svx/source/sdr/properties/captionproperties.cxx | 3 ---
svx/source/sdr/properties/circleproperties.cxx | 3 ---
svx/source/sdr/properties/graphicproperties.cxx | 3 ---
svx/source/sdr/properties/measureproperties.cxx | 3 ---
svx/source/sdr/properties/textproperties.cxx | 3 ---
svx/source/table/cell.cxx | 1 +
6 files changed, 1 insertion(+), 15 deletions(-)
New commits:
commit 4b1acf7d1a0a2515a5f781b702c22c6233caecc8
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Oct 31 15:28:30 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 31 20:20:52 2023 +0100
no need to call GetObjectItemSet inside ForceDefaultAttributes
ForceDefaultAttributes is only called after an itemset has been created
Change-Id: I0ef8df039ed7a238b673c3770ee884a58dd62772
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158735
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/svx/source/sdr/properties/captionproperties.cxx
b/svx/source/sdr/properties/captionproperties.cxx
index 31bb62268521..3de1da6d65b9 100644
--- a/svx/source/sdr/properties/captionproperties.cxx
+++ b/svx/source/sdr/properties/captionproperties.cxx
@@ -89,9 +89,6 @@ namespace sdr::properties
// call parent
RectangleProperties::ForceDefaultAttributes();
- // force ItemSet
- GetObjectItemSet();
-
// this was set by TextProperties::ForceDefaultAttributes(),
// reset to default
if
(static_cast<SdrCaptionObj&>(GetSdrObject()).GetSpecialTextBoxShadow())
diff --git a/svx/source/sdr/properties/circleproperties.cxx
b/svx/source/sdr/properties/circleproperties.cxx
index 6f589f67548f..643c297eb043 100644
--- a/svx/source/sdr/properties/circleproperties.cxx
+++ b/svx/source/sdr/properties/circleproperties.cxx
@@ -98,9 +98,6 @@ namespace sdr::properties
if(eKind != SdrCircKind::Full)
{
- // force ItemSet
- GetObjectItemSet();
-
moItemSet->Put(SdrCircKindItem(eKind));
if(rObj.GetStartAngle())
diff --git a/svx/source/sdr/properties/graphicproperties.cxx
b/svx/source/sdr/properties/graphicproperties.cxx
index 3346c5d80048..a43ee5bd9fbb 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -132,9 +132,6 @@ namespace sdr::properties
// call parent
RectangleProperties::ForceDefaultAttributes();
- // force ItemSet
- GetObjectItemSet();
-
moItemSet->Put( SdrGrafLuminanceItem( 0 ) );
moItemSet->Put( SdrGrafContrastItem( 0 ) );
moItemSet->Put( SdrGrafRedItem( 0 ) );
diff --git a/svx/source/sdr/properties/measureproperties.cxx
b/svx/source/sdr/properties/measureproperties.cxx
index 44cdae798899..a6f4b7fd7c81 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -105,9 +105,6 @@ namespace sdr::properties
// call parent
TextProperties::ForceDefaultAttributes();
- // force ItemSet
- GetObjectItemSet();
-
//#71958# by default, the show units Bool-Item is set as hard
// attribute to sal_True to avoid confusion when copying
SdrMeasureObj's
// from one application to another
diff --git a/svx/source/sdr/properties/textproperties.cxx
b/svx/source/sdr/properties/textproperties.cxx
index b2bb7b746ab9..55b366bdc03b 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -374,9 +374,6 @@ namespace sdr::properties
bool bTextFrame(rObj.IsTextFrame());
- // force ItemSet
- GetObjectItemSet();
-
if(bTextFrame)
{
moItemSet->Put(XLineStyleItem(drawing::LineStyle_NONE));
commit ba85e9f54809dd2c7eb817ead90f9fac0add6e06
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Oct 31 15:08:44 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 31 20:20:43 2023 +0100
add comment to CellProperties::ForceDefaultAttributes
Change-Id: Iea65e06b886d47ea18fa1dc81a6df0cd8b995776
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158734
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 98e46842e414..c617129f3fd2 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -181,6 +181,7 @@ SdrText* CellTextProvider::getText(sal_Int32 nIndex) const
void CellProperties::ForceDefaultAttributes()
{
+ // deliberately do not run superclass ForceDefaultAttributes, we
don't want any default attributes
}
void CellProperties::ItemSetChanged(std::span< const SfxPoolItem*
const > aChangedItems, sal_uInt16 nDeletedWhich)
