diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2018-11-09 01:36:33 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2018-11-19 13:43:25 +0100 |
| commit | 6fe56989cfe0c4aa58cd8532db9cfdb5116f2a73 (patch) | |
| tree | f141f948efe25f37049acfd3cc5763fe6c118569 /svx | |
| parent | 268364e35100b559f42d8c02b930c5cca1c84be7 (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>
(cherry picked from commit f162066d9df814086c92fa008c563ffc08daaf98)
Reviewed-on: https://gerrit.libreoffice.org/63551
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 9 |
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" ) { |