scp2/source/ooo/file_ooo.scp | 6 +++---
svx/source/customshapes/EnhancedCustomShape2d.cxx | 15 +++++++++++++++
2 files changed, 18 insertions(+), 3 deletions(-)
New commits:
commit c45779ce3d1b95abd037d3d4d706aca511dfdc24
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Jun 8 14:59:34 2023 +0200
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Nov 11 16:49:26 2023 +0100
On Linux dictionaries are packaged separately
Change-Id: Iadbd5a1411c3b2c72deb59ba91f86d889a34fdc3
(cherry picked from commit 135a474477d143ffbe877d95ba37c008c509e45f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159312
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index d6e424629536..f5573c3ab872 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -383,7 +383,7 @@ File gid_File_Extension_Dictionary_Da
End
#endif
-#if defined WITH_MYSPELL_DICTS && !defined MPL_SUBSET
+#if defined WITH_MYSPELL_DICTS && (!defined MPL_SUBSET || defined LINUX)
File gid_File_Extension_Dictionary_De
Dir = FILELIST_DIR;
Name = "Dictionary/dict-de.filelist";
@@ -392,7 +392,7 @@ File gid_File_Extension_Dictionary_De
End
#endif
-#if defined WITH_MYSPELL_DICTS && !defined MPL_SUBSET
+#if defined WITH_MYSPELL_DICTS && (!defined MPL_SUBSET || defined LINUX)
File gid_File_Extension_Dictionary_En
Dir = FILELIST_DIR;
Name = "Dictionary/dict-en.filelist";
@@ -536,7 +536,7 @@ File gid_File_Extension_Dictionary_Is
End
#endif
-#if defined WITH_MYSPELL_DICTS && !defined MPL_SUBSET
+#if defined WITH_MYSPELL_DICTS && (!defined MPL_SUBSET || defined LINUX)
File gid_File_Extension_Dictionary_It
Dir = FILELIST_DIR;
Name = "Dictionary/dict-it.filelist";
commit 454d70247fee7e0fc255f2605836b52804eba41f
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Nov 10 21:12:31 2023 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Nov 11 16:49:18 2023 +0100
ofz#63845 Integer-overflow
Change-Id: Ic2396c92b53012642976e75fcfa42cf2737f3092
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159311
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 7d105d63a728..bb99bf2ae40a 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -43,6 +43,7 @@
#include <svx/xbtmpit.hxx>
#include <svx/xhatch.hxx>
#include <svx/sdshitm.hxx>
+#include <unotools/configmgr.hxx>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp>
@@ -703,6 +704,20 @@ void EnhancedCustomShape2d::SetPathSize( sal_Int32 nIndex )
}
else
m_fYRatio = 1.0;
+
+ if (utl::ConfigManager::IsFuzzing())
+ {
+ if (fabs(m_fXScale) > 100000)
+ {
+ SAL_WARN("svx", "unreasonable X Scale of: " << m_fXScale);
+ m_fXScale = 1.0;
+ }
+ if (fabs(m_fYScale) > 100000)
+ {
+ SAL_WARN("svx", "unreasonable Y Scale of: " << m_fYScale);
+ m_fYScale = 1.0;
+ }
+ }
}
EnhancedCustomShape2d::EnhancedCustomShape2d(SdrObjCustomShape&
rSdrObjCustomShape)
