Attachment 49617 Details for Bug 37693 – Seeing as its a LineBorder member in TableBorder, we need it like so I reckon

[patch] Seeing as its a LineBorder member in TableBorder, we need it like so I reckon

fix.this.patch (text/plain), 1.89 KB, created by Caolán McNamara on 2011-07-27 09:06:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolán McNamara

Created: 2011-07-27 09:06:12 UTC

Size: 1.89 KB

patch

obsolete

>diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
>index fff58ac..0444a13 100644
>--- a/sw/source/core/unocore/unotbl.cxx
>+++ b/sw/source/core/unocore/unotbl.cxx
>@@ -74,6 +74,7 @@
> #include <com/sun/star/table/ShadowFormat.hpp>
> #include <com/sun/star/table/TableBorder.hpp>
> #include <com/sun/star/table/BorderLine2.hpp>
>+#include <com/sun/star/table/BorderLineStyle.hpp>
> #include <com/sun/star/table/TableBorderDistances.hpp>
> #include <com/sun/star/style/PageStyleLayout.hpp>
> #include <com/sun/star/style/BreakType.hpp>
>@@ -136,20 +137,14 @@ table::BorderLine lcl_SvxLineToLine(const SvxBorderLine* pLine)
> 
> sal_Bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine)
> {
>-    const table::BorderLine2& rLine2 = static_cast< const table::BorderLine2& >( rLine );
>-    rSvxLine.SetColor(   Color(rLine.Color));
>+    rSvxLine.SetColor(Color(rLine.Color));
> 
>-    if ( rLine2.LineWidth > 0 )
>-    {
>-        rSvxLine.SetStyle( editeng::SvxBorderStyle( rLine2.LineStyle ) );
>-        rSvxLine.SetWidth( MM100_TO_TWIP_UNSIGNED( rLine2.LineWidth ) );
>-    }
>-    else
>-        rSvxLine.GuessLinesWidths( editeng::SvxBorderStyle( rLine2.LineStyle ),
>-                                    MM100_TO_TWIP( rLine.OuterLineWidth ),
>-                                    MM100_TO_TWIP( rLine.InnerLineWidth ),
>-                                    MM100_TO_TWIP( rLine.LineDistance	) );
>-    sal_Bool bRet = rLine.InnerLineWidth > 0 || rLine.OuterLineWidth > 0 || rLine2.LineWidth > 0;
>+    rSvxLine.GuessLinesWidths( editeng::SvxBorderStyle(table::BorderLineStyle::SOLID),
>+                                MM100_TO_TWIP( rLine.OuterLineWidth ),
>+                                MM100_TO_TWIP( rLine.InnerLineWidth ),
>+                                MM100_TO_TWIP( rLine.LineDistance ) );
>+
>+    sal_Bool bRet = rLine.InnerLineWidth > 0 || rLine.OuterLineWidth > 0;
>     return bRet;
> }
>

Actions: View | Splinter Review

Attachments on bug 37693: 47251 | 47252 | 47258 | 47712 | 49617

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.