diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-27 15:06:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-28 11:51:32 +0100 |
| commit | 5564a31c3fe1098fd72635238d33a3dbafb8b62e (patch) | |
| tree | 434a835c4cc04c671834f069b573c82ff414bbca /accessibility | |
| parent | 9df0ce081eac287154ea496e9eb299b4bc4fa776 (diff) | |
use less COLORDATA_RGB
part of removing ColorData
Change-Id: I5518cddeeefe66f70380367e1e3f78af0f3b5fbc
Reviewed-on: https://gerrit.libreoffice.org/50486
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/source/extended/textwindowaccessibility.cxx | 3 | ||||
| -rw-r--r-- | accessibility/source/standard/vclxaccessibleedit.cxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index a4de8a27c67a..4c5309795867 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -2352,8 +2352,7 @@ void Document::disposeParagraphs() // static css::uno::Any Document::mapFontColor(::Color const & rColor) { - return css::uno::Any( - static_cast< ::sal_Int32 >(COLORDATA_RGB(rColor.GetColor()))); + return css::uno::makeAny(rColor.GetRGBColor()); // FIXME keep transparency? } diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index 17146ae2518c..f1959b9dc980 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -319,7 +319,7 @@ Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32 { if (aValue.Name == "CharColor") { - aValue.Value <<= static_cast< sal_Int32 >(COLORDATA_RGB(pFontColor->GetColor().GetColor())); + aValue.Value <<= pFontColor->GetColor().GetRGBColor(); break; } } |