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

[Stephan Bergmann (via logerrit)]

 sw/source/core/layout/paintfrm.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e3196f3dddad6e7825db3b35e8196be35b466fd9
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Mar 26 21:08:33 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Mar 27 08:53:31 2020 +0100

    Fix pointer equality comparision
    
    ...between OutputDevice* and derived SfxPrinter*
    
    Change-Id: I221f8a184c5019db6920cf199570e6d14f434b5c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91155
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 93c28c6503f3..2f7f4e4d4dc3 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/lazydelete.hxx>
 #include <sfx2/docfile.hxx>
+#include <sfx2/printer.hxx>
 #include <sfx2/progress.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/prntitem.hxx>
@@ -3841,7 +3842,7 @@ bool SwFlyFrame::IsPaint( SdrObject *pObj, const SwViewShell *pSh )
             {
                 if ( !pAnch->isFrameAreaPositionValid() )
                     pAnch = nullptr;
-                else if ( reinterpret_cast<sal_IntPtr>(pSh->GetOut()) == reinterpret_cast<sal_IntPtr>(pSh->getIDocumentDeviceAccess().getPrinter( false )))
+                else if ( pSh->GetOut() == pSh->getIDocumentDeviceAccess().getPrinter( false ))
                 {
                     //HACK: we have to omit some of the objects for printing,
                     //otherwise they would be printed twice.