From 58ece5025790b6835d2bcb766da499bcc0ee17b3 Mon Sep 17 00:00:00 2001 From: Artur Dorda Date: Sun, 10 Jun 2012 22:21:41 +0200 Subject: Added dumping LayerID & LayerName properties Change-Id: Icadcea9251a2f33a2d37b70b438282238f5b29ee --- drawinglayer/inc/drawinglayer/XShapeDumper.hxx | 2 ++ drawinglayer/source/dumper/XShapeDumper.cxx | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) (limited to 'drawinglayer') diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx index d36cf966ae94..b9461aba8ee8 100644 --- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx +++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx @@ -149,6 +149,8 @@ private: //Shape.idl void dumpZOrderAsAttribute(sal_Int32 aZOrder, xmlTextWriterPtr xmlWriter); + void dumpLayerIDAsAttribute(sal_Int32 aLayerID, xmlTextWriterPtr xmlWriter); + void dumpLayerNameAsAttribute(rtl::OUString sLayerName, xmlTextWriterPtr xmlWriter); // XShape.idl void dumpPositionAsAttribute(const com::sun::star::awt::Point& rPoint, xmlTextWriterPtr xmlWriter); diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx b/drawinglayer/source/dumper/XShapeDumper.cxx index 667fca235f4c..4b6552395b06 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -868,6 +868,17 @@ namespace { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("zOrder"), "%" SAL_PRIdINT32, aZOrder); } + void XShapeDumper::dumpLayerIDAsAttribute(sal_Int32 aLayerID, xmlTextWriterPtr xmlWriter) + { + xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("layerID"), "%" SAL_PRIdINT32, aLayerID); + } + + void XShapeDumper::dumpLayerNameAsAttribute(rtl::OUString sLayerName, xmlTextWriterPtr xmlWriter) + { + xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("layerName"), "%s", + rtl::OUStringToOString(sLayerName, RTL_TEXTENCODING_UTF8).getStr()); + } + // -------------------------------- // ---------- XShape.idl ---------- // -------------------------------- @@ -1371,6 +1382,18 @@ namespace { if(anotherAny >>= aZOrder) dumpZOrderAsAttribute(aZOrder, xmlWriter); } + { + uno::Any anotherAny = xPropSet->getPropertyValue("LayerID"); + sal_Int32 aLayerID; + if(anotherAny >>= aLayerID) + dumpLayerIDAsAttribute(aLayerID, xmlWriter); + } + { + uno::Any anotherAny = xPropSet->getPropertyValue("LayerName"); + rtl::OUString sLayerName; + if(anotherAny >>= sLayerName) + dumpLayerNameAsAttribute(sLayerName, xmlWriter); + } } #if DEBUG_DUMPER -- cgit