You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/02/28 13:58:40 UTC
[openoffice] 02/02: Elements on cropmarker share borders. Separate them from each other.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 8b6ef4e4a3fed5ceee14b60f8ad68ab42dcf8a6c
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Feb 21 16:38:18 2023 +0100
Elements on cropmarker share borders. Separate them from each other.
(cherry picked from commit 062a78fddc867c36b9b38674f01893e3600cd6d3)
---
main/default_images/svx/res/cropmarkers.png | Bin 968 -> 645 bytes
main/default_images/svx/res/cropmarkers2.png | Bin 1205 -> 864 bytes
main/default_images/svx/res/cropmarkersACC.png | Bin 1013 -> 688 bytes
main/svx/source/svdraw/svdhdl.cxx | 6 +++---
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/main/default_images/svx/res/cropmarkers.png b/main/default_images/svx/res/cropmarkers.png
index 3048e01921..c59af51a2e 100644
Binary files a/main/default_images/svx/res/cropmarkers.png and b/main/default_images/svx/res/cropmarkers.png differ
diff --git a/main/default_images/svx/res/cropmarkers2.png b/main/default_images/svx/res/cropmarkers2.png
index c0f37ef800..9d5ed79108 100644
Binary files a/main/default_images/svx/res/cropmarkers2.png and b/main/default_images/svx/res/cropmarkers2.png differ
diff --git a/main/default_images/svx/res/cropmarkersACC.png b/main/default_images/svx/res/cropmarkersACC.png
index 27ccf021ff..6cd7c28646 100644
Binary files a/main/default_images/svx/res/cropmarkersACC.png and b/main/default_images/svx/res/cropmarkersACC.png differ
diff --git a/main/svx/source/svdraw/svdhdl.cxx b/main/svx/source/svdraw/svdhdl.cxx
index 8c85d1e63e..cc04db7923 100644
--- a/main/svx/source/svdraw/svdhdl.cxx
+++ b/main/svx/source/svdraw/svdhdl.cxx
@@ -2348,12 +2348,12 @@ BitmapEx SdrCropHdl::GetBitmapForHandle( const BitmapEx& rBitmap, int nSize )
else if( nSize <=4 )
{
nPixelSize = 17;
- nOffset = 36;
+ nOffset = 39;
}
else
{
nPixelSize = 21;
- nOffset = 84;
+ nOffset = 90;
}
switch( eKind )
@@ -2369,7 +2369,7 @@ BitmapEx SdrCropHdl::GetBitmapForHandle( const BitmapEx& rBitmap, int nSize )
default: break;
}
- Rectangle aSourceRect( Point( nX * (nPixelSize-1) + nOffset, nY * (nPixelSize-1)), Size(nPixelSize, nPixelSize) );
+ Rectangle aSourceRect( Point( nX * (nPixelSize) + nOffset, nY * (nPixelSize)), Size(nPixelSize, nPixelSize) );
BitmapEx aRetval(rBitmap);
aRetval.Crop(aSourceRect);