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

18 files changed, 0 insertions, 34 deletions

diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index cb48b6cf83fc..f60719f31519 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -55,8 +55,6 @@
 #include "jvmaccess/unovirtualmachine.hxx"
 #include "jvmaccess/virtualmachine.hxx"
 
-namespace css = com::sun::star;
-
 using namespace ::com::sun::star::java;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::loader;
diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx
index 112353531c03..236649f542be 100644
--- a/stoc/source/javavm/interact.cxx
+++ b/stoc/source/javavm/interact.cxx
@@ -28,8 +28,6 @@
 #include "cppuhelper/implbase1.hxx"
 #include "osl/mutex.hxx"
 
-namespace css = com::sun::star;
-
 using stoc_javavm::InteractionRequest;
 
 namespace {
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 4667fee609fc..b0e7225dfe09 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -117,8 +117,6 @@
  * com.sun.star.uno.RuntimeException.
  */
 
-namespace css = com::sun::star;
-
 using stoc_javavm::JavaVirtualMachine;
 
 namespace {
diff --git a/stoc/source/registry_tdprovider/functiondescription.cxx b/stoc/source/registry_tdprovider/functiondescription.cxx
index 75019ca7a162..8840451355fe 100644
--- a/stoc/source/registry_tdprovider/functiondescription.cxx
+++ b/stoc/source/registry_tdprovider/functiondescription.cxx
@@ -38,8 +38,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 
-namespace css = com::sun::star;
-
 using stoc::registry_tdprovider::FunctionDescription;
 
 FunctionDescription::FunctionDescription(
diff --git a/stoc/source/registry_tdprovider/methoddescription.cxx b/stoc/source/registry_tdprovider/methoddescription.cxx
index f071f6eeb8ae..fd2d6c3343aa 100644
--- a/stoc/source/registry_tdprovider/methoddescription.cxx
+++ b/stoc/source/registry_tdprovider/methoddescription.cxx
@@ -35,8 +35,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 
-namespace css = com::sun::star;
-
 using stoc::registry_tdprovider::MethodDescription;
 
 namespace {
diff --git a/stoc/source/registry_tdprovider/structtypedescription.cxx b/stoc/source/registry_tdprovider/structtypedescription.cxx
index 84d88c4eee61..3251fd1812d2 100644
--- a/stoc/source/registry_tdprovider/structtypedescription.cxx
+++ b/stoc/source/registry_tdprovider/structtypedescription.cxx
@@ -37,7 +37,6 @@
 
 #include <new>
 
-namespace css = com::sun::star;
 using stoc::registry_tdprovider::StructTypeDescription;
 
 StructTypeDescription::StructTypeDescription(
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index 24f47e057c14..e08aba30593a 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -59,8 +59,6 @@ extern rtl_StandardModuleCount g_moduleCount;
 
 namespace {
 
-namespace css = com::sun::star;
-
 class SimpleRegistry:
     public cppu::WeakImplHelper2<
         css::registry::XSimpleRegistry, css::lang::XServiceInfo >
diff --git a/stoc/source/simpleregistry/textualservices.cxx b/stoc/source/simpleregistry/textualservices.cxx
index 6c007ac2f52f..eae2f4255547 100644
--- a/stoc/source/simpleregistry/textualservices.cxx
+++ b/stoc/source/simpleregistry/textualservices.cxx
@@ -49,8 +49,6 @@ namespace stoc { namespace simpleregistry {
 
 namespace {
 
-namespace css = com::sun::star;
-
 struct Implementation {
     rtl::OUString uri;
     rtl::OUString loader;
diff --git a/stoc/source/tdmanager/tdmgr_common.hxx b/stoc/source/tdmanager/tdmgr_common.hxx
index b8dda62799d6..a4830a70d1a9 100644
--- a/stoc/source/tdmanager/tdmgr_common.hxx
+++ b/stoc/source/tdmanager/tdmgr_common.hxx
@@ -28,8 +28,6 @@
 #define ARLEN(x) (sizeof (x) / sizeof *(x))
 
 
-namespace css = ::com::sun::star;
-
 namespace stoc_tdmgr
 {
     extern rtl_StandardModuleCount g_moduleCount;
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index b67ab7924b5b..cad73741f527 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -43,8 +43,6 @@
 
 #include <new>
 
-namespace css = com::sun::star;
-
 namespace {
 
 class Translator: public cppu::WeakImplHelper2<
diff --git a/stoc/source/uriproc/UriReference.cxx b/stoc/source/uriproc/UriReference.cxx
index d2e7b0af2469..2dafb685a8d9 100644
--- a/stoc/source/uriproc/UriReference.cxx
+++ b/stoc/source/uriproc/UriReference.cxx
@@ -27,7 +27,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 
-namespace css = com::sun::star;
 using stoc::uriproc::UriReference;
 
 UriReference::UriReference(
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index c89777b0d8e0..ef947c1f90e4 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -51,8 +51,6 @@
 #include <new>
 #include <vector>
 
-namespace css = com::sun::star;
-
 namespace {
 
 //TODO: move comphelper::string::misc into something like
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index e9af16695485..47b2bc7b965c 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -48,8 +48,6 @@
 
 namespace {
 
-namespace css = ::com::sun::star;
-
 bool parseSchemeSpecificPart(::rtl::OUString const & part) {
     // Liberally accepts both an empty opaque_part and an opaque_part that
     // starts with a non-escaped "/":
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index 09c57fc80f72..9db6f7300a5f 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -43,8 +43,6 @@
 
 #include <new>
 
-namespace css = com::sun::star;
-
 namespace {
 
 int getHexWeight(sal_Unicode c) {
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index e0843277c02a..50a0fbdd4c6d 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -45,8 +45,6 @@
 
 #include <new>
 
-namespace css = com::sun::star;
-
 namespace {
 
 class Factory: public cppu::WeakImplHelper2<
diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
index 7fa6947611b7..4e03b5aaf68b 100644
--- a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
+++ b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
@@ -56,8 +56,6 @@
 #include <iostream>
 #include <ostream>
 
-namespace css = com::sun::star;
-
 namespace {
 
 class Service: public cppu::WeakImplHelper1< css::lang::XMain > {
diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx
index dc0d29e5d027..9e45fb3ff27c 100644
--- a/stoc/test/tdmanager/testtdmanager.cxx
+++ b/stoc/test/tdmanager/testtdmanager.cxx
@@ -54,8 +54,6 @@
 #include <iostream>
 #include <ostream>
 
-namespace css = com::sun::star;
-
 namespace {
 
 class Service: public cppu::WeakImplHelper1< css::lang::XMain > {
diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx
index c2b4d84e69f1..34a3b2d9c0c1 100644
--- a/stoc/test/uriproc/test_uriproc.cxx
+++ b/stoc/test/uriproc/test_uriproc.cxx
@@ -48,8 +48,6 @@
 
 #include <cstdlib>
 
-namespace css = com::sun::star;
-
 namespace {
 
 #define TEST_ASSERT_EQUAL(token1, token2, token3, expected, actual) \