[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - cui/source

Caolán McNamara caolanm at redhat.com
Thu Jan 26 11:56:58 UTC 2017


 cui/source/tabpages/border.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b8b744a4ea46a4e68383f9283e00f4de5fa8a1cf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 24 16:11:46 2017 +0000

    Resolves: tdf#104552 table properties dialog drops previous border color
    
    Change-Id: Ie39ea17fe56cc88efc65f6916aaeb1bd1b77c51f
    (cherry picked from commit e2eaaa8a578fff5770a99e3f8ee2a7c95c460891)
    Reviewed-on: https://gerrit.libreoffice.org/33502
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index f989a7c..9a6e7d6 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -542,6 +542,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
 
         // set the current style and color (caches style in control even if nothing is selected)
         SelStyleHdl_Impl(*m_pLbLineStyle);
+        SelColHdl_Impl(*m_pLbLineColor);
     }
 
     bool bEnable = m_pWndShadows->GetSelectItemId() > 1 ;
@@ -832,6 +833,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void)
 
         // set current style to all previously selected lines
         SelStyleHdl_Impl(*m_pLbLineStyle);
+        SelColHdl_Impl(*m_pLbLineColor);
     }
 
     // Presets ValueSet does not show a selection (used as push buttons).


More information about the Libreoffice-commits mailing list