Kaydet (Commit) 0fc5d67a authored tarafından Caolán McNamara's avatar Caolán McNamara

fix up indent

Change-Id: Icaa9b84aa0c3617248d8e52fcccfca928accaea1
üst 6832d9f0
...@@ -4173,16 +4173,16 @@ void WW8RStyle::ImportOldFormatStyles() ...@@ -4173,16 +4173,16 @@ void WW8RStyle::ImportOldFormatStyles()
rtl_TextEncoding eStructChrSet = WW8Fib::GetFIBCharset( rtl_TextEncoding eStructChrSet = WW8Fib::GetFIBCharset(
pIo->pWwFib->chseTables); pIo->pWwFib->chseTables);
sal_uInt16 cstcStd; sal_uInt16 cstcStd(0);
rSt.ReadUInt16( cstcStd ); rSt.ReadUInt16( cstcStd );
sal_uInt16 cbName; sal_uInt16 cbName(0);
rSt.ReadUInt16( cbName ); rSt.ReadUInt16( cbName );
sal_uInt16 nByteCount = 2; sal_uInt16 nByteCount = 2;
sal_uInt16 stcp=0; sal_uInt16 stcp=0;
while (nByteCount < cbName) while (nByteCount < cbName)
{ {
sal_uInt8 nCount; sal_uInt8 nCount(0);
rSt.ReadUChar( nCount ); rSt.ReadUChar( nCount );
nByteCount++; nByteCount++;
...@@ -4226,14 +4226,14 @@ void WW8RStyle::ImportOldFormatStyles() ...@@ -4226,14 +4226,14 @@ void WW8RStyle::ImportOldFormatStyles()
sal_uInt16 nStyles=stcp; sal_uInt16 nStyles=stcp;
std::vector<pxoffset> aCHPXOffsets(stcp); std::vector<pxoffset> aCHPXOffsets(stcp);
sal_uInt16 cbChpx; sal_uInt16 cbChpx(0);
rSt.ReadUInt16( cbChpx ); rSt.ReadUInt16( cbChpx );
nByteCount = 2; nByteCount = 2;
stcp=0; stcp=0;
std::vector< std::vector<sal_uInt8> > aConvertedChpx; std::vector< std::vector<sal_uInt8> > aConvertedChpx;
while (nByteCount < cbChpx) while (nByteCount < cbChpx)
{ {
sal_uInt8 cb; sal_uInt8 cb(0);
rSt.ReadUChar( cb ); rSt.ReadUChar( cb );
nByteCount++; nByteCount++;
...@@ -4257,20 +4257,20 @@ void WW8RStyle::ImportOldFormatStyles() ...@@ -4257,20 +4257,20 @@ void WW8RStyle::ImportOldFormatStyles()
stcp++; stcp++;
if (stcp == nStyles) if (stcp == nStyles)
{ {
rSt.SeekRel(cbChpx-nByteCount); rSt.SeekRel(cbChpx-nByteCount);
nByteCount += cbChpx-nByteCount; nByteCount += cbChpx-nByteCount;
} }
} }
std::vector<pxoffset> aPAPXOffsets(stcp); std::vector<pxoffset> aPAPXOffsets(stcp);
sal_uInt16 cbPapx; sal_uInt16 cbPapx(0);
rSt.ReadUInt16( cbPapx ); rSt.ReadUInt16( cbPapx );
nByteCount = 2; nByteCount = 2;
stcp=0; stcp=0;
while (nByteCount < cbPapx) while (nByteCount < cbPapx)
{ {
sal_uInt8 cb; sal_uInt8 cb(0);
rSt.ReadUChar( cb ); rSt.ReadUChar( cb );
nByteCount++; nByteCount++;
...@@ -4278,7 +4278,7 @@ void WW8RStyle::ImportOldFormatStyles() ...@@ -4278,7 +4278,7 @@ void WW8RStyle::ImportOldFormatStyles()
if (cb != 0xFF) if (cb != 0xFF)
{ {
sal_uInt8 stc2; sal_uInt8 stc2(0);
rSt.ReadUChar( stc2 ); rSt.ReadUChar( stc2 );
rSt.SeekRel(6); rSt.SeekRel(6);
nByteCount+=7; nByteCount+=7;
...@@ -4294,20 +4294,20 @@ void WW8RStyle::ImportOldFormatStyles() ...@@ -4294,20 +4294,20 @@ void WW8RStyle::ImportOldFormatStyles()
stcp++; stcp++;
if (stcp == nStyles) if (stcp == nStyles)
{ {
rSt.SeekRel(cbPapx-nByteCount); rSt.SeekRel(cbPapx-nByteCount);
nByteCount += cbPapx-nByteCount; nByteCount += cbPapx-nByteCount;
} }
} }
sal_uInt16 iMac; sal_uInt16 iMac(0);
rSt.ReadUInt16( iMac ); rSt.ReadUInt16( iMac );
if (iMac > nStyles) iMac = nStyles; if (iMac > nStyles) iMac = nStyles;
for (stcp = 0; stcp < iMac; ++stcp) for (stcp = 0; stcp < iMac; ++stcp)
{ {
sal_uInt8 stcNext, stcBase; sal_uInt8 stcNext(0), stcBase(0);
rSt.ReadUChar( stcNext ); rSt.ReadUChar( stcNext );
rSt.ReadUChar( stcBase ); rSt.ReadUChar( stcBase );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment