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 /cui | |
| parent | 90eac3e69749a9227c4b6902b1f3cef1e338c6d1 (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 'cui')
| -rw-r--r-- | cui/source/customize/acccfg.cxx | 6 | ||||
| -rw-r--r-- | cui/source/customize/cfg.cxx | 1 | ||||
| -rw-r--r-- | cui/source/inc/acccfg.hxx | 2 | ||||
| -rw-r--r-- | cui/source/inc/cfgutil.hxx | 2 | ||||
| -rw-r--r-- | cui/source/options/optlingu.cxx | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/tpcolor.cxx | 2 |
6 files changed, 0 insertions, 14 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 78b9e7358e7d..931a025d2c91 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -70,12 +70,6 @@ //----------------------------------------------- // namespaces -#ifdef css - #error "ambigous praeprozessor directive for css ..." -#else - namespace css = ::com::sun::star; -#endif - using namespace com::sun::star; diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 1db51dc8bf8a..a6bc4d8ca01a 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -118,7 +118,6 @@ static const char aMenuSeparatorStr[] = " | "; #endif using rtl::OUString; -namespace css = com::sun::star; namespace uno = com::sun::star::uno; namespace frame = com::sun::star::frame; namespace lang = com::sun::star::lang; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index a837b8d2d441..e3b64316e372 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -46,8 +46,6 @@ #include <sfx2/minarray.hxx> #include "cfgutil.hxx" -namespace css = ::com::sun::star; - class SfxMacroInfoItem; class SfxConfigGroupListBox_Impl; class SfxConfigFunctionListBox_Impl; diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index d2ec922822f2..a67548437524 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -36,8 +36,6 @@ class SfxMacroInfoItem; -namespace css = ::com::sun::star; - struct SfxStyleInfo_Impl { ::rtl::OUString sFamily; diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index ae328c02e5b8..21c04140f005 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -79,7 +79,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::beans; -namespace css = com::sun::star; #define CBCOL_FIRST 0 #define CBCOL_SECOND 1 diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index d464e68ebb84..f8c3aff2977b 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -49,8 +49,6 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -namespace css = ::com::sun::star; - // Load save embed functionality SvxLoadSaveEmbed::SvxLoadSaveEmbed( Window *pParent, Window *pDialog, |