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
---
 ucbhelper/inc/ucbhelper/fd_inputstream.hxx         | 2 --
 ucbhelper/inc/ucbhelper/std_inputstream.hxx        | 2 --
 ucbhelper/inc/ucbhelper/std_outputstream.hxx       | 2 --
 ucbhelper/source/client/interceptedinteraction.cxx | 3 ---
 ucbhelper/source/provider/getcomponentcontext.cxx  | 2 --
 5 files changed, 11 deletions(-)

(limited to 'ucbhelper')

diff --git a/ucbhelper/inc/ucbhelper/fd_inputstream.hxx b/ucbhelper/inc/ucbhelper/fd_inputstream.hxx
index aa9603bf89f1..df3d6e386b67 100644
--- a/ucbhelper/inc/ucbhelper/fd_inputstream.hxx
+++ b/ucbhelper/inc/ucbhelper/fd_inputstream.hxx
@@ -35,8 +35,6 @@ namespace ucbhelper
     /** Implements a seekable InputStream
      *  working on a buffer.
      */
-    namespace css = com::sun::star;
-
     class UCBHELPER_DLLPUBLIC FdInputStream
         : public cppu::OWeakObject,
           public com::sun::star::io::XInputStream,
diff --git a/ucbhelper/inc/ucbhelper/std_inputstream.hxx b/ucbhelper/inc/ucbhelper/std_inputstream.hxx
index 23ab4100b945..92c9577519bc 100644
--- a/ucbhelper/inc/ucbhelper/std_inputstream.hxx
+++ b/ucbhelper/inc/ucbhelper/std_inputstream.hxx
@@ -24,8 +24,6 @@
 
 namespace ucbhelper
 {
-    namespace css = com::sun::star;
-
     /** Implements a seekable InputStream
      *  working on an std::istream
      */
diff --git a/ucbhelper/inc/ucbhelper/std_outputstream.hxx b/ucbhelper/inc/ucbhelper/std_outputstream.hxx
index 38f1b4fddbc6..d0ad4a660248 100644
--- a/ucbhelper/inc/ucbhelper/std_outputstream.hxx
+++ b/ucbhelper/inc/ucbhelper/std_outputstream.hxx
@@ -21,8 +21,6 @@
 
 namespace ucbhelper
 {
-    namespace css = com::sun::star;
-
     /** Implements a OutputStream
      *  working on an std::ostream
      */
diff --git a/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx
index ee48a9e8be7f..b925f7ca290f 100644
--- a/ucbhelper/source/client/interceptedinteraction.cxx
+++ b/ucbhelper/source/client/interceptedinteraction.cxx
@@ -22,9 +22,6 @@
 
 namespace ucbhelper{
 
-namespace css = ::com::sun::star;
-
-
 InterceptedInteraction::InterceptedInteraction()
 {
 }
diff --git a/ucbhelper/source/provider/getcomponentcontext.cxx b/ucbhelper/source/provider/getcomponentcontext.cxx
index 41f3923988e8..5dddf15db989 100644
--- a/ucbhelper/source/provider/getcomponentcontext.cxx
+++ b/ucbhelper/source/provider/getcomponentcontext.cxx
@@ -25,8 +25,6 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "ucbhelper/getcomponentcontext.hxx"
 
-namespace { namespace css = com::sun::star; }
-
 css::uno::Reference< css::uno::XComponentContext >
 ucbhelper::getComponentContext(
     css::uno::Reference< css::lang::XMultiServiceFactory > const & factory)
-- 
cgit