Kaydet (Commit) d9fc18d5 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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/49616Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarTor Lillqvist <tml@collabora.com>
üst 707f787c
......@@ -24,7 +24,7 @@ See udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration.idl
This is initialized in Desktop::Main() in Desktop::OpenClients_Impl()
by creating the service "com.sun.star.bridge.OleApplicationRegistration",
which is implemented by ole_adapter::OleServer_Impl.
which is implemented by OleServer_Impl.
See extensions/source/ole/
......
......@@ -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: */
......@@ -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: */
......@@ -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: */
......@@ -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: */
......@@ -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: */
......@@ -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: */
......@@ -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: */
......@@ -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*/ )
......
......@@ -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: */
......@@ -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: */
......@@ -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: */
......@@ -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: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment