diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-11-06 15:36:53 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-11-07 22:02:06 +0100 |
commit | ca04f207d750be041abcdb5344a6cbd308151492 (patch) | |
tree | b55ae317ad97312d3da1632037d8fab7436becb9 | |
parent | 7acf5fe037e50557c6ddbc8d9a797dc727ce4001 (diff) |
0xffffffff is COL_TRANSPARENT/COL_AUTO
Change-Id: I17d4a3d3a05913f4f0fc11508f2196b30661b88a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105415
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/sidebar/MenuButton.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/sidebar/TabItem.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdotextdecomposition.cxx | 4 | ||||
-rw-r--r-- | vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/xmlnumi.cxx | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 9eb92c2dba05..a03d9ce2ed01 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -1080,7 +1080,7 @@ IMPL_LINK_NOARG(ColorPickerDialog, ColorModifyEditHdl, weld::Entry&, void) Color aColor = m_xEDHex->GetColor(); - if (aColor != Color(0xffffffff) && aColor != GetColor()) + if (aColor != COL_AUTO && aColor != GetColor()) { mdRed = static_cast<double>(aColor.GetRed()) / 255.0; mdGreen = static_cast<double>(aColor.GetGreen()) / 255.0; diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index 9ff564ca4d3d..ba6a0f1dd43e 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -43,14 +43,14 @@ namespace rptui FormattedFieldBeautifier::FormattedFieldBeautifier(const OReportController& _aController) :m_rReportController(_aController) - ,m_nTextColor(0xffffffff) + ,m_nTextColor(COL_AUTO) { } Color FormattedFieldBeautifier::getTextColor() { - if (m_nTextColor == Color(0xffffffff)) + if (m_nTextColor == COL_AUTO) { svtools::ExtendedColorConfig aConfig; m_nTextColor = aConfig.GetColorValue(CFG_REPORTDESIGNER, DBTEXTBOXBOUNDCONTENT).getColor(); diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx index 364f0b89d6af..fb8d914ded2a 100644 --- a/sfx2/source/sidebar/MenuButton.cxx +++ b/sfx2/source/sidebar/MenuButton.cxx @@ -47,7 +47,7 @@ void MenuButton::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangl 3, (bIsHighlighted || bIsSelected ? Theme::GetColor(Theme::Color_TabItemBorder) - : Color(0xffffffff)), + : COL_TRANSPARENT), (bIsHighlighted ? Theme::GetPaint(Theme::Paint_TabItemBackgroundHighlight) : Theme::GetPaint(Theme::Paint_TabItemBackgroundNormal))); diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx index dcf00532044f..cb4d217fdaf1 100644 --- a/sfx2/source/sidebar/TabItem.cxx +++ b/sfx2/source/sidebar/TabItem.cxx @@ -51,7 +51,7 @@ void TabItem::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& Theme::GetInteger(Theme::Int_ButtonCornerRadius), bIsHighlighted||bIsSelected ? Theme::GetColor(Theme::Color_TabItemBorder) - : Color(0xffffffff), + : COL_TRANSPARENT, bIsHighlighted ? Theme::GetPaint(Theme::Paint_TabItemBackgroundHighlight) : Theme::GetPaint(Theme::Paint_TabItemBackgroundNormal)); diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 23e5279b4c1d..de362466fe03 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -268,9 +268,9 @@ namespace // TextDecoratedPortionPrimitive2D needed, prepare some more data // get overline and underline color. If it's on automatic (0xffffffff) use FontColor instead const Color aUnderlineColor(rInfo.maTextLineColor); - const basegfx::BColor aBUnderlineColor((Color(0xffffffff) == aUnderlineColor) ? aBFontColor : aUnderlineColor.getBColor()); + const basegfx::BColor aBUnderlineColor((aUnderlineColor == COL_AUTO) ? aBFontColor : aUnderlineColor.getBColor()); const Color aOverlineColor(rInfo.maOverlineColor); - const basegfx::BColor aBOverlineColor((Color(0xffffffff) == aOverlineColor) ? aBFontColor : aOverlineColor.getBColor()); + const basegfx::BColor aBOverlineColor((aOverlineColor == COL_AUTO) ? aBFontColor : aOverlineColor.getBColor()); // prepare overline and underline data const drawinglayer::primitive2d::TextLine eFontOverline( diff --git a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx index dd10d508e243..fb892395ecc1 100644 --- a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx +++ b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx @@ -181,7 +181,7 @@ void BitmapRenderTest::testAlphaVirtualDevice() CPPUNIT_ASSERT_EQUAL(tools::Long(4), aBitmap.GetSizePixel().Width()); CPPUNIT_ASSERT_EQUAL(tools::Long(4), aBitmap.GetSizePixel().Height()); Color aColor = aBitmap.GetPixelColor(1, 1); - CPPUNIT_ASSERT_EQUAL(Color(0xffffffff), aColor); + CPPUNIT_ASSERT_EQUAL(COL_TRANSPARENT, aColor); // Draw an opaque pixel to the VirDev pAlphaVirtualDevice->DrawPixel(Point(1, 1), Color(0x0022ff55)); diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index d658fee12476..16eff2be6aff 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -629,7 +629,7 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl( case XML_ELEMENT(STYLE, XML_USE_WINDOW_FONT_COLOR): { if( IsXMLToken( sValue, XML_TRUE ) ) - rListLevel.SetColor( Color(0xffffffff) ); + rListLevel.SetColor(COL_AUTO); } break; case XML_ELEMENT(FO, XML_FONT_SIZE): |