From a2c8195f465a2e4346169d2b586c34e8fbed253c Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Wed, 12 May 2021 20:01:05 +1000 Subject: tdf#74702 vcl: introduce GetSystemTextColor() Also rename DrawFlags to SystemDrawColorFlags, added a unit test. Change-Id: I3cb74b278e43561d1055b3b55b9730cdbdea51aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113559 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- forms/source/richtext/richtextcontrol.cxx | 2 +- forms/source/richtext/richtextvclcontrol.cxx | 2 +- forms/source/richtext/richtextvclcontrol.hxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'forms') diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 45e898b8ed13..7aeb8410b568 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -330,7 +330,7 @@ namespace frm if ( eTargetUnit != MapUnit::MapPixel ) aPos = pTargetDevice->PixelToLogic( aPos ); - pControl->Draw( pTargetDevice, aPos, DrawFlags::NoControls ); + pControl->Draw( pTargetDevice, aPos, SystemTextColorFlags::NoControls ); } diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 0df141693f54..ff570eb74efa 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -288,7 +288,7 @@ namespace frm return bDone || Control::EventNotify(_rNEvt); } - void RichTextControl::Draw( OutputDevice* _pDev, const Point& _rPos, DrawFlags /*_nFlags*/ ) + void RichTextControl::Draw( OutputDevice* _pDev, const Point& _rPos, SystemTextColorFlags /*_nFlags*/ ) { m_pImpl->Draw( _pDev, _rPos, _pDev->PixelToLogic(GetSizePixel()) ); } diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx index 58448c34cd11..92d0c047d7ea 100644 --- a/forms/source/richtext/richtextvclcontrol.hxx +++ b/forms/source/richtext/richtextvclcontrol.hxx @@ -96,7 +96,7 @@ namespace frm EditView& getView(); // Window overridables - virtual void Draw( OutputDevice* _pDev, const Point& _rPos, DrawFlags _nFlags ) override; + virtual void Draw( OutputDevice* _pDev, const Point& _rPos, SystemTextColorFlags _nFlags ) override; protected: // Window overridables -- cgit