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

Change-Id: I480a789c767dd671775c9d70d96bf71908f21f5b

8 files changed, 22 insertions, 22 deletions

diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 38bb11671f40..ffb147e382f3 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -495,7 +495,7 @@ void SpellDialog::StartSpellOptDlg_Impl()
         SID_AUTOSPELL_CHECK, SID_AUTOSPELL_CHECK,
         0
     };
-    SfxItemSet aSet( SFX_APP()->GetPool(), aSpellInfos);
+    SfxItemSet aSet( SfxGetpApp()->GetPool(), aSpellInfos);
     aSet.Put(SfxSpellCheckItem( xSpell, SID_ATTR_SPELL ));
     SfxSingleTabDialog* pDlg =
         new SfxSingleTabDialog(this, aSet, "SpellOptionsDialog", "cui/ui/spelloptionsdialog.ui");
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index f23c8e1082dc..5ea074da9999 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -101,7 +101,7 @@ SvxCharacterMap::SvxCharacterMap( Window* pParent, bool bOne_, const SfxItemSet*
         SetCharFont( aTmpFont );
     }
 
-    CreateOutputItemSet( pSet ? *pSet->GetPool() : SFX_APP()->GetPool() );
+    CreateOutputItemSet( pSet ? *pSet->GetPool() : SfxGetpApp()->GetPool() );
 }
 
 
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index ecbf3ffd4029..a63fba041fb5 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -345,7 +345,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
     }
     else if (m_pSoundsLikeCJKSettings == pButton)
     {
-        SfxItemSet aSet( SFX_APP()->GetPool() );
+        SfxItemSet aSet( SfxGetpApp()->GetPool() );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         if(pFact)
         {
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 33081c158a07..5bf73b9415d8 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -117,7 +117,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
     GetCancelButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_CLOSEBUT) );
 
     // create itemset for tabpages
-    mpItemSet = new SfxItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK,
+    mpItemSet = new SfxItemSet( SfxGetpApp()->GetPool(), SID_HYPERLINK_GETLINK,
                                SID_HYPERLINK_SETLINK );
 
     SvxHyperlinkItem aItem;
@@ -197,7 +197,7 @@ void SvxHpLinkDlg::Move()
         Size aDlgSize ( GetSizePixel () );
 
         // Size of Office-Main-Window
-        Size aWindowSize( SFX_APP()->GetTopWindow()->GetSizePixel() );
+        Size aWindowSize( SfxGetpApp()->GetTopWindow()->GetSizePixel() );
 
         // Size of Extrawindow
         Size aExtraWndSize( pCurrentPage->GetSizeExtraWnd() );
@@ -239,7 +239,7 @@ void SvxHpLinkDlg::Move()
 
 IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl)
 {
-    SfxItemSet aItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK,
+    SfxItemSet aItemSet( SfxGetpApp()->GetPool(), SID_HYPERLINK_GETLINK,
                          SID_HYPERLINK_SETLINK );
 
     SvxHyperlinkTabPageBase* pCurrentPage = (SvxHyperlinkTabPageBase*)
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index b019bebde343..3b3cd201783b 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -307,7 +307,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl)
             aItem.SetMacroTable( *pMacroTbl );
 
         // create empty itemset for macro-dlg
