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

[Jochen Nitschke]

 sd/inc/sdattr.hrc             |    7 +++----
 sd/source/ui/app/optsitem.cxx |   24 ------------------------
 sd/source/ui/app/sdmod2.cxx   |    3 ---
 sd/source/ui/inc/optsitem.hxx |   13 -------------
 4 files changed, 3 insertions(+), 44 deletions(-)

New commits:
commit fabafcfc1861646c7e39810d262777010200dbd1
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Mon Aug 21 08:48:43 2017 +0200

    drop unused SdOptionsContentsItem
    
    unused since commit e933538779d29a472c92252f14660c245aa8622e
    Date:   Mon Nov 26 13:34:57 2007 +0000
        INTEGRATION: CWS aw053 (1.23.124); FILE MERGED
    
    Change-Id: I67db5558e0a125273c4d5647329e9cecf70cf581
    Reviewed-on: https://gerrit.libreoffice.org/41380
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc
index dc1131a43f40..8c7629460a4c 100644
--- a/sd/inc/sdattr.hrc
+++ b/sd/inc/sdattr.hrc
@@ -94,10 +94,9 @@
 
 #define ATTR_OPTIONS_START              ATTR_SNAPLINE_END + 1
 #define ATTR_OPTIONS_LAYOUT             ATTR_OPTIONS_START + 1
-#define ATTR_OPTIONS_CONTENTS           ATTR_OPTIONS_START + 2
-#define ATTR_OPTIONS_MISC               ATTR_OPTIONS_START + 3
-#define ATTR_OPTIONS_SNAP               ATTR_OPTIONS_START + 4
-#define ATTR_OPTIONS_PRINT              ATTR_OPTIONS_START + 5
+#define ATTR_OPTIONS_MISC               ATTR_OPTIONS_START + 2
+#define ATTR_OPTIONS_SNAP               ATTR_OPTIONS_START + 3
+#define ATTR_OPTIONS_PRINT              ATTR_OPTIONS_START + 4
 #define ATTR_OPTIONS_END                ATTR_OPTIONS_PRINT
 
 #define ATTR_OPTIONS_SCALE_START        ATTR_OPTIONS_END + 1
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 3e38c6e963a8..0f67b818113d 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -382,30 +382,6 @@ bool SdOptionsContents::WriteData( Any* pValues ) const
 
     return true;
 }
-
-/*************************************************************************
-|*
-|* SdOptionsContentsItem
-|*
-\************************************************************************/
-
-SdOptionsContentsItem::SdOptionsContentsItem()
-:   SfxPoolItem         ( ATTR_OPTIONS_CONTENTS )
-,   maOptionsContents   ( false, false )
-{
-}
-
-SfxPoolItem* SdOptionsContentsItem::Clone( SfxItemPool* ) const
-{
-    return new SdOptionsContentsItem( *this );
-}
-
-bool SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const
-{
-    assert(SfxPoolItem::operator==(rAttr));
-    return maOptionsContents == static_cast<const SdOptionsContentsItem&>(rAttr).maOptionsContents;
-}
-
 /*************************************************************************
 |*
 |* SdOptionsMisc
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 1e95727d4a64..3f025fec1f8d 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -470,9 +470,6 @@ std::unique_ptr<SfxItemSet> SdModule::CreateItemSet( sal_uInt16 nSlot )
 
     pRet->Put( SfxUInt16Item( SID_ATTR_METRIC, (sal_uInt16)nMetric ) );
 
-    // TP_OPTIONS_CONTENTS:
-    pRet->Put( SdOptionsContentsItem() );
-
     // TP_OPTIONS_MISC:
     SdOptionsMiscItem aSdOptionsMiscItem( pOptions, pFrameView );
     if ( pFrameView )
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index bf1e3aabd903..1eb581b6f65c 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -176,19 +176,6 @@ public:
     bool    operator==( const SdOptionsContents& rOpt ) const;
 };
 
-class SD_DLLPUBLIC SdOptionsContentsItem : public SfxPoolItem
-{
-public:
-
-                            SdOptionsContentsItem();
-
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
-    virtual bool            operator==( const SfxPoolItem& ) const override;
-
-private:
-    SdOptionsContents       maOptionsContents;
-};
-
 class SD_DLLPUBLIC SdOptionsMisc : public SdOptionsGeneric
 {
 private: