Simplify sdr::properties::ItemChangeBroadcaster

Change-Id: Ie731294b6490165cf208335e7ec404a35f8a6a95

1 files changed, 8 insertions, 10 deletions

diff --git a/svx/inc/sdr/properties/itemsettools.hxx b/svx/inc/sdr/properties/itemsettools.hxx
index c9cb93261ad0..4559f8f2e3c8 100644
--- a/svx/inc/sdr/properties/itemsettools.hxx
+++ b/svx/inc/sdr/properties/itemsettools.hxx
@@ -21,11 +21,11 @@
 #define INCLUDED_SVX_INC_SDR_PROPERTIES_ITEMSETTOOLS_HXX
 
 #include <sal/types.h>
-#include <vcl/region.hxx>
+#include <tools/gen.hxx>
+#include <vector>
 
 class SdrObject;
 class SfxItemSet;
-namespace tools { class Rectangle; }
 class Fraction;
 
 // class to remember broadcast start positions
@@ -35,21 +35,19 @@ namespace sdr
     {
         class ItemChangeBroadcaster
         {
-            bool                                            mbSingleRect;
-            union {
-                RectangleVector*                            mpRectangleVector;
-                tools::Rectangle*                           mpRectangle;
-            };
+            std::vector< tools::Rectangle > maRectangles;
 
         public:
             explicit ItemChangeBroadcaster(const SdrObject& rObj);
-            ~ItemChangeBroadcaster();
 
             sal_uInt32 GetRectangleCount() const
             {
-                return mbSingleRect ? 1 : mpRectangleVector->size();
+                return maRectangles.size();
+            }
+            const tools::Rectangle& GetRectangle(sal_uInt32 nIndex) const
+            {
+                return maRectangles[nIndex];
             }
-            const tools::Rectangle& GetRectangle(sal_uInt32 nIndex) const;
         };
     } // end of namespace properties
 } // end of namespace sdr