From 8646ab97dc37c0606b19057686bf3d610f9c15ee Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 10 Feb 2017 14:05:21 +0100 Subject: 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 Reviewed-by: Stephan Bergmann --- .../win32/filepicker/VistaFilePickerImpl.cxx | 33 ---------------------- fpicker/source/win32/filepicker/comptr.hxx | 4 --- 2 files changed, 37 deletions(-) (limited to 'fpicker/source/win32/filepicker') diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index b4c1e9bcc0ee..eb798d87c348 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -33,9 +33,6 @@ #include #include #include -#ifdef __MINGW32__ -#include -#endif #include "../misc/WinImplHelper.hxx" #include @@ -64,14 +61,8 @@ bool createFolderItem(OUString const & url, ComPtr & folder) { { return false; } -#if defined __MINGW32__ - HRESULT res = SHCreateItemFromParsingName( - reinterpret_cast(path.getStr()), NULL, IID_IShellItem, - reinterpret_cast(&folder)); -#else HRESULT res = SHCreateItemFromParsingName( path.getStr(), nullptr, IID_PPV_ARGS(&folder)); -#endif return SUCCEEDED(res); } @@ -416,11 +407,7 @@ void VistaFilePickerImpl::impl_sta_CreateOpenDialog(const RequestRef& rRequest) return; TFileDialog iDialog; -#ifdef __MINGW32__ - m_iDialogOpen->QueryInterface(IID_IFileDialog, (void **)(&iDialog)); -#else m_iDialogOpen.query(&iDialog); -#endif TFileDialogEvents iHandler = m_iEventHandler; @@ -459,11 +446,7 @@ void VistaFilePickerImpl::impl_sta_CreateSaveDialog(const RequestRef& rRequest) TFileDialogEvents iHandler = m_iEventHandler; TFileDialog iDialog; -#ifdef __MINGW32__ - m_iDialogSave->QueryInterface(IID_IFileDialog, (void **)(&iDialog)); -#else m_iDialogSave.query(&iDialog); -#endif aLock.clear(); // <- SYNCHRONIZED @@ -998,17 +981,9 @@ TFileDialog VistaFilePickerImpl::impl_getBaseDialogInterface() ::osl::ResettableMutexGuard aLock(m_aMutex); if (m_iDialogOpen.is()) -#ifdef __MINGW32__ - m_iDialogOpen->QueryInterface(IID_IFileDialog, (void**)(&iDialog)); -#else m_iDialogOpen.query(&iDialog); -#endif if (m_iDialogSave.is()) -#ifdef __MINGW32__ - m_iDialogSave->QueryInterface(IID_IFileDialog, (void**)(&iDialog)); -#else m_iDialogSave.query(&iDialog); -#endif return iDialog; } @@ -1022,17 +997,9 @@ TFileDialogCustomize VistaFilePickerImpl::impl_getCustomizeInterface() ::osl::ResettableMutexGuard aLock(m_aMutex); if (m_iDialogOpen.is()) -#ifdef __MINGW32__ - m_iDialogOpen->QueryInterface(IID_IFileDialogCustomize, (void**)(&iCustom)); -#else m_iDialogOpen.query(&iCustom); -#endif else if (m_iDialogSave.is()) -#ifdef __MINGW32__ - m_iDialogSave->QueryInterface(IID_IFileDialogCustomize, (void**)(&iCustom)); -#else m_iDialogSave.query(&iCustom); -#endif return iCustom; } diff --git a/fpicker/source/win32/filepicker/comptr.hxx b/fpicker/source/win32/filepicker/comptr.hxx index 89fc85b34787..b7f123833a34 100644 --- a/fpicker/source/win32/filepicker/comptr.hxx +++ b/fpicker/source/win32/filepicker/comptr.hxx @@ -174,15 +174,11 @@ class ComPtr } } -#ifndef __MINGW32__ - template< class T_QUERYINTERFACE > HRESULT query(T_QUERYINTERFACE** pQuery) { return m_pInterface->QueryInterface(__uuidof(T_QUERYINTERFACE), reinterpret_cast(pQuery)); } -#endif - bool equals(IUnknown* pCheck) { -- cgit