diff options
Diffstat (limited to 'reportdesign/source/ui/report/DesignView.cxx')
| -rw-r--r-- | reportdesign/source/ui/report/DesignView.cxx | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 2659914ad393..b9df2babf467 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -132,9 +132,7 @@ ODesignView::~ODesignView() if ( m_pPropWin ) { notifySystemWindow(this,m_pPropWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<vcl::Window> aTemp2(m_pPropWin); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<vcl::Window> aTemp2(m_pPropWin); m_pPropWin = NULL; } if ( m_pAddField ) @@ -142,9 +140,7 @@ ODesignView::~ODesignView() 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)); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<vcl::Window> aTemp2(m_pAddField); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<vcl::Window> aTemp2(m_pAddField); m_pAddField = NULL; } if ( m_pReportExplorer ) @@ -152,15 +148,11 @@ ODesignView::~ODesignView() 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)); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<vcl::Window> aTemp2(m_pReportExplorer); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<vcl::Window> aTemp2(m_pReportExplorer); m_pReportExplorer = NULL; } { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<vcl::Window> aTemp2(m_pTaskPane); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<vcl::Window> aTemp2(m_pTaskPane); m_pTaskPane = NULL; } } |