summaryrefslogtreecommitdiff
path: root/dtrans/source/win32/clipb
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-01-31 12:41:45 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-02-01 06:52:57 +0100
commitf901bc5ac0d5812e7f2ec3fd68a266297cb41255 (patch)
tree1524f3a476123da4955f9d16092b514386365730 /dtrans/source/win32/clipb
parentbe13e756d64c461681c79457b5de4a22b6ec00d4 (diff)
dtrans: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: I7a043bc152373e98635bf2bd3513113a8ea45958 Reviewed-on: https://gerrit.libreoffice.org/48974 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'dtrans/source/win32/clipb')
-rw-r--r--dtrans/source/win32/clipb/MtaOleClipb.cxx5
-rw-r--r--dtrans/source/win32/clipb/MtaOleClipb.hxx6
-rw-r--r--dtrans/source/win32/clipb/WinClipbImpl.cxx6
-rw-r--r--dtrans/source/win32/clipb/WinClipbImpl.hxx6
4 files changed, 0 insertions, 23 deletions
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx
index 145ae4e739c0..36afcbe99a49 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.cxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx
@@ -30,11 +30,6 @@
hidden window and forward these requests via window messages.
*/
-#ifdef _MSC_VER
-#pragma warning( disable : 4786 ) // identifier was truncated to 'number'
- // characters in the debug information
-#endif
-
#if !defined WINVER
#define WINVER 0x0400
#endif
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.hxx b/dtrans/source/win32/clipb/MtaOleClipb.hxx
index 5c7dbfa5c6f5..abab29bf9717 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.hxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.hxx
@@ -23,13 +23,7 @@
#include <sal/types.h>
#include <osl/mutex.hxx>
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#include <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
// the Mta-Ole clipboard class is for internal use only!
// only one instance of this class should be created, the
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx
index a3267942a050..8df5db4a7d03 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.cxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx
@@ -28,18 +28,12 @@
#include <com/sun/star/datatransfer/clipboard/RenderingCapabilities.hpp>
#include "../dtobj/XNotifyingDataObject.hxx"
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <ole2.h>
#include <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
using namespace osl;
using namespace std;
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx
index e062d5557546..55a9d8d600bc 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.hxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx
@@ -27,16 +27,10 @@
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
#include "MtaOleClipb.hxx"
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
class CWinClipboard;
class CXNotifyingDataObject;