diff options
author | Armin Le Grand <alg@apache.org> | 2012-10-23 12:46:28 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-12 14:31:10 +0100 |
commit | e717d1dcce7f8906311c5ccdbb2326b61a702630 (patch) | |
tree | 91290db5179fa4b4927af94c0f023f40dcda434c /svx/source/sdr/properties | |
parent | 9e50e5f82927742c56e89258b80bc8cd93bb7e3b (diff) |
Resolves: #i121237# Rework/Cleanup of Region code...
due to missing complete support for B2DPolygon class
(cherry picked from commit cab10eeb7878edf224a004fd7640bd4adf8d3c51)
Conflicts:
cppcanvas/source/mtfrenderer/implrenderer.cxx
svx/source/sdr/overlay/overlaymanagerbuffered.cxx
svx/source/svdraw/svdpntv.cxx
vcl/aqua/source/gdi/salgdi.cxx
vcl/inc/region.h
vcl/inc/unx/gtk/gtkgdi.hxx
vcl/inc/vcl/regband.hxx
vcl/inc/vcl/region.hxx
vcl/os2/source/gdi/salgdi.cxx
vcl/source/gdi/bmpacc3.cxx
vcl/source/gdi/outdev2.cxx
vcl/source/gdi/outmap.cxx
vcl/source/gdi/regband.cxx
vcl/source/gdi/region.cxx
vcl/source/window/window.cxx
vcl/unx/generic/gdi/pspgraphics.cxx
vcl/unx/headless/svpgdi.cxx
vcl/unx/headless/svppspgraphics.cxx
vcl/win/source/gdi/salgdi.cxx
Change-Id: Iee9a66ff431c3cecb7603e445147b67715de0f7d
Remove unused variable to prevent compiler warning
(cherry picked from commit 0ac65ccf079e3e22ac23cbe7ae546504c863c31f)
Change-Id: Icbcaa9d576a7e560d96debc7360bdbe9090b3fd3
Wrong comparison with bool corrected
(cherry picked from commit 612cefdcf6176b6bb847ce899d89af40ef313a90)
Change-Id: I1cf5de6734b588f78d8e870ba7b7860634b461ce
Diffstat (limited to 'svx/source/sdr/properties')
-rw-r--r-- | svx/source/sdr/properties/itemsettools.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index b5f763ab6245..cea89d0e6248 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -21,10 +21,9 @@ #include <tools/debug.hxx> #include <svl/itemset.hxx> #include <svl/whiter.hxx> - -#include <vector> #include <svx/svdogrp.hxx> #include <svx/svditer.hxx> +#include <vcl/region.hxx> ////////////////////////////////////////////////////////////////////////////// // class to remember broadcast start positions @@ -33,9 +32,6 @@ namespace sdr { namespace properties { - // helper vector to remember rectangles - typedef ::std::vector< Rectangle > RectangleVector; - ItemChangeBroadcaster::ItemChangeBroadcaster(const SdrObject& rObj) { if(rObj.ISA(SdrObjGroup)) |