extensions/workben/testframecontrol.cxx | 7 ------- sfx2/inc/sfx2/viewfrm.hxx | 3 --- sfx2/source/appl/appbas.cxx | 6 ------ sfx2/source/bastyp/progress.cxx | 6 ------ sfx2/source/doc/objstor.cxx | 7 ------- sfx2/source/view/viewfrm.cxx | 10 ---------- sw/source/ui/docvw/edtwin.cxx | 6 ------ vcl/inc/vcl/svapp.hxx | 3 --- vcl/source/app/svapp.cxx | 12 ------------ 9 files changed, 60 deletions(-)
New commits: commit b3a3ab05e41a34c4a9d62639993f215dd47a2ae9 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Jun 9 06:32:31 2012 +0200 Remove non-functional Hide/ShowStatusText Change-Id: Ifad680ea6f2f3693fecc649a000e638052dcf080 diff --git a/extensions/workben/testframecontrol.cxx b/extensions/workben/testframecontrol.cxx index a4b715b..758738e 100644 --- a/extensions/workben/testframecontrol.cxx +++ b/extensions/workben/testframecontrol.cxx @@ -200,7 +200,6 @@ class FrameControlApplication { public: virtual void Main(); - virtual void ShowStatusText( const XubString& rText ); public: FrameControlApplication() {} @@ -308,10 +307,4 @@ void FrameControlApplication::Main() deinit(); } -//-------------------------------------------------------------------------------------------------- -void FrameControlApplication::ShowStatusText( const XubString& rStatus ) -{ - Application::GetAppWindow()->SetText( rStatus ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx index 18c8678..5cc3259 100644 --- a/sfx2/inc/sfx2/viewfrm.hxx +++ b/sfx2/inc/sfx2/viewfrm.hxx @@ -157,9 +157,6 @@ public: const ::com::sun::star::uno::Any & rValue ); virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const String& rItem ); - void ShowStatusText( const String& rText ); - void HideStatusText(); - void UpdateTitle(); static void ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL ); diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 0018663..1e79632 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -250,12 +250,6 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq ) case SID_STATUSBARTEXT: { - SFX_REQUEST_ARG(rReq, pStringItem, SfxStringItem, nSID, sal_False); - String aText = pStringItem->GetValue(); - if ( aText.Len() ) - GetpApp()->ShowStatusText( aText ); - else - GetpApp()->HideStatusText(); break; } diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index f31b125..d48c8cd 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -68,7 +68,6 @@ struct SfxProgress_Impl sal_Bool bWaitMode; sal_Bool bAllowRescheduling; sal_Bool bRunning; - sal_Bool bIsStatusText; SfxProgress* pActiveProgress; SfxObjectShellRef xObjSh; @@ -157,7 +156,6 @@ SfxProgress::SfxProgress pImp->nMax = nRange; pImp->bLocked = sal_False; pImp->bWaitMode = bWait; - pImp->bIsStatusText = sal_False; pImp->nCreate = Get10ThSec(); pImp->nNextReschedule = pImp->nCreate; DBG( DbgOutf( "SfxProgress: created for '%s' at %luds", @@ -188,9 +186,6 @@ SfxProgress::~SfxProgress() Stop(); if ( pImp->xStatusInd.is() ) pImp->xStatusInd->end(); - - if( pImp->bIsStatusText == sal_True ) - GetpApp()->HideStatusText( ); delete pImp; } @@ -256,7 +251,6 @@ long TimeOut_Impl( void*, void* pArgV ) Timer *pArg = (Timer*)pArgV; if( Time::GetSystemTicks() - nLastTime > 3000 ) { - GetpApp()->HideStatusText(); nLastTime = 0; delete pArg; } diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 3700d57..3645e8a 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -580,9 +580,6 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) { ModifyBlocker_Impl aBlock( this ); - if ( SFX_CREATE_MODE_EMBEDDED != eCreateMode ) - GetpApp()->ShowStatusText( SfxResId(STR_DOC_LOADING) ); - pMedium = pMed; pMedium->CanDisposeStorage_Impl( sal_True ); @@ -805,8 +802,6 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) if ( SFX_CREATE_MODE_EMBEDDED != eCreateMode ) { - GetpApp()->HideStatusText(); - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pAsTempItem, SfxBoolItem, SID_TEMPLATE, sal_False); SFX_ITEMSET_ARG( pMedium->GetItemSet(), pPreviewItem, SfxBoolItem, SID_PREVIEW, sal_False); SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False); @@ -829,8 +824,6 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) if (bReconnectDde) ReconnectDdeLinks(*this); } - else - GetpApp()->HideStatusText(); return bOk; } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 09351f1..1f920bc 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1589,16 +1589,6 @@ SfxProgress* SfxViewFrame::GetProgress() const } //-------------------------------------------------------------------- -void SfxViewFrame::ShowStatusText( const String& /*rText*/) -{ -} - -//-------------------------------------------------------------------- -void SfxViewFrame::HideStatusText() -{ -} - -//-------------------------------------------------------------------- void SfxViewFrame::DoAdjustPosSizePixel //! divide on Inner.../Outer... ( SfxViewShell* pSh, diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index b923ec5..6e40e57 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -417,8 +417,6 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier ) pUserMarker = 0L; } - rView.GetViewFrame()->ShowStatusText( - SW_RESSTR(STR_CHAIN_OK+nChainable)); SetPointer( eStyle ); return; } @@ -3452,8 +3450,6 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) if ( IsChainMode() ) { UpdatePointer( aDocPt, rMEvt.GetModifier() ); - if ( rMEvt.IsLeaveWindow() ) - rView.GetViewFrame()->HideStatusText(); return; } @@ -5439,8 +5435,6 @@ void SwEditWin::SetChainMode( sal_Bool bOn ) } bChainMode = bOn; - if ( !bChainMode ) - rView.GetViewFrame()->HideStatusText(); static sal_uInt16 aInva[] = { diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index acea686..3f04045 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -177,9 +177,6 @@ public: virtual void ActivateExtHelp(); virtual void DeactivateExtHelp(); - virtual void ShowStatusText( const XubString& rText ); - virtual void HideStatusText(); - virtual void FocusChanged(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 7e6d544..17c29aa 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -256,12 +256,6 @@ void Application::UserEvent( sal_uLong, void* ) // ----------------------------------------------------------------------- -void Application::ShowStatusText( const XubString& ) -{ -} - -// ----------------------------------------------------------------------- - void Application::ActivateExtHelp() { } @@ -274,12 +268,6 @@ void Application::DeactivateExtHelp() // ----------------------------------------------------------------------- -void Application::HideStatusText() -{ -} - -// ----------------------------------------------------------------------- - void Application::FocusChanged() { } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits