[Libreoffice-commits] core.git: 3 commits - configure.ac svx/source

[Michael Stahl]

 configure.ac                    |   16 +++++++++++++---
 svx/source/dialog/framelink.cxx |    2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 81a1882d62ca26a28f70289e0134f6b78f1c21f2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jan 23 18:29:13 2018 +0100

    configure: if WiLangId.vbs isn't found but is required, error out
    
    Change-Id: I8a145c1024a522a17c6ac2bf961cb4f07f3e7be9

diff --git a/configure.ac b/configure.ac
index aec4c88f9e95..3de79ab4d192 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5340,9 +5340,16 @@ the  Windows SDK are installed.])
         if ! test -e "$WINDOWS_SDK_WILANGID" ; then
             WINDOWS_SDK_WILANGID=$(cygpath -sm "C:/Program Files (x86)/Windows Kits/8.1/bin/$WINDOWS_SDK_ARCH/WiLangId.vbs")
         fi
-        if ! test -e "$WINDOWS_SDK_WILANGID" ; then
-            AC_MSG_WARN([WiLangId.vbs not found - building translated packages will fail])
-            add_warning "WiLangId.vbs not found - building translated packages will fail"
+    fi
+    if test -n "$with_lang" -a "$with_lang" != "en-US"; then
+        if test -n "$with_package_format" -a "$with_package_format" != no; then
+            for i in "$with_package_format"; do
+                if test "$i" = "msi"; then
+                    if ! test -e "$WINDOWS_SDK_WILANGID" ; then
+                        AC_MSG_ERROR([WiLangId.vbs not found - building translated packages will fail])
+                    fi
+                fi
+            done
         fi
     fi
 fi
commit 112c931ff3a7aa263481b659931dfd172e75aafc
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jan 23 18:27:25 2018 +0100

    configure: find WiLangId.vbs where SDK 10.0.16299.0 hides it
    
    Change-Id: I71d27f3f97e257b4e45261004088ce3435f82090

diff --git a/configure.ac b/configure.ac
index 6edc010762de..aec4c88f9e95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5332,6 +5332,9 @@ the  Windows SDK are installed.])
     if test -z "$WINDOWS_SDK_WILANGID" -a -n "$WINDOWS_SDK_HOME"; then
         WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/Samples/sysmgmt/msi/scripts/WiLangId.vbs
         if ! test -e "$WINDOWS_SDK_WILANGID" ; then
+            WINDOWS_SDK_WILANGID="${WINDOWS_SDK_HOME}/bin/${WINDOWS_SDK_LIB_SUBDIR}/${WINDOWS_SDK_ARCH}/WiLangId.vbs"
+        fi
+        if ! test -e "$WINDOWS_SDK_WILANGID" ; then
             WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/bin/$WINDOWS_SDK_ARCH/WiLangId.vbs
         fi
         if ! test -e "$WINDOWS_SDK_WILANGID" ; then
commit dba57e8db1c51ad0a0dc4a4859ff6d64a4982226
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jan 23 18:24:36 2018 +0100

    svx::frame::Style::operator< does not implement strict weak order
    
    ... at least since other single line styles than SOLID and DASHED
    were added some years ago.
    
    This causes an assertion from MSVC std::max in CppunitTest_sw_odfexport.
    
    Change-Id: I2e0833b3d5c5afab259108be1c8782c4c4d26978

diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 827def10ed2f..1501fca0022d 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -318,7 +318,7 @@ bool Style::operator<( const Style& rOther) const
     if( (Secn() && rOther.Secn()) && !rtl::math::approxEqual(Dist(), rOther.Dist()) ) return Dist() > rOther.Dist();
 
     // both lines single and 1 unit thick, only one is dotted -> this<rOther, if this is dotted
-    if( (nLW == 1) && (Type() != rOther.Type()) ) return Type() != SvxBorderLineStyle::SOLID;
+    if ((nLW == 1) && !Secn() && !rOther.Secn() && (Type() != rOther.Type())) return Type() > rOther.Type();
 
     // seem to be equal
     return false;