cui/source/inc/page.hxx | 1
include/sfx2/app.hxx | 2
include/sfx2/sfxsids.hrc | 9 -
include/svl/aeitem.hxx | 46 ---------
sfx2/source/appl/appcfg.cxx | 191 ----------------------------------------
sfx2/source/appl/appserv.cxx | 2
svl/Library_svl.mk | 1
svl/source/items/aeitem.cxx | 69 --------------
svl/source/items/poolitem.cxx | 1
sw/source/uibase/app/apphdl.cxx | 10 --
10 files changed, 4 insertions(+), 328 deletions(-)
New commits:
commit 519876dffdc8c93710af543cc11332dab9a50c14
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Jul 18 23:45:47 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Jul 19 03:59:17 2023 +0200
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.kagan...@collabora.com>
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 3d3ccff65ab2..151569ac4634 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -38,7 +38,6 @@
<SvxSizeItem>: <SID_ATTR_MAXSIZE>
<SvxULSpaceItem>: <SID_ATTR_LRSPACE>
<SvxLRSpaceItem>: <SID_ATTR_ULSPACE>
- <SfxAllEnumItem>: <SID_ATTR_PAPERTRAY>
<SvxPaperBinItem>: <SID_ATTR_PAPERBIN>
<SvxBoolItem>: <SID_ATTR_EXT1>
<SvxBoolItem>: <SID_ATTR_EXT2>
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: */
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 9ab34f68cfda..b0816397c88b 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -23,7 +23,6 @@
#include <rtl/ustring.hxx>
#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
-#include <svl/aeitem.hxx>
#include <svl/slstitm.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
@@ -140,10 +139,6 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
bool bRet = false;
switch(nWhich)
{
- case SID_ATTR_BUTTON_BIGSIZE:
- if( rSet.Put( SfxBoolItem( SID_ATTR_BUTTON_BIGSIZE,
SvtMiscOptions::AreCurrentSymbolsLarge() ) ) )
- bRet = true;
- break;
case SID_ATTR_BACKUP:
bRet = true;
if
(!officecfg::Office::Common::Save::Document::CreateBackup::isReadOnly())
@@ -179,29 +174,6 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
bRet =
toSet_ifRW<officecfg::Office::Common::Save::Document::EditProperty>(
rSet, SID_ATTR_DOCINFO);
break;
- case SID_ATTR_WORKINGSET:
- bRet = toSet_ifRW<officecfg::Office::Common::Save::WorkingSet>(
- rSet, SID_ATTR_WORKINGSET);
- break;
- case SID_ATTR_SAVEDOCVIEW:
- bRet =
toSet_ifRW<officecfg::Office::Common::Save::Document::ViewInfo>(
- rSet, SID_ATTR_SAVEDOCVIEW);
- break;
- case SID_ATTR_METRIC:
- break;
- case SID_HELPBALLOONS:
- bRet =
toSet<officecfg::Office::Common::Help::ExtendedTip>(rSet, SID_HELPBALLOONS);
- break;
- case SID_HELPTIPS :
- bRet = toSet<officecfg::Office::Common::Help::Tip>(rSet,
SID_HELPTIPS);
- break;
- case SID_HELP_STYLESHEET:
- bRet =
toSet<officecfg::Office::Common::Help::HelpStyleSheet>(rSet,
-
SID_HELP_STYLESHEET);
- break;
- case SID_ATTR_UNDO_COUNT:
- bRet = toSet<officecfg::Office::Common::Undo::Steps>(rSet,
SID_ATTR_UNDO_COUNT);
- break;
case SID_ATTR_QUICKLAUNCHER:
if ( ShutdownIcon::IsQuickstarterInstalled() )
{
@@ -233,10 +205,6 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
bRet = false;
}
break;
- case SID_INET_PROXY_TYPE:
- bRet =
toSet_withDefault<officecfg::Inet::Settings::ooInetProxyType>(
- rSet, SID_INET_PROXY_TYPE, 0);
- break;
case SID_INET_HTTP_PROXY_NAME:
bRet = toSet<officecfg::Inet::Settings::ooInetHTTPProxyName>(
rSet, SID_INET_HTTP_PROXY_NAME);
@@ -256,47 +224,6 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_INET_NOPROXY:
bRet = toSet<officecfg::Inet::Settings::ooInetNoProxy>(rSet,
SID_INET_NOPROXY);
break;
- case SID_ATTR_PATHNAME:
- {
- SfxAllEnumItem aValues(SID_ATTR_PATHNAME);
- SvtPathOptions aPathCfg;
- for ( sal_uInt16 nProp =
static_cast<sal_uInt16>(SvtPathOptions::Paths::AddIn);
- nProp <=
static_cast<sal_uInt16>(SvtPathOptions::Paths::Work); nProp++ )
- {
- OUString aValue;
- switch ( static_cast<SvtPathOptions::Paths>(nProp) )
- {
- case SvtPathOptions::Paths::AddIn:
osl::FileBase::getFileURLFromSystemPath( aPathCfg.GetAddinPath(), aValue );
break;
- case SvtPathOptions::Paths::AutoCorrect: aValue =
aPathCfg.GetAutoCorrectPath(); break;
- case SvtPathOptions::Paths::AutoText: aValue =
aPathCfg.GetAutoTextPath(); break;
- case SvtPathOptions::Paths::Backup: aValue =
aPathCfg.GetBackupPath(); break;
- case SvtPathOptions::Paths::Basic: aValue =
aPathCfg.GetBasicPath(); break;
- case SvtPathOptions::Paths::Bitmap: aValue =
aPathCfg.GetBitmapPath(); break;
- case SvtPathOptions::Paths::Config: aValue =
aPathCfg.GetConfigPath(); break;
- case SvtPathOptions::Paths::Dictionary: aValue =
aPathCfg.GetDictionaryPath(); break;
- case SvtPathOptions::Paths::Favorites: aValue =
aPathCfg.GetFavoritesPath(); break;
- case SvtPathOptions::Paths::Filter:
osl::FileBase::getFileURLFromSystemPath( aPathCfg.GetFilterPath(), aValue );
break;
- case SvtPathOptions::Paths::Gallery: aValue =
aPathCfg.GetGalleryPath(); break;
- case SvtPathOptions::Paths::Graphic: aValue =
aPathCfg.GetGraphicPath(); break;
- case SvtPathOptions::Paths::Help:
osl::FileBase::getFileURLFromSystemPath( aPathCfg.GetHelpPath(), aValue );
break;
- case SvtPathOptions::Paths::Linguistic: aValue =
aPathCfg.GetLinguisticPath(); break;
- case SvtPathOptions::Paths::Module:
osl::FileBase::getFileURLFromSystemPath( aPathCfg.GetModulePath(), aValue );
break;
- case SvtPathOptions::Paths::Palette: aValue =
aPathCfg.GetPalettePath(); break;
- case SvtPathOptions::Paths::Plugin:
osl::FileBase::getFileURLFromSystemPath( aPathCfg.GetPluginPath(), aValue );
break;
- case SvtPathOptions::Paths::Storage:
osl::FileBase::getFileURLFromSystemPath( aPathCfg.GetStoragePath(), aValue );
break;
- case SvtPathOptions::Paths::Temp: aValue =
aPathCfg.GetTempPath(); break;
- case SvtPathOptions::Paths::Template: aValue =
aPathCfg.GetTemplatePath(); break;
- case SvtPathOptions::Paths::UserConfig: aValue =
aPathCfg.GetUserConfigPath(); break;
- case SvtPathOptions::Paths::Work: aValue =
aPathCfg.GetWorkPath(); break;
- default: break;
- }
- aValues.SetTextByPos( nProp, aValue );
- }
-
- if (rSet.Put(aValues))
- bRet = true;
- }
- break;
default:
SAL_INFO( "sfx.appl", "W1:Wrong ID while getting Options!" );
@@ -306,25 +233,8 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
}
}
-// TODO/CLEANUP: Why two SetOptions Methods?
-void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
+void SfxApplication::SetOptions_Nbc(const SfxItemSet& rSet)
{
- if ( const SfxBoolItem *pItem = rSet.GetItemIfSet(SID_ATTR_BUTTON_BIGSIZE)
)
- {
- SvtMiscOptions aMiscOptions;
- bool bBigSize = pItem->GetValue();
- aMiscOptions.SetSymbolsSize(
- sal::static_int_cast< sal_Int16 >(
- bBigSize ? SFX_SYMBOLS_SIZE_LARGE : SFX_SYMBOLS_SIZE_SMALL ) );
- SfxViewFrame* pCurrViewFrame = SfxViewFrame::GetFirst();
- while ( pCurrViewFrame )
- {
- // update all "final" dispatchers
- pCurrViewFrame->GetDispatcher()->Update_Impl(true);
- pCurrViewFrame = SfxViewFrame::GetNext(*pCurrViewFrame);
- }
- }
-
std::shared_ptr< comphelper::ConfigurationChanges > batch(
comphelper::ConfigurationChanges::create());
@@ -358,28 +268,12 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet&
rSet )
toCfg_ifSet<officecfg::Office::Common::Save::Document::EditProperty>(
rSet, SID_ATTR_DOCINFO, batch);
- // Mark open Documents
- toCfg_ifSet<officecfg::Office::Common::Save::WorkingSet>(rSet,
SID_ATTR_WORKINGSET, batch);
-
- // Save window settings
- toCfg_ifSet<officecfg::Office::Common::Save::Document::ViewInfo>(
- rSet, SID_ATTR_SAVEDOCVIEW, batch);
-
- // Metric
- const SfxPoolItem* pItem1 = nullptr;
- if (SfxItemState::SET ==
rSet.GetItemState(GetPool().GetWhich(SID_ATTR_METRIC), true, &pItem1))
- {
- DBG_ASSERT(dynamic_cast< const SfxUInt16Item *>( pItem1 ) != nullptr,
"UInt16Item expected");
- }
-
// HelpBalloons
toCfg_ifSet<officecfg::Office::Common::Help::ExtendedTip>(rSet,
SID_HELPBALLOONS, batch);
// HelpTips
toCfg_ifSet<officecfg::Office::Common::Help::Tip>(rSet, SID_HELPTIPS,
batch);
- toCfg_ifSet<officecfg::Office::Common::Help::HelpStyleSheet>(rSet,
SID_HELP_STYLESHEET, batch);
-
// SaveRelINet
toCfg_ifSet<officecfg::Office::Common::Save::URL::Internet>(rSet,
SID_SAVEREL_INET, batch);
@@ -445,88 +339,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet&
rSet )
void SfxApplication::SetOptions(const SfxItemSet &rSet)
{
- // PathName
- if ( const SfxAllEnumItem* pEnumItem =
rSet.GetItemIfSet(SID_ATTR_PATHNAME))
- {
- sal_uInt16 nCount = pEnumItem->GetTextCount();
- SvtPathOptions aPathOptions;
- for( sal_uInt16 nPath=0; nPath<nCount; ++nPath )
- {
- const OUString& sValue = pEnumItem->GetTextByPos(nPath);
- if ( sValue != " " ) // "No change" string
- {
- switch( static_cast<SvtPathOptions::Paths>(nPath) )
- {
- case SvtPathOptions::Paths::AddIn:
- {
- OUString aTmp;
- if( osl::FileBase::getSystemPathFromFileURL( sValue,
aTmp ) == osl::FileBase::E_None )
- aPathOptions.SetAddinPath( aTmp );
- break;
- }
-
- case SvtPathOptions::Paths::AutoCorrect:
aPathOptions.SetAutoCorrectPath( sValue );break;
- case SvtPathOptions::Paths::AutoText:
aPathOptions.SetAutoTextPath( sValue );break;
- case SvtPathOptions::Paths::Backup:
aPathOptions.SetBackupPath( sValue );break;
- case SvtPathOptions::Paths::Basic:
aPathOptions.SetBasicPath( sValue );break;
- case SvtPathOptions::Paths::Bitmap:
aPathOptions.SetBitmapPath( sValue );break;
- case SvtPathOptions::Paths::Config:
aPathOptions.SetConfigPath( sValue );break;
- case SvtPathOptions::Paths::Dictionary:
aPathOptions.SetDictionaryPath( sValue );break;
- case SvtPathOptions::Paths::Favorites:
aPathOptions.SetFavoritesPath( sValue );break;
- case SvtPathOptions::Paths::Filter:
- {
- OUString aTmp;
- if( osl::FileBase::getSystemPathFromFileURL( sValue,
aTmp ) == osl::FileBase::E_None )
- aPathOptions.SetFilterPath( aTmp );
- break;
- }
- case SvtPathOptions::Paths::Gallery:
aPathOptions.SetGalleryPath( sValue );break;
- case SvtPathOptions::Paths::Graphic:
aPathOptions.SetGraphicPath( sValue );break;
- case SvtPathOptions::Paths::Help:
- {
- OUString aTmp;
- if( osl::FileBase::getSystemPathFromFileURL( sValue,
aTmp ) == osl::FileBase::E_None )
- aPathOptions.SetHelpPath( aTmp );
- break;
- }
-
- case SvtPathOptions::Paths::Linguistic:
aPathOptions.SetLinguisticPath( sValue );break;
- case SvtPathOptions::Paths::Module:
- {
- OUString aTmp;
- if( osl::FileBase::getSystemPathFromFileURL( sValue,
aTmp ) == osl::FileBase::E_None )
- aPathOptions.SetModulePath( aTmp );
- break;
- }
-
- case SvtPathOptions::Paths::Palette:
aPathOptions.SetPalettePath( sValue );break;
- case SvtPathOptions::Paths::Plugin:
- {
- OUString aTmp;
- if( osl::FileBase::getSystemPathFromFileURL( sValue,
aTmp ) == osl::FileBase::E_None )
- aPathOptions.SetPluginPath( aTmp );
- break;
- }
-
- case SvtPathOptions::Paths::Storage:
- {
- OUString aTmp;
- if( osl::FileBase::getSystemPathFromFileURL( sValue,
aTmp ) == osl::FileBase::E_None )
- aPathOptions.SetStoragePath( aTmp );
- break;
- }
-
- case SvtPathOptions::Paths::Temp:
aPathOptions.SetTempPath( sValue );break;
- case SvtPathOptions::Paths::Template:
aPathOptions.SetTemplatePath( sValue );break;
- case SvtPathOptions::Paths::UserConfig:
aPathOptions.SetUserConfigPath( sValue );break;
- case SvtPathOptions::Paths::Work:
aPathOptions.SetWorkPath( sValue );break;
- default: SAL_WARN( "sfx.appl",
"SfxApplication::SetOptions_Impl() Invalid path number found for set
directories!" );
- }
- }
- }
- }
-
- SetOptions_Impl( rSet );
+ SetOptions_Nbc( rSet );
// Undo-Count
Broadcast( SfxItemSetHint( rSet ) );
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index cab9f16c5b8a..b7e89ab735ad 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -325,7 +325,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
case SID_SETOPTIONS:
{
if( rReq.GetArgs() )
- SetOptions_Impl( *rReq.GetArgs() );
+ SetOptions_Nbc( *rReq.GetArgs() );
break;
}
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index a67184b8f5ad..ac6fe2d8130a 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -112,7 +112,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
svl/source/config/languageoptions \
svl/source/crypto/cryptosign \
svl/source/filepicker/pickerhistory \
- svl/source/items/aeitem \
svl/source/items/cenumitm \
svl/source/items/cintitem \
svl/source/items/custritm \
diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
deleted file mode 100644
index 9901ecdded60..000000000000
--- a/svl/source/items/aeitem.cxx
+++ /dev/null
@@ -1,69 +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 .
- */
-
-#include <rtl/ustring.hxx>
-#include <svl/aeitem.hxx>
-
-SfxAllEnumItem::SfxAllEnumItem(sal_uInt16 which):
- SfxPoolItem(which)
-{
-}
-
-SfxAllEnumItem::SfxAllEnumItem(const SfxAllEnumItem &rCopy):
- SfxPoolItem(rCopy),
- m_Values(rCopy.m_Values)
-{
-}
-
-SfxAllEnumItem::~SfxAllEnumItem()
-{
-}
-
-sal_uInt16 SfxAllEnumItem::GetTextCount() const
-{
- return m_Values.size();
-}
-
-OUString const & SfxAllEnumItem::GetTextByPos( sal_uInt16 nPos ) const
-{
- return m_Values[nPos];
-}
-
-SfxAllEnumItem* SfxAllEnumItem::Clone( SfxItemPool * ) const
-{
- return new SfxAllEnumItem(*this);
-}
-
-void SfxAllEnumItem::SetTextByPos( sal_uInt16 nPos, const OUString &rText )
-{
- if (nPos >= m_Values.size())
- m_Values.resize(nPos);
- m_Values[nPos] = rText;
-}
-
-bool SfxAllEnumItem::operator==( const SfxPoolItem& rCmp ) const
-{
- if (!SfxPoolItem::operator==(rCmp))
- return false;
- const SfxAllEnumItem& rOther = static_cast<const SfxAllEnumItem&>(rCmp);
- return m_Values == rOther.m_Values;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index 9869d9d4fa08..dfa584f6114a 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -70,7 +70,6 @@
// class SfxObjectShellItem: public SfxPoolItem
// class SfxViewFrameItem: public SfxPoolItem
// class SfxWatermarkItem: public SfxPoolItem
-// class SfxAllEnumItem: public SfxPoolItem
// class SfxEnumItemInterface: public SfxPoolItem
// class SvxAdjustItem : public SfxEnumItemInterface
// class SvxEscapementItem : public SfxEnumItemInterface
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 3222db5688a9..087caeffbed2 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -919,16 +919,6 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const
SfxHint& rHint )
}
}
}
- else if(const SfxItemSetHint* pSfxItemSetHint = dynamic_cast<const
SfxItemSetHint*>(&rHint))
- {
- if( SfxItemState::SET ==
pSfxItemSetHint->GetItemSet().GetItemState(SID_ATTR_PATHNAME))
- {
- ::GetGlossaries()->UpdateGlosPath( false );
- SwGlossaryList* pList = ::GetGlossaryList();
- if(pList->IsActive())
- pList->Update();
- }
- }
else
{
if (rHint.GetId() == SfxHintId::Deinitializing)
