summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/misc/RtfReader.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2018-06-03 13:07:55 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-06-06 08:55:02 +0200
commit9739c37d8ad7c6fca269709674a6975fa7ebd191 (patch)
treefae0bf0830d41d66017815ff6a665610d2c65a8a /dbaccess/source/ui/misc/RtfReader.cxx
parenta96a260a5fd6303eeebb26aee4be24ddf88391d1 (diff)
enable incremental linking on windows
requires a handful of workarounds Change-Id: I77c25580135eeec437716eceea1412607f8d14ca Reviewed-on: https://gerrit.libreoffice.org/55244 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess/source/ui/misc/RtfReader.cxx')
-rw-r--r--dbaccess/source/ui/misc/RtfReader.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx
index f09ac52b8eb3..1d71e1b81c78 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -92,6 +92,10 @@ SvParserState ORTFReader::CallParser()
return m_bFoundTable ? eParseState : SvParserState::Error;
}
+#if defined _MSC_VER
+#pragma warning(disable: 4702) // unreachable code, bug in MSVC2015
+#endif
+
void ORTFReader::NextToken( int nToken )
{
if(m_bError || !m_nRows) // if there is an error or no more rows to check, return immediately