[Libreoffice-commits] core.git: Branch 'feature/unitver' - 3 commits - external/udunits2 sc/source vcl/source

[Andrzej Hunt]

 external/udunits2/ExternalProject_udunits2.mk |    1 +
 sc/source/core/units/unitsimpl.cxx            |    2 +-
 vcl/source/window/window2.cxx                 |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 2df2037b6d4c24a9b6501225b5cc3c3cd768c0a7
Author: Andrzej Hunt <andrzej at ahunt.org>
Date:   Sun May 31 16:14:10 2015 +0100

    Allow unsetting underline attribute
    
    Change-Id: Ib11f6e76a52c0b8c943d46b9f14b3b00642879d1

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index c38a2b2..f187280 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1558,10 +1558,10 @@ bool Window::set_font_attribute(const OString &rKey, const OString &rValue)
             aFont.SetItalic(ITALIC_NORMAL);
         SetControlFont(aFont);
     }
-    else if (rKey == "underline" && toBool(rValue))
+    else if (rKey == "underline")
     {
         vcl::Font aFont(GetControlFont());
-        aFont.SetUnderline(UNDERLINE_SINGLE);
+        aFont.SetUnderline(toBool(rValue) ? UNDERLINE_SINGLE : UNDERLINE_NONE);
         SetControlFont(aFont);
     }
     else if (rKey == "size")
commit 4973d16c2871b66531bf697e37c1a724799ec8f7
Author: Andrzej Hunt <andrzej at ahunt.org>
Date:   Sun May 31 16:13:35 2015 +0100

    Unset MAKEFLAGS for udunits2 to prevent WaE.
    
    Change-Id: I781aa3557b2f68b8e65319056619aa81be02b518

diff --git a/external/udunits2/ExternalProject_udunits2.mk b/external/udunits2/ExternalProject_udunits2.mk
index 070dc67..a9ccd67 100644
--- a/external/udunits2/ExternalProject_udunits2.mk
+++ b/external/udunits2/ExternalProject_udunits2.mk
@@ -25,6 +25,7 @@ $(call gb_ExternalProject_get_state_target,udunits2,build) : $(call gb_ExternalP
 
 $(call gb_ExternalProject_get_state_target,udunits2,configure) :
 	$(call gb_ExternalProject_run,configure,\
+		unset MAKEFLAGS && \
 		autoreconf -i && \
 		MAKE=$(MAKE) ./configure \
 			$(if $(ENABLE_DEBUG),--enable-debug) \
commit daea7451d850d0ad48ac76f03c890cff46a04c00
Author: Andrzej Hunt <andrzej at ahunt.org>
Date:   Thu May 28 14:15:49 2015 +0100

    Use GetParamCount instead of GetByte.
    
    Change-Id: I8f49d198c2e49246a28839a77c37563e9a8b19a5

diff --git a/sc/source/core/units/unitsimpl.cxx b/sc/source/core/units/unitsimpl.cxx
index 0f79edb..fc4e899 100644
--- a/sc/source/core/units/unitsimpl.cxx
+++ b/sc/source/core/units/unitsimpl.cxx
@@ -172,7 +172,7 @@ UnitsResult UnitsImpl::getOutputUnitsForOpCode(stack< RAUSItem >& rStack, const
         }
     } else if (nOpCode >= SC_OPCODE_START_2_PAR &&
                nOpCode < SC_OPCODE_STOP_2_PAR) {
-        sal_uInt8 nParams = pToken->GetByte();
+        sal_uInt8 nParams = pToken->GetParamCount();
 
         assert(nParams <= rStack.size());