summaryrefslogtreecommitdiff
path: root/i18npool
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-01-31 15:29:34 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-02-01 10:40:52 +0100
commitbc5f56303551ddc0d4a51cb979b6d48c73d086b0 (patch)
tree967545ee8c683d03b7d1ea6559fdaa42a9b9ce28 /i18npool
parentbf79168dba6100624bc105a66ce3f4d1bff9353b (diff)
i18npool: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: Iacb0c1fba331aa76ea341bc21690f09109b14a0a Reviewed-on: https://gerrit.libreoffice.org/48990 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'i18npool')
-rw-r--r--i18npool/CustomTarget_breakiterator.mk2
-rw-r--r--i18npool/source/search/levdis.cxx4
-rw-r--r--i18npool/source/search/textsearch.cxx7
3 files changed, 1 insertions, 12 deletions
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;