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 /svx/source/dialog | |
| parent | 556981f07815a0de0ad3576ba6f8639671a6c13c (diff) | |
remove SFX_APP() macro that was a mer wrapper for SfxGetApp()
Change-Id: I480a789c767dd671775c9d70d96bf71908f21f5b
Diffstat (limited to 'svx/source/dialog')
| -rw-r--r-- | svx/source/dialog/databaseregistrationui.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/hyperdlg.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/srchdlg.cxx | 6 |
3 files changed, 5 insertions, 5 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) |