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

Change-Id: I480a789c767dd671775c9d70d96bf71908f21f5b

9 files changed, 21 insertions, 21 deletions

diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 65b6ff7d5a01..72fab2ccb2e9 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -201,7 +201,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium)
     if ( !pFilter )
     {
         rMedium.UseInteractionHandler( true );
-        SFX_APP()->GetFilterMatcher().GuessFilter( rMedium, &pFilter );
+        SfxGetpApp()->GetFilterMatcher().GuessFilter( rMedium, &pFilter );
     }
 
     if ( !pFilter )
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 871bbc06b6ad..9bd820d35c6d 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -83,7 +83,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
     SetName( OUString( "StarDraw" ) );  // Do not translate!
     pSearchItem = new SvxSearchItem(SID_SEARCH_ITEM);
     pSearchItem->SetAppFlag(SVX_SEARCHAPP_DRAW);
-    StartListening( *SFX_APP() );
+    StartListening( *SfxGetpApp() );
     SvxErrorHandler::ensure();
     mpErrorHdl = new SfxErrorHandler( RID_SD_ERRHDL,
                                          ERRCODE_AREA_SD,
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index a10cbf31a868..b4d725649604 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -99,7 +99,7 @@ void SdModule::Execute(SfxRequest& rReq)
     {
         case SID_NEWDOC:
         {
-            SFX_APP()->ExecuteSlot(rReq, SFX_APP()->GetInterface());
+            SfxGetpApp()->ExecuteSlot(rReq, SfxGetpApp()->GetInterface());
         }
         break;
 
@@ -230,7 +230,7 @@ void SdModule::Execute(SfxRequest& rReq)
 
             if (!bIntercept)
             {
-                SFX_APP()->ExecuteSlot(rReq, SFX_APP()->GetInterface());
+                SfxGetpApp()->ExecuteSlot(rReq, SfxGetpApp()->GetInterface());
             }
             else
             {
@@ -358,7 +358,7 @@ void SdModule::GetState(SfxItemSet& rItemSet)
     // state of SID_OPENDOC is determined by the base class
     if (rItemSet.GetItemState(SID_OPENDOC) != SFX_ITEM_UNKNOWN)
     {
-        const SfxPoolItem* pItem = SFX_APP()->GetSlotState(SID_OPENDOC, SFX_APP()->GetInterface());
+        const SfxPoolItem* pItem = SfxGetpApp()->GetSlotState(SID_OPENDOC, SfxGetpApp()->GetInterface());
         if (pItem)
             rItemSet.Put(*pItem);
     }
@@ -366,7 +366,7 @@ void SdModule::GetState(SfxItemSet& rItemSet)
     // state of SID_OPENHYPERLINK is determined by the base class
     if (rItemSet.GetItemState(SID_OPENHYPERLINK) != SFX_ITEM_UNKNOWN)
     {
-        const SfxPoolItem* pItem = SFX_APP()->GetSlotState(SID_OPENHYPERLINK, SFX_APP()->GetInterface());
+        const SfxPoolItem* pItem = SfxGetpApp()->GetSlotState(SID_OPENHYPERLINK, SfxGetpApp()->GetInterface());
         if (pItem)
             rItemSet.Put(*pItem);
     }
@@ -498,10 +498,10 @@ SfxFrame* SdModule::CreateFromTemplate( const OUString& rTemplatePath, const Ref
 
     SfxObjectShellLock xDocShell;
 
-    SfxItemSet* pSet = new SfxAllItemSet( SFX_APP()->GetPool() );
+    SfxItemSet* pSet = new SfxAllItemSet( SfxGetpApp()->GetPool() );
     pSet->Put( SfxBoolItem( SID_TEMPLATE, true ) );
 
-    sal_uLong lErr = SFX_APP()->LoadTemplate( xDocShell, rTemplatePath, true, pSet );
+    sal_uLong lErr = SfxGetpApp()->LoadTemplate( xDocShell, rTemplatePath, true, pSet );
 
     SfxObjectShell* pDocShell = xDocShell;
 
@@ -601,7 +601,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
                         }
                         else
                         {
-                            SfxRequest aRequest (SID_OPENDOC, SFX_CALLMODE_SYNCHRON, SFX_APP()->GetPool());
+                            SfxRequest aRequest (SID_OPENDOC, SFX_CALLMODE_SYNCHRON, SfxGetpApp()->GetPool());
                             aRequest.AppendItem (aFile);
                             aRequest.AppendItem (aReferer);
                             // Put the password into the request
@@ -613,7 +613,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
                                 OUString("_default")));
                             try
                             {
-                                const SfxPoolItem* pRet = SFX_APP()->ExecuteSlot (aRequest);
+                                const SfxPoolItem* pRet = SfxGetpApp()->ExecuteSlot (aRequest);
                                 const SfxViewFrameItem* pFrameItem = PTR_CAST( SfxViewFrameItem, pRet );
                                 if ( pFrameItem )
                                     pFrame = &pFrameItem->GetFrame()->GetFrame();
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index b434666c28a8..0e7f4d39263b 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1406,7 +1406,7 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview )
     OUString aDocFile = GetDocFileName();
     OUString aLayoutFile = GetLayoutFileName();
 
-    SfxApplication *pSfxApp = SFX_APP();
+    SfxApplication *pSfxApp = SfxGetpApp();
     sal_uLong lErr;
     bool bChangeMaster = !aLayoutFile.isEmpty();
 
@@ -1468,14 +1468,14 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview )
         }
         else
         {
-            SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, SFX_APP()->GetPool() );
+            SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, SfxGetpApp()->GetPool() );
             aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aDocFile ));
             aReq.AppendItem( SfxStringItem( SID_REFERER, OUString() ) );
             aReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) );
             aReq.AppendItem( SfxBoolItem( SID_HIDDEN, true ) );
             aReq.AppendItem( SfxBoolItem( SID_PREVIEW, bDocPreview ) );
 
