include/svx/svdobj.hxx | 2 +-
include/svx/svdogrp.hxx | 2 ++
include/svx/svdpage.hxx | 4 ++--
svx/source/svdraw/svdogrp.cxx | 12 ++++++++++++
svx/source/svdraw/svdpage.cxx | 30 +++++++++++++++---------------
sw/inc/fmtfsize.hxx | 2 ++
sw/source/core/docnode/nodedump.cxx | 11 +++--------
sw/source/core/layout/atrfrm.cxx | 19 +++++++++++++++++++
8 files changed, 56 insertions(+), 26 deletions(-)
New commits:
commit dc08157dff6d997b4e5b19c9496ddf54727ba26f
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sat Dec 20 12:41:03 2014 +0100
Factor out SwFmtFrmSize::dumpAsXml() from nodedump
Change-Id: Idcf24d40876230a0e34f2f816dfe414b4a143f53
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index 6bb75da..29598be 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -97,6 +97,8 @@ public:
void SetHeightPercentRelation ( sal_Int16 n ) {
m_eHeightPercentRelation = n; }
void SetWidthPercent ( sal_uInt8 n ) { m_nWidthPercent = n; }
void SetWidthPercentRelation ( sal_Int16 n ) { m_eWidthPercentRelation
= n; }
+
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(bool bInP) const
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index c0cda75..7d18b65 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -426,6 +426,9 @@ void lcl_dumpSfxItemSet(WriterHelper& writer, const
SfxItemSet* pSet)
case RES_CNTNT:
static_cast<const SwFmtCntnt*>(pItem)->dumpAsXml(writer);
break;
+ case RES_FRM_SIZE:
+ static_cast<const SwFmtFrmSize*>(pItem)->dumpAsXml(writer);
+ break;
default: bDone = false; break;
}
if (bDone)
@@ -440,14 +443,6 @@ void lcl_dumpSfxItemSet(WriterHelper& writer, const
SfxItemSet* pSet)
boost::optional<OString> oValue;
switch (pItem->Which())
{
- case RES_FRM_SIZE:
- {
- pWhich = "frame size";
- const SwFmtFrmSize* pSize = static_cast<const
SwFmtFrmSize*>(pItem);
- oValue = "height size type: " +
OString::number(pSize->GetHeightSizeType()) + ", height: " +
OString::number(pSize->GetHeight())
- + ", width size type: " +
OString::number(pSize->GetWidthSizeType()) + ", width: " +
OString::number(pSize->GetWidth());
- break;
- }
case RES_VERT_ORIENT:
{
pWhich = "frame vertical orientation";
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index dbf0caa..79517f2 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -411,6 +411,25 @@ bool SwFmtFrmSize::PutValue( const uno::Any& rVal,
sal_uInt8 nMemberId )
return bRet;
}
+void SwFmtFrmSize::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+ xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtFrmSize"));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"),
BAD_CAST(OString::number(Which()).getStr()));
+
+ std::stringstream aSize;
+ aSize << m_aSize;
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("size"),
BAD_CAST(aSize.str().c_str()));
+
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eFrmHeightType"),
BAD_CAST(OString::number(m_eFrmHeightType).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eFrmWidthType"),
BAD_CAST(OString::number(m_eFrmWidthType).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nWidthPercent"),
BAD_CAST(OString::number(m_nWidthPercent).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eWidthPercentRelation"),
BAD_CAST(OString::number(m_eWidthPercentRelation).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nHeightPercent"),
BAD_CAST(OString::number(m_nHeightPercent).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eHeightPercentRelation"),
BAD_CAST(OString::number(m_eHeightPercentRelation).getStr()));
+
+ xmlTextWriterEndElement(pWriter);
+}
+
// Partially implemented inline in hxx
SwFmtFillOrder::SwFmtFillOrder( SwFillOrder nFO )
: SfxEnumItem( RES_FILL_ORDER, sal_uInt16(nFO) )
commit b1e0d30e6adaa1bef2b0e923354ce4e5f82ae707
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sat Dec 20 12:20:50 2014 +0100
Add SdrObjGroup::dumpAsXml() to show contents of group shapes
Change-Id: I8b713cbd64f91ad62d06ef57d790ac4e54e37315
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 1502a4f..fd1f56f 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -966,7 +966,7 @@ public:
OString stringify() const;
- void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+ virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
protected:
// Sets a new UNO shape
diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx
index c209532..6e9f48e 100644
--- a/include/svx/svdogrp.hxx
+++ b/include/svx/svdogrp.hxx
@@ -108,6 +108,8 @@ public:
virtual void ReformatText() SAL_OVERRIDE;
virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const
SAL_OVERRIDE;
+
+ virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
#endif // INCLUDED_SVX_SVDOGRP_HXX
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 1cf3d1c..3cab76f 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -48,6 +48,7 @@
#include <basegfx/range/b2drange.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
+#include <libxml/xmlwriter.h>
// BaseProperties section
@@ -776,4 +777,15 @@ SdrObject* SdrObjGroup::DoConvertToPolyObj(bool bBezier,
bool bAddText) const
return pGroup;
}
+void SdrObjGroup::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+ xmlTextWriterStartElement(pWriter, BAD_CAST("sdrObjGroup"));
+ xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
+
+ SdrObject::dumpAsXml(pWriter);
+
+ pSub->dumpAsXml(pWriter);
+ xmlTextWriterEndElement(pWriter);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 8ee916d7ea1b7ebffc69539491da123703d04b90
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Dec 19 23:58:18 2014 +0100
Move SdrPage::dumpAsXml() up to SdrObjList
So that group shapes having an SdrObjList can reuse that.
Change-Id: Icc8a8dd8d1f90b368142a1c7b42249bc34b3bebb
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 55a2740..c186f3a 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -251,6 +251,8 @@ public:
void SetNavigationOrder (const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexAccess>& rxOrder);
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+
private:
class WeakSdrObjectContainerType;
/// This list, if it exists, defines the navigation order. If it does
@@ -574,8 +576,6 @@ public:
const sdr::contact::DisplayInfo& rDisplayInfo,
bool bEdit );
- void dumpAsXml(struct _xmlTextWriter* pWriter) const;
-
private:
void impl_setModelForLayerAdmin(SdrModel* pNewModel);
};
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 1e754f0..12301dc 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1037,6 +1037,21 @@ void SdrObjList::RemoveObjectFromContainer (
bObjOrdNumsDirty=true;
}
+void SdrObjList::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+ xmlTextWriterStartElement(pWriter, BAD_CAST("sdrObjList"));
+ xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
+ xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("symbol"), "%s",
BAD_CAST(typeid(*this).name()));
+
+ size_t nObjCount = GetObjCount();
+ for (size_t i = 0; i < nObjCount; ++i)
+ {
+ if (const SdrObject* pObject = GetObj(i))
+ pObject->dumpAsXml(pWriter);
+ }
+
+ xmlTextWriterEndElement(pWriter);
+}
@@ -1798,21 +1813,6 @@ void SdrPage::ActionChanged() const
}
}
-void SdrPage::dumpAsXml(xmlTextWriterPtr pWriter) const
-{
- xmlTextWriterStartElement(pWriter, BAD_CAST("sdrPage"));
- xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
-
- size_t nObjCount = GetObjCount();
- for (size_t i = 0; i < nObjCount; ++i)
- {
- if (const SdrObject* pObject = GetObj(i))
- pObject->dumpAsXml(pWriter);
- }
-
- xmlTextWriterEndElement(pWriter);
-}
-
// sdr::Comment interface
const SdrPageProperties* SdrPage::getCorrectSdrPageProperties() const
commit a012b17bd82e4b7d7414546af8eaaa885ea419b1
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Dec 19 23:44:43 2014 +0100
SdrPage::dumpAsXml: typo
Change-Id: I9aef4e1bdec68456293a88c410ecf45eb85c7489
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index e4238d9..1e754f0 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1806,7 +1806,7 @@ void SdrPage::dumpAsXml(xmlTextWriterPtr pWriter) const
size_t nObjCount = GetObjCount();
for (size_t i = 0; i < nObjCount; ++i)
{
- if (const SdrObject* pObject = pPage->GetObj(i))
+ if (const SdrObject* pObject = GetObj(i))
pObject->dumpAsXml(pWriter);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
