Kaydet (Commit) 7dc00c73 authored tarafından Michael Meeks's avatar Michael Meeks

tdf#91577 - fix unique_ptr conversion bugs in reportdesign.

Change-Id: Icc94ce266d567e7aad5afb5eacf0e85699ef4107
üst f0bbafba
...@@ -139,26 +139,26 @@ void ODesignView::dispose() ...@@ -139,26 +139,26 @@ void ODesignView::dispose()
if ( m_pPropWin ) if ( m_pPropWin )
{ {
notifySystemWindow(this,m_pPropWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); notifySystemWindow(this,m_pPropWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
m_pPropWin.disposeAndClear();
} }
if ( m_pAddField ) if ( m_pAddField )
{ {
SvtViewOptions aDlgOpt( E_WINDOW, OUString( UID_RPT_RPT_APP_VIEW ) ); SvtViewOptions aDlgOpt( E_WINDOW, OUString( UID_RPT_RPT_APP_VIEW ) );
aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US));
notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
m_pAddField.disposeAndClear();
} }
if ( m_pReportExplorer ) if ( m_pReportExplorer )
{ {
SvtViewOptions aDlgOpt(E_WINDOW, OStringToOUString(m_pReportExplorer->GetHelpId(), RTL_TEXTENCODING_UTF8)); SvtViewOptions aDlgOpt(E_WINDOW, OStringToOUString(m_pReportExplorer->GetHelpId(), RTL_TEXTENCODING_UTF8));
aDlgOpt.SetWindowState(OStringToOUString(m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); aDlgOpt.SetWindowState(OStringToOUString(m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US));
notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
m_pReportExplorer.disposeAndClear();
} }
m_aSplitWin.disposeAndClear(); m_pTaskPane.disposeAndClear();
m_aScrollWindow.disposeAndClear(); m_aScrollWindow.disposeAndClear();
m_pTaskPane.clear(); m_aSplitWin.disposeAndClear();
m_pReportExplorer.clear();
m_pPropWin.clear();
m_pAddField.clear();
dbaui::ODataView::dispose(); dbaui::ODataView::dispose();
} }
......
...@@ -191,6 +191,8 @@ OViewsWindow::~OViewsWindow() ...@@ -191,6 +191,8 @@ OViewsWindow::~OViewsWindow()
void OViewsWindow::dispose() void OViewsWindow::dispose()
{ {
m_aColorConfig.RemoveListener(this); m_aColorConfig.RemoveListener(this);
for (auto i = m_aSections.begin(); i != m_aSections.end(); ++i)
i->disposeAndClear();
m_aSections.clear(); m_aSections.clear();
m_pParent.clear(); m_pParent.clear();
vcl::Window::dispose(); vcl::Window::dispose();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment