svx/source/sdr/properties/customshapeproperties.cxx | 3 ++-
svx/source/sdr/properties/graphicproperties.cxx | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 3d49e8bfa6173cab17b8b46ad36cbfa567e0617a
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Jul 13 15:39:17 2021 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Jul 13 19:37:45 2021 +0200
Split the which id ranges merged in c4f615b359be56e88e4fbf9aaaf30affb29d57e2
... after specifying adjacent ranges became possible in commit
d8bb5bb58ef62bc0e32d17f00f5fe695c81b5606. This allows to have
the used ranges expressed explicitly, and makes it safe in case
when new which ids potentially added between SDRATTR_SOFTEDGE_LAST
and SDRATTR_TEXTCOLUMNS_FIRST.
Change-Id: I94b75bc89e4cf2b490ffc55f692d4ebb593681a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118848
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/svx/source/sdr/properties/customshapeproperties.cxx
b/svx/source/sdr/properties/customshapeproperties.cxx
index a621e3d84e71..771c76183280 100644
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
@@ -71,7 +71,8 @@ namespace sdr::properties
// Graphic attributes, 3D properties, CustomShape
// properties:
SDRATTR_GRAF_FIRST, SDRATTR_CUSTOMSHAPE_LAST,
- SDRATTR_GLOW_FIRST, SDRATTR_TEXTCOLUMNS_LAST,
+ SDRATTR_GLOW_FIRST, SDRATTR_SOFTEDGE_LAST,
+ SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST,
// Range from SdrTextObj:
EE_ITEMS_START, EE_ITEMS_END>{});
}
diff --git a/svx/source/sdr/properties/graphicproperties.cxx
b/svx/source/sdr/properties/graphicproperties.cxx
index c7a9b6913ad0..78ca9a83bd23 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -67,7 +67,8 @@ namespace sdr::properties
// range from SdrGrafObj
SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST,
- SDRATTR_GLOW_FIRST, SDRATTR_TEXTCOLUMNS_LAST,
+ SDRATTR_GLOW_FIRST, SDRATTR_SOFTEDGE_LAST,
+ SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST,
// range from SdrTextObj
EE_ITEMS_START, EE_ITEMS_END>{});
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
