From 135c63c8f9cc363c0895542b0f3bed48b61ea836 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Fri, 4 May 2012 15:51:56 +0200
Subject: fdo#48253 Expand SAL_STATIC_CAST and SAL_CONST_CAST

Change-Id: I50f0887ceb4517d7ef234f970ca2ba679d533382
---
 sfx2/source/appl/sfxhelp.cxx           | 4 ++--
 sfx2/source/toolbox/tbxitem.cxx        | 4 ++--
 sfx2/source/view/sfxbasecontroller.cxx | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'sfx2')

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 1335e1fb0fa3..6b3d69930e33 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -814,7 +814,7 @@ sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const S
 String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleName )
 {
     String aURL;
-    SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
+    SfxHelp* pHelp = (static_cast< SfxHelp* >(Application::GetHelp()) );
     if ( pHelp )
         aURL = pHelp->CreateHelpURL_Impl( aCommandURL, rModuleName );
     return aURL;
@@ -822,7 +822,7 @@ String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleN
 
 void SfxHelp::OpenHelpAgent( SfxFrame*, const rtl::OString& sHelpId )
 {
-    SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
+    SfxHelp* pHelp = (static_cast< SfxHelp* >(Application::GetHelp()) );
     if ( pHelp )
         pHelp->OpenHelpAgent( sHelpId );
 }
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 1bdeddd138ef..25ef143b4c30 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -474,8 +474,8 @@ Any SAL_CALL SfxToolBoxControl::queryInterface( const Type & rType )
 throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                           SAL_STATIC_CAST( ::com::sun::star::awt::XDockableWindowListener*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::frame::XSubToolbarController*, this ));
+                                           (static_cast< ::com::sun::star::awt::XDockableWindowListener* >(this)),
+                                        (static_cast< ::com::sun::star::frame::XSubToolbarController* >(this)));
     return (aRet.hasValue() ? aRet : svt::ToolboxController::queryInterface( rType ));
 }
 
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 9013a674f08a..d1bab1090826 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -234,7 +234,7 @@ public:
                             {
                                 ++m_refCount;
                                 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComponent(
-                                    SAL_STATIC_CAST(::cppu::OWeakObject*, pController ), ::com::sun::star::uno::UNO_QUERY );
+                                    (static_cast< ::cppu::OWeakObject* >(pController)), ::com::sun::star::uno::UNO_QUERY );
                                 if (xComponent.is())
                                     xComponent->addEventListener(this);
                                 --m_refCount;
-- 
cgit