[Libreoffice-commits] core.git: sw/source

[Libreoffice Gerrit user]

 sw/source/core/txtnode/fntcache.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a8b72c8a54ab6ce68764a4c5b97b7af0e30ce566
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Thu Oct 25 15:44:58 2018 +0000
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Thu Oct 25 19:53:36 2018 +0200

    Always check IsVirtual() in SwFntObj::DrawText
    
    I tried to use the new OUTDEV_PDF in replacement for the PDF
    export check. It survived Jenkins and local builds, but sometimes
    a tinderbox breaks, so check IsVirtual() instead.
    
    Change-Id: I64fe7c145dc3b87345f6a967f6b2997f3c7e38c2
    Reviewed-on: https://gerrit.libreoffice.org/62366
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 7a653917e9e4..bf365413f282 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -880,7 +880,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
             OSL_FAIL( "Outdev Check failed" );
         }
     }
-    else if ( OUTDEV_PDF == rInf.GetOut().GetOutDevType() && ! pWin )
+    else if ( rInf.GetOut().IsVirtual() && ! pWin )
     {
         // PDF export
         if ( OUTDEV_PRINTER == rRefDev.GetOutDevType() )
@@ -897,7 +897,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
         }
     }
     else if ( OUTDEV_WINDOW == rInf.GetOut().GetOutDevType() ||
-               ( OUTDEV_VIRDEV == rInf.GetOut().GetOutDevType() && pWin ) )
+               ( rInf.GetOut().IsVirtual() && pWin ) )
     {
         // Window or virtual window
         if ( OUTDEV_PRINTER == rRefDev.GetOutDevType() )