[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sfx2/source

[Stephan Bergmann]

 sfx2/source/doc/new.cxx     |    2 +-
 sfx2/source/doc/objcont.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c82ef1dadaa3571524eaf5c474d745ce24ba5803
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jan 27 15:46:47 2017 +0100

    -Werror=int-in-bool-context (GCC 7)
    
    Change-Id: I69f31a94f3e57b3488c576f8d8e0569f459a2117
    (cherry picked from commit c65d6e9e5dc4f7d13be582bfb5206caeb7b51ba4)

diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 5d55b9c1ab39..ee350533650d 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -73,7 +73,7 @@ void SfxPreviewWin_Impl::ImpPaint(vcl::RenderContext& rRenderContext, const Rect
     rRenderContext.DrawRect(Rectangle(Point(0,0), rRenderContext.GetOutputSize()));
 
     Size aTmpSize = pFile ? pFile->GetPrefSize() : Size(1, 1);
-    DBG_ASSERT(aTmpSize.Height() * aTmpSize.Width(), "size of first page is 0, override GetFirstPageSize or set vis-area!");
+    DBG_ASSERT(aTmpSize.Height() != 0 && aTmpSize.Width() != 0, "size of first page is 0, override GetFirstPageSize or set vis-area!");
 
 #define FRAME 4
 
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 13ba0ec0d266..cffb201eb92e 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -151,7 +151,7 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( bool bFullContent ) const
     }
 
     xFile->SetPrefSize( aTmpSize );
-    DBG_ASSERT( aTmpSize.Height()*aTmpSize.Width(),
+    DBG_ASSERT( aTmpSize.Height() != 0 && aTmpSize.Width() != 0,
         "size of first page is 0, override GetFirstPageSize or set vis-area!" );
 
     xFile->Record( pDevice );