diff options
| author | Noel Grandin <noel@peralex.com> | 2018-06-03 13:07:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-06 08:55:02 +0200 |
| commit | 9739c37d8ad7c6fca269709674a6975fa7ebd191 (patch) | |
| tree | fae0bf0830d41d66017815ff6a665610d2c65a8a /dbaccess | |
| parent | a96a260a5fd6303eeebb26aee4be24ddf88391d1 (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')
| -rw-r--r-- | dbaccess/source/ui/misc/HtmlReader.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/RtfReader.cxx | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 8bc0b36eb156..c810a9175cf7 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -110,6 +110,9 @@ SvParserState OHTMLReader::CallParser() return m_bFoundTable ? eParseState : SvParserState::Error; } +#if defined _MSC_VER +#pragma warning(disable: 4702) // unreachable code, bug in MSVC2015 +#endif void OHTMLReader::NextToken( HtmlTokenId nToken ) { if(m_bError || !m_nRows) // if there is an error or no more rows to check, return immediately 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 |