desktop/source/lib/init.cxx | 4 ++--
translations | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit dbc307ef7c2351cd72e60ef46e647c908379db86
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Nov 14 17:34:55 2022 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Nov 14 19:22:04 2022 +0100
gtktiledviewer: Fix getting tiles on Windows
The "CanvasSize + 1" hack was implemented by myself in commit
ebb3a72ba0c4f070c9c254c439147beea8b2d93d (Paint tiles on Windows;
Oct 24 09:01:32 2022 +0200) to workaround a rounding error, where
converting pixels to logic and back resulted in 1 pixel smaller
size (when I worked in Writer). This hack breaks in Calc, because
the size then is 1 pixel larger than expected, failing the assert
below.
This fixes the problem by disabling the map mode, as everywhere
else in such cases.
Change-Id: I37f0f03ae4cb19f2de0e7995064843d17b0c7189
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142714
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f4aeaf2760cf..41f05517082f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3703,8 +3703,8 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
#ifdef _WIN32
// pBuffer was not used there
- tools::Rectangle r(pDevice->PixelToLogic({ Point(0, 0), Size(nCanvasWidth
+ 1, nCanvasHeight + 1) }));
- BitmapEx aBmpEx = pDevice->GetBitmapEx(r.TopLeft(), r.GetSize());
+ pDevice->EnableMapMode(false);
+ BitmapEx aBmpEx = pDevice->GetBitmapEx({ 0, 0 }, { nCanvasWidth,
nCanvasHeight });
Bitmap aBmp = aBmpEx.GetBitmap();
Bitmap aAlpha = aBmpEx.GetAlpha();
Bitmap::ScopedReadAccess sraBmp(aBmp);
commit 9c33b6772022333ca6651a400064154f8705788d
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Mon Nov 14 19:12:44 2022 +0100
Commit: Gerrit Code Review <ger...@gerrit.libreoffice.org>
CommitDate: Mon Nov 14 19:12:44 2022 +0100
Update git submodules
* Update translations from branch 'master'
to 3322d894ee938182ff6d5dec818deadd4fbf9010
- update translations for master
and force-fix errors using pocheck
Change-Id: I7b8d6fb47b4c093ef48a731d629ed5c0d0ac29eb
diff --git a/translations b/translations
index b03d019e0d04..3322d894ee93 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit b03d019e0d04ae68a632bc052fc1ce7801736d7f
+Subproject commit 3322d894ee938182ff6d5dec818deadd4fbf9010
