Replace css macro with namespace for nicer namespacing

14 files changed, 28 insertions, 29 deletions

diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx
index 50d693302589..5a8554b24294 100644
--- a/scripting/source/inc/util/MiscUtils.hxx
+++ b/scripting/source/inc/util/MiscUtils.hxx
@@ -48,10 +48,10 @@
 
 #include "util.hxx"
 
+namespace css = ::com::sun::star;
+
 namespace sf_misc
 {
-// for simplification
-#define css ::com::sun::star
 
 class MiscUtils
 {
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 73f4e56b8771..7b12e68c6a5e 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -509,8 +509,7 @@ const Reference< XMultiServiceFactory >& xServiceManager )
 extern "C"
 {
 
-#undef css
-#define css ::com::sun::star
+    namespace css = ::com::sun::star;
 
     SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplementationName ,
                                          void * pServiceManager ,
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index 42964cd0b4fd..08eb70d7f1b9 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -45,10 +45,10 @@
 
 #include <comphelper/stl_types.hxx>
 
+namespace css = ::com::sun::star;
+
 namespace func_provider
 {
-// for simplification
-#define css ::com::sun::star
 
 //Typedefs
 //=============================================================================
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
index 9594b6f6f067..226f236faf94 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
@@ -38,10 +38,10 @@
 #include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
 #include <com/sun/star/script/browse/XBrowseNodeFactory.hpp>
 
+namespace css = ::com::sun::star;
+
 namespace browsenodefactory
 {
-// for simplification
-#define css ::com::sun::star
 
 class BrowseNodeFactoryImpl :
     public ::cppu::WeakImplHelper2 <
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index 89336a9dadb9..fa6c71e26e8c 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -45,10 +45,10 @@
 
 #include "ProviderCache.hxx"
 
+namespace css = ::com::sun::star;
+
 namespace func_provider
 {
-// for simplification
-#define css ::com::sun::star
 
  typedef ::cppu::WeakImplHelper5<
      css::script::provider::XScriptProvider,
diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx
index 9db031e2e87e..cf1a67f34804 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.hxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.hxx
@@ -39,10 +39,10 @@
 
 #include "ActiveMSPList.hxx"
 
+namespace css = ::com::sun::star;
+
 namespace func_provider
 {
-// for simplification
-#define css ::com::sun::star
 
 class MasterScriptProviderFactory :
     public ::cppu::WeakImplHelper2 <
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index db1c7d3db70e..ebb6d344ad61 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -44,10 +44,10 @@
 
 #include "ScriptingContext.hxx"
 
+namespace css = ::com::sun::star;
+
 namespace func_provider
 {
-// for simplification
-#define css ::com::sun::star
 
 //Typedefs
 //=============================================================================
diff --git a/scripting/source/provider/ScriptImpl.hxx b/scripting/source/provider/ScriptImpl.hxx
index b49f245cdd3d..d7e6b41339a1 100644
--- a/scripting/source/provider/ScriptImpl.hxx
+++ b/scripting/source/provider/ScriptImpl.hxx
@@ -41,11 +41,10 @@
 #include <drafts/com/sun/star/script/framework/provider/XScript.hpp>
 #include <drafts/com/sun/star/script/framework/runtime/XScriptInvocation.hpp>
 
+namespace css = ::com::sun::star;
+
 namespace func_provider
 {
-// for simplification
-#define css ::com::sun::star
-
 
 class ScriptImpl :
             public ::cppu::WeakImplHelper1 < ::drafts::com::sun::star::script::framework::provider::XScript >
diff --git a/scripting/source/provider/ScriptingContext.hxx b/scripting/source/provider/ScriptingContext.hxx
index 97998c25ade5..afb5bf7c33d4 100644
--- a/scripting/source/provider/ScriptingContext.hxx
+++ b/scripting/source/provider/ScriptingContext.hxx
@@ -44,10 +44,11 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/broadcasthelper.hxx>
+
+namespace css = ::com::sun::star;
+
 namespace func_provider
 {
-// for simplification
-#define css ::com::sun::star
 
 //Typedefs
 //=============================================================================
diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx
index 25683dcbb916..b1e89469b0c8 100644
--- a/scripting/source/provider/URIHelper.hxx
+++ b/scripting/source/provider/URIHelper.hxx
@@ -40,11 +40,11 @@
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase3.hxx>
 
+namespace css = ::com::sun::star;
+
 namespace func_provider
 {
 
-#define css ::com::sun::star
-
 class ScriptingFrameworkURIHelper :
     public ::cppu::WeakImplHelper3<
         css::script::provider::XScriptURIHelper,
diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
index 4a068ed4b1e9..3df87d221b76 100644
--- a/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
+++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
@@ -41,10 +41,10 @@
 #include <drafts/com/sun/star/script/framework/storage/XScriptInfoAccess.hpp>
 #include <drafts/com/sun/star/script/framework/storage/XScriptInfo.hpp>
 
+namespace css = ::com::sun::star;
+
 namespace scripting_runtimemgr
 {
-// for simplification
-#define css ::com::sun::star
 
 class ScriptNameResolverImpl : public
     ::cppu::WeakImplHelper1 < ::drafts::com::sun::star::script::framework::runtime::XScriptNameResolver >
diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.hxx b/scripting/source/runtimemgr/ScriptRuntimeManager.hxx
index 33fea58f3a5e..6850027e1c18 100644
--- a/scripting/source/runtimemgr/ScriptRuntimeManager.hxx
+++ b/scripting/source/runtimemgr/ScriptRuntimeManager.hxx
@@ -44,10 +44,10 @@
 #include <drafts/com/sun/star/script/framework/runtime/XScriptInvocation.hpp>
 #include <drafts/com/sun/star/script/framework/runtime/XScriptNameResolver.hpp>
 
+namespace css = ::com::sun::star;
+
 namespace scripting_runtimemgr
 {
-// for simplification
-#define css ::com::sun::star
 
 /**
  * Class responsible for managing the various ScriptRuntime implementations.
diff --git a/scripting/source/runtimemgr/StorageBridge.hxx b/scripting/source/runtimemgr/StorageBridge.hxx
index 153d174e9a63..3f407b0ace85 100644
--- a/scripting/source/runtimemgr/StorageBridge.hxx
+++ b/scripting/source/runtimemgr/StorageBridge.hxx
@@ -36,10 +36,10 @@
 #include <drafts/com/sun/star/script/framework/storage/XScriptInfoAccess.hpp>
 #include "StorageBridgeFactory.hxx"
 
+namespace css = ::com::sun::star;
+
 namespace scripting_runtimemgr
 {
-// for simplification
-#define css ::com::sun::star
 
 class StorageBridge : public ::cppu::WeakImplHelper1< ::drafts::com::sun::star::script::framework::storage::XScriptInfoAccess >
 {
diff --git a/scripting/source/runtimemgr/StorageBridgeFactory.hxx b/scripting/source/runtimemgr/StorageBridgeFactory.hxx
index 35f774d4ce00..e4f2970863a9 100644
--- a/scripting/source/runtimemgr/StorageBridgeFactory.hxx
+++ b/scripting/source/runtimemgr/StorageBridgeFactory.hxx
@@ -37,10 +37,10 @@
 
 #include <drafts/com/sun/star/script/framework/storage/XScriptInfoAccess.hpp>
 
+namespace css = ::com::sun::star;
+
 namespace scripting_runtimemgr
 {
-// for simplification
-#define css ::com::sun::star
 
 class StorageBridgeFactory
 {