diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-05-04 15:51:56 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-05-04 15:52:57 +0200 |
commit | 135c63c8f9cc363c0895542b0f3bed48b61ea836 (patch) | |
tree | 5afa3bcc304e246b38058c2ad7b0d1fd1e76a05f /svtools/source/uno | |
parent | c48fe716225b1b784d657685396b6cf5fee4fc3d (diff) |
fdo#48253 Expand SAL_STATIC_CAST and SAL_CONST_CAST
Change-Id: I50f0887ceb4517d7ef234f970ca2ba679d533382
Diffstat (limited to 'svtools/source/uno')
-rw-r--r-- | svtools/source/uno/contextmenuhelper.cxx | 4 | ||||
-rw-r--r-- | svtools/source/uno/unoiface.cxx | 26 |
2 files changed, 15 insertions, 15 deletions
diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index 22d361a17a1e..6d8578e7952c 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -113,7 +113,7 @@ throw ( uno::RuntimeException ) { uno::Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XStatusListener*, this )); + (static_cast< XStatusListener* >(this))); if( a.hasValue() ) return a; @@ -156,7 +156,7 @@ bool StateEventHelper::isCommandEnabled() { // Be sure that we cannot die during condition wait uno::Reference< frame::XStatusListener > xSelf( - SAL_STATIC_CAST( frame::XStatusListener*, this )); + (static_cast< frame::XStatusListener* >(this))); uno::Reference< frame::XDispatch > xDispatch; util::URL aTargetURL; diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index fc48708d873a..cdb58e639bb9 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -194,10 +194,10 @@ VCLXMultiLineEdit::~VCLXMultiLineEdit() ::com::sun::star::uno::Any VCLXMultiLineEdit::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XTextComponent*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XTextArea*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XTextLayoutConstrains*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) ); + (static_cast< ::com::sun::star::awt::XTextComponent* >(this)), + (static_cast< ::com::sun::star::awt::XTextArea* >(this)), + (static_cast< ::com::sun::star::awt::XTextLayoutConstrains* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } @@ -558,9 +558,9 @@ VCLXFileControl::~VCLXFileControl() ::com::sun::star::uno::Any VCLXFileControl::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XTextComponent*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XTextLayoutConstrains*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) ); + (static_cast< ::com::sun::star::awt::XTextComponent* >(this)), + (static_cast< ::com::sun::star::awt::XTextLayoutConstrains* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } @@ -1675,8 +1675,8 @@ SVTXNumericField::~SVTXNumericField() ::com::sun::star::uno::Any SVTXNumericField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XNumericField*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) ); + (static_cast< ::com::sun::star::awt::XNumericField* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : SVTXFormattedField::queryInterface( rType )); } @@ -1842,8 +1842,8 @@ SVTXCurrencyField::~SVTXCurrencyField() ::com::sun::star::uno::Any SVTXCurrencyField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XCurrencyField*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) ); + (static_cast< ::com::sun::star::awt::XCurrencyField* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : SVTXFormattedField::queryInterface( rType )); } @@ -2133,8 +2133,8 @@ void VCLXProgressBar::ImplUpdateValue() ::com::sun::star::uno::Any VCLXProgressBar::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XProgressBar*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) ); + (static_cast< ::com::sun::star::awt::XProgressBar* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } |