summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2018-11-09 01:36:33 +0200
committerMaxim Monastirsky <momonasmon@gmail.com>2018-11-17 23:41:52 +0100
commitf162066d9df814086c92fa008c563ffc08daaf98 (patch)
tree1b1d194b4a9b37aa86d22b4e44de26abeea68f19 /svx
parent8a02a1d329c43df6de383a7b0cf8ac14247b18c9 (diff)
tdf#121267 Handle missing diagonal borders
Regression of 9125a4f3f63a7f49fd307908c181e999120063e0 ("Use FeatureStateEvent directly for status updates"). Change-Id: I57856c5707fffcf84f95afa9ef80a394b550c56f Reviewed-on: https://gerrit.libreoffice.org/63497 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 2a50eb6329b7..f4d85d734526 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1952,8 +1952,13 @@ bool BorderColorStatus::statusChanged( const css::frame::FeatureStateEvent& rEve
else
{
css::table::BorderLine2 aTable;
- if ( rEvent.IsEnabled && ( rEvent.State >>= aTable ) )
- aColor = Color(aTable.Color);
+ if ( rEvent.IsEnabled )
+ rEvent.State >>= aTable;
+
+ SvxBorderLine aLine;
+ SvxBoxItem::LineToSvxLine( aTable, aLine, false );
+ if ( !aLine.isEmpty() )
+ aColor = aLine.GetColor();
if ( rEvent.FeatureURL.Complete == ".uno:BorderTLBR" )
{