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

20 files changed, 0 insertions, 37 deletions

diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index 486426a5879e..66b9c9c20445 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -161,8 +161,6 @@
 #define XTITLECHANGEBROADCASTER ::com::sun::star::frame::XTitleChangeBroadcaster
 #define XUNTITLEDNUMBERS ::com::sun::star::frame::XUntitledNumbers
 
-namespace css = ::com::sun::star;
-
 //________________________________________________________________________________________________________
 //  forwards
 //________________________________________________________________________________________________________
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index d79f838118f6..e4fd8cde0e8f 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -70,7 +70,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star;
-namespace css = ::com::sun::star;
 
 class SfxTerminateListener_Impl : public ::cppu::WeakImplHelper2< XTerminateListener, XServiceInfo >
 {
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 6c764b8a2dc8..e7c0f6da1e62 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -113,8 +113,6 @@ using namespace ::com::sun::star::container;
 using namespace ::cppu;
 using namespace ::sfx2;
 
-namespace css = ::com::sun::star;
-
 //=========================================================================
 
 class SfxOpenDocStatusListener_Impl : public WeakImplHelper1< XDispatchResultListener >
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 744a0ef807d9..b85612bff2b4 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -130,8 +130,6 @@ using namespace ::com::sun::star::system;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::document;
 
-namespace css = com::sun::star;
-
 /// Find the correct location of the document (LICENSE.odt, etc.), and return
 /// it in rURL if found.
 static sal_Bool checkURL( const char *pName, const char *pExt, rtl::OUString &rURL )
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index d715f4d3dd88..83a2252a974b 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -42,8 +42,6 @@
 #include "fileobj.hxx"
 #include "app.hrc"
 
-namespace css = ::com::sun::star;
-
 #define FILETYPE_TEXT       1
 #define FILETYPE_GRF        2
 #define FILETYPE_OBJECT     3
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index 56631e9ba801..3ad5d2bcd8c1 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -80,8 +80,6 @@ class WeakPropertyChangeListener : public ::cppu::WeakImplHelper1<com::sun::star
         }
 };
 
-namespace css = com::sun::star;
-
 using sfx2::appl::ImeStatusWindow;
 
 ImeStatusWindow::ImeStatusWindow(
diff --git a/sfx2/source/appl/openuriexternally.cxx b/sfx2/source/appl/openuriexternally.cxx
index b704b38cb649..7fcc17439386 100644
--- a/sfx2/source/appl/openuriexternally.cxx
+++ b/sfx2/source/appl/openuriexternally.cxx
@@ -49,12 +49,6 @@
 
 #include "app.hrc"
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 bool sfx2::openUriExternally(
     rtl::OUString const & uri, bool handleSystemShellExecuteException)
 {
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index c7cb563cdfb8..e7212722add6 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -55,7 +55,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-namespace css = ::com::sun::star;
 
 struct ResIdToResName
 {
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 1af5157d4868..352a4fe2d928 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -61,7 +61,6 @@
 
 #include <boost/scoped_ptr.hpp>
 
-namespace css = ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 884ad4fc8e86..6ce7a2215a01 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -85,7 +85,6 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::system;
 using namespace ::rtl;
 
-namespace css = ::com::sun::star;
 // - class PrepareListener_Impl ------------------------------------------
 class PrepareListener_Impl : public ::cppu::WeakImplHelper1< css::frame::XStatusListener >
 {
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index b530da3571e9..c41257822611 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -109,9 +109,6 @@
 /// anonymous implementation namespace
 namespace {
 
-namespace css = ::com::sun::star;
-
-
 /// a list of attribute-lists, where attribute means name and content
 typedef std::vector<std::vector<std::pair<const char*, ::rtl::OUString> > >
         AttrVector;
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 4315fb73880d..d0e305895868 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -53,7 +53,6 @@
 
 #include <assert.h>
 
-namespace css = ::com::sun::star;
 using namespace ::com::sun::star;
 
 //========================================================================
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 9fe53943155e..88380bbe9bf4 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -141,8 +141,6 @@ using namespace ::com::sun::star::document;
 using namespace ::rtl;
 using namespace ::cppu;
 
-namespace css = ::com::sun::star;
-
 //=========================================================================
 void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >& xModel)
 {
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 57e8f27d4609..5dd7d63246c1 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -115,7 +115,6 @@
 //  namespaces
 //________________________________________________________________________________________________________
 
-namespace css = ::com::sun::star;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using ::com::sun::star::beans::PropertyValue;
diff --git a/sfx2/source/inc/SfxDocumentMetaData.hxx b/sfx2/source/inc/SfxDocumentMetaData.hxx
index e8a3779a02c6..080713a2efeb 100644
--- a/sfx2/source/inc/SfxDocumentMetaData.hxx
+++ b/sfx2/source/inc/SfxDocumentMetaData.hxx
@@ -27,8 +27,6 @@
 // component helper namespace
 namespace comp_SfxDocumentMetaData {
 
-namespace css = ::com::sun::star;
-
 // component and service helper functions:
 ::rtl::OUString SAL_CALL _getImplementationName();
 css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames();
@@ -39,8 +37,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create(
 
 namespace comp_CompatWriterDocProps {
 
-namespace css = ::com::sun::star;
-
 // component and service helper functions:
 ::rtl::OUString SAL_CALL _getImplementationName();
 css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames();
diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx
index 56f6639fe299..a6a274fa5d40 100644
--- a/sfx2/source/menu/thessubmenu.hxx
+++ b/sfx2/source/menu/thessubmenu.hxx
@@ -27,8 +27,6 @@
 #include <vcl/menu.hxx>
 #include <sfx2/mnuitem.hxx>
 
-namespace css = ::com::sun::star;
-
 class SfxThesSubMenuHelper
 {
     css::uno::Reference< css::linguistic2::XLinguServiceManager2 >  m_xLngMgr;
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 21b578b7146a..8218d20236f5 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -57,7 +57,6 @@
 #define PROPERTYVALUE       ::com::sun::star::beans::PropertyValue
 #define UNO_QUERY           ::com::sun::star::uno::UNO_QUERY
 
-namespace css = ::com::sun::star;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::PropertyValue;
 
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index dee5ea764914..f1b2b01bf73b 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -112,7 +112,6 @@ using ::com::sun::star::frame::XFrameActionListener;
 using ::com::sun::star::util::XCloseListener;
 using ::com::sun::star::task::XStatusIndicator;
 using ::com::sun::star::frame::XTitle;
-namespace css = ::com::sun::star;
 
 struct GroupIDToCommandGroup
 {
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 60bd2a758673..b97f7615ecbf 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -99,7 +99,6 @@ using ::com::sun::star::awt::XWindow;
 using ::com::sun::star::beans::PropertyValue;
 using ::com::sun::star::document::XViewDataSupplier;
 using ::com::sun::star::container::XIndexContainer;
-namespace css = ::com::sun::star;
 
 // Due to ViewFrame::Current
 #include "appdata.hxx"
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index f6c2eb55248f..d865d2687709 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -84,7 +84,6 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 using namespace ::cppu;
-namespace css = ::com::sun::star;
 
 //=========================================================================
 DBG_NAME(SfxViewShell)