[Libreoffice-commits] core.git: 2 commits - i18nlangtag/source i18npool/CustomTarget_breakiterator.mk i18npool/source

[Mike Kaganski]

 i18nlangtag/source/isolang/inwnt.cxx   |    6 ------
 i18npool/CustomTarget_breakiterator.mk |    2 +-
 i18npool/source/search/levdis.cxx      |    4 ----
 i18npool/source/search/textsearch.cxx  |    7 -------
 4 files changed, 1 insertion(+), 18 deletions(-)

New commits:
commit d3870fc746a160b42be3baf3999c684e91ad08ce
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jan 31 13:07:54 2018 +0300

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

diff --git a/i18nlangtag/source/isolang/inwnt.cxx b/i18nlangtag/source/isolang/inwnt.cxx
index 7e868acf0b3d..a96cc67bb5cb 100644
--- a/i18nlangtag/source/isolang/inwnt.cxx
+++ b/i18nlangtag/source/isolang/inwnt.cxx
@@ -20,15 +20,9 @@
 
 #include <sal/config.h>
 
-#ifdef _MSC_VER
-#pragma warning(push,1) // disable warnings within system headers
-#endif
 #include <windef.h>
 #include <winbase.h>
 #include <winnls.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 #include <osl/mutex.hxx>
 #include <rtl/instance.hxx>
 #include <i18nlangtag/mslangid.hxx>
commit bc5f56303551ddc0d4a51cb979b6d48c73d086b0
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jan 31 15:29:34 2018 +0300

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

diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
index b9297ec13259..5c505c322c50 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -74,7 +74,7 @@ $(i18npool_BIDIR)/OpenOffice_dat.c : $(SRCDIR)/i18npool/CustomTarget_breakiterat
 		$(call gb_ExternalExecutable_get_command,gencmn) -n OpenOffice -t tmp -S -d $(i18npool_BIDIR)/ 0 $${RESPONSEFILE} && \
 		rm -f $${RESPONSEFILE} && \
 		echo '#ifdef _MSC_VER' > $@ && \
-		echo '#pragma warning( disable : 4229 4668 )' >> $@ && \
+		echo '#pragma warning( disable : 4229 )' >> $@ && \
 		echo '#endif' >> $@ && \
 		cat $(subst _dat,_tmp,$@) >> $@)
 
diff --git a/i18npool/source/search/levdis.cxx b/i18npool/source/search/levdis.cxx
index 9e4d9afe527c..c0ae5732443e 100644
--- a/i18npool/source/search/levdis.cxx
+++ b/i18npool/source/search/levdis.cxx
@@ -58,10 +58,6 @@
 #include <string.h>
 #include <algorithm>
 
-#if defined( _MSC_VER )
-#pragma warning(once: 4068)
-#endif
-
 #include "levdis.hxx"
 
 #define LEVDISBIG   (nLimit + 1)    // Return value if distance > nLimit
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index 6935defaaeba..dfbdafbbf626 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -40,13 +40,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
-#ifdef _MSC_VER
-// get rid of that dumb compiler warning
-// identifier was truncated to '255' characters in the debug information
-// for STL template usage, if .pdb files are to be created
-#pragma warning( disable: 4786 )
-#endif
-
 #include <string.h>
 
 using namespace ::com::sun::star::util;