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

24 files changed, 1 insertions, 75 deletions

diff --git a/framework/inc/framework/preventduplicateinteraction.hxx b/framework/inc/framework/preventduplicateinteraction.hxx
index a510110c8232..921a54b8ae23 100644
--- a/framework/inc/framework/preventduplicateinteraction.hxx
+++ b/framework/inc/framework/preventduplicateinteraction.hxx
@@ -30,8 +30,6 @@
 
 #include <cppuhelper/implbase1.hxx>
 
-namespace css = ::com::sun::star;
-
 namespace framework{
 
 /**
diff --git a/framework/inc/framework/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx
index b46a45f79656..92fff24df7c3 100644
--- a/framework/inc/framework/titlehelper.hxx
+++ b/framework/inc/framework/titlehelper.hxx
@@ -44,8 +44,6 @@
 #include <framework/fwedllapi.h>
 
 
-namespace css = ::com::sun::star;
-
 namespace framework{
 
 
diff --git a/framework/inc/general.h b/framework/inc/general.h
index fe7899b100a8..57e24101aca7 100644
--- a/framework/inc/general.h
+++ b/framework/inc/general.h
@@ -29,16 +29,6 @@
 
 #include <rtl/ustring.hxx>
 
-
-//-----------------------------------------------------------------------------
-/** will make our code more readable if we can use such short name css instead
-    of typing ::com::sun::star everytimes.
-
-    On the other side we had so many problems with "using namespace" so we dont use
-    it here any longer.
- */
-namespace css = ::com::sun::star;
-
 #endif // #ifndef __FRAMEWORK_GENERAL_H_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx
index e61e24e13a5d..9ef0a2fcf4b7 100644
--- a/framework/inc/services/autorecovery.hxx
+++ b/framework/inc/services/autorecovery.hxx
@@ -51,10 +51,6 @@
 //_______________________________________________
 // definition
 
-#ifndef css
-namespace css = ::com::sun::star;
-#endif
-
 namespace framework
 {
 
diff --git a/framework/inc/services/modulemanager.hxx b/framework/inc/services/modulemanager.hxx
index eb1b9f456f54..849d5500b969 100644
--- a/framework/inc/services/modulemanager.hxx
+++ b/framework/inc/services/modulemanager.hxx
@@ -36,8 +36,6 @@ namespace com { namespace sun { namespace star { namespace lang {
     class XSingleServiceFactory;
 } } } }
 
-namespace css = com::sun::star;
-
 //_______________________________________________
 // definition
 
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index 8e9d7c3f1413..42bb80cf131f 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -50,8 +50,6 @@
 namespace framework
 {
 
-namespace css = ::com::sun::star;
-
 //-----------------------------------------------
 StorageHolder::StorageHolder()
     : ThreadHelpBase(                                        )
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index 7c700d4b10f4..b0c6db53d2a4 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -30,8 +30,6 @@
 
 namespace framework{
 
-namespace css = ::com::sun::star;
-
 DEFINE_XINTERFACE_1(DispatchInformationProvider                               ,
                     OWeakObject                                               ,
                     DIRECT_INTERFACE(css::frame::XDispatchInformationProvider))
diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx
index 96edcac573e3..4d0a12b7c85e 100644
--- a/framework/source/dispatch/loaddispatcher.cxx
+++ b/framework/source/dispatch/loaddispatcher.cxx
@@ -25,8 +25,6 @@
 
 namespace framework{
 
-namespace css = ::com::sun::star;
-
 LoadDispatcher::LoadDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR       ,
                                const css::uno::Reference< css::frame::XFrame >&              xOwnerFrame ,
                                const ::rtl::OUString                                         sTargetName ,
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index e293764010b7..620f5449153a 100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -39,8 +39,6 @@
 
 namespace framework{
 
-namespace css = ::com::sun::star;
-
 //-----------------------------------------------
 WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
                          const css::uno::Reference< css::frame::XFrame >&              xFrame)
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index fe8d24ad159e..b54c3042202a 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -38,8 +38,6 @@
 
 namespace framework{
 
-namespace css = ::com::sun::star;
-
 //-----------------------------------------------
 TitleHelper::TitleHelper(const css::uno::Reference< css::uno::XComponentContext >& rxContext)
     : ::cppu::BaseMutex ()
diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
index 59cf842e86d5..eeddfd7717b2 100644
--- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
@@ -24,8 +24,6 @@
 
 namespace framework{
 
-namespace css = ::com::sun::star;
-
 #define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER                 ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler"))
 
 PreventDuplicateInteraction::PreventDuplicateInteraction(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)
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{
 
 
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 3176246be3ef..c676fe49ac03 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -83,10 +83,6 @@ const char PROP_NAME[] = "Name";
 
 namespace framework {
 
-// may there exist already a define .-(
-#ifndef css
-namespace css = ::com::sun::star;
-#endif
 using namespace com::sun::star;
 
 
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 2cb8309e78ea..3d4a794eba89 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -90,10 +90,6 @@
 //_______________________________________________
 // namespaces
 
-#ifndef css
-namespace css = ::com::sun::star;
-#endif
-
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::UNO_QUERY;
 using ::com::sun::star::uno::UNO_QUERY_THROW;
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index 67f3c1df1d10..6c0e37ca0525 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -26,15 +26,10 @@
 
 #include "tools/urlobj.hxx"
 
-// component helper namespace
-namespace css = ::com::sun::star;
-
 // framework namespace
 namespace framework
 {
 
-namespace css = ::com::sun::star;
-
 //*****************************************************************************************************************
 //  XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index c6fd9f185fb4..25b29a4900bc 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -50,7 +50,6 @@
 #include <rtl/logfile.hxx>
 
 using namespace ::com::sun::star;
-namespace css = ::com::sun::star;
 
 // Property names of a menu/menu item ItemDescriptor
 static const char ITEM_DESCRIPTOR_COMMANDURL[]  = "CommandURL";