summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2023-10-31 12:09:56 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2023-10-31 18:09:53 +0100
commit5d0748b0c44649c422980a2b2f5554846c47ac9c (patch)
tree32a4f5b77efbd467cf7fb8f0b84519cc98c76305 /svx
parentd0f521132c43fea1ca18e18d3e31c6d868e4ebd6 (diff)
SdrAttrObj and SdrObject are abstract
so push the CreateObjectSpecificProperties implementation down to the concrete subclasses. Change-Id: If2c9545aada3e9f2c2f2a0140b6d880bdfef111d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158711 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdoattr.cxx5
-rw-r--r--svx/source/svdraw/svdobj.cxx10
-rw-r--r--svx/source/svdraw/svdovirt.cxx6
3 files changed, 11 insertions, 10 deletions
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 2c1b208d314d..ae4f59baa5cf 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -29,11 +29,6 @@
using namespace com::sun::star;
-std::unique_ptr<sdr::properties::BaseProperties> SdrAttrObj::CreateObjectSpecificProperties()
-{
- return std::make_unique<sdr::properties::AttributeProperties>(*this);
-}
-
SdrAttrObj::SdrAttrObj(SdrModel& rSdrModel)
: SdrObject(rSdrModel)
{
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index c5741f5007c1..f4d13219db0d 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -211,11 +211,6 @@ const std::shared_ptr< svx::diagram::IDiagramHelper >& SdrObject::getDiagramHelp
// BaseProperties section
-std::unique_ptr<sdr::properties::BaseProperties> SdrObject::CreateObjectSpecificProperties()
-{
- return std::make_unique<sdr::properties::EmptyProperties>(*this);
-}
-
sdr::properties::BaseProperties& SdrObject::GetProperties() const
{
if(!mpProperties)
@@ -3245,6 +3240,11 @@ public:
return new EmptyObject(rTargetModel, *this);
}
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override
+ {
+ return std::make_unique<sdr::properties::EmptyProperties>(*this);
+ }
+
SdrInventor GetObjInventor() const override
{
return OBJECT_INVENTOR;
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index 25a38804a78b..b1fe6f5cb9bb 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -18,6 +18,7 @@
*/
+#include <sdr/properties/emptyproperties.hxx>
#include <svx/svdovirt.hxx>
#include <svx/svdhdl.hxx>
#include <svx/sdr/contact/viewcontactofvirtobj.hxx>
@@ -31,6 +32,11 @@ sdr::properties::BaseProperties& SdrVirtObj::GetProperties() const
}
+std::unique_ptr<sdr::properties::BaseProperties> SdrVirtObj::CreateObjectSpecificProperties()
+{
+ return std::make_unique<sdr::properties::EmptyProperties>(*this);
+}
+
// #i27224#
std::unique_ptr<sdr::contact::ViewContact> SdrVirtObj::CreateObjectSpecificViewContact()
{