From d9fc18d5a797972ba182fbcae941535a50098dcb Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Mon, 12 Feb 2018 15:31:14 +0200
Subject: Get rid of ole_adapter namespace level

None of this is DLLPUBLIC anyway, and it all goes into one DLL.

Change-Id: I3756f87aaa4561ef54a9e6aaeeac47b99350c6b3
Reviewed-on: https://gerrit.libreoffice.org/49616
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
---
 extensions/source/ole/ole2uno.cxx                | 5 -----
 extensions/source/ole/ole2uno.hxx                | 6 ------
 extensions/source/ole/oleobjw.cxx                | 5 -----
 extensions/source/ole/oleobjw.hxx                | 6 ------
 extensions/source/ole/olethread.cxx              | 5 -----
 extensions/source/ole/servprov.cxx               | 7 -------
 extensions/source/ole/servprov.hxx               | 3 ---
 extensions/source/ole/servreg.cxx                | 7 +------
 extensions/source/ole/unoconversionutilities.hxx | 4 +---
 extensions/source/ole/unoobjw.cxx                | 4 ----
 extensions/source/ole/unoobjw.hxx                | 5 -----
 extensions/source/ole/windata.hxx                | 5 -----
 12 files changed, 2 insertions(+), 60 deletions(-)

(limited to 'extensions/source')

diff --git a/extensions/source/ole/ole2uno.cxx b/extensions/source/ole/ole2uno.cxx
index a42c26fac140..4899a2df11d4 100644
--- a/extensions/source/ole/ole2uno.cxx
+++ b/extensions/source/ole/ole2uno.cxx
@@ -23,8 +23,6 @@
 #include "ole2uno.hxx"
 
 using namespace osl;
-namespace ole_adapter
-{
 
 struct MutexInit
 {
@@ -43,7 +41,4 @@ Mutex * getBridgeMutex()
             MutexInit(), ::osl::GetGlobalMutex());
 }
 
-
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx
index a3447a8d952c..e4d83c48b73b 100644
--- a/extensions/source/ole/ole2uno.hxx
+++ b/extensions/source/ole/ole2uno.hxx
@@ -53,9 +53,6 @@ using namespace com::sun::star::beans;
 using namespace osl;
 using namespace std;
 
