dtrans: MSVC: pragma warning: make more specific, remove obsolete

Change-Id: I7a043bc152373e98635bf2bd3513113a8ea45958
Reviewed-on: https://gerrit.libreoffice.org/48974Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

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

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

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;

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;

dtrans/source/win32/dnd/globals.hxx

@@ -28,13 +28,7 @@ namespace com { namespace sun { namespace star { namespace datatransfer {
     class XTransferable;
 } } } }
 
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
 #include <wtypes.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 #include <sal/types.h>
 
 #define DNDSOURCE_SERVICE_NAME  "com.sun.star.datatransfer.dnd.OleDragSource"

dtrans/source/win32/dnd/target.hxx

@@ -28,13 +28,7 @@
 #include <cppuhelper/interfacecontainer.hxx>
 #include <osl/mutex.hxx>
 
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
 #include <oleidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 #include "globals.hxx"
 
 namespace com { namespace sun { namespace star { namespace uno {

dtrans/source/win32/dtobj/DTransHelper.hxx

@@ -20,17 +20,11 @@
 #ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DTRANSHELPER_HXX
 #define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DTRANSHELPER_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 <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 #include <WinClip.hxx>
 
 #define AUTO_INIT                 TRUE

dtrans/source/win32/dtobj/DataFmtTransl.cxx

@@ -30,18 +30,11 @@
 #include "Fetc.hxx"
 #include <com/sun/star/datatransfer/DataFormatTranslator.hpp>
 
-#if defined _MSC_VER
-#pragma warning(push,1)
-#pragma warning(disable:4917)
-#endif
 #if !defined WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
 #include <shlobj.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 using namespace std;
 using namespace com::sun::star::uno;

dtrans/source/win32/dtobj/DataFmtTransl.hxx

@@ -26,17 +26,11 @@
 #include <sal/types.h>
 #include <rtl/ustring.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 <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 // declaration
 

dtrans/source/win32/dtobj/Fetc.hxx

@@ -22,17 +22,11 @@
 
 #include <sal/types.h>
 
-#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 <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 /**********************************************************************
  stl container elements must fulfill the following requirements:

dtrans/source/win32/dtobj/FetcList.hxx

@@ -25,16 +25,11 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include "Fetc.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
+
 #include <vector>
 
 /*****************************************************************

dtrans/source/win32/dtobj/FmtFilter.cxx

@@ -23,17 +23,10 @@
 #include <osl/diagnose.h>
 #include <comphelper/sequence.hxx>
 
-#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>

dtrans/source/win32/dtobj/FmtFilter.hxx

@@ -24,17 +24,11 @@
 
 #include <com/sun/star/uno/Sequence.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 <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 /*------------------------------------------------------------------------
     input:

dtrans/source/win32/dtobj/TxtCnvtHlp.hxx

@@ -24,14 +24,8 @@
 
 #include "DTransHelper.hxx"
 
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 int MultiByteToWideCharEx( UINT cp_src,
                            LPCSTR lpMultiByteString,

dtrans/source/win32/dtobj/XNotifyingDataObject.hxx

@@ -23,17 +23,11 @@
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
 
-#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 <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include <systools/win32/comtools.hxx>
 

dtrans/source/win32/dtobj/XTDataObject.cxx

@@ -33,18 +33,11 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase.hxx>
 
-#if defined _MSC_VER
-#pragma warning(push,1)
-#pragma warning(disable:4917)
-#endif
 #if !defined WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
 #include <shlobj.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 using namespace com::sun::star::datatransfer;
 using namespace com::sun::star::datatransfer::clipboard;

dtrans/source/win32/dtobj/XTDataObject.hxx

@@ -27,18 +27,12 @@
 
 #include "FetcList.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
 
 /*--------------------------------------------------------------------------
     - the function principle of the windows clipboard:

dtrans/source/win32/ftransl/ftransl.cxx

@@ -28,14 +28,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include "../misc/ImplHelper.hxx"
 
-#if defined _MSC_VER
-#pragma warning(push,1)
-#pragma warning(disable:4917)
-#endif
 #include <shlobj.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 #define IMPL_NAME  "com.sun.star.datatransfer.DataFormatTranslator"
 

dtrans/source/win32/misc/ImplHelper.cxx

@@ -24,16 +24,10 @@
 #include <string.h>
 #include <memory>
 
-#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
 
 #include <vector>
 

dtrans/source/win32/misc/ImplHelper.hxx

@@ -23,17 +23,11 @@
 #include <sal/types.h>
 #include <rtl/ustring.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 <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 // target device and formatetc helper
 void DeleteTargetDevice(DVTARGETDEVICE* ptd);