diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-25 16:23:17 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-18 00:45:43 +0100 |
| commit | 390e951b78288e082361c386ff5c6618d917c333 (patch) | |
| tree | de4f00b80ba6183f2678d6582d98d65a94b93aa7 /svtools | |
| parent | 599719217423e8468cc54cc74e7850b8a867120b (diff) | |
loplugin:vclwidgets check for assigning from VclPt<T> to T*
Inspired by a recent bug report where we were assigning the result
of VclPtr<T>::Create to a raw pointer.
As a consequence, we also need to change various methods that were
returning newly created Window subclasses via raw pointer, to
instead return those via VclPtr
Change-Id: I8118e0195a5b2b4780e646cfb0e151692e54ae2b
Reviewed-on: https://gerrit.libreoffice.org/31318
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit e6ffb539ee232ea0c679928ff456c1cf97429f63)
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/hatchwindow/hatchwindow.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/uno/genericunodialog.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx index 148ff37d0d9f..e7216d25f256 100644 --- a/svtools/source/hatchwindow/hatchwindow.cxx +++ b/svtools/source/hatchwindow/hatchwindow.cxx @@ -45,7 +45,7 @@ void VCLXHatchWindow::initializeWindow( const uno::Reference< awt::XWindowPeer > { SolarMutexGuard aGuard; - vcl::Window* pParent = nullptr; + VclPtr<vcl::Window> pParent; VCLXWindow* pParentComponent = VCLXWindow::GetImplementation( xParent ); if ( pParentComponent ) diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 7f1b54b49fc5..1a6fab51fd62 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -168,7 +168,7 @@ bool OGenericUnoDialog::impl_ensureDialog_lck() // get the parameters for the dialog from the current settings // the parent window - vcl::Window* pParent = nullptr; + VclPtr<vcl::Window> pParent; VCLXWindow* pImplementation = VCLXWindow::GetImplementation(m_xParent); if (pImplementation) pParent = pImplementation->GetWindow(); |