diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-06-03 14:45:59 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-06-06 18:09:11 +0000 |
| commit | 62d270116bf34778bf581f21b27fa9cdbff7de0e (patch) | |
| tree | 0402df0506ab8f6825ef497f27426f01d2e01850 /editeng | |
| parent | d0bc637426060593046c8d3a4d01d0b05b052cc5 (diff) | |
tools: rename SvStream::Read/Write to ReadBytes/WriteBytes
Change-Id: Ib788a30d413436aa03f813aa2fddcbc4d6cd2f9a
Reviewed-on: https://gerrit.libreoffice.org/25972
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editobj.cxx | 10 | ||||
| -rw-r--r-- | editeng/source/items/flditem.cxx | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 06ac06998e75..1ae6ff31fabc 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1221,14 +1221,15 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const const ContentInfo& rC = *aContents[nPara].get(); sal_uInt16 nL = rC.GetText().getLength(); rOStream.WriteUInt16( nL ); - rOStream.Write(rC.GetText().getStr(), nL*sizeof(sal_Unicode)); + // FIXME this isn't endian safe, but presumably this is just used for copy/paste? + rOStream.WriteBytes(rC.GetText().getStr(), nL*sizeof(sal_Unicode)); // StyleSheetName must be Unicode too! // Copy/Paste from EA3 to BETA or from BETA to EA3 not possible, not needed... // If needed, change nL back to sal_uLong and increase version... nL = rC.GetStyle().getLength(); rOStream.WriteUInt16( nL ); - rOStream.Write(rC.GetStyle().getStr(), nL*sizeof(sal_Unicode)); + rOStream.WriteBytes(rC.GetStyle().getStr(), nL*sizeof(sal_Unicode)); } } } @@ -1495,7 +1496,8 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) } rtl_uString *pStr = rtl_uString_alloc(nL); - rIStream.Read(pStr->buffer, nL*sizeof(sal_Unicode)); + // FIXME this isn't endian safe, but presumably this is just used for copy/paste? + rIStream.ReadBytes(pStr->buffer, nL*sizeof(sal_Unicode)); rC.SetText((OUString(pStr, SAL_NO_ACQUIRE))); nL = 0; @@ -1514,7 +1516,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) } rtl_uString *pStr = rtl_uString_alloc(nL); - rIStream.Read(pStr->buffer, nL*sizeof(sal_Unicode) ); + rIStream.ReadBytes(pStr->buffer, nL*sizeof(sal_Unicode) ); rC.GetStyle() = OUString(pStr, SAL_NO_ACQUIRE); } } diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 121dcf8625b0..4f2c03e4b23e 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -529,7 +529,7 @@ static void write_unicode( SvPersistStream & rStm, const OUString& rString ) sal_uInt16 nL = sal::static_int_cast<sal_uInt16>(rString.getLength()); rStm.WriteUInt16( nL ); //endian specific?, yipes! - rStm.Write( rString.getStr(), nL*sizeof(sal_Unicode) ); + rStm.WriteBytes( rString.getStr(), nL*sizeof(sal_Unicode) ); } static OUString read_unicode( SvPersistStream & rStm ) @@ -548,7 +548,7 @@ static OUString read_unicode( SvPersistStream & rStm ) { pStr = rtl_uString_alloc(nL); //endian specific?, yipes! - rStm.Read(pStr->buffer, nL*sizeof(sal_Unicode)); + rStm.ReadBytes(pStr->buffer, nL*sizeof(sal_Unicode)); } //take ownership of buffer and return, otherwise return empty string return pStr ? OUString(pStr, SAL_NO_ACQUIRE) : OUString(); |