Hi guys,
A really silly snafu - storing two different image at the same index,
thus breaking selected gluepoint rendering; I'd love to get it into
4.0.1 tomorrow if we can field the reviews - works nicely now.
HTH,
Michael.
>From fb0552439b81aff4bf495e68928b5f23b4460330 Mon Sep 17 00:00:00 2001
From: Michael Meeks <[email protected]>
Date: Mon, 25 Feb 2013 21:48:33 +0000
Subject: [PATCH] fdo#45879 - fix selected gluepoint rendering.
Store the glue-point bitmap at a unique index in maRealMarkers for re-use.
Change-Id: I2cd5b240619502dfc8634eca331f4163e5bd5ca8
---
svx/source/svdraw/svdhdl.cxx | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 1ed280f..02d9412 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)));
}
}
}
--
1.7.7
--
[email protected] <><, Pseudo Engineer, itinerant idiot
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
