diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-07-14 22:06:29 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-07-14 22:06:29 +0100 |
commit | ef9239f42e98038b75c601e5b58b8b1fb8497a38 (patch) | |
tree | e6817951c08c7c5159404ba02be14d485b0de7d5 /sfx2 | |
parent | 27db97e6a07c92ee5c603e3228589b905c66f408 (diff) |
callcatcher: remove unused methods
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/inc/sfx2/dispatch.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/appl/workwin.cxx | 141 | ||||
-rw-r--r-- | sfx2/source/bastyp/helper.cxx | 26 | ||||
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 18 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/inc/helper.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/inc/templdgi.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/inc/workwin.hxx | 13 |
8 files changed, 0 insertions, 213 deletions
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx index 5e7dd33b32..a3b0e4fe34 100644 --- a/sfx2/inc/sfx2/dispatch.hxx +++ b/sfx2/inc/sfx2/dispatch.hxx @@ -248,7 +248,6 @@ public: SAL_DLLPRIVATE void SetModalMode_Impl( sal_Bool bOn ); SAL_DLLPRIVATE sal_Bool IsReadOnlyShell_Impl( sal_uInt16 nShell ) const; SAL_DLLPRIVATE void RemoveShell_Impl( SfxShell& rShell ); - SAL_DLLPRIVATE void InsertShell_Impl( SfxShell& rShell, sal_uInt16 nPos ); SAL_DLLPRIVATE void DoParentActivate_Impl(); SAL_DLLPRIVATE void DoParentDeactivate_Impl(); SAL_DLLPRIVATE void DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* pOld ); diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 1ce246f6e9..8402a6b93d 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -644,14 +644,6 @@ SfxWorkWindow::~SfxWorkWindow() m_xLayoutManagerListener->dispose(); } -SystemWindow* SfxWorkWindow::GetTopWindow() const -{ - Window* pRet = pWorkWin; - while ( pRet && !pRet->IsSystemWindow() ) - pRet = pRet->GetParent(); - return (SystemWindow*) pRet; -} - void SfxWorkWindow::Lock_Impl( sal_Bool bLock ) { if ( bLock ) @@ -668,37 +660,6 @@ void SfxWorkWindow::Lock_Impl( sal_Bool bLock ) ArrangeChilds_Impl(); } -void SfxWorkWindow::ChangeWindow_Impl( Window *pNew ) -{ - Window *pOld = pWorkWin; - pWorkWin = pNew; - for ( sal_uInt16 nPos = 0; nPos < pChilds->Count(); ++nPos ) - { - SfxChild_Impl *pCli = (*pChilds)[nPos]; - if ( pCli && pCli->pWin && pCli->pWin->GetParent() == pOld ) - { - pCli->pWin->SetParent( pNew ); - } - } -} - -void SfxWorkWindow::SaveStatus_Impl() -{ - sal_uInt16 nCount = pChildWins->Count(); - for ( sal_uInt16 n=0; n<nCount; n++ ) - { - SfxChildWin_Impl* pCW = (*pChildWins)[n]; - SfxChildWindow *pChild = pCW->pWin; - if (pChild) - { - sal_uInt16 nFlags = pCW->aInfo.nFlags; - pCW->aInfo = pChild->GetInfo(); - pCW->aInfo.nFlags |= nFlags; - SaveStatus_Impl(pChild, pCW->aInfo); - } - } -} - //-------------------------------------------------------------------- // Helper method to release the child lists. Should the destructor not be // called after this, instead work continues, then space for the object bars @@ -989,25 +950,6 @@ SvBorder SfxWorkWindow::Arrange_Impl() return IsDockingAllowed() ? aBorder : SvBorder(); } -//-------------------------------------------------------------------- -// Close-Handler: The Configuration of the ChildWindows is saved. - -void SfxWorkWindow::Close_Impl() -{ - for (sal_uInt16 n=0; n<pChildWins->Count(); n++) - { - SfxChildWin_Impl *pCW = (*pChildWins)[n]; - SfxChildWindow *pChild = pCW->pWin; - if (pChild) - { - sal_uInt16 nFlags = pCW->aInfo.nFlags; - pCW->aInfo = pChild->GetInfo(); - pCW->aInfo.nFlags |= nFlags; - SaveStatus_Impl(pChild, pCW->aInfo); - } - } -} - sal_Bool SfxWorkWindow::PrepareClose_Impl() { for (sal_uInt16 n=0; n<pChildWins->Count(); n++) @@ -1047,30 +989,6 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow, //-------------------------------------------------------------------- -void SfxWorkWindow::AlignChild_Impl( Window& rWindow, - const Size& rNewSize, - SfxChildAlignment eAlign ) -{ - DBG_CHKTHIS(SfxWorkWindow, 0); - DBG_ASSERT( SfxChildAlignValid(eAlign), "invalid align" ); - - SfxChild_Impl *pChild = FindChild_Impl(rWindow); - if ( pChild ) - { - if (pChild->eAlign != eAlign) - bSorted = sal_False; - - pChild->eAlign = eAlign; - pChild->aSize = rNewSize; - pChild->bResize = sal_True; - } - else { - OSL_FAIL( "aligning unregistered child" ); - } -} - -//-------------------------------------------------------------------- - void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow ) { DBG_CHKTHIS(SfxWorkWindow, 0); @@ -1224,15 +1142,6 @@ void SfxWorkWindow::ResetObjectBars_Impl() (*pChildWins)[n]->nId = 0; } -void SfxWorkWindow::NextObjectBar_Impl( sal_uInt16 ) -{ -} - -sal_uInt16 SfxWorkWindow::HasNextObjectBar_Impl( sal_uInt16, String* ) -{ - return 0; -} - //------------------------------------------------------------------------ void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId, @@ -1315,12 +1224,6 @@ sal_Bool SfxWorkWindow::IsVisible_Impl( sal_uInt16 nMode ) const } } -Window* SfxWorkWindow::GetObjectBar_Impl( sal_uInt16, sal_uInt32 ) -{ - return NULL; -} - -//------------------------------------------------------------------------ void SfxFrameWorkWin_Impl::UpdateObjectBars_Impl() { if ( pFrame->IsClosing_Impl() ) @@ -1731,36 +1634,6 @@ void SfxWorkWindow::SetStatusBar_Impl( sal_uInt32 nResId, SfxShell*, SfxBindings #define SFX_ITEMTYPE_STATBAR 4 -void SfxWorkWindow::SetTempStatusBar_Impl( sal_Bool bSet ) -{ - if ( aStatBar.bTemp != bSet && bShowStatusBar && IsVisible_Impl() ) - { - sal_Bool bOn = sal_False; - sal_Bool bReset = sal_False; - if ( bSet && !aStatBar.nId ) - { - bReset = sal_True; - SetStatusBar_Impl( SFX_ITEMTYPE_STATBAR, SFX_APP(), GetBindings() ); - } - - if ( aStatBar.nId && aStatBar.bOn && !bIsFullScreen ) - bOn = sal_True; - - aStatBar.bTemp = bSet; - if ( !bOn || bReset || (!bSet && aStatBar.nId ) ) - { - // Just do something if the temp settings really are causing - // anything - UpdateStatusBar_Impl(); - ArrangeChilds_Impl(); - ShowChilds_Impl(); - } - - if ( bReset ) - ResetStatusBar_Impl(); - } -} - void SfxWorkWindow::UpdateStatusBar_Impl() { Reference< ::com::sun::star::beans::XPropertySet > xPropSet( GetFrameInterface(), UNO_QUERY ); @@ -2885,11 +2758,6 @@ SfxChildWinController_Impl::SfxChildWinController_Impl( sal_uInt16 nID, SfxWorkW , pWorkwin( pWork ) {} -::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SfxWorkWindow::CreateDispatch( const String& ) -{ - return ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >(); -} - void SfxChildWinController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* ) { @@ -2917,11 +2785,6 @@ void SfxWorkWindow::SetActiveChild_Impl( Window *pChild ) pActiveChild = pChild; } -Window* SfxWorkWindow::GetActiveChild_Impl() -{ - return pActiveChild; -} - sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward ) { // Sort all children under list @@ -3036,10 +2899,6 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward ) return sal_False; } -void SfxWorkWindow::SetObjectBarCustomizeMode_Impl( sal_Bool ) -{ -} - void SfxWorkWindow::DataChanged_Impl( const DataChangedEvent& ) { sal_uInt16 n; diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index b7ecb65a06..3f5e75e569 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -788,32 +788,6 @@ sal_Bool SfxContentHelper::MakeFolder( const String& rFolder ) // ----------------------------------------------------------------------- -ErrCode SfxContentHelper::QueryDiskSpace( const String& rPath, sal_Int64& rFreeBytes ) -{ - ErrCode nErr = 0; - rFreeBytes = 0; - INetURLObject aObj( rPath ); - DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" ); - try - { - ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () ); - aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FreeSpace")) ) >>= rFreeBytes; - } - catch( const ucb::CommandAbortedException& ) - { - DBG_ERRORFILE( "CommandAbortedException" ); - nErr = ERRCODE_IO_GENERAL; - } - catch( const uno::Exception& ) - { - DBG_ERRORFILE( "Any other exception" ); - nErr = ERRCODE_IO_GENERAL; - } - return nErr; -} - -// ----------------------------------------------------------------------- - sal_uIntPtr SfxContentHelper::GetSize( const String& rContent ) { sal_uIntPtr nSize = 0; diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index c26713720c..70ead26c05 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -2801,24 +2801,6 @@ sal_Bool SfxDispatcher::IsReadOnlyShell_Impl( sal_uInt16 nShell ) const class StackAccess_Impl : public SfxShellStack_Implarr_ {}; -void SfxDispatcher::InsertShell_Impl( SfxShell& rShell, sal_uInt16 nPos ) -{ - Flush(); - - // The cast is because SfxShellStack_Impl member has non of its own - ((StackAccess_Impl*) (&pImp->aStack))->Insert( nPos, &rShell ); - rShell.SetDisableFlags( pImp->nDisableFlags ); - rShell.DoActivate_Impl(pImp->pFrame, sal_True); - - if ( !SFX_APP()->IsDowning() ) - { - pImp->bUpdated = sal_False; - pImp->pCachedServ1 = 0; - pImp->pCachedServ2 = 0; - InvalidateBindings_Impl(sal_True); - } -} - void SfxDispatcher::RemoveShell_Impl( SfxShell& rShell ) { Flush(); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 1f54aa5f57..d965286f54 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -869,18 +869,6 @@ void SfxTemplateDialog_Impl::EnableEdit(sal_Bool bEnable) //------------------------------------------------------------------------- - -sal_uInt16 SfxCommonTemplateDialog_Impl::InfoOffsetToStyleNr(sal_uInt16 nId) -{ - for ( size_t i = 0; i < pStyleFamilies->size(); i++ ) - if ( SfxFamilyIdToNId(pStyleFamilies->at( i )->GetFamily()) == nId+1 ) - return i; - OSL_FAIL("Style Nummer not found"); - return 0; -} - -//------------------------------------------------------------------------- - void SfxCommonTemplateDialog_Impl::ReadResource() { // Read global user resource diff --git a/sfx2/source/inc/helper.hxx b/sfx2/source/inc/helper.hxx index 93389a87d7..7856508886 100644 --- a/sfx2/source/inc/helper.hxx +++ b/sfx2/source/inc/helper.hxx @@ -66,7 +66,6 @@ public: static sal_Bool MoveTo( const String& rSource, const String& rDest, sal_Int32 nNameClash = com::sun::star::ucb::NameClash::ERROR ); static sal_Bool MakeFolder( const String& rFolder ); - static ErrCode QueryDiskSpace( const String& rPath, sal_Int64& rFreeBytes ); static sal_uIntPtr GetSize( const String& rContent ); // please don't use this! diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 0d27f381d4..a26724afe7 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -224,7 +224,6 @@ protected: // In which FamilyState do I have to look , in order to get the // information of the ith Family in the pStyleFamilies. sal_uInt16 StyleNrToInfoOffset( sal_uInt16 i ); - sal_uInt16 InfoOffsetToStyleNr( sal_uInt16 i ); void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index ecd1fa4269..084385a38e 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -278,8 +278,6 @@ protected: void CreateChildWin_Impl(SfxChildWin_Impl*,sal_Bool); void RemoveChildWin_Impl(SfxChildWin_Impl*); void Sort_Impl(); - void AlignChild_Impl( Window& rWindow, const Size& rNewSize, - SfxChildAlignment eAlign ); SfxChild_Impl* FindChild_Impl( const Window& rWindow ) const; virtual sal_Bool RequestTopToolSpacePixel_Impl( SvBorder aBorder ); virtual Rectangle GetTopRect_Impl(); @@ -290,7 +288,6 @@ protected: public: SfxWorkWindow( Window *pWin, SfxBindings& rBindings, SfxWorkWindow* pParent = NULL); virtual ~SfxWorkWindow(); - SystemWindow* GetTopWindow() const; SfxBindings& GetBindings() { return *pBindings; } Window* GetWindow() const @@ -306,7 +303,6 @@ public: { return bInternalDockingAllowed; } SfxWorkWindow* GetParent_Impl() const { return pParent; } - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > CreateDispatch( const String& ); // Methods for all Child windows void DataChanged_Impl( const DataChangedEvent& rDCEvt ); @@ -314,11 +310,9 @@ public: SfxChild_Impl* RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, sal_Bool bCanGetFocus=sal_False ); void ShowChilds_Impl(); void HideChilds_Impl(); - void Close_Impl(); sal_Bool PrepareClose_Impl(); virtual void ArrangeChilds_Impl( sal_Bool bForce = sal_True ); void DeleteControllers_Impl(); - void SaveStatus_Impl(); void HidePopups_Impl(sal_Bool bHide, sal_Bool bParent=sal_False, sal_uInt16 nId=0); void ConfigChild_Impl(SfxChildIdentifier, SfxDockingConfig, sal_uInt16); @@ -334,16 +328,12 @@ public: void ResetObjectBars_Impl(); void SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId, SfxInterface *pIFace, const String* pName=0 ); - Window* GetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId ); bool KnowsObjectBar_Impl( sal_uInt16 nPos ) const; sal_Bool IsVisible_Impl(); void MakeVisible_Impl( sal_Bool ); void SetObjectBarVisibility_Impl( sal_uInt16 nVis ); sal_Bool IsContainer_Impl() const; void Lock_Impl( sal_Bool ); - void NextObjectBar_Impl( sal_uInt16 nPos ); - sal_uInt16 HasNextObjectBar_Impl( sal_uInt16 nPos, String* pStr=0 ); - void SetObjectBarCustomizeMode_Impl( sal_Bool ); // Methods for ChildWindows void UpdateChildWindows_Impl(); @@ -361,14 +351,11 @@ public: sal_Bool IsVisible_Impl( sal_uInt16 nMode ) const; void DisableChildWindow_Impl( sal_uInt16 nId, sal_Bool bDisable ); sal_Bool IsFloating( sal_uInt16 nId ); - void ChangeWindow_Impl( Window *pNew ); void SetActiveChild_Impl( Window *pChild ); - Window* GetActiveChild_Impl(); virtual sal_Bool ActivateNextChild_Impl( sal_Bool bForward = sal_True ); bool AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const; // Methods for StatusBar - void SetTempStatusBar_Impl( sal_Bool bSet ); void ResetStatusBar_Impl(); void SetStatusBar_Impl(sal_uInt32 nResId, SfxShell *pShell, SfxBindings& ); void UpdateStatusBar_Impl(); |