From 60fcbc1af412b56f95561e26aff2cc63dd81b2aa Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Sat, 14 Mar 2015 23:15:17 +0000 Subject: toolkit: more VclPtr pieces. Change-Id: I0393d906657b94cc547986a2165960a85d36cf48 --- .../toolkit/controls/accessiblecontrolcontext.hxx | 3 +- include/toolkit/helper/vclunohelper.hxx | 9 +- toolkit/source/awt/vclxwindows.cxx | 103 ++++++++++----------- .../source/controls/accessiblecontrolcontext.cxx | 11 ++- toolkit/source/helper/vclunohelper.cxx | 12 +-- 5 files changed, 69 insertions(+), 69 deletions(-) diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index 78fdfe7cc4d8..b991b80793f3 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -26,6 +26,7 @@ #include #include #include +#include namespace vcl { class Window; } @@ -116,7 +117,7 @@ namespace toolkit // stops listening at the control model void stopModelListening( ); - vcl::Window* implGetWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const; + VclPtr< vcl::Window > implGetWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const; }; diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx index dc1ae888476f..c902e5c9155c 100644 --- a/include/toolkit/helper/vclunohelper.hxx +++ b/include/toolkit/helper/vclunohelper.hxx @@ -56,11 +56,12 @@ namespace com { namespace sun { namespace star { namespace awt { #include #include #include +#include +#include #include #include #include -namespace vcl { class Window; } class OutputDevice; class MouseEvent; class KeyEvent; @@ -79,9 +80,9 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap> CreateBitmap( const BitmapEx& rBitmap ); // Window - static vcl::Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow ); - static vcl::Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow2 ); - static vcl::Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindowPeer ); + static VclPtr< vcl::Window > GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow ); + static VclPtr< vcl::Window > GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow2 ); + static VclPtr< vcl::Window > GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindowPeer ); static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> GetInterface( vcl::Window* pWindow ); // OutputDevice diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index e9a6b4a48ad6..ca4400e14526 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -5162,7 +5162,7 @@ void VCLXTimeField::setTime( const util::Time& aTime ) throw(::com::sun::star::u { SolarMutexGuard aGuard; - TimeField* pTimeField = static_cast(GetWindow()); + VclPtr< TimeField > pTimeField = GetAs< TimeField >(); if ( pTimeField ) { pTimeField->SetTime( aTime ); @@ -5179,7 +5179,7 @@ util::Time VCLXTimeField::getTime() throw(::com::sun::star::uno::RuntimeExceptio { SolarMutexGuard aGuard; - TimeField* pTimeField = static_cast(GetWindow()); + VclPtr< TimeField > pTimeField = GetAs< TimeField >(); if ( pTimeField ) return pTimeField->GetTime().GetUNOTime(); else @@ -5190,7 +5190,7 @@ void VCLXTimeField::setMin( const util::Time& aTime ) throw(::com::sun::star::un { SolarMutexGuard aGuard; - TimeField* pTimeField = static_cast(GetWindow()); + VclPtr< TimeField > pTimeField = GetAs< TimeField >(); if ( pTimeField ) pTimeField->SetMin( aTime ); } @@ -5199,7 +5199,7 @@ util::Time VCLXTimeField::getMin() throw(::com::sun::star::uno::RuntimeException { SolarMutexGuard aGuard; - TimeField* pTimeField = static_cast(GetWindow()); + VclPtr< TimeField > pTimeField = GetAs< TimeField >(); if ( pTimeField ) return pTimeField->GetMin().GetUNOTime(); else @@ -5210,7 +5210,7 @@ void VCLXTimeField::setMax( const util::Time& aTime ) throw(::com::sun::star::un { SolarMutexGuard aGuard; - TimeField* pTimeField = static_cast(GetWindow()); + VclPtr< TimeField > pTimeField = GetAs< TimeField >(); if ( pTimeField ) pTimeField->SetMax( aTime ); } @@ -5219,7 +5219,7 @@ util::Time VCLXTimeField::getMax() throw(::com::sun::star::uno::RuntimeException { SolarMutexGuard aGuard; - TimeField* pTimeField = static_cast(GetWindow()); + VclPtr< TimeField > pTimeField = GetAs< TimeField >(); if ( pTimeField ) return pTimeField->GetMax().GetUNOTime(); else @@ -5230,7 +5230,7 @@ void VCLXTimeField::setFirst( const util::Time& aTime ) throw(::com::sun::star:: { SolarMutexGuard aGuard; - TimeField* pTimeField = static_cast(GetWindow()); + VclPtr< TimeField > pTimeField = GetAs< TimeField >(); if ( pTimeField ) pTimeField->SetFirst( aTime ); } @@ -5239,7 +5239,7 @@ util::Time VCLXTimeField::getFirst() throw(::com::sun::star::uno::RuntimeExcepti { SolarMutexGuard aGuard; - TimeField* pTimeField = static_cast(GetWindow()); + VclPtr< TimeField > pTimeField = GetAs< TimeField >(); if ( pTimeField ) return pTimeField->GetFirst().GetUNOTime(); else @@ -5250,7 +5250,7 @@ void VCLXTimeField::setLast( const util::Time& aTime ) throw(::com::sun::star::u { SolarMutexGuard aGuard; - TimeField* pTimeField = static_cast(GetWindow()); + VclPtr< TimeField > pTimeField = GetAs< TimeField >(); if ( pTimeField ) pTimeField->SetLast( aTime ); } @@ -5259,7 +5259,7 @@ util::Time VCLXTimeField::getLast() throw(::com::sun::star::uno::RuntimeExceptio { SolarMutexGuard aGuard; - TimeField* pTimeField = static_cast(GetWindow()); + VclPtr< TimeField > pTimeField = GetAs< TimeField >(); if ( pTimeField ) return pTimeField->GetLast().GetUNOTime(); else @@ -5270,7 +5270,7 @@ void VCLXTimeField::setEmpty() throw(::com::sun::star::uno::RuntimeException, st { SolarMutexGuard aGuard; - TimeField* pTimeField = static_cast(GetWindow()); + VclPtr< TimeField > pTimeField = GetAs< TimeField >(); if ( pTimeField ) pTimeField->SetEmptyTime(); } @@ -5279,7 +5279,7 @@ sal_Bool VCLXTimeField::isEmpty() throw(::com::sun::star::uno::RuntimeException, { SolarMutexGuard aGuard; - TimeField* pTimeField = static_cast(GetWindow()); + VclPtr< TimeField > pTimeField = GetAs< TimeField >(); return pTimeField ? pTimeField->IsEmptyTime() : sal_False; } @@ -5309,8 +5309,8 @@ void VCLXTimeField::setProperty( const OUString& PropertyName, const ::com::sun: { if ( bVoid ) { - static_cast(GetWindow())->EnableEmptyFieldValue( true ); - static_cast(GetWindow())->SetEmptyFieldValue(); + GetAs< TimeField >()->EnableEmptyFieldValue( true ); + GetAs< TimeField >()->SetEmptyFieldValue(); } else { @@ -5338,14 +5338,14 @@ void VCLXTimeField::setProperty( const OUString& PropertyName, const ::com::sun: { sal_Int16 n = sal_Int16(); if ( Value >>= n ) - static_cast(GetWindow())->SetExtFormat( (ExtTimeFieldFormat) n ); + GetAs< TimeField >()->SetExtFormat( (ExtTimeFieldFormat) n ); } break; case BASEPROPERTY_ENFORCE_FORMAT: { bool bEnforce( true ); OSL_VERIFY( Value >>= bEnforce ); - static_cast< TimeField* >( GetWindow() )->EnforceValidValue( bEnforce ); + GetAs< TimeField >()->EnforceValidValue( bEnforce ); } break; default: @@ -5383,7 +5383,7 @@ void VCLXTimeField::setProperty( const OUString& PropertyName, const ::com::sun: break; case BASEPROPERTY_ENFORCE_FORMAT: { - aProp <<= static_cast< TimeField* >( GetWindow() )->IsEnforceValidValue( ); + aProp <<= GetAs< TimeField >()->IsEnforceValidValue( ); } break; default: @@ -5536,7 +5536,7 @@ void VCLXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::Run { SolarMutexGuard aGuard; - NumericField* pNumericField = static_cast(GetWindow()); + VclPtr< NumericField > pNumericField = GetAs< NumericField >(); if ( pNumericField ) pNumericField->SetFirst( (long)ImplCalcLongValue( Value, pNumericField->GetDecimalDigits() ) ); @@ -5546,7 +5546,7 @@ double VCLXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeExceptio { SolarMutexGuard aGuard; - NumericField* pNumericField = static_cast(GetWindow()); + VclPtr< NumericField > pNumericField = GetAs< NumericField >(); return pNumericField ? ImplCalcDoubleValue( (double)pNumericField->GetFirst(), pNumericField->GetDecimalDigits() ) : 0; @@ -5556,7 +5556,7 @@ void VCLXNumericField::setLast( double Value ) throw(::com::sun::star::uno::Runt { SolarMutexGuard aGuard; - NumericField* pNumericField = static_cast(GetWindow()); + VclPtr< NumericField > pNumericField = GetAs< NumericField >(); if ( pNumericField ) pNumericField->SetLast( (long)ImplCalcLongValue( Value, pNumericField->GetDecimalDigits() ) ); @@ -5566,7 +5566,7 @@ double VCLXNumericField::getLast() throw(::com::sun::star::uno::RuntimeException { SolarMutexGuard aGuard; - NumericField* pNumericField = static_cast(GetWindow()); + VclPtr< NumericField > pNumericField = GetAs< NumericField >(); return pNumericField ? ImplCalcDoubleValue( (double)pNumericField->GetLast(), pNumericField->GetDecimalDigits() ) : 0; @@ -5587,7 +5587,7 @@ void VCLXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno:: { SolarMutexGuard aGuard; - NumericField* pNumericField = static_cast(GetWindow()); + VclPtr< NumericField > pNumericField = GetAs< NumericField >(); if ( pNumericField ) pNumericField->SetSpinSize( (long)ImplCalcLongValue( Value, pNumericField->GetDecimalDigits() ) ); @@ -5597,7 +5597,7 @@ double VCLXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeExcep { SolarMutexGuard aGuard; - NumericField* pNumericField = static_cast(GetWindow()); + VclPtr< NumericField > pNumericField = GetAs< NumericField >(); return pNumericField ? ImplCalcDoubleValue( (double)pNumericField->GetSpinSize(), pNumericField->GetDecimalDigits() ) : 0; @@ -5639,8 +5639,8 @@ void VCLXNumericField::setProperty( const OUString& PropertyName, const ::com::s { if ( bVoid ) { - static_cast(GetWindow())->EnableEmptyFieldValue( true ); - static_cast(GetWindow())->SetEmptyFieldValue(); + GetAs< NumericField >()->EnableEmptyFieldValue( true ); + GetAs< NumericField >()->SetEmptyFieldValue(); } else { @@ -5682,7 +5682,7 @@ void VCLXNumericField::setProperty( const OUString& PropertyName, const ::com::s { bool b = bool(); if ( Value >>= b ) - static_cast(GetWindow())->SetUseThousandSep( b ); + GetAs< NumericField >()->SetUseThousandSep( b ); } break; default: @@ -5726,7 +5726,7 @@ void VCLXNumericField::setProperty( const OUString& PropertyName, const ::com::s break; case BASEPROPERTY_NUMSHOWTHOUSANDSEP: { - aProp <<= static_cast(GetWindow())->IsUseThousandSep(); + aProp <<= GetAs< NumericField >()->IsUseThousandSep(); } break; default: @@ -5794,7 +5794,7 @@ MetricFormatter *VCLXMetricField::GetMetricFormatter() throw(::com::sun::star::u MetricField *VCLXMetricField::GetMetricField() throw(::com::sun::star::uno::RuntimeException) { - MetricField *pField = static_cast(GetWindow()); + VclPtr< MetricField > pField = GetAs< MetricField >(); if (!pField) throw ::com::sun::star::uno::RuntimeException(); return pField; @@ -5932,21 +5932,21 @@ void VCLXMetricField::setProperty( const OUString& PropertyName, const ::com::su { bool b = false; if ( Value >>= b ) - static_cast(GetWindow())->SetUseThousandSep( b ); + GetAs< NumericField >()->SetUseThousandSep( b ); } break; case BASEPROPERTY_UNIT: { sal_uInt16 nVal = 0; if ( Value >>= nVal ) - static_cast(GetWindow())->SetUnit( (FieldUnit) nVal ); + GetAs< MetricField >()->SetUnit( (FieldUnit) nVal ); break; } case BASEPROPERTY_CUSTOMUNITTEXT: { OUString aStr; if ( Value >>= aStr ) - static_cast(GetWindow())->SetCustomUnitText( aStr ); + GetAs< MetricField >()->SetCustomUnitText( aStr ); break; } default: @@ -5970,13 +5970,13 @@ void VCLXMetricField::setProperty( const OUString& PropertyName, const ::com::su switch ( nPropType ) { case BASEPROPERTY_NUMSHOWTHOUSANDSEP: - aProp <<= static_cast(GetWindow())->IsUseThousandSep(); + aProp <<= GetAs< NumericField >()->IsUseThousandSep(); break; case BASEPROPERTY_UNIT: - aProp <<= (sal_uInt16) (static_cast(GetWindow())->GetUnit()); + aProp <<= (sal_uInt16) (GetAs< MetricField >()->GetUnit()); break; case BASEPROPERTY_CUSTOMUNITTEXT: - aProp <<= OUString( static_cast(GetWindow())->GetCustomUnitText() ); + aProp <<= OUString( GetAs< MetricField >()->GetCustomUnitText() ); break; default: { @@ -6132,7 +6132,7 @@ void VCLXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::Ru { SolarMutexGuard aGuard; - LongCurrencyField* pCurrencyField = static_cast(GetWindow()); + VclPtr< LongCurrencyField > pCurrencyField = GetAs< LongCurrencyField >(); if ( pCurrencyField ) pCurrencyField->SetFirst( ImplCalcLongValue( Value, pCurrencyField->GetDecimalDigits() ) ); @@ -6142,7 +6142,7 @@ double VCLXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeExcepti { SolarMutexGuard aGuard; - LongCurrencyField* pCurrencyField = static_cast(GetWindow()); + VclPtr< LongCurrencyField > pCurrencyField = GetAs< LongCurrencyField >(); return pCurrencyField ? ImplCalcDoubleValue( (double)pCurrencyField->GetFirst(), pCurrencyField->GetDecimalDigits() ) : 0; @@ -6152,7 +6152,7 @@ void VCLXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::Run { SolarMutexGuard aGuard; - LongCurrencyField* pCurrencyField = static_cast(GetWindow()); + VclPtr< LongCurrencyField > pCurrencyField = GetAs< LongCurrencyField >(); if ( pCurrencyField ) pCurrencyField->SetLast( ImplCalcLongValue( Value, pCurrencyField->GetDecimalDigits() ) ); @@ -6162,7 +6162,7 @@ double VCLXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeExceptio { SolarMutexGuard aGuard; - LongCurrencyField* pCurrencyField = static_cast(GetWindow()); + VclPtr< LongCurrencyField > pCurrencyField = GetAs< LongCurrencyField >(); return pCurrencyField ? ImplCalcDoubleValue( (double)pCurrencyField->GetLast(), pCurrencyField->GetDecimalDigits() ) : 0; @@ -6172,7 +6172,7 @@ void VCLXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno: { SolarMutexGuard aGuard; - LongCurrencyField* pCurrencyField = static_cast(GetWindow()); + VclPtr< LongCurrencyField > pCurrencyField = GetAs< LongCurrencyField >(); if ( pCurrencyField ) pCurrencyField->SetSpinSize( ImplCalcLongValue( Value, pCurrencyField->GetDecimalDigits() ) ); @@ -6182,7 +6182,7 @@ double VCLXCurrencyField::getSpinSize() throw(::com::sun::star::uno::RuntimeExce { SolarMutexGuard aGuard; - LongCurrencyField* pCurrencyField = static_cast(GetWindow()); + VclPtr< LongCurrencyField > pCurrencyField = GetAs< LongCurrencyField >(); return pCurrencyField ? ImplCalcDoubleValue( (double)pCurrencyField->GetSpinSize(), pCurrencyField->GetDecimalDigits() ) : 0; @@ -6235,8 +6235,8 @@ void VCLXCurrencyField::setProperty( const OUString& PropertyName, const ::com:: { if ( bVoid ) { - static_cast(GetWindow())->EnableEmptyFieldValue( true ); - static_cast(GetWindow())->SetEmptyFieldValue(); + GetAs< LongCurrencyField >()->EnableEmptyFieldValue( true ); + GetAs< LongCurrencyField >()->SetEmptyFieldValue(); } else { @@ -6278,14 +6278,14 @@ void VCLXCurrencyField::setProperty( const OUString& PropertyName, const ::com:: { OUString aString; if ( Value >>= aString ) - static_cast(GetWindow())->SetCurrencySymbol( aString ); + GetAs< LongCurrencyField >()->SetCurrencySymbol( aString ); } break; case BASEPROPERTY_NUMSHOWTHOUSANDSEP: { bool b = bool(); if ( Value >>= b ) - static_cast(GetWindow())->SetUseThousandSep( b ); + GetAs< LongCurrencyField >()->SetUseThousandSep( b ); } break; default: @@ -6329,12 +6329,12 @@ void VCLXCurrencyField::setProperty( const OUString& PropertyName, const ::com:: break; case BASEPROPERTY_CURRENCYSYMBOL: { - aProp <<= OUString( static_cast(GetWindow())->GetCurrencySymbol() ); + aProp <<= OUString( GetAs< LongCurrencyField >()->GetCurrencySymbol() ); } break; case BASEPROPERTY_NUMSHOWTHOUSANDSEP: { - aProp <<= static_cast(GetWindow())->IsUseThousandSep(); + aProp <<= GetAs< LongCurrencyField >()->IsUseThousandSep(); } break; default: @@ -6406,7 +6406,7 @@ void VCLXPatternField::setMasks( const OUString& EditMask, const OUString& Liter { SolarMutexGuard aGuard; - PatternField* pPatternField = static_cast(GetWindow()); + VclPtr< PatternField > pPatternField = GetAs< PatternField >(); if ( pPatternField ) { pPatternField->SetMask( OUStringToOString(EditMask, RTL_TEXTENCODING_ASCII_US), LiteralMask ); @@ -6417,7 +6417,7 @@ void VCLXPatternField::getMasks( OUString& EditMask, OUString& LiteralMask ) thr { SolarMutexGuard aGuard; - PatternField* pPatternField = static_cast(GetWindow()); + VclPtr< PatternField > pPatternField = GetAs< PatternField >(); if ( pPatternField ) { EditMask = OStringToOUString(pPatternField->GetEditMask(), RTL_TEXTENCODING_ASCII_US); @@ -6428,12 +6428,9 @@ void VCLXPatternField::getMasks( OUString& EditMask, OUString& LiteralMask ) thr void VCLXPatternField::setString( const OUString& Str ) throw(::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - - PatternField* pPatternField = static_cast(GetWindow()); + VclPtr< PatternField > pPatternField = GetAs< PatternField >(); if ( pPatternField ) - { pPatternField->SetString( Str ); - } } OUString VCLXPatternField::getString() throw(::com::sun::star::uno::RuntimeException, std::exception) @@ -6441,7 +6438,7 @@ OUString VCLXPatternField::getString() throw(::com::sun::star::uno::RuntimeExcep SolarMutexGuard aGuard; OUString aString; - PatternField* pPatternField = static_cast(GetWindow()); + VclPtr< PatternField > pPatternField = GetAs< PatternField >(); if ( pPatternField ) aString = pPatternField->GetString(); return aString; 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 ) { 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 ) -- cgit v1.2.3