summaryrefslogtreecommitdiff
path: root/dtrans
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 05:05:33 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 05:05:33 +0000
commitb2aeed885c61e0097cb66dbeb3379e4f08aac1cb (patch)
treea8d041a1c2c7696f8699be3763abf981ae45c43b /dtrans
parentfdfcb4e812220d1ff17567fb821caa4e542ceef1 (diff)
INTEGRATION: CWS warnings01 (1.13.4); FILE MERGED
2006/03/09 20:31:54 pl 1.13.4.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'dtrans')
-rw-r--r--dtrans/source/win32/dtobj/FmtFilter.cxx13
1 files changed, 10 insertions, 3 deletions
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx
index caa2a353b94b..7f0f4633eac4 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: FmtFilter.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 18:24:34 $
+ * last change: $Author: hr $ $Date: 2006-06-20 06:05:33 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -45,10 +45,17 @@
#include <comphelper/sequence.hxx>
#endif
+#if defined _MSC_VER
+#pragma warning(push,1)
+#pragma warning(disable:4917)
+#endif
#include <Shobjidl.h>
#include <shlguid.h>
#include <ObjIdl.h>
#include <shellapi.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
#include <string>
#include <sstream>
@@ -534,7 +541,7 @@ ByteSequence_t CF_HDROPToFileList(HGLOBAL hGlobal)
for (UINT i = 0; i < nFiles; i++)
{
wchar_t buff[MAX_PATH];
- UINT size = DragQueryFileW((HDROP)hGlobal, i, buff, MAX_PATH);
+ /*UINT size =*/ DragQueryFileW((HDROP)hGlobal, i, buff, MAX_PATH);
std::wstring filename = buff;
if (isShellLink(filename))
filename = getShellLinkTarget(filename);