diff options
| -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 | 34 | ||||
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/undo/undobj1.cxx | 7 |
4 files changed, 43 insertions, 0 deletions
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 000000000000..35f0e857173e --- /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 index aeacffc78e9b..e43d154f3a66 100644 --- a/sw/qa/core/undo/undo.cxx +++ b/sw/qa/core/undo/undo.cxx @@ -10,11 +10,17 @@ #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/"; @@ -50,6 +56,34 @@ CPPUNIT_TEST_FIXTURE(SwCoreUndoTest, testTextboxCutSave) 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: */ diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 84076a24ced6..8755ee81235d 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -615,6 +615,8 @@ void SwFormatContent::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute( pWriter, BAD_CAST("startNode"), BAD_CAST(OString::number(m_pStartNode->GetNode().GetIndex()).getStr())); + xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("startNodePtr"), "%p", + &m_pStartNode->GetNode()); } xmlTextWriterEndElement(pWriter); } diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index 15801bca46e2..fb779e53d4f9 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -155,6 +155,13 @@ void SwUndoFlyBase::InsFly(::sw::UndoRedoContext & rContext, bool bShowSelFrame) pSdrObject->setUnoShape(nullptr); } } + if (m_pFrameFormat->Which() == RES_DRAWFRMFMT) + { + // This is a draw format and we just set the fly format's textbox pointer to this draw + // format. Sync the draw format's content with the fly format's content. + SwFrameFormat* pFlyFormat = m_pFrameFormat->GetOtherTextBoxFormat(); + m_pFrameFormat->SetFormatAttr(pFlyFormat->GetContent()); + } } m_pFrameFormat->MakeFrames(); |