Resolves: fdo#66815 avoid resetting the selection when values are unchanged

Change-Id: I88534e0b0e8302630193f77d2d85c4029a5a8f52

include/svtools/ctrlbox.hxx

@@ -325,6 +325,7 @@ public:
 
     /** Set the width in Twips */
     void            SetWidth( long nWidth );
+    long            GetWidth() const { return m_nWidth; }
     void            SetNone( const XubString& sNone );
 
     using ListBox::InsertEntry;
@@ -356,7 +357,7 @@ public:
     inline FieldUnit    GetSourceUnit() const { return eSourceUnit; }
 
     void            SetColor( const Color& rColor );
-    inline Color    GetColor( void ) const;
+    Color           GetColor() const { return aColor; }
 
 protected:
 
@@ -389,11 +390,6 @@ inline void LineListBox::SetColor( const Color& rColor )
     UpdateEntries( m_nWidth );
 }
 
-inline Color LineListBox::GetColor( void ) const
-{
-    return aColor;
-}
-
 const Color& LineListBox::GetPaintColor( void ) const
 {
     return maPaintCol;

sw/source/ui/frmdlg/column.cxx

@@ -731,8 +731,13 @@ IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
         m_pLinePosLbl->Enable( bEnable );
         m_pLinePosDLB->Enable( bEnable );
 
-        m_pLineTypeDLB->SetWidth( nLineWidth );
-        m_pLineTypeDLB->SetColor( m_pLineColorDLB->GetSelectEntryColor( ) );
+        //fdo#66815 if the values are going to be the same, don't update
+        //them to avoid the listbox selection resetting
+        if (nLineWidth != m_pLineTypeDLB->GetWidth())
+            m_pLineTypeDLB->SetWidth(nLineWidth);
+        Color aColor(m_pLineColorDLB->GetSelectEntryColor());
+        if (aColor != m_pLineTypeDLB->GetColor())
+            m_pLineTypeDLB->SetColor(aColor);
     }
     else
     {