diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-31 21:06:51 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:28:52 +0100 |
| commit | d46e0d9656670dcd7dcca2f32062606400ff6246 (patch) | |
| tree | feec84bb694fe4d107c6aae2d66442ae046be31f /sw/source/uibase/uiview | |
| parent | 5d133eb62187ae910772ff5dfeb8f2c3276e8481 (diff) | |
second half of non-scriptable, Instance constructor conversion.
Change-Id: I616c8c28255e0d90ae90033a128bd34d7570530c
Diffstat (limited to 'sw/source/uibase/uiview')
| -rw-r--r-- | sw/source/uibase/uiview/view2.cxx | 8 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/viewprt.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index e408b3e81756..314eccf5e12e 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -2287,9 +2287,9 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument) if ( lcl_NeedAdditionalDataSource( xDBContext ) ) { // no data sources are available - create a new one - ScopedVclPtr<MessageDialog> aQuery(new MessageDialog(&GetViewFrame()->GetWindow(), + ScopedVclPtrInstance<MessageDialog> aQuery(&GetViewFrame()->GetWindow(), "DataSourcesUnavailableDialog", - "modules/swriter/ui/datasourcesunavailabledialog.ui")); + "modules/swriter/ui/datasourcesunavailabledialog.ui"); // no cancel allowed if (RET_OK != aQuery->Execute()) return; @@ -2336,9 +2336,9 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument) OUString sSource; if(!GetWrtShell().IsFieldDataSourceAvailable(sSource)) { - ScopedVclPtr<MessageDialog> aWarning(new MessageDialog(&GetViewFrame()->GetWindow(), + ScopedVclPtrInstance<MessageDialog> aWarning(&GetViewFrame()->GetWindow(), "WarnDataSourceDialog", - "modules/swriter/ui/warndatasourcedialog.ui")); + "modules/swriter/ui/warndatasourcedialog.ui"); OUString sTmp(aWarning->get_primary_text()); aWarning->set_primary_text(sTmp.replaceFirst("%1", sSource)); if (RET_OK == aWarning->Execute()) diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index af45b47ce266..f3b963724472 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -201,8 +201,8 @@ void SwView::ExecutePrint(SfxRequest& rReq) if(!bSilent && !bFromMerge && SW_MOD()->GetModuleConfig()->IsAskForMailMerge() && pSh->IsAnyDatabaseFieldInDoc()) { - ScopedVclPtr<MessageDialog> aBox(new MessageDialog(&GetEditWin(), "PrintMergeDialog", - "modules/swriter/ui/printmergedialog.ui")); + ScopedVclPtrInstance<MessageDialog> aBox(&GetEditWin(), "PrintMergeDialog", + "modules/swriter/ui/printmergedialog.ui"); short nRet = aBox->Execute(); if(RET_YES == nRet) { |