-            const SfxViewFrameItem* pRet = PTR_CAST( SfxViewFrameItem, SFX_APP()->ExecuteSlot( aReq ) );
+            const SfxViewFrameItem* pRet = PTR_CAST( SfxViewFrameItem, SfxGetpApp()->ExecuteSlot( aReq ) );
 
             if ( pRet && pRet->GetFrame() && pRet->GetFrame()->GetObjectShell() )
                 xDocShell = pRet->GetFrame()->GetObjectShell();
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 99a240760e27..4d172e02f431 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -92,7 +92,7 @@ rtl::Reference<FuPoor> FuInsertFile::Create( ViewShell* pViewSh, ::sd::Window* p
 
 void FuInsertFile::DoExecute( SfxRequest& rReq )
 {
-    SfxFilterMatcher&       rMatcher = SFX_APP()->GetFilterMatcher();
+    SfxFilterMatcher&       rMatcher = SfxGetpApp()->GetFilterMatcher();
     ::std::vector< OUString > aFilterVector;
     const SfxItemSet*       pArgs = rReq.GetArgs ();
 
@@ -251,7 +251,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
     SfxMedium*          pMedium = new SfxMedium( aFile, STREAM_READ | STREAM_NOCREATE );
     const SfxFilter*    pFilter = NULL;
 
-    SFX_APP()->GetFilterMatcher().GuessFilter( *pMedium, &pFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE );
+    SfxGetpApp()->GetFilterMatcher().GuessFilter( *pMedium, &pFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE );
 
     bool                bDrawMode = mpViewShell && mpViewShell->ISA(DrawViewShell);
     bool                bInserted = false;
@@ -718,7 +718,7 @@ bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium)
 
 void FuInsertFile::GetSupportedFilterVector( ::std::vector< OUString >& rFilterVector )
 {
-    SfxFilterMatcher&   rMatcher = SFX_APP()->GetFilterMatcher();
+    SfxFilterMatcher&   rMatcher = SfxGetpApp()->GetFilterMatcher();
     const SfxFilter*    pSearchFilter = NULL;
 
     rFilterVector.clear();
diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
index c81f74aaeca7..c197615666e3 100644
--- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
@@ -151,7 +151,7 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume
 
 ::sd::DrawDocShell* TemplatePageObjectProvider::LoadDocument (const OUString& sFileName)
 {
-    SfxApplication* pSfxApp = SFX_APP();
+    SfxApplication* pSfxApp = SfxGetpApp();
     SfxItemSet* pSet = new SfxAllItemSet (pSfxApp->GetPool());
     pSet->Put (SfxBoolItem (SID_TEMPLATE, true));
     pSet->Put (SfxBoolItem (SID_PREVIEW, true));
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 01219e549e07..ef06796497a2 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -189,7 +189,7 @@ void TableDesignWidget::ApplyStyle()
         {
             if( pView )
             {
-                SfxRequest aReq( SID_TABLE_STYLE, SFX_CALLMODE_SYNCHRON, SFX_APP()->GetPool() );
+                SfxRequest aReq( SID_TABLE_STYLE, SFX_CALLMODE_SYNCHRON, SfxGetpApp()->GetPool() );
                 aReq.AppendItem( SfxStringItem( SID_TABLE_STYLE, sStyleName ) );
 
                 rtl::Reference< sdr::SelectionController > xController( pView->getSelectionController() );
@@ -238,7 +238,7 @@ void TableDesignWidget::ApplyOptions()
 
     if( mxSelectedTable.is() )
     {
-        SfxRequest aReq( SID_TABLE_STYLE_SETTINGS, SFX_CALLMODE_SYNCHRON, SFX_APP()->GetPool() );
+        SfxRequest aReq( SID_TABLE_STYLE_SETTINGS, SFX_CALLMODE_SYNCHRON, SfxGetpApp()->GetPool() );
 
         for( sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i )
         {
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index cbb919c2ac1d..2ada0a9cbad7 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -199,7 +199,7 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
         pOptions->StoreConfig();
 
         // Saves the configuration IMMEDIATELY
-        // SFX_APP()->SaveConfiguration();
+        // SfxGetpApp()->SaveConfiguration();
         WriteFrameViewData();
 
         mpFrameView->Update( pOptions );
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 70adc9d90864..a437669a0ca8 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -447,7 +447,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl)
             {
                 const SfxFilter*        pFoundFilter = NULL;
                 SfxMedium               aSfxMedium( aCurrentDropFile, STREAM_READ | STREAM_SHARE_DENYNONE );
-                ErrCode                 nErr = SFX_APP()->GetFilterMatcher().GuessFilter(  aSfxMedium, &pFoundFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE );
+                ErrCode                 nErr = SfxGetpApp()->GetFilterMatcher().GuessFilter(  aSfxMedium, &pFoundFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE );
 
                 if( pFoundFilter && !nErr )
                 {