diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-16 23:06:13 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-17 09:54:13 +0100 |
commit | 7acd9e2c28911003511de641cfd18b86bde7d808 (patch) | |
tree | 17d19f4778f0df9a9557d827ea0b6b43757750ec /sfx2 | |
parent | 9b845e5814ba8f251986494bed4ec3c64bddcfd3 (diff) |
callcatcher: remove some methods
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/inc/resmgr.hxx | 3 | ||||
-rw-r--r-- | sfx2/inc/sfx2/app.hxx | 2 | ||||
-rw-r--r-- | sfx2/inc/sfx2/docfile.hxx | 2 | ||||
-rw-r--r-- | sfx2/inc/sfx2/doctdlg.hxx | 2 | ||||
-rw-r--r-- | sfx2/inc/sfx2/mnuitem.hxx | 1 | ||||
-rw-r--r-- | sfx2/inc/sfx2/mnumgr.hxx | 4 | ||||
-rw-r--r-- | sfx2/source/appl/app.cxx | 14 | ||||
-rw-r--r-- | sfx2/source/appl/appmisc.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/doc/docfile.cxx | 14 | ||||
-rw-r--r-- | sfx2/source/doc/doctdlg.cxx | 19 | ||||
-rw-r--r-- | sfx2/source/menu/mnuitem.cxx | 30 | ||||
-rw-r--r-- | sfx2/source/menu/mnumgr.cxx | 78 |
12 files changed, 0 insertions, 170 deletions
diff --git a/sfx2/inc/resmgr.hxx b/sfx2/inc/resmgr.hxx index 3e0fc3cfc1c5..09bdca5dee1a 100644 --- a/sfx2/inc/resmgr.hxx +++ b/sfx2/inc/resmgr.hxx @@ -69,9 +69,6 @@ public: SfxMessageDescription* CreateDescription( sal_uInt16 nId ); }; - -#define SFX_RESMANAGER() SFX_APP()->GetResourceManager() - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx index 060af28b087f..ca78c56ad1b9 100644 --- a/sfx2/inc/sfx2/app.hxx +++ b/sfx2/inc/sfx2/app.hxx @@ -162,7 +162,6 @@ public: static SfxApplication* GetOrCreate(); // Resource Manager - SfxResourceManager& GetResourceManager() const; ResMgr* GetSfxResManager(); static ResMgr* CreateResManager( const char *pPrefix ); @@ -182,7 +181,6 @@ public: // "static" methods sal_uIntPtr LoadTemplate( SfxObjectShellLock& xDoc, const String& rFileName, sal_Bool bCopy=sal_True, SfxItemSet* pArgs = 0 ); - ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > GetStatusIndicator() const; SfxTemplateDialog* GetTemplateDialog(); Window* GetTopWindow() const; diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx index af6ba04bfc49..dba159d3d928 100644 --- a/sfx2/inc/sfx2/docfile.hxx +++ b/sfx2/inc/sfx2/docfile.hxx @@ -145,7 +145,6 @@ public: void SetReferer( const String& rRefer ); const String& GetReferer( ) const; - sal_Bool Exists( sal_Bool bForceSession = sal_True ); void SetFilter(const SfxFilter *pFlt, sal_Bool bResetOrig = sal_False); const SfxFilter * GetFilter() const { return pFilter; } const SfxFilter * GetOrigFilter( sal_Bool bNotCurrent = sal_False ) const; @@ -167,7 +166,6 @@ public: const String& GetPhysicalName() const; sal_Bool IsRemote(); sal_Bool IsOpen() const; // { return aStorage.Is() || pInStream; } - void StartDownload(); void DownLoad( const Link& aLink = Link()); void SetDoneLink( const Link& rLink ); Link GetDoneLink( ) const; diff --git a/sfx2/inc/sfx2/doctdlg.hxx b/sfx2/inc/sfx2/doctdlg.hxx index 8d8e7dfdd546..9d3261bb12d3 100644 --- a/sfx2/inc/sfx2/doctdlg.hxx +++ b/sfx2/inc/sfx2/doctdlg.hxx @@ -75,8 +75,6 @@ public: String GetTemplateName() const { return aNameEd.GetText().EraseLeadingChars(); } - String GetTemplatePath(); - void NewTemplate(const String &rPath); sal_uInt16 GetRegion() const { return aRegionLb.GetSelectEntryPos(); } String GetRegionName() const { return aRegionLb.GetSelectEntry(); } }; diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx index a4b990c63b1f..5d39f178fbee 100644 --- a/sfx2/inc/sfx2/mnuitem.hxx +++ b/sfx2/inc/sfx2/mnuitem.hxx @@ -79,7 +79,6 @@ public: static SfxMenuControl* CreateControl( sal_uInt16 nId, Menu &, SfxBindings & ); static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, SfxBindings&, SfxVirtualMenu* ); static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, const String& sItemText, SfxBindings&, SfxVirtualMenu* ); - static sal_Bool IsSpecialControl( sal_uInt16 nId, SfxModule* ); static void RegisterMenuControl(SfxModule*, SfxMenuCtrlFactory*); }; diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx index 49ff8fa47d84..c95b31b4f38f 100644 --- a/sfx2/inc/sfx2/mnumgr.hxx +++ b/sfx2/inc/sfx2/mnumgr.hxx @@ -75,8 +75,6 @@ protected: sal_uInt32 GetType() { return nType; } public: - void UseDefault(); - DECL_LINK( Select, Menu* ); SfxVirtualMenu* GetMenu() const @@ -87,8 +85,6 @@ public: void SetResMgr(ResMgr* pMgr) {pResMgr = pMgr; } ResMgr* GetResMgr() const { return pResMgr; } void SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu ); - - void Construct_Impl( Menu* pMenu, sal_Bool bWithHelp ); }; //-------------------------------------------------------------------- diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 1c552ca756e7..ed3695cdb940 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -583,20 +583,6 @@ Window* SfxApplication::GetTopWindow() const return pWork ? pWork->GetWindow() : NULL; } -//-------------------------------------------------------------------- - -uno::Reference< task::XStatusIndicator > SfxApplication::GetStatusIndicator() const -{ - if ( !pAppData_Impl->pViewFrame ) - return uno::Reference< task::XStatusIndicator >(); - - SfxViewFrame *pTop = pAppData_Impl->pViewFrame; - while ( pTop->GetParentViewFrame_Impl() ) - pTop = pTop->GetParentViewFrame_Impl(); - - return pTop->GetFrame().GetWorkWindow_Impl()->GetStatusIndicator(); -} - SfxTbxCtrlFactArr_Impl& SfxApplication::GetTbxCtrlFactories_Impl() const { return *pAppData_Impl->pTbxCtrlFac; diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 767e514dcba3..fffecd3f348e 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -276,7 +276,6 @@ ISfxTemplateCommon* SfxApplication::GetCurrentTemplateCommon( SfxBindings& rBind return 0; } -SfxResourceManager& SfxApplication::GetResourceManager() const { return *pAppData_Impl->pResMgr; } sal_Bool SfxApplication::IsDowning() const { return pAppData_Impl->bDowning; } SfxDispatcher* SfxApplication::GetAppDispatcher_Impl() { return pAppData_Impl->pAppDispat; } SfxSlotPool& SfxApplication::GetAppSlotPool_Impl() const { return *pAppData_Impl->pSlotPool; } diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 5f925b0485b4..184768eb2000 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2380,12 +2380,6 @@ void SfxMedium::SetDataAvailableLink( const Link& rLink ) pImp->aAvailableLink = rLink; } -//---------------------------------------------------------------- -void SfxMedium::StartDownload() -{ - GetInStream(); -} - void SfxMedium::DownLoad( const Link& aLink ) { SetDoneLink( aLink ); @@ -2774,14 +2768,6 @@ void SfxMedium::SetPhysicalName_Impl( const String& rNameP ) //------------------------------------------------------------------ -sal_Bool SfxMedium::Exists( sal_Bool /*bForceSession*/ ) -{ - OSL_FAIL( "Not implemented!" ); - return sal_True; -} - -//------------------------------------------------------------------ - void SfxMedium::ReOpen() { sal_Bool bUseInteractionHandler = pImp->bUseInteractionHandler; diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx index 222cfaf328e7..360b1fec8a72 100644 --- a/sfx2/source/doc/doctdlg.cxx +++ b/sfx2/source/doc/doctdlg.cxx @@ -214,23 +214,4 @@ IMPL_LINK( SfxDocumentTemplateDlg, NameModify, Edit *, pBox ) return 0; } -//------------------------------------------------------------------------- - -String SfxDocumentTemplateDlg::GetTemplatePath() -{ - const String& rPath=GetTemplateName(); - if(pTemplates->GetRegionCount()) - return pTemplates->GetTemplatePath( - aRegionLb.GetSelectEntryPos(), rPath); - return pTemplates->GetDefaultTemplatePath(rPath); -} - -//------------------------------------------------------------------------- - -void SfxDocumentTemplateDlg::NewTemplate(const String &rPath) -{ - pTemplates->NewTemplate( - aRegionLb.GetSelectEntryPos(), GetTemplateName(), rPath); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index b34625820fae..62e88fe01068 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -373,36 +373,6 @@ SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxB return 0; } -sal_Bool SfxMenuControl::IsSpecialControl( sal_uInt16 nId, SfxModule* pMod ) -{ - TypeId aSlotType = SFX_SLOTPOOL().GetSlotType( nId ); - if ( aSlotType ) - { - if ( pMod ) - { - SfxMenuCtrlFactArr_Impl *pFactories = pMod->GetMenuCtrlFactories_Impl(); - if ( pFactories ) - { - SfxMenuCtrlFactArr_Impl &rFactories = *pFactories; - for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory ) - if ( rFactories[nFactory]->nTypeId == aSlotType && - ( ( rFactories[nFactory]->nSlotId == 0 ) || - ( rFactories[nFactory]->nSlotId == nId) ) ) - return sal_True; - } - } - - SfxMenuCtrlFactArr_Impl &rFactories = SFX_APP()->GetMenuCtrlFactories_Impl(); - - for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory ) - if ( rFactories[nFactory]->nTypeId == aSlotType && - ( ( rFactories[nFactory]->nSlotId == 0 ) || - ( rFactories[nFactory]->nSlotId == nId) ) ) - return sal_True; - } - return 0; -} - //-------------------------------------------------------------------- PopupMenu* SfxMenuControl::GetPopup () const diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 793c122394d0..d8e01e4c2e54 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -265,61 +265,6 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu ) return pThesSubMenu; } - -//-------------------------------------------------------------------- - -void SfxMenuManager::UseDefault() -{ - DBG_MEMTEST(); - - SFX_APP(); - SfxVirtualMenu *pOldVirtMenu=0; - if (pMenu) - { - pOldVirtMenu = pMenu; - pBindings->ENTERREGISTRATIONS(); - } - - SfxVirtualMenu *pVMenu = 0; - { - ResId aResId(GetType(),*pResMgr); - aResId.SetRT(RSC_MENU); - Menu *pSVMenu = new PopupMenu( aResId ); - - if ( bAddClipboardFuncs ) - { - sal_uInt16 n, nCount = pSVMenu->GetItemCount(); - for ( n=0; n<nCount; n++ ) - { - sal_uInt16 nId = pSVMenu->GetItemId( n ); - if ( nId == SID_COPY || nId == SID_CUT || nId == SID_PASTE ) - break; - } - - if ( n == nCount ) - { - PopupMenu aPop( SfxResId( MN_CLIPBOARDFUNCS ) ); - nCount = aPop.GetItemCount(); - pSVMenu->InsertSeparator(); - for ( n=0; n<nCount; n++ ) - { - sal_uInt16 nId = aPop.GetItemId( n ); - pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ) ); - } - } - } - - pVMenu = new SfxVirtualMenu( pSVMenu, sal_False, *pBindings, sal_True, sal_True ); - } - - Construct(*pVMenu); - if (pOldVirtMenu) - { - delete pOldVirtMenu; - pBindings->LEAVEREGISTRATIONS(); - } -} - // ------------------------------------------------------------------------ // executes the function for the selected item @@ -355,29 +300,6 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu ) //-------------------------------------------------------------------- -void SfxMenuManager::Construct_Impl( Menu* pSVMenu, sal_Bool bWithHelp ) -{ - SfxVirtualMenu *pOldVirtMenu=0; - if ( pMenu ) - { - // It is reconfigured - pOldVirtMenu = pMenu; - pBindings->ENTERREGISTRATIONS(); - } - - TryToHideDisabledEntries_Impl( pSVMenu ); - SfxVirtualMenu *pVMenu = new SfxVirtualMenu( pSVMenu, bWithHelp, *pBindings, sal_True ); - Construct(*pVMenu); - - if ( pOldVirtMenu ) - { - delete pOldVirtMenu; - pBindings->LEAVEREGISTRATIONS(); - } -} - -//-------------------------------------------------------------------- - // don't insert Popups into ConfigManager, they are not configurable at the moment ! SfxPopupMenuManager::SfxPopupMenuManager(const ResId& rResId, SfxBindings &rBindings ) : SfxMenuManager( rResId, rBindings ) |