svx/source/tbxctrls/tbcontrl.cxx | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit d01ad3a3c715900de6448c3010d41f3b75fb6103
Author: Maxim Monastirsky <momonas...@gmail.com>
AuthorDate: Fri Nov 9 01:36:33 2018 +0200
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Mon Nov 19 13:43:58 2018 +0100
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 <momonas...@gmail.com>
(cherry picked from commit f162066d9df814086c92fa008c563ffc08daaf98)
Reviewed-on: https://gerrit.libreoffice.org/63552
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index d7c5031004da..ee7028e439a6 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1958,8 +1958,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" )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
