diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-06-27 10:26:55 +0200 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-06-27 17:08:04 +0200 |
commit | d92aa2f445662aa9ca7d81fef1e667bcae031fc6 (patch) | |
tree | a773275c7753286fbf116eef4d20c1f31bb6b123 /sfx2/source/bastyp/progress.cxx | |
parent | 556981f07815a0de0ad3576ba6f8639671a6c13c (diff) |
remove SFX_APP() macro that was a mer wrapper for SfxGetApp()
Change-Id: I480a789c767dd671775c9d70d96bf71908f21f5b
Diffstat (limited to 'sfx2/source/bastyp/progress.cxx')
-rw-r--r-- | sfx2/source/bastyp/progress.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 2b4a51a83d90..83410b689f1b 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -97,7 +97,7 @@ void SfxProgress_Impl::Enable_Impl( bool bEnable ) } if ( !pDoc ) - SFX_APP()->GetAppDispatcher_Impl()->Lock( !bEnable ); + SfxGetpApp()->GetAppDispatcher_Impl()->Lock( !bEnable ); } @@ -170,7 +170,7 @@ SfxProgress::SfxProgress if ( pObjSh ) pObjSh->SetProgress_Impl(this); else if( !pImp->pActiveProgress ) - SFX_APP()->SetProgress_Impl(this); + SfxGetpApp()->SetProgress_Impl(this); Resume(); } @@ -218,7 +218,7 @@ void SfxProgress::Stop() if ( pImp->xObjSh.Is() ) pImp->xObjSh->SetProgress_Impl(0); else - SFX_APP()->SetProgress_Impl(0); + SfxGetpApp()->SetProgress_Impl(0); if ( pImp->bLocked ) pImp->Enable_Impl(true); } @@ -320,7 +320,7 @@ bool SfxProgress::SetState } else if ( pImp->pView ) { - pImp->pWorkWin = SFX_APP()->GetWorkWindow_Impl( pImp->pView ); + pImp->pWorkWin = SfxGetpApp()->GetWorkWindow_Impl( pImp->pView ); if ( pImp->pWorkWin ) pImp->xStatusInd = pImp->pWorkWin->GetStatusIndicator(); } @@ -454,7 +454,7 @@ void SfxProgress::Reschedule() SFX_STACK(SfxProgress::Reschedule); if( pImp->pActiveProgress ) return; - SfxApplication* pApp = SFX_APP(); + SfxApplication* pApp = SfxGetpApp(); if ( pImp->bLocked && 0 == pApp->Get_Impl()->nRescheduleLocks ) { SfxAppData_Impl *pAppData = pApp->Get_Impl(); @@ -509,7 +509,7 @@ SfxProgress* SfxProgress::GetActiveProgress if ( pDocSh ) pProgress = pDocSh->GetProgress(); if ( !pProgress ) - pProgress = SFX_APP()->GetProgress(); + pProgress = SfxGetpApp()->GetProgress(); return pProgress; } @@ -517,14 +517,14 @@ SfxProgress* SfxProgress::GetActiveProgress void SfxProgress::EnterLock() { - SFX_APP()->Get_Impl()->nRescheduleLocks++; + SfxGetpApp()->Get_Impl()->nRescheduleLocks++; } void SfxProgress::LeaveLock() { - SfxAppData_Impl *pImp = SFX_APP()->Get_Impl(); + SfxAppData_Impl *pImp = SfxGetpApp()->Get_Impl(); DBG_ASSERT( 0 != pImp->nRescheduleLocks, "SFxProgress::LeaveLock but no locks" ); pImp->nRescheduleLocks--; } |