diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-17 14:55:13 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-17 15:20:43 +0200 |
commit | 9f23260105672903a047c2194a36ebd448fff135 (patch) | |
tree | 9408d894cebb45123235ae8a86700a0f8686d7af /vcl | |
parent | c007829a67456ef01b82b8368f7ed3e5a3026c95 (diff) |
SvStream: WriteUChar -> WriteBool
Change-Id: I89aa0e22c31d368ab36fe46917db6aacb11c7b14
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/gdi/animate.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/cvtsvm.cxx | 16 | ||||
-rw-r--r-- | vcl/source/gdi/font.cxx | 8 | ||||
-rw-r--r-- | vcl/source/gdi/mapmod.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/metaact.cxx | 22 | ||||
-rw-r--r-- | vcl/source/gdi/region.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/wall.cxx | 2 |
7 files changed, 27 insertions, 27 deletions
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index f4ba559074a8..f83581fd8bba 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -720,7 +720,7 @@ SvStream& WriteAnimation( SvStream& rOStm, const Animation& rAnimation ) WritePair( rOStm, rAnimation.maGlobalSize ); rOStm.WriteUInt16( ( ANIMATION_TIMEOUT_ON_CLICK == rAnimBmp.nWait ) ? 65535 : rAnimBmp.nWait ); rOStm.WriteUInt16( rAnimBmp.eDisposal ); - rOStm.WriteUChar( rAnimBmp.bUserInput ); + rOStm.WriteBool( rAnimBmp.bUserInput ); rOStm.WriteUInt32( rAnimation.mnLoopCount ); rOStm.WriteUInt32( nDummy32 ); // Unused rOStm.WriteUInt32( nDummy32 ); // Unused diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 2f4b17a6ccb0..f732f8d83e22 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -252,10 +252,10 @@ void ImplWriteFont( SvStream& rOStm, const vcl::Font& rFont, rOStm.WriteInt16( nWeight ); rOStm.WriteInt16( rFont.GetUnderline() ); rOStm.WriteInt16( rFont.GetStrikeout() ); - rOStm.WriteUChar( rFont.GetItalic() != ITALIC_NONE ); - rOStm.WriteUChar( rFont.IsOutline() ); - rOStm.WriteUChar( rFont.IsShadow() ); - rOStm.WriteUChar( rFont.IsTransparent() ); + rOStm.WriteBool( rFont.GetItalic() != ITALIC_NONE ); + rOStm.WriteBool( rFont.IsOutline() ); + rOStm.WriteBool( rFont.IsShadow() ); + rOStm.WriteBool( rFont.IsTransparent() ); if ( rActualCharSet == RTL_TEXTENCODING_DONTKNOW ) rActualCharSet = osl_getThreadTextEncoding(); } @@ -371,7 +371,7 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const tools::PolyPolygo if(rCandidate.HasFlags()) { - rOStm.WriteUChar( true ); + rOStm.WriteBool( true ); for(sal_uInt16 c(0); c < nPointCount; c++) { @@ -380,7 +380,7 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const tools::PolyPolygo } else { - rOStm.WriteUChar( false ); + rOStm.WriteBool( false ); } } } @@ -2344,7 +2344,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, // write data WritePair( rOStm, rRefPoint ); - rOStm.WriteUChar( bSet ); + rOStm.WriteBool( bSet ); rOStm.WriteInt32( 0 ); // number of actions that follow this comment // calculate and write ActionSize of comment @@ -2373,7 +2373,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, // write data WriteColor( rOStm, rColor ); - rOStm.WriteUChar( bSet ); + rOStm.WriteBool( bSet ); rOStm.WriteInt32( 0 ); // number of actions that follow this comment // calculate and write ActionSize of comment diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 8e3be59283a7..d8cf71a19055 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -719,15 +719,15 @@ SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& rImpl_Font ) rOStm.WriteInt16( rImpl_Font.mnOrientation ); - rOStm.WriteUChar( rImpl_Font.mbWordLine ); - rOStm.WriteUChar( rImpl_Font.mbOutline ); - rOStm.WriteUChar( rImpl_Font.mbShadow ); + rOStm.WriteBool( rImpl_Font.mbWordLine ); + rOStm.WriteBool( rImpl_Font.mbOutline ); + rOStm.WriteBool( rImpl_Font.mbShadow ); rOStm.WriteUChar( rImpl_Font.mnKerning ); // new in version 2 rOStm.WriteUChar( rImpl_Font.meRelief ); rOStm.WriteUInt16( rImpl_Font.maCJKLanguageTag.getLanguageType( false) ); - rOStm.WriteUChar( rImpl_Font.mbVertical ); + rOStm.WriteBool( rImpl_Font.mbVertical ); rOStm.WriteUInt16( rImpl_Font.meEmphasisMark ); // new in version 3 diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx index ec568fa38483..b3b71c54582f 100644 --- a/vcl/source/gdi/mapmod.cxx +++ b/vcl/source/gdi/mapmod.cxx @@ -88,7 +88,7 @@ SvStream& WriteImplMapMode(SvStream& rOStm, const MapMode::ImplMapMode& rImplMap WritePair( rOStm, rImplMapMode.maOrigin ); WriteFraction( rOStm, rImplMapMode.maScaleX ); WriteFraction( rOStm, rImplMapMode.maScaleY ); - rOStm.WriteUChar( rImplMapMode.mbSimple ); + rOStm.WriteBool( rImplMapMode.mbSimple ); return rOStm; } diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 9dbcce0cc323..870195925a79 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -889,8 +889,8 @@ void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WritePolygon( rOStm, aSimplePoly ); // Version 1 WriteLineInfo( rOStm, maLineInfo ); // Version 2 - sal_uInt8 bHasPolyFlags = maPoly.HasFlags(); // Version 3 - rOStm.WriteUChar( bHasPolyFlags ); + bool bHasPolyFlags = maPoly.HasFlags(); // Version 3 + rOStm.WriteBool( bHasPolyFlags ); if ( bHasPolyFlags ) maPoly.Write( rOStm ); } @@ -962,8 +962,8 @@ void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maPoly.AdaptiveSubdivide( aSimplePoly ); WritePolygon( rOStm, aSimplePoly ); - sal_uInt8 bHasPolyFlags = maPoly.HasFlags(); // Version 2 - rOStm.WriteUChar( bHasPolyFlags ); + bool bHasPolyFlags = maPoly.HasFlags(); // Version 2 + rOStm.WriteBool( bHasPolyFlags ); if ( bHasPolyFlags ) maPoly.Write( rOStm ); } @@ -2485,7 +2485,7 @@ void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) VersionCompat aCompat(rOStm, StreamMode::WRITE, 1); WriteRegion( rOStm, maRegion ); - rOStm.WriteUChar( mbClip ); + rOStm.WriteBool( mbClip ); } void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) @@ -2695,7 +2695,7 @@ void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) MetaAction::Write(rOStm, pData); VersionCompat aCompat(rOStm, StreamMode::WRITE, 1); maColor.Write( rOStm, true ); - rOStm.WriteUChar( mbSet ); + rOStm.WriteBool( mbSet ); } void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) @@ -2745,7 +2745,7 @@ void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) MetaAction::Write(rOStm, pData); VersionCompat aCompat(rOStm, StreamMode::WRITE, 1); maColor.Write( rOStm, true ); - rOStm.WriteUChar( mbSet ); + rOStm.WriteBool( mbSet ); } void MetaFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) @@ -2837,7 +2837,7 @@ void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) MetaAction::Write(rOStm, pData); VersionCompat aCompat(rOStm, StreamMode::WRITE, 1); maColor.Write( rOStm, true ); - rOStm.WriteUChar( mbSet ); + rOStm.WriteBool( mbSet ); } void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) @@ -2887,7 +2887,7 @@ void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) MetaAction::Write(rOStm, pData); VersionCompat aCompat(rOStm, StreamMode::WRITE, 1); maColor.Write( rOStm, true ); - rOStm.WriteUChar( mbSet ); + rOStm.WriteBool( mbSet ); } void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) @@ -2937,7 +2937,7 @@ void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) MetaAction::Write(rOStm, pData); VersionCompat aCompat(rOStm, StreamMode::WRITE, 1); maColor.Write( rOStm, true ); - rOStm.WriteUChar( mbSet ); + rOStm.WriteBool( mbSet ); } void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) @@ -3479,7 +3479,7 @@ void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) VersionCompat aCompat(rOStm, StreamMode::WRITE, 1); WritePair( rOStm, maRefPoint ); - rOStm.WriteUChar( mbSet ); + rOStm.WriteBool( mbSet ); } void MetaRefPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index d6114ef721d4..086739a62fff 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -1682,7 +1682,7 @@ SvStream& WriteRegion( SvStream& rOStrm, const vcl::Region& rRegion ) // write polypolygon if available const bool bHasPolyPolygon(rRegion.HasPolyPolygonOrB2DPolyPolygon()); - rOStrm.WriteUChar( bHasPolyPolygon ); + rOStrm.WriteBool( bHasPolyPolygon ); if(bHasPolyPolygon) { diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx index b4208f262891..847a5a1a34be 100644 --- a/vcl/source/gdi/wall.cxx +++ b/vcl/source/gdi/wall.cxx @@ -151,7 +151,7 @@ SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpap rOStm.WriteUInt16( rImplWallpaper.meStyle ); // version 2 - rOStm.WriteUChar( bRect ).WriteUChar( bGrad ).WriteUChar( bBmp ).WriteUChar( bDummy ).WriteUChar( bDummy ).WriteUChar( bDummy ); + rOStm.WriteBool( bRect ).WriteBool( bGrad ).WriteBool( bBmp ).WriteBool( bDummy ).WriteBool( bDummy ).WriteBool( bDummy ); if( bRect ) WriteRectangle( rOStm, *rImplWallpaper.mpRect ); |