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/notify | |
| parent | 556981f07815a0de0ad3576ba6f8639671a6c13c (diff) | |
remove SFX_APP() macro that was a mer wrapper for SfxGetApp()
Change-Id: I480a789c767dd671775c9d70d96bf71908f21f5b
Diffstat (limited to 'sfx2/source/notify')
| -rw-r--r-- | sfx2/source/notify/eventsupplier.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/notify/globalevents.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 9832c47e3492..311faf5fb795 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -395,7 +395,7 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const uno::Any& rElement, SfxObjectShe if ( !aMacroName.isEmpty() ) { if ( aLibrary == "application" ) - aLibrary = SFX_APP()->GetName(); + aLibrary = SfxGetpApp()->GetName(); else aLibrary = ""; pMacro = new SvxMacro( aMacroName, aLibrary, eType ); @@ -448,7 +448,7 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i if ( aBasMgrName == "." ) aLibrary = pDoc->GetTitle(); else - aLibrary = SFX_APP()->GetName(); + aLibrary = SfxGetpApp()->GetName(); // Get the macro name aMacroName = aScript.copy( nHashPos+1, nArgsPos - nHashPos - 1 ); @@ -462,7 +462,7 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i else if ( !aMacroName.isEmpty() ) { aScript = OUString( MACRO_PRFIX ); - if ( aLibrary != SFX_APP()->GetName() && aLibrary != "StarDesktop" && aLibrary != "application" ) + if ( aLibrary != SfxGetpApp()->GetName() && aLibrary != "StarDesktop" && aLibrary != "application" ) aScript += OUString('.'); aScript += OUString('/'); diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx index fa0949382212..04aef56c3c3f 100644 --- a/sfx2/source/notify/globalevents.cxx +++ b/sfx2/source/notify/globalevents.cxx @@ -236,7 +236,7 @@ SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const uno::Reference < uno::XCompone , pImp (0 ) { m_refCount++; - SFX_APP(); + SfxGetpApp(); pImp = new GlobalEventConfig(); m_xEvents = pImp; m_refCount--; |