diff options
| -rw-r--r-- | svtools/source/filter.vcl/wmf/enhwmf.cxx | 12 | ||||
| -rw-r--r-- | svtools/source/filter.vcl/wmf/winmtf.hxx | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/svtools/source/filter.vcl/wmf/enhwmf.cxx b/svtools/source/filter.vcl/wmf/enhwmf.cxx index a81fcab66db0..7f041adfae5b 100644 --- a/svtools/source/filter.vcl/wmf/enhwmf.cxx +++ b/svtools/source/filter.vcl/wmf/enhwmf.cxx @@ -262,7 +262,7 @@ void EnhWMFReader::ReadEMFPlusComment(sal_uInt32 length, sal_Bool& bHaveDC) void *buffer = malloc( length ); - int count = 0, next, pos = pWMF->Tell(); + int pos = pWMF->Tell(); pOut->PassEMFPlus( buffer, pWMF->Read( buffer, length ) ); pWMF->Seek( pos ); @@ -318,14 +318,10 @@ void EnhWMFReader::ReadGDIComment() break; } case 3: { - sal_uInt32 x, y, w, h; - EMFP_DEBUG(printf ("\t\tENDGROUP\n")); break; } case 0x40000004: { - sal_uInt32 x, y, w, h; - EMFP_DEBUG(printf ("\t\tMULTIFORMATS\n")); break; } @@ -397,10 +393,11 @@ BOOL EnhWMFReader::ReadEnhWMF() if( id == 0x2B464D45 && nRecSize >= 12 ) ReadEMFPlusComment( length, bHaveDC ); // GDIC comment, doesn't do anything useful yet => enabled only for debug - else if( id == 0x43494447 && nRecSize >= 12 ) + else if( id == 0x43494447 && nRecSize >= 12 ) { EMFP_DEBUG(ReadGDIComment()); - else + } else { EMFP_DEBUG(printf ("\t\tunknown id: 0x%x\n", id)); + } } } else if( !bEMFPlus || bHaveDC || nRecType == EMR_EOF ) @@ -1339,7 +1336,6 @@ BOOL EnhWMFReader::ReadEnhWMF() case EMR_CREATEDIBPATTERNBRUSHPT : { - static int count = 0; UINT32 nStart = pWMF->Tell() - 8; Bitmap aBitmap; diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx index a9903a641014..61e737022946 100644 --- a/svtools/source/filter.vcl/wmf/winmtf.hxx +++ b/svtools/source/filter.vcl/wmf/winmtf.hxx @@ -390,8 +390,8 @@ struct WinMtfFillStyle }; WinMtfFillStyle( Bitmap& rBmp ) : - aBmp ( rBmp ), - aType( FillStylePattern ) + aType( FillStylePattern ), + aBmp ( rBmp ) { }; |