[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sc/source sw/source

[Eike Rathke]

 sc/source/ui/unoobj/cellsuno.cxx  |    3 +--
 sw/source/core/unocore/unotbl.cxx |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit b979d1b9ddb97737ac9cf3c8b72bc4d4eba3ede1
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Feb 3 21:06:18 2012 +0100

    fdo#45115: sc: fix setting borders
    
    Same problem in ScHelperFunctions::GetBorderLine.
    (cherry picked from commit 697743161a6047902ee880851b23c9aef1bfa392)
    
    Signed-off-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 423e324..e44ae32 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -953,8 +953,7 @@ ScSubTotalFunc lcl_SummaryToSubTotal( sheet::GeneralFunction eSummary )
 const ::editeng::SvxBorderLine* ScHelperFunctions::GetBorderLine( ::editeng::SvxBorderLine& rLine, const table::BorderLine& rStruct )
 {
     //  Calc needs Twips, and there are 1/100mm in the Uno structure
-    rLine.SetStyle( ::editeng::SvxBorderStyle( table::BorderLineStyle::SOLID ) );
-    rLine.GuessLinesWidths( rLine.GetStyle(),
+    rLine.GuessLinesWidths( editeng::NO_STYLE,
         (sal_uInt16)HMMToTwips( rStruct.OuterLineWidth ),
         (sal_uInt16)HMMToTwips( rStruct.InnerLineWidth ),
         (sal_uInt16)HMMToTwips( rStruct.LineDistance ) );
commit 511a92733bcf970e4154833a352d565bd3167e26
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Feb 3 18:49:56 2012 +0100

    fdo#45115: SwXTextTable: fix setting borders
    
    This plus e549f52f16c4a519ed3eddb9c66c19bacc247590 fixes the problem.
    (cherry picked from commit ef9881001e4ddfa6bfbe7d83f482393bb76d926a)
    
    Signed-off-by: Eike Rathke <erack at redhat.com>

diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 5adc781..0078bd7 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -137,7 +137,7 @@ sal_Bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLi
 {
     rSvxLine.SetColor(Color(rLine.Color));
 
-    rSvxLine.GuessLinesWidths( editeng::SvxBorderStyle(table::BorderLineStyle::SOLID),
+    rSvxLine.GuessLinesWidths( editeng::NO_STYLE,
                                 MM100_TO_TWIP( rLine.OuterLineWidth ),
                                 MM100_TO_TWIP( rLine.InnerLineWidth ),
                                 MM100_TO_TWIP( rLine.LineDistance ) );