[Libreoffice-commits] core.git: sw/source

Mike Kaganski mike.kaganski at collabora.com
Fri Feb 2 12:11:56 UTC 2018


 sw/source/ui/vba/vbasystem.cxx |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit 8cf69e32244516edaa5f822606624cd37788c477
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jan 31 21:19:08 2018 +0300

    sw: MSVC: pragma warning: make more specific, remove obsolete
    
    Change-Id: I0307561186651884ea08b908be6a53d2d49f74b2
    Reviewed-on: https://gerrit.libreoffice.org/49051
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx
index 693cd8e13679..2a4569591ca7 100644
--- a/sw/source/ui/vba/vbasystem.cxx
+++ b/sw/source/ui/vba/vbasystem.cxx
@@ -26,10 +26,6 @@
 #include <o3tl/char16_t2wchar_t.hxx>
 
 #ifdef _WIN32
-#if defined _MSC_VER
-#pragma warning (push, 1)
-#pragma warning (disable: 4005)
-#endif
 #if !defined WINVER
 # define WINVER 0x0400
 #endif
@@ -37,9 +33,6 @@
 # define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
-#if defined _MSC_VER
-#pragma warning (pop)
-#endif
 #endif
 
 using namespace ::ooo::vba;


More information about the Libreoffice-commits mailing list