summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-04-19 13:57:54 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-08-04 11:09:49 +0200
commit4e3e7b9f9bb91c48c39d60a7f19fb085725fbe86 (patch)
tree1e57139b7b21b48b2fa802419e84ebbefba54f82
parent64eba246de2277602eb10f26789093ba3c066b5b (diff)
sd doc model dump: include undo manager info
So that it's easy to see where the implementation for a given undo action is. Reviewed-on: https://gerrit.libreoffice.org/24243 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 7a06ef161cc27a3d1bcc8b970928f776500c267e) Change-Id: I93b8603f75d0b5a68922e02540b9db6824f4d0db
-rw-r--r--sd/qa/unit/tiledrendering/tiledrendering.cxx2
-rw-r--r--sd/source/core/drawdoc.cxx8
2 files changed, 9 insertions, 1 deletions
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 12529cdd6c24..4e28834b0cca 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -793,7 +793,7 @@ void SdTiledRenderingTest::testResizeTableColumn()
// Remember the original cell widths.
xmlDocPtr pXmlDoc = parseXmlDump();
- OString aPrefix = "/sdrModel/sdPage/sdrObjList/sdrTableObj/sdrTableObjImpl/tableLayouter/columns/";
+ OString aPrefix = "/sdDrawDocument/sdrModel/sdPage/sdrObjList/sdrTableObj/sdrTableObjImpl/tableLayouter/columns/";
sal_Int32 nExpectedColumn1 = getXPath(pXmlDoc, aPrefix + "layout[1]", "size").toInt32();
sal_Int32 nExpectedColumn2 = getXPath(pXmlDoc, aPrefix + "layout[2]", "size").toInt32();
xmlFreeDoc(pXmlDoc);
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index dcde763b39ca..3e1aff87a95f 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -98,6 +98,7 @@
#include "../ui/inc/ViewShell.hxx"
#include "../ui/inc/optsitem.hxx"
#include "../ui/inc/FrameView.hxx"
+#include <undo/undomanager.hxx>
#include <tools/tenccvt.hxx>
#include <vcl/settings.hxx>
@@ -1101,7 +1102,14 @@ void SdDrawDocument::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterStartDocument(pWriter, nullptr, nullptr, nullptr);
bOwns = true;
}
+ xmlTextWriterStartElement(pWriter, BAD_CAST("sdDrawDocument"));
+ xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
+
FmFormModel::dumpAsXml(pWriter);
+ if (GetUndoManager())
+ GetUndoManager()->dumpAsXml(pWriter);
+
+ xmlTextWriterEndElement(pWriter);
if (bOwns)
{
xmlTextWriterEndDocument(pWriter);