diff options
| -rw-r--r-- | sfx2/source/appl/sfxpicklist.cxx | 40 | ||||
| -rw-r--r-- | sfx2/source/doc/oleprops.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/inc/sfxpicklist.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/inc/sfxtypes.hxx | 11 | ||||
| -rw-r--r-- | sfx2/source/inc/templdgi.hxx | 8 |
5 files changed, 0 insertions, 63 deletions
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 909706a623e7..31ec4e51e027 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -305,41 +305,6 @@ void SfxPickList::CreatePickListEntries() } } -void SfxPickList::CreateMenuEntries( Menu* pMenu ) -{ - ::osl::MutexGuard aGuard( thePickListMutex::get() ); - - static bool bPickListMenuInitializing = false; - - if ( bPickListMenuInitializing ) // method is not reentrant! - return; - - bPickListMenuInitializing = true; - CreatePickListEntries(); - - for ( sal_uInt16 nId = START_ITEMID_PICKLIST; nId <= END_ITEMID_PICKLIST; ++nId ) - pMenu->RemoveItem( pMenu->GetItemPos( nId ) ); - - if ( pMenu->GetItemType( pMenu->GetItemCount()-1 ) == MenuItemType::SEPARATOR ) - pMenu->RemoveItem( pMenu->GetItemCount()-1 ); - - if ( m_aPicklistVector.size() > 0 && - pMenu->GetItemType( pMenu->GetItemCount()-1 ) - != MenuItemType::SEPARATOR && m_nAllowedMenuSize ) - pMenu->InsertSeparator(); - - OUString aEmptyString; - for ( size_t i = 0; i < m_aPicklistVector.size(); i++ ) - { - PickListEntry* pEntry = GetPickListEntry( i ); - - pMenu->InsertItem( (sal_uInt16)(START_ITEMID_PICKLIST + i), aEmptyString ); - CreatePicklistMenuTitle( pMenu, (sal_uInt16)(START_ITEMID_PICKLIST + i), pEntry->aName, i ); - } - - bPickListMenuInitializing = false; -} - void SfxPickList::ExecuteEntry( sal_uInt32 nIndex ) { ::osl::ClearableMutexGuard aGuard( thePickListMutex::get() ); @@ -369,11 +334,6 @@ void SfxPickList::ExecuteEntry( sal_uInt32 nIndex ) } } -void SfxPickList::ExecuteMenuEntry( sal_uInt16 nId ) -{ - ExecuteEntry( (sal_uInt32)( nId - START_ITEMID_PICKLIST ) ); -} - void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint ) { const SfxStringHint* pStringHint = dynamic_cast<const SfxStringHint*>(&rHint); diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx index 8ae7236c0798..ebbf4fa6c1d2 100644 --- a/sfx2/source/doc/oleprops.hxx +++ b/sfx2/source/doc/oleprops.hxx @@ -104,8 +104,6 @@ public: mxTextEnc( new rtl_TextEncoding( osl_getThreadTextEncoding() ) ) {} inline explicit SfxOleTextEncoding( rtl_TextEncoding eTextEnc ) : mxTextEnc( new rtl_TextEncoding( eTextEnc ) ) {} - inline explicit SfxOleTextEncoding( sal_Int16 nCodePage ) : - mxTextEnc( new rtl_TextEncoding ) { SetCodePage( nCodePage ); } /** Returns the current text encoding identifier. */ inline rtl_TextEncoding GetTextEncoding() const { return *mxTextEnc; } diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx index c7c70e2eb5fe..a9a13ae7ff1f 100644 --- a/sfx2/source/inc/sfxpicklist.hxx +++ b/sfx2/source/inc/sfxpicklist.hxx @@ -62,8 +62,6 @@ class SfxPickList : public SfxListener static SfxPickList& Get(); static void ensure() { Get(); } - void CreateMenuEntries( Menu* pMenu ); - static void ExecuteMenuEntry( sal_uInt16 nId ); static void ExecuteEntry( sal_uInt32 nIndex ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index dd55b761147a..cfa3d1d77780 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -69,17 +69,6 @@ public: #endif -struct StringList_Impl : private Resource -{ - - ResId aResId; - - StringList_Impl( const ResId& rErrIdP, sal_uInt16 nId) - : Resource( rErrIdP ), aResId(nId, *rErrIdP.GetResMgr()) {} - ~StringList_Impl() { FreeResource(); } - -}; - #endif // INCLUDED_SFX2_SOURCE_INC_SFXTYPES_HXX diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 3f202039e488..b8a08d3524ed 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -62,14 +62,6 @@ protected: sal_uInt16 nModifier; public: - DropListBox_Impl(vcl::Window* pParent, const ResId& rId, SfxCommonTemplateDialog_Impl* pD) - : SvTreeListBox(pParent, rId) - , pDialog(pD) - , nModifier(0) - { - SetHighlightRange(); - } - DropListBox_Impl(vcl::Window* pParent, WinBits nWinBits, SfxCommonTemplateDialog_Impl* pD) : SvTreeListBox(pParent, nWinBits) , pDialog(pD) |