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/controls/accessiblecontrolcontext.cxx | |
| parent | 95f686d99ec2772d547bec45736644d4ca527b09 (diff) | |
toolkit: more VclPtr pieces.
Change-Id: I0393d906657b94cc547986a2165960a85d36cf48
Diffstat (limited to 'toolkit/source/controls/accessiblecontrolcontext.cxx')
| -rw-r--r-- | toolkit/source/controls/accessiblecontrolcontext.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index d8084d46832e..bf8f38065672 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -225,17 +225,18 @@ namespace toolkit } - vcl::Window* OAccessibleControlContext::implGetWindow( Reference< awt::XWindow >* _pxUNOWindow ) const + VclPtr< vcl::Window > OAccessibleControlContext::implGetWindow( Reference< awt::XWindow >* _pxUNOWindow ) const { Reference< awt::XControl > xControl( getAccessibleCreator(), UNO_QUERY ); Reference< awt::XWindow > xWindow; if ( xControl.is() ) xWindow.set(xControl->getPeer(), css::uno::UNO_QUERY); - vcl::Window* pWindow = xWindow.is() ? VCLUnoHelper::GetWindow( xWindow ) : NULL; + VclPtr< vcl::Window > pWindow = xWindow.is() ? VCLUnoHelper::GetWindow( xWindow ) : VclPtr< vcl::Window >(); if ( _pxUNOWindow ) *_pxUNOWindow = xWindow; + return pWindow; } @@ -259,7 +260,7 @@ namespace toolkit // our control Reference< awt::XWindow > xWindow; - vcl::Window* pVCLWindow = implGetWindow( &xWindow ); + VclPtr< vcl::Window > pVCLWindow = implGetWindow( &xWindow ); awt::Rectangle aBounds( 0, 0, 0, 0 ); if ( xWindow.is() ) @@ -319,7 +320,7 @@ namespace toolkit // want to do some VCL stuff here ... OContextEntryGuard aGuard( this ); - vcl::Window* pWindow = implGetWindow( ); + VclPtr< vcl::Window > pWindow = implGetWindow(); sal_Int32 nColor = 0; if ( pWindow ) { @@ -345,7 +346,7 @@ namespace toolkit // want to do some VCL stuff here ... OContextEntryGuard aGuard( this ); - vcl::Window* pWindow = implGetWindow( ); + VclPtr< vcl::Window > pWindow = implGetWindow(); sal_Int32 nColor = 0; if ( pWindow ) { |