drawinglayer/inc/drawinglayer/XShapeDumper.hxx | 15 ++ drawinglayer/source/dumper/XShapeDumper.cxx | 139 +++++++++++++++++++++++++ 2 files changed, 154 insertions(+)
New commits: commit 26b404ef3c411a91be55f6f58b6ff686d0ec389e Author: Artur Dorda <[email protected]> Date: Mon Jun 11 14:00:26 2012 +0200 Added dumping Transformation property Change-Id: Id7ded83cee7798a1ddc3fc3ce7344d64b8f0f795 diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx index 5c540ad..2e27505 100644 --- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx +++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx @@ -52,6 +52,7 @@ #include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/drawing/HomogenMatrixLine3.hpp> +#include <com/sun/star/drawing/HomogenMatrix3.hpp> #ifndef ChartViewDumper_hxx #define ChartViewDumper_hxx @@ -159,6 +160,7 @@ private: void dumpNameAsAttribute(rtl::OUString sName, xmlTextWriterPtr xmlWriter); void dumpSizeProtectAsAttribute(sal_Bool bSizeProtect, xmlTextWriterPtr xmlWriter); void dumpHomogenMatrixLine3(com::sun::star::drawing::HomogenMatrixLine3 aLine, xmlTextWriterPtr xmlWriter); + void dumpTransformationAsElement(com::sun::star::drawing::HomogenMatrix3 aTransformation, 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 4ef4569..470d897 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -917,11 +917,28 @@ namespace { xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("sizeProtect"), "%s", "false"); } - void XShapeDumper::dumpHomogenMatrixLine3(drawing::HomogenMatrixLine3 aLine, xmlTextWriterPtr xmlWriter) + void XShapeDumper::dumpHomogenMatrixLine3(drawing::HomogenMatrixLine3 aHomogenMatrixLine3, xmlTextWriterPtr xmlWriter) { - xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("column1"), "%f", aLine.Column1); - xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("column2"), "%f", aLine.Column2); - xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("column3"), "%f", aLine.Column3); + xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("column1"), "%f", aHomogenMatrixLine3.Column1); + xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("column2"), "%f", aHomogenMatrixLine3.Column2); + xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("column3"), "%f", aHomogenMatrixLine3.Column3); + } + + void XShapeDumper::dumpTransformationAsElement(drawing::HomogenMatrix3 aTransformation, xmlTextWriterPtr xmlWriter) + { + xmlTextWriterStartElement(xmlWriter, BAD_CAST( "Transformation" )); + { + xmlTextWriterStartElement(xmlWriter, BAD_CAST( "Line1" )); + dumpHomogenMatrixLine3(aTransformation.Line1, xmlWriter); + xmlTextWriterEndElement( xmlWriter ); + xmlTextWriterStartElement(xmlWriter, BAD_CAST( "Line2" )); + dumpHomogenMatrixLine3(aTransformation.Line2, xmlWriter); + xmlTextWriterEndElement( xmlWriter ); + xmlTextWriterStartElement(xmlWriter, BAD_CAST( "Line3" )); + dumpHomogenMatrixLine3(aTransformation.Line3, xmlWriter); + xmlTextWriterEndElement( xmlWriter ); + } + xmlTextWriterEndElement( xmlWriter ); } // -------------------------------- @@ -1469,6 +1486,12 @@ namespace { if(anotherAny >>= bSizeProtect) dumpSizeProtectAsAttribute(bSizeProtect, xmlWriter); } + { + uno::Any anotherAny = xPropSet->getPropertyValue("Transformation"); + drawing::HomogenMatrix3 aTransformation; + if(anotherAny >>= aTransformation) + dumpTransformationAsElement(aTransformation, xmlWriter); + } } #if DEBUG_DUMPER commit 5375a6828dbccc58a1a74ccca78bd8b75632cf9f Author: Artur Dorda <[email protected]> Date: Mon Jun 11 01:03:06 2012 +0200 Added separate method to dump HomogenMatrixLine3 properties/fields Change-Id: Id0c66cf82ce224364f4e15fe5a21fcf52b8cde3b diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx index 4244cc1..5c540ad 100644 --- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx +++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx @@ -51,6 +51,8 @@ #include <com/sun/star/drawing/TextAnimationKind.hpp> #include <com/sun/star/text/WritingMode.hpp> +#include <com/sun/star/drawing/HomogenMatrixLine3.hpp> + #ifndef ChartViewDumper_hxx #define ChartViewDumper_hxx @@ -156,6 +158,7 @@ private: void dumpMoveProtectAsAttribute(sal_Bool bMoveProtect, xmlTextWriterPtr xmlWriter); void dumpNameAsAttribute(rtl::OUString sName, xmlTextWriterPtr xmlWriter); void dumpSizeProtectAsAttribute(sal_Bool bSizeProtect, xmlTextWriterPtr xmlWriter); + void dumpHomogenMatrixLine3(com::sun::star::drawing::HomogenMatrixLine3 aLine, 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 2ba635a..4ef4569 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -917,6 +917,13 @@ namespace { xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("sizeProtect"), "%s", "false"); } + void XShapeDumper::dumpHomogenMatrixLine3(drawing::HomogenMatrixLine3 aLine, xmlTextWriterPtr xmlWriter) + { + xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("column1"), "%f", aLine.Column1); + xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("column2"), "%f", aLine.Column2); + xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("column3"), "%f", aLine.Column3); + } + // -------------------------------- // ---------- XShape.idl ---------- // -------------------------------- commit cafa3ee4a46ea08a1b32b2afcf973061d53bdb02 Author: Artur Dorda <[email protected]> Date: Mon Jun 11 00:53:24 2012 +0200 Added dumping SizeProtect property Change-Id: Ie0fc0e92522184caa3380443ea601a77101ac813 diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx index fd0a8ab..4244cc1 100644 --- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx +++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx @@ -155,6 +155,7 @@ private: void dumpPrintableAsAttribute(sal_Bool bPrintable, xmlTextWriterPtr xmlWriter); void dumpMoveProtectAsAttribute(sal_Bool bMoveProtect, xmlTextWriterPtr xmlWriter); void dumpNameAsAttribute(rtl::OUString sName, xmlTextWriterPtr xmlWriter); + void dumpSizeProtectAsAttribute(sal_Bool bSizeProtect, 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 2e04779..2ba635a 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -909,6 +909,14 @@ namespace { rtl::OUStringToOString(sName, RTL_TEXTENCODING_UTF8).getStr()); } + void XShapeDumper::dumpSizeProtectAsAttribute(sal_Bool bSizeProtect, xmlTextWriterPtr xmlWriter) + { + if(bSizeProtect) + xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("sizeProtect"), "%s", "true"); + else + xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("sizeProtect"), "%s", "false"); + } + // -------------------------------- // ---------- XShape.idl ---------- // -------------------------------- @@ -1448,6 +1456,12 @@ namespace { if(anotherAny >>= sName) dumpNameAsAttribute(sName, xmlWriter); } + { + uno::Any anotherAny = xPropSet->getPropertyValue("SizeProtect"); + sal_Bool bSizeProtect; + if(anotherAny >>= bSizeProtect) + dumpSizeProtectAsAttribute(bSizeProtect, xmlWriter); + } } #if DEBUG_DUMPER commit 7aee7405128dfcf68153a8e973e71f5bc5152a34 Author: Artur Dorda <[email protected]> Date: Sun Jun 10 22:29:52 2012 +0200 Added dumping MoveProtect & Name properties Change-Id: I5faf77a955fe9e6134e6e5ae15c2367f1ee81d7b diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx index b8a437d..fd0a8ab 100644 --- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx +++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx @@ -153,6 +153,8 @@ private: void dumpLayerNameAsAttribute(rtl::OUString sLayerName, xmlTextWriterPtr xmlWriter); void dumpVisibleAsAttribute(sal_Bool bVisible, xmlTextWriterPtr xmlWriter); void dumpPrintableAsAttribute(sal_Bool bPrintable, xmlTextWriterPtr xmlWriter); + void dumpMoveProtectAsAttribute(sal_Bool bMoveProtect, xmlTextWriterPtr xmlWriter); + void dumpNameAsAttribute(rtl::OUString sName, 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 d1211ba..2e04779 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -876,7 +876,7 @@ namespace { void XShapeDumper::dumpLayerNameAsAttribute(rtl::OUString sLayerName, xmlTextWriterPtr xmlWriter) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("layerName"), "%s", - rtl::OUStringToOString(sLayerName, RTL_TEXTENCODING_UTF8).getStr()); + rtl::OUStringToOString(sLayerName, RTL_TEXTENCODING_UTF8).getStr()); } void XShapeDumper::dumpVisibleAsAttribute(sal_Bool bVisible, xmlTextWriterPtr xmlWriter) @@ -895,6 +895,20 @@ namespace { xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("printable"), "%s", "false"); } + void XShapeDumper::dumpMoveProtectAsAttribute(sal_Bool bMoveProtect, xmlTextWriterPtr xmlWriter) + { + if(bMoveProtect) + xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("moveProtect"), "%s", "true"); + else + xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("moveProtect"), "%s", "false"); + } + + void XShapeDumper::dumpNameAsAttribute(rtl::OUString sName, xmlTextWriterPtr xmlWriter) + { + xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("name"), "%s", + rtl::OUStringToOString(sName, RTL_TEXTENCODING_UTF8).getStr()); + } + // -------------------------------- // ---------- XShape.idl ---------- // -------------------------------- @@ -1422,6 +1436,18 @@ namespace { if(anotherAny >>= bPrintable) dumpPrintableAsAttribute(bPrintable, xmlWriter); } + { + uno::Any anotherAny = xPropSet->getPropertyValue("MoveProtect"); + sal_Bool bMoveProtect; + if(anotherAny >>= bMoveProtect) + dumpMoveProtectAsAttribute(bMoveProtect, xmlWriter); + } + { + uno::Any anotherAny = xPropSet->getPropertyValue("Name"); + rtl::OUString sName; + if(anotherAny >>= sName) + dumpNameAsAttribute(sName, xmlWriter); + } } #if DEBUG_DUMPER commit b062d890bed5cf4922c0a1c03806a2e0845fe952 Author: Artur Dorda <[email protected]> Date: Sun Jun 10 22:24:59 2012 +0200 Added dumping Visible & Printable properties Change-Id: If6abb577f9ae752f2467976e388a13964eaa3417 diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx index b9461ab..b8a437d 100644 --- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx +++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx @@ -151,6 +151,8 @@ private: void dumpZOrderAsAttribute(sal_Int32 aZOrder, xmlTextWriterPtr xmlWriter); void dumpLayerIDAsAttribute(sal_Int32 aLayerID, xmlTextWriterPtr xmlWriter); void dumpLayerNameAsAttribute(rtl::OUString sLayerName, xmlTextWriterPtr xmlWriter); + void dumpVisibleAsAttribute(sal_Bool bVisible, xmlTextWriterPtr xmlWriter); + void dumpPrintableAsAttribute(sal_Bool bPrintable, 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 4b65523..d1211ba 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -879,6 +879,22 @@ namespace { rtl::OUStringToOString(sLayerName, RTL_TEXTENCODING_UTF8).getStr()); } + void XShapeDumper::dumpVisibleAsAttribute(sal_Bool bVisible, xmlTextWriterPtr xmlWriter) + { + if(bVisible) + xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("visible"), "%s", "true"); + else + xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("visible"), "%s", "false"); + } + + void XShapeDumper::dumpPrintableAsAttribute(sal_Bool bPrintable, xmlTextWriterPtr xmlWriter) + { + if(bPrintable) + xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("printable"), "%s", "true"); + else + xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("printable"), "%s", "false"); + } + // -------------------------------- // ---------- XShape.idl ---------- // -------------------------------- @@ -1394,6 +1410,18 @@ namespace { if(anotherAny >>= sLayerName) dumpLayerNameAsAttribute(sLayerName, xmlWriter); } + { + uno::Any anotherAny = xPropSet->getPropertyValue("Visible"); + sal_Bool bVisible; + if(anotherAny >>= bVisible) + dumpVisibleAsAttribute(bVisible, xmlWriter); + } + { + uno::Any anotherAny = xPropSet->getPropertyValue("Printable"); + sal_Bool bPrintable; + if(anotherAny >>= bPrintable) + dumpPrintableAsAttribute(bPrintable, xmlWriter); + } } #if DEBUG_DUMPER commit a5265f1efb5bb960f110075c9267ccb4ed4cb466 Author: Artur Dorda <[email protected]> Date: Sun Jun 10 22:21:41 2012 +0200 Added dumping LayerID & LayerName properties Change-Id: Icadcea9251a2f33a2d37b70b438282238f5b29ee diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx index d36cf96..b9461ab 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 667fca2..4b65523 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 commit c71b4b375c0ba07bb549da463e7a44b10ea8b122 Author: Artur Dorda <[email protected]> Date: Sun Jun 10 22:16:36 2012 +0200 Start of dumping Shape service. Added ZOrder property Change-Id: I0d9ec609988d1df577fe4e9dd656fc6579dec701 diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx index 54f0364..d36cf96 100644 --- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx +++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx @@ -147,6 +147,9 @@ private: void dumpShadowXDistanceAsAttribute(sal_Int32 aShadowXDistance, xmlTextWriterPtr xmlWriter); void dumpShadowYDistanceAsAttribute(sal_Int32 aShadowYDistance, xmlTextWriterPtr xmlWriter); + //Shape.idl + void dumpZOrderAsAttribute(sal_Int32 aZOrder, xmlTextWriterPtr xmlWriter); + // XShape.idl void dumpPositionAsAttribute(const com::sun::star::awt::Point& rPoint, xmlTextWriterPtr xmlWriter); void dumpSizeAsAttribute(const com::sun::star::awt::Size& rSize, xmlTextWriterPtr xmlWriter); diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx b/drawinglayer/source/dumper/XShapeDumper.cxx index f6626e1..667fca2 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -859,6 +859,15 @@ namespace { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("shadowYDistance"), "%" SAL_PRIdINT32, aShadowYDistance); } + // ------------------------------- + // ---------- Shape.idl ---------- + // ------------------------------- + + void XShapeDumper::dumpZOrderAsAttribute(sal_Int32 aZOrder, xmlTextWriterPtr xmlWriter) + { + xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("zOrder"), "%" SAL_PRIdINT32, aZOrder); + } + // -------------------------------- // ---------- XShape.idl ---------- // -------------------------------- @@ -1354,6 +1363,15 @@ namespace { dumpShadowYDistanceAsAttribute(aShadowYDistance, xmlWriter); } } + else if(xServiceInfo->supportsService("com.sun.star.drawing.Shape")) + { + { + uno::Any anotherAny = xPropSet->getPropertyValue("ZOrder"); + sal_Int32 aZOrder; + if(anotherAny >>= aZOrder) + dumpZOrderAsAttribute(aZOrder, xmlWriter); + } + } #if DEBUG_DUMPER sal_Int32 nServices = aServiceNames.getLength(); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
