diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-14 23:15:17 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 11:04:19 +0100 |
| commit | 60fcbc1af412b56f95561e26aff2cc63dd81b2aa (patch) | |
| tree | aeb3004ab4cf8851b4f5e196d68e05297ac69af4 /toolkit/source/helper/vclunohelper.cxx | |
| parent | 95f686d99ec2772d547bec45736644d4ca527b09 (diff) | |
toolkit: more VclPtr pieces.
Change-Id: I0393d906657b94cc547986a2165960a85d36cf48
Diffstat (limited to 'toolkit/source/helper/vclunohelper.cxx')
| -rw-r--r-- | toolkit/source/helper/vclunohelper.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 7b80bc7a26e6..005caccf8871 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -108,22 +108,22 @@ BitmapEx VCLUnoHelper::GetBitmap( const ::com::sun::star::uno::Reference< ::com: return xBmp; } -vcl::Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow ) +VclPtr< vcl::Window > VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow ) { VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( rxWindow ); - return pVCLXWindow ? pVCLXWindow->GetWindow() : NULL; + return pVCLXWindow ? pVCLXWindow->GetWindow() : VclPtr< vcl::Window >(); } -vcl::Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow ) +VclPtr< vcl::Window > VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow ) { VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( rxWindow ); - return pVCLXWindow ? pVCLXWindow->GetWindow() : NULL; + return pVCLXWindow ? pVCLXWindow->GetWindow() : VclPtr< vcl::Window >(); } -vcl::Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindow ) +VclPtr< vcl::Window > VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindow ) { VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( rxWindow ); - return pVCLXWindow ? pVCLXWindow->GetWindow() : NULL; + return pVCLXWindow ? pVCLXWindow->GetWindow() : VclPtr< vcl::Window >(); } vcl::Region VCLUnoHelper::GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) |