Added dumping [property] FillBitmapName and [property] FillBitmap

Change-Id: I86808c35463abf849f187b47dbe15c16a74d68a3

2 files changed, 53 insertions, 19 deletions

diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
index 3fe2067d1839..12b912733bd5 100644
--- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
+++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/drawing/Hatch.hpp>
+#include <com/sun/star/awt/XBitmap.hpp>
 
 #ifndef ChartViewDumper_hxx
 #define ChartViewDumper_hxx
@@ -48,14 +49,16 @@ private:
     void dumpFillStyleAsAttribute(com::sun::star::drawing::FillStyle eFillStyle, xmlTextWriterPtr xmlWriter);
     void dumpFillColorAsAttribute(sal_Int32 aColor, xmlTextWriterPtr xmlWriter);
     void dumpFillTransparenceAsAttribute(sal_Int32 aTransparence, xmlTextWriterPtr xmlWriter);
-    void dumpFillTransparenceGradientNameAsAttribute(rtl::OUString aTranspGradName, xmlTextWriterPtr xmlWriter);
+    void dumpFillTransparenceGradientNameAsAttribute(rtl::OUString sTranspGradName, xmlTextWriterPtr xmlWriter);
     void dumpGradientProperty(com::sun::star::awt::Gradient aGradient, xmlTextWriterPtr xmlWriter);
     void dumpFillTransparenceGradientAsElement(com::sun::star::awt::Gradient aTranspGrad, xmlTextWriterPtr xmlWriter);
-    void dumpFillGradientNameAsAttribute(rtl::OUString aGradName, xmlTextWriterPtr xmlWriter);
+    void dumpFillGradientNameAsAttribute(rtl::OUString sGradName, xmlTextWriterPtr xmlWriter);
     void dumpFillGradientAsElement(com::sun::star::awt::Gradient aGradient, xmlTextWriterPtr xmlWriter);
-    void dumpFillHatchNameAsAttribute(rtl::OUString aHatchName, xmlTextWriterPtr xmlWriter);
+    void dumpFillHatchNameAsAttribute(rtl::OUString sHatchName, xmlTextWriterPtr xmlWriter);
     void dumpFillHatchAsElement(com::sun::star::drawing::Hatch aHatch, xmlTextWriterPtr xmlWriter);
     void dumpFillBackgroundAsAttribute(sal_Bool aBackground, xmlTextWriterPtr xmlWriter);
+    void dumpFillBitmapNameAsAttribute(rtl::OUString sBitmapName, xmlTextWriterPtr xmlWriter);
+    void dumpFillBitmapAsElement(com::sun::star::uno::Reference<com::sun::star::awt::XBitmap> xBitmap, xmlTextWriterPtr xmlWriter);
 
     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 d9b2acaeda33..34f059a318c8 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -96,10 +96,10 @@ namespace {
         xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fillTransparence"), "%" SAL_PRIdINT32, aTransparence);
     }
 
-    void XShapeDumper::dumpFillTransparenceGradientNameAsAttribute(rtl::OUString aTranspGradName, xmlTextWriterPtr xmlWriter)
+    void XShapeDumper::dumpFillTransparenceGradientNameAsAttribute(rtl::OUString sTranspGradName, xmlTextWriterPtr xmlWriter)
     {
         xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fillTransparenceGradientName"), "%s",
-            rtl::OUStringToOString(aTranspGradName, RTL_TEXTENCODING_UTF8).getStr());
+            rtl::OUStringToOString(sTranspGradName, RTL_TEXTENCODING_UTF8).getStr());
     }
 
     //because there's more awt::Gradient properties to dump
@@ -146,10 +146,10 @@ namespace {
         xmlTextWriterEndElement( xmlWriter );
     }
 
-    void XShapeDumper::dumpFillGradientNameAsAttribute(rtl::OUString aGradName, xmlTextWriterPtr xmlWriter)
+    void XShapeDumper::dumpFillGradientNameAsAttribute(rtl::OUString sGradName, xmlTextWriterPtr xmlWriter)
     {
         xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fillGradientName"), "%s",
-            rtl::OUStringToOString(aGradName, RTL_TEXTENCODING_UTF8).getStr());
+            rtl::OUStringToOString(sGradName, RTL_TEXTENCODING_UTF8).getStr());
     }
 
     void XShapeDumper::dumpFillGradientAsElement(awt::Gradient aGradient, xmlTextWriterPtr xmlWriter)
@@ -159,10 +159,10 @@ namespace {
         xmlTextWriterEndElement( xmlWriter );
     }
 
-    void XShapeDumper::dumpFillHatchNameAsAttribute(rtl::OUString aHatchName, xmlTextWriterPtr xmlWriter)
+    void XShapeDumper::dumpFillHatchNameAsAttribute(rtl::OUString sHatchName, xmlTextWriterPtr xmlWriter)
     {
         xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fillHatchName"), "%s",
-            rtl::OUStringToOString(aHatchName, RTL_TEXTENCODING_UTF8).getStr());
+            rtl::OUStringToOString(sHatchName, RTL_TEXTENCODING_UTF8).getStr());
     }
 
     void XShapeDumper::dumpFillHatchAsElement(drawing::Hatch aHatch, xmlTextWriterPtr xmlWriter)
