[Libreoffice-commits] core.git: svx/inc svx/source

[Noel Grandin (via logerrit)]

 svx/inc/sdr/properties/attributeproperties.hxx    |    2 +-
 svx/source/sdr/properties/attributeproperties.cxx |   16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 3d33912707a621b04467eb56823e26b4b0db01ae
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Nov 1 09:51:35 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Nov 1 14:32:58 2023 +0100

    AttributeProperties is effectively abstract
    
    so remove the unused code and assert there, just to make sure
    
    Change-Id: I31771e5c210b087775d59804874456cece9509cb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158746
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/svx/inc/sdr/properties/attributeproperties.hxx 
b/svx/inc/sdr/properties/attributeproperties.hxx
index fa193aeec28e..bdaf48822b0b 100644
--- a/svx/inc/sdr/properties/attributeproperties.hxx
+++ b/svx/inc/sdr/properties/attributeproperties.hxx
@@ -51,13 +51,13 @@ namespace sdr::properties
             // apply the correct SfyStyleSheet from SdrObject's SdrModel
             virtual void applyDefaultStyleSheetFromSdrModel();
 
-        public:
             // basic constructor
             explicit AttributeProperties(SdrObject& rObj);
 
             // constructor for copying, but using new object
             AttributeProperties(const AttributeProperties& rProps, SdrObject& 
rObj);
 
+        public:
             // Clone() operator, normally just calls the local copy constructor
             virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) 
const override;
 
diff --git a/svx/source/sdr/properties/attributeproperties.cxx 
b/svx/source/sdr/properties/attributeproperties.cxx
index 3fc050f825f9..56ce36b9d095 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -122,15 +122,10 @@ namespace sdr::properties
         }
 
         // create a new itemset
-        SfxItemSet 
AttributeProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
+        SfxItemSet 
AttributeProperties::CreateObjectSpecificItemSet(SfxItemPool&)
         {
-            return SfxItemSet(rPool,
-
-                // ranges from SdrAttrObj
-                svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST,
-                SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST,
-                SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION,
-                SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST>);
+            assert(false && "this class is effectively abstract, should only 
be instantiating subclasses");
+            abort();
         }
 
         AttributeProperties::AttributeProperties(SdrObject& rObj)
@@ -224,9 +219,10 @@ namespace sdr::properties
             ImpRemoveStyleSheet();
         }
 
-        std::unique_ptr<BaseProperties> AttributeProperties::Clone(SdrObject& 
rObj) const
+        std::unique_ptr<BaseProperties> AttributeProperties::Clone(SdrObject&) 
const
         {
-            return std::unique_ptr<BaseProperties>(new 
AttributeProperties(*this, rObj));
+            assert(false && "this class is effectively abstract, should only 
be instantiating subclasses");
+            abort();
         }
 
         const SfxItemSet& AttributeProperties::GetObjectItemSet() const