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 /cli_ure/source | |
| 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 'cli_ure/source')
| -rwxr-xr-x | cli_ure/source/climaker/climaker_share.h | 2 | ||||
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_data.cxx | 6 | ||||
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_proxy.cxx | 1 | ||||
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_uno.cxx | 1 |
4 files changed, 2 insertions, 8 deletions
diff --git a/cli_ure/source/climaker/climaker_share.h b/cli_ure/source/climaker/climaker_share.h index f70fe705d514..f6e987f45777 100755 --- a/cli_ure/source/climaker/climaker_share.h +++ b/cli_ure/source/climaker/climaker_share.h @@ -34,8 +34,6 @@ #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) -namespace css = ::com::sun::star; - namespace climaker { diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx index 9292b4af43c5..373e4bf10a5f 100644 --- a/cli_ure/source/uno_bridge/cli_data.cxx +++ b/cli_ure/source/uno_bridge/cli_data.cxx @@ -37,8 +37,6 @@ #undef VOID -namespace css = com::sun::star; - namespace sri = System::Runtime::InteropServices; namespace sr = System::Reflection; namespace st = System::Text; @@ -542,7 +540,7 @@ System::String^ mapUnoTypeName(rtl_uString const * typeName) The values in the type list are uno types and are replaced by cli types, such as System.Char, System.Int32, etc. - The prfix unoidl is not added. + The präfix unoidl is not added. */ inline System::String^ mapUnoPolymorphicName(System::String^ unoName) { @@ -553,7 +551,7 @@ inline System::String^ mapUnoPolymorphicName(System::String^ unoName) The values in the type list are CLI types and are replaced by uno types, such as char, long, etc. - The prfix unoidl remains. + The präfix unoidl remains. */ inline System::String^ mapCliPolymorphicName(System::String^ unoName) { diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx index aaa59e9f9971..61c3036ee14d 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.cxx +++ b/cli_ure/source/uno_bridge/cli_proxy.cxx @@ -35,7 +35,6 @@ namespace srrm = System::Runtime::Remoting::Messaging; namespace srr = System::Runtime::Remoting; namespace srrp = System::Runtime::Remoting::Proxies; namespace sd = System::Diagnostics; -namespace css = com::sun::star; namespace ucss = unoidl::com::sun::star; using namespace cli_uno; diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx index e72b8651472f..93ab81e62328 100644 --- a/cli_ure/source/uno_bridge/cli_uno.cxx +++ b/cli_ure/source/uno_bridge/cli_uno.cxx @@ -23,7 +23,6 @@ #include "cli_bridge.h" namespace sr=System::Reflection; -namespace css=com::sun::star; using ::rtl::OUStringBuffer; |