sw/source/core/layout/anchoredobject.cxx | 26 ++++++++++++++++++++++++++
sw/source/core/text/xmldump.cxx | 26 --------------------------
2 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit d52982f4b3ba3f54adf21a9f185c726fb1a3db9a
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Oct 19 20:12:33 2023 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Oct 20 08:14:08 2023 +0200
sw layout xml dump: move SwAnchoredObject dumper
Next to the rest of the anchored object code.
So it's more likely that it gets updated as SwAnchoredObject changes.
Change-Id: Iff07da7a2679f4ea7b63ce18251140f4e46a0956
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158199
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sw/source/core/layout/anchoredobject.cxx
b/sw/source/core/layout/anchoredobject.cxx
index 5f8a307867bf..42e7dd39fcd2 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -941,4 +941,30 @@ SwFlyFrame* SwAnchoredObject::DynCastFlyFrame()
return nullptr;
}
+void SwAnchoredObject::dumpAsXml( xmlTextWriterPtr writer ) const
+{
+ (void)xmlTextWriterStartElement( writer, BAD_CAST( getElementName() ) );
+ (void)xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "ptr" ), "%p",
this );
+ (void)xmlTextWriterWriteAttribute(writer, BAD_CAST("anchor-frame"),
BAD_CAST(OString::number(mpAnchorFrame->GetFrameId()).getStr()));
+ if (mpPageFrame)
+ {
+ (void)xmlTextWriterWriteAttribute(writer, BAD_CAST("page-frame"),
BAD_CAST(OString::number(mpPageFrame->GetFrameId()).getStr()));
+ }
+ SwTextFrame* pAnchorCharFrame =
const_cast<SwAnchoredObject*>(this)->FindAnchorCharFrame();
+ if (pAnchorCharFrame)
+ {
+ (void)xmlTextWriterWriteAttribute(writer,
BAD_CAST("anchor-char-frame"),
BAD_CAST(OString::number(pAnchorCharFrame->GetFrameId()).getStr()));
+ }
+
+ (void)xmlTextWriterStartElement( writer, BAD_CAST( "bounds" ) );
+ // don't call GetObjBoundRect(), it modifies the layout
+ SwRect(GetDrawObj()->GetLastBoundRect()).dumpAsXmlAttributes(writer);
+ (void)xmlTextWriterEndElement( writer );
+
+ if (const SdrObject* pObject = GetDrawObj())
+ pObject->dumpAsXml(writer);
+
+ (void)xmlTextWriterEndElement( writer );
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 345740858783..8284ac3fdc58 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -252,30 +252,4 @@ void SwFrame::dumpChildrenAsXml( xmlTextWriterPtr writer )
const
}
}
-void SwAnchoredObject::dumpAsXml( xmlTextWriterPtr writer ) const
-{
- (void)xmlTextWriterStartElement( writer, BAD_CAST( getElementName() ) );
- (void)xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "ptr" ), "%p",
this );
- (void)xmlTextWriterWriteAttribute(writer, BAD_CAST("anchor-frame"),
BAD_CAST(OString::number(mpAnchorFrame->GetFrameId()).getStr()));
- if (mpPageFrame)
- {
- (void)xmlTextWriterWriteAttribute(writer, BAD_CAST("page-frame"),
BAD_CAST(OString::number(mpPageFrame->GetFrameId()).getStr()));
- }
- SwTextFrame* pAnchorCharFrame =
const_cast<SwAnchoredObject*>(this)->FindAnchorCharFrame();
- if (pAnchorCharFrame)
- {
- (void)xmlTextWriterWriteAttribute(writer,
BAD_CAST("anchor-char-frame"),
BAD_CAST(OString::number(pAnchorCharFrame->GetFrameId()).getStr()));
- }
-
- (void)xmlTextWriterStartElement( writer, BAD_CAST( "bounds" ) );
- // don't call GetObjBoundRect(), it modifies the layout
- SwRect(GetDrawObj()->GetLastBoundRect()).dumpAsXmlAttributes(writer);
- (void)xmlTextWriterEndElement( writer );
-
- if (const SdrObject* pObject = GetDrawObj())
- pObject->dumpAsXml(writer);
-
- (void)xmlTextWriterEndElement( writer );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
