diff options
| author | Noel Grandin <noel@peralex.com> | 2014-12-12 10:45:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-12-12 10:46:23 +0200 |
| commit | aa2f02a4dc8a05f49e679a26f2beebb9d66b2325 (patch) | |
| tree | bed0e3b1b000fceaf09552bc703d19a236de7bbc /oox/source/ole/olehelper.cxx | |
| parent | osl_getCommandArg always returns osl_Process_E_None (diff) | |
| download | core-aa2f02a4dc8a05f49e679a26f2beebb9d66b2325.tar.gz core-aa2f02a4dc8a05f49e679a26f2beebb9d66b2325.zip | |
remove operator>> and operator<< methods
in favour of ReadXXX/WriteXXX methods
Change-Id: I69eebee3a8ce5b40301db7940a1d85915c0bf6f4
Diffstat (limited to 'oox/source/ole/olehelper.cxx')
| -rw-r--r-- | oox/source/ole/olehelper.cxx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 92aacef2d05d..e6c854c370cf 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -260,9 +260,9 @@ sal_uInt32 OleHelper::encodeOleColor( sal_Int32 nRgbColor ) void OleHelper::exportGuid( BinaryOutputStream& rOStr, const SvGlobalName& rId ) { - rOStr << rId.GetCLSID().Data1; - rOStr << rId.GetCLSID().Data2; - rOStr << rId.GetCLSID().Data3; + rOStr.WriteUInt32( rId.GetCLSID().Data1 ); + rOStr.WriteUInt16( rId.GetCLSID().Data2 ); + rOStr.WriteUInt16( rId.GetCLSID().Data3 ); rOStr.writeArray( rId.GetCLSID().Data4, 8 ); } @@ -296,7 +296,12 @@ bool OleHelper::importStdFont( StdFontInfo& orFontInfo, BinaryInputStream& rInSt } sal_uInt8 nVersion, nNameLen; - rInStrm >> nVersion >> orFontInfo.mnCharSet >> orFontInfo.mnFlags >> orFontInfo.mnWeight >> orFontInfo.mnHeight >> nNameLen; + nVersion = rInStrm.readuChar(); + orFontInfo.mnCharSet = rInStrm.readuInt16(); + orFontInfo.mnFlags = rInStrm.readuChar(); + orFontInfo.mnWeight = rInStrm.readuInt16(); + orFontInfo.mnHeight = rInStrm.readuInt32(); + nNameLen = rInStrm.readuChar(); // according to spec the name is ASCII orFontInfo.maName = rInStrm.readCharArrayUC( nNameLen, RTL_TEXTENCODING_ASCII_US ); OSL_ENSURE( nVersion <= 1, "OleHelper::importStdFont - wrong version" ); @@ -315,7 +320,8 @@ bool OleHelper::importStdPic( StreamDataSequence& orGraphicData, BinaryInputStre sal_uInt32 nStdPicId; sal_Int32 nBytes; - rInStrm >> nStdPicId >> nBytes; + nStdPicId = rInStrm.readuInt32(); + nBytes = rInStrm.readInt32(); OSL_ENSURE( nStdPicId == OLE_STDPIC_ID, "OleHelper::importStdPic - unexpected header version" ); return !rInStrm.isEof() && (nStdPicId == OLE_STDPIC_ID) && (nBytes > 0) && (rInStrm.readData( orGraphicData, nBytes ) == nBytes); } |