[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/source

[Michael Meeks]

 svx/source/svdraw/svdhdl.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 9a4cef83c386199f740c85350da2bb53a7b3aa96
Author: Michael Meeks <michael.me...@suse.com>
Date:   Mon Feb 25 21:48:33 2013 +0000

    fdo#45879 - fix selected gluepoint rendering.
    
    Store the glue-point bitmap at a unique index in maRealMarkers for re-use.
    
    Change-Id: I2cd5b240619502dfc8634eca331f4163e5bd5ca8
    (cherry picked from commit 8d34984116c0841748ae47afa667877dc1b5a444)
    
    Signed-off-by: Thorsten Behrens <tbehr...@suse.com>

diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 020bb6a..9edebc2 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -87,11 +87,11 @@ public:
 
////////////////////////////////////////////////////////////////////////////////////////////////////
 #define KIND_COUNT          (14)
 #define INDEX_COUNT         (6)
-#define INDIVIDUAL_COUNT    (4)
+#define INDIVIDUAL_COUNT    (5)
 
 SdrHdlBitmapSet::SdrHdlBitmapSet(sal_uInt16 nResId)
     :   maMarkersBitmap(ResId(nResId, *ImpGetResMgr())),
-    // 14 kinds (BitmapMarkerKind) use index [0..5], 4 extra
+        // 15 kinds (BitmapMarkerKind) use index [0..5] + 5 extra
         maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT)
 {
 }
@@ -237,20 +237,20 @@ const BitmapEx& 
SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
 
         case Glue_Deselected:
         {
-            return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 1, 
Rectangle(Point(15, 67), Size(9, 9)));
+            return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 2, 
Rectangle(Point(15, 67), Size(9, 9)));
         }
 
         case Anchor: // AnchorTR for SW
         case AnchorTR:
         {
-            return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 2, 
Rectangle(Point(24, 67), Size(24, 24)));
+            return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 3, 
Rectangle(Point(24, 67), Size(24, 24)));
         }
 
         // add AnchorPressed to be able to animate anchor control
         case AnchorPressed:
         case AnchorPressedTR:
         {
-            return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 3, 
Rectangle(Point(48, 67), Size(24, 24)));
+            return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 4, 
Rectangle(Point(48, 67), Size(24, 24)));
         }
     }
 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits