remove SFX_APP() macro that was a mer wrapper for SfxGetApp()

Change-Id: I480a789c767dd671775c9d70d96bf71908f21f5b

7 files changed, 19 insertions, 19 deletions

diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index c1dddbaa99c5..aa78bea3b8f6 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -49,7 +49,7 @@ void basctl_DocShell::InitInterface_Impl()
 DocShell::DocShell()
     :SfxObjectShell( SFXMODEL_DISABLE_EMBEDDED_SCRIPTS | SFXMODEL_DISABLE_DOCUMENT_RECOVERY )
 {
-    SetPool( &SFX_APP()->GetPool() );
+    SetPool( &SfxGetpApp()->GetPool() );
     SetBaseModel( new SIDEModel(this) );
 }
 
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index f66f8ca44613..18be9999cbf8 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -370,7 +370,7 @@ void Shell::StoreAllWindowData( bool bPersistent )
 
     if ( bPersistent  )
     {
-        SFX_APP()->SaveBasicAndDialogContainer();
+        SfxGetpApp()->SaveBasicAndDialogContainer();
         SetAppBasicModified(false);
 
         if (SfxBindings* pBindings = GetBindingsPtr())
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index ccc1e23cfb6a..6a3f5998a6b5 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -422,9 +422,9 @@ long HandleBasicError( StarBASIC* pBasic )
                 pShell = GetShell();
                 if ( !pShell )
                 {
-                    SfxAllItemSet aArgs( SFX_APP()->GetPool() );
+                    SfxAllItemSet aArgs( SfxGetpApp()->GetPool() );
                     SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs );
-                    SFX_APP()->ExecuteSlot( aRequest );
+                    SfxGetpApp()->ExecuteSlot( aRequest );
                     pShell = GetShell();
                 }
             }
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index d5969d18becf..55f4f8010dbd 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -125,7 +125,7 @@ MacroChooser::MacroChooser( Window* pParnt, bool bCreateEntries )
 MacroChooser::~MacroChooser()
 {
     if ( bForceStoreBasic )
-        SFX_APP()->SaveBasicAndDialogContainer();
+        SfxGetpApp()->SaveBasicAndDialogContainer();
 }
 
 void MacroChooser::StoreMacroDescription()
@@ -674,9 +674,9 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
             if ( pEntry )
                 aInfoItem.SetMethod( m_pMacroBox->GetEntryText( pEntry ) );
             StoreMacroDescription();
-            SfxAllItemSet aArgs( SFX_APP()->GetPool() );
+            SfxAllItemSet aArgs( SfxGetpApp()->GetPool() );
             SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs );
-            SFX_APP()->ExecuteSlot( aRequest );
+            SfxGetpApp()->ExecuteSlot( aRequest );
 
             if (SfxDispatcher* pDispatcher = GetDispatcher())
                 pDispatcher->Execute( SID_BASICIDE_EDITMACRO, SFX_CALLMODE_ASYNCHRON, &aInfoItem, 0L );
@@ -710,9 +710,9 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
                     aInfoItem.SetMethod( pMethod->GetName() );
                     aInfoItem.SetModule( pMethod->GetModule()->GetName() );
                     aInfoItem.SetLib( pMethod->GetModule()->GetParent()->GetName() );
-                    SfxAllItemSet aArgs( SFX_APP()->GetPool() );
+                    SfxAllItemSet aArgs( SfxGetpApp()->GetPool() );
                     SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs );
-                    SFX_APP()->ExecuteSlot( aRequest );
+                    SfxGetpApp()->ExecuteSlot( aRequest );
 
                     if (SfxDispatcher* pDispatcher = GetDispatcher())
                         pDispatcher->Execute( SID_BASICIDE_EDITMACRO, SFX_CALLMODE_ASYNCHRON, &aInfoItem, 0L );
@@ -739,10 +739,10 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
         DBG_ASSERT( pMethod, "Method?" );
         OUString aComment( GetInfo( pMethod ) );
         SfxMacroInfoItem aItem( SID_MACROINFO, pBasMgr, aLib, aMod, aSub, aComment );
-        SfxAllItemSet Args( SFX_APP()->GetPool() );
+        SfxAllItemSet Args( SfxGetpApp()->GetPool() );
         SfxRequest aRequest( SID_CONFIG, SFX_CALLMODE_SYNCHRON, Args );
         aRequest.AppendItem( aItem );
-        SFX_APP()->ExecuteSlot( aRequest );
+        SfxGetpApp()->ExecuteSlot( aRequest );
     }
     else if (pButton == m_pNewLibButton)
     {
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 3a22d5714c16..199c5d4986c9 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -576,9 +576,9 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
 {
     if (pButton == m_pEditButton)
     {
-        SfxAllItemSet aArgs( SFX_APP()->GetPool() );
+        SfxAllItemSet aArgs( SfxGetpApp()->GetPool() );
         SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs );
-        SFX_APP()->ExecuteSlot( aRequest );
+        SfxGetpApp()->ExecuteSlot( aRequest );
 
         SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, makeAny( m_aCurDocument.getDocumentOrNull() ) );
         SvTreeListEntry* pCurEntry = m_pLibBox->GetCurEntry();
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 35f631659f23..dbae1502e23d 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -679,9 +679,9 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton )
 {
     if (pButton == m_pEditButton)
     {
-        SfxAllItemSet aArgs( SFX_APP()->GetPool() );
+        SfxAllItemSet aArgs( SfxGetpApp()->GetPool() );
         SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs );
-        SFX_APP()->ExecuteSlot( aRequest );
+        SfxGetpApp()->ExecuteSlot( aRequest );
 
         SfxDispatcher* pDispatcher = GetDispatcher();
         SvTreeListEntry* pCurEntry = m_pBasicBox->GetCurEntry();
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 4847ad098d92..c4f54e350118 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -372,7 +372,7 @@ namespace basctl
         try
         {
             if ( isApplication() )
-                xContainer.set( _eType == E_SCRIPTS ? SFX_APP()->GetBasicContainer() : SFX_APP()->GetDialogContainer(), UNO_QUERY_THROW );
+                xContainer.set( _eType == E_SCRIPTS ? SfxGetpApp()->GetBasicContainer() : SfxGetpApp()->GetDialogContainer(), UNO_QUERY_THROW );
             else
             {
                 xContainer.set(
@@ -430,7 +430,7 @@ namespace basctl
                 return NULL;
 
             if ( isApplication() )
-                return SFX_APP()->GetBasicManager();
+                return SfxGetpApp()->GetBasicManager();
 
             return ::basic::BasicManagerRepository::getDocumentBasicManager( m_xDocument );
         }
@@ -1088,7 +1088,7 @@ namespace basctl
 
     ScriptDocument ScriptDocument::getDocumentForBasicManager( const BasicManager* _pManager )
     {
-        if ( _pManager == SFX_APP()->GetBasicManager() )
+        if ( _pManager == SfxGetpApp()->GetBasicManager() )
             return getApplicationScriptDocument();
 
         docs::Documents aDocuments;
@@ -1100,7 +1100,7 @@ namespace basctl
             )
         {
             const BasicManager* pDocBasicManager = ::basic::BasicManagerRepository::getDocumentBasicManager( doc->xModel );
-            if  (   ( pDocBasicManager != SFX_APP()->GetBasicManager() )
+            if  (   ( pDocBasicManager != SfxGetpApp()->GetBasicManager() )
                 &&  ( pDocBasicManager == _pManager )
                 )
             {