summaryrefslogtreecommitdiff
path: root/framework/source/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 /framework/source/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 'framework/source/inc')
-rw-r--r--framework/source/inc/accelerators/storageholder.hxx2
-rw-r--r--framework/source/inc/dispatch/loaddispatcher.hxx2
-rw-r--r--framework/source/inc/dispatch/windowcommanddispatch.hxx2
-rw-r--r--framework/source/inc/loadenv/actionlockguard.hxx5
-rw-r--r--framework/source/inc/loadenv/loadenv.hxx1
-rw-r--r--framework/source/inc/loadenv/loadenvexception.hxx4
-rw-r--r--framework/source/inc/pattern/configuration.hxx4
-rw-r--r--framework/source/inc/pattern/frame.hxx4
-rw-r--r--framework/source/inc/pattern/window.hxx4
9 files changed, 0 insertions, 28 deletions
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index 5541d3c858f5..9b4955b7e699 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -30,8 +30,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-namespace css = ::com::sun::star;
-
namespace framework
{
diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index 41e033253515..20c003916efe 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -29,8 +29,6 @@
namespace framework{
-namespace css = ::com::sun::star;
-
/** @short implements a dispatch object which can be used to load
non-visible components (by using the mechanism of ContentHandler)
or visible-components (by using the mechanism of FrameLoader).
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx
index 0597e322c5b1..4d561cb8ee5b 100644
--- a/framework/source/inc/dispatch/windowcommanddispatch.hxx
+++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx
@@ -32,8 +32,6 @@
namespace framework{
-namespace css = ::com::sun::star;
-
/** @short internal helper to bind e.g. MAC-Menu events to our internal dispatch API.
@descr On e.g. MAC platform system menus are merged together with some fix entries as
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx
index 9ccde9e57f95..832a3a93f837 100644
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -29,11 +29,6 @@
namespace framework{
-#ifndef css
-namespace css = ::com::sun::star;
-#endif
-
-
/** @short implements a guard, which can use the interface
<type scope="com::sun::star::document">XActionLockable</type>.
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index 665882485d5e..ba50b7d24b0e 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -43,7 +43,6 @@
namespace framework {
-namespace css = ::com::sun::star;
class QuietInteraction;
/** @short implements general mechainsm for loading documents.
diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx
index 858f7b14881b..a1b4be2418b6 100644
--- a/framework/source/inc/loadenv/loadenvexception.hxx
+++ b/framework/source/inc/loadenv/loadenvexception.hxx
@@ -27,10 +27,6 @@
namespace framework{
-#ifndef css // conflict with define :-(
-namespace css = ::com::sun::star;
-#endif
-
/** @short specify an exception, which can be used inside the
load environment only.
diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx
index e1ad98262b23..01d97c1d5456 100644
--- a/framework/source/inc/pattern/configuration.hxx
+++ b/framework/source/inc/pattern/configuration.hxx
@@ -33,10 +33,6 @@
#include <rtl/ustrbuf.hxx>
-#ifndef css
-namespace css = ::com::sun::star;
-#endif
-
namespace framework{
namespace pattern{
namespace configuration{
diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx
index 5a51422abe72..6bb2b8e4659a 100644
--- a/framework/source/inc/pattern/frame.hxx
+++ b/framework/source/inc/pattern/frame.hxx
@@ -31,10 +31,6 @@
// namespaces
-#ifndef css
-namespace css = ::com::sun::star;
-#endif
-
namespace framework{
namespace pattern{
namespace frame{
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index e91a3ba68c1e..6604488d52ba 100644
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/window.hxx
@@ -36,10 +36,6 @@
//_______________________________________________
// namespaces
-#ifndef css
-namespace css = ::com::sun::star;
-#endif
-
namespace framework{