diff options
| author | Andres Gomez <agomez@igalia.com> | 2013-09-06 00:53:27 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-09-09 09:27:48 +0000 |
| commit | a2e73b061f8e17fac7bdc8362231b3afd1e92d46 (patch) | |
| tree | 435f6192f4de5250898805db4cb26173530f857b /drawinglayer | |
| parent | 665574e8daa65aaa8a461fe8e02dc61c52323b2f (diff) | |
drawinglayer: added dumping of InteropGrabBag prop
XShapeDumper is now also dumping the
InteropGrabBag property as a new empty element.
In the future, new "private" properties added to
the grab bag could be dumped too.
Updated the unit tests accordingly.
Change-Id: I7526dbd64bdc08915dc71f1167f05224118f17a6
Reviewed-on: https://gerrit.libreoffice.org/5848
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/dumper/XShapeDumper.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx b/drawinglayer/source/dumper/XShapeDumper.cxx index fb114e8f65e3..a77cb37641b2 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -134,9 +134,7 @@ void dumpHomogenMatrixLine3(com::sun::star::drawing::HomogenMatrixLine3 aLine, x void dumpTransformationAsElement(com::sun::star::drawing::HomogenMatrix3 aTransformation, xmlTextWriterPtr xmlWriter); void dumpNavigationOrderAsAttribute(sal_Int32 aNavigationOrder, xmlTextWriterPtr xmlWriter); void dumpHyperlinkAsAttribute(OUString sHyperlink, xmlTextWriterPtr xmlWriter); -#if 0 // unused now, but will presumably soon be used, avoid compiler warning till then void dumpInteropGrabBagAsElement(uno::Sequence< beans::PropertyValue> aInteropGrabBag, xmlTextWriterPtr xmlWriter); -#endif // CustomShape.idl void dumpCustomShapeEngineAsAttribute(OUString sCustomShapeEngine, xmlTextWriterPtr xmlWriter); @@ -1056,8 +1054,6 @@ void dumpHyperlinkAsAttribute(OUString sHyperlink, xmlTextWriterPtr xmlWriter) OUStringToOString(sHyperlink, RTL_TEXTENCODING_UTF8).getStr()); } -#if 0 // unused now, but will presumably soon be used, avoid compiler warning till then - void dumpInteropGrabBagAsElement(uno::Sequence< beans::PropertyValue> aInteropGrabBag, xmlTextWriterPtr xmlWriter) { xmlTextWriterStartElement(xmlWriter, BAD_CAST( "InteropGrabBag" )); @@ -1069,8 +1065,6 @@ void dumpInteropGrabBagAsElement(uno::Sequence< beans::PropertyValue> aInteropGr xmlTextWriterEndElement( xmlWriter ); } -#endif - // -------------------------------- // ---------- XShape.idl ---------- // -------------------------------- @@ -1745,6 +1739,13 @@ void dumpShapeService(uno::Reference< beans::XPropertySet > xPropSet, xmlTextWri if(anotherAny >>= sHyperlink) dumpHyperlinkAsAttribute(sHyperlink, xmlWriter); } + if(xInfo->hasPropertyByName("InteropGrabBag")) + { + uno::Any anotherAny = xPropSet->getPropertyValue("InteropGrabBag"); + uno::Sequence< beans::PropertyValue> aInteropGrabBag; + if(anotherAny >>= aInteropGrabBag) + dumpInteropGrabBagAsElement(aInteropGrabBag, xmlWriter); + } } void dumpPolyPolygonBezierDescriptorService(uno::Reference< beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter) |