diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-02-25 21:48:33 +0000 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-02-26 12:15:58 +0000 |
| commit | 37b7289a84b0cc0f84e099129135556d89b953fc (patch) | |
| tree | 51746ec6a69d92aeba5d602abe6ba9426d47780f | |
| parent | c60860b966aba025d7e88422b172faefd007a945 (diff) | |
fdo#45879 - fix selected gluepoint rendering.
Store the glue-point bitmap at a unique index in maRealMarkers for re-use.
(cherry picked from commit 8d34984116c0841748ae47afa667877dc1b5a444)
Change-Id: I2cd5b240619502dfc8634eca331f4163e5bd5ca8
Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
Reviewed-on: https://gerrit.libreoffice.org/2424
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Reviewed-by: Jan Holesovsky <kendy@suse.cz>
Tested-by: Jan Holesovsky <kendy@suse.cz>
| -rw-r--r-- | 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 020bb6a30c8b..9edebc2c45a5 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))); } } } |