improve field names in CellAppearancePropertyPanel

to make the code easier to read

Change-Id: I8f5cb13c017e00f3a0b992be1e03acbce9f61769
Reviewed-on: https://gerrit.libreoffice.org/52492
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 90 insertions, 132 deletions

diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 96ad5468136b..537e4431555e 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -70,15 +70,15 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel(
     maIMGLineStyle8(BitmapEx(RID_BMP_LINE_STYLE8)),
     maIMGLineStyle9(BitmapEx(RID_BMP_LINE_STYLE9)),
 
-    mnIn(0),
-    mnOut(0),
-    mnDis(0),
-    mnTLBRIn(0),
-    mnTLBROut(0),
-    mnTLBRDis(0),
-    mnBLTRIn(0),
-    mnBLTROut(0),
-    mnBLTRDis(0),
+    mnInWidth(0),
+    mnOutWidth(0),
+    mnDistance(0),
+    mnDiagTLBRInWidth(0),
+    mnDiagTLBROutWidth(0),
+    mnDiagTLBRDistance(0),
+    mnDiagBLTRInWidth(0),
+    mnDiagBLTROutWidth(0),
+    mnDiagBLTRDistance(0),
     mbBorderStyleAvailable(true),
     mbLeft(false),
     mbRight(false),
@@ -88,8 +88,8 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel(
     mbHor(false),
     mbOuterBorder(false),
     mbInnerBorder(false),
-    mbTLBR(false),
-    mbBLTR(false),
+    mbDiagTLBR(false),
+    mbDiagBLTR(false),
     mxCellLineStylePopup(),
     mxCellBorderStylePopup(),
     maContext(),
@@ -165,7 +165,7 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pToolBox
     {
         if (!mxCellLineStylePopup)
             mxCellLineStylePopup = VclPtr<CellLineStylePopup>::Create(GetBindings()->GetDispatcher());
-        mxCellLineStylePopup->SetLineStyleSelect(mnOut, mnIn, mnDis);
+        mxCellLineStylePopup->SetLineStyleSelect(mnOutWidth, mnInWidth, mnDistance);
         mxCellLineStylePopup->StartPopupMode(pToolBox, FloatWinPopupFlags::GrabFocus);
     }
 }
@@ -210,38 +210,26 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
     switch(nSID)
     {
     case SID_FRAME_LINESTYLE:
+        mbBorderStyleAvailable = false;
         if( eState == SfxItemState::DONTCARE )
         {
             mbBorderStyleAvailable = true;
-            mnIn = 0;
-            mnOut = 0;
-            mnDis = 0;
-            SetStyleIcon();
-            break;
+            mnInWidth = 0;
+            mnOutWidth = 0;
+            mnDistance = 0;
         }
-
-        if(eState >= SfxItemState::DEFAULT)
+        else if(eState >= SfxItemState::DEFAULT)
         {
             const SvxLineItem* pSvxLineItem = dynamic_cast< const SvxLineItem* >(pState);
-
             if(pSvxLineItem)
             {
                 const editeng::SvxBorderLine* pLineItem = pSvxLineItem->GetLine();
-                mnIn = pLineItem->GetInWidth();
-                mnOut = pLineItem->GetOutWidth();
-                mnDis = pLineItem->GetDistance();
-
-                if(mnIn == 0 && mnOut == 0 && mnDis == 0)
-                    mbBorderStyleAvailable = false;
-                else
-                    mbBorderStyleAvailable = true;
-
-                SetStyleIcon();
-                break;
+                mnInWidth = pLineItem->GetInWidth();
+                mnOutWidth = pLineItem->GetOutWidth();
+                mnDistance = pLineItem->GetDistance();
+                mbBorderStyleAvailable = !(mnInWidth == 0 && mnOutWidth == 0 && mnDistance == 0);
             }
         }
-
-        mbBorderStyleAvailable = false;
         SetStyleIcon();
         break;
     case SID_ATTR_BORDER_OUTER:
@@ -286,7 +274,6 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
         if(eState >= SfxItemState::DEFAULT)
         {
             const SvxBoxInfoItem* pBoxInfoItem = dynamic_cast< const SvxBoxInfoItem* >(pState);
-
             if(pBoxInfoItem)
             {
                 bool bLeft(false), bRight(false), bTop(false), bBottom(false);
@@ -327,83 +314,54 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
         }
         break;
     case SID_ATTR_BORDER_DIAG_TLBR:
+        mbDiagTLBR = false;
         if( eState == SfxItemState::DONTCARE )
         {
-            mbTLBR = true;
-            mnTLBRIn = mnTLBROut = mnTLBRDis = 0;
-            UpdateControlState();
-            break;
+            mbDiagTLBR = true;
+            mnDiagTLBRInWidth = mnDiagTLBROutWidth = mnDiagTLBRDistance = 0;
         }
-
-        if(eState >= SfxItemState::DEFAULT)
+        else if(eState >= SfxItemState::DEFAULT)
         {
             const SvxLineItem* pItem = dynamic_cast< const SvxLineItem* >(pState);
-
             if(pItem)
             {
                 const editeng::SvxBorderLine* aLine = pItem->GetLine();
-
-                if(!aLine)
+                if(aLine)
                 {
-                    mbTLBR = false;
-                }
-                else
-                {
-                    mbTLBR = true;
-                    mnTLBRIn = aLine->GetInWidth();
-                    mnTLBROut = aLine->GetOutWidth();
-                    mnTLBRDis = aLine->GetDistance();
+                    mnDiagTLBRInWidth = aLine->GetInWidth();
+                    mnDiagTLBROutWidth = aLine->GetOutWidth();
+                    mnDiagTLBRDistance = aLine->GetDistance();
 
-                    if(mnTLBRIn == 0 && mnTLBROut == 0 && mnTLBRDis == 0)
-                        mbTLBR = false;
+                    mbDiagTLBR = !(mnDiagTLBRInWidth == 0 && mnDiagTLBROutWidth == 0 && mnDiagTLBRDistance == 0);
                 }
-
-                UpdateControlState();
-                break;
             }
         }
-
-        mbTLBR = false;
         UpdateControlState();
         break;
     case SID_ATTR_BORDER_DIAG_BLTR:
+        mbDiagBLTR = false;
         if( eState == SfxItemState::DONTCARE )
         {
-            mbBLTR = true;
-            mnBLTRIn = mnBLTROut = mnBLTRDis = 0;
-            UpdateControlState();
-            break;
+            mbDiagBLTR = true;
+            mnDiagBLTRInWidth = mnDiagBLTROutWidth = mnDiagBLTRDistance = 0;
         }
-
-        if(eState >= SfxItemState::DEFAULT)
+        else if(eState >= SfxItemState::DEFAULT)
         {
             const SvxLineItem* pItem = dynamic_cast< const SvxLineItem* >(pState);
-
             if(pItem)
             {
                 const editeng::SvxBorderLine* aLine = pItem->GetLine();
 
-                if(!aLine)
-                {
-                    mbBLTR = false;
-                }
-                else
+                if(aLine)
                 {
-                    mbBLTR = true;
-                    mnBLTRIn = aLine->GetInWidth();
-                    mnBLTROut = aLine->GetOutWidth();
-                    mnBLTRDis = aLine->GetDistance();
+                    mnDiagBLTRInWidth = aLine->GetInWidth();
+                    mnDiagBLTROutWidth = aLine->GetOutWidth();
+                    mnDiagBLTRDistance = aLine->GetDistance();
 
-                    if(mnBLTRIn == 0 && mnBLTROut == 0 && mnBLTRDis == 0)
-                        mbBLTR = false;
+                    mbDiagBLTR = !(mnDiagBLTRInWidth == 0 && mnDiagBLTROutWidth == 0 && mnDiagBLTRDistance == 0);
                 }
-
-                UpdateControlState();
             }
-            break;
         }
-
-        mbBLTR = false;
         UpdateControlState();
         break;
     }
@@ -414,23 +372,23 @@ void CellAppearancePropertyPanel::SetStyleIcon()
     const sal_uInt16 nIdBorderLineStyle = mpTBLineStyle->GetItemId( UNO_LINESTYLE );
 
     //FIXME: update for new line border possibilities
-    if(mnOut == DEF_LINE_WIDTH_0 && mnIn == 0 && mnDis == 0)    //1
+    if(mnOutWidth == DEF_LINE_WIDTH_0 && mnInWidth == 0 && mnDistance == 0)    //1
         mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle1);
-    else if(mnOut == DEF_LINE_WIDTH_2 && mnIn == 0 && mnDis == 0) //2
+    else if(mnOutWidth == DEF_LINE_WIDTH_2 && mnInWidth == 0 && mnDistance == 0) //2
         mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle2);
-    else if(mnOut == DEF_LINE_WIDTH_3 && mnIn == 0 && mnDis == 0) //3
+    else if(mnOutWidth == DEF_LINE_WIDTH_3 && mnInWidth == 0 && mnDistance == 0) //3
         mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle3);
-    else if(mnOut == DEF_LINE_WIDTH_4 && mnIn == 0 && mnDis == 0) //4
+    else if(mnOutWidth == DEF_LINE_WIDTH_4 && mnInWidth == 0 && mnDistance == 0) //4
         mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle4);
-    else if(mnOut == DEF_LINE_WIDTH_0 && mnIn == DEF_LINE_WIDTH_0 && mnDis == DEF_LINE_WIDTH_1) //5
+    else if(mnOutWidth == DEF_LINE_WIDTH_0 && mnInWidth == DEF_LINE_WIDTH_0 && mnDistance == DEF_LINE_WIDTH_1) //5
         mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle5);
-    else if(mnOut == DEF_LINE_WIDTH_0 && mnIn == DEF_LINE_WIDTH_0 && mnDis == DEF_LINE_WIDTH_2) //6
+    else if(mnOutWidth == DEF_LINE_WIDTH_0 && mnInWidth == DEF_LINE_WIDTH_0 && mnDistance == DEF_LINE_WIDTH_2) //6
         mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle6);
-    else if(mnOut == DEF_LINE_WIDTH_1 && mnIn == DEF_LINE_WIDTH_2 && mnDis == DEF_LINE_WIDTH_1) //7
+    else if(mnOutWidth == DEF_LINE_WIDTH_1 && mnInWidth == DEF_LINE_WIDTH_2 && mnDistance == DEF_LINE_WIDTH_1) //7
         mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle7);
-    else if(mnOut == DEF_LINE_WIDTH_2 && mnIn == DEF_LINE_WIDTH_0 && mnDis == DEF_LINE_WIDTH_2) //8
+    else if(mnOutWidth == DEF_LINE_WIDTH_2 && mnInWidth == DEF_LINE_WIDTH_0 && mnDistance == DEF_LINE_WIDTH_2) //8
         mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle8);
-    else if(mnOut == DEF_LINE_WIDTH_2 && mnIn == DEF_LINE_WIDTH_2 && mnDis == DEF_LINE_WIDTH_2) //9
+    else if(mnOutWidth == DEF_LINE_WIDTH_2 && mnInWidth == DEF_LINE_WIDTH_2 && mnDistance == DEF_LINE_WIDTH_2) //9
         mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle9);
     else
         mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle1);
@@ -438,65 +396,65 @@ void CellAppearancePropertyPanel::SetStyleIcon()
 
 void CellAppearancePropertyPanel::UpdateControlState()
 {
-    if(mbOuterBorder || mbInnerBorder || mbTLBR || mbBLTR)
+    if(mbOuterBorder || mbInnerBorder || mbDiagTLBR || mbDiagBLTR)
     {
         mpTBLineColor->Enable();
         mpTBLineStyle->Enable();
 
         //set line style state
-        if( mbBorderStyleAvailable && !mbTLBR && !mbBLTR )
+        if( mbBorderStyleAvailable && !mbDiagTLBR && !mbDiagBLTR )
         {
         }
-        else if( !mbBorderStyleAvailable && mbTLBR && !mbBLTR )
+        else if( !mbBorderStyleAvailable && mbDiagTLBR && !mbDiagBLTR )
         {
-            mnIn = mnTLBRIn;
-            mnOut = mnTLBROut;
-            mnDis = mnTLBRDis;
+            mnInWidth = mnDiagTLBRInWidth;
+            mnOutWidth = mnDiagTLBROutWidth;
+            mnDistance = mnDiagTLBRDistance;
         }
-        else if ( !mbBorderStyleAvailable && !mbTLBR && mbBLTR )
+        else if ( !mbBorderStyleAvailable && !mbDiagTLBR && mbDiagBLTR )
         {
-            mnIn = mnBLTRIn;
-            mnOut = mnBLTROut;
-            mnDis = mnBLTRDis;
+            mnInWidth = mnDiagBLTRInWidth;
+            mnOutWidth = mnDiagBLTROutWidth;
+            mnDistance = mnDiagBLTRDistance;
         }
-        else if( !mbBorderStyleAvailable && mbTLBR && mbBLTR)
+        else if( !mbBorderStyleAvailable && mbDiagTLBR && mbDiagBLTR)
         {
-            if( mnTLBRIn == mnBLTRIn && mnTLBROut == mnBLTROut && mnTLBRDis == mnBLTRDis)
+            if( mnDiagTLBRInWidth == mnDiagBLTRInWidth && mnDiagTLBROutWidth == mnDiagBLTROutWidth && mnDiagTLBRDistance == mnDiagBLTRDistance)
             {
-                mnIn = mnTLBRIn;
-                mnOut = mnTLBROut;
-                mnDis = mnTLBRDis;
+                mnInWidth = mnDiagTLBRInWidth;
+                mnOutWidth = mnDiagTLBROutWidth;
+                mnDistance = mnDiagTLBRDistance;
             }
             else
             {
-                mnIn = 0;
-                mnOut = 0;
-                mnDis = 0;
+                mnInWidth = 0;
+                mnOutWidth = 0;
+                mnDistance = 0;
             }
         }
-        else if( mbBorderStyleAvailable && mbTLBR && !mbBLTR )
+        else if( mbBorderStyleAvailable && mbDiagTLBR && !mbDiagBLTR )
         {
-            if( mnTLBRIn != mnIn || mnTLBROut != mnOut || mnTLBRDis != mnDis)
+            if( mnDiagTLBRInWidth != mnInWidth || mnDiagTLBROutWidth != mnOutWidth || mnDiagTLBRDistance != mnDistance)
             {
-                mnIn = 0;
-                mnOut = 0;
-                mnDis = 0;
+                mnInWidth = 0;
+                mnOutWidth = 0;
+                mnDistance = 0;
             }
         }
-        else if( mbBorderStyleAvailable && !mbTLBR && mbBLTR )
+        else if( mbBorderStyleAvailable && !mbDiagTLBR && mbDiagBLTR )
         {
-            if(  mnBLTRIn != mnIn || mnBLTROut != mnOut || mnBLTRDis != mnDis )
+            if(  mnDiagBLTRInWidth != mnInWidth || mnDiagBLTROutWidth != mnOutWidth || mnDiagBLTRDistance != mnDistance )
             {
-                mnIn = 0;
-                mnOut = 0;
-                mnDis = 0;
+                mnInWidth = 0;
+                mnOutWidth = 0;
+                mnDistance = 0;
             }
         }
         else
         {
-            mnIn = 0;
-            mnOut = 0;
-            mnDis = 0;
+            mnInWidth = 0;
+            mnOutWidth = 0;
+            mnDistance = 0;
         }
         SetStyleIcon();
     }
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index 8a5c6a924256..0618d87286e3 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -99,15 +99,15 @@ private:
     Image                                   maIMGLineStyle9;
 
     // BorderStyle defines
-    sal_uInt16                              mnIn;
-    sal_uInt16                              mnOut;
-    sal_uInt16                              mnDis;
-    sal_uInt16                              mnTLBRIn;
-    sal_uInt16                              mnTLBROut;
-    sal_uInt16                              mnTLBRDis;
-    sal_uInt16                              mnBLTRIn;
-    sal_uInt16                              mnBLTROut;
-    sal_uInt16                              mnBLTRDis;
+    sal_uInt16                              mnInWidth;
+    sal_uInt16                              mnOutWidth;
+    sal_uInt16                              mnDistance;
+    sal_uInt16                              mnDiagTLBRInWidth;
+    sal_uInt16                              mnDiagTLBROutWidth;
+    sal_uInt16                              mnDiagTLBRDistance;
+    sal_uInt16                              mnDiagBLTRInWidth;
+    sal_uInt16                              mnDiagBLTROutWidth;
+    sal_uInt16                              mnDiagBLTRDistance;
 
     bool                                    mbBorderStyleAvailable : 1;
 
@@ -122,8 +122,8 @@ private:
     bool                                    mbOuterBorder : 1; // mbLeft || mbRight || mbTop || mbBottom
     bool                                    mbInnerBorder : 1; // mbVer || mbHor || bLeft || bRight || bTop || bBottom
 
-    bool                                    mbTLBR : 1;
-    bool                                    mbBLTR : 1;
+    bool                                    mbDiagTLBR : 1;
+    bool                                    mbDiagBLTR : 1;
 
     // popups
     VclPtr<CellLineStylePopup>              mxCellLineStylePopup;