summaryrefslogtreecommitdiff
path: root/comphelper/inc
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 /comphelper/inc
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 'comphelper/inc')
-rw-r--r--comphelper/inc/comphelper/configurationhelper.hxx11
-rw-r--r--comphelper/inc/comphelper/numberedcollection.hxx9
-rw-r--r--comphelper/inc/comphelper/servicedecl.hxx1
3 files changed, 0 insertions, 21 deletions
diff --git a/comphelper/inc/comphelper/configurationhelper.hxx b/comphelper/inc/comphelper/configurationhelper.hxx
index 2f6c94166337..1a31c9afb851 100644
--- a/comphelper/inc/comphelper/configurationhelper.hxx
+++ b/comphelper/inc/comphelper/configurationhelper.hxx
@@ -34,15 +34,6 @@
//_______________________________________________
// namespaces
-// no panic .. this define will be reseted at the end of this file.
-// BUT doing so it's neccessary to add all includes BEFORE this css-value
-// will be defined :_)
-#ifdef css
-#error "Who use css? I need it as namespace alias."
-#else
-#define css ::com::sun::star
-#endif
-
namespace comphelper{
@@ -244,8 +235,6 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
} // namespace comphelper
-#undef css // important!
-
#endif // _COMPHELPER_CONFIGURATIONHELPER_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/inc/comphelper/numberedcollection.hxx b/comphelper/inc/comphelper/numberedcollection.hxx
index d2ea6b892f17..59183e460b9e 100644
--- a/comphelper/inc/comphelper/numberedcollection.hxx
+++ b/comphelper/inc/comphelper/numberedcollection.hxx
@@ -37,13 +37,6 @@
namespace comphelper{
-#ifdef css
- #error "Ambigious namespace definition of css."
-#else
- #define css ::com::sun::star
-#endif
-
-
/** @short defines a collection of UNO components, where every component will get it's own unique number.
@descr Such number will be unique at runtime only ... but it supports fragmentation.
@@ -176,8 +169,6 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
css::uno::WeakReference< css::uno::XInterface > m_xOwner;
};
-#undef css
-
} // namespace comphelper
#endif // _COMPHELPER_NUMBEREDCOLLECTION_HXX_
diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx
index 442bf9f592f7..d02e47fba612 100644
--- a/comphelper/inc/comphelper/servicedecl.hxx
+++ b/comphelper/inc/comphelper/servicedecl.hxx
@@ -37,7 +37,6 @@ namespace service_decl {
class ServiceDecl;
namespace detail {
-namespace css = ::com::sun::star;
typedef ::boost::function3<
css::uno::Reference<css::uno::XInterface> /* return */,
ServiceDecl const&,