[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/source

[Arnaud Versini (via logerrit)]

 vcl/source/control/edit.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit b0b7a38bd0ae6261ceeea20b31523070bf66b806
Author:     Arnaud Versini <arnaud.versini at libreoffice.org>
AuthorDate: Sun Dec 8 11:42:35 2019 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Fri Dec 27 20:56:03 2019 +0100

    tdf#83248: Use the right text color when printing fields
    
    Change-Id: I81167207a35d524660b9a1d6740cfce551489c4a
    Reviewed-on: https://gerrit.libreoffice.org/84707
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    (cherry picked from commit 10d345faa087fa49692f38bb2ece22560f423ba7)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85848
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 6eb9e991a38b..b4f3edd6a71a 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1732,7 +1732,6 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawF
     Point aPos = pDev->LogicToPixel( rPos );
     Size aSize = pDev->LogicToPixel( rSize );
     vcl::Font aFont = GetDrawPixelFont( pDev );
-    OutDevType eOutDevType = pDev->GetOutDevType();
 
     pDev->Push();
     pDev->SetMapMode();
@@ -1759,7 +1758,7 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawF
     }
 
     // Content
-    if ( ( nFlags & DrawFlags::Mono ) || ( eOutDevType == OUTDEV_PRINTER ) )
+    if ( nFlags & DrawFlags::Mono )
         pDev->SetTextColor( COL_BLACK );
     else
     {