diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-14 20:43:06 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-14 21:28:06 +0100 |
| commit | 2dbed8bc8bf189fef40eb6b5d9cf453b59e83099 (patch) | |
| tree | 76d74cf1171f8f07bdc6ebb0a3f726b4ad6d93f4 /filter | |
| parent | 854da46a4b5e201e20841c20a740210b97b2583b (diff) | |
Be explicit when using bool as integral value
Change-Id: Ia55702e1ce7ca153de6e82abfce731bb8fc21977
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/flash/swfwriter.cxx | 4 | ||||
| -rw-r--r-- | filter/source/flash/swfwriter1.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index 0a6e562739e9..673717622492 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -223,9 +223,9 @@ void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int BitStream aBits; - aBits.writeUB( nClip != 0, 1 ); // Has Clip Actions? + aBits.writeUB( sal_uInt32(nClip != 0), 1 ); // Has Clip Actions? aBits.writeUB( 0, 1 ); // reserved - aBits.writeUB( pName != NULL, 1 ); // has a name + aBits.writeUB( sal_uInt32(pName != NULL), 1 ); // has a name aBits.writeUB( 0, 1 ); // no ratio aBits.writeUB( 0, 1 ); // no color transform aBits.writeUB( 1, 1 ); // has a matrix diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 5b2dce15f52c..6efcd514ac86 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -181,7 +181,7 @@ void Writer::Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int1 { rBits.writeUB( 0, 1 ); // TypeFlag rBits.writeUB( 0, 1 ); // StateNewStyles - rBits.writeUB( !bFilled, 1 ); // StateLineStyle + rBits.writeUB( sal_uInt32(!bFilled), 1 ); // StateLineStyle rBits.writeUB( 0, 1 ); // StateFillStyle0 rBits.writeUB( bFilled, 1 ); // StateFillStyle1 rBits.writeUB( 1, 1 ); // StateMoveTo @@ -218,7 +218,7 @@ void Writer::Impl_addStraightEdgeRecord( BitStream& rBits, sal_Int16 dx, sal_Int else { rBits.writeUB( 0, 1 ); - rBits.writeUB( ( dx == 0 ), 1 ); + rBits.writeUB( sal_uInt32( dx == 0 ), 1 ); if( dx == 0 ) { rBits.writeSB( dy, nBits ); // DeltaY @@ -855,7 +855,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali GraphicFilter aFilter; - Sequence< PropertyValue > aFilterData(nJPEGQualityLevel != -1); + Sequence< PropertyValue > aFilterData(sal_Int32(nJPEGQualityLevel != -1)); if( nJPEGQualityLevel != -1 ) { aFilterData[0].Name = "Quality"; |