[Libreoffice-commits] core.git: cppu/source cui/source

[Stefan Weiberg]

 cppu/source/helper/purpenv/Proxy.hxx |   13 +++++--------
 cui/source/options/optinet2.hxx      |    4 +---
 2 files changed, 6 insertions(+), 11 deletions(-)

New commits:
commit 2ec55fd6a1f79e19bb3654953919260a9ff29ece
Author: Stefan Weiberg <stefan.weiberg at germandev.org>
Date:   Mon Sep 1 05:54:28 2014 +0000

    Related fdo#82088: removing namespace alias in hxx
    
    Change-Id: Iaf455e8361653bc1262cda3bccc2e798b3c60580
    Reviewed-on: https://gerrit.libreoffice.org/11225
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at arnhold.org>

diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx
index 4791d7d..2b69faa 100644
--- a/cppu/source/helper/purpenv/Proxy.hxx
+++ b/cppu/source/helper/purpenv/Proxy.hxx
@@ -29,18 +29,15 @@
 #include "cppu/helper/purpenv/Mapping.hxx"
 
 
-namespace cssu = com::sun::star::uno;
-
-
 class Proxy : public uno_Interface
 {
     oslInterlockedCount                 m_nRef;
 
-    cssu::Environment                   m_from;
-    cssu::Environment                   m_to;
+    css::uno::Environment                   m_from;
+    css::uno::Environment                   m_to;
 
-    cssu::Mapping                       m_from_to;
-    cssu::Mapping                       m_to_from;
+    css::uno::Mapping                       m_from_to;
+    css::uno::Mapping                       m_to_from;
 
     // mapping information
     uno_Interface                    *  m_pUnoI; // wrapped interface
@@ -51,7 +48,7 @@ class Proxy : public uno_Interface
     void                              * m_pProbeContext;
 
 public:
-    explicit Proxy(cssu::Mapping                    const & to_from,
+    explicit Proxy(css::uno::Mapping                    const & to_from,
                    uno_Environment                        * pTo,
                    uno_Environment                        * pFrom,
                    uno_Interface                          * pUnoI,
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 540bb3d..4aa3cde 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -35,8 +35,6 @@ namespace svx {
     class SecurityOptionsDialog;
 }
 
-namespace lang = ::com::sun::star::lang;
-namespace uno = ::com::sun::star::uno;
 
 // class SvxNoSpaceEdit --------------------------------------------------
 
@@ -90,7 +88,7 @@ private:
     const OUString aFtpPortPN;
     const OUString aNoProxyDescPN;
 
-    uno::Reference< uno::XInterface > m_xConfigurationUpdateAccess;
+    css::uno::Reference< css::uno::XInterface > m_xConfigurationUpdateAccess;
 
     void EnableControls_Impl(bool bEnable);
     void ReadConfigData_Impl();