aw079: #i99147# attribute rework and others

1 files changed, 26 insertions, 16 deletions

diff --git a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
index 376e1d626927..04d1a9298eb5 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
@@ -36,18 +36,22 @@
 #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX
 #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX
 
-#include <vcl/bitmapex.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/vector/b2dvector.hxx>
+#include <sal/types.h>
 
 //////////////////////////////////////////////////////////////////////////////
 // predefines
 
+class BitmapEx;
+
 namespace basegfx {
-    class B2DRange;
-    class BColor;
+    class B2DPoint;
+    class B2DVector;
 }
 
+namespace drawinglayer { namespace attribute {
+    class ImpFillBitmapAttribute;
+}}
+
 //////////////////////////////////////////////////////////////////////////////
 
 namespace drawinglayer
@@ -56,26 +60,32 @@ namespace drawinglayer
     {
         class FillBitmapAttribute
         {
-            BitmapEx                                    maBitmapEx;
-            basegfx::B2DPoint                           maTopLeft;
-            basegfx::B2DVector                          maSize;
-
-            // bitfield
-            unsigned                                    mbTiling : 1;
+        private:
+            ImpFillBitmapAttribute*             mpFillBitmapAttribute;
 
         public:
+            /// constructors/assignmentoperator/destructor
             FillBitmapAttribute(
                 const BitmapEx& rBitmapEx,
                 const basegfx::B2DPoint& rTopLeft,
                 const basegfx::B2DVector& rSize,
                 bool bTiling);
+            FillBitmapAttribute();
+            FillBitmapAttribute(const FillBitmapAttribute& rCandidate);
+            FillBitmapAttribute& operator=(const FillBitmapAttribute& rCandidate);
+            ~FillBitmapAttribute();
+
+            // checks if the incarnation is default constructed
+            bool isDefault() const;
+
+            // compare operator
             bool operator==(const FillBitmapAttribute& rCandidate) const;
 
-            // data access
-            const BitmapEx& getBitmapEx() const { return maBitmapEx; }
-            const basegfx::B2DPoint& getTopLeft() const { return maTopLeft; }
-            const basegfx::B2DVector& getSize() const { return maSize; }
-            bool getTiling() const { return mbTiling; }
+            // data read access
+            const BitmapEx& getBitmapEx() const;
+            const basegfx::B2DPoint& getTopLeft() const;
+            const basegfx::B2DVector& getSize() const;
+            bool getTiling() const;
         };
     } // end of namespace attribute
 } // end of namespace drawinglayer