Move mnTransparenceForShadow down to SdrCellPrimitive2D

where it belongs. It appears it was only put into
BufferedDecompositionPrimitive2D so that it can be accessed
by Primitive2DXmlDump, so fix that by creating an extended version
of the dumper for use in svx.

Change-Id: Idb0b849c4fa538bbede882e48c2d090669c2325a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162949
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 7 insertions, 13 deletions

diff --git a/include/drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx b/include/drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx
index cc36ddb93cd5..f4f618029627 100644
--- a/include/drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx
+++ b/include/drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx
@@ -74,10 +74,6 @@ private:
     mutable std::mutex maCallbackLock;
     sal_uInt16 maCallbackSeconds;
 
-    /// When a shadow wraps a list of primitives, this primitive wants to influence the transparency
-    /// of the shadow.
-    sal_uInt16 mnTransparenceForShadow;
-
 protected:
     /** access methods to maBuffered2DDecomposition. The usage of this methods may allow
         later thread-safe stuff to be added if needed. Only to be used by getDecomposition()
@@ -111,13 +107,6 @@ public:
     virtual void
     get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor,
                        const geometry::ViewInformation2D& rViewInformation) const override;
-
-    void setTransparenceForShadow(sal_uInt16 nTransparenceForShadow)
-    {
-        mnTransparenceForShadow = nTransparenceForShadow;
-    }
-
-    sal_uInt16 getTransparenceForShadow() const { return mnTransparenceForShadow; }
 };
 
 } // end of namespace drawinglayer::primitive2d
diff --git a/include/drawinglayer/tools/primitive2dxmldump.hxx b/include/drawinglayer/tools/primitive2dxmldump.hxx
index 9dc06e7b674d..29c432f24680 100644
--- a/include/drawinglayer/tools/primitive2dxmldump.hxx
+++ b/include/drawinglayer/tools/primitive2dxmldump.hxx
@@ -22,15 +22,18 @@ namespace tools { class XmlWriter; }
 namespace drawinglayer
 {
 
-class DRAWINGLAYER_DLLPUBLIC Primitive2dXmlDump final
+class DRAWINGLAYER_DLLPUBLIC Primitive2dXmlDump
 {
 private:
     std::vector<bool> maFilter;
+
+protected:
     void decomposeAndWrite(const drawinglayer::primitive2d::Primitive2DContainer& rPrimitive2DSequence, tools::XmlWriter& rWriter);
+    static OUString idToString(sal_uInt32 nId);
 
 public:
     Primitive2dXmlDump();
-    ~Primitive2dXmlDump();
+    virtual ~Primitive2dXmlDump();
 
     /** Dumps the input primitive sequence to xml into a file or memory stream and parses the xml for testing.
      *
@@ -44,6 +47,8 @@ public:
     /** Dumps the input primitive sequence to xml into a file. */
     void dump(const drawinglayer::primitive2d::Primitive2DContainer& rPrimitive2DSequence, const OUString& rStreamName);
 
+    /** overridden by svx::ExtendedPrimitive2dXmlDump */
+    virtual bool decomposeAndWrite( const drawinglayer::primitive2d::BasePrimitive2D& /*rPrimitive2DSequence*/, ::tools::XmlWriter& /*rWriter*/) { return false; }
 };
 
 }