@@ -196,6 +196,24 @@ namespace {
             xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("fillBackground"), "%s", "false");
     }
 
+    void XShapeDumper::dumpFillBitmapNameAsAttribute(rtl::OUString sBitmapName, xmlTextWriterPtr xmlWriter)
+    {
+        xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fillGradientName"), "%s",
+            rtl::OUStringToOString(sBitmapName, RTL_TEXTENCODING_UTF8).getStr());
+    }
+
+    void XShapeDumper::dumpFillBitmapAsElement(uno::Reference<awt::XBitmap> xBitmap, xmlTextWriterPtr xmlWriter)
+    {
+        xmlTextWriterStartElement(xmlWriter, BAD_CAST( "FillBitmap" ));
+        if (xBitmap.is())
+        {
+            awt::Size const aSize = xBitmap->getSize();
+            xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("width"), "%" SAL_PRIdINT32, aSize.Width);
+            xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("height"), "%" SAL_PRIdINT32, aSize.Height);
+        }
+        xmlTextWriterEndElement( xmlWriter );
+    }
+
     void XShapeDumper::dumpPositionAsAttribute(const awt::Point& rPoint, xmlTextWriterPtr xmlWriter)
     {
         xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("positionX"), "%" SAL_PRIdINT32, rPoint.X);
@@ -210,7 +228,8 @@ namespace {
 
     void XShapeDumper::dumpShapeDescriptorAsAttribute( uno::Reference< drawing::XShapeDescriptor > xDescr, xmlTextWriterPtr xmlWriter )
     {
-        xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("type"), "%s", rtl::OUStringToOString(xDescr->getShapeType(), RTL_TEXTENCODING_UTF8).getStr());
+        xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("type"), "%s",
+            rtl::OUStringToOString(xDescr->getShapeType(), RTL_TEXTENCODING_UTF8).getStr());
     }
 
     void XShapeDumper::dumpXShape(uno::Reference< drawing::XShape > xShape, xmlTextWriterPtr xmlWriter)
@@ -270,9 +289,9 @@ namespace {
             }
             {
                 uno::Any anotherAny = xPropSet->getPropertyValue("FillTransparenceGradientName");
-                rtl::OUString aTranspGradName;
-                if(anotherAny >>= aTranspGradName)
-                    dumpFillTransparenceGradientNameAsAttribute(aTranspGradName, xmlWriter);
+                rtl::OUString sTranspGradName;
+                if(anotherAny >>= sTranspGradName)
+                    dumpFillTransparenceGradientNameAsAttribute(sTranspGradName, xmlWriter);
             }
             {
                 uno::Any anotherAny = xPropSet->getPropertyValue("FillTransparenceGradient");
@@ -282,9 +301,9 @@ namespace {
             }
             {
                 uno::Any anotherAny = xPropSet->getPropertyValue("FillGradientName");
-                rtl::OUString aGradName;
-                if(anotherAny >>= aGradName)
-                    dumpFillGradientNameAsAttribute(aGradName, xmlWriter);
+                rtl::OUString sGradName;
+                if(anotherAny >>= sGradName)
+                    dumpFillGradientNameAsAttribute(sGradName, xmlWriter);
             }
             {
                 uno::Any anotherAny = xPropSet->getPropertyValue("FillGradient");
@@ -294,9 +313,9 @@ namespace {
             }
             {
                 uno::Any anotherAny = xPropSet->getPropertyValue("FillHatchName");
-                rtl::OUString aHatchName;
-                if(anotherAny >>= aHatchName)
-                    dumpFillGradientNameAsAttribute(aHatchName, xmlWriter);
+                rtl::OUString sHatchName;
+                if(anotherAny >>= sHatchName)
+                    dumpFillGradientNameAsAttribute(sHatchName, xmlWriter);
             }
             {
                 uno::Any anotherAny = xPropSet->getPropertyValue("FillHatch");
@@ -310,6 +329,18 @@ namespace {
                 if(anotherAny >>= bFillBackground)
                     dumpFillBackgroundAsAttribute(bFillBackground, xmlWriter);
             }
+            {
+                uno::Any anotherAny = xPropSet->getPropertyValue("FillBitmapName");
+                rtl::OUString sBitmapName;
+                if(anotherAny >>= sBitmapName)
+                    dumpFillGradientNameAsAttribute(sBitmapName, xmlWriter);
+            }
+            {
+                uno::Any anotherAny = xPropSet->getPropertyValue("FillBitmap");
+                uno::Reference<awt::XBitmap> xBitmap(xShape, uno::UNO_QUERY);
+                if(anotherAny >>= xBitmap)
+                    dumpFillBitmapAsElement(xBitmap, xmlWriter);
+            }
         }
 
         #if DEBUG_DUMPER