diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-18 00:56:28 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-18 09:16:28 +0100 |
commit | b48a6f14e5fff7ec8f2a9f9fcf49a035b7287c97 (patch) | |
tree | 6591bd060485537467558df50f14bb4ca2718e6d /sfx2 | |
parent | f0cb9d723ed4b561ec771abbb9f1888c66ba348e (diff) |
callcatcher: unused code
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/inc/orgmgr.hxx | 1 | ||||
-rw-r--r-- | sfx2/inc/sfx2/objsh.hxx | 2 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sfxstatuslistener.hxx | 2 | ||||
-rw-r--r-- | sfx2/inc/sorgitm.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/control/sfxstatuslistener.cxx | 43 | ||||
-rw-r--r-- | sfx2/source/control/sorgitm.cxx | 11 | ||||
-rw-r--r-- | sfx2/source/doc/objmisc.cxx | 35 | ||||
-rw-r--r-- | sfx2/source/inc/virtmenu.hxx | 5 | ||||
-rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 80 | ||||
-rw-r--r-- | sfx2/source/view/orgmgr.cxx | 7 |
10 files changed, 0 insertions, 187 deletions
diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx index da26a55f0921..d2fe396b6bf4 100644 --- a/sfx2/inc/orgmgr.hxx +++ b/sfx2/inc/orgmgr.hxx @@ -46,7 +46,6 @@ public: ~SfxObjectList(); const String& GetBaseName( sal_uInt16 nId ) const; - const String& GetFileName( sal_uInt16 nId ) const; }; class IntlWrapper; diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index 31890aa1d5e4..104a67743d86 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -282,7 +282,6 @@ public: sal_Bool IsInModalMode() const; sal_Bool IsInPrepareClose() const; virtual sal_Bool AcceptStateUpdate() const; - sal_Bool HasModalViews() const; sal_Bool IsHelpDocument() const; sal_Bool IsDocShared() const; @@ -454,7 +453,6 @@ public: sal_Bool IsLoading() const; sal_Bool IsLoadingFinished() const; void SetAutoLoad( const INetURLObject&, sal_uInt32 nTime, sal_Bool bReload = sal_True ); - void LockAutoLoad( sal_Bool bLock ); sal_Bool IsAutoLoadLocked() const; void NotifyReloadAvailable(); sal_Bool IsSecure(); diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx index c8b709e2aeb5..2fa370e717b7 100644 --- a/sfx2/inc/sfx2/sfxstatuslistener.hxx +++ b/sfx2/inc/sfx2/sfxstatuslistener.hxx @@ -62,8 +62,6 @@ class SFX2_DLLPUBLIC SfxStatusListener : // old methods from SfxControllerItem sal_uInt16 GetId() const { return m_nSlotID; } - void Bind(); - void Bind( sal_uInt16 nSlotID, const rtl::OUString& rNewCommand ); void UnBind(); void ReBind(); diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx index aedb2ab16ac8..a162bcc35ae4 100644 --- a/sfx2/inc/sorgitm.hxx +++ b/sfx2/inc/sorgitm.hxx @@ -40,7 +40,6 @@ private: public: TYPEINFO(); SfxScriptOrganizerItem(); - SfxScriptOrganizerItem( const String &rLanguage ); SfxScriptOrganizerItem( const SfxScriptOrganizerItem& ); virtual ~SfxScriptOrganizerItem(); diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index c40263f18cac..24bfb7d67306 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -85,49 +85,6 @@ void SfxStatusListener::StateChanged( sal_uInt16, SfxItemState, const SfxPoolIte // must be implemented by sub class } -void SfxStatusListener::Bind() -{ - if ( !m_xDispatch.is() && m_xDispatchProvider.is() ) - { - m_xDispatch = m_xDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 ); - try - { - Reference< XStatusListener > aStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY ); - m_xDispatch->addStatusListener( aStatusListener, m_aCommand ); - } - catch( Exception& ) - { - } - } -} - -void SfxStatusListener::Bind( sal_uInt16 nSlotId, const rtl::OUString& rNewCommand ) -{ - // first remove old listener, if we have a dispatch object - Reference< XStatusListener > aStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY ); - if ( m_xDispatch.is() ) - m_xDispatch->removeStatusListener( aStatusListener, m_aCommand ); - if ( m_xDispatchProvider.is() ) - { - // Store new command data and query for new dispatch - m_nSlotID = nSlotId; - m_aCommand.Complete = rNewCommand; - Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY ); - xTrans->parseStrict( m_aCommand ); - - m_xDispatch = m_xDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 ); - - try - { - m_xDispatch->addStatusListener( aStatusListener, m_aCommand ); - } - catch( Exception& ) - { - } - } -} - void SfxStatusListener::UnBind() { if ( m_xDispatch.is() ) diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx index 4bf146527839..65301b985f1a 100644 --- a/sfx2/source/control/sorgitm.cxx +++ b/sfx2/source/control/sorgitm.cxx @@ -46,17 +46,6 @@ SfxScriptOrganizerItem::SfxScriptOrganizerItem() : //------------------------------------------------------------------------ -SfxScriptOrganizerItem::SfxScriptOrganizerItem( const String& rLanguage ) : - - SfxStringItem( SID_SCRIPTORGANIZER, rLanguage ), - - aLanguage( rLanguage ) - -{ -} - -//------------------------------------------------------------------------ - SfxScriptOrganizerItem::SfxScriptOrganizerItem( const SfxScriptOrganizerItem& rItem ) : SfxStringItem( rItem ), diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 14d87ac3df96..2f12a8bfa790 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -483,22 +483,6 @@ sal_Bool SfxObjectShell::AcceptStateUpdate() const //------------------------------------------------------------------------- -sal_Bool SfxObjectShell::HasModalViews() const -{ - SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this ); - while( pFrame ) - { - if ( pFrame->IsInModalMode() ) - return sal_True; - - pFrame = SfxViewFrame::GetNext( *pFrame, this ); - } - - return sal_False; -} - -//------------------------------------------------------------------------- - void SfxObjectShell::SetMacroMode_Impl( sal_Bool bModal ) { if ( !pImp->bRunningMacro != !bModal ) @@ -1137,25 +1121,6 @@ void SfxObjectShell::PrepareReload( ) { } -//------------------------------------------------------------------------- - -void SfxObjectShell::LockAutoLoad( sal_Bool bLock ) - -/* [Description] - - Prevents an possible occuring autoload. Takes also FrameSet into account. - before the autoload. -*/ - -{ - if ( bLock ) - ++pImp->nAutoLoadLocks; - else - --pImp->nAutoLoadLocks; -} - -//------------------------------------------------------------------------- - // Can be moved to frame.cxx, when 358+36x-State have been merged sal_Bool SfxFrame::IsAutoLoadLocked_Impl() const diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index 3d3270d51a37..3da800c37e60 100644 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -106,9 +106,6 @@ public: SfxMenuControl& operator[]( sal_uInt16 nPos ) const; sal_uInt16 GetItemId( sal_uInt16 nPos ) const; - SfxVirtualMenu* GetPopupMenu( sal_uInt16 nId ) const; - String GetItemText( sal_uInt16 nId ) const; - SfxVirtualMenu* GetParentMenu() const { return pParent; } void SetParentMenu( SfxVirtualMenu* pNewParent ) @@ -121,8 +118,6 @@ public: void InitializeHelp(); void SetResMgr(ResMgr* pMgr) {pResMgr = pMgr; } ResMgr* GetResMgr() { return pResMgr; } - void SetHelpIds( ResMgr* ); - void UpdateImages(); DECL_LINK( Select, Menu * ); }; diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index e427b052b2b4..723f49000824 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -609,51 +609,6 @@ IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG ) //-------------------------------------------------------------------- -void SfxVirtualMenu::UpdateImages() -{ - sal_Bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus(); - - if ( bIcons ) - { - sal_uInt16 nItemCount = pSVMenu->GetItemCount(); - SfxViewFrame * pViewFrame = pBindings->GetDispatcher()->GetFrame(); - Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() ); - - for ( sal_uInt16 nSVPos=0; nSVPos < nItemCount; ++nSVPos ) - { - sal_uInt16 nSlotId = pSVMenu->GetItemId( nSVPos ); - if ( pSVMenu->GetItemType( nSVPos ) == MENUITEM_STRINGIMAGE ) - { - if ( framework::AddonMenuManager::IsAddonMenuId( nSlotId )) - { - // Special code for Add-On menu items. They can appear inside the help menu. - rtl::OUString aCmd( pSVMenu->GetItemCommand( nSlotId ) ); - rtl::OUString aImageId; - - ::framework::MenuConfiguration::Attributes* pMenuAttributes = - (::framework::MenuConfiguration::Attributes*)pSVMenu->GetUserValue( nSlotId ); - - if ( pMenuAttributes ) - aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes - - pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, false )); - } - else - { - rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId )); - pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, false )); - } - } - } - - if ( pImageControl ) - pImageControl->Update(); - } -} - -//-------------------------------------------------------------------- - void SfxVirtualMenu::UpdateImages( Menu* pMenu ) { if ( !pMenu ) @@ -1109,34 +1064,6 @@ sal_uInt16 SfxVirtualMenu::GetItemPos( sal_uInt16 nItemId ) const //-------------------------------------------------------------------- -// returns the popup-menu assigned to the item or 0 if none - -SfxVirtualMenu* SfxVirtualMenu::GetPopupMenu( sal_uInt16 nItemId ) const -{ - DBG_MEMTEST(); - DBG_CHKTHIS(SfxVirtualMenu, 0); - - sal_uInt16 nPos = GetItemPos(nItemId); - if ( nPos != MENU_ITEM_NOTFOUND ) - return (pItems+nPos)->GetPopupMenu(); - return 0; -} -//-------------------------------------------------------------------- - -// returns the text of the item as currently shown in the menu - -String SfxVirtualMenu::GetItemText( sal_uInt16 nSlotId ) const -{ - DBG_MEMTEST(); - DBG_CHKTHIS(SfxVirtualMenu, 0); - - sal_uInt16 nPos = GetItemPos(nSlotId); - if ( nPos != MENU_ITEM_NOTFOUND ) - return (pItems+nPos)->GetTitle(); - return String(); -} -//-------------------------------------------------------------------- - // set the checkmark of the specified item void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck ) @@ -1241,11 +1168,4 @@ void SfxVirtualMenu::InitializeHelp() bHelpInitialized = sal_True; } -typedef sal_uIntPtr (__LOADONCALLAPI *HelpIdFunc) ( const String& ); - -void SfxVirtualMenu::SetHelpIds( ResMgr *pRes ) -{ - pResMgr = pRes; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx index b33684a4e6f4..c1015d225bfc 100644 --- a/sfx2/source/view/orgmgr.cxx +++ b/sfx2/source/view/orgmgr.cxx @@ -214,13 +214,6 @@ const String &SfxObjectList::GetBaseName(sal_uInt16 i) const //------------------------------------------------------------------------- -const String& SfxObjectList::GetFileName( sal_uInt16 i ) const -{ - return (*this)[i]->aFileName; -} - -//------------------------------------------------------------------------- - SfxOrganizeMgr::SfxOrganizeMgr( SfxOrganizeListBox_Impl *pLeft, SfxOrganizeListBox_Impl *pRight, SfxDocumentTemplates *pTempl) : |