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

Change-Id: I480a789c767dd671775c9d70d96bf71908f21f5b

8 files changed, 13 insertions, 13 deletions

diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index 1b1f40d0f226..b4e2316b7085 100644
--- a/svx/source/dialog/databaseregistrationui.cxx
+++ b/svx/source/dialog/databaseregistrationui.cxx
@@ -37,7 +37,7 @@ namespace svx
     {
         sal_uInt16 nResult = RET_CANCEL;
 
-        SfxItemSet aRegistrationItems( SFX_APP()->GetPool(), SID_SB_DB_REGISTER, SID_SB_DB_REGISTER, 0 );
+        SfxItemSet aRegistrationItems( SfxGetpApp()->GetPool(), SID_SB_DB_REGISTER, SID_SB_DB_REGISTER, 0 );
 
         SvxAbstractDialogFactory* pDialogFactory = SvxAbstractDialogFactory::Create();
         boost::scoped_ptr< SfxAbstractDialog > pDialog;
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 95a2800c9b62..621e95c16ac9 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -62,7 +62,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, sal_uInt16 nId,
 
     Window* pTopWindow = 0;
     if ( pInfo->aSize.Width() != 0 && pInfo->aSize.Height() != 0 &&
-            (0 != (pTopWindow = SFX_APP()->GetTopWindow())))
+            (0 != (pTopWindow = SfxGetpApp()->GetTopWindow())))
     {
         Size aParentSize( pTopWindow->GetSizePixel() );
         Size aDlgSize ( GetSizePixel () );
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 6a6cb82eea9c..c3c39120a278 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -135,7 +135,7 @@ struct SearchDlg_Impl
 void ListToStrArr_Impl( sal_uInt16 nId, std::vector<OUString>& rStrLst, ComboBox& rCBox )
 {
     SfxStringListItem* pSrchItem =
-        (SfxStringListItem*)SFX_APP()->GetItem( nId );
+        (SfxStringListItem*)SfxGetpApp()->GetItem( nId );
 
     if (pSrchItem)
     {
@@ -152,7 +152,7 @@ void ListToStrArr_Impl( sal_uInt16 nId, std::vector<OUString>& rStrLst, ComboBox
 void StrArrToList_Impl( sal_uInt16 nId, const std::vector<OUString>& rStrLst )
 {
     DBG_ASSERT( !rStrLst.empty(), "check in advance");
-    SFX_APP()->PutItem( SfxStringListItem( nId, &rStrLst ) );
+    SfxGetpApp()->PutItem( SfxStringListItem( nId, &rStrLst ) );
 }
 
 // class SearchAttrItemList ----------------------------------------------
@@ -1305,7 +1305,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
     }
     else if (pBtn == m_pJapOptionsBtn)
     {
-        SfxItemSet aSet( SFX_APP()->GetPool() );
+        SfxItemSet aSet( SfxGetpApp()->GetPool() );
         pSearchItem->SetTransliterationFlags( GetTransliterationFlags() );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         if(pFact)
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 58dc19de9fb6..5c9b5b9abb54 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -982,7 +982,7 @@ namespace svxform
             if ( sMacroLocation.isEmpty() )
             {
                 // legacy format: use the app-wide Basic, if it has a respective method, otherwise fall back to the doc's Basic
-                if ( SFX_APP()->GetBasicManager()->HasMacro( sScriptCode ) )
+                if ( SfxGetpApp()->GetBasicManager()->HasMacro( sScriptCode ) )
                     sMacroLocation = "application";
                 else
                     sMacroLocation = "document";
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index a87fae4cbdb5..23a65c85646d 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -221,7 +221,7 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView )
             ,m_bHasForms(false)
 {
     m_pImpl->acquire();
-    SetPool( &SFX_APP()->GetPool() );
+    SetPool( &SfxGetpApp()->GetPool() );
     SetName( OUString("Form") );
 
     SetView(m_pFormView);
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 594afb09fa6d..4682df6244ab 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -585,8 +585,8 @@ namespace svx
             SfxSlotId nSlotId( aFeature->first );
             #if OSL_DEBUG_LEVEL > 0
                 OUString sUnoSlotName;
-                if ( SFX_APP() )
-                    sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotId );
+                if ( SfxGetpApp() )
+                    sUnoSlotName = lcl_getUnoSlotName( *SfxGetpApp(), nSlotId );
                 else
                     sUnoSlotName = "<unknown>";
                 OString sUnoSlotNameAscii( "\"" );
@@ -739,7 +739,7 @@ namespace svx
                         sError += "\n  WhichID: "; sError += OString::number( nWhich );
                         sError += "\n  UNO name: ";
 
-                        OUString sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotForItemSet );
+                        OUString sUnoSlotName = lcl_getUnoSlotName( *SfxGetpApp(), nSlotForItemSet );
                         if ( !sUnoSlotName.isEmpty() )
                             sError += OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US );
                         else
@@ -1275,7 +1275,7 @@ namespace svx
             ControlFeatures& _rDispatchers )
     {
         Reference< XDispatchProvider > xProvider( _rxControl, UNO_QUERY );
-        SfxApplication* pApplication = SFX_APP();
+        SfxApplication* pApplication = SfxGetpApp();
         DBG_ASSERT( pApplication, "FmTextControlShell::fillFeatureDispatchers: no SfxApplication!" );
         if ( xProvider.is() && pApplication )
         {
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 0cc404ef81f2..ddb6bfa9d7be 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -266,7 +266,7 @@ void GalleryBrowser1::ImplGetExecuteVector(::std::vector< sal_uInt16 >& o_aExec)
 void GalleryBrowser1::ImplGalleryThemeProperties( const OUString & rThemeName, bool bCreateNew )
 {
     DBG_ASSERT(!mpThemePropsDlgItemSet, "mpThemePropsDlgItemSet already set!");
-    mpThemePropsDlgItemSet = new SfxItemSet( SFX_APP()->GetPool() );
+    mpThemePropsDlgItemSet = new SfxItemSet( SfxGetpApp()->GetPool() );
     GalleryTheme*   pTheme = mpGallery->AcquireTheme( rThemeName, *this );
 
     ImplFillExchangeData( pTheme, *mpExchangeData );
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index acbb614fc74d..0c52dd972ad7 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1526,7 +1526,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte
                 const SfxFilter*    pSfxFilter = NULL;
                 SfxMedium           aSfxMedium( aURL, referer_, STREAM_READ | STREAM_SHARE_DENYNONE );
 
-                SFX_APP()->GetFilterMatcher().GuessFilter( aSfxMedium, &pSfxFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE );
+                SfxGetpApp()->GetFilterMatcher().GuessFilter( aSfxMedium, &pSfxFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE );
 
                 if( !pSfxFilter )
                 {