From 66a175834c39ccde9475eac3adb72a843110d01f Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@suse.com>
Date: Thu, 29 Nov 2012 21:26:09 +0100
Subject: c++ API: use css alias in generated headers, adds global css decl

This changes all generated API headers (.hpp and .hdl) to use a
namespace alias 'css' instead of the pointlessly long com::sun::star

Makes the change in cppumaker & associated tools, adds a global
namespace alias definition in sal/types.h, and removes a kiloton
of local, now pointless-to-harmful versions of that alias from all
over the code.

Change-Id: Ice5a644a6b971a981f01dc0589d48f5add31cc0f
---
 scripting/source/dlgprov/DialogModelProvider.cxx          | 2 --
 scripting/source/dlgprov/DialogModelProvider.hxx          | 2 --
 scripting/source/inc/util/MiscUtils.hxx                   | 2 --
 scripting/source/protocolhandler/scripthandler.cxx        | 3 ---
 scripting/source/protocolhandler/scripthandler.hxx        | 2 --
 scripting/source/provider/ActiveMSPList.hxx               | 2 --
 scripting/source/provider/BrowseNodeFactoryImpl.hxx       | 2 --
 scripting/source/provider/MasterScriptProvider.hxx        | 2 --
 scripting/source/provider/MasterScriptProviderFactory.hxx | 2 --
 scripting/source/provider/ProviderCache.hxx               | 2 --
 scripting/source/provider/ScriptImpl.hxx                  | 2 --
 scripting/source/provider/ScriptingContext.hxx            | 2 --
 scripting/source/provider/URIHelper.hxx                   | 2 --
 13 files changed, 27 deletions(-)

(limited to 'scripting/source')

diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx b/scripting/source/dlgprov/DialogModelProvider.cxx
index 176ed1452745..8567d88fe51a 100644
--- a/scripting/source/dlgprov/DialogModelProvider.cxx
+++ b/scripting/source/dlgprov/DialogModelProvider.cxx
@@ -26,7 +26,6 @@
 // component helper namespace
 namespace comp_DialogModelProvider {
 
-namespace css = ::com::sun::star;
 using namespace ::com::sun::star;
 using namespace awt;
 using namespace lang;
@@ -47,7 +46,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Referenc
 /// anonymous implementation namespace
 namespace dlgprov {
 
-namespace css = ::com::sun::star;
 using namespace ::com::sun::star;
 using namespace awt;
 using namespace lang;
diff --git a/scripting/source/dlgprov/DialogModelProvider.hxx b/scripting/source/dlgprov/DialogModelProvider.hxx
index e80e12a5669f..9ce8518a1784 100644
--- a/scripting/source/dlgprov/DialogModelProvider.hxx
+++ b/scripting/source/dlgprov/DialogModelProvider.hxx
@@ -27,8 +27,6 @@
 /// anonymous implementation namespace
 namespace dlgprov{
 
-namespace css = ::com::sun::star;
-
 class DialogModelProvider:
     public ::cppu::WeakImplHelper4<
         css::lang::XInitialization,
diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx
index 41a57fe5d9ef..657355c9aaf5 100644
--- a/scripting/source/inc/util/MiscUtils.hxx
+++ b/scripting/source/inc/util/MiscUtils.hxx
@@ -39,8 +39,6 @@
 
 #include "util.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace sf_misc
 {
 
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index faa25bb3613e..36ca322e932e 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -489,9 +489,6 @@ const Reference< XMultiServiceFactory >& xServiceManager )
 
 extern "C"
 {
-
-    namespace css = ::com::sun::star;
-
     SAL_DLLPUBLIC_EXPORT void* SAL_CALL protocolhandler_component_getFactory( const sal_Char * pImplementationName ,
                                          void * pServiceManager ,
                                          void * pRegistryKey )
diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx
index 87bd9b7a2551..d2bf74309236 100644
--- a/scripting/source/protocolhandler/scripthandler.hxx
+++ b/scripting/source/protocolhandler/scripthandler.hxx
@@ -63,8 +63,6 @@ namespace com { namespace sun { namespace star {
 namespace scripting_protocolhandler
 {
 
-namespace css = ::com::sun::star;
-
 class ScriptProtocolHandler :
 public ::cppu::WeakImplHelper4< css::frame::XDispatchProvider,
     css::frame::XNotifyingDispatch, css::lang::XServiceInfo, css::lang::XInitialization >
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index efb38fb0881f..37fd8d6ab349 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -36,8 +36,6 @@
 
 #include <comphelper/stl_types.hxx>
 
-namespace css = ::com::sun::star;
-
 namespace func_provider
 {
 
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
index cf9a109bfc21..0953a9f26f18 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
@@ -29,8 +29,6 @@
 #include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
 #include <com/sun/star/script/browse/XBrowseNodeFactory.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace browsenodefactory
 {
 
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index 86643722514b..3299fcfe35e3 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -36,8 +36,6 @@
 
 #include "ProviderCache.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace func_provider
 {
 
diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx
index 8ee4c76394ea..f07a03b3df32 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.hxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.hxx
@@ -30,8 +30,6 @@
 
 #include "ActiveMSPList.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace func_provider
 {
 
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index eefa9fb6cf03..2021baa08e2b 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -35,8 +35,6 @@
 
 #include "ScriptingContext.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace func_provider
 {
 
diff --git a/scripting/source/provider/ScriptImpl.hxx b/scripting/source/provider/ScriptImpl.hxx
index ffe114771a40..f6f1f6bfce4e 100644
--- a/scripting/source/provider/ScriptImpl.hxx
+++ b/scripting/source/provider/ScriptImpl.hxx
@@ -32,8 +32,6 @@
 #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
 {
 
diff --git a/scripting/source/provider/ScriptingContext.hxx b/scripting/source/provider/ScriptingContext.hxx
index a1ab2dd362d7..881445790700 100644
--- a/scripting/source/provider/ScriptingContext.hxx
+++ b/scripting/source/provider/ScriptingContext.hxx
@@ -36,8 +36,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/broadcasthelper.hxx>
 
-namespace css = ::com::sun::star;
-
 namespace func_provider
 {
 
diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx
index ddf65c04db0c..2ceb3d875fb7 100644
--- a/scripting/source/provider/URIHelper.hxx
+++ b/scripting/source/provider/URIHelper.hxx
@@ -31,8 +31,6 @@
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase3.hxx>
 
-namespace css = ::com::sun::star;
-
 namespace func_provider
 {
 
-- 
cgit