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
---
 binaryurp/qa/test-unmarshal.cxx       | 2 --
 binaryurp/source/binaryany.cxx        | 6 ------
 binaryurp/source/bridge.cxx           | 2 --
 binaryurp/source/bridgefactory.cxx    | 6 ------
 binaryurp/source/currentcontext.cxx   | 6 ------
 binaryurp/source/incomingrequest.cxx  | 6 ------
 binaryurp/source/marshal.cxx          | 2 --
 binaryurp/source/outgoingrequests.cxx | 6 ------
 binaryurp/source/proxy.cxx            | 2 --
 binaryurp/source/reader.cxx           | 2 --
 binaryurp/source/unmarshal.cxx        | 2 --
 binaryurp/source/writer.cxx           | 6 ------
 12 files changed, 48 deletions(-)

(limited to 'binaryurp')

diff --git a/binaryurp/qa/test-unmarshal.cxx b/binaryurp/qa/test-unmarshal.cxx
index 9846673ef0d1..759b120a2d20 100644
--- a/binaryurp/qa/test-unmarshal.cxx
+++ b/binaryurp/qa/test-unmarshal.cxx
@@ -36,8 +36,6 @@
 
 namespace {
 
-namespace css = com::sun::star;
-
 class Test: public CppUnit::TestFixture {
 private:
     CPPUNIT_TEST_SUITE(Test);
diff --git a/binaryurp/source/binaryany.cxx b/binaryurp/source/binaryany.cxx
index 9a60dacf3582..a56663afad2d 100644
--- a/binaryurp/source/binaryany.cxx
+++ b/binaryurp/source/binaryany.cxx
@@ -29,12 +29,6 @@
 
 namespace binaryurp {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 BinaryAny::BinaryAny() throw () {
     uno_any_construct(&data_, 0, 0, 0);
 }
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 5256ac081663..5b463f59c8c3 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -73,8 +73,6 @@ namespace binaryurp {
 
 namespace {
 
-namespace css = com::sun::star;
-
 sal_Int32 random() {
     sal_Int32 n;
     rtlRandomPool pool = rtl_random_createPool();
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index 4050e068d619..24105f30ff9d 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -38,12 +38,6 @@
 
 namespace binaryurp {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 css::uno::Reference< css::uno::XInterface > BridgeFactory::static_create(
     css::uno::Reference< css::uno::XComponentContext > const & xContext)
     SAL_THROW((css::uno::Exception))
diff --git a/binaryurp/source/currentcontext.cxx b/binaryurp/source/currentcontext.cxx
index a2d6c1a5d1c2..143dd34879ac 100644
--- a/binaryurp/source/currentcontext.cxx
+++ b/binaryurp/source/currentcontext.cxx
@@ -32,12 +32,6 @@
 
 namespace binaryurp {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 namespace current_context {
 
 css::uno::UnoInterfaceReference get() {
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx
index b156196d040c..1ac6e10ef24b 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -40,12 +40,6 @@
 
 namespace binaryurp {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 IncomingRequest::IncomingRequest(
     rtl::Reference< Bridge > const & bridge, rtl::ByteSequence const & tid,
     OUString const & oid, css::uno::UnoInterfaceReference const & object,
diff --git a/binaryurp/source/marshal.cxx b/binaryurp/source/marshal.cxx
index d5c9f71b2441..476fb19b13aa 100644
--- a/binaryurp/source/marshal.cxx
+++ b/binaryurp/source/marshal.cxx
@@ -50,8 +50,6 @@ namespace binaryurp {
 
 namespace {
 
-namespace css = com::sun::star;
-
 void write64(std::vector< unsigned char > * buffer, sal_uInt64 value) {
     Marshal::write8(buffer, value >> 56);
     Marshal::write8(buffer, (value >> 48) & 0xFF);
diff --git a/binaryurp/source/outgoingrequests.cxx b/binaryurp/source/outgoingrequests.cxx
index 2a15d04a0e5b..a0fb6d272f82 100644
--- a/binaryurp/source/outgoingrequests.cxx
+++ b/binaryurp/source/outgoingrequests.cxx
@@ -29,12 +29,6 @@
 
 namespace binaryurp {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 OutgoingRequests::OutgoingRequests() {}
 
 OutgoingRequests::~OutgoingRequests() {}
diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx
index fde8b31cbd4d..355ac8787d1f 100644
--- a/binaryurp/source/proxy.cxx
+++ b/binaryurp/source/proxy.cxx
@@ -41,8 +41,6 @@ namespace binaryurp {
 
 namespace {
 
-namespace css = com::sun::star;
-
 extern "C" void SAL_CALL proxy_acquireInterface(uno_Interface * pInterface) {
     assert(pInterface != 0);
     static_cast< Proxy * >(pInterface)->do_acquire();
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index cbfb7dd42d3c..522b1654452d 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -56,8 +56,6 @@ namespace binaryurp {
 
 namespace {
 
-namespace css = com::sun::star;
-
 css::uno::Sequence< sal_Int8 > read(
     css::uno::Reference< css::connection::XConnection > const & connection,
     sal_uInt32 size, bool eofOk)
diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx
index f0c9ef52456a..d413e5f84e78 100644
--- a/binaryurp/source/unmarshal.cxx
+++ b/binaryurp/source/unmarshal.cxx
@@ -55,8 +55,6 @@ namespace binaryurp {
 
 namespace {
 
-namespace css = com::sun::star;
-
 void * allocate(sal_Size size) {
     void * p = rtl_allocateMemory(size);
     if (p == 0) {
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index dbbaf85e6c4c..3d5c199befa0 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -38,12 +38,6 @@
 
 namespace binaryurp {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 Writer::Item::Item() {}
 
 Writer::Item::Item(
-- 
cgit