summaryrefslogtreecommitdiff
path: root/extensions/source/ole
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-02-10 14:05:21 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-02-10 18:01:27 +0000
commit8646ab97dc37c0606b19057686bf3d610f9c15ee (patch)
tree17b3df6f5cf55cb1091c4aa70930dd415d9ea0e3 /extensions/source/ole
parent09e9274fc080b471393b806617eb03124db67590 (diff)
Remove MinGW support
In OOo times, there'd originally been efforts to allow building on Windows with MinGW. Later, in LO times, this has been shifted to an attempt of cross- compiling for Windows on Linux. That attempt can be considered abandoned, and the relevant code rotting. Due to this heritage, there are now three kinds of MinGW-specific code in LO: * Code from the original OOo native Windows effort that is no longer relevant for the LO cross-compilation effort, but has never been removed properly. * Code from the original OOo native Windows effort that is re-purposed for the LO cross-compilation effort. * Code that has been added specifially for the LO cross-compilation effort. All three kinds of code are removed. (An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing --with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.) Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568 Reviewed-on: https://gerrit.libreoffice.org/34127 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'extensions/source/ole')
-rw-r--r--extensions/source/ole/comifaces.hxx5
-rw-r--r--extensions/source/ole/oledll.cxx3
-rw-r--r--extensions/source/ole/oleobjw.cxx8
-rw-r--r--extensions/source/ole/servprov.cxx5
-rw-r--r--extensions/source/ole/unoconversionutilities.hxx24
-rw-r--r--extensions/source/ole/unoobjw.cxx12
-rw-r--r--extensions/source/ole/unotypewrapper.cxx8
7 files changed, 0 insertions, 65 deletions
diff --git a/extensions/source/ole/comifaces.hxx b/extensions/source/ole/comifaces.hxx
index c3957eff1598..87784161e8cd 100644
--- a/extensions/source/ole/comifaces.hxx
+++ b/extensions/source/ole/comifaces.hxx
@@ -23,11 +23,6 @@
using namespace com::sun::star::uno;
-#ifdef __MINGW32__
-DEFINE_GUID(IID_IJScriptValueObject, 0xe40a2331, 0x3bc1, 0x11d4, 0x83, 0x21, 0x00, 0x50, 0x04, 0x52, 0x6a, 0xb4);
-DEFINE_GUID(IID_IUnoObjectWrapper, 0x7B5C3410, 0x66FA, 0x11d4, 0x83, 0x2A, 0x00, 0x50, 0x04, 0x52, 0x6A, 0xB4);
-DEFINE_GUID(IID_IUnoTypeWrapper, 0x8BB66591, 0xA544, 0x4de9, 0x82, 0x2C, 0x57, 0xAB, 0x57, 0xBC, 0xED, 0x1C);
-#endif
MIDL_INTERFACE("e40a2331-3bc1-11d4-8321-005004526ab4")
IJScriptValueObject: public IUnknown
{
diff --git a/extensions/source/ole/oledll.cxx b/extensions/source/ole/oledll.cxx
index 62064e8b173e..c7f91ee7d9a1 100644
--- a/extensions/source/ole/oledll.cxx
+++ b/extensions/source/ole/oledll.cxx
@@ -37,9 +37,6 @@
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
#endif
-#ifdef __MINGW32__
-#define _INIT_ATL_COMMON_VARS
-#endif
#include <atlbase.h>
static CComModule _Module;
#include <atlcom.h>
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index fa5bfefbf2d6..d0f6f0f2e09e 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -949,11 +949,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName,
if( SUCCEEDED( CComObject<JScriptOutParam>::CreateInstance( &pParamObject)))
{
CComPtr<IUnknown> pUnk(pParamObject->GetUnknown());
-#ifdef __MINGW32__
- CComQIPtr<IDispatch, &__uuidof(IDispatch)> pDisp( pUnk);
-#else
CComQIPtr<IDispatch> pDisp( pUnk);
-#endif
pVarParams[ parameterCount - i -1].vt= VT_DISPATCH;
pVarParams[ parameterCount - i -1].pdispVal= pDisp;
@@ -1178,11 +1174,7 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArgument
OSL_ASSERT(aArguments.getLength() == 3);
m_spUnknown= *static_cast<IUnknown* const *>(aArguments[0].getValue());
-#ifdef __MINGW32__
- m_spUnknown->QueryInterface(IID_IDispatch, reinterpret_cast<LPVOID*>( & m_spDispatch.p));
-#else
m_spUnknown.QueryInterface( & m_spDispatch.p);
-#endif
aArguments[1] >>= m_bOriginalDispatch;
aArguments[2] >>= m_seqTypes;
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index 30fea73db39e..28d64cf5664e 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -19,13 +19,8 @@
#include <vector>
-#ifdef __MINGW32__
-#define INITGUID
-#include <initguid.h>
-#else
#include "ole2uno.hxx"
#include "unoconversionutilities.hxx"
-#endif
#include "servprov.hxx"
#include "unoobjw.hxx"
#include "oleobjw.hxx"
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index 430064f24aa4..93ab6bef8baa 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -57,10 +57,6 @@ typedef unsigned char BYTE;
using namespace com::sun::star::script;
using namespace com::sun::star::beans;
using namespace com::sun::star::uno;
-#ifdef __MINGW32__
-using namespace com::sun::star::bridge;
-using namespace com::sun::star::bridge::ModelDependent;
-#endif
using namespace com::sun::star::bridge::oleautomation;
namespace ole_adapter
{
@@ -85,10 +81,6 @@ typedef std::unordered_map<sal_uIntPtr, WeakReference<XInterface> >::const_itera
extern std::unordered_map<sal_uIntPtr, WeakReference<XInterface> > UnoObjToWrapperMap;
typedef std::unordered_map<sal_uIntPtr, WeakReference<XInterface> >::iterator IT_Uno;
typedef std::unordered_map<sal_uIntPtr, WeakReference<XInterface> >::const_iterator CIT_Uno;
-#ifdef __MINGW32__
-inline void reduceRange( Any& any);
-#endif
-
// createUnoObjectWrapper gets a wrapper instance by calling createUnoWrapperInstance
// and initializes it via XInitialization. The wrapper object is required to implement
@@ -1523,11 +1515,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny
case VT_DISPATCH:
{
//check if it is a UNO type
-#ifdef __MINGW32__
- CComQIPtr<IUnoTypeWrapper, &__uuidof(IUnoTypeWrapper)> spType((IUnknown*) var.byref);
-#else
CComQIPtr<IUnoTypeWrapper> spType(static_cast<IUnknown*>(var.byref));
-#endif
if (spType)
{
CComBSTR sName;
@@ -1669,21 +1657,13 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
{
spUnknown = pVar->punkVal;
if (spUnknown)
-#ifdef __MINGW32__
- spUnknown->QueryInterface( IID_IDispatch, reinterpret_cast<LPVOID*>( & spDispatch.p));
-#else
spUnknown.QueryInterface( & spDispatch.p);
-#endif
}
else if (pVar->vt == VT_DISPATCH && pVar->pdispVal != nullptr)
{
CComPtr<IDispatch> spDispatch2(pVar->pdispVal);
if (spDispatch2)
-#ifdef __MINGW32__
- spDispatch2->QueryInterface( IID_IUnknown, reinterpret_cast<LPVOID*>( & spUnknown.p));
-#else
spDispatch2.QueryInterface( & spUnknown.p);
-#endif
}
static Type VOID_TYPE= Type();
@@ -1725,11 +1705,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
// Check if "spUnknown" is a UNO wrapper, that is an UNO object that has been
// passed to COM. Then it supports IUnoObjectWrapper
// and we extract the original UNO object.
-#ifdef __MINGW32__
- CComQIPtr<IUnoObjectWrapper, &__uuidof(IUnoObjectWrapper)> spUno( spUnknown);
-#else
CComQIPtr<IUnoObjectWrapper> spUno( spUnknown);
-#endif
if( spUno)
{ // it is a wrapper
Reference<XInterface> xInt;
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 60cb7d4cb572..d8d0d1944122 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -561,11 +561,7 @@ static bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource)
CComPtr<IDispatch> spDispDest(varDest.pdispVal);
// special Handling for a JScriptValue object
-#ifdef __MINGW32__
- CComQIPtr<IJScriptValueObject, &__uuidof(IJScriptValueObject)> spValueDest(spDispDest);
-#else
CComQIPtr<IJScriptValueObject> spValueDest(spDispDest);
-#endif
if (spValueDest)
{
VARIANT_BOOL varBool= VARIANT_FALSE;
@@ -584,11 +580,7 @@ static bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource)
// of a property if it does not exist already. This is convenient for
// out parameters in JScript. Then the user must not specify propery "0"
// explicitly
-#ifdef __MINGW32__
- CComQIPtr<IDispatchEx, &__uuidof(IDispatchEx)> spDispEx( spDispDest);
-#else
CComQIPtr<IDispatchEx> spDispEx( spDispDest);
-#endif
if( spDispEx)
{
CComBSTR nullProp(L"0");
@@ -1074,11 +1066,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s
{
pValue->AddRef();
pvarResult->vt= VT_DISPATCH;
-#ifdef __MINGW32__
- pvarResult->pdispVal= CComQIPtr<IDispatch, &__uuidof(IDispatch)>(pValue->GetUnknown());
-#else
pvarResult->pdispVal= CComQIPtr<IDispatch>(pValue->GetUnknown());
-#endif
ret= S_OK;
}
else
diff --git a/extensions/source/ole/unotypewrapper.cxx b/extensions/source/ole/unotypewrapper.cxx
index 3d10e7675380..ef576a11aaa4 100644
--- a/extensions/source/ole/unotypewrapper.cxx
+++ b/extensions/source/ole/unotypewrapper.cxx
@@ -32,17 +32,9 @@ bool createUnoTypeWrapper(BSTR sTypeName, VARIANT * pVar)
{
pObj->AddRef();
pVar->vt= VT_DISPATCH;
-#ifdef __MINGW32__
- pVar->pdispVal= CComQIPtr<IDispatch, &__uuidof(IDispatch)>(pObj->GetUnknown());
-#else
pVar->pdispVal= CComQIPtr<IDispatch>(pObj->GetUnknown());
-#endif
//now set the value, e.i. the name of the type
-#ifdef __MINGW32__
- CComQIPtr<IUnoTypeWrapper, &__uuidof(IUnoTypeWrapper)> spType(pVar->pdispVal);
-#else
CComQIPtr<IUnoTypeWrapper> spType(pVar->pdispVal);
-#endif
OSL_ASSERT(spType);
if (SUCCEEDED(spType->put_Name(sTypeName)))
{