summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2012-11-29 21:26:09 +0100
committerThorsten Behrens <tbehrens@suse.com>2012-11-30 14:36:36 +0100
commit66a175834c39ccde9475eac3adb72a843110d01f (patch)
treeef925daaf84a85731525c2b14f0cd4a2ed84e2de /bridges
parent90eac3e69749a9227c4b6902b1f3cef1e338c6d1 (diff)
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
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx2
-rw-r--r--bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx2
-rw-r--r--bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx2
-rw-r--r--bridges/source/jni_uno/jni_info.cxx1
-rw-r--r--bridges/test/java_uno/acquire/testacquire.cxx2
-rw-r--r--bridges/test/java_uno/equals/testequals.cxx2
-rw-r--r--bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx2
-rw-r--r--bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx2
8 files changed, 0 insertions, 15 deletions
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx
index 9822979c6d22..7f9323f865ca 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx
@@ -45,8 +45,6 @@
namespace {
-namespace css = com::sun::star;
-
void loadFpRegsFromStruct(typelib_TypeDescription * type, void * data) {
for (typelib_CompoundTypeDescription * t =
reinterpret_cast< typelib_CompoundTypeDescription * >(type);
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx
index 2a55fcdf2d88..d192036eb24e 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx
@@ -49,8 +49,6 @@
namespace {
-namespace css = com::sun::star;
-
typedef void (* Function)(void *);
Function toFunction(void * pointer) {
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx
index cf4545a7fdd7..b91f2ab0806d 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx
@@ -46,8 +46,6 @@
namespace {
-namespace css = com::sun::star;
-
void storeFpRegsToStruct(typelib_TypeDescription * type, void * data) {
for (typelib_CompoundTypeDescription * t =
reinterpret_cast< typelib_CompoundTypeDescription * >(type);
diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index 713b3f60b5d1..61dd3e8420be 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -29,7 +29,6 @@
#include "uno/lbnames.h"
-namespace css = ::com::sun::star;
using namespace ::std;
using namespace ::osl;
using namespace ::rtl;
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx
index f7a94a19cc90..fddc097edb42 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -50,8 +50,6 @@
#include <iostream>
#include <cstdlib>
-namespace css = com::sun::star;
-
namespace {
class WaitCondition {
diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx
index d64efc39f2b0..106e0a318c48 100644
--- a/bridges/test/java_uno/equals/testequals.cxx
+++ b/bridges/test/java_uno/equals/testequals.cxx
@@ -46,8 +46,6 @@
#include "uno/environment.h"
#include "uno/lbnames.h"
-namespace css = com::sun::star;
-
namespace {
class Service: public cppu::WeakImplHelper2<
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
index b30f20346071..df0991c245ac 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
@@ -46,8 +46,6 @@
#include <iostream>
-namespace css = com::sun::star;
-
namespace {
class Client: public cppu::WeakImplHelper2<
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
index c4308033bc73..607a05414c2e 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
@@ -41,8 +41,6 @@
#include "sal/types.h"
#include "uno/lbnames.h"
-namespace css = com::sun::star;
-
namespace {
class Server: