[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sc/source

[Samuel Mehrbrodt (via logerrit)]

 sc/source/ui/sidebar/CellBorderStyleControl.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 914b83b23984659590ccd9887ebbe4d4c81b9d4a
Author:     Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Wed Nov 24 14:07:05 2021 +0100
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sat Dec 11 18:22:53 2021 +0100

    tdf#145828 Sidebar line styles: Default to "thin" width
    
    Change-Id: I78d754d36c7ea41f7e3259be331d23b8a25c480f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125771
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
    (cherry picked from commit 2f43d95a0fb4bdd7121968ff9f365ffc325e5647)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126420
    Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>

diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx 
b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index 1e4f177bec98..cd0de2b126fa 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -78,7 +78,7 @@ IMPL_LINK(CellBorderStylePopup, TB1SelectHdl, ToolBox*, 
pToolBox, void)
     sal_uInt16 nId = pToolBox->GetCurItemId();
     SvxBoxItem          aBorderOuter( SID_ATTR_BORDER_OUTER );
     SvxBoxInfoItem      aBorderInner( SID_ATTR_BORDER_INNER );
-    editeng::SvxBorderLine theDefLine(nullptr, 1);
+    editeng::SvxBorderLine theDefLine(nullptr, SvxBorderLineWidth::Thin);
     editeng::SvxBorderLine *pLeft = nullptr, *pRight = nullptr, *pTop = 
nullptr, *pBottom = nullptr;
     sal_uInt8 nValidFlags = 0;
 
@@ -138,7 +138,7 @@ IMPL_LINK(CellBorderStylePopup, TB2SelectHdl, ToolBox *, 
pToolBox, void)
 
     if (nId == pToolBox->GetItemId("diagup"))
     {
-        editeng::SvxBorderLine aTmp( nullptr, 1 );
+        editeng::SvxBorderLine aTmp( nullptr, SvxBorderLineWidth::Thin );
         SvxLineItem     aLineItem( SID_ATTR_BORDER_DIAG_BLTR );
         aLineItem.SetLine( &aTmp );
         mpDispatcher->ExecuteList(
@@ -146,7 +146,7 @@ IMPL_LINK(CellBorderStylePopup, TB2SelectHdl, ToolBox *, 
pToolBox, void)
     }
     else if (nId == pToolBox->GetItemId("diagdown"))
     {
-        editeng::SvxBorderLine aTmp( nullptr, 1 );
+        editeng::SvxBorderLine aTmp( nullptr, SvxBorderLineWidth::Thin );
         SvxLineItem     aLineItem( SID_ATTR_BORDER_DIAG_TLBR );
         aLineItem.SetLine( &aTmp );
         mpDispatcher->ExecuteList(
@@ -156,7 +156,7 @@ IMPL_LINK(CellBorderStylePopup, TB2SelectHdl, ToolBox *, 
pToolBox, void)
     {
         SvxBoxItem          aBorderOuter( SID_ATTR_BORDER_OUTER );
         SvxBoxInfoItem      aBorderInner( SID_ATTR_BORDER_INNER );
-        editeng::SvxBorderLine theDefLine(nullptr, 1);
+        editeng::SvxBorderLine theDefLine(nullptr, SvxBorderLineWidth::Thin);
         editeng::SvxBorderLine       *pLeft = nullptr,
                             *pRight = nullptr,
                             *pTop = nullptr,
@@ -249,7 +249,7 @@ IMPL_LINK(CellBorderStylePopup, TB3SelectHdl, ToolBox *, 
pToolBox, void)
     else if (nId == maTBBorder3->GetItemId("topthickbottom"))
     {
         pBottom.reset(new editeng::SvxBorderLine(nullptr, 
SvxBorderLineWidth::Thick));
-        pTop.reset(new editeng::SvxBorderLine(nullptr, 1));
+        pTop.reset(new editeng::SvxBorderLine(nullptr, 
SvxBorderLineWidth::Thin));
         nValidFlags |= FRM_VALID_BOTTOM|FRM_VALID_TOP;
     }
     else if (nId == maTBBorder3->GetItemId("topdoublebottom"))
@@ -257,7 +257,7 @@ IMPL_LINK(CellBorderStylePopup, TB3SelectHdl, ToolBox *, 
pToolBox, void)
         pBottom.reset(new editeng::SvxBorderLine(nullptr));
         pBottom->GuessLinesWidths(SvxBorderLineStyle::DOUBLE, 
SvxBorderLineWidth::Hairline,
                                   SvxBorderLineWidth::Hairline, 
SvxBorderLineWidth::Thin);
-        pTop.reset(new editeng::SvxBorderLine(nullptr, 1));
+        pTop.reset(new editeng::SvxBorderLine(nullptr, 
SvxBorderLineWidth::Thin));
         nValidFlags |= FRM_VALID_BOTTOM|FRM_VALID_TOP;
     }