summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-02-07 11:53:18 +0200
committerMichael Stahl <mstahl@redhat.com>2014-02-12 19:45:10 +0000
commit0c7f35277575fee8594737f5b2842dfac2c6d04f (patch)
tree23ec8864dcdd91dc4c6f4234380bd8f4695131a9 /sw
parentda2efb3e14aa93be13dc4a88f0e41b7dc7948e15 (diff)
remove SvStream::operator>> methods
in favour of ReadXXX methods. Change-Id: Ic2c0a7b6b92ff4c236ae99b39d77f3d935b301e3 Reviewed-on: https://gerrit.libreoffice.org/7915 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 8c601355183a..d6edbcd220ca 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -79,20 +79,20 @@ namespace
documents) where in error 8bit strings are used instead of 16bits
strings for style names.
*/
- template<typename C> bool TestBeltAndBraces(SvStream& rStrm)
+ bool TestBeltAndBraces(SvStream& rStrm)
{
bool bRet = false;
sal_uInt32 nOldPos = rStrm.Tell();
- C nBelt(0);
- rStrm >> nBelt;
- nBelt *= sizeof(C);
- if (rStrm.good() && (rStrm.remainingSize() >= (nBelt + sizeof(C))))
+ sal_Unicode nBelt(0);
+ rStrm.ReadUInt16( nBelt );
+ nBelt *= sizeof(sal_Unicode);
+ if (rStrm.good() && (rStrm.remainingSize() >= (nBelt + sizeof(sal_Unicode))))
{
rStrm.SeekRel(nBelt);
if (rStrm.good())
{
- C cBraces(0);
- rStrm >> cBraces;
+ sal_Unicode cBraces(0);
+ rStrm.ReadUInt16( cBraces );
if (rStrm.good() && cBraces == 0)
bRet = true;
}
@@ -6085,7 +6085,7 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, OUString* pString, short* pcbStd )
case 8:
// handle Unicode-String with leading length short and
// trailing zero
- if (TestBeltAndBraces<sal_Unicode>(rSt))
+ if (TestBeltAndBraces(rSt))
{
*pString = read_uInt16_BeltAndBracesString(rSt);
rSkip -= (pString->getLength() + 2) * 2;