summaryrefslogtreecommitdiff
path: root/dtrans
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 /dtrans
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 'dtrans')
-rw-r--r--dtrans/source/win32/clipb/MtaOleClipb.cxx6
-rw-r--r--dtrans/source/win32/dnd/idroptarget.cxx7
-rw-r--r--dtrans/source/win32/dnd/source.cxx7
-rw-r--r--dtrans/source/win32/dtobj/APNDataObject.cxx6
-rw-r--r--dtrans/source/win32/dtobj/XNotifyingDataObject.cxx7
-rw-r--r--dtrans/source/win32/dtobj/XTDataObject.cxx7
-rw-r--r--dtrans/source/win32/misc/ImplHelper.cxx76
7 files changed, 0 insertions, 116 deletions
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx
index 9323ed3ab05e..f416baab5df0 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.cxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx
@@ -46,12 +46,6 @@
#include <process.h>
#include <systools/win32/comtools.hxx>
-#ifdef __MINGW32__
-#if defined __uuidof
-#undef __uuidof
-#endif
-#define __uuidof(I) IID_##I
-#endif
// namespace directives
diff --git a/dtrans/source/win32/dnd/idroptarget.cxx b/dtrans/source/win32/dnd/idroptarget.cxx
index 1686baf0d718..8b403eb7a35f 100644
--- a/dtrans/source/win32/dnd/idroptarget.cxx
+++ b/dtrans/source/win32/dnd/idroptarget.cxx
@@ -19,13 +19,6 @@
#include "idroptarget.hxx"
-#ifdef __MINGW32__
-#if defined __uuidof
-#undef __uuidof
-#endif
-#define __uuidof(I) IID_##I
-#endif
-
IDropTargetImpl::IDropTargetImpl( DropTarget& pTarget): m_nRefCount( 0),
m_rDropTarget( pTarget)
{
diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx
index 39c0bc472f2c..43f6fa9ccbb5 100644
--- a/dtrans/source/win32/dnd/source.cxx
+++ b/dtrans/source/win32/dnd/source.cxx
@@ -36,13 +36,6 @@
#include <winuser.h>
#include <stdio.h>
-#ifdef __MINGW32__
-#if defined __uuidof
-#undef __uuidof
-#endif
-#define __uuidof(I) IID_##I
-#endif
-
using namespace cppu;
using namespace osl;
using namespace com::sun::star::datatransfer;
diff --git a/dtrans/source/win32/dtobj/APNDataObject.cxx b/dtrans/source/win32/dtobj/APNDataObject.cxx
index 62d59007afea..f511c48c3894 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.cxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.cxx
@@ -21,12 +21,6 @@
#include <osl/diagnose.h>
#include <systools/win32/comtools.hxx>
-#ifdef __MINGW32__
-#if defined __uuidof
-#undef __uuidof
-#endif
-#define __uuidof(I) IID_##I
-#endif
#define FREE_HGLOB_ON_RELEASE TRUE
#define KEEP_HGLOB_ON_RELEASE FALSE
diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
index c18e32912111..3b495b4d2dd4 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
@@ -22,13 +22,6 @@
#include "../clipb/WinClipbImpl.hxx"
#include "../clipb/WinClipboard.hxx"
-#ifdef __MINGW32__
-#if defined __uuidof
-#undef __uuidof
-#endif
-#define __uuidof(I) IID_##I
-#endif
-
using namespace com::sun::star::datatransfer;
using namespace com::sun::star::datatransfer::clipboard;
using com::sun::star::uno::RuntimeException;
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index 5f3c33e44c4f..74d28b9e9f20 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -42,13 +42,6 @@
#pragma warning(pop)
#endif
-#ifdef __MINGW32__
-#if defined __uuidof
-#undef __uuidof
-#endif
-#define __uuidof(I) IID_##I
-#endif
-
using namespace com::sun::star::datatransfer;
using namespace com::sun::star::datatransfer::clipboard;
using namespace com::sun::star::uno;
diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx
index 5a3cdb10c71d..e4e8d1cb0ba7 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.cxx
@@ -33,10 +33,6 @@
#include <vector>
-#if defined ( __MINGW32__ )
-#include <sehandler.hxx>
-#endif
-
#define FORMATETC_EXACT_MATCH 1
#define FORMATETC_PARTIAL_MATCH -1
#define FORMATETC_NO_MATCH 0
@@ -175,29 +171,14 @@ OUString SAL_CALL cptostr( sal_uInt32 codepage )
// SCODE - S_OK if successful
void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd )
{
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- jmp_buf jmpbuf;
- __SEHandler han;
- if (__builtin_setjmp(jmpbuf) == 0)
- {
- han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER);
-#else
__try
{
-#endif
CoTaskMemFree( ptd );
}
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- else
-#else
__except( EXCEPTION_EXECUTE_HANDLER )
-#endif
{
OSL_FAIL( "Error DeleteTargetDevice" );
}
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- han.Reset();
-#endif
}
// OleStdCopyTargetDevice()
@@ -219,29 +200,17 @@ DVTARGETDEVICE* SAL_CALL CopyTargetDevice( DVTARGETDEVICE* ptdSrc )
{
DVTARGETDEVICE* ptdDest = nullptr;
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- jmp_buf jmpbuf;
- __SEHandler han;
- if (__builtin_setjmp(jmpbuf) == 0)
- {
- han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER);
-#else
__try
{
-#endif
if ( nullptr != ptdSrc )
{
ptdDest = static_cast< DVTARGETDEVICE* >( CoTaskMemAlloc( ptdSrc->tdSize ) );
memcpy( ptdDest, ptdSrc, static_cast< size_t >( ptdSrc->tdSize ) );
}
}
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- han.Reset();
-#else
__except( EXCEPTION_EXECUTE_HANDLER )
{
}
-#endif
return ptdDest;
}
@@ -273,16 +242,8 @@ bool SAL_CALL CopyFormatEtc( LPFORMATETC petcDest, LPFORMATETC petcSrc )
{
bool bRet = false;
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- jmp_buf jmpbuf;
- __SEHandler han;
- if (__builtin_setjmp(jmpbuf) == 0)
- {
- han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER);
-#else
__try
{
-#endif
if ( petcDest != petcSrc )
{
@@ -299,17 +260,10 @@ bool SAL_CALL CopyFormatEtc( LPFORMATETC petcDest, LPFORMATETC petcSrc )
bRet = true;
}
}
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- else
-#else
__except( EXCEPTION_EXECUTE_HANDLER )
-#endif
{
OSL_FAIL( "Error CopyFormatEtc" );
}
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- han.Reset();
-#endif
return bRet;
}
@@ -324,16 +278,8 @@ sal_Int32 SAL_CALL CompareFormatEtc( const FORMATETC* pFetcLhs, const FORMATETC*
{
sal_Int32 nMatch = FORMATETC_EXACT_MATCH;
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- jmp_buf jmpbuf;
- __SEHandler han;
- if (__builtin_setjmp(jmpbuf) == 0)
- {
- han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER);
-#else
__try
{
-#endif
if ( pFetcLhs != pFetcRhs )
{
if ( ( pFetcLhs->cfFormat != pFetcRhs->cfFormat ) ||
@@ -371,18 +317,11 @@ sal_Int32 SAL_CALL CompareFormatEtc( const FORMATETC* pFetcLhs, const FORMATETC*
}
}
}
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- else
-#else
__except( EXCEPTION_EXECUTE_HANDLER )
-#endif
{
OSL_FAIL( "Error CompareFormatEtc" );
nMatch = FORMATETC_NO_MATCH;
}
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- han.Reset();
-#endif
return nMatch;
}
@@ -391,16 +330,8 @@ bool SAL_CALL CompareTargetDevice( DVTARGETDEVICE* ptdLeft, DVTARGETDEVICE* ptdR
{
bool bRet = false;
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- jmp_buf jmpbuf;
- __SEHandler han;
- if (__builtin_setjmp(jmpbuf) == 0)
- {
- han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER);
-#else
__try
{
-#endif
if ( ptdLeft == ptdRight )
{
// same address of td; must be same (handles NULL case)
@@ -415,18 +346,11 @@ bool SAL_CALL CompareTargetDevice( DVTARGETDEVICE* ptdLeft, DVTARGETDEVICE* ptdR
if ( memcmp( ptdLeft, ptdRight, ptdLeft->tdSize ) == 0 )
bRet = true;
}
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- else
-#else
__except( EXCEPTION_EXECUTE_HANDLER )
-#endif
{
OSL_FAIL( "Error CompareTargetDevice" );
bRet = false;
}
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- han.Reset();
-#endif
return bRet;
}