diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-27 15:46:47 +0100 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2018-02-09 20:30:22 +0100 |
| commit | 804c52e5e4412880639d816a688f284afd85cfcf (patch) | |
| tree | 3a22bb17f2858f52b3b23faa8d9d1bc1b3d052bb /sfx2 | |
| parent | 04901aeeb521aa576a741a89f080f6ac76acf071 (diff) | |
-Werror=int-in-bool-context (GCC 7)
Change-Id: I69f31a94f3e57b3488c576f8d8e0569f459a2117
(cherry picked from commit c65d6e9e5dc4f7d13be582bfb5206caeb7b51ba4)
(cherry picked from commit c82ef1dadaa3571524eaf5c474d745ce24ba5803)
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/new.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objcont.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 0a7f60b219e0..667e002e5bb1 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 fc25b5f9ae65..890a87a4d752 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 ); |