diff options
Diffstat (limited to 'sw/qa/core/undo')
-rw-r--r-- | sw/qa/core/undo/data/textbox-cut-save.docx | bin | 0 -> 7272 bytes | |||
-rw-r--r-- | sw/qa/core/undo/data/textbox-cut-undo.docx | bin | 0 -> 13196 bytes | |||
-rw-r--r-- | sw/qa/core/undo/undo.cxx | 89 |
3 files changed, 89 insertions, 0 deletions
diff --git a/sw/qa/core/undo/data/textbox-cut-save.docx b/sw/qa/core/undo/data/textbox-cut-save.docx Binary files differnew file mode 100644 index 000000000..a1a350d08 --- /dev/null +++ b/sw/qa/core/undo/data/textbox-cut-save.docx diff --git a/sw/qa/core/undo/data/textbox-cut-undo.docx b/sw/qa/core/undo/data/textbox-cut-undo.docx Binary files differnew file mode 100644 index 000000000..35f0e8571 --- /dev/null +++ b/sw/qa/core/undo/data/textbox-cut-undo.docx diff --git a/sw/qa/core/undo/undo.cxx b/sw/qa/core/undo/undo.cxx new file mode 100644 index 000000000..e43d154f3 --- /dev/null +++ b/sw/qa/core/undo/undo.cxx @@ -0,0 +1,89 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <swmodeltestbase.hxx> + +#include <unotools/mediadescriptor.hxx> +#include <sfx2/viewfrm.hxx> +#include <sfx2/dispatch.hxx> + +#include <unotxdoc.hxx> +#include <docsh.hxx> +#include <wrtsh.hxx> +#include <swdtflvr.hxx> +#include <frameformats.hxx> +#include <fmtcntnt.hxx> +#include <view.hxx> +#include <cmdid.h> + +char const DATA_DIRECTORY[] = "/sw/qa/core/undo/data/"; + +/// Covers sw/source/core/undo/ fixes. +class SwCoreUndoTest : public SwModelTestBase +{ +}; + +CPPUNIT_TEST_FIXTURE(SwCoreUndoTest, testTextboxCutSave) +{ + // Load the document and select all. + load(DATA_DIRECTORY, "textbox-cut-save.docx"); + SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); + SwDocShell* pDocShell = pTextDoc->GetDocShell(); + SwWrtShell* pWrtShell = pDocShell->GetWrtShell(); + pWrtShell->SelAll(); + + // Cut. + rtl::Reference<SwTransferable> pTransfer = new SwTransferable(*pWrtShell); + pTransfer->Cut(); + + // Undo. + pWrtShell->Undo(); + + // Save. + uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); + utl::MediaDescriptor aMediaDescriptor; + aMediaDescriptor["FilterName"] <<= OUString("Office Open XML Text"); + + // Without the accompanying fix in place, this test would have failed with: + // void sax_fastparser::FastSaxSerializer::endDocument(): Assertion `mbMarkStackEmpty && maMarkStack.empty()' failed. + // i.e. failed to save because we tried to write not-well-formed XML. + xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); +} + +CPPUNIT_TEST_FIXTURE(SwCoreUndoTest, testTextboxCutUndo) +{ + load(DATA_DIRECTORY, "textbox-cut-undo.docx"); + SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); + SwDocShell* pDocShell = pTextDoc->GetDocShell(); + SwWrtShell* pWrtShell = pDocShell->GetWrtShell(); + SwDoc* pDoc = pDocShell->GetDoc(); + SwView* pView = pDoc->GetDocShell()->GetView(); + + pView->GetViewFrame()->GetDispatcher()->Execute(FN_CNTNT_TO_NEXT_FRAME, SfxCallMode::SYNCHRON); + pView->StopShellTimer(); + rtl::Reference<SwTransferable> pTransfer = new SwTransferable(*pWrtShell); + pTransfer->Cut(); + SwFrameFormats& rSpzFrameFormats = *pDoc->GetSpzFrameFormats(); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), rSpzFrameFormats.size()); + + pWrtShell->Undo(); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), rSpzFrameFormats.size()); + + const SwNodeIndex* pIndex1 = rSpzFrameFormats[0]->GetContent().GetContentIdx(); + const SwNodeIndex* pIndex2 = rSpzFrameFormats[1]->GetContent().GetContentIdx(); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 5 + // - Actual : 8 + // i.e. the draw frame format had a wrong node index in its content. + CPPUNIT_ASSERT_EQUAL(pIndex1->GetIndex(), pIndex2->GetIndex()); +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |