diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-05-12 20:01:05 +1000 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-08-30 06:09:49 +0200 |
commit | a2c8195f465a2e4346169d2b586c34e8fbed253c (patch) | |
tree | 2ad0a45dfebaaa63e26f96ce244486cf1d0598e4 /forms | |
parent | vcl: move TextLayoutCache into vcl::text namespace (diff) | |
download | core-a2c8195f465a2e4346169d2b586c34e8fbed253c.tar.gz core-a2c8195f465a2e4346169d2b586c34e8fbed253c.zip |
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 <mike.kaganski@collabora.com>
Diffstat (limited to 'forms')
-rw-r--r-- | forms/source/richtext/richtextcontrol.cxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/richtextvclcontrol.cxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/richtextvclcontrol.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
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 |