mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix includes for MinGW cross-compilation

Browse Source 
Don't use backslashes. Use correct case in header names.
This commit is contained in:
Tor Lillqvist
2011-06-23 00:24:38 +03:00
parent 17e84ae72d
commit 97529fc384
17 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dtrans/source/win32/clipb/WinClipbImpl.cxx
View File

@@ -36,11 +36,11 @@
#include "WinClipbImpl.hxx" #include "WinClipbImpl.hxx"
#include <systools/win32/comtools.hxx> #include <systools/win32/comtools.hxx>
#include "..\..\inc\DtObjFactory.hxx" #include "../../inc/DtObjFactory.hxx"
#include "..\dtobj\APNDataObject.hxx" #include "../dtobj/APNDataObject.hxx"
#include "WinClipboard.hxx" #include "WinClipboard.hxx"
#include <com/sun/star/datatransfer/clipboard/RenderingCapabilities.hpp> #include <com/sun/star/datatransfer/clipboard/RenderingCapabilities.hpp>
#include "..\dtobj\XNotifyingDataObject.hxx" #include "../dtobj/XNotifyingDataObject.hxx"
#if defined _MSC_VER #if defined _MSC_VER
#pragma warning(push,1) #pragma warning(push,1)
@@ -200,11 +200,11 @@ sal_Int8 SAL_CALL CWinClipbImpl::getRenderingCapabilities( ) throw( RuntimeExce
void SAL_CALL CWinClipbImpl::flushClipboard( ) throw( RuntimeException ) void SAL_CALL CWinClipbImpl::flushClipboard( ) throw( RuntimeException )
{ {
// sollte eigentlich hier stehen: ClearableMutexGuard aGuard( m_ClipContentMutex ); // sollte eigentlich hier stehen: ClearableMutexGuard aGuard( m_ClipContentMutex );
// geht aber nicht, da FlushClipboard zur<EFBFBD>ckruft und das DataObject // geht aber nicht, da FlushClipboard zurückruft und das DataObject
// freigibt und damit w<EFBFBD>rde es einen Deadlock in onReleaseDataObject geben // freigibt und damit würde es einen Deadlock in onReleaseDataObject geben
// FlushClipboard mu<EFBFBD> synchron sein, damit das runterfahren ggf. erst weitergeht, // FlushClipboard muß synchron sein, damit das runterfahren ggf. erst weitergeht,
// wenn alle Clipboard-Formate gerendert wurden // wenn alle Clipboard-Formate gerendert wurden
// die Abfrage ist n<EFBFBD>tig, damit nur geflusht wird, wenn wir wirklich Clipboardowner // die Abfrage ist nötig, damit nur geflusht wird, wenn wir wirklich Clipboardowner
// sind (ich weiss nicht genau was passiert, wenn man flusht und nicht Clipboard // sind (ich weiss nicht genau was passiert, wenn man flusht und nicht Clipboard
// owner ist). // owner ist).
// eventuell kann man aber die Abfrage in den Clipboard STA Thread verlagern, indem // eventuell kann man aber die Abfrage in den Clipboard STA Thread verlagern, indem

2
dtrans/source/win32/clipb/WinClipbImpl.hxx
View File

@@ -39,7 +39,7 @@
#include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
#include "..\..\inc\MtaOleClipb.hxx" #include "../../inc/MtaOleClipb.hxx"
#if defined _MSC_VER #if defined _MSC_VER
#pragma warning(push,1) #pragma warning(push,1)

6
dtrans/source/win32/dtobj/DOTransferable.cxx
View File

@@ -36,10 +36,10 @@
#include <rtl/process.h> #include <rtl/process.h>
#include "DOTransferable.hxx" #include "DOTransferable.hxx"
#include "..\misc\ImplHelper.hxx" #include "../misc/ImplHelper.hxx"
#include "..\misc\WinClip.hxx" #include "../misc/WinClip.hxx"
#include "DTransHelper.hxx" #include "DTransHelper.hxx"
#include "..\misc\ImplHelper.hxx" #include "../misc/ImplHelper.hxx"
#include "TxtCnvtHlp.hxx" #include "TxtCnvtHlp.hxx"
#include "MimeAttrib.hxx" #include "MimeAttrib.hxx"
#include "FmtFilter.hxx" #include "FmtFilter.hxx"

2
dtrans/source/win32/dtobj/DTransHelper.hxx
View File

@@ -41,7 +41,7 @@
#if defined _MSC_VER #if defined _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#endif #endif
#include "..\misc\WinClip.hxx" #include "../misc/WinClip.hxx"
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// defines // defines

4
dtrans/source/win32/dtobj/DataFmtTransl.cxx
View File

@@ -36,8 +36,8 @@
#include <rtl/string.hxx> #include <rtl/string.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <rtl/tencinfo.h> #include <rtl/tencinfo.h>
#include "..\misc\ImplHelper.hxx" #include "../misc/ImplHelper.hxx"
#include "..\misc\WinClip.hxx" #include "../misc/WinClip.hxx"
#include "MimeAttrib.hxx" #include "MimeAttrib.hxx"
#include "DTransHelper.hxx" #include "DTransHelper.hxx"
#include <rtl/string.h> #include <rtl/string.h>

2
dtrans/source/win32/dtobj/DtObjFactory.cxx
View File

@@ -32,7 +32,7 @@
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// includes // includes
//------------------------------------------------------------------------ //------------------------------------------------------------------------
#include "..\..\inc\DtObjFactory.hxx" #include "../../inc/DtObjFactory.hxx"
#include "XTDataObject.hxx" #include "XTDataObject.hxx"

2
dtrans/source/win32/dtobj/Fetc.cxx
View File

@@ -34,7 +34,7 @@
//------------------------------------------------------------------------ //------------------------------------------------------------------------
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include "Fetc.hxx" #include "Fetc.hxx"
#include "..\misc\ImplHelper.hxx" #include "../misc/ImplHelper.hxx"
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// //

4
dtrans/source/win32/dtobj/FetcList.cxx
View File

@@ -39,8 +39,8 @@
#include <com/sun/star/datatransfer/XMimeContentType.hpp> #include <com/sun/star/datatransfer/XMimeContentType.hpp>
#include "DataFmtTransl.hxx" #include "DataFmtTransl.hxx"
#include "..\misc\ImplHelper.hxx" #include "../misc/ImplHelper.hxx"
#include "..\misc\WinClip.hxx" #include "../misc/WinClip.hxx"
#include <algorithm> #include <algorithm>

4
dtrans/source/win32/dtobj/FmtFilter.cxx
View File

@@ -36,9 +36,9 @@
#pragma warning(push,1) #pragma warning(push,1)
#pragma warning(disable:4917) #pragma warning(disable:4917)
#endif #endif
#include <Shobjidl.h> #include <shobjidl.h>
#include <shlguid.h> #include <shlguid.h>
#include <ObjIdl.h> #include <objidl.h>
#include <shellapi.h> #include <shellapi.h>
#if defined _MSC_VER #if defined _MSC_VER
#pragma warning(pop) #pragma warning(pop)

2
dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
View File

@@ -35,7 +35,7 @@
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include "TxtCnvtHlp.hxx" #include "TxtCnvtHlp.hxx"
#include "DTransHelper.hxx" #include "DTransHelper.hxx"
#include "..\misc\ImplHelper.hxx" #include "../misc/ImplHelper.hxx"
using namespace ::com::sun::star::datatransfer; using namespace ::com::sun::star::datatransfer;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;

6
dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
View File

@@ -30,9 +30,9 @@
#include "precompiled_dtrans.hxx" #include "precompiled_dtrans.hxx"
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include "XNotifyingDataObject.hxx" #include "XNotifyingDataObject.hxx"
#include "..\clipb\WinClipbImpl.hxx" #include "../clipb/WinClipbImpl.hxx"
#include "..\clipb\WinClipboard.hxx" #include "../clipb/WinClipboard.hxx"
#include "..\..\inc\DtObjFactory.hxx" #include "../../inc/DtObjFactory.hxx"
#ifdef __MINGW32__ #ifdef __MINGW32__
#define __uuidof(I) IID_##I #define __uuidof(I) IID_##I

2
dtrans/source/win32/dtobj/XTDataObject.cxx
View File

@@ -36,7 +36,7 @@
#include "XTDataObject.hxx" #include "XTDataObject.hxx"
#include <com/sun/star/datatransfer/DataFlavor.hpp> #include <com/sun/star/datatransfer/DataFlavor.hpp>
#include "..\misc\ImplHelper.hxx" #include "../misc/ImplHelper.hxx"
#include "DTransHelper.hxx" #include "DTransHelper.hxx"
#include "TxtCnvtHlp.hxx" #include "TxtCnvtHlp.hxx"
#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>

2
dtrans/source/win32/ftransl/ftransl.cxx
View File

@@ -36,7 +36,7 @@
#include "ftransl.hxx" #include "ftransl.hxx"
#include <com/sun/star/datatransfer/XMimeContentType.hpp> #include <com/sun/star/datatransfer/XMimeContentType.hpp>
#include "..\misc\ImplHelper.hxx" #include "../misc/ImplHelper.hxx"
#if defined _MSC_VER #if defined _MSC_VER
#pragma warning(push,1) #pragma warning(push,1)

2
dtrans/source/win32/ftransl/ftransl.hxx
View File

@@ -40,7 +40,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/datatransfer/XDataFormatTranslator.hpp> #include <com/sun/star/datatransfer/XDataFormatTranslator.hpp>
#include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp> #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
#include "..\misc\WinClip.hxx" #include "../misc/WinClip.hxx"
#include <vector> #include <vector>

2
dtrans/source/win32/workbench/XTDo.cxx
View File

@@ -34,7 +34,7 @@
//------------------------------------------------------------------------ //------------------------------------------------------------------------
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include "..\DTransHelper.hxx" #include "../DTransHelper.hxx"
#include "XTDo.hxx" #include "XTDo.hxx"

2
dtrans/source/win32/workbench/test_wincb.cxx
View File

@@ -35,7 +35,7 @@
//_________________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________________
#include "..\misc\ImplHelper.hxx" #include "../misc/ImplHelper.hxx"
//_________________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________________
// other includes // other includes

2
dtrans/test/win32/dnd/transferable.hxx
View File

@@ -53,7 +53,7 @@
#include <process.h> #include <process.h>
#include "..\..\source\win32\ImplHelper.hxx" #include "../../source/win32/ImplHelper.hxx"
//------------------------------------------------------------- //-------------------------------------------------------------