[Libreoffice-commits] .: 2 commits - dtrans/source dtrans/test
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Jun 22 14:29:27 PDT 2011
dtrans/source/win32/clipb/WinClipbImpl.cxx | 14 +++++++-------
dtrans/source/win32/clipb/WinClipbImpl.hxx | 2 +-
dtrans/source/win32/dtobj/DOTransferable.cxx | 6 +++---
dtrans/source/win32/dtobj/DTransHelper.hxx | 2 +-
dtrans/source/win32/dtobj/DataFmtTransl.cxx | 4 ++--
dtrans/source/win32/dtobj/DtObjFactory.cxx | 2 +-
dtrans/source/win32/dtobj/Fetc.cxx | 2 +-
dtrans/source/win32/dtobj/FetcList.cxx | 4 ++--
dtrans/source/win32/dtobj/FmtFilter.cxx | 4 ++--
dtrans/source/win32/dtobj/TxtCnvtHlp.cxx | 2 +-
dtrans/source/win32/dtobj/XNotifyingDataObject.cxx | 6 +++---
dtrans/source/win32/dtobj/XTDataObject.cxx | 2 +-
dtrans/source/win32/ftransl/ftransl.cxx | 2 +-
dtrans/source/win32/ftransl/ftransl.hxx | 2 +-
dtrans/source/win32/misc/ImplHelper.cxx | 5 ++---
dtrans/source/win32/workbench/XTDo.cxx | 2 +-
dtrans/source/win32/workbench/test_wincb.cxx | 2 +-
dtrans/test/win32/dnd/transferable.hxx | 2 +-
18 files changed, 32 insertions(+), 33 deletions(-)
New commits:
commit 2a9aea1779d6ee0495754575f65b3b2984295c10
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jun 23 00:26:03 2011 +0300
Use the newly introduced sehandler.hxx (now in solenv/wntgcci/inc)
Where the OOo MinGW people get their __SEHandler from, no idea.
diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx
index d002741..aad14f3 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.cxx
@@ -47,8 +47,7 @@
#pragma warning(pop)
#endif
#ifdef __MINGW32__
-#include <setjmp.h>
-#include <excpt.h>
+#include <sehandler.hxx>
#endif
//------------------------------------------------------------------------
@@ -189,7 +188,7 @@ sal_Bool SAL_CALL IsOEMCP( sal_uInt32 codepage )
869, 874, 932, 936, 949, 950, 1361 };
for ( sal_Int8 i = 0; i < ( sizeof( arrOEMCP )/sizeof( sal_uInt32 ) ); ++i )
- if ( arrOEMCP[i] == codepage )
+ if ( (sal_uInt32) arrOEMCP[i] == codepage )
return sal_True;
return sal_False;
commit 9d52dac6e88f147860d4f5cbfd806cdb0e4d1c51
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jun 23 00:24:38 2011 +0300
Fix includes for MinGW cross-compilation
Don't use backslashes. Use correct case in header names.
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx
index 200091f..5a3e581 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 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,
+ // 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 nö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
// 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 c79b70e..e6f3637 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 04d64c4..ec29b13 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 0c8ee5b..f7af6a5 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 d9fd382..d487e48 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 581ef2b..90a739b 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 9443599..78c5cfa 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 854ee81..099f4bd 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 e150427..2e71019 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 06fc87d..2852281 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 bae8c66..7121494 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 9cf47e1..ae30a7b 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 c382b95..489a93f 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 d3da0f8..2373e01 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 42a6ae8..b41a8fe 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 339238d..b16e195 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
diff --git a/dtrans/test/win32/dnd/transferable.hxx b/dtrans/test/win32/dnd/transferable.hxx
index 7bf67a8..af901e8 100644
--- a/dtrans/test/win32/dnd/transferable.hxx
+++ b/dtrans/test/win32/dnd/transferable.hxx
@@ -53,7 +53,7 @@
#include <process.h>
-#include "..\..\source\win32\ImplHelper.hxx"
+#include "../../source/win32/ImplHelper.hxx"
//-------------------------------------------------------------
More information about the Libreoffice-commits
mailing list