sw/CppunitTest_sw_core_layout.mk | 1 + vcl/source/gdi/TypeSerializer.cxx | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)
New commits: commit bd6dad1bbc8a0707202fe67ce9db502692f7098e Author: Stephan Bergmann <[email protected]> AuthorDate: Thu Mar 2 13:49:24 2023 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Thu Mar 2 16:53:23 2023 +0000 Missing test dependency > warn:vcl.builder:3976130:3976130:vcl/source/window/builder.cxx:480: DBG_UNHANDLED_EXCEPTION in VclBuilder > when: Unable to read .ui file exception: com.sun.star.container.NoSuchElementException message: "file:///.../instdir/share/config/soffice.cfg/sfx/ui/tabbar.ui at /home/sbergman/lo/core/xmlreader/source/xmlreader.cxx:67" > warn:sfx.view:3976130:3976130:sfx2/source/view/frmload.cxx:495: DBG_UNHANDLED_EXCEPTION in impl_handleCaughtError_nothrow exception: com.sun.star.container.NoSuchElementException message: "file:///.../instdir/share/config/soffice.cfg/sfx/ui/tabbar.ui at xmlreader/source/xmlreader.cxx:67" Change-Id: Ie46f6c39f5d6cc4942d71c61bb5349ffe8f6a695 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148121 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/sw/CppunitTest_sw_core_layout.mk b/sw/CppunitTest_sw_core_layout.mk index 1a7aeb649887..ed891deb4b68 100644 --- a/sw/CppunitTest_sw_core_layout.mk +++ b/sw/CppunitTest_sw_core_layout.mk @@ -70,6 +70,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_core_layout)) $(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_layout, \ modules/swriter \ + sfx \ svt \ svx \ )) commit e61d12f815f825fef24f0260ccfcaa9248ccbd89 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Mar 2 15:29:33 2023 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Mar 2 16:53:11 2023 +0000 drop TooLargeScaleForMapMode import check revert this part of: commit 32dc2d14287a4210589c33dbd62c6e36e095aa6e Author: Caolán McNamara <[email protected]> Date: Fri Mar 18 19:50:12 2022 +0000 ofz#45583 detect some invalid scale cases at import time Change-Id: Ib80eda465d5b9d975a5b30974241d9f824c6741d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148130 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/vcl/source/gdi/TypeSerializer.cxx b/vcl/source/gdi/TypeSerializer.cxx index cad183128570..0c7b68b8eb1b 100644 --- a/vcl/source/gdi/TypeSerializer.cxx +++ b/vcl/source/gdi/TypeSerializer.cxx @@ -440,8 +440,6 @@ static bool UselessScaleForMapMode(const Fraction& rScale) { if (!rScale.IsValid()) return true; - if (TooLargeScaleForMapMode(rScale, 96)) - return true; if (static_cast<double>(rScale) < 0.0) return true; return false;
