diff options
| -rw-r--r-- | vcl/inc/brdwin.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/brdwin.cxx | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 36292b21e963..8e3846a07c74 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -82,7 +82,7 @@ class ImplBorderWindow : public vcl::Window friend class ImplStdBorderWindowView; private: - ImplBorderWindowView* mpBorderView; + std::unique_ptr<ImplBorderWindowView> mpBorderView; VclPtr<vcl::Window> mpMenuBarWindow; VclPtr<NotebookBar> mpNotebookBar; long mnMinWidth; diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 0b027196db8f..594b7471d038 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1666,8 +1666,7 @@ ImplBorderWindow::~ImplBorderWindow() void ImplBorderWindow::dispose() { - delete mpBorderView; - mpBorderView = nullptr; + mpBorderView.reset(); mpMenuBarWindow.clear(); mpNotebookBar.disposeAndClear(); vcl::Window::dispose(); @@ -1834,18 +1833,18 @@ void ImplBorderWindow::DataChanged( const DataChangedEvent& rDCEvt ) void ImplBorderWindow::InitView() { if ( mbSmallOutBorder ) - mpBorderView = new ImplSmallBorderWindowView( this ); + mpBorderView.reset(new ImplSmallBorderWindowView( this )); else if ( mpWindowImpl->mbFrame ) { if( mbFrameBorder ) - mpBorderView = new ImplStdBorderWindowView( this ); + mpBorderView.reset(new ImplStdBorderWindowView( this )); else - mpBorderView = new ImplNoBorderWindowView; + mpBorderView.reset(new ImplNoBorderWindowView); } else if ( !mbFrameBorder ) - mpBorderView = new ImplSmallBorderWindowView( this ); + mpBorderView.reset(new ImplSmallBorderWindowView( this )); else - mpBorderView = new ImplStdBorderWindowView( this ); + mpBorderView.reset(new ImplStdBorderWindowView( this )); Size aSize = GetOutputSizePixel(); mpBorderView->Init( this, aSize.Width(), aSize.Height() ); } @@ -1861,7 +1860,7 @@ void ImplBorderWindow::UpdateView( bool bNewView, const Size& rNewOutSize ) if ( bNewView ) { - delete mpBorderView; + mpBorderView.reset(); InitView(); } else |