-        SfxItemSet* pItemSet = new SfxItemSet(SFX_APP()->GetPool(),
+        SfxItemSet* pItemSet = new SfxItemSet(SfxGetpApp()->GetPool(),
                                               SID_ATTR_MACROITEM,
                                               SID_ATTR_MACROITEM );
         pItemSet->Put ( aItem, SID_ATTR_MACROITEM );
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 01490ba0fc82..55d20b3ccc17 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1596,7 +1596,7 @@ class SvxMacroAssignDialog : public VclAbstractDialog
 public:
     SvxMacroAssignDialog( Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode,
             const Reference< XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent )
-        :m_aItems( SFX_APP()->GetPool(), SID_ATTR_MACROITEM, SID_ATTR_MACROITEM )
+        :m_aItems( SfxGetpApp()->GetPool(), SID_ATTR_MACROITEM, SID_ATTR_MACROITEM )
     {
         m_aItems.Put( SfxBoolItem( SID_ATTR_MACROITEM, _bUnoDialogMode ) );
         m_pDialog.reset( new SvxMacroAssignDlg( _pParent, _rxDocumentFrame, m_aItems, _rxEvents, _nInitiallySelectedEvent ) );
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index b39286939c8a..fad0d74bd32f 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -513,7 +513,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder )
             SvtViewOptions aDlgOpt( E_DIALOG, IODLG_CONFIGNAME );
             aDlgOpt.Delete();
             // Reset also last used dir in the sfx application instance
-            SfxApplication *pSfxApp = SFX_APP();
+            SfxApplication *pSfxApp = SfxGetpApp();
             pSfxApp->ResetLastDir();
 
             // Set configuration flag to notify file picker that it's necessary
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 1420c3ae2811..ed363cce9f2a 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1230,7 +1230,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
         case SID_GENERAL_OPTIONS:
         {
             pRet = new SfxItemSet(
-                SFX_APP()->GetPool(),
+                SfxGetpApp()->GetPool(),
                 SID_ATTR_METRIC, SID_ATTR_SPELL,
                 SID_AUTOSPELL_CHECK, SID_AUTOSPELL_CHECK,
                 SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER,
@@ -1238,8 +1238,8 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
                 SID_HTML_MODE, SID_HTML_MODE,
                 0 );
 
-            SfxItemSet aOptSet( SFX_APP()->GetPool(), SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER );
-            SFX_APP()->GetOptions(aOptSet);
+            SfxItemSet aOptSet( SfxGetpApp()->GetPool(), SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER );
+            SfxGetpApp()->GetOptions(aOptSet);
             pRet->Put(aOptSet);
 
             utl::MiscCfg    aMisc;
@@ -1270,7 +1270,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
         break;
         case SID_LANGUAGE_OPTIONS :
         {
-            pRet = new SfxItemSet(SFX_APP()->GetPool(),
+            pRet = new SfxItemSet(SfxGetpApp()->GetPool(),
                     SID_ATTR_LANGUAGE, SID_AUTOSPELL_CHECK,
                     SID_ATTR_CHAR_CJK_LANGUAGE, SID_ATTR_CHAR_CTL_LANGUAGE,
                     SID_OPT_LOCALE_CHANGED, SID_OPT_LOCALE_CHANGED,
@@ -1328,7 +1328,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
         }
         break;
         case SID_INET_DLG :
-                pRet = new SfxItemSet( SFX_APP()->GetPool(),
+                pRet = new SfxItemSet( SfxGetpApp()->GetPool(),
                                 SID_BASIC_ENABLED, SID_BASIC_ENABLED,
                 //SID_OPTIONS_START - ..END
                                 SID_INET_PROXY_TYPE, SID_INET_PROXY_PORT,
@@ -1338,20 +1338,20 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
                                 SID_INET_DNS_AUTO, SID_INET_DNS_SERVER,
                                 SID_SECURE_URL, SID_SECURE_URL,
                                 0L );
-                SFX_APP()->GetOptions(*pRet);
+                SfxGetpApp()->GetOptions(*pRet);
         break;
         case SID_FILTER_DLG:
-            pRet = new SfxItemSet( SFX_APP()->GetPool(),
+            pRet = new SfxItemSet( SfxGetpApp()->GetPool(),
             SID_ATTR_DOCINFO, SID_ATTR_AUTOSAVEMINUTE,
             SID_SAVEREL_INET, SID_SAVEREL_FSYS,
             SID_ATTR_PRETTYPRINTING, SID_ATTR_PRETTYPRINTING,
             SID_ATTR_WARNALIENFORMAT, SID_ATTR_WARNALIENFORMAT,
             0 );
-            SFX_APP()->GetOptions(*pRet);
+            SfxGetpApp()->GetOptions(*pRet);
             break;
 
         case SID_SB_STARBASEOPTIONS:
-            pRet = new SfxItemSet( SFX_APP()->GetPool(),
+            pRet = new SfxItemSet( SfxGetpApp()->GetPool(),
             SID_SB_POOLING_ENABLED, SID_SB_DB_REGISTER,
             0 );
             ::offapp::ConnectionPoolConfig::GetOptions(*pRet);
@@ -1361,7 +1361,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
         case SID_SCH_EDITOPTIONS:
         {
             SvxChartOptions aChartOpt;
-            pRet = new SfxItemSet( SFX_APP()->GetPool(), SID_SCH_EDITOPTIONS, SID_SCH_EDITOPTIONS );
+            pRet = new SfxItemSet( SfxGetpApp()->GetPool(), SID_SCH_EDITOPTIONS, SID_SCH_EDITOPTIONS );
             pRet->Put( SvxChartColorTableItem( SID_SCH_EDITOPTIONS, aChartOpt.GetDefaultColors() ) );
             break;
         }
@@ -1377,10 +1377,10 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
         {
             utl::MiscCfg    aMisc;
             const SfxPoolItem* pItem;
-            SfxItemSet aOptSet(SFX_APP()->GetPool(), SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER );
+            SfxItemSet aOptSet(SfxGetpApp()->GetPool(), SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER );
             aOptSet.Put(rSet);
             if(aOptSet.Count())
-                SFX_APP()->SetOptions( aOptSet );
+                SfxGetpApp()->SetOptions( aOptSet );
             // get dispatcher anew, because SetOptions() might have destroyed the dispatcher
             SfxViewFrame *pViewFrame = SfxViewFrame::Current();
 
@@ -1427,7 +1427,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
         break;
         case SID_INET_DLG :
         case SID_FILTER_DLG:
-            SFX_APP()->SetOptions( rSet );
+            SfxGetpApp()->SetOptions( rSet );
         break;
 
         case SID_SB_STARBASEOPTIONS: