diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-17 15:13:34 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 11:40:50 +0100 |
| commit | 6d0c89123f353aed80d3a8a08ef5cd1ffaa1eea9 (patch) | |
| tree | 59b3f214e068d3df6b08b2acd7647002946a6847 /reportdesign | |
| parent | 2269fd1d751d9b198cf9189125bd177151559596 (diff) | |
vclwidget: fix more places that should be wrapping in VclPtr
Change-Id: I31c9115662da2f81e1b22be91ee58e2862076b8e
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/Formula.cxx | 3 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/DesignView.cxx | 10 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 1 |
3 files changed, 0 insertions, 14 deletions
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 1c78e8a36337..be924e61a42f 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -96,9 +96,6 @@ void FormulaDialog::dispose() { SvtViewOptions aDlgOpt( E_WINDOW, OUString( HID_RPT_FIELD_SEL_WIN ) ); aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US)); - - boost::scoped_ptr<vcl::Window> aTemp2(m_pAddField); - m_pAddField = NULL; } StoreFormEditData( m_pFormulaData ); diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 982964989921..1cc4d1bccfac 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -139,28 +139,18 @@ void ODesignView::dispose() if ( m_pPropWin ) { notifySystemWindow(this,m_pPropWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); - ::std::unique_ptr<vcl::Window> aTemp2(m_pPropWin); - m_pPropWin = NULL; } if ( m_pAddField ) { SvtViewOptions aDlgOpt( E_WINDOW, OUString( UID_RPT_RPT_APP_VIEW ) ); aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); - ::std::unique_ptr<vcl::Window> aTemp2(m_pAddField); - m_pAddField = NULL; } if ( m_pReportExplorer ) { SvtViewOptions aDlgOpt(E_WINDOW, OStringToOUString(m_pReportExplorer->GetHelpId(), RTL_TEXTENCODING_UTF8)); aDlgOpt.SetWindowState(OStringToOUString(m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); - ::std::unique_ptr<vcl::Window> aTemp2(m_pReportExplorer); - m_pReportExplorer = NULL; - } - { - ::std::unique_ptr<vcl::Window> aTemp2(m_pTaskPane); - m_pTaskPane = NULL; } m_aSplitWin.disposeAndClear(); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 520b5be25183..330f54c43677 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -339,7 +339,6 @@ void OReportController::disposing() { SvtViewOptions aDlgOpt(E_WINDOW, OStringToOUString(m_pGroupsFloater->GetHelpId(), RTL_TEXTENCODING_UTF8)); aDlgOpt.SetWindowState(OStringToOUString(m_pGroupsFloater->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); - ::std::unique_ptr<FloatingWindow> aTemp(m_pGroupsFloater); m_pGroupsFloater = NULL; } |