svx/source/svdraw/svdedxv.cxx | 37 +++++++++++++++++++++++++++----------
1 file changed, 27 insertions(+), 10 deletions(-)
New commits:
commit d3e51bce28a759916e9a3988172ba02b1db66641
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Jun 14 16:01:09 2021 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Jun 14 17:37:38 2021 +0200
global-buffer-overflow
...down in svl::detail::CountRanges during e.g.
CppunitTest_sd_tiledrendering,
after 8aaa28ed43978a9a4a20d62368410a57ec05c23f "Assert on valid order of
which
ids in ranges on SfxItemSet creation" and
90cb57eb53e28ecb983001bf8f018577abb6d145 "Workaround internal compiler
error on
tb77"
Change-Id: I8ff49384a86676a97ec876ef08426b978e39f6d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117168
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index c83ae8b1746c..be08b46b1f2e 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2628,16 +2628,33 @@ bool
SdrObjEditView::SupportsFormatPaintbrush(SdrInventor nObjectInventor,
static const sal_uInt16* GetFormatRangeImpl(bool bTextOnly)
{
- static const sal_uInt16 gFull[]
- = { XATTR_LINE_FIRST, XATTR_LINE_LAST, XATTR_FILL_FIRST,
- XATTRSET_FILL, SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST,
- SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, // table cell formats
- SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST, SDRATTR_TABLE_FIRST,
- SDRATTR_TABLE_LAST, EE_PARA_START, EE_PARA_END,
- EE_CHAR_START, EE_CHAR_END };
-
- static const sal_uInt16 gTextOnly[] = { SDRATTR_MISC_FIRST,
SDRATTR_MISC_LAST, EE_PARA_START,
- EE_PARA_END, EE_CHAR_START,
EE_CHAR_END };
+ static const sal_uInt16 gFull[] = { XATTR_LINE_FIRST,
+ XATTR_LINE_LAST,
+ XATTR_FILL_FIRST,
+ XATTRSET_FILL,
+ SDRATTR_SHADOW_FIRST,
+ SDRATTR_SHADOW_LAST,
+ SDRATTR_MISC_FIRST,
+ SDRATTR_MISC_LAST, // table cell
formats
+ SDRATTR_GRAF_FIRST,
+ SDRATTR_GRAF_LAST,
+ SDRATTR_TABLE_FIRST,
+ SDRATTR_TABLE_LAST,
+ EE_PARA_START,
+ EE_PARA_END,
+ EE_CHAR_START,
+ EE_CHAR_END,
+ 0,
+ 0 };
+
+ static const sal_uInt16 gTextOnly[] = { SDRATTR_MISC_FIRST,
+ SDRATTR_MISC_LAST,
+ EE_PARA_START,
+ EE_PARA_END,
+ EE_CHAR_START,
+ EE_CHAR_END,
+ 0,
+ 0 };
return bTextOnly ? gTextOnly : gFull;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
