diff options
Diffstat (limited to 'include/cppu')
| -rw-r--r-- | include/cppu/EnvGuards.hxx | 13 | ||||
| -rw-r--r-- | include/cppu/Map.hxx | 26 |
2 files changed, 17 insertions, 22 deletions
diff --git a/include/cppu/EnvGuards.hxx b/include/cppu/EnvGuards.hxx index 3997c46f12a7..a64807abe8ea 100644 --- a/include/cppu/EnvGuards.hxx +++ b/include/cppu/EnvGuards.hxx @@ -24,9 +24,6 @@ #include <uno/mapping.hxx> -namespace cssuno = com::sun::star::uno; - - namespace cppu { /** Environment Guard @@ -38,14 +35,14 @@ namespace cppu */ class EnvGuard { - cssuno::Environment m_env; + css::uno::Environment m_env; public: - explicit EnvGuard(cssuno::Environment const & env) + explicit EnvGuard(css::uno::Environment const & env) { if (env.is()) { - m_env = cssuno::Environment::getCurrent(); + m_env = css::uno::Environment::getCurrent(); env.enter(); } } @@ -86,11 +83,11 @@ namespace cppu */ class AntiEnvGuard { - cssuno::Environment m_env; + css::uno::Environment m_env; public: explicit AntiEnvGuard() - : m_env(cssuno::Environment::getCurrent()) + : m_env(css::uno::Environment::getCurrent()) { uno_Environment_enter(NULL); } diff --git a/include/cppu/Map.hxx b/include/cppu/Map.hxx index 2274c9e87d0f..2b6397918c3f 100644 --- a/include/cppu/Map.hxx +++ b/include/cppu/Map.hxx @@ -23,8 +23,6 @@ #include <uno/mapping.hxx> -namespace cssu = com::sun::star::uno; - namespace cppu { /** Helpers for mapping objects relative to the current environment. @@ -38,11 +36,11 @@ namespace cppu @return the mapped object @since UDK 3.2.7 */ - template<class T> inline T * mapOut(T * pT, cssu::Environment const & outerEnv) + template<class T> inline T * mapOut(T * pT, css::uno::Environment const & outerEnv) { - cssu::Mapping curr2outer(cssu::Environment::getCurrent(), outerEnv); + css::uno::Mapping curr2outer(css::uno::Environment::getCurrent(), outerEnv); - return reinterpret_cast<T *>(curr2outer.mapInterface(pT, getCppuType((cssu::Reference<T> *)NULL))); + return reinterpret_cast<T *>(curr2outer.mapInterface(pT, getCppuType((css::uno::Reference<T> *)NULL))); } @@ -53,11 +51,11 @@ namespace cppu @return the mapped object @since UDK 3.2.7 */ - template<class T> inline T * mapIn(T * pT, cssu::Environment const & outerEnv) + template<class T> inline T * mapIn(T * pT, css::uno::Environment const & outerEnv) { - cssu::Mapping outer2curr(outerEnv, cssu::Environment::getCurrent()); + css::uno::Mapping outer2curr(outerEnv, css::uno::Environment::getCurrent()); - return reinterpret_cast<T *>(outer2curr.mapInterface(pT, getCppuType((cssu::Reference<T> *)NULL))); + return reinterpret_cast<T *>(outer2curr.mapInterface(pT, getCppuType((css::uno::Reference<T> *)NULL))); } @@ -69,11 +67,11 @@ namespace cppu @since UDK 3.2.7 */ // Problem: any gets assigned to something, acquire/releases may be called in wrong env. - inline void mapOutAny(cssu::Any const & any, cssu::Any * res, cssu::Environment const & outerEnv) + inline void mapOutAny(css::uno::Any const & any, css::uno::Any * res, css::uno::Environment const & outerEnv) { - cssu::Mapping curr2outer(cssu::Environment::getCurrent(), outerEnv); + css::uno::Mapping curr2outer(css::uno::Environment::getCurrent(), outerEnv); - uno_any_destruct(res, (uno_ReleaseFunc)cssu::cpp_release); + uno_any_destruct(res, (uno_ReleaseFunc)css::uno::cpp_release); uno_type_any_constructAndConvert( res, const_cast<void *>(any.getValue()), @@ -89,11 +87,11 @@ namespace cppu @param outerEnv the source environment @since UDK 3.2.7 */ - inline void mapInAny(cssu::Any const & any, cssu::Any * res, cssu::Environment const & outerEnv) + inline void mapInAny(css::uno::Any const & any, css::uno::Any * res, css::uno::Environment const & outerEnv) { - cssu::Mapping outer2curr(outerEnv, cssu::Environment::getCurrent()); + css::uno::Mapping outer2curr(outerEnv, css::uno::Environment::getCurrent()); - uno_any_destruct(res, (uno_ReleaseFunc)cssu::cpp_release); + uno_any_destruct(res, (uno_ReleaseFunc)css::uno::cpp_release); uno_type_any_constructAndConvert( res, const_cast<void *>(any.getValue()), |