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 /sw/source/ui | |
| parent | 556981f07815a0de0ad3576ba6f8639671a6c13c (diff) | |
remove SFX_APP() macro that was a mer wrapper for SfxGetApp()
Change-Id: I480a789c767dd671775c9d70d96bf71908f21f5b
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/dbui/mmoutputpage.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/index/cnttab.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index ec881424da09..0d8ca5c395cf 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -814,7 +814,7 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl) } SfxObjectShell* pObjSh = pTargetView->GetViewFrame()->GetObjectShell(); - SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE), pObjSh)); + SfxGetpApp()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE), pObjSh)); SfxBoolItem aMergeSilent(SID_SILENT, false); m_pWizard->enableButtons(WZB_CANCEL, false); @@ -825,7 +825,7 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl) aProps[1]. Value <<= sPages; pTargetView->ExecPrint( aProps, false, true ); - SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE_END, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE_END), pObjSh)); + SfxGetpApp()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE_END, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE_END), pObjSh)); pTargetView->SetMailMergeConfigItem(0, 0, false); m_pWizard->enableButtons(WZB_CANCEL, true); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 7f537e01e9b8..b0831e782a35 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -101,7 +101,7 @@ static OUString lcl_CreateAutoMarkFileDlg( const OUString& rURL, xFltMgr->appendFilter( rFileString, "*.sdi" ); xFltMgr->setCurrentFilter( rFileString ) ; - OUString& rLastSaveDir = (OUString&)SFX_APP()->GetLastSaveDirectory(); + OUString& rLastSaveDir = (OUString&)SfxGetpApp()->GetLastSaveDirectory(); OUString sSaveDir = rLastSaveDir; if( !rURL.isEmpty() ) |