diff options
31 files changed, 88 insertions, 88 deletions
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 4aeb38e700cb..8ac5bee81d59 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -2064,7 +2064,7 @@ bool SbMethod::StoreData( SvStream& rStrm ) const .WriteInt16( nLine1 ) .WriteInt16( nLine2 ) .WriteInt16( nStart ) - .WriteUChar( bInvalid ); + .WriteBool( bInvalid ); return true; } diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index 2e1d382b2d10..09463459a84b 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -316,7 +316,7 @@ bool SbxStdCollection::StoreData( SvStream& rStrm ) const { write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aElemClass, RTL_TEXTENCODING_ASCII_US); - rStrm.WriteUChar( bAddRemoveOk ); + rStrm.WriteBool( bAddRemoveOk ); } return bRes; } diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 2f4c3d4a2062..c62dbb68458a 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1100,7 +1100,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const sal_uInt16 nVer = 602; rOStream.WriteUInt16( nVer ); - rOStream.WriteUChar( bOwnerOfPool ); + rOStream.WriteBool( bOwnerOfPool ); // First store the pool, later only the Surregate if ( bOwnerOfPool ) @@ -1243,10 +1243,10 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const rOStream.WriteUInt16( nUserType ); rOStream.WriteUInt32( nObjSettings ); - rOStream.WriteUChar( bVertical ); + rOStream.WriteBool( bVertical ); rOStream.WriteUInt16( static_cast<sal_uInt16>(nScriptType) ); - rOStream.WriteUChar( bStoreUnicodeStrings ); + rOStream.WriteBool( bStoreUnicodeStrings ); if ( bStoreUnicodeStrings ) { for ( size_t nPara = 0; nPara < nParagraphs_Stream; nPara++ ) diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 1a5738d9453d..b06466729bf4 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -54,9 +54,9 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const vcl::Font& rFont ) // UNICODE: rStream << rFont.GetName(); rStream.WriteUniOrByteString(rFont.GetName(), rStream.GetStreamCharSet()); - rStream.WriteUChar( rFont.IsOutline() ); - rStream.WriteUChar( rFont.IsShadow() ); - rStream.WriteUChar( rFont.IsTransparent() ); + rStream.WriteBool( rFont.IsOutline() ); + rStream.WriteBool( rFont.IsShadow() ); + rStream.WriteBool( rFont.IsTransparent() ); } diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index a25bc0a97290..32ccb2cc7a4e 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1521,7 +1521,7 @@ SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) { rStrm.WriteSChar( GetLocation() ) .WriteUInt16( GetWidth() ) - .WriteUChar( aShadowColor.GetTransparency() > 0 ); + .WriteBool( aShadowColor.GetTransparency() > 0 ); WriteColor( rStrm, GetColor() ); WriteColor( rStrm, GetColor() ); rStrm.WriteSChar( aShadowColor.GetTransparency() > 0 ? 0 : 1 ); //BRUSH_NULL : BRUSH_SOLID @@ -3874,7 +3874,7 @@ SfxPoolItem* SvxBrushItem::Create( SvStream& rStream, sal_uInt16 nVersion ) cons SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) const { - rStream.WriteUChar( false ); + rStream.WriteBool( false ); WriteColor( rStream, aColor ); WriteColor( rStream, aColor ); rStream.WriteSChar( aColor.GetTransparency() > 0 ? 0 : 1 ); //BRUSH_NULL : BRUSH_SOLID diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 7b3f647d8083..db11b63772b9 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -1611,7 +1611,7 @@ SfxPoolItem* SvxShadowedItem::Clone( SfxItemPool * ) const SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteUChar( GetValue() ); + rStrm.WriteBool( GetValue() ); return rStrm; } @@ -1660,7 +1660,7 @@ SfxPoolItem* SvxAutoKernItem::Clone( SfxItemPool * ) const SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteUChar( GetValue() ); + rStrm.WriteBool( GetValue() ); return rStrm; } @@ -1710,7 +1710,7 @@ SfxPoolItem* SvxWordLineModeItem::Clone( SfxItemPool * ) const SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteUChar( GetValue() ); + rStrm.WriteBool( GetValue() ); return rStrm; } @@ -1759,7 +1759,7 @@ SfxPoolItem* SvxContourItem::Clone( SfxItemPool * ) const SvStream& SvxContourItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteUChar( GetValue() ); + rStrm.WriteBool( GetValue() ); return rStrm; } @@ -2567,7 +2567,7 @@ SfxPoolItem* SvxNoLinebreakItem::Clone( SfxItemPool* ) const SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteUChar( GetValue() ); + rStrm.WriteBool( GetValue() ); return rStrm; } @@ -2612,7 +2612,7 @@ SfxPoolItem* SvxNoHyphenItem::Clone( SfxItemPool* ) const SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteUChar( GetValue() ); + rStrm.WriteBool( GetValue() ); return rStrm; } @@ -2700,7 +2700,7 @@ SfxPoolItem* SvxBlinkItem::Clone( SfxItemPool * ) const SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteUChar( GetValue() ); + rStrm.WriteBool( GetValue() ); return rStrm; } @@ -2984,7 +2984,7 @@ SfxPoolItem* SvxTwoLinesItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*/) con SvStream& SvxTwoLinesItem::Store(SvStream & rStrm, sal_uInt16 /*nIVer*/) const { - rStrm.WriteUChar( GetValue() ).WriteUInt16( GetStartBracket() ).WriteUInt16( GetEndBracket() ); + rStrm.WriteBool( GetValue() ).WriteUInt16( GetStartBracket() ).WriteUInt16( GetEndBracket() ); return rStrm; } @@ -3026,7 +3026,7 @@ SfxPoolItem* SvxCharRotateItem::Create( SvStream& rStrm, sal_uInt16 ) const SvStream& SvxCharRotateItem::Store( SvStream & rStrm, sal_uInt16 ) const { bool bFlag = IsFitToLine(); - rStrm.WriteUInt16( GetValue() ).WriteUChar( bFlag ); + rStrm.WriteUInt16( GetValue() ).WriteBool( bFlag ); return rStrm; } diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 67680c0e1f81..a3a3a5b08d5a 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -4134,7 +4134,7 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject .WriteInt16( pGraphicAttr->GetChannelG() ) .WriteInt16( pGraphicAttr->GetChannelB() ) .WriteDouble( pGraphicAttr->GetGamma() ); - aSt.WriteUChar( pGraphicAttr->IsInvert() ) + aSt.WriteBool( pGraphicAttr->IsInvert() ) .WriteUChar( pGraphicAttr->GetTransparency() ); mnIdentifier[ 1 ] = rtl_crc32( 0, aSt.GetData(), aSt.Tell() ); } diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index 0dfc3690663c..08d258ccec30 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -173,7 +173,7 @@ SfxPoolItem* ScPatternAttr::Create( SvStream& rStream, sal_uInt16 /* nVersion */ SvStream& ScPatternAttr::Store(SvStream& rStream, sal_uInt16 /* nItemVersion */) const { - rStream.WriteUChar( true ); + rStream.WriteBool( true ); if ( pStyle ) rStream.WriteUniOrByteString( pStyle->GetName(), rStream.GetStreamCharSet() ); diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 6d69934d08a8..c68a4f65239d 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -795,12 +795,12 @@ bool ScAutoFormatData::Save(SvStream& rStream, sal_uInt16 fileVersion) write_uInt16_lenPrefixed_uInt8s_FromOUString(rStream, aName, RTL_TEXTENCODING_UTF8); rStream.WriteUInt16( nStrResId ); - rStream.WriteUChar( bIncludeFont ); - rStream.WriteUChar( bIncludeJustify ); - rStream.WriteUChar( bIncludeFrame ); - rStream.WriteUChar( bIncludeBackground ); - rStream.WriteUChar( bIncludeValueFormat ); - rStream.WriteUChar( bIncludeWidthHeight ); + rStream.WriteBool( bIncludeFont ); + rStream.WriteBool( bIncludeJustify ); + rStream.WriteBool( bIncludeFrame ); + rStream.WriteBool( bIncludeBackground ); + rStream.WriteBool( bIncludeValueFormat ); + rStream.WriteBool( bIncludeWidthHeight ); if (fileVersion >= SOFFICE_FILEFORMAT_50) WriteAutoFormatSwBlob( rStream, m_swFields ); diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx index f449912ee20c..bf7770cd7680 100644 --- a/sc/source/core/tool/ddelink.cxx +++ b/sc/source/core/tool/ddelink.cxx @@ -110,7 +110,7 @@ void ScDdeLink::Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const rStream.WriteUniOrByteString( aItem, eCharSet ); bool bHasValue = ( pResult != 0 ); - rStream.WriteUChar( bHasValue ); + rStream.WriteBool( bHasValue ); if( rStream.GetVersion() > SOFFICE_FILEFORMAT_40 ) // nicht bei 4.0 Export rStream.WriteUChar( nMode ); // seit 388b diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 7edbf1200514..36bc1973c72c 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -302,8 +302,8 @@ SvStream& WriteSdPublishingDesign(SvStream& rOut, const SdPublishingDesign& rDes RTL_TEXTENCODING_UTF8); rOut.WriteUInt16( rDesign.m_eMode ); - rOut.WriteUChar( rDesign.m_bContentPage ); - rOut.WriteUChar( rDesign.m_bNotes ); + rOut.WriteBool( rDesign.m_bContentPage ); + rOut.WriteBool( rDesign.m_bNotes ); rOut.WriteUInt16( rDesign.m_nResolution ); write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCompression, RTL_TEXTENCODING_UTF8); @@ -316,17 +316,17 @@ SvStream& WriteSdPublishingDesign(SvStream& rOut, const SdPublishingDesign& rDes RTL_TEXTENCODING_UTF8); write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aMisc, RTL_TEXTENCODING_UTF8); - rOut.WriteUChar( rDesign.m_bDownload ); - rOut.WriteUChar( rDesign.m_bCreated ); // not used + rOut.WriteBool( rDesign.m_bDownload ); + rOut.WriteBool( rDesign.m_bCreated ); // not used rOut.WriteInt16( rDesign.m_nButtonThema ); - rOut.WriteUChar( rDesign.m_bUserAttr ); + rOut.WriteBool( rDesign.m_bUserAttr ); WriteColor( rOut, rDesign.m_aBackColor ); WriteColor( rOut, rDesign.m_aTextColor ); WriteColor( rOut, rDesign.m_aLinkColor ); WriteColor( rOut, rDesign.m_aVLinkColor ); WriteColor( rOut, rDesign.m_aALinkColor ); - rOut.WriteUChar( rDesign.m_bUseAttribs ); - rOut.WriteUChar( rDesign.m_bUseColor ); + rOut.WriteBool( rDesign.m_bUseAttribs ); + rOut.WriteBool( rDesign.m_bUseColor ); rOut.WriteUInt16( rDesign.m_eScript ); write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aURL, @@ -334,11 +334,11 @@ SvStream& WriteSdPublishingDesign(SvStream& rOut, const SdPublishingDesign& rDes write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCGI, RTL_TEXTENCODING_UTF8); - rOut.WriteUChar( rDesign.m_bAutoSlide ); + rOut.WriteBool( rDesign.m_bAutoSlide ); rOut.WriteUInt32( rDesign.m_nSlideDuration ); - rOut.WriteUChar( rDesign.m_bEndless ); - rOut.WriteUChar( rDesign.m_bSlideSound ); - rOut.WriteUChar( rDesign.m_bHiddenSlides ); + rOut.WriteBool( rDesign.m_bEndless ); + rOut.WriteBool( rDesign.m_bSlideSound ); + rOut.WriteBool( rDesign.m_bHiddenSlides ); return rOut; } diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index d21de6f97c27..db55129d3f8a 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -102,8 +102,8 @@ void MorphDlg::SaveSettings() const SdIOCompat aCompat( *xOStm, StreamMode::WRITE, 1 ); xOStm->WriteUInt16( m_pMtfSteps->GetValue() ) - .WriteUChar( m_pCbxOrientation->IsChecked() ) - .WriteUChar( m_pCbxAttributes->IsChecked() ); + .WriteBool( m_pCbxOrientation->IsChecked() ) + .WriteBool( m_pCbxAttributes->IsChecked() ); } } diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 71d6ed9dd558..f533073cfe32 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -335,7 +335,7 @@ void SdVectorizeDlg::SaveSettings() const { SdIOCompat aCompat( *xOStm, StreamMode::WRITE, 1 ); xOStm->WriteUInt16( m_pNmLayers->GetValue() ).WriteUInt16( m_pMtReduce->GetValue() ); - xOStm->WriteUInt16( m_pMtFillHoles->GetValue() ).WriteUChar( m_pCbFillHoles->IsChecked() ); + xOStm->WriteUInt16( m_pMtFillHoles->GetValue() ).WriteBool( m_pCbFillHoles->IsChecked() ); } } diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index bb4ada807dd2..a5525bedd27d 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -211,7 +211,7 @@ SfxPoolItem * SfxBoolItem::Create(SvStream & rStream, sal_uInt16) const // virtual SvStream & SfxBoolItem::Store(SvStream & rStream, sal_uInt16) const { - rStream.WriteUChar( m_bValue ); // not bool for serialization! + rStream.WriteBool( m_bValue ); // not bool for serialization! return rStream; } diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index 4e79d882780e..a5427df0b2f8 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -90,7 +90,7 @@ SvStream & CntContentTypeItem::Store(SvStream & rStream, sal_uInt16) const // CntContentTypeItem used to be derived from CntStringItem, so take that // into account: writeUnicodeString(rStream, GetValue()); - rStream.WriteUInt32( CNTSTRINGITEM_STREAM_MAGIC ).WriteUChar( false ); + rStream.WriteUInt32( CNTSTRINGITEM_STREAM_MAGIC ).WriteBool( false ); return rStream; } diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx index 6a11cb266115..29e5e50b0bdd 100644 --- a/svtools/source/graphic/grfattr.cxx +++ b/svtools/source/graphic/grfattr.cxx @@ -108,7 +108,7 @@ SvStream& WriteGraphicAttr( SvStream& rOStm, const GraphicAttr& rAttr ) rOStm.WriteDouble( rAttr.mfGamma ); rOStm.WriteUInt32( rAttr.mnMirrFlags ).WriteUInt16( rAttr.mnRotate10 ); rOStm.WriteInt16( rAttr.mnContPercent ).WriteInt16( rAttr.mnLumPercent ).WriteInt16( rAttr.mnRPercent ).WriteInt16( rAttr.mnGPercent ).WriteInt16( rAttr.mnBPercent ); - rOStm.WriteUChar( rAttr.mbInvert ).WriteUChar( rAttr.mcTransparency ).WriteUInt16( rAttr.meDrawMode ); + rOStm.WriteBool( rAttr.mbInvert ).WriteUChar( rAttr.mcTransparency ).WriteUInt16( rAttr.meDrawMode ); rOStm.WriteInt32( rAttr.mnLeftCrop ) .WriteInt32( rAttr.mnTopCrop ) .WriteInt32( rAttr.mnRightCrop ) diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index c91b6e0236b3..0ee4ff9bcdbf 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1122,7 +1122,7 @@ SvStream& WriteGraphicObject( SvStream& rOStm, const GraphicObject& rGraphicObj WriteGraphic( rOStm, rGraphicObj.GetGraphic() ); WriteGraphicAttr( rOStm, rGraphicObj.GetAttr() ); - rOStm.WriteUChar( bLink ); + rOStm.WriteBool( bLink ); if( bLink ) write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8); diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index 3df94ab93e7f..d005651a4213 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -78,7 +78,7 @@ void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), eEncoding); write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, aRelURL); write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aAltText, eEncoding); - rOStm.WriteUChar( bActive ); + rOStm.WriteBool( bActive ); write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aTarget, eEncoding); boost::scoped_ptr<IMapCompat> pCompat(new IMapCompat( rOStm, StreamMode::WRITE )); @@ -418,7 +418,7 @@ void IMapPolygonObject::ImpConstruct( const Polygon& rPoly, bool bPixel ) void IMapPolygonObject::WriteIMapObject( SvStream& rOStm ) const { WritePolygon( rOStm, aPoly ); - rOStm.WriteUChar( bEllipse ); // >= Version 2 + rOStm.WriteBool( bEllipse ); // >= Version 2 WriteRectangle( rOStm, aEllipse ); // >= Version 2 } diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 3205a9ca0927..35a35efbd16a 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -174,7 +174,7 @@ void SgaObject::WriteData( SvStream& rOut, const OUString& rDestDir ) const static const sal_uInt32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' ); rOut.WriteUInt32( nInventor ).WriteUInt16( 0x0004 ).WriteUInt16( GetVersion() ).WriteUInt16( GetObjKind() ); - rOut.WriteUChar( bIsThumbBmp ); + rOut.WriteBool( bIsThumbBmp ); if( bIsThumbBmp ) { diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index f037a0b9fc44..b3e2c39d477a 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -1346,7 +1346,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const << m_aDestDir << "' in '" << aPath << "'"); } - rOStm.WriteUChar( bRel ); + rOStm.WriteBool( bRel ); write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aPath, RTL_TEXTENCODING_UTF8); rOStm.WriteUInt32( pObj->nOffset ).WriteUInt16( pObj->eObjKind ); } @@ -1358,7 +1358,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const const long nReservePos = rOStm.Tell(); boost::scoped_ptr<VersionCompat> pCompat(new VersionCompat( rOStm, StreamMode::WRITE, 2 )); - rOStm.WriteUInt32( GetId() ).WriteUChar( IsThemeNameFromResource() ); // From version 2 and up + rOStm.WriteUInt32( GetId() ).WriteBool( IsThemeNameFromResource() ); // From version 2 and up pCompat.reset(); diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 1ebbdeaa8e9a..b92e9469fea3 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -246,7 +246,7 @@ SvStream& SvxPageItem::Store( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) con // UNICODE: rStrm << aDescName; rStrm.WriteUniOrByteString(aDescName, rStrm.GetStreamCharSet()); - rStrm.WriteUChar( eNumType ).WriteUChar( bLandscape ).WriteUInt16( eUse ); + rStrm.WriteUChar( eNumType ).WriteBool( bLandscape ).WriteUInt16( eUse ); return rStrm; } diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 4bd62acbf29a..408a694623dc 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -1405,7 +1405,7 @@ SvStream& SdrTextFixedCellHeightItem::Store( SvStream& rOut, sal_uInt16 nItemVer if ( nItemVersion ) { bool bValue = GetValue(); - rOut.WriteUChar( bValue ); + rOut.WriteBool( bValue ); } return rOut; } diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 5880d2fa7a82..66bc94016de5 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -967,12 +967,12 @@ bool SwTableAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const write_uInt16_lenPrefixed_uInt8s_FromOUString(rStream, m_aName, RTL_TEXTENCODING_UTF8 ); rStream.WriteUInt16( nStrResId ); - rStream.WriteUChar( bInclFont ); - rStream.WriteUChar( bInclJustify ); - rStream.WriteUChar( bInclFrame ); - rStream.WriteUChar( bInclBackground ); - rStream.WriteUChar( bInclValueFormat ); - rStream.WriteUChar( bInclWidthHeight ); + rStream.WriteBool( bInclFont ); + rStream.WriteBool( bInclJustify ); + rStream.WriteBool( bInclFrame ); + rStream.WriteBool( bInclBackground ); + rStream.WriteBool( bInclValueFormat ); + rStream.WriteBool( bInclWidthHeight ); { WriterSpecificAutoFormatBlock block(rStream); @@ -980,7 +980,7 @@ bool SwTableAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const m_aBreak.Store(rStream, m_aBreak.GetVersion(fileVersion)); m_aPageDesc.Store(rStream, m_aPageDesc.GetVersion(fileVersion)); m_aKeepWithNextPara.Store(rStream, m_aKeepWithNextPara.GetVersion(fileVersion)); - rStream.WriteUInt16( m_aRepeatHeading ).WriteUChar( m_bLayoutSplit ).WriteUChar( m_bRowSplit ).WriteUChar( m_bCollapsingBorders ); + rStream.WriteUInt16( m_aRepeatHeading ).WriteBool( m_bLayoutSplit ).WriteBool( m_bRowSplit ).WriteBool( m_bCollapsingBorders ); m_aShadow.Store(rStream, m_aShadow.GetVersion(fileVersion)); } diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index e4153b9af6f9..53577424d666 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -1643,7 +1643,7 @@ void Polygon::ImplWrite( SvStream& rOStream ) const { bool bHasPolyFlags = mpImplPolygon->mpFlagAry != NULL; WritePolygon( rOStream, *this ); - rOStream.WriteUChar(bHasPolyFlags); + rOStream.WriteBool(bHasPolyFlags); if ( bHasPolyFlags ) rOStream.Write( mpImplPolygon->mpFlagAry, mpImplPolygon->mnPoints ); 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 ); |