diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-06-22 11:50:38 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-10-12 18:46:48 +0200 |
| commit | 3fbf2af7211a77ac0d4fbe49403cec416caa1db6 (patch) | |
| tree | 5f23859f4f68bc5c50a52346cb9d0852ef5b7fc4 /svtools | |
| parent | fix off-by-one when reading WMF/EMF (diff) | |
| download | core-3fbf2af7211a77ac0d4fbe49403cec416caa1db6.tar.gz core-3fbf2af7211a77ac0d4fbe49403cec416caa1db6.zip | |
fix counting of bitmaps in a metafile
if( !number ) { ... ++number; } would never get beyond 1.
Change-Id: Iac33df3a21280c76fcdd130b699b4ab6466b1f46
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/graphic/grfmgr2.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 1c2ea1a62b32..b792f3f426b2 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -685,8 +685,8 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, pAction->GetBitmap().GetSizePixel(), rSizePix, bNonBitmapActionEncountered ); - ++nNumBitmaps; } + ++nNumBitmaps; break; case META_BMPSCALE_ACTION: @@ -703,8 +703,8 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, rPrefMapMode ), rSizePix, bNonBitmapActionEncountered ); - ++nNumBitmaps; } + ++nNumBitmaps; break; case META_BMPSCALEPART_ACTION: @@ -722,8 +722,8 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, rPrefMapMode ), rSizePix, bNonBitmapActionEncountered ); - ++nNumBitmaps; } + ++nNumBitmaps; break; case META_BMPEX_ACTION: @@ -739,8 +739,8 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, pAction->GetBitmapEx().GetSizePixel(), rSizePix, bNonBitmapActionEncountered ); - ++nNumBitmaps; } + ++nNumBitmaps; break; case META_BMPEXSCALE_ACTION: @@ -757,8 +757,8 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, rPrefMapMode ), rSizePix, bNonBitmapActionEncountered ); - ++nNumBitmaps; } + ++nNumBitmaps; break; case META_BMPEXSCALEPART_ACTION: @@ -775,8 +775,8 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, rPrefMapMode ), rSizePix, bNonBitmapActionEncountered ); - ++nNumBitmaps; } + ++nNumBitmaps; break; // these actions actually output something (that's |