diff options
author | Thorsten Behrens <tbehrens@suse.com> | 2012-11-29 21:26:09 +0100 |
---|---|---|
committer | Thorsten Behrens <tbehrens@suse.com> | 2012-11-30 14:36:36 +0100 |
commit | 66a175834c39ccde9475eac3adb72a843110d01f (patch) | |
tree | ef925daaf84a85731525c2b14f0cd4a2ed84e2de /unotools | |
parent | API CHANGE remove [oneway] method attributes (diff) | |
download | core-66a175834c39ccde9475eac3adb72a843110d01f.tar.gz core-66a175834c39ccde9475eac3adb72a843110d01f.zip |
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 'unotools')
-rw-r--r-- | unotools/source/config/configmgr.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/historyoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/itemholder1.cxx | 6 | ||||
-rw-r--r-- | unotools/source/config/itemholder1.hxx | 6 | ||||
-rw-r--r-- | unotools/source/config/moduleoptions.cxx | 8 | ||||
-rw-r--r-- | unotools/source/config/saveopt.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/viewoptions.cxx | 6 | ||||
-rw-r--r-- | unotools/source/i18n/instance.hxx | 2 | ||||
-rw-r--r-- | unotools/source/ucbhelper/ucbhelper.cxx | 2 | ||||
-rw-r--r-- | unotools/source/ucbhelper/xtempfile.cxx | 2 |
10 files changed, 0 insertions, 38 deletions
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index a4589601e37c..b81bbccf71fe 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -39,8 +39,6 @@ namespace { -namespace css = com::sun::star; - class RegisterConfigItemHelper: private boost::noncopyable { public: RegisterConfigItemHelper( diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index 141555044ec7..aed1f4ba13c8 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.cxx @@ -50,8 +50,6 @@ using namespace ::osl ; using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::beans ; -namespace css = ::com::sun::star; - namespace { static const ::sal_Int32 s_nOffsetURL = 0; static const ::sal_Int32 s_nOffsetFilter = 1; diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index 19ff19d95e36..0bac77328ccb 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.cxx @@ -53,12 +53,6 @@ #include <unotools/syslocaleoptions.hxx> //----------------------------------------------- -// namespaces - -namespace css = ::com::sun::star; - - -//----------------------------------------------- ItemHolder1::ItemHolder1() : ItemHolderMutexBase() { diff --git a/unotools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx index 5133f777edc1..9051e18adc83 100644 --- a/unotools/source/config/itemholder1.hxx +++ b/unotools/source/config/itemholder1.hxx @@ -24,12 +24,6 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/lang/XEventListener.hpp> -//----------------------------------------------- -// namespaces - -namespace css = ::com::sun::star; - - class ItemHolder1 : private ItemHolderMutexBase , public ::cppu::WeakImplHelper1< css::lang::XEventListener > { diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 1d008d74d65b..4c03a2cd93dd 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -40,14 +40,6 @@ #include "itemholder1.hxx" -//_________________________________________________________________________________________________________________ -// namespaces -//_________________________________________________________________________________________________________________ - -#ifndef css -namespace css = ::com::sun::star; -#endif - /*-************************************************************************************************************//** @descr These values are used to define neccessary keys from our configuration management to support all functionality of these implementation. diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 7f43c5a6be16..16186382a8b1 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -36,8 +36,6 @@ using namespace com::sun::star::uno; using ::rtl::OUString; -namespace css = ::com::sun::star; - class SvtSaveOptions_Impl; class SvtLoadOptions_Impl; diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 688e1ec0d1ec..461f6fcbb338 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -32,12 +32,6 @@ #include <itemholder1.hxx> -//_________________________________________________________________________________________________________________ -// namespaces -//_________________________________________________________________________________________________________________ - -namespace css = ::com::sun::star; - #ifdef CONST_ASCII #error "Who define CONST_ASCII before! I use it to create const ascii strings ..." #else diff --git a/unotools/source/i18n/instance.hxx b/unotools/source/i18n/instance.hxx index e0378af36a59..074da8363e64 100644 --- a/unotools/source/i18n/instance.hxx +++ b/unotools/source/i18n/instance.hxx @@ -32,8 +32,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <rtl/strbuf.hxx> -namespace css = ::com::sun::star; - // Helper to share code between activators with a fallback MSF. // Potentially this may also needs to find the library the component // is implemented inside, but at least centralises this. diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx index 1b6902eceb82..2961fff80a24 100644 --- a/unotools/source/ucbhelper/ucbhelper.cxx +++ b/unotools/source/ucbhelper/ucbhelper.cxx @@ -60,8 +60,6 @@ namespace { -namespace css = com::sun::star; - rtl::OUString canonic(rtl::OUString const & url) { INetURLObject o(url); SAL_WARN_IF(o.HasError(), "unotools", "Invalid URL \"" << url << '"'); diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx index 963ab636fc17..62d4fb77ddb8 100644 --- a/unotools/source/ucbhelper/xtempfile.cxx +++ b/unotools/source/ucbhelper/xtempfile.cxx @@ -23,8 +23,6 @@ #include <osl/file.hxx> #include <unotools/configmgr.hxx> -namespace css = com::sun::star; - OTempFileService::OTempFileService(::css::uno::Reference< ::css::uno::XComponentContext > const & context) : ::cppu::PropertySetMixin< ::css::io::XTempFile >( context |