-namespace ole_adapter
-{
-
 VARTYPE getVarType( const Any& val);
 /* creates a Type object for a given type name.
 
@@ -78,9 +75,6 @@ public:
 
 Mutex* getBridgeMutex();
 
-} // end namespace
-
-
 #endif // INCLUDED_EXTENSIONS_SOURCE_OLE_OLE2UNO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 3e90adb54385..b07c9bf067ac 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -57,9 +57,6 @@ using namespace ::com::sun::star;
 
 #define JSCRIPT_ID_PROPERTY L"_environment"
 #define JSCRIPT_ID          L"jscript"
-namespace ole_adapter
-{
-
 
 // key: XInterface pointer created by Invocation Adapter Factory
 // value: XInterface pointer to the wrapper class.
@@ -2496,6 +2493,4 @@ ITypeInfo* IUnknownWrapper_Impl::getTypeInfo()
     return m_spTypeInfo;
 }
 
-} // end namespace
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index dbf1b74924eb..6c673f178c82 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -46,10 +46,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::bridge;
 using namespace com::sun::star::bridge::oleautomation;
 
-namespace ole_adapter
-{
-
-
 typedef std::unordered_map<OUString, pair<DISPID, unsigned short>> DispIdMap;
 
 typedef std::unordered_multimap<OUString, unsigned int> TLBFuncIndexMap;
@@ -246,8 +242,6 @@ protected:
     bool m_bHasDfltProperty;
 };
 
-} // end namespace
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/olethread.cxx b/extensions/source/ole/olethread.cxx
index 72434b89febb..6bb0c5daab2a 100644
--- a/extensions/source/ole/olethread.cxx
+++ b/extensions/source/ole/olethread.cxx
@@ -24,9 +24,6 @@
 
 using namespace std;
 
-namespace ole_adapter
-{
-
 void o2u_attachCurrentThread()
 {
     static osl::ThreadData oleThreadData;
@@ -44,6 +41,4 @@ void o2u_attachCurrentThread()
     }
 }
 
-} // end namespace
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index 9f217b2a8770..15e2ae246d87 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -37,10 +37,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::bridge;
 using namespace com::sun::star::bridge::ModelDependent;
 
-
-namespace ole_adapter
-{
-
 #include <initguid.h>
 
 // GUID used since 5.2 ( src569 m)
@@ -641,7 +637,4 @@ bool OleServer_Impl::provideInstance(const Reference<XInterface>& xInst, GUID co
     return pFac->registerClass();
 }
 
-
-} // end namespace
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index 9173aa9de665..d8725f35cc49 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -31,8 +31,6 @@ using namespace com::sun::star::bridge;
 using namespace cppu;
 using namespace std;
 
-namespace ole_adapter
-{
 /// @throws Exception
 Reference< XInterface> ConverterProvider_CreateInstance2(  const Reference<XMultiServiceFactory> & xSMgr);
 /// @throws Exception
@@ -253,7 +251,6 @@ protected:
     Reference<XMultiServiceFactory> m_smgr;
 };
 
-} // end namespace
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index 807bf990005b..aee019b79c1e 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -22,12 +22,8 @@
 #include "servprov.hxx"
 #include <rtl/ustring.hxx>
 #include <cppuhelper/factory.hxx>
-using namespace ole_adapter;
-using namespace cppu;
-
 
-namespace ole_adapter
-{
+using namespace cppu;
 
 Reference<XInterface> ConverterProvider_CreateInstance2(   const Reference<XMultiServiceFactory> & xSMgr)
 {
@@ -52,7 +48,6 @@ Reference<XInterface> OleServer_CreateInstance( const Reference<XMultiServiceFac
     Reference<XInterface > xService = *new OleServer_Impl(xSMgr);
     return xService;
 }
-} // end namespace
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * oleautobridge_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index dac687cc30ef..f52a3c3430f7 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -59,8 +59,7 @@ using namespace com::sun::star::script;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::bridge::oleautomation;
-namespace ole_adapter
-{
+
 extern std::unordered_map<sal_uIntPtr, sal_uIntPtr> AdapterToWrapperMap;
 extern std::unordered_map<sal_uIntPtr, sal_uIntPtr> WrapperToAdapterMap;
 
@@ -2361,7 +2360,6 @@ inline void reduceRange( Any& any)
     }
 }
 
-} // end namespace
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 95683c2f6de4..ba2b2fd0ceea 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -69,8 +69,6 @@ using namespace com::sun::star::reflection;
 extern "C" const GUID IID_IDispatchEx;
 #endif
 
-namespace ole_adapter
-{
 std::unordered_map<sal_uIntPtr, WeakReference<XInterface> > UnoObjToWrapperMap;
 static bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource);
 static bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource);
@@ -1605,6 +1603,4 @@ VARTYPE getVarType( const Any& value)
     return ret;
 }
 
-} // end namespace
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx
index 36af08e4d46f..94d49f51fd21 100644
--- a/extensions/source/ole/unoobjw.hxx
+++ b/extensions/source/ole/unoobjw.hxx
@@ -45,9 +45,6 @@ using namespace std;
 using namespace cppu;
 using namespace com::sun::star::bridge;
 using namespace com::sun::star::script;
-namespace ole_adapter
-{
-
 
 struct hash_IUnknown_Impl
 {
@@ -268,8 +265,6 @@ protected:
 
 };
 
-} // end namespace
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/windata.hxx b/extensions/source/ole/windata.hxx
index 76b493199ab5..760d1e6c052a 100644
--- a/extensions/source/ole/windata.hxx
+++ b/extensions/source/ole/windata.hxx
@@ -41,8 +41,6 @@
 
 #include <osl/diagnose.h>
 
-namespace ole_adapter
-{
 //Wrapper for VARDESC
 class VarDesc
 {
@@ -196,9 +194,6 @@ public:
    }
 };
 
-
-}
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit