From dbcf188d39ff70ac87312dd28444df97e3cea993 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 1 May 2023 21:10:52 +0200 Subject: [PATCH] remove unnecessary method the call to GetObjectItemSet() in OleProperties::ForceDefaultAttributes() is unnecessary, because it is always called before ForceDefaultAttributes is called, and having removed that, the rest of the method becomes unnecessary too. Change-Id: Ibb09020837d47cb9eb1fb8b5deca1defc1465108 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151237 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svx/inc/sdr/properties/oleproperties.hxx | 4 ---- svx/source/sdr/properties/oleproperties.cxx | 9 --------- 2 files changed, 13 deletions(-) diff --git a/svx/inc/sdr/properties/oleproperties.hxx b/svx/inc/sdr/properties/oleproperties.hxx index abd321ba7cdf..2a35c3ad0ec4 100644 --- a/svx/inc/sdr/properties/oleproperties.hxx +++ b/svx/inc/sdr/properties/oleproperties.hxx @@ -42,10 +42,6 @@ namespace sdr::properties // Clone() operator, normally just calls the local copy constructor virtual std::unique_ptr Clone(SdrObject& rObj) const override; - - // force default attributes for a specific object type, called from - // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes() override; }; } // end of namespace sdr::properties diff --git a/svx/source/sdr/properties/oleproperties.cxx b/svx/source/sdr/properties/oleproperties.cxx index da599428c97b..a0e0e82d37d7 100644 --- a/svx/source/sdr/properties/oleproperties.cxx +++ b/svx/source/sdr/properties/oleproperties.cxx @@ -60,15 +60,6 @@ namespace sdr::properties { return std::unique_ptr(new OleProperties(*this, rObj)); } - - void OleProperties::ForceDefaultAttributes() - { - // call parent - RectangleProperties::ForceDefaultAttributes(); - - // force ItemSet - GetObjectItemSet(); - } } // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */