[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - external/twain_dsm

[Mike Kaganski (via logerrit)]

 external/twain_dsm/TWAIN_DSM_VS2015.vcxproj.patch |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 21bf3ad695ebc47e1d491ecc94bcbf5b1f784c4d
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Aug 15 13:47:31 2018 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Nov 22 18:48:39 2019 +0100

    Don't break on twain_dsm warnings
    
    Change-Id: I5e180ebef0a9d6809f0b5ca3014f60eaedd8ffe9
    Reviewed-on: https://gerrit.libreoffice.org/59070
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit c144dcbdb54cf657e21b0ba09ca8675246441519)
    Reviewed-on: https://gerrit.libreoffice.org/83508
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Tested-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/external/twain_dsm/TWAIN_DSM_VS2015.vcxproj.patch b/external/twain_dsm/TWAIN_DSM_VS2015.vcxproj.patch
index 86b87a4ff41b..40e131d2ad71 100644
--- a/external/twain_dsm/TWAIN_DSM_VS2015.vcxproj.patch
+++ b/external/twain_dsm/TWAIN_DSM_VS2015.vcxproj.patch
@@ -3,7 +3,7 @@ new file mode 100755
 index 000000000000..425c39966171
 --- /dev/null
 +++ b/visual_studio/TWAIN_DSM_VS2015.vcxproj
-@@ -0,0 +1,256 @@
+@@ -0,0 +1,258 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
@@ -122,7 +122,7 @@ index 000000000000..425c39966171
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level4</WarningLevel>
-+      <TreatWarningAsError>true</TreatWarningAsError>
++      <TreatWarningAsError>false</TreatWarningAsError>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
@@ -158,7 +158,7 @@ index 000000000000..425c39966171
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level4</WarningLevel>
-+      <TreatWarningAsError>true</TreatWarningAsError>
++      <TreatWarningAsError>false</TreatWarningAsError>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <ResourceCompile>
@@ -191,6 +191,7 @@ index 000000000000..425c39966171
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
++      <TreatWarningAsError>false</TreatWarningAsError>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
@@ -223,6 +224,7 @@ index 000000000000..425c39966171
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
++      <TreatWarningAsError>false</TreatWarningAsError>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <ResourceCompile>