diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-31 20:57:16 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:27:16 +0100 |
| commit | 5d133eb62187ae910772ff5dfeb8f2c3276e8481 (patch) | |
| tree | de10fa41a70071dfb3e36ed061e19328e883d206 /reportdesign | |
| parent | 28a863756b5891e6074a2ce432f97a1ff0271aed (diff) | |
first half of non-scriptable, Instance constructor conversion.
Change-Id: If73bb41bfa805e22609748f25971724b4778edb3
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/misc/UITools.cxx | 5 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 5b7e37119812..e22a968d0db9 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -1027,8 +1027,9 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula CharClass aCC(_xContext, aLangTag); svl::SharedStringPool aStringPool(&aCC); - ScopedVclPtr<FormulaDialog> aDlg(new FormulaDialog( - pParent, xServiceFactory, pFormulaManager, aFormula.getUndecoratedContent(), _xRowSet, aStringPool)); + ScopedVclPtrInstance<FormulaDialog> aDlg( + pParent, xServiceFactory, pFormulaManager, + aFormula.getUndecoratedContent(), _xRowSet, aStringPool); bSuccess = aDlg->Execute() == RET_OK; if ( bSuccess ) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index e256afe9e952..de0fa71c11b1 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2480,9 +2480,9 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ } { // want the dialog to be destroyed before our set - ScopedVclPtr<ORptPageDialog> aDlg(new ORptPageDialog(getView(), pDescriptor.get(),_xSection.is() + ScopedVclPtr<ORptPageDialog> aDlg(getView(), pDescriptor.get(),_xSection.is() ? OUString("BackgroundDialog") - : OUString("PageDialog"))); + : OUString("PageDialog")); if (RET_OK == aDlg->Execute()) { |