summaryrefslogtreecommitdiff
path: root/cppuhelper
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 /cppuhelper
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 'cppuhelper')
-rw-r--r--cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx2
-rw-r--r--cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx2
-rw-r--r--cppuhelper/qa/weak/test_weak.cxx2
-rw-r--r--cppuhelper/source/defaultbootstrap.cxx2
-rw-r--r--cppuhelper/source/paths.cxx6
-rw-r--r--cppuhelper/source/propertysetmixin.cxx2
-rw-r--r--cppuhelper/source/servicefactory.cxx1
-rw-r--r--cppuhelper/source/supportsservice.cxx6
8 files changed, 0 insertions, 23 deletions
diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
index 1d7448a94ac8..9d4f9cd22b31 100644
--- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
@@ -62,8 +62,6 @@ namespace com { namespace sun { namespace star {
class XEventListener;
} } }
-namespace css = com::sun::star;
-
namespace {
class Empty1:
diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
index 85bb689f68d6..e46ff6f86c6d 100644
--- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
@@ -77,8 +77,6 @@ namespace com { namespace sun { namespace star {
struct EventObject;
} } }
-namespace css = com::sun::star;
-
namespace {
std::ostream & operator <<(std::ostream & out, rtl::OUString const & value) {
diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx
index 861433fb19eb..a9d0c489bb45 100644
--- a/cppuhelper/qa/weak/test_weak.cxx
+++ b/cppuhelper/qa/weak/test_weak.cxx
@@ -44,8 +44,6 @@
namespace {
-namespace css = com::sun::star;
-
class Reference: public cppu::WeakImplHelper1< css::uno::XReference > {
public:
Reference(): m_disposed(false) {}
diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index f27d82c5c114..1fe1aa76e8bd 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -77,8 +77,6 @@
namespace {
-namespace css = com::sun::star;
-
bool nextDirectoryItem(osl::Directory & directory, rtl::OUString * url) {
assert(url != 0);
for (;;) {
diff --git a/cppuhelper/source/paths.cxx b/cppuhelper/source/paths.cxx
index d834e25dcab8..ba491c3af281 100644
--- a/cppuhelper/source/paths.cxx
+++ b/cppuhelper/source/paths.cxx
@@ -38,12 +38,6 @@
#include "paths.hxx"
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
rtl::OUString cppu::get_this_libpath() {
static rtl::OUString s_uri;
if (s_uri.isEmpty()) {
diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx
index c3c30fb3acd9..3f309ee65c28 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -92,8 +92,6 @@
using cppu::PropertySetMixinImpl;
-namespace css = com::sun::star;
-
namespace {
template< typename T > struct AutoDispose {
diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx
index 062e7ffe2d58..6b3acb29bb6e 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -69,7 +69,6 @@ using namespace ::rtl;
using namespace ::osl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace css = com::sun::star;
namespace cppu
{
diff --git a/cppuhelper/source/supportsservice.cxx b/cppuhelper/source/supportsservice.cxx
index 9a3771384d28..afef759b965a 100644
--- a/cppuhelper/source/supportsservice.cxx
+++ b/cppuhelper/source/supportsservice.cxx
@@ -17,12 +17,6 @@
#include "rtl/ustring.hxx"
#include "sal/types.h"
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
bool cppu::supportsService(
css::lang::XServiceInfo * implementation, rtl::OUString const & name)
{