mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Related fdo#82088: removing namespace alias in hxx

Browse Source 
Change-Id: Iaf455e8361653bc1262cda3bccc2e798b3c60580
Reviewed-on: https://gerrit.libreoffice.org/11225
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
This commit is contained in:
Stefan Weiberg 2014-09-01 05:54:28 +00:00 committed by Thomas Arnhold
parent 670f472e13
commit 2ec55fd6a1
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cppu/source/helper/purpenv/Proxy.hxx
View File

@ -29,18 +29,15 @@
#include "cppu/helper/purpenv/Mapping.hxx" #include "cppu/helper/purpenv/Mapping.hxx"
namespace cssu = com::sun::star::uno;
class Proxy : public uno_Interface class Proxy : public uno_Interface
{ {
oslInterlockedCount m_nRef; oslInterlockedCount m_nRef;
cssu::Environment m_from; css::uno::Environment m_from;
cssu::Environment m_to; css::uno::Environment m_to;
cssu::Mapping m_from_to; css::uno::Mapping m_from_to;
cssu::Mapping m_to_from; css::uno::Mapping m_to_from;
// mapping information // mapping information
uno_Interface * m_pUnoI; // wrapped interface uno_Interface * m_pUnoI; // wrapped interface
@ -51,7 +48,7 @@ class Proxy : public uno_Interface
void * m_pProbeContext; void * m_pProbeContext;
public: public:
explicit Proxy(cssu::Mapping const & to_from, explicit Proxy(css::uno::Mapping const & to_from,
uno_Environment * pTo, uno_Environment * pTo,
uno_Environment * pFrom, uno_Environment * pFrom,
uno_Interface * pUnoI, uno_Interface * pUnoI,

4
cui/source/options/optinet2.hxx
View File

@ -35,8 +35,6 @@ namespace svx {
class SecurityOptionsDialog; class SecurityOptionsDialog;
} }
namespace lang = ::com::sun::star::lang;
namespace uno = ::com::sun::star::uno;
// class SvxNoSpaceEdit -------------------------------------------------- // class SvxNoSpaceEdit --------------------------------------------------
@ -90,7 +88,7 @@ private:
const OUString aFtpPortPN; const OUString aFtpPortPN;
const OUString aNoProxyDescPN; const OUString aNoProxyDescPN;
uno::Reference< uno::XInterface > m_xConfigurationUpdateAccess; css::uno::Reference< css::uno::XInterface > m_xConfigurationUpdateAccess;
void EnableControls_Impl(bool bEnable); void EnableControls_Impl(bool bEnable);
void ReadConfigData_Impl(); void ReadConfigData_Impl();