[Libreoffice-commits] .: 2 commits - solenv/gbuild svtools/source sw/source

[Libreoffice Gerrit user]

 solenv/gbuild/LinkTarget.mk        |    9 ++++++---
 svtools/source/control/ctrlbox.cxx |    4 ++++
 sw/source/filter/html/htmltab.cxx  |    3 +--
 3 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 601bfe2ce3113719b2f8edaba2ccb6b630051a9a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 22 00:19:42 2012 +0200

    fdo#51777: add a hack for 1 twip DOUBLE borders:
    
    Arguably such annoyingly thin double borders don't make much sense
    anyway, because they're essentially 2 hairlines with ~no space between,
    but unfortunately older LO versions are able to create them;
    since the refactoring in 2d045cdb69176b280812dda0b813371cf1ac72e2,
    which changed the BorderWidthImpl::Get* methods to return 0 due to
    rounding, they were ignored at least in the HTML import, which is a
    regression.
    So add a special purpose hack that essentially rounds up the first line
    to 1 but not the other lines so the visual result is a hairline single
    border.
    
    Change-Id: I20ac4675bcf67ea58a6931a40bff3605390e9c0d

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index ca70c0e..96780a1 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -328,6 +328,10 @@ long BorderWidthImpl::GetLine1( long nWidth ) const
         result = std::max<long>(0,
                     static_cast<long>((m_nRate1 * nWidth) + 0.5)
                         - (nConstant2 + nConstantD));
+        if (result == 0 && m_nRate1 > 0.0 && nWidth > 0)
+        {   // fdo#51777: hack to essentially treat 1 twip DOUBLE border
+            result = 1;  // as 1 twip SINGLE border
+        }
     }
     return result;
 }
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index d23c729..d7e117d 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2072,8 +2072,7 @@ void HTMLTable::SetBorders()
 sal_uInt16 HTMLTable::GetBorderWidth( const SvxBorderLine& rBLine,
                                   sal_Bool bWithDistance ) const
 {
-    sal_uInt16 nBorderWidth = rBLine.GetOutWidth() + rBLine.GetInWidth() +
-                    rBLine.GetDistance();
+    sal_uInt16 nBorderWidth = rBLine.GetWidth();
     if( bWithDistance )
     {
         if( nCellPadding )
commit cd0046bca0691fdca45a030903b7cde3bfee544c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Aug 21 22:37:03 2012 +0200

    fdo#53888: fix YaccTarget/LexTarget dependencies:
    
    These cannot be order only because if the source file is changed the
    generated cxx file has to be recompiled as well.
    
    Change-Id: I6c1d8e2d90d98a80ce747f8cd1d118e0a83ed379

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 7599597..7745316 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -206,8 +206,10 @@ $(call gb_YaccTarget_get_target,%) : $(call gb_YaccTarget_get_source,$(SRCDIR),%
 	$(call gb_YaccTarget__command,$<,$*,$@,$(call gb_YaccTarget_get_header_target,$*),$(call gb_YaccTarget_get_grammar_target,$*))
 
 define gb_YaccTarget_YaccTarget
-$(call gb_YaccTarget_get_grammar_target,$(1)) :| $(call gb_YaccTarget_get_target,$(1))
-$(call gb_YaccTarget_get_header_target,$(1)) :| $(call gb_YaccTarget_get_target,$(1))
+$(call gb_YaccTarget_get_grammar_target,$(1)) : $(call gb_YaccTarget_get_target,$(1))
+	touch $$@
+$(call gb_YaccTarget_get_header_target,$(1)) : $(call gb_YaccTarget_get_target,$(1))
+	touch $$@
 
 endef
 
@@ -229,7 +231,8 @@ $(call gb_LexTarget_get_target,%) : $(call gb_LexTarget_get_source,$(SRCDIR),%)
 
 # gb_LexTarget_LexTarget(scanner-file)
 define gb_LexTarget_LexTarget
-$(call gb_LexTarget_get_scanner_target,$(1)) :| $(call gb_LexTarget_get_target,$(1))
+$(call gb_LexTarget_get_scanner_target,$(1)) : $(call gb_LexTarget_get_target,$(1))
+	touch $$@
 
 endef