Cleanup SfxApplication::Get/SetOptions, and drop unused SIDs

The removed stuff was never used elsewhere; e.g. all uses of GetOptions
use Which Ranges that don't include the removed identifiers. Elements
removed from SetOptions weren't passed to that function from anywhere.

Change-Id: Id81b57014b82f89538a46a609f3e4b328864bbcf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154604
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

3 files changed, 1 insertions, 56 deletions

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 5ed6fbc0dc57..09ddd082db31 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -164,7 +164,7 @@ public:
     SAL_DLLPRIVATE SfxDispatcher* GetAppDispatcher_Impl();
     SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl();
 
-    SAL_DLLPRIVATE void         SetOptions_Impl(const SfxItemSet &);
+    SAL_DLLPRIVATE static void  SetOptions_Nbc(const SfxItemSet &);
     SAL_DLLPRIVATE void         Initialize_Impl();
 
     SAL_DLLPRIVATE SfxAppData_Impl* Get_Impl() const { return pImpl.get(); }
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index e1d1cbca869c..b88b778714a8 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -23,7 +23,6 @@
 #include <svl/memberid.h>
 #include <svl/typedwhich.hxx>
 
-class SfxAllEnumItem;
 class SfxBoolItem;
 class SfxDocumentInfoItem;
 class SfxEventNamesItem;
@@ -530,23 +529,16 @@ class SvxZoomItem;
 #define SID_ATTR_AUTOSAVE               TypedWhichId<SfxBoolItem>(SID_OPTIONS_START +  3)
 #define SID_ATTR_USERAUTOSAVE           TypedWhichId<SfxBoolItem>(SID_OPTIONS_START +  4)
 #define SID_ATTR_AUTOSAVEMINUTE         TypedWhichId<SfxUInt16Item>(SID_OPTIONS_START +  5)
-#define SID_ATTR_WORKINGSET             TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 13)
 #define SID_ATTR_UNDO_COUNT             TypedWhichId<SfxUInt16Item>(SID_OPTIONS_START + 16)
-    // unused
-#define SID_ATTR_SAVEDOCVIEW            TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 18)
 
 // GeneralTabPage
 
 #define SID_ATTR_METRIC                 TypedWhichId<SfxUInt16Item>(SID_OPTIONS_START +  8)
 #define SID_ATTR_DEFTABSTOP             TypedWhichId<SfxUInt16Item>(SID_OPTIONS_START + 14)
-#define SID_ATTR_BUTTON_BIGSIZE         TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 63)
 #define SID_ATTR_QUICKLAUNCHER          TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 74)
 #define SID_ATTR_YEAR2000               TypedWhichId<SfxUInt16Item>(SID_OPTIONS_START + 87)
 #define SID_ATTR_APPLYCHARUNIT          TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 88)
 
-// PathTabPage
-#define SID_ATTR_PATHNAME               TypedWhichId<SfxAllEnumItem>(SID_OPTIONS_START + 11)
-
 // LinguTabPage
 #define SID_ATTR_LANGUAGE               TypedWhichId<SvxLanguageItem>(SID_OPTIONS_START +  7)
 #define SID_ATTR_HYPHENREGION           TypedWhichId<SfxHyphenRegionItem>(SID_OPTIONS_START + 12)
@@ -577,7 +569,6 @@ class SvxZoomItem;
 #define SID_OPT_LOCALE_CHANGED              TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 94)
 //middle mouse button
 #define SID_ATTR_PRETTYPRINTING             TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 98)
-#define SID_HELP_STYLESHEET                 TypedWhichId<SfxStringItem>(SID_OPTIONS_START + 99)
 
 // slot IDs from SVX (svxids.hrc) ---------------------------------------------
 // These SID_SVX_START entries came from include/svx/svxids.hrc, avoid
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx
deleted file mode 100644
index d8a44486b1f6..000000000000
--- a/include/svl/aeitem.hxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVL_AEITEM_HXX
-#define INCLUDED_SVL_AEITEM_HXX
-
-#include <config_options.h>
-#include <svl/svldllapi.h>
-#include <svl/poolitem.hxx>
-
-#include <vector>
-
-class UNLESS_MERGELIBS(SVL_DLLPUBLIC) SfxAllEnumItem final : public SfxPoolItem
-{
-    std::vector<OUString>   m_Values;
-
-public:
-    explicit                SfxAllEnumItem( sal_uInt16 nWhich);
-                            SfxAllEnumItem( const SfxAllEnumItem & );
-                            virtual ~SfxAllEnumItem() override;
-
-    void                    SetTextByPos( sal_uInt16 nPos, const OUString &rText );
-    OUString const &        GetTextByPos( sal_uInt16 nPos ) const;
-    sal_uInt16              GetTextCount() const;
-    virtual SfxAllEnumItem* Clone( SfxItemPool *pPool = nullptr ) const override;
-    virtual bool            operator==( SfxPoolItem const & ) const override;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */