summaryrefslogtreecommitdiff
path: root/dtrans/source
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-06-23 00:24:38 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-06-23 00:27:35 +0300
commit97529fc38405cb75a7c924d8f228fa28b2a82f6c (patch)
tree39f5fb5593b05cbcbf6b8bbeb97065a44d9df6fd /dtrans/source
parent17e84ae72d784c9c5c1b9ebc3eb3c5fb989121e8 (diff)
Fix includes for MinGW cross-compilation
Don't use backslashes. Use correct case in header names.
Diffstat (limited to 'dtrans/source')
-rw-r--r--dtrans/source/win32/clipb/WinClipbImpl.cxx14
-rw-r--r--dtrans/source/win32/clipb/WinClipbImpl.hxx2
-rw-r--r--dtrans/source/win32/dtobj/DOTransferable.cxx6
-rw-r--r--dtrans/source/win32/dtobj/DTransHelper.hxx2
-rw-r--r--dtrans/source/win32/dtobj/DataFmtTransl.cxx4
-rw-r--r--dtrans/source/win32/dtobj/DtObjFactory.cxx2
-rw-r--r--dtrans/source/win32/dtobj/Fetc.cxx2
-rw-r--r--dtrans/source/win32/dtobj/FetcList.cxx4
-rw-r--r--dtrans/source/win32/dtobj/FmtFilter.cxx4
-rw-r--r--dtrans/source/win32/dtobj/TxtCnvtHlp.cxx2
-rw-r--r--dtrans/source/win32/dtobj/XNotifyingDataObject.cxx6
-rw-r--r--dtrans/source/win32/dtobj/XTDataObject.cxx2
-rw-r--r--dtrans/source/win32/ftransl/ftransl.cxx2
-rw-r--r--dtrans/source/win32/ftransl/ftransl.hxx2
-rw-r--r--dtrans/source/win32/workbench/XTDo.cxx2
-rw-r--r--dtrans/source/win32/workbench/test_wincb.cxx2
16 files changed, 29 insertions, 29 deletions
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx
index e2755bcd8123..0387f54c676f 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.cxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx
@@ -36,11 +36,11 @@
#include "WinClipbImpl.hxx"
#include <systools/win32/comtools.hxx>
-#include "..\..\inc\DtObjFactory.hxx"
-#include "..\dtobj\APNDataObject.hxx"
+#include "../../inc/DtObjFactory.hxx"
+#include "../dtobj/APNDataObject.hxx"
#include "WinClipboard.hxx"
#include <com/sun/star/datatransfer/clipboard/RenderingCapabilities.hpp>
-#include "..\dtobj\XNotifyingDataObject.hxx"
+#include "../dtobj/XNotifyingDataObject.hxx"
#if defined _MSC_VER
#pragma warning(push,1)
@@ -200,11 +200,11 @@ sal_Int8 SAL_CALL CWinClipbImpl::getRenderingCapabilities( ) throw( RuntimeExce
void SAL_CALL CWinClipbImpl::flushClipboard( ) throw( RuntimeException )
{
// sollte eigentlich hier stehen: ClearableMutexGuard aGuard( m_ClipContentMutex );
- // geht aber nicht, da FlushClipboard zurckruft und das DataObject
- // freigibt und damit wrde es einen Deadlock in onReleaseDataObject geben
- // FlushClipboard mu synchron sein, damit das runterfahren ggf. erst weitergeht,
+ // geht aber nicht, da FlushClipboard zurückruft und das DataObject
+ // freigibt und damit würde es einen Deadlock in onReleaseDataObject geben
+ // FlushClipboard muß synchron sein, damit das runterfahren ggf. erst weitergeht,
// wenn alle Clipboard-Formate gerendert wurden
- // die Abfrage ist ntig, 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
// owner ist).
// eventuell kann man aber die Abfrage in den Clipboard STA Thread verlagern, indem
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx
index 97e7919ea174..aa7a98d62e00 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.hxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx
@@ -39,7 +39,7 @@
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
-#include "..\..\inc\MtaOleClipb.hxx"
+#include "../../inc/MtaOleClipb.hxx"
#if defined _MSC_VER
#pragma warning(push,1)
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index f63e13b59ae7..561204cc5c4c 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -36,10 +36,10 @@
#include <rtl/process.h>
#include "DOTransferable.hxx"
-#include "..\misc\ImplHelper.hxx"
-#include "..\misc\WinClip.hxx"
+#include "../misc/ImplHelper.hxx"
+#include "../misc/WinClip.hxx"
#include "DTransHelper.hxx"
-#include "..\misc\ImplHelper.hxx"
+#include "../misc/ImplHelper.hxx"
#include "TxtCnvtHlp.hxx"
#include "MimeAttrib.hxx"
#include "FmtFilter.hxx"
diff --git a/dtrans/source/win32/dtobj/DTransHelper.hxx b/dtrans/source/win32/dtobj/DTransHelper.hxx
index 0e6003211f90..9b2db7fbec6d 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.hxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.hxx
@@ -41,7 +41,7 @@
#if defined _MSC_VER
#pragma warning(pop)
#endif
-#include "..\misc\WinClip.hxx"
+#include "../misc/WinClip.hxx"
//------------------------------------------------------------------------
// defines
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index a1d56a562c53..98e4bf2f62e0 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
@@ -36,8 +36,8 @@
#include <rtl/string.hxx>
#include <osl/diagnose.h>
#include <rtl/tencinfo.h>
-#include "..\misc\ImplHelper.hxx"
-#include "..\misc\WinClip.hxx"
+#include "../misc/ImplHelper.hxx"
+#include "../misc/WinClip.hxx"
#include "MimeAttrib.hxx"
#include "DTransHelper.hxx"
#include <rtl/string.h>
diff --git a/dtrans/source/win32/dtobj/DtObjFactory.cxx b/dtrans/source/win32/dtobj/DtObjFactory.cxx
index 0f69b389e8ce..c7cab6086195 100644
--- a/dtrans/source/win32/dtobj/DtObjFactory.cxx
+++ b/dtrans/source/win32/dtobj/DtObjFactory.cxx
@@ -32,7 +32,7 @@
//------------------------------------------------------------------------
// includes
//------------------------------------------------------------------------
-#include "..\..\inc\DtObjFactory.hxx"
+#include "../../inc/DtObjFactory.hxx"
#include "XTDataObject.hxx"
diff --git a/dtrans/source/win32/dtobj/Fetc.cxx b/dtrans/source/win32/dtobj/Fetc.cxx
index f9bbe856436e..faa453569910 100644
--- a/dtrans/source/win32/dtobj/Fetc.cxx
+++ b/dtrans/source/win32/dtobj/Fetc.cxx
@@ -34,7 +34,7 @@
//------------------------------------------------------------------------
#include <osl/diagnose.h>
#include "Fetc.hxx"
-#include "..\misc\ImplHelper.hxx"
+#include "../misc/ImplHelper.hxx"
//------------------------------------------------------------------------
//
diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx
index dec172f01d84..fdf8ac4487ac 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/dtrans/source/win32/dtobj/FetcList.cxx
@@ -39,8 +39,8 @@
#include <com/sun/star/datatransfer/XMimeContentType.hpp>
#include "DataFmtTransl.hxx"
-#include "..\misc\ImplHelper.hxx"
-#include "..\misc\WinClip.hxx"
+#include "../misc/ImplHelper.hxx"
+#include "../misc/WinClip.hxx"
#include <algorithm>
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx
index 677d382df729..099ee71d9263 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -36,9 +36,9 @@
#pragma warning(push,1)
#pragma warning(disable:4917)
#endif
-#include <Shobjidl.h>
+#include <shobjidl.h>
#include <shlguid.h>
-#include <ObjIdl.h>
+#include <objidl.h>
#include <shellapi.h>
#if defined _MSC_VER
#pragma warning(pop)
diff --git a/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx b/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
index 669ee78eff6d..d11eec3cfbe2 100644
--- a/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
+++ b/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
@@ -35,7 +35,7 @@
#include <osl/diagnose.h>
#include "TxtCnvtHlp.hxx"
#include "DTransHelper.hxx"
-#include "..\misc\ImplHelper.hxx"
+#include "../misc/ImplHelper.hxx"
using namespace ::com::sun::star::datatransfer;
using namespace ::com::sun::star::uno;
diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
index e23ec150f1d4..fe0c9896fb08 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
@@ -30,9 +30,9 @@
#include "precompiled_dtrans.hxx"
#include <osl/diagnose.h>
#include "XNotifyingDataObject.hxx"
-#include "..\clipb\WinClipbImpl.hxx"
-#include "..\clipb\WinClipboard.hxx"
-#include "..\..\inc\DtObjFactory.hxx"
+#include "../clipb/WinClipbImpl.hxx"
+#include "../clipb/WinClipboard.hxx"
+#include "../../inc/DtObjFactory.hxx"
#ifdef __MINGW32__
#define __uuidof(I) IID_##I
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index e263f7e58292..82b18dd3185f 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -36,7 +36,7 @@
#include "XTDataObject.hxx"
#include <com/sun/star/datatransfer/DataFlavor.hpp>
-#include "..\misc\ImplHelper.hxx"
+#include "../misc/ImplHelper.hxx"
#include "DTransHelper.hxx"
#include "TxtCnvtHlp.hxx"
#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index 97bbe2b6634c..24e81e2b28a5 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -36,7 +36,7 @@
#include "ftransl.hxx"
#include <com/sun/star/datatransfer/XMimeContentType.hpp>
-#include "..\misc\ImplHelper.hxx"
+#include "../misc/ImplHelper.hxx"
#if defined _MSC_VER
#pragma warning(push,1)
diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx
index 7adbfdae61a2..a63d308bb93e 100644
--- a/dtrans/source/win32/ftransl/ftransl.hxx
+++ b/dtrans/source/win32/ftransl/ftransl.hxx
@@ -40,7 +40,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/datatransfer/XDataFormatTranslator.hpp>
#include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
-#include "..\misc\WinClip.hxx"
+#include "../misc/WinClip.hxx"
#include <vector>
diff --git a/dtrans/source/win32/workbench/XTDo.cxx b/dtrans/source/win32/workbench/XTDo.cxx
index 050cc349a41d..e036d1732336 100644
--- a/dtrans/source/win32/workbench/XTDo.cxx
+++ b/dtrans/source/win32/workbench/XTDo.cxx
@@ -34,7 +34,7 @@
//------------------------------------------------------------------------
#include <osl/diagnose.h>
-#include "..\DTransHelper.hxx"
+#include "../DTransHelper.hxx"
#include "XTDo.hxx"
diff --git a/dtrans/source/win32/workbench/test_wincb.cxx b/dtrans/source/win32/workbench/test_wincb.cxx
index c41d5a79153f..395865449c85 100644
--- a/dtrans/source/win32/workbench/test_wincb.cxx
+++ b/dtrans/source/win32/workbench/test_wincb.cxx
@@ -35,7 +35,7 @@
//_________________________________________________________________________________________________________________________
-#include "..\misc\ImplHelper.hxx"
+#include "../misc/ImplHelper.hxx"
//_________________________________________________________________________________________________________________________
// other includes