diff options
| author | Gabor Jenei <jengab@elte.hu> | 2011-09-01 16:18:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-01 16:42:03 +0100 |
| commit | cdc4b3803490dd275547efb38dc1fe7bfca7c0ec (patch) | |
| tree | 71558cca9c78bc4f0bebf00168cdd727caf2f19e /svtools | |
| parent | humour me, and sync this with osl/w32/security.c (diff) | |
| download | core-cdc4b3803490dd275547efb38dc1fe7bfca7c0ec.tar.gz core-cdc4b3803490dd275547efb38dc1fe7bfca7c0ec.zip | |
fix warnings
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/filter/wmf/enhwmf.cxx | 15 | ||||
| -rw-r--r-- | svtools/source/filter/wmf/winmtf.cxx | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/svtools/source/filter/wmf/enhwmf.cxx b/svtools/source/filter/wmf/enhwmf.cxx index 8f9074d5bb7e..18ae10c0a27a 100644 --- a/svtools/source/filter/wmf/enhwmf.cxx +++ b/svtools/source/filter/wmf/enhwmf.cxx @@ -13,7 +13,7 @@ * it under the terms of the GNU Lesser General Public License version 3 * only, as published by the Free Software Foundation. * - * OpenOffice.org is distributed in the hope that it will be useful, + * OpenOffsaice.org is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License version 3 for more details @@ -319,13 +319,12 @@ void EnhWMFReader::ReadGDIComment() EMFP_DEBUG(printf ("\t\tBEGINGROUP\n")); *pWMF >> x >> y >> r >> b; - EMFP_DEBUG(printf ("\t\tbounding rectangle: %d,%d x %d,%d\n", x, y, r, b)); + EMFP_DEBUG(printf ("\t\tbounding rectangle: %d,%d x %d,%d\n", (int)x,(int)y,(int)r,(int) b)); sal_uInt32 l; *pWMF >> l; - EMFP_DEBUG(printf ("\t\tdescription length: %d\n", l)); - + EMFP_DEBUG(printf ("\t\tdescription length: %d\n", (int)l)); break; } case 3: { @@ -387,21 +386,21 @@ sal_Bool EnhWMFReader::ReadEnhWMF() bFlag = sal_False; - EMFP_DEBUG(printf ("0x%04x-0x%04x record type: %d size: %d\n", nNextPos - nRecSize, nNextPos, nRecType, nRecSize)); + EMFP_DEBUG(printf ("0x%04x-0x%04x record type: %d size: %d\n",(unsigned int) (nNextPos - nRecSize),(unsigned int) nNextPos, (int)nRecType,(int) nRecSize)); if( bEnableEMFPlus && nRecType == EMR_GDICOMMENT ) { sal_uInt32 length; *pWMF >> length; - EMFP_DEBUG(printf ("\tGDI comment\n\t\tlength: %d\n", length)); + EMFP_DEBUG(printf ("\tGDI comment\n\t\tlength: %d\n", (int)length)); if( length >= 4 ) { sal_uInt32 id; *pWMF >> id; - EMFP_DEBUG(printf ("\t\tbegin %c%c%c%c id: 0x%x\n", (char)(id & 0xff), (char)((id & 0xff00) >> 8), (char)((id & 0xff0000) >> 16), (char)((id & 0xff000000) >> 24), id)); + EMFP_DEBUG(printf ("\t\tbegin %c%c%c%c id: 0x%x\n", (char)(id & 0xff), (char)((id & 0xff00) >> 8), (char)((id & 0xff0000) >> 16), (char)((id & 0xff000000) >> 24), (unsigned int)id)); // EMF+ comment (fixme: BE?) if( id == 0x2B464D45 && nRecSize >= 12 ) @@ -410,7 +409,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() else if( id == 0x43494447 && nRecSize >= 12 ) { EMFP_DEBUG(ReadGDIComment()); } else { - EMFP_DEBUG(printf ("\t\tunknown id: 0x%x\n", id)); + EMFP_DEBUG(printf ("\t\tunknown id: 0x%x\n",(unsigned int) id)); } } } else if( !bEMFPlus || bHaveDC || nRecType == EMR_EOF ) diff --git a/svtools/source/filter/wmf/winmtf.cxx b/svtools/source/filter/wmf/winmtf.cxx index 4c6e73980385..e4ba6ccf2b78 100644 --- a/svtools/source/filter/wmf/winmtf.cxx +++ b/svtools/source/filter/wmf/winmtf.cxx @@ -2259,7 +2259,7 @@ void WinMtfOutput::PassEMFPlusHeaderInfo() void WinMtfOutput::PassEMFPlus( void* pBuffer, sal_uInt32 nLength ) { - EMFP_DEBUG(printf ("\t\t\tadd EMF_PLUS comment length %d\n", nLength)); + EMFP_DEBUG(printf ("\t\t\tadd EMF_PLUS comment length %04x\n",(unsigned int) nLength)); mpGDIMetaFile->AddAction( new MetaCommentAction( "EMF_PLUS", 0, static_cast<const sal_uInt8*>(pBuffer), nLength ) ); } |