sw/source/filter/ww8/wrtw8esh.cxx | 28
sw/source/filter/ww8/wrtw8num.cxx | 14
sw/source/filter/ww8/wrtw8sty.cxx | 60 -
sw/source/filter/ww8/wrtww8.cxx | 186 ++---
sw/source/filter/ww8/wrtww8gr.cxx | 2
sw/source/filter/ww8/ww8atr.cxx | 4
sw/source/filter/ww8/ww8glsy.cxx | 18
sw/source/filter/ww8/ww8glsy.hxx | 2
sw/source/filter/ww8/ww8graf.cxx | 2
sw/source/filter/ww8/ww8graf2.cxx | 2
sw/source/filter/ww8/ww8par.cxx | 108 +--
sw/source/filter/ww8/ww8par2.cxx | 2
sw/source/filter/ww8/ww8par3.cxx | 14
sw/source/filter/ww8/ww8par5.cxx | 2
sw/source/filter/ww8/ww8par6.cxx | 4
sw/source/filter/ww8/ww8scan.cxx | 1192 +++++++++++++++++++-------------------
sw/source/filter/ww8/ww8scan.hxx | 438 ++++++-------
17 files changed, 1039 insertions(+), 1039 deletions(-)
New commits:
commit 2e143e77d05c5798904e8e24cf99e7967efc61f1
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Oct 3 08:16:48 2016 +0200
sw: prefix members of WW8Fib
Change-Id: I69f8b6dda03b9a8cc19fc1dbe5e8031cfb7329d2
Reviewed-on: https://gerrit.libreoffice.org/29470
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index 0aa62eb..ea93c91 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -699,7 +699,7 @@ void WW8Export::MiserableRTLFrameFormatHack(SwTwips &rLeft,
SwTwips &rRight,
void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
{
- if (8 > rWrt.pFib->nVersion) // Cannot export drawobject in vers 7-
+ if (8 > rWrt.pFib->m_nVersion) // Cannot export drawobject in vers 7-
return;
sal_uInt32 nFcStart = rWrt.pTableStrm->Tell();
@@ -716,8 +716,8 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
for (aIter = maDrawObjs.begin(); aIter < aEnd; ++aIter)
SwWW8Writer::WriteLong(*rWrt.pTableStrm, aIter->mnCp - nCpOffs);
- SwWW8Writer::WriteLong(*rWrt.pTableStrm, rFib.ccpText +
rFib.ccpFootnote +
- rFib.ccpHdr + rFib.ccpEdn + rFib.ccpTxbx + rFib.ccpHdrTxbx + 1);
+ SwWW8Writer::WriteLong(*rWrt.pTableStrm, rFib.m_ccpText +
rFib.m_ccpFootnote +
+ rFib.m_ccpHdr + rFib.m_ccpEdn + rFib.m_ccpTxbx + rFib.m_ccpHdrTxbx
+ 1);
for (aIter = maDrawObjs.begin(); aIter < aEnd; ++aIter)
{
@@ -899,8 +899,8 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
void MainTextPlcDrawObj::RegisterWithFib(WW8Fib &rFib, sal_uInt32 nStart,
sal_uInt32 nLen) const
{
- rFib.fcPlcfspaMom = nStart;
- rFib.lcbPlcfspaMom = nLen;
+ rFib.m_fcPlcfspaMom = nStart;
+ rFib.m_lcbPlcfspaMom = nLen;
}
WW8_CP MainTextPlcDrawObj::GetCpOffset(const WW8Fib &) const
@@ -911,13 +911,13 @@ WW8_CP MainTextPlcDrawObj::GetCpOffset(const WW8Fib &)
const
void HdFtPlcDrawObj::RegisterWithFib(WW8Fib &rFib, sal_uInt32 nStart,
sal_uInt32 nLen) const
{
- rFib.fcPlcfspaHdr = nStart;
- rFib.lcbPlcfspaHdr = nLen;
+ rFib.m_fcPlcfspaHdr = nStart;
+ rFib.m_lcbPlcfspaHdr = nLen;
}
WW8_CP HdFtPlcDrawObj::GetCpOffset(const WW8Fib &rFib) const
{
- return rFib.ccpText + rFib.ccpFootnote;
+ return rFib.m_ccpText + rFib.m_ccpFootnote;
}
DrawObj& DrawObj::operator=(const DrawObj& rOther)
@@ -967,18 +967,18 @@ void DrawObj::SetShapeDetails(sal_uInt32 nId, sal_Int32
nThick)
bool WW8_WrPlcTextBoxes::WriteText( WW8Export& rWrt )
{
rWrt.m_bInWriteEscher = true;
- WW8_CP& rccp=TXT_TXTBOX == nTyp ? rWrt.pFib->ccpTxbx :
rWrt.pFib->ccpHdrTxbx;
+ WW8_CP& rccp=TXT_TXTBOX == nTyp ? rWrt.pFib->m_ccpTxbx :
rWrt.pFib->m_ccpHdrTxbx;
bool bRet = WriteGenericText( rWrt, nTyp, rccp );
WW8_CP nCP = rWrt.Fc2Cp( rWrt.Strm().Tell() );
WW8Fib& rFib = *rWrt.pFib;
- WW8_CP nMyOffset = rFib.ccpText + rFib.ccpFootnote + rFib.ccpHdr +
rFib.ccpAtn
- + rFib.ccpEdn;
+ WW8_CP nMyOffset = rFib.m_ccpText + rFib.m_ccpFootnote + rFib.m_ccpHdr +
rFib.m_ccpAtn
+ + rFib.m_ccpEdn;
if( TXT_TXTBOX == nTyp )
rWrt.m_pFieldTextBxs->Finish( nCP, nMyOffset );
else
- rWrt.m_pFieldHFTextBxs->Finish( nCP, nMyOffset + rFib.ccpTxbx );
+ rWrt.m_pFieldHFTextBxs->Finish( nCP, nMyOffset + rFib.m_ccpTxbx );
rWrt.m_bInWriteEscher = false;
return bRet;
}
@@ -1523,8 +1523,8 @@ void WW8Export::WriteEscher()
m_pEscher->WritePictures();
m_pEscher->FinishEscher();
- pFib->fcDggInfo = nStart;
- pFib->lcbDggInfo = pTableStrm->Tell() - nStart;
+ pFib->m_fcDggInfo = nStart;
+ pFib->m_lcbDggInfo = pTableStrm->Tell() - nStart;
delete m_pEscher;
m_pEscher = nullptr;
}
diff --git a/sw/source/filter/ww8/wrtw8num.cxx
b/sw/source/filter/ww8/wrtw8num.cxx
index ad10961..f8ad4ab 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -137,11 +137,11 @@ void WW8Export::WriteNumbering()
return; // no numbering is used
// list formats - LSTF
- pFib->fcPlcfLst = pTableStrm->Tell();
+ pFib->m_fcPlcfLst = pTableStrm->Tell();
SwWW8Writer::WriteShort( *pTableStrm, m_pUsedNumTable->size() );
NumberingDefinitions();
// set len to FIB
- pFib->lcbPlcfLst = pTableStrm->Tell() - pFib->fcPlcfLst;
+ pFib->m_lcbPlcfLst = pTableStrm->Tell() - pFib->m_fcPlcfLst;
// list formats - LVLF
AbstractNumberingDefinitions();
@@ -551,7 +551,7 @@ void WW8Export::OutOverrideListTab()
sal_uInt16 nCount = m_pUsedNumTable->size();
sal_uInt16 n;
- pFib->fcPlfLfo = pTableStrm->Tell();
+ pFib->m_fcPlfLfo = pTableStrm->Tell();
SwWW8Writer::WriteLong( *pTableStrm, nCount );
for( n = 0; n < nCount; ++n )
@@ -563,7 +563,7 @@ void WW8Export::OutOverrideListTab()
SwWW8Writer::WriteLong( *pTableStrm, -1 ); // no overwrite
// set len to FIB
- pFib->lcbPlfLfo = pTableStrm->Tell() - pFib->fcPlfLfo;
+ pFib->m_lcbPlfLfo = pTableStrm->Tell() - pFib->m_fcPlfLfo;
}
void WW8Export::OutListNamesTab()
@@ -574,7 +574,7 @@ void WW8Export::OutListNamesTab()
// write the "list format override" - LFO
sal_uInt16 nNms = 0, nCount = m_pUsedNumTable->size();
- pFib->fcSttbListNames = pTableStrm->Tell();
+ pFib->m_fcSttbListNames = pTableStrm->Tell();
SwWW8Writer::WriteShort( *pTableStrm, -1 );
SwWW8Writer::WriteLong( *pTableStrm, nCount );
@@ -590,9 +590,9 @@ void WW8Export::OutListNamesTab()
SwWW8Writer::WriteString16(*pTableStrm, sNm, false);
}
- SwWW8Writer::WriteLong( *pTableStrm, pFib->fcSttbListNames + 2, nNms );
+ SwWW8Writer::WriteLong( *pTableStrm, pFib->m_fcSttbListNames + 2, nNms );
// set len to FIB
- pFib->lcbSttbListNames = pTableStrm->Tell() - pFib->fcSttbListNames;
+ pFib->m_lcbSttbListNames = pTableStrm->Tell() - pFib->m_fcSttbListNames;
}
void MSWordExportBase::SubstituteBullet( OUString& rNumStr,
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index 291b20e..7479d3e 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -643,7 +643,7 @@ void WW8AttributeOutput::StartStyles()
m_rWW8Export.pTableStrm->WriteChar( (char)0 ); // Address
++nCurPos;
}
- rFib.fcStshfOrig = rFib.fcStshf = nCurPos;
+ rFib.m_fcStshfOrig = rFib.m_fcStshf = nCurPos;
m_nStyleCountPos = nCurPos + 2; // Anzahl wird nachgetragen
static sal_uInt8 aStShi[] = {
@@ -659,7 +659,7 @@ void WW8AttributeOutput::EndStyles( sal_uInt16
nNumberOfStyles )
{
WW8Fib& rFib = *m_rWW8Export.pFib;
- rFib.lcbStshfOrig = rFib.lcbStshf = m_rWW8Export.pTableStrm->Tell() -
rFib.fcStshf;
+ rFib.m_lcbStshfOrig = rFib.m_lcbStshf = m_rWW8Export.pTableStrm->Tell() -
rFib.m_fcStshf;
SwWW8Writer::WriteShort( *m_rWW8Export.pTableStrm, m_nStyleCountPos,
nNumberOfStyles );
}
@@ -902,7 +902,7 @@ std::vector< const wwFont* > wwFontHelper::AsVector() const
void wwFontHelper::WriteFontTable(SvStream *pTableStream, WW8Fib& rFib)
{
- rFib.fcSttbfffn = pTableStream->Tell();
+ rFib.m_fcSttbfffn = pTableStream->Tell();
/*
* Reserve some space to fill in the len after we know how big it is
*/
@@ -923,8 +923,8 @@ void wwFontHelper::WriteFontTable(SvStream *pTableStream,
WW8Fib& rFib)
/*
* Write the position and len in the FIB
*/
- rFib.lcbSttbfffn = pTableStream->Tell() - rFib.fcSttbfffn;
- SwWW8Writer::WriteLong( *pTableStream, rFib.fcSttbfffn, maFonts.size());
+ rFib.m_lcbSttbfffn = pTableStream->Tell() - rFib.m_fcSttbfffn;
+ SwWW8Writer::WriteLong( *pTableStream, rFib.m_fcSttbfffn, maFonts.size());
}
void wwFontHelper::WriteFontTable( DocxAttributeOutput& rAttrOutput )
@@ -1797,8 +1797,8 @@ bool WW8_WrPlcSepx::WriteKFText( WW8Export& rWrt )
rWrt.WriteStringAsPara( OUString() ); // CR ans Ende ( sonst mault
WW )
}
- rWrt.m_pFieldHdFt->Finish( nCpEnd, rWrt.pFib->ccpText +
rWrt.pFib->ccpFootnote );
- rWrt.pFib->ccpHdr = nCpEnd - nCpStart;
+ rWrt.m_pFieldHdFt->Finish( nCpEnd, rWrt.pFib->m_ccpText +
rWrt.pFib->m_ccpFootnote );
+ rWrt.pFib->m_ccpHdr = nCpEnd - nCpStart;
}
else
{
@@ -1806,7 +1806,7 @@ bool WW8_WrPlcSepx::WriteKFText( WW8Export& rWrt )
pTextPos = nullptr;
}
- return rWrt.pFib->ccpHdr != 0;
+ return rWrt.pFib->m_ccpHdr != 0;
}
void WW8_WrPlcSepx::WriteSepx( SvStream& rStrm ) const
@@ -1847,19 +1847,19 @@ void WW8_WrPlcSepx::WritePlcSed( WW8Export& rWrt ) const
UInt32ToSVBT32( rSectionAttribute->m_nSepxFcPos, aSed.fcSepx );
rWrt.pTableStrm->WriteBytes(&aSed, sizeof(aSed));
}
- rWrt.pFib->fcPlcfsed = nFcStart;
- rWrt.pFib->lcbPlcfsed = rWrt.pTableStrm->Tell() - nFcStart;
+ rWrt.pFib->m_fcPlcfsed = nFcStart;
+ rWrt.pFib->m_lcbPlcfsed = rWrt.pTableStrm->Tell() - nFcStart;
}
void WW8_WrPlcSepx::WritePlcHdd( WW8Export& rWrt ) const
{
// Don't write out the PlcfHdd if ccpHdd is 0: it's a validation failure
case.
- if( rWrt.pFib->ccpHdr != 0 && pTextPos && pTextPos->Count() )
+ if( rWrt.pFib->m_ccpHdr != 0 && pTextPos && pTextPos->Count() )
{
- rWrt.pFib->fcPlcfhdd = rWrt.pTableStrm->Tell();
+ rWrt.pFib->m_fcPlcfhdd = rWrt.pTableStrm->Tell();
pTextPos->Write( *rWrt.pTableStrm ); // Plc0
- rWrt.pFib->lcbPlcfhdd = rWrt.pTableStrm->Tell() -
- rWrt.pFib->fcPlcfhdd;
+ rWrt.pFib->m_lcbPlcfhdd = rWrt.pTableStrm->Tell() -
+ rWrt.pFib->m_fcPlcfhdd;
}
}
@@ -2209,20 +2209,20 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt,
sal_uInt8 nTTyp,
false);
}
- rFib.fcGrpStAtnOwners = nFcStart;
+ rFib.m_fcGrpStAtnOwners = nFcStart;
nFcStart = rWrt.pTableStrm->Tell();
- rFib.lcbGrpStAtnOwners = nFcStart - rFib.fcGrpStAtnOwners;
+ rFib.m_lcbGrpStAtnOwners = nFcStart - rFib.m_fcGrpStAtnOwners;
// Commented text ranges
if( aRangeStartPos.size() > 0 )
{
// Commented text ranges starting positions (Plcfbkf.aCP)
- rFib.fcPlcfAtnbkf = nFcStart;
+ rFib.m_fcPlcfAtnbkf = nFcStart;
for ( i = 0; i < aRangeStartPos.size(); ++i )
{
SwWW8Writer::WriteLong( *rWrt.pTableStrm,
aRangeStartPos[i].first );
}
- SwWW8Writer::WriteLong( *rWrt.pTableStrm, rFib.ccpText +
1);
+ SwWW8Writer::WriteLong( *rWrt.pTableStrm, rFib.m_ccpText +
1);
// Commented text ranges additional information
(Plcfbkf.aFBKF)
for ( i = 0; i < aRangeStartPos.size(); ++i )
@@ -2232,21 +2232,21 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt,
sal_uInt8 nTTyp,
}
nFcStart = rWrt.pTableStrm->Tell();
- rFib.lcbPlcfAtnbkf = nFcStart - rFib.fcPlcfAtnbkf;
+ rFib.m_lcbPlcfAtnbkf = nFcStart - rFib.m_fcPlcfAtnbkf;
// Commented text ranges ending positions (PlcfBkl.aCP)
- rFib.fcPlcfAtnbkl = nFcStart;
+ rFib.m_fcPlcfAtnbkl = nFcStart;
for ( i = 0; i < aRangeEndPos.size(); ++i )
{
SwWW8Writer::WriteLong( *rWrt.pTableStrm,
aRangeEndPos[i].first );
}
- SwWW8Writer::WriteLong( *rWrt.pTableStrm, rFib.ccpText +
1);
+ SwWW8Writer::WriteLong( *rWrt.pTableStrm, rFib.m_ccpText +
1);
nFcStart = rWrt.pTableStrm->Tell();
- rFib.lcbPlcfAtnbkl = nFcStart - rFib.fcPlcfAtnbkl;
+ rFib.m_lcbPlcfAtnbkl = nFcStart - rFib.m_fcPlcfAtnbkl;
// Commented text ranges as bookmarks (SttbfAtnBkmk)
- rFib.fcSttbfAtnbkmk = nFcStart;
+ rFib.m_fcSttbfAtnbkmk = nFcStart;
SwWW8Writer::WriteShort( *rWrt.pTableStrm,
(sal_Int16)(sal_uInt16)0xFFFF ); // SttbfAtnBkmk.fExtend
SwWW8Writer::WriteShort( *rWrt.pTableStrm,
aRangeStartPos.size() ); // SttbfAtnBkmk.cData
SwWW8Writer::WriteShort( *rWrt.pTableStrm, 0xA );
// SttbfAtnBkmk.cbExtra
@@ -2261,7 +2261,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt,
sal_uInt8 nTTyp,
}
nFcStart = rWrt.pTableStrm->Tell();
- rFib.lcbSttbfAtnbkmk = nFcStart - rFib.fcSttbfAtnbkmk;
+ rFib.m_lcbSttbfAtnbkmk = nFcStart - rFib.m_fcSttbfAtnbkmk;
}
// Write the extended >= Word XP ATRD records
@@ -2278,11 +2278,11 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt,
sal_uInt8 nTTyp,
SwWW8Writer::WriteLong( *rWrt.pTableStrm, 0 );
}
- rFib.fcAtrdExtra = nFcStart;
+ rFib.m_fcAtrdExtra = nFcStart;
nFcStart = rWrt.pTableStrm->Tell();
- rFib.lcbAtrdExtra = nFcStart - rFib.fcAtrdExtra;
- rFib.fcHplxsdr = 0x01010002; //WTF, but apparently necessary
- rFib.lcbHplxsdr = 0;
+ rFib.m_lcbAtrdExtra = nFcStart - rFib.m_fcAtrdExtra;
+ rFib.m_fcHplxsdr = 0x01010002; //WTF, but apparently necessary
+ rFib.m_lcbHplxsdr = 0;
}
break;
case TXT_TXTBOX:
@@ -2356,8 +2356,8 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt,
sal_uInt8 nTTyp,
// n+1-th CP-Pos according to the manual
SwWW8Writer::WriteLong( *rWrt.pTableStrm,
- rFib.ccpText + rFib.ccpFootnote + rFib.ccpHdr + rFib.ccpEdn +
- rFib.ccpTxbx + rFib.ccpHdrTxbx + 1 );
+ rFib.m_ccpText + rFib.m_ccpFootnote + rFib.m_ccpHdr +
rFib.m_ccpEdn +
+ rFib.m_ccpTxbx + rFib.m_ccpHdrTxbx + 1 );
if ( TXT_ATN == nTTyp )
{
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 24851a2..4d7229e 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -278,11 +278,11 @@ void WW8_WrtBookmarks::Write( WW8Export& rWrt)
}
aTempStrm2.Seek(0L);
- rWrt.WriteAsStringTable(aNames,
rWrt.pFib->fcSttbfbkmk,rWrt.pFib->lcbSttbfbkmk);
+ rWrt.WriteAsStringTable(aNames,
rWrt.pFib->m_fcSttbfbkmk,rWrt.pFib->m_lcbSttbfbkmk);
SvStream& rStrm = *rWrt.pTableStrm;
- rWrt.pFib->fcPlcfbkf = rStrm.Tell();
+ rWrt.pFib->m_fcPlcfbkf = rStrm.Tell();
rStrm.WriteStream( aTempStrm1 );
- SwWW8Writer::WriteLong(rStrm, rWrt.pFib->ccpText + rWrt.pFib->ccpTxbx);
+ SwWW8Writer::WriteLong(rStrm, rWrt.pFib->m_ccpText + rWrt.pFib->m_ccpTxbx);
for (aItr = aSttCps.begin();aItr!=aSttCps.end();++aItr)
{
if (aItr->second)
@@ -290,11 +290,11 @@ void WW8_WrtBookmarks::Write( WW8Export& rWrt)
SwWW8Writer::WriteLong(rStrm, aItr->second->first);
}
}
- rWrt.pFib->lcbPlcfbkf = rStrm.Tell() - rWrt.pFib->fcPlcfbkf;
- rWrt.pFib->fcPlcfbkl = rStrm.Tell();
+ rWrt.pFib->m_lcbPlcfbkf = rStrm.Tell() - rWrt.pFib->m_fcPlcfbkf;
+ rWrt.pFib->m_fcPlcfbkl = rStrm.Tell();
rStrm.WriteStream( aTempStrm2 );
- SwWW8Writer::WriteLong(rStrm, rWrt.pFib->ccpText + rWrt.pFib->ccpTxbx);
- rWrt.pFib->lcbPlcfbkl = rStrm.Tell() - rWrt.pFib->fcPlcfbkl;
+ SwWW8Writer::WriteLong(rStrm, rWrt.pFib->m_ccpText + rWrt.pFib->m_ccpTxbx);
+ rWrt.pFib->m_lcbPlcfbkl = rStrm.Tell() - rWrt.pFib->m_fcPlcfbkl;
}
void WW8_WrtBookmarks::MoveFieldMarks(WW8_CP nFrom, WW8_CP nTo)
@@ -362,7 +362,7 @@ void WW8_WrtFactoids::Write(WW8Export& rExport)
SvStream& rStream = *rExport.pTableStrm;
- rExport.pFib->fcSttbfBkmkFactoid = rStream.Tell();
+ rExport.pFib->m_fcSttbfBkmkFactoid = rStream.Tell();
// Write SttbfBkmkFactoid.
rStream.WriteUInt16(0xffff); // fExtend
rStream.WriteUInt16(m_aStartCPs.size()); // cData
@@ -377,12 +377,12 @@ void WW8_WrtFactoids::Write(WW8Export& rExport)
rStream.WriteUInt16(0); // fto
rStream.WriteUInt32(0); // pfpb
}
- rExport.pFib->lcbSttbfBkmkFactoid = rStream.Tell() -
rExport.pFib->fcSttbfBkmkFactoid;
+ rExport.pFib->m_lcbSttbfBkmkFactoid = rStream.Tell() -
rExport.pFib->m_fcSttbfBkmkFactoid;
- rExport.pFib->fcPlcfBkfFactoid = rStream.Tell();
+ rExport.pFib->m_fcPlcfBkfFactoid = rStream.Tell();
for (const WW8_CP& rCP : m_aStartCPs)
rStream.WriteInt32(rCP);
- rStream.WriteInt32(rExport.pFib->ccpText + rExport.pFib->ccpTxbx);
+ rStream.WriteInt32(rExport.pFib->m_ccpText + rExport.pFib->m_ccpTxbx);
// Write FBKFD.
for (size_t i = 0; i < m_aStartCPs.size(); ++i)
@@ -392,12 +392,12 @@ void WW8_WrtFactoids::Write(WW8Export& rExport)
rStream.WriteInt16(1); // cDepth, 1 as start and end is the same.
}
- rExport.pFib->lcbPlcfBkfFactoid = rStream.Tell() -
rExport.pFib->fcPlcfBkfFactoid;
+ rExport.pFib->m_lcbPlcfBkfFactoid = rStream.Tell() -
rExport.pFib->m_fcPlcfBkfFactoid;
- rExport.pFib->fcPlcfBklFactoid = rStream.Tell();
+ rExport.pFib->m_fcPlcfBklFactoid = rStream.Tell();
for (const WW8_CP& rCP : m_aEndCPs)
rStream.WriteInt32(rCP);
- rStream.WriteInt32(rExport.pFib->ccpText + rExport.pFib->ccpTxbx);
+ rStream.WriteInt32(rExport.pFib->m_ccpText + rExport.pFib->m_ccpTxbx);
// Write FBKLD.
for (size_t i = 0; i < m_aEndCPs.size(); ++i)
@@ -405,9 +405,9 @@ void WW8_WrtFactoids::Write(WW8Export& rExport)
rStream.WriteInt16(i); // ibkf
rStream.WriteInt16(0); // cDepth, 0 as does not overlap with any other
smart tag.
}
- rExport.pFib->lcbPlcfBklFactoid = rStream.Tell() -
rExport.pFib->fcPlcfBklFactoid;
+ rExport.pFib->m_lcbPlcfBklFactoid = rStream.Tell() -
rExport.pFib->m_fcPlcfBklFactoid;
- rExport.pFib->fcFactoidData = rStream.Tell();
+ rExport.pFib->m_fcFactoidData = rStream.Tell();
// Write SmartTagData.
MSOFactoidType aFactoidType;
aFactoidType.m_nId = 1;
@@ -442,7 +442,7 @@ void WW8_WrtFactoids::Write(WW8Export& rExport)
}
aSmartTagData.Write(rExport);
- rExport.pFib->lcbFactoidData = rStream.Tell() -
rExport.pFib->fcFactoidData;
+ rExport.pFib->m_lcbFactoidData = rStream.Tell() -
rExport.pFib->m_fcFactoidData;
}
#define ANZ_DEFAULT_STYLES 16
@@ -876,37 +876,37 @@ void WW8_WrPlcField::Write( WW8Export& rWrt )
switch (nTextTyp)
{
case TXT_MAINTEXT:
- pfc = &rWrt.pFib->fcPlcffldMom;
- plc = &rWrt.pFib->lcbPlcffldMom;
+ pfc = &rWrt.pFib->m_fcPlcffldMom;
+ plc = &rWrt.pFib->m_lcbPlcffldMom;
break;
case TXT_HDFT:
- pfc = &rWrt.pFib->fcPlcffldHdr;
- plc = &rWrt.pFib->lcbPlcffldHdr;
+ pfc = &rWrt.pFib->m_fcPlcffldHdr;
+ plc = &rWrt.pFib->m_lcbPlcffldHdr;
break;
case TXT_FTN:
- pfc = &rWrt.pFib->fcPlcffldFootnote;
- plc = &rWrt.pFib->lcbPlcffldFootnote;
+ pfc = &rWrt.pFib->m_fcPlcffldFootnote;
+ plc = &rWrt.pFib->m_lcbPlcffldFootnote;
break;
case TXT_EDN:
- pfc = &rWrt.pFib->fcPlcffldEdn;
- plc = &rWrt.pFib->lcbPlcffldEdn;
+ pfc = &rWrt.pFib->m_fcPlcffldEdn;
+ plc = &rWrt.pFib->m_lcbPlcffldEdn;
break;
case TXT_ATN:
- pfc = &rWrt.pFib->fcPlcffldAtn;
- plc = &rWrt.pFib->lcbPlcffldAtn;
+ pfc = &rWrt.pFib->m_fcPlcffldAtn;
+ plc = &rWrt.pFib->m_lcbPlcffldAtn;
break;
case TXT_TXTBOX:
- pfc = &rWrt.pFib->fcPlcffldTxbx;
- plc = &rWrt.pFib->lcbPlcffldTxbx;
+ pfc = &rWrt.pFib->m_fcPlcffldTxbx;
+ plc = &rWrt.pFib->m_lcbPlcffldTxbx;
break;
case TXT_HFTXTBOX:
- pfc = &rWrt.pFib->fcPlcffldHdrTxbx;
- plc = &rWrt.pFib->lcbPlcffldHdrTxbx;
+ pfc = &rWrt.pFib->m_fcPlcffldHdrTxbx;
+ plc = &rWrt.pFib->m_lcbPlcffldHdrTxbx;
break;
default:
@@ -929,8 +929,8 @@ void WW8_WrMagicTable::Write( WW8Export& rWrt )
return;
sal_uLong nFcStart = rWrt.pTableStrm->Tell();
WW8_WrPlc1::Write( *rWrt.pTableStrm );
- rWrt.pFib->fcPlcfTch = nFcStart;
- rWrt.pFib->lcbPlcfTch = rWrt.pTableStrm->Tell() - nFcStart;
+ rWrt.pFib->m_fcPlcfTch = nFcStart;
+ rWrt.pFib->m_lcbPlcfTch = rWrt.pTableStrm->Tell() - nFcStart;
}
void WW8_WrMagicTable::Append( WW8_CP nCp, sal_uLong nData)
@@ -1058,13 +1058,13 @@ void WW8_WrPlcPn::WriteFkps()
if( CHP == ePlc )
{
- rWrt.pFib->pnChpFirst = nFkpStartPage;
- rWrt.pFib->cpnBteChp = m_Fkps.size();
+ rWrt.pFib->m_pnChpFirst = nFkpStartPage;
+ rWrt.pFib->m_cpnBteChp = m_Fkps.size();
}
else
{
- rWrt.pFib->pnPapFirst = nFkpStartPage;
- rWrt.pFib->cpnBtePap = m_Fkps.size();
+ rWrt.pFib->m_pnPapFirst = nFkpStartPage;
+ rWrt.pFib->m_cpnBtePap = m_Fkps.size();
}
}
@@ -1090,13 +1090,13 @@ void WW8_WrPlcPn::WritePlc()
if( CHP == ePlc )
{
- rWrt.pFib->fcPlcfbteChpx = nFcStart;
- rWrt.pFib->lcbPlcfbteChpx = rWrt.pTableStrm->Tell() - nFcStart;
+ rWrt.pFib->m_fcPlcfbteChpx = nFcStart;
+ rWrt.pFib->m_lcbPlcfbteChpx = rWrt.pTableStrm->Tell() - nFcStart;
}
else
{
- rWrt.pFib->fcPlcfbtePapx = nFcStart;
- rWrt.pFib->lcbPlcfbtePapx = rWrt.pTableStrm->Tell() - nFcStart;
+ rWrt.pFib->m_fcPlcfbtePapx = nFcStart;
+ rWrt.pFib->m_lcbPlcfbtePapx = rWrt.pTableStrm->Tell() - nFcStart;
}
}
@@ -1397,7 +1397,7 @@ void WW8_WrPct::WritePc( WW8Export& rWrt )
}
// calculate the last Pos
- sal_uLong nStartCp = rWrt.pFib->fcMac - nOldFc;
+ sal_uLong nStartCp = rWrt.pFib->m_fcMac - nOldFc;
nStartCp >>= 1; // For Unicode: number of characters / 2
nStartCp += m_Pcts.back()->GetStartCp();
SwWW8Writer::WriteLong( *rWrt.pTableStrm, nStartCp );
@@ -1411,9 +1411,9 @@ void WW8_WrPct::WritePc( WW8Export& rWrt )
}
// entries in the FIB
- rWrt.pFib->fcClx = nPctStart;
+ rWrt.pFib->m_fcClx = nPctStart;
nEndPos = rWrt.pTableStrm->Tell();
- rWrt.pFib->lcbClx = nEndPos - nPctStart;
+ rWrt.pFib->m_lcbClx = nEndPos - nPctStart;
// and register the length as well
SwWW8Writer::WriteLong( *rWrt.pTableStrm, nOldPos,
@@ -1674,8 +1674,8 @@ void MSWordExportBase::AppendWordBookmark( const
OUString& rName )
void WW8_WrtRedlineAuthor::Write( Writer& rWrt )
{
WW8Export & rWW8Wrt = *(static_cast<SwWW8Writer&>(rWrt).m_pExport);
- rWW8Wrt.WriteAsStringTable(maAuthors, rWW8Wrt.pFib->fcSttbfRMark,
- rWW8Wrt.pFib->lcbSttbfRMark);
+ rWW8Wrt.WriteAsStringTable(maAuthors, rWW8Wrt.pFib->m_fcSttbfRMark,
+ rWW8Wrt.pFib->m_lcbSttbfRMark);
}
sal_uInt16 WW8Export::AddRedlineAuthor( sal_uInt16 nId )
@@ -2774,17 +2774,17 @@ void WW8Export::WriteMainText()
{
SAL_INFO( "sw.ww8.level2", "<WriteMainText>" );
- pFib->fcMin = Strm().Tell();
+ pFib->m_fcMin = Strm().Tell();
m_pCurPam->GetPoint()->nNode =
m_pDoc->GetNodes().GetEndOfContent().StartOfSectionNode()->GetIndex();
WriteText();
- if( 0 == Strm().Tell() - pFib->fcMin ) // no text ?
+ if( 0 == Strm().Tell() - pFib->m_fcMin ) // no text ?
WriteCR(); // then CR at the end ( otherwise WW will
complain )
- pFib->ccpText = Fc2Cp( Strm().Tell() );
- m_pFieldMain->Finish( pFib->ccpText, 0 );
+ pFib->m_ccpText = Fc2Cp( Strm().Tell() );
+ m_pFieldMain->Finish( pFib->m_ccpText, 0 );
// ccpText includes Footnote and KF-text
// therefore pFib->ccpText may get updated as well
@@ -2911,8 +2911,8 @@ void WW8Export::WriteFkpPlcUsw()
if ( pSttbfAssoc ) // #i106057#
{
std::vector<OUString> aStrings(pSttbfAssoc->getStrings());
- WriteAsStringTable(aStrings, pFib->fcSttbfAssoc,
- pFib->lcbSttbfAssoc);
+ WriteAsStringTable(aStrings, pFib->m_fcSttbfAssoc,
+ pFib->m_lcbSttbfAssoc);
}
Strm().Seek( 0 );
@@ -2923,9 +2923,9 @@ void WW8Export::WriteFkpPlcUsw()
if ( pFibData )
{
- pFib->fReadOnlyRecommended =
+ pFib->m_fReadOnlyRecommended =
pFibData->getReadOnlyRecommended();
- pFib->fWriteReservation =
+ pFib->m_fWriteReservation =
pFibData->getWriteReservation();
}
@@ -2936,7 +2936,7 @@ void WW8Export::StoreDoc1()
{
bool bNeedsFinalPara = false;
// Start of Text ( Mangel ueber )
- SwWW8Writer::FillUntil( Strm(), pFib->fcMin );
+ SwWW8Writer::FillUntil( Strm(), pFib->m_fcMin );
WriteMainText(); // main text
sal_uInt8 nSprmsLen;
@@ -2963,7 +2963,7 @@ void WW8Export::StoreDoc1()
pSepx->Finish( Fc2Cp( Strm().Tell() ));// Text + Footnote + HdFt als
Section-Ende
m_pMagicTable->Finish( Fc2Cp( Strm().Tell() ),0);
- pFib->fcMac = Strm().Tell(); // End of all texts
+ pFib->m_fcMac = Strm().Tell(); // End of all texts
WriteFkpPlcUsw(); // FKP, PLC, .....
}
@@ -3214,7 +3214,7 @@ void WW8Export::ExportDocument_Impl()
tools::SvRef<SotStorageStream> xTableStrm( xWwStrm ), xDataStrm( xWwStrm );
xWwStrm->SetBufferSize( 32768 );
- pFib->fWhichTableStm = true;
+ pFib->m_fWhichTableStm = true;
xTableStrm = GetWriter().GetStorage().OpenSotStream(OUString(SL::a1Table),
StreamMode::STD_WRITE );
xDataStrm = GetWriter().GetStorage().OpenSotStream(OUString(SL::aData),
@@ -3270,8 +3270,8 @@ void WW8Export::ExportDocument_Impl()
m_pBkmks = new WW8_WrtBookmarks; // Bookmarks
GetWriter().CreateBookmarkTable();
- m_pPapPlc = new WW8_WrPlcPn( *this, PAP, pFib->fcMin );
- m_pChpPlc = new WW8_WrPlcPn( *this, CHP, pFib->fcMin );
+ m_pPapPlc = new WW8_WrPlcPn( *this, PAP, pFib->m_fcMin );
+ m_pChpPlc = new WW8_WrPlcPn( *this, CHP, pFib->m_fcMin );
pO = new ww::bytes();
m_pStyles = new MSWordStyles( *this );
m_pFieldMain = new WW8_WrPlcField( 2, TXT_MAINTEXT );
@@ -3285,7 +3285,7 @@ void WW8Export::ExportDocument_Impl()
m_pMagicTable = new WW8_WrMagicTable;
m_pGrf = new SwWW8WrGrf( *this );
- m_pPiece = new WW8_WrPct( pFib->fcMin );
+ m_pPiece = new WW8_WrPct( pFib->m_fcMin );
pDop = new WW8Dop;
pDop->fRevMarking = bool( RedlineFlags::On & m_nOrigRedlineFlags );
@@ -3336,10 +3336,10 @@ void WW8Export::ExportDocument_Impl()
EncryptRC4(aCtx, GetWriter().Strm(), *pStrmTemp);
// Write Unencrypted Fib 68 bytes to the start of the workdocument
stream
- pFib->fEncrypted = true; // fEncrypted indicates the document is
encrypted.
- pFib->fObfuscated = false; // Must be 0 for RC4.
- pFib->nHash = 0x34; // encrypt header bytes count of table stream.
- pFib->nKey = 0; // lkey2 must be 0 for RC4.
+ pFib->m_fEncrypted = true; // fEncrypted indicates the document is
encrypted.
+ pFib->m_fObfuscated = false; // Must be 0 for RC4.
+ pFib->m_nHash = 0x34; // encrypt header bytes count of table stream.
+ pFib->m_nKey = 0; // lkey2 must be 0 for RC4.
pStrmTemp->Seek( 0 );
pFib->WriteHeader( *pStrmTemp );
@@ -3646,16 +3646,16 @@ bool WW8_WrPlcFootnoteEdn::WriteText( WW8Export& rWrt )
bool bRet = false;
if (TXT_FTN == nTyp)
{
- bRet = WriteGenericText( rWrt, TXT_FTN, rWrt.pFib->ccpFootnote );
+ bRet = WriteGenericText( rWrt, TXT_FTN, rWrt.pFib->m_ccpFootnote );
rWrt.m_pFieldFootnote->Finish( rWrt.Fc2Cp( rWrt.Strm().Tell() ),
- rWrt.pFib->ccpText );
+ rWrt.pFib->m_ccpText );
}
else
{
- bRet = WriteGenericText( rWrt, TXT_EDN, rWrt.pFib->ccpEdn );
+ bRet = WriteGenericText( rWrt, TXT_EDN, rWrt.pFib->m_ccpEdn );
rWrt.m_pFieldEdn->Finish( rWrt.Fc2Cp( rWrt.Strm().Tell() ),
- rWrt.pFib->ccpText + rWrt.pFib->ccpFootnote
- + rWrt.pFib->ccpHdr + rWrt.pFib->ccpAtn );
+ rWrt.pFib->m_ccpText + rWrt.pFib->m_ccpFootnote
+ + rWrt.pFib->m_ccpHdr + rWrt.pFib->m_ccpAtn );
}
return bRet;
}
@@ -3664,53 +3664,53 @@ void WW8_WrPlcFootnoteEdn::WritePlc( WW8Export& rWrt )
const
{
if( TXT_FTN == nTyp )
{
- WriteGenericPlc( rWrt, TXT_FTN, rWrt.pFib->fcPlcffndText,
- rWrt.pFib->lcbPlcffndText, rWrt.pFib->fcPlcffndRef,
- rWrt.pFib->lcbPlcffndRef );
+ WriteGenericPlc( rWrt, TXT_FTN, rWrt.pFib->m_fcPlcffndText,
+ rWrt.pFib->m_lcbPlcffndText, rWrt.pFib->m_fcPlcffndRef,
+ rWrt.pFib->m_lcbPlcffndRef );
}
else
{
- WriteGenericPlc( rWrt, TXT_EDN, rWrt.pFib->fcPlcfendText,
- rWrt.pFib->lcbPlcfendText, rWrt.pFib->fcPlcfendRef,
- rWrt.pFib->lcbPlcfendRef );
+ WriteGenericPlc( rWrt, TXT_EDN, rWrt.pFib->m_fcPlcfendText,
+ rWrt.pFib->m_lcbPlcfendText, rWrt.pFib->m_fcPlcfendRef,
+ rWrt.pFib->m_lcbPlcfendRef );
}
}
bool WW8_WrPlcAnnotations::WriteText( WW8Export& rWrt )
{
- bool bRet = WriteGenericText( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
+ bool bRet = WriteGenericText( rWrt, TXT_ATN, rWrt.pFib->m_ccpAtn );
rWrt.m_pFieldAtn->Finish( rWrt.Fc2Cp( rWrt.Strm().Tell() ),
- rWrt.pFib->ccpText + rWrt.pFib->ccpFootnote
- + rWrt.pFib->ccpHdr );
+ rWrt.pFib->m_ccpText + rWrt.pFib->m_ccpFootnote
+ + rWrt.pFib->m_ccpHdr );
return bRet;
}
void WW8_WrPlcAnnotations::WritePlc( WW8Export& rWrt ) const
{
- WriteGenericPlc( rWrt, TXT_ATN, rWrt.pFib->fcPlcfandText,
- rWrt.pFib->lcbPlcfandText, rWrt.pFib->fcPlcfandRef,
- rWrt.pFib->lcbPlcfandRef );
+ WriteGenericPlc( rWrt, TXT_ATN, rWrt.pFib->m_fcPlcfandText,
+ rWrt.pFib->m_lcbPlcfandText, rWrt.pFib->m_fcPlcfandRef,
+ rWrt.pFib->m_lcbPlcfandRef );
}
void WW8_WrPlcTextBoxes::WritePlc( WW8Export& rWrt ) const
{
if( TXT_TXTBOX == nTyp )
{
- WriteGenericPlc( rWrt, nTyp, rWrt.pFib->fcPlcftxbxBkd,
- rWrt.pFib->lcbPlcftxbxBkd, rWrt.pFib->fcPlcftxbxText,
- rWrt.pFib->lcbPlcftxbxText );
+ WriteGenericPlc( rWrt, nTyp, rWrt.pFib->m_fcPlcftxbxBkd,
+ rWrt.pFib->m_lcbPlcftxbxBkd, rWrt.pFib->m_fcPlcftxbxText,
+ rWrt.pFib->m_lcbPlcftxbxText );
}
else
{
- WriteGenericPlc( rWrt, nTyp, rWrt.pFib->fcPlcfHdrtxbxBkd,
- rWrt.pFib->lcbPlcfHdrtxbxBkd, rWrt.pFib->fcPlcfHdrtxbxText,
- rWrt.pFib->lcbPlcfHdrtxbxText );
+ WriteGenericPlc( rWrt, nTyp, rWrt.pFib->m_fcPlcfHdrtxbxBkd,
+ rWrt.pFib->m_lcbPlcfHdrtxbxBkd, rWrt.pFib->m_fcPlcfHdrtxbxText,
+ rWrt.pFib->m_lcbPlcfHdrtxbxText );
}
}
void WW8Export::RestoreMacroCmds()
{
- pFib->fcCmds = pTableStrm->Tell();
+ pFib->m_fcCmds = pTableStrm->Tell();
uno::Reference < embed::XStorage >
xSrcRoot(m_pDoc->GetDocShell()->GetStorage());
try
@@ -3722,13 +3722,13 @@ void WW8Export::RestoreMacroCmds()
if ( pStream && SVSTREAM_OK == pStream->GetError())
{
pStream->Seek(STREAM_SEEK_TO_END);
- pFib->lcbCmds = pStream->Tell();
+ pFib->m_lcbCmds = pStream->Tell();
pStream->Seek(0);
- sal_uInt8 *pBuffer = new sal_uInt8[pFib->lcbCmds];
- bool bReadOk = checkRead(*pStream, pBuffer, pFib->lcbCmds);
+ sal_uInt8 *pBuffer = new sal_uInt8[pFib->m_lcbCmds];
+ bool bReadOk = checkRead(*pStream, pBuffer, pFib->m_lcbCmds);
if (bReadOk)
- pTableStrm->WriteBytes(pBuffer, pFib->lcbCmds);
+ pTableStrm->WriteBytes(pBuffer, pFib->m_lcbCmds);
delete[] pBuffer;
}
@@ -3740,7 +3740,7 @@ void WW8Export::RestoreMacroCmds()
}
// set len to FIB
- pFib->lcbCmds = pTableStrm->Tell() - pFib->fcCmds;
+ pFib->m_lcbCmds = pTableStrm->Tell() - pFib->m_fcCmds;
}
void WW8SHDLong::Write( WW8Export& rExport )
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx
b/sw/source/filter/ww8/wrtww8gr.cxx
index e43e099..75ee64c 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -85,7 +85,7 @@ void WW8Export::OutputGrfNode( const SwGrfNode& /*rNode*/ )
if ( m_pParentFrame )
{
OutGrf( *m_pParentFrame );
- pFib->fHasPic = true;
+ pFib->m_fHasPic = true;
}
}
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 106c6c5..0f6b04d 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3351,7 +3351,7 @@ sal_uLong WW8Export::ReplaceCr( sal_uInt8 nChar )
SvStream& rStrm = Strm();
sal_uLong nRetPos = 0, nPos = rStrm.Tell();
//If there is at least two characters already output
- if (nPos - 2 >= sal_uLong(pFib->fcMin))
+ if (nPos - 2 >= sal_uLong(pFib->m_fcMin))
{
sal_uInt16 nUCode=0;
@@ -3361,7 +3361,7 @@ sal_uLong WW8Export::ReplaceCr( sal_uInt8 nChar )
if (nUCode == 0x0d) // CR ?
{
if ((nChar == 0x0c) &&
- (nPos - 4 >= sal_uLong(pFib->fcMin)))
+ (nPos - 4 >= sal_uLong(pFib->m_fcMin)))
{
rStrm.SeekRel(-4);
rStrm.ReadUInt16( nUCode );
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 1df65d0..35e0192 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -40,10 +40,10 @@ WW8Glossary::WW8Glossary(tools::SvRef<SotStorageStream>
&refStrm, sal_uInt8 nVer
refStrm->SetEndian(SvStreamEndian::LITTLE);
WW8Fib aWwFib(*refStrm, nVersion);
- if (aWwFib.nFibBack >= 0x6A) //Word97
+ if (aWwFib.m_nFibBack >= 0x6A) //Word97
{
xTableStream = pStg->OpenSotStream(OUString::createFromAscii(
- aWwFib.fWhichTableStm ? SL::a1Table : SL::a0Table),
StreamMode::STD_READ);
+ aWwFib.m_fWhichTableStm ? SL::a1Table : SL::a0Table),
StreamMode::STD_READ);
if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError())
{
@@ -197,10 +197,10 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool
bSaveRelFile )
std::vector<ww::bytes> aData;
rtl_TextEncoding eStructCharSet =
- WW8Fib::GetFIBCharset(pGlossary->chseTables, pGlossary->lid);
+ WW8Fib::GetFIBCharset(pGlossary->m_chseTables, pGlossary->m_lid);
- WW8ReadSTTBF(true, *xTableStream, pGlossary->fcSttbfglsy,
- pGlossary->lcbSttbfglsy, 0, eStructCharSet, aStrings, &aData );
+ WW8ReadSTTBF(true, *xTableStream, pGlossary->m_fcSttbfglsy,
+ pGlossary->m_lcbSttbfglsy, 0, eStructCharSet, aStrings, &aData );
rStrm->Seek(0);
@@ -222,7 +222,7 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool
bSaveRelFile )
aPamo.GetPoint()->nContent.Assign(aIdx.GetNode().GetContentNode(),
0);
std::unique_ptr<SwWW8ImplReader> xRdr(new SwWW8ImplReader(
- pGlossary->nVersion, xStg, &rStrm, *pD,
rBlocks.GetBaseURL(),
+ pGlossary->m_nVersion, xStg, &rStrm, *pD,
rBlocks.GetBaseURL(),
true, false, *aPamo.GetPoint()));
xRdr->LoadDoc(this);
bRet = MakeEntries(pD, rBlocks, bSaveRelFile, aStrings, aData);
@@ -239,10 +239,10 @@ sal_uInt32 WW8GlossaryFib::FindGlossaryFibOffset(SvStream
& /* rTableStrm */,
const WW8Fib &rFib)
{
sal_uInt32 nGlossaryFibOffset = 0;
- if ( rFib.fDot ) // it's a template
+ if ( rFib.m_fDot ) // it's a template
{
- if ( rFib.pnNext )
- nGlossaryFibOffset = ( rFib.pnNext * 512 );
+ if ( rFib.m_pnNext )
+ nGlossaryFibOffset = ( rFib.m_pnNext * 512 );
}
return nGlossaryFibOffset;
}
diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx
index 55ca91e..c0d03b2 100644
--- a/sw/source/filter/ww8/ww8glsy.hxx
+++ b/sw/source/filter/ww8/ww8glsy.hxx
@@ -38,7 +38,7 @@ public:
SvStream& rTableStrm, const WW8Fib &rFib) : WW8Fib(rStrm,
nWantedVersion,FindGlossaryFibOffset(rTableStrm,rStrm,rFib)) {}
// fGlsy will indicate whether this has AutoText or not
- bool IsGlossaryFib() { return fGlsy; }
+ bool IsGlossaryFib() { return m_fGlsy; }
private:
static sal_uInt32 FindGlossaryFibOffset(SvStream &rTableStrm,SvStream
&rStrm,
const WW8Fib &rFib);
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index e7358a4..b20d5e2 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2401,7 +2401,7 @@ bool SwWW8ImplReader::IsObjectLayoutInTableCell( const
sal_uInt32 nLayoutInTable
if ( m_bVer8 )
{
- const sal_uInt16 nWWVersion = m_pWwFib->nProduct & 0xE000;
+ const sal_uInt16 nWWVersion = m_pWwFib->m_nProduct & 0xE000;
switch ( nWWVersion )
{
case 0x0000: // version 8 aka Microsoft Word 97
diff --git a/sw/source/filter/ww8/ww8graf2.cxx
b/sw/source/filter/ww8/ww8graf2.cxx
index f979bf8..90e6021 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -272,7 +272,7 @@ bool SwWW8ImplReader::ReadGrafFile(OUString& rFileName,
Graphic*& rpGraphic,
if (!bOk || pSt->GetError() || !aWMF.GetActionSize())
return false;
- if (m_pWwFib->envr != 1) // !MAC as creator
+ if (m_pWwFib->m_envr != 1) // !MAC as creator
{
rpGraphic = new Graphic( aWMF );
return true;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 1d176f2..40b610f 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -531,7 +531,7 @@ Sttb::getStringAtIndex( sal_uInt32 index )
}
SwMSDffManager::SwMSDffManager( SwWW8ImplReader& rRdr, bool bSkipImages )
- : SvxMSDffManager(*rRdr.m_pTableStream, rRdr.GetBaseURL(),
rRdr.m_pWwFib->fcDggInfo,
+ : SvxMSDffManager(*rRdr.m_pTableStream, rRdr.GetBaseURL(),
rRdr.m_pWwFib->m_fcDggInfo,
rRdr.m_pDataStream, nullptr, 0, COL_WHITE, rRdr.m_pStrm, bSkipImages),
rReader(rRdr), pFallbackStream(nullptr)
{
@@ -1964,7 +1964,7 @@ void SwWW8ImplReader::ImportDop()
// COMPATIBILITY FLAGS END
// Import magic doptypography information, if its there
- if (m_pWwFib->nFib > 105)
+ if (m_pWwFib->m_nFib > 105)
ImportDopTypography(m_pWDop->doptypography);
// disable form design mode to be able to use imported controls directly
@@ -2209,7 +2209,7 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
if (sal_uInt8 * pExtended = m_pPlcxMan->GetExtendedAtrds()) // Word < 2002
has no date data for comments
{
sal_uLong nIndex = pSD->GetIdx() & 0xFFFF; // Index is (stupidly)
multiplexed for WW8PLCFx_SubDocs
- if (m_pWwFib->lcbAtrdExtra/18 > nIndex)
+ if (m_pWwFib->m_lcbAtrdExtra/18 > nIndex)
nDateTime =
SVBT32ToUInt32(*reinterpret_cast<SVBT32*>(pExtended+(nIndex*18)));
}
@@ -2295,7 +2295,7 @@ void SwWW8ImplReader::Read_HdFtText(WW8_CP nStart, WW8_CP
nLen, SwFrameFormat* p
bool SwWW8ImplReader::isValid_HdFt_CP(WW8_CP nHeaderCP) const
{
// Each CP of Plcfhdd MUST be less than FibRgLw97.ccpHdd
- return (nHeaderCP < m_pWwFib->ccpHdr && nHeaderCP >= 0);
+ return (nHeaderCP < m_pWwFib->m_ccpHdr && nHeaderCP >= 0);
}
bool SwWW8ImplReader::HasOwnHeaderFooter(sal_uInt8 nWhichItems, sal_uInt8
grpfIhdt,
@@ -2428,7 +2428,7 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const
SwPageDesc *pPrev,
bool wwSectionManager::SectionIsProtected(const wwSection &rSection) const
{
- return (mrReader.m_pWwFib->fReadOnlyRecommended &&
!rSection.IsNotProtected());
+ return (mrReader.m_pWwFib->m_fReadOnlyRecommended &&
!rSection.IsNotProtected());
}
void wwSectionManager::SetHdFt(wwSection &rSection, int nSect,
@@ -4670,9 +4670,9 @@ void wwExtraneousParas::delete_all_from_doc()
void SwWW8ImplReader::StoreMacroCmds()
{
- if (m_pWwFib->lcbCmds)
+ if (m_pWwFib->m_lcbCmds)
{
- m_pTableStream->Seek(m_pWwFib->fcCmds);
+ m_pTableStream->Seek(m_pWwFib->m_fcCmds);
uno::Reference < embed::XStorage > xRoot(m_pDocShell->GetStorage());
@@ -4685,10 +4685,10 @@ void SwWW8ImplReader::StoreMacroCmds()
xRoot->openStreamElement( SL::aMSMacroCmds,
embed::ElementModes::READWRITE );
std::unique_ptr<SvStream>
xOutStream(::utl::UcbStreamHelper::CreateStream(xStream));
- sal_uInt32 lcbCmds = std::min<sal_uInt32>(m_pWwFib->lcbCmds,
m_pTableStream->remainingSize());
+ sal_uInt32 lcbCmds = std::min<sal_uInt32>(m_pWwFib->m_lcbCmds,
m_pTableStream->remainingSize());
std::unique_ptr<sal_uInt8[]> xBuffer(new sal_uInt8[lcbCmds]);
- m_pWwFib->lcbCmds = m_pTableStream->ReadBytes(xBuffer.get(),
lcbCmds);
- xOutStream->WriteBytes(xBuffer.get(), m_pWwFib->lcbCmds);
+ m_pWwFib->m_lcbCmds = m_pTableStream->ReadBytes(xBuffer.get(),
lcbCmds);
+ xOutStream->WriteBytes(xBuffer.get(), m_pWwFib->m_lcbCmds);
}
catch (...)
{
@@ -4701,8 +4701,8 @@ void SwWW8ImplReader::ReadDocVars()
std::vector<OUString> aDocVarStrings;
std::vector<ww::bytes> aDocVarStringIds;
std::vector<OUString> aDocValueStrings;
- WW8ReadSTTBF(!m_bVer67, *m_pTableStream, m_pWwFib->fcStwUser,
- m_pWwFib->lcbStwUser, m_bVer67 ? 2 : 0, m_eStructCharSet,
+ WW8ReadSTTBF(!m_bVer67, *m_pTableStream, m_pWwFib->m_fcStwUser,
+ m_pWwFib->m_lcbStwUser, m_bVer67 ? 2 : 0, m_eStructCharSet,
aDocVarStrings, &aDocVarStringIds, &aDocValueStrings);
if (!m_bVer67) {
using namespace ::com::sun::star;
@@ -4746,7 +4746,7 @@ void SwWW8ImplReader::ReadDocInfo()
OSL_ENSURE(xDocProps.is(), "DocumentProperties is null");
if (xDocProps.is()) {
- if ( m_pWwFib->fDot )
+ if ( m_pWwFib->m_fDot )
{
OUString sTemplateURL;
SfxMedium* pMedium = m_pDocShell->GetMedium();
@@ -4759,11 +4759,11 @@ void SwWW8ImplReader::ReadDocInfo()
xDocProps->setTemplateURL( sTemplateURL );
}
}
- else if (m_pWwFib->lcbSttbfAssoc) // not a template, and has a
SttbfAssoc
+ else if (m_pWwFib->m_lcbSttbfAssoc) // not a template, and has a
SttbfAssoc
{
long nCur = m_pTableStream->Tell();
Sttb aSttb;
- m_pTableStream->Seek( m_pWwFib->fcSttbfAssoc ); // point at
tgc record
+ m_pTableStream->Seek( m_pWwFib->m_fcSttbfAssoc ); // point at
tgc record
if (!aSttb.Read( *m_pTableStream ) )
OSL_TRACE("** Read of SttbAssoc data failed!!!! ");
m_pTableStream->Seek( nCur ); // return to previous position,
is that necessary?
@@ -4833,13 +4833,13 @@ WW8Customizations::WW8Customizations( SvStream*
pTableStream, WW8Fib& rFib ) : m
void WW8Customizations::Import( SwDocShell* pShell )
{
- if ( mWw8Fib.lcbCmds == 0 || !IsEightPlus(mWw8Fib.GetFIBVersion()) )
+ if ( mWw8Fib.m_lcbCmds == 0 || !IsEightPlus(mWw8Fib.GetFIBVersion()) )
return;
try
{
Tcg aTCG;
long nCur = mpTableStream->Tell();
- mpTableStream->Seek( mWw8Fib.fcCmds ); // point at tgc record
+ mpTableStream->Seek( mWw8Fib.m_fcCmds ); // point at tgc record
bool bReadResult = aTCG.Read( *mpTableStream );
mpTableStream->Seek( nCur ); // return to previous position, is that
necessary?
if ( !bReadResult )
@@ -4897,7 +4897,7 @@ void SwWW8ImplReader::ReadGlobalTemplateSettings( const
OUString& sCreatedFrom,
tools::SvRef<SotStorageStream> refMainStream = rRoot->OpenSotStream(
"WordDocument");
refMainStream->SetEndian(SvStreamEndian::LITTLE);
WW8Fib aWwFib( *refMainStream, 8 );
- tools::SvRef<SotStorageStream> xTableStream =
rRoot->OpenSotStream(OUString::createFromAscii( aWwFib.fWhichTableStm ?
SL::a1Table : SL::a0Table), StreamMode::STD_READ);
+ tools::SvRef<SotStorageStream> xTableStream =
rRoot->OpenSotStream(OUString::createFromAscii( aWwFib.m_fWhichTableStm ?
SL::a1Table : SL::a0Table), StreamMode::STD_READ);
if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError())
{
@@ -4934,12 +4934,12 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
::ww8::WW8FibData * pFibData = new ::ww8::WW8FibData();
- if (m_pWwFib->fReadOnlyRecommended)
+ if (m_pWwFib->m_fReadOnlyRecommended)
pFibData->setReadOnlyRecommended(true);
else
pFibData->setReadOnlyRecommended(false);
- if (m_pWwFib->fWriteReservation)
+ if (m_pWwFib->m_fWriteReservation)
pFibData->setWriteReservation(true);
else
pFibData->setWriteReservation(false);
@@ -4949,11 +4949,11 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
m_rDoc.getIDocumentExternalData().setExternalData(::sw::tExternalDataType::FIB,
pExternalFibData);
::sw::tExternalDataPointer pSttbfAsoc
- (new ::ww8::WW8Sttb<ww8::WW8Struct>(*m_pTableStream,
m_pWwFib->fcSttbfAssoc, m_pWwFib->lcbSttbfAssoc));
+ (new ::ww8::WW8Sttb<ww8::WW8Struct>(*m_pTableStream,
m_pWwFib->m_fcSttbfAssoc, m_pWwFib->m_lcbSttbfAssoc));
m_rDoc.getIDocumentExternalData().setExternalData(::sw::tExternalDataType::STTBF_ASSOC,
pSttbfAsoc);
- if (m_pWwFib->fWriteReservation || m_pWwFib->fReadOnlyRecommended)
+ if (m_pWwFib->m_fWriteReservation || m_pWwFib->m_fReadOnlyRecommended)
{
SwDocShell * pDocShell = m_rDoc.GetDocShell();
if (pDocShell)
@@ -4985,15 +4985,15 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
m_pSprmParser = new wwSprmParser(m_pWwFib->GetFIBVersion());
// Set handy helper variables
- m_bVer6 = (6 == m_pWwFib->nVersion);
- m_bVer7 = (7 == m_pWwFib->nVersion);
+ m_bVer6 = (6 == m_pWwFib->m_nVersion);
+ m_bVer7 = (7 == m_pWwFib->m_nVersion);
m_bVer67 = m_bVer6 || m_bVer7;
- m_bVer8 = (8 == m_pWwFib->nVersion);
+ m_bVer8 = (8 == m_pWwFib->m_nVersion);
- m_eTextCharSet = WW8Fib::GetFIBCharset(m_pWwFib->chse, m_pWwFib->lid);
- m_eStructCharSet = WW8Fib::GetFIBCharset(m_pWwFib->chseTables,
m_pWwFib->lid);
+ m_eTextCharSet = WW8Fib::GetFIBCharset(m_pWwFib->m_chse, m_pWwFib->m_lid);
+ m_eStructCharSet = WW8Fib::GetFIBCharset(m_pWwFib->m_chseTables,
m_pWwFib->m_lid);
- m_bWWBugNormal = m_pWwFib->nProduct == 0xc03d;
+ m_bWWBugNormal = m_pWwFib->m_nProduct == 0xc03d;
if (!m_bNewDoc)
aSttNdIdx = m_pPaM->GetPoint()->nNode;
@@ -5004,8 +5004,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
m_pFonts = new WW8Fonts( *m_pTableStream, *m_pWwFib );
// Document Properties
- m_pWDop = new WW8Dop( *m_pTableStream, m_pWwFib->nFib, m_pWwFib->fcDop,
- m_pWwFib->lcbDop );
+ m_pWDop = new WW8Dop( *m_pTableStream, m_pWwFib->m_nFib, m_pWwFib->m_fcDop,
+ m_pWwFib->m_lcbDop );
if (m_bNewDoc)
ImportDop();
@@ -5013,19 +5013,19 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
/*
Import revisioning data: author names
*/
- if( m_pWwFib->lcbSttbfRMark )
+ if( m_pWwFib->m_lcbSttbfRMark )
{
ReadRevMarkAuthorStrTabl( *m_pTableStream,
- m_pWwFib->fcSttbfRMark,
- m_pWwFib->lcbSttbfRMark, m_rDoc );
+ m_pWwFib->m_fcSttbfRMark,
+ m_pWwFib->m_lcbSttbfRMark, m_rDoc );
}
// Initialize our String/ID map for Linked Sections
std::vector<OUString> aLinkStrings;
std::vector<ww::bytes> aStringIds;
- WW8ReadSTTBF(!m_bVer67, *m_pTableStream, m_pWwFib->fcSttbFnm,
- m_pWwFib->lcbSttbFnm, m_bVer67 ? 2 : 0, m_eStructCharSet,
+ WW8ReadSTTBF(!m_bVer67, *m_pTableStream, m_pWwFib->m_fcSttbFnm,
+ m_pWwFib->m_lcbSttbFnm, m_bVer67 ? 2 : 0, m_eStructCharSet,
aLinkStrings, &aStringIds);
for (size_t i=0; i < aLinkStrings.size() && i < aStringIds.size(); ++i)
@@ -5103,7 +5103,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
m_rDoc.SetEndNoteInfo( aInfo );
}
- if( m_pWwFib->lcbPlcfhdd )
+ if( m_pWwFib->m_lcbPlcfhdd )
m_pHdFt = new WW8PLCF_HdFt( m_pTableStream, *m_pWwFib, *m_pWDop );
if (!m_bNewDoc)
@@ -5136,7 +5136,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
// loop for each glossary entry and add dummy section node
if (pGloss)
{
- WW8PLCF aPlc(*m_pTableStream, m_pWwFib->fcPlcfglsy,
m_pWwFib->lcbPlcfglsy, 0);
+ WW8PLCF aPlc(*m_pTableStream, m_pWwFib->m_fcPlcfglsy,
m_pWwFib->m_lcbPlcfglsy, 0);
WW8_CP nStart, nEnd;
void* pDummy;
@@ -5160,7 +5160,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
{
if (m_bNewDoc && m_pStg && !pGloss) /*meaningless for a glossary */
{
- m_pDocShell->SetIsTemplate( m_pWwFib->fDot ); // point at tgc
record
+ m_pDocShell->SetIsTemplate( m_pWwFib->m_fDot ); // point at tgc
record
uno::Reference<document::XDocumentPropertiesSupplier> const
xDocPropSupp(m_pDocShell->GetModel(), uno::UNO_QUERY_THROW);
uno::Reference< document::XDocumentProperties > xDocProps(
xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
@@ -5209,7 +5209,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
StoreMacroCmds();
}
m_bOnLoadingMain = true;
- ReadText(0, m_pWwFib->ccpText, MAN_MAINTEXT);
+ ReadText(0, m_pWwFib->m_ccpText, MAN_MAINTEXT);
m_bOnLoadingMain = false;
}
@@ -5421,7 +5421,7 @@ sal_uLong
SwWW8ImplReader::SetSubStreams(tools::SvRef<SotStorageStream> &rTableS
{
sal_uLong nErrRet = 0;
// 6 stands for "6 OR 7", 7 stands for "ONLY 7"
- switch (m_pWwFib->nVersion)
+ switch (m_pWwFib->m_nVersion)
{
case 6:
case 7:
@@ -5437,7 +5437,7 @@ sal_uLong
SwWW8ImplReader::SetSubStreams(tools::SvRef<SotStorageStream> &rTableS
}
rTableStream = m_pStg->OpenSotStream( OUString::createFromAscii(
- m_pWwFib->fWhichTableStm ? SL::a1Table : SL::a0Table),
+ m_pWwFib->m_fWhichTableStm ? SL::a1Table : SL::a0Table),
StreamMode::STD_READ);
m_pTableStream = &rTableStream;
@@ -5562,7 +5562,7 @@ namespace
OUString sUniPassword = QueryPasswordForMedium( rMedium );
OString sPassword(OUStringToOString(sUniPassword,
- WW8Fib::GetFIBCharset(pWwFib->chseTables, pWwFib->lid)));
+ WW8Fib::GetFIBCharset(pWwFib->m_chseTables, pWwFib->m_lid)));
sal_Int32 nLen = sPassword.getLength();
if( nLen <= 15 )
@@ -5645,7 +5645,7 @@ sal_uLong
SwWW8ImplReader::LoadThroughDecryption(WW8Glossary *pGloss)
else
m_pWwFib = new WW8Fib(*m_pStrm, m_nWantedVersion);
- if (m_pWwFib->nFibError)
+ if (m_pWwFib->m_nFibError)
nErrRet = ERR_SWG_READ_ERROR;
tools::SvRef<SotStorageStream> xTableStream, xDataStream;
@@ -5662,16 +5662,16 @@ sal_uLong
SwWW8ImplReader::LoadThroughDecryption(WW8Glossary *pGloss)
bool bDecrypt = false;
enum {RC4, XOR, Other} eAlgo = Other;
- if (m_pWwFib->fEncrypted && !nErrRet)
+ if (m_pWwFib->m_fEncrypted && !nErrRet)
{
if (!pGloss)
{
bDecrypt = true;
- if (8 != m_pWwFib->nVersion)
+ if (8 != m_pWwFib->m_nVersion)
eAlgo = XOR;
else
{
- if (m_pWwFib->nKey != 0)
+ if (m_pWwFib->m_nKey != 0)
eAlgo = XOR;
else
{
@@ -5703,14 +5703,14 @@ sal_uLong
SwWW8ImplReader::LoadThroughDecryption(WW8Glossary *pGloss)
uno::Sequence< beans::NamedValue > aEncryptionData =
InitXorWord95Codec( aCtx, *pMedium, m_pWwFib );
// if initialization has failed the EncryptionData should
be empty
- if ( aEncryptionData.getLength() && aCtx.VerifyKey(
m_pWwFib->nKey, m_pWwFib->nHash ) )
+ if ( aEncryptionData.getLength() && aCtx.VerifyKey(
m_pWwFib->m_nKey, m_pWwFib->m_nHash ) )
{
nErrRet = 0;
pTempMain = MakeTemp(aDecryptMain);
m_pStrm->Seek(0);
size_t nUnencryptedHdr =
- (8 == m_pWwFib->nVersion) ? 0x44 : 0x34;
+ (8 == m_pWwFib->m_nVersion) ? 0x44 : 0x34;
sal_uInt8 *pIn = new sal_uInt8[nUnencryptedHdr];
nUnencryptedHdr = m_pStrm->ReadBytes(pIn,
nUnencryptedHdr);
aDecryptMain.WriteBytes(pIn, nUnencryptedHdr);
@@ -5801,7 +5801,7 @@ sal_uLong
SwWW8ImplReader::LoadThroughDecryption(WW8Glossary *pGloss)
delete m_pWwFib;
m_pWwFib = new WW8Fib(*m_pStrm, m_nWantedVersion);
- if (m_pWwFib->nFibError)
+ if (m_pWwFib->m_nFibError)
nErrRet = ERR_SWG_READ_ERROR;
}
}
@@ -5968,16 +5968,16 @@ void SwWW8ImplReader::SetOutlineStyles()
const OUString* SwWW8ImplReader::GetAnnotationAuthor(sal_uInt16 nIdx)
{
- if (!m_pAtnNames && m_pWwFib->lcbGrpStAtnOwners)
+ if (!m_pAtnNames && m_pWwFib->m_lcbGrpStAtnOwners)
{
// Determine authors: can be found in the TableStream
m_pAtnNames = new std::vector<OUString>;
SvStream& rStrm = *m_pTableStream;
long nOldPos = rStrm.Tell();
- rStrm.Seek( m_pWwFib->fcGrpStAtnOwners );
+ rStrm.Seek( m_pWwFib->m_fcGrpStAtnOwners );
- long nRead = 0, nCount = m_pWwFib->lcbGrpStAtnOwners;
+ long nRead = 0, nCount = m_pWwFib->m_lcbGrpStAtnOwners;
while (nRead < nCount)
{
if( m_bVer67 )
@@ -6004,10 +6004,10 @@ const OUString*
SwWW8ImplReader::GetAnnotationAuthor(sal_uInt16 nIdx)
void SwWW8ImplReader::GetSmartTagInfo(SwFltRDFMark& rMark)
{
- if (!m_pSmartTagData && m_pWwFib->lcbFactoidData)
+ if (!m_pSmartTagData && m_pWwFib->m_lcbFactoidData)
{
m_pSmartTagData.reset(new WW8SmartTagData());
- m_pSmartTagData->Read(*m_pTableStream, m_pWwFib->fcFactoidData,
m_pWwFib->lcbFactoidData);
+ m_pSmartTagData->Read(*m_pTableStream, m_pWwFib->m_fcFactoidData,
m_pWwFib->m_lcbFactoidData);
}
// Check if the handle is a valid smart tag bookmark index.
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index b21feb2..a658485 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -4279,7 +4279,7 @@ void WW8RStyle::ImportOldFormatStyles()
}
rtl_TextEncoding eStructChrSet = WW8Fib::GetFIBCharset(
- pIo->m_pWwFib->chseTables, pIo->m_pWwFib->lid);
+ pIo->m_pWwFib->m_chseTables, pIo->m_pWwFib->m_lid);
sal_uInt16 cstcStd(0);
rSt.ReadUInt16( cstcStd );
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 782ae88..33cf02b 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1144,10 +1144,10 @@ WW8ListManager::WW8ListManager(SvStream& rSt_,
SwWW8ImplReader& rReader_)
{
// LST und LFO gibts erst ab WW8
- if( ( 8 > rFib.nVersion )
- || ( rFib.fcPlcfLst == rFib.fcPlfLfo )
- || ( rFib.lcbPlcfLst < 2 )
- || ( rFib.lcbPlfLfo < 2) ) return; // offensichtlich keine Listen
da
+ if( ( 8 > rFib.m_nVersion )
+ || ( rFib.m_fcPlcfLst == rFib.m_fcPlfLfo )
+ || ( rFib.m_lcbPlcfLst < 2 )
+ || ( rFib.m_lcbPlfLfo < 2) ) return; // offensichtlich keine
Listen da
// Arrays anlegen
bool bLVLOk = true;
@@ -1156,12 +1156,12 @@ WW8ListManager::WW8ListManager(SvStream& rSt_,
SwWW8ImplReader& rReader_)
// 1. PLCF LST auslesen und die Listen Vorlagen im Writer anlegen
- bool bOk = checkSeek(rSt, rFib.fcPlcfLst);
+ bool bOk = checkSeek(rSt, rFib.m_fcPlcfLst);
if (!bOk)
return;
- sal_uInt32 nRemainingPlcfLst = rFib.lcbPlcfLst;
+ sal_uInt32 nRemainingPlcfLst = rFib.m_lcbPlcfLst;
sal_uInt16 nListCount(0);
rSt.ReadUInt16( nListCount );
@@ -1278,7 +1278,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_,
SwWW8ImplReader& rReader_)
// 2. PLF LFO auslesen und speichern
- bOk = checkSeek(rSt, rFib.fcPlfLfo);
+ bOk = checkSeek(rSt, rFib.m_fcPlfLfo);
if (!bOk)
return;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index aef81a9..0466c6e 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -484,7 +484,7 @@ short SwWW8ImplReader::GetTimeDatePara(OUString& rStr,
sal_uInt32& rFormat,
sal_uLong nFormatIdx =
sw::ms::MSDateTimeFormatToSwFormat(sParams, pFormatter, rLang, bHijri,
- GetFib().lid);
+ GetFib().m_lid);
short nNumFormatType = css::util::NumberFormat::UNDEFINED;
if (nFormatIdx)
nNumFormatType = pFormatter->GetType(nFormatIdx);
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 3492daa..92dc55b 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -841,7 +841,7 @@ void wwSectionManager::CreateSep(const long nTextPos, bool
/*bMustHaveBreak*/)
aLastSection = maSegments.back();
//Here
- sal_uInt16 nLIdx = ( ( mrReader.m_pWwFib->lid & 0xff ) == 0x9 ) ? 1 : 0;
+ sal_uInt16 nLIdx = ( ( mrReader.m_pWwFib->m_lid & 0xff ) == 0x9 ) ? 1 : 0;
//BEGIN read section values
wwSection aNewSection(*mrReader.m_pPaM->GetPoint());
@@ -1620,7 +1620,7 @@ void WW8FlyPara::ReadFull(sal_uInt8 nOrigSp29,
SwWW8ImplReader* pIo)
do{ // block for quick exit
if( nSp45 != 0 /* || nSp28 != 0 */ )
break; // bGrafApo only automatic for height
- if( pIo->m_pWwFib->fComplex )
+ if( pIo->m_pWwFib->m_fComplex )
break; // (*pPap)++ does not work for FastSave
// -> for FastSave, no test for
graphics APO
SvStream* pIoStrm = pIo->m_pStrm;
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 845bc77..eb7cff6 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1362,10 +1362,10 @@ WW8_CP WW8ScannerBase::WW8Fc2Cp( WW8_FC nFcPos ) const
return nFallBackCpEnd;
bool bIsUnicode;
- if (pWw8Fib->nVersion >= 8)
+ if (pWw8Fib->m_nVersion >= 8)
bIsUnicode = false;
else
- bIsUnicode = pWw8Fib->fExtChar;
+ bIsUnicode = pWw8Fib->m_fExtChar;
if( pPieceIter ) // Complex File ?
{
@@ -1382,14 +1382,14 @@ WW8_CP WW8ScannerBase::WW8Fc2Cp( WW8_FC nFcPos ) const
break;
}
sal_Int32 nFcStart = SVBT32ToUInt32(
static_cast<WW8_PCD*>(pData)->fc );
- if (pWw8Fib->nVersion >= 8)
+ if (pWw8Fib->m_nVersion >= 8)
{
nFcStart = WW8PLCFx_PCD::TransformPieceAddress( nFcStart,
bIsUnicode );
}
else
{
- bIsUnicode = pWw8Fib->fExtChar;
+ bIsUnicode = pWw8Fib->m_fExtChar;
}
sal_Int32 nLen = (nCpEnd - nCpStart) * (bIsUnicode ? 2 : 1);
@@ -1427,9 +1427,9 @@ WW8_CP WW8ScannerBase::WW8Fc2Cp( WW8_FC nFcPos ) const
// No complex file
if (!bIsUnicode)
- nFallBackCpEnd = (nFcPos - pWw8Fib->fcMin);
+ nFallBackCpEnd = (nFcPos - pWw8Fib->m_fcMin);
else
- nFallBackCpEnd = (nFcPos - pWw8Fib->fcMin + 1) / 2;
+ nFallBackCpEnd = (nFcPos - pWw8Fib->m_fcMin + 1) / 2;
return nFallBackCpEnd;
}
@@ -1446,10 +1446,10 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool*
pIsUnicode,
if( !pIsUnicode )
pIsUnicode = &bIsUnicode;
- if (pWw8Fib->nVersion >= 8)
+ if (pWw8Fib->m_nVersion >= 8)
*pIsUnicode = false;
else
- *pIsUnicode = pWw8Fib->fExtChar;
+ *pIsUnicode = pWw8Fib->m_fExtChar;
if( pPieceIter )
{
@@ -1481,10 +1481,10 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool*
pIsUnicode,
*pNextPieceCp = nCpEnd;
WW8_FC nRet = SVBT32ToUInt32( static_cast<WW8_PCD*>(pData)->fc );
- if (pWw8Fib->nVersion >= 8)
+ if (pWw8Fib->m_nVersion >= 8)
nRet = WW8PLCFx_PCD::TransformPieceAddress( nRet, *pIsUnicode );
else
- *pIsUnicode = pWw8Fib->fExtChar;
+ *pIsUnicode = pWw8Fib->m_fExtChar;
nRet += (nCpPos - nCpStart) * (*pIsUnicode ? 2 : 1);
@@ -1492,21 +1492,21 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool*
pIsUnicode,
}
// No complex file
- return pWw8Fib->fcMin + nCpPos * (*pIsUnicode ? 2 : 1);
+ return pWw8Fib->m_fcMin + nCpPos * (*pIsUnicode ? 2 : 1);
}
// class WW8ScannerBase
WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF
)
{
- if ( ((8 > pWw8Fib->nVersion) && !pWwF->fComplex) || !pWwF->lcbClx )
+ if ( ((8 > pWw8Fib->m_nVersion) && !pWwF->m_fComplex) || !pWwF->m_lcbClx )
return nullptr;
- WW8_FC nClxPos = pWwF->fcClx;
+ WW8_FC nClxPos = pWwF->m_fcClx;
if (!checkSeek(*pStr, nClxPos))
return nullptr;
- sal_Int32 nClxLen = pWwF->lcbClx;
+ sal_Int32 nClxLen = pWwF->m_lcbClx;
sal_Int32 nLeft = nClxLen;
while (true)
@@ -1590,16 +1590,16 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt,
SvStream* pTableSt,
// Footnotes
pFootnotePLCF = new WW8PLCFx_SubDoc( pTableSt, pWwFib->GetFIBVersion(), 0,
- pWwFib->fcPlcffndRef, pWwFib->lcbPlcffndRef, pWwFib->fcPlcffndText,
- pWwFib->lcbPlcffndText, 2 );
+ pWwFib->m_fcPlcffndRef, pWwFib->m_lcbPlcffndRef,
pWwFib->m_fcPlcffndText,
+ pWwFib->m_lcbPlcffndText, 2 );
// Endnotes
pEdnPLCF = new WW8PLCFx_SubDoc( pTableSt, pWwFib->GetFIBVersion(), 0,
- pWwFib->fcPlcfendRef, pWwFib->lcbPlcfendRef, pWwFib->fcPlcfendText,
- pWwFib->lcbPlcfendText, 2 );
+ pWwFib->m_fcPlcfendRef, pWwFib->m_lcbPlcfendRef,
pWwFib->m_fcPlcfendText,
+ pWwFib->m_lcbPlcfendText, 2 );
// Comments
pAndPLCF = new WW8PLCFx_SubDoc( pTableSt, pWwFib->GetFIBVersion(), 0,
- pWwFib->fcPlcfandRef, pWwFib->lcbPlcfandRef, pWwFib->fcPlcfandText,
- pWwFib->lcbPlcfandText, IsSevenMinus(pWwFib->GetFIBVersion()) ? 20 :
30);
+ pWwFib->m_fcPlcfandRef, pWwFib->m_lcbPlcfandRef,
pWwFib->m_fcPlcfandText,
+ pWwFib->m_lcbPlcfandText, IsSevenMinus(pWwFib->GetFIBVersion()) ? 20 :
30);
// Fields Main Text
pFieldPLCF = new WW8PLCFx_FLD(pTableSt, *pWwFib, MAN_MAINTEXT);
@@ -1617,67 +1617,67 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt,
SvStream* pTableSt,
pFieldTxbxHdFtPLCF = new WW8PLCFx_FLD(pTableSt,*pWwFib,MAN_TXBX_HDFT);
// Note: 6 stands for "6 OR 7", 7 stands for "ONLY 7"
- switch( pWw8Fib->nVersion )
+ switch( pWw8Fib->m_nVersion )
{
case 6:
case 7:
- if( pWwFib->fcPlcfdoaMom && pWwFib->lcbPlcfdoaMom )
+ if( pWwFib->m_fcPlcfdoaMom && pWwFib->m_lcbPlcfdoaMom )
{
- pMainFdoa = new WW8PLCFspecial( pTableSt, pWwFib->fcPlcfdoaMom,
- pWwFib->lcbPlcfdoaMom, 6 );
+ pMainFdoa = new WW8PLCFspecial( pTableSt,
pWwFib->m_fcPlcfdoaMom,
+ pWwFib->m_lcbPlcfdoaMom, 6 );
}
- if( pWwFib->fcPlcfdoaHdr && pWwFib->lcbPlcfdoaHdr )
+ if( pWwFib->m_fcPlcfdoaHdr && pWwFib->m_lcbPlcfdoaHdr )
{
- pHdFtFdoa = new WW8PLCFspecial( pTableSt, pWwFib->fcPlcfdoaHdr,
- pWwFib->lcbPlcfdoaHdr, 6 );
+ pHdFtFdoa = new WW8PLCFspecial( pTableSt,
pWwFib->m_fcPlcfdoaHdr,
+ pWwFib->m_lcbPlcfdoaHdr, 6 );
}
break;
case 8:
- if( pWwFib->fcPlcfspaMom && pWwFib->lcbPlcfspaMom )
+ if( pWwFib->m_fcPlcfspaMom && pWwFib->m_lcbPlcfspaMom )
{
- pMainFdoa = new WW8PLCFspecial( pTableSt, pWwFib->fcPlcfspaMom,
- pWwFib->lcbPlcfspaMom, 26 );
+ pMainFdoa = new WW8PLCFspecial( pTableSt,
pWwFib->m_fcPlcfspaMom,
+ pWwFib->m_lcbPlcfspaMom, 26 );
}
- if( pWwFib->fcPlcfspaHdr && pWwFib->lcbPlcfspaHdr )
+ if( pWwFib->m_fcPlcfspaHdr && pWwFib->m_lcbPlcfspaHdr )
{
- pHdFtFdoa = new WW8PLCFspecial( pTableSt, pWwFib->fcPlcfspaHdr,
- pWwFib->lcbPlcfspaHdr, 26 );
+ pHdFtFdoa = new WW8PLCFspecial( pTableSt,
pWwFib->m_fcPlcfspaHdr,
+ pWwFib->m_lcbPlcfspaHdr, 26 );
}
// PLCF for TextBox break-descriptors in the main text
- if( pWwFib->fcPlcftxbxBkd && pWwFib->lcbPlcftxbxBkd )
+ if( pWwFib->m_fcPlcftxbxBkd && pWwFib->m_lcbPlcftxbxBkd )
{
pMainTxbxBkd = new WW8PLCFspecial( pTableSt,
- pWwFib->fcPlcftxbxBkd, pWwFib->lcbPlcftxbxBkd, 0);
+ pWwFib->m_fcPlcftxbxBkd, pWwFib->m_lcbPlcftxbxBkd, 0);
}
// PLCF for TextBox break-descriptors in Header/Footer range
- if( pWwFib->fcPlcfHdrtxbxBkd && pWwFib->lcbPlcfHdrtxbxBkd )
+ if( pWwFib->m_fcPlcfHdrtxbxBkd && pWwFib->m_lcbPlcfHdrtxbxBkd )
{
pHdFtTxbxBkd = new WW8PLCFspecial( pTableSt,
- pWwFib->fcPlcfHdrtxbxBkd, pWwFib->lcbPlcfHdrtxbxBkd, 0);
+ pWwFib->m_fcPlcfHdrtxbxBkd, pWwFib->m_lcbPlcfHdrtxbxBkd,
0);
}
// Sub table cp positions
- if (pWwFib->fcPlcfTch && pWwFib->lcbPlcfTch)
+ if (pWwFib->m_fcPlcfTch && pWwFib->m_lcbPlcfTch)
{
pMagicTables = new WW8PLCFspecial( pTableSt,
- pWwFib->fcPlcfTch, pWwFib->lcbPlcfTch, 4);
+ pWwFib->m_fcPlcfTch, pWwFib->m_lcbPlcfTch, 4);
}
// Sub document cp positions
- if (pWwFib->fcPlcfwkb && pWwFib->lcbPlcfwkb)
+ if (pWwFib->m_fcPlcfwkb && pWwFib->m_lcbPlcfwkb)
{
pSubdocs = new WW8PLCFspecial( pTableSt,
- pWwFib->fcPlcfwkb, pWwFib->lcbPlcfwkb, 12);
+ pWwFib->m_fcPlcfwkb, pWwFib->m_lcbPlcfwkb, 12);
}
// Extended ATRD
- if (pWwFib->fcAtrdExtra && pWwFib->lcbAtrdExtra)
+ if (pWwFib->m_fcAtrdExtra && pWwFib->m_lcbAtrdExtra)
{
sal_uInt64 const nOldPos = pTableSt->Tell();
- if (checkSeek(*pTableSt, pWwFib->fcAtrdExtra) &&
(pTableSt->remainingSize() >= pWwFib->lcbAtrdExtra))
+ if (checkSeek(*pTableSt, pWwFib->m_fcAtrdExtra) &&
(pTableSt->remainingSize() >= pWwFib->m_lcbAtrdExtra))
{
- pExtendedAtrds = new sal_uInt8[pWwFib->lcbAtrdExtra];
- pWwFib->lcbAtrdExtra = pTableSt->ReadBytes(pExtendedAtrds,
pWwFib->lcbAtrdExtra);
+ pExtendedAtrds = new sal_uInt8[pWwFib->m_lcbAtrdExtra];
+ pWwFib->m_lcbAtrdExtra =
pTableSt->ReadBytes(pExtendedAtrds, pWwFib->m_lcbAtrdExtra);
}
else
- pWwFib->lcbAtrdExtra = 0;
+ pWwFib->m_lcbAtrdExtra = 0;
pTableSt->Seek(nOldPos);
}
@@ -1688,18 +1688,18 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt,
SvStream* pTableSt,
}
// PLCF for TextBox stories in main text
- sal_uInt32 nLenTxBxS = (8 > pWw8Fib->nVersion) ? 0 : 22;
- if( pWwFib->fcPlcftxbxText && pWwFib->lcbPlcftxbxText )
+ sal_uInt32 nLenTxBxS = (8 > pWw8Fib->m_nVersion) ? 0 : 22;
+ if( pWwFib->m_fcPlcftxbxText && pWwFib->m_lcbPlcftxbxText )
{
- pMainTxbx = new WW8PLCFspecial( pTableSt, pWwFib->fcPlcftxbxText,
- pWwFib->lcbPlcftxbxText, nLenTxBxS );
+ pMainTxbx = new WW8PLCFspecial( pTableSt, pWwFib->m_fcPlcftxbxText,
+ pWwFib->m_lcbPlcftxbxText, nLenTxBxS );
}
// PLCF for TextBox stories in Header/Footer range
- if( pWwFib->fcPlcfHdrtxbxText && pWwFib->lcbPlcfHdrtxbxText )
+ if( pWwFib->m_fcPlcfHdrtxbxText && pWwFib->m_lcbPlcfHdrtxbxText )
{
- pHdFtTxbx = new WW8PLCFspecial( pTableSt, pWwFib->fcPlcfHdrtxbxText,
- pWwFib->lcbPlcfHdrtxbxText, nLenTxBxS );
+ pHdFtTxbx = new WW8PLCFspecial( pTableSt, pWwFib->m_fcPlcfHdrtxbxText,
+ pWwFib->m_lcbPlcfHdrtxbxText, nLenTxBxS );
}
pBook = new WW8PLCFx_Book(pTableSt, *pWwFib);
@@ -2877,16 +2877,16 @@ WW8PLCFx_Fc_FKP::WW8PLCFx_Fc_FKP(SvStream* pSt,
SvStream* pTableSt,
pFkp(nullptr), ePLCF(ePl), pPCDAttrs(nullptr)
{
SetStartFc(nStartFcL);
- long nLenStruct = (8 > rFib.nVersion) ? 2 : 4;
+ long nLenStruct = (8 > rFib.m_nVersion) ? 2 : 4;
if (ePl == CHP)
{
- pPLCF = new WW8PLCF(*pTableSt, rFib.fcPlcfbteChpx, rFib.lcbPlcfbteChpx,
- nLenStruct, GetStartFc(), rFib.pnChpFirst, rFib.cpnBteChp);
+ pPLCF = new WW8PLCF(*pTableSt, rFib.m_fcPlcfbteChpx,
rFib.m_lcbPlcfbteChpx,
+ nLenStruct, GetStartFc(), rFib.m_pnChpFirst, rFib.m_cpnBteChp);
}
else
{
- pPLCF = new WW8PLCF(*pTableSt, rFib.fcPlcfbtePapx, rFib.lcbPlcfbtePapx,
- nLenStruct, GetStartFc(), rFib.pnPapFirst, rFib.cpnBtePap);
+ pPLCF = new WW8PLCF(*pTableSt, rFib.m_fcPlcfbtePapx,
rFib.m_lcbPlcfbtePapx,
+ nLenStruct, GetStartFc(), rFib.m_pnPapFirst, rFib.m_cpnBtePap);
}
}
@@ -3088,7 +3088,7 @@ WW8PLCFx_Cp_FKP::WW8PLCFx_Cp_FKP( SvStream* pSt,
SvStream* pTableSt,
: WW8PLCFx_Fc_FKP(pSt, pTableSt, pDataSt, *rBase.pWw8Fib, ePl,
rBase.WW8Cp2Fc(0)), rSBase(rBase), nAttrStart(-1), nAttrEnd(-1),
bLineEnd(false),
- bComplex( (7 < rBase.pWw8Fib->nVersion) || rBase.pWw8Fib->fComplex )
+ bComplex( (7 < rBase.pWw8Fib->m_nVersion) || rBase.pWw8Fib->m_fComplex )
{
ResetAttrStartEnd();
@@ -3376,8 +3376,8 @@ WW8PLCFx_SEPX::WW8PLCFx_SEPX(SvStream* pSt, SvStream*
pTableSt,
: WW8PLCFx(rFib.GetFIBVersion(), true), maSprmParser(rFib.GetFIBVersion()),
pStrm(pSt), nArrMax(256), nSprmSiz(0)
{
- pPLCF = rFib.lcbPlcfsed
- ? new WW8PLCF(*pTableSt, rFib.fcPlcfsed, rFib.lcbPlcfsed,
+ pPLCF = rFib.m_lcbPlcfsed
+ ? new WW8PLCF(*pTableSt, rFib.m_fcPlcfsed, rFib.m_lcbPlcfsed,
GetFIBVersion() <= ww::eWW2 ? 6 : 12, nStartCp)
: nullptr;
@@ -3655,32 +3655,32 @@ WW8PLCFx_FLD::WW8PLCFx_FLD( SvStream* pSt, const
WW8Fib& rMyFib, short nType)
switch( nType )
{
case MAN_HDFT:
- nFc = rFib.fcPlcffldHdr;
- nLen = rFib.lcbPlcffldHdr;
+ nFc = rFib.m_fcPlcffldHdr;
+ nLen = rFib.m_lcbPlcffldHdr;
break;
case MAN_FTN:
- nFc = rFib.fcPlcffldFootnote;
- nLen = rFib.lcbPlcffldFootnote;
+ nFc = rFib.m_fcPlcffldFootnote;
+ nLen = rFib.m_lcbPlcffldFootnote;
break;
case MAN_EDN:
- nFc = rFib.fcPlcffldEdn;
- nLen = rFib.lcbPlcffldEdn;
+ nFc = rFib.m_fcPlcffldEdn;
+ nLen = rFib.m_lcbPlcffldEdn;
break;
case MAN_AND:
- nFc = rFib.fcPlcffldAtn;
- nLen = rFib.lcbPlcffldAtn;
+ nFc = rFib.m_fcPlcffldAtn;
+ nLen = rFib.m_lcbPlcffldAtn;
break;
case MAN_TXBX:
- nFc = rFib.fcPlcffldTxbx;
- nLen = rFib.lcbPlcffldTxbx;
+ nFc = rFib.m_fcPlcffldTxbx;
+ nLen = rFib.m_lcbPlcffldTxbx;
break;
case MAN_TXBX_HDFT:
- nFc = rFib.fcPlcffldHdrTxbx;
- nLen = rFib.lcbPlcffldHdrTxbx;
+ nFc = rFib.m_fcPlcffldHdrTxbx;
+ nLen = rFib.m_lcbPlcffldHdrTxbx;
break;
default:
- nFc = rFib.fcPlcffldMom;
- nLen = rFib.lcbPlcffldMom;
+ nFc = rFib.m_fcPlcffldMom;
+ nLen = rFib.m_lcbPlcffldMom;
break;
}
@@ -3945,22 +3945,22 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm,
sal_uInt32 nStart, sal_Int32 nLen
WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTableSt, const WW8Fib& rFib)
: WW8PLCFx(rFib.GetFIBVersion(), false), nIsEnd(0), nBookmarkId(1)
{
- if( !rFib.fcPlcfbkf || !rFib.lcbPlcfbkf || !rFib.fcPlcfbkl ||
- !rFib.lcbPlcfbkl || !rFib.fcSttbfbkmk || !rFib.lcbSttbfbkmk )
+ if( !rFib.m_fcPlcfbkf || !rFib.m_lcbPlcfbkf || !rFib.m_fcPlcfbkl ||
+ !rFib.m_lcbPlcfbkl || !rFib.m_fcSttbfbkmk || !rFib.m_lcbSttbfbkmk )
{
pBook[0] = pBook[1] = nullptr;
nIMax = 0;
}
else
{
- pBook[0] = new
WW8PLCFspecial(pTableSt,rFib.fcPlcfbkf,rFib.lcbPlcfbkf,4);
+ pBook[0] = new
WW8PLCFspecial(pTableSt,rFib.m_fcPlcfbkf,rFib.m_lcbPlcfbkf,4);
- pBook[1] = new
WW8PLCFspecial(pTableSt,rFib.fcPlcfbkl,rFib.lcbPlcfbkl,0);
+ pBook[1] = new
WW8PLCFspecial(pTableSt,rFib.m_fcPlcfbkl,rFib.m_lcbPlcfbkl,0);
- rtl_TextEncoding eStructChrSet =
WW8Fib::GetFIBCharset(rFib.chseTables, rFib.lid);
+ rtl_TextEncoding eStructChrSet =
WW8Fib::GetFIBCharset(rFib.m_chseTables, rFib.m_lid);
- WW8ReadSTTBF( (7 < rFib.nVersion), *pTableSt, rFib.fcSttbfbkmk,
- rFib.lcbSttbfbkmk, 0, eStructChrSet, aBookNames );
+ WW8ReadSTTBF( (7 < rFib.m_nVersion), *pTableSt, rFib.m_fcSttbfbkmk,
+ rFib.m_lcbSttbfbkmk, 0, eStructChrSet, aBookNames );
nIMax = aBookNames.size();
@@ -4209,15 +4209,15 @@ WW8PLCFx_AtnBook::WW8PLCFx_AtnBook(SvStream* pTableSt,
const WW8Fib& rFib)
: WW8PLCFx(rFib.GetFIBVersion(), /*bSprm=*/false),
m_bIsEnd(false)
{
- if (!rFib.fcPlcfAtnbkf || !rFib.lcbPlcfAtnbkf || !rFib.fcPlcfAtnbkl ||
!rFib.lcbPlcfAtnbkl)
+ if (!rFib.m_fcPlcfAtnbkf || !rFib.m_lcbPlcfAtnbkf || !rFib.m_fcPlcfAtnbkl
|| !rFib.m_lcbPlcfAtnbkl)
{
m_pBook[0] = m_pBook[1] = nullptr;
nIMax = 0;
}
else
{
- m_pBook[0] = new WW8PLCFspecial(pTableSt, rFib.fcPlcfAtnbkf,
rFib.lcbPlcfAtnbkf, 4);
- m_pBook[1] = new WW8PLCFspecial(pTableSt, rFib.fcPlcfAtnbkl,
rFib.lcbPlcfAtnbkl, 0);
+ m_pBook[0] = new WW8PLCFspecial(pTableSt, rFib.m_fcPlcfAtnbkf,
rFib.m_lcbPlcfAtnbkf, 4);
+ m_pBook[1] = new WW8PLCFspecial(pTableSt, rFib.m_fcPlcfAtnbkl,
rFib.m_lcbPlcfAtnbkl, 0);
nIMax = m_pBook[0]->GetIMax();
if (m_pBook[1]->GetIMax() < nIMax)
@@ -4341,15 +4341,15 @@ WW8PLCFx_FactoidBook::WW8PLCFx_FactoidBook(SvStream*
pTableSt, const WW8Fib& rFi
: WW8PLCFx(rFib.GetFIBVersion(), /*bSprm=*/false),
m_bIsEnd(false)
{
- if (!rFib.fcPlcfBkfFactoid || !rFib.lcbPlcfBkfFactoid ||
!rFib.fcPlcfBklFactoid || !rFib.lcbPlcfBklFactoid)
+ if (!rFib.m_fcPlcfBkfFactoid || !rFib.m_lcbPlcfBkfFactoid ||
!rFib.m_fcPlcfBklFactoid || !rFib.m_lcbPlcfBklFactoid)
{
m_pBook[0] = m_pBook[1] = nullptr;
m_nIMax = 0;
}
else
{
- m_pBook[0] = new WW8PLCFspecial(pTableSt, rFib.fcPlcfBkfFactoid,
rFib.lcbPlcfBkfFactoid, 6);
- m_pBook[1] = new WW8PLCFspecial(pTableSt, rFib.fcPlcfBklFactoid,
rFib.lcbPlcfBklFactoid, 4);
+ m_pBook[0] = new WW8PLCFspecial(pTableSt, rFib.m_fcPlcfBkfFactoid,
rFib.m_lcbPlcfBkfFactoid, 6);
+ m_pBook[1] = new WW8PLCFspecial(pTableSt, rFib.m_fcPlcfBklFactoid,
rFib.m_lcbPlcfBklFactoid, 4);
m_nIMax = m_pBook[0]->GetIMax();
if (m_pBook[1]->GetIMax() < m_nIMax)
@@ -5358,25 +5358,25 @@ bool WW8Fib::GetBaseCp(ManTypes nType, WW8_CP * cp)
const
{
default:
case MAN_TXBX_HDFT:
- nOffset = ccpTxbx;
+ nOffset = m_ccpTxbx;
SAL_FALLTHROUGH;
case MAN_TXBX:
- if (ccpEdn > std::numeric_limits<WW8_CP>::max() - nOffset) {
+ if (m_ccpEdn > std::numeric_limits<WW8_CP>::max() - nOffset) {
return false;
}
- nOffset += ccpEdn;
+ nOffset += m_ccpEdn;
SAL_FALLTHROUGH;
case MAN_EDN:
- if (ccpAtn > std::numeric_limits<WW8_CP>::max() - nOffset) {
+ if (m_ccpAtn > std::numeric_limits<WW8_CP>::max() - nOffset) {
return false;
}
- nOffset += ccpAtn;
+ nOffset += m_ccpAtn;
SAL_FALLTHROUGH;
case MAN_AND:
- if (ccpMcr > std::numeric_limits<WW8_CP>::max() - nOffset) {
+ if (m_ccpMcr > std::numeric_limits<WW8_CP>::max() - nOffset) {
return false;
}
- nOffset += ccpMcr;
+ nOffset += m_ccpMcr;
/*
// fall through
@@ -5386,22 +5386,22 @@ bool WW8Fib::GetBaseCp(ManTypes nType, WW8_CP * cp)
const
case MAN_MACRO:
*/
- if (ccpHdr > std::numeric_limits<WW8_CP>::max() - nOffset) {
+ if (m_ccpHdr > std::numeric_limits<WW8_CP>::max() - nOffset) {
return false;
}
- nOffset += ccpHdr;
+ nOffset += m_ccpHdr;
SAL_FALLTHROUGH;
case MAN_HDFT:
- if (ccpFootnote > std::numeric_limits<WW8_CP>::max() - nOffset) {
+ if (m_ccpFootnote > std::numeric_limits<WW8_CP>::max() - nOffset) {
return false;
}
- nOffset += ccpFootnote;
+ nOffset += m_ccpFootnote;
SAL_FALLTHROUGH;
case MAN_FTN:
- if (ccpText > std::numeric_limits<WW8_CP>::max() - nOffset) {
+ if (m_ccpText > std::numeric_limits<WW8_CP>::max() - nOffset) {
return false;
}
- nOffset += ccpText;
+ nOffset += m_ccpText;
SAL_FALLTHROUGH;
case MAN_MAINTEXT:
break;
@@ -5433,13 +5433,13 @@ ww::WordVersion WW8Fib::GetFIBVersion() const
* its format isn't the same as that of Word 2 for windows. Nor is it
* the same as that of Word for DOS/PCWord 5
*/
- if (wIdent == 0xa59b || wIdent == 0xa59c)
+ if (m_wIdent == 0xa59b || m_wIdent == 0xa59c)
eVer = ww::eWW1;
- else if (wIdent == 0xa5db)
+ else if (m_wIdent == 0xa5db)
eVer = ww::eWW2;
else
{
- switch (nVersion)
+ switch (m_nVersion)
{
case 6:
eVer = ww::eWW6;
@@ -5456,7 +5456,7 @@ ww::WordVersion WW8Fib::GetFIBVersion() const
}
WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset)
- : nFibError( 0 )
+ : m_nFibError( 0 )
{
memset(this, 0, sizeof(*this));
sal_uInt8 aBits1;
@@ -5467,16 +5467,16 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion,
sal_uInt32 nOffset)
note desired number, identify file version number
and check against desired number!
*/
- nVersion = nWantedVersion;
- rSt.ReadUInt16( wIdent );
- rSt.ReadUInt16( nFib );
- rSt.ReadUInt16( nProduct );
+ m_nVersion = nWantedVersion;
+ rSt.ReadUInt16( m_wIdent );
+ rSt.ReadUInt16( m_nFib );
+ rSt.ReadUInt16( m_nProduct );
if( 0 != rSt.GetError() )
{
sal_Int16 nFibMin;
sal_Int16 nFibMax;
// note: 6 stands for "6 OR 7", 7 stands for "ONLY 7"
- switch( nVersion )
+ switch( m_nVersion )
{
case 6:
nFibMin = 0x0065; // from 101 WinWord 6.0
@@ -5496,13 +5496,13 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion,
sal_uInt32 nOffset)
default:
nFibMin = 0; // programm error!
nFibMax = 0;
- nFib = 1;
+ m_nFib = 1;
OSL_ENSURE( false, "nVersion not implemented!" );
break;
}
- if ( (nFib < nFibMin) || (nFib > nFibMax) )
+ if ( (m_nFib < nFibMin) || (m_nFib > nFibMax) )
{
- nFibError = ERR_SWG_READ_ERROR; // report error
+ m_nFibError = ERR_SWG_READ_ERROR; // report error
return;
}
}
@@ -5516,14 +5516,14 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion,
sal_uInt32 nOffset)
sal_Int16 cpnBtePap_Ver67=0;
// read FIB
- rSt.ReadInt16( lid );
- rSt.ReadInt16( pnNext );
+ rSt.ReadInt16( m_lid );
+ rSt.ReadInt16( m_pnNext );
rSt.ReadUChar( aBits1 );
rSt.ReadUChar( aBits2 );
- rSt.ReadUInt16( nFibBack );
- rSt.ReadUInt16( nHash );
- rSt.ReadUInt16( nKey );
- rSt.ReadUChar( envr );
+ rSt.ReadUInt16( m_nFibBack );
+ rSt.ReadUInt16( m_nHash );
+ rSt.ReadUInt16( m_nKey );
+ rSt.ReadUChar( m_envr );
rSt.ReadUChar( aVer8Bits1 ); // only have an empty reserve field
under Ver67
// content from aVer8Bits1
@@ -5533,21 +5533,21 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion,
sal_uInt32 nOffset)
// sal_uInt8 fFuturesavedUndo :1;
// sal_uInt8 fWord97Saved :1;
// sal_uInt8 :3;
- rSt.ReadUInt16( chse );
- rSt.ReadUInt16( chseTables );
- rSt.ReadInt32( fcMin );
- rSt.ReadInt32( fcMac );
+ rSt.ReadUInt16( m_chse );
+ rSt.ReadUInt16( m_chseTables );
+ rSt.ReadInt32( m_fcMin );
+ rSt.ReadInt32( m_fcMac );
// insertion for WW8
if (IsEightPlus(eVer))
{
- rSt.ReadUInt16( csw );
+ rSt.ReadUInt16( m_csw );
// Marke: "rgsw" Beginning of the array of shorts
- rSt.ReadUInt16( wMagicCreated );
- rSt.ReadUInt16( wMagicRevised );
- rSt.ReadUInt16( wMagicCreatedPrivate );
- rSt.ReadUInt16( wMagicRevisedPrivate );
+ rSt.ReadUInt16( m_wMagicCreated );
+ rSt.ReadUInt16( m_wMagicRevised );
+ rSt.ReadUInt16( m_wMagicCreatedPrivate );
+ rSt.ReadUInt16( m_wMagicRevisedPrivate );
rSt.SeekRel( 9 * sizeof( sal_Int16 ) );
/*
@@ -5562,14 +5562,14 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion,
sal_uInt32 nOffset)
&& (bVer67 || WW8ReadINT16( rSt, pnLvcFirst_W6 )) //
8
&& (bVer67 || WW8ReadINT16( rSt, cpnBteLvc_W6 )) //
9
*/
- rSt.ReadInt16( lidFE );
- rSt.ReadUInt16( clw );
+ rSt.ReadInt16( m_lidFE );
+ rSt.ReadUInt16( m_clw );
}
// end of the insertion for WW8
// Marke: "rglw" Beginning of the array of longs
- rSt.ReadInt32( cbMac );
+ rSt.ReadInt32( m_cbMac );
// ignore 2 longs, because they are unimportant
rSt.SeekRel( 2 * sizeof( sal_Int32) );
@@ -5578,14 +5578,14 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion,
sal_uInt32 nOffset)
if (IsSevenMinus(eVer))
rSt.SeekRel( 2 * sizeof( sal_Int32) );
- rSt.ReadInt32( ccpText );
- rSt.ReadInt32( ccpFootnote );
- rSt.ReadInt32( ccpHdr );
- rSt.ReadInt32( ccpMcr );
- rSt.ReadInt32( ccpAtn );
- rSt.ReadInt32( ccpEdn );
- rSt.ReadInt32( ccpTxbx );
- rSt.ReadInt32( ccpHdrTxbx );
+ rSt.ReadInt32( m_ccpText );
+ rSt.ReadInt32( m_ccpFootnote );
+ rSt.ReadInt32( m_ccpHdr );
+ rSt.ReadInt32( m_ccpMcr );
+ rSt.ReadInt32( m_ccpAtn );
+ rSt.ReadInt32( m_ccpEdn );
+ rSt.ReadInt32( m_ccpTxbx );
+ rSt.ReadInt32( m_ccpHdrTxbx );
// only skip one more long at Ver67
if (IsSevenMinus(eVer))
@@ -5593,107 +5593,107 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8
nWantedVersion, sal_uInt32 nOffset)
else
{
// insertion for WW8
- rSt.ReadInt32( pnFbpChpFirst );
- rSt.ReadInt32( pnChpFirst );
- rSt.ReadInt32( cpnBteChp );
- rSt.ReadInt32( pnFbpPapFirst );
- rSt.ReadInt32( pnPapFirst );
- rSt.ReadInt32( cpnBtePap );
- rSt.ReadInt32( pnFbpLvcFirst );
- rSt.ReadInt32( pnLvcFirst );
- rSt.ReadInt32( cpnBteLvc );
- rSt.ReadInt32( fcIslandFirst );
- rSt.ReadInt32( fcIslandLim );
- rSt.ReadUInt16( cfclcb );
+ rSt.ReadInt32( m_pnFbpChpFirst );
+ rSt.ReadInt32( m_pnChpFirst );
+ rSt.ReadInt32( m_cpnBteChp );
+ rSt.ReadInt32( m_pnFbpPapFirst );
+ rSt.ReadInt32( m_pnPapFirst );
+ rSt.ReadInt32( m_cpnBtePap );
+ rSt.ReadInt32( m_pnFbpLvcFirst );
+ rSt.ReadInt32( m_pnLvcFirst );
+ rSt.ReadInt32( m_cpnBteLvc );
+ rSt.ReadInt32( m_fcIslandFirst );
+ rSt.ReadInt32( m_fcIslandLim );
+ rSt.ReadUInt16( m_cfclcb );
}
// end of the insertion for WW8
// Marke: "rgfclcb" Beginning of array of FC/LCB pairs.
- rSt.ReadInt32( fcStshfOrig );
- lcbStshfOrig = Readcb(rSt, eVer);
- rSt.ReadInt32( fcStshf );
- lcbStshf = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcffndRef );
- lcbPlcffndRef = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcffndText );
- lcbPlcffndText = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcfandRef );
- lcbPlcfandRef = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcfandText );
- lcbPlcfandText = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcfsed );
- lcbPlcfsed = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcfpad );
- lcbPlcfpad = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcfphe );
- lcbPlcfphe = Readcb(rSt, eVer);
- rSt.ReadInt32( fcSttbfglsy );
- lcbSttbfglsy = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcfglsy );
- lcbPlcfglsy = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcfhdd );
- lcbPlcfhdd = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcfbteChpx );
- lcbPlcfbteChpx = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcfbtePapx );
- lcbPlcfbtePapx = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcfsea );
- lcbPlcfsea = Readcb(rSt, eVer);
- rSt.ReadInt32( fcSttbfffn );
- lcbSttbfffn = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcffldMom );
- lcbPlcffldMom = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcffldHdr );
- lcbPlcffldHdr = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcffldFootnote );
- lcbPlcffldFootnote = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcffldAtn );
- lcbPlcffldAtn = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcffldMcr );
- lcbPlcffldMcr = Readcb(rSt, eVer);
- rSt.ReadInt32( fcSttbfbkmk );
- lcbSttbfbkmk = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcfbkf );
- lcbPlcfbkf = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcfbkl );
- lcbPlcfbkl = Readcb(rSt, eVer);
- rSt.ReadInt32( fcCmds );
- lcbCmds = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcfmcr );
- lcbPlcfmcr = Readcb(rSt, eVer);
- rSt.ReadInt32( fcSttbfmcr );
- lcbSttbfmcr = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcStshfOrig );
+ m_lcbStshfOrig = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcStshf );
+ m_lcbStshf = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcffndRef );
+ m_lcbPlcffndRef = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcffndText );
+ m_lcbPlcffndText = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcfandRef );
+ m_lcbPlcfandRef = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcfandText );
+ m_lcbPlcfandText = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcfsed );
+ m_lcbPlcfsed = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcfpad );
+ m_lcbPlcfpad = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcfphe );
+ m_lcbPlcfphe = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcSttbfglsy );
+ m_lcbSttbfglsy = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcfglsy );
+ m_lcbPlcfglsy = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcfhdd );
+ m_lcbPlcfhdd = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcfbteChpx );
+ m_lcbPlcfbteChpx = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcfbtePapx );
+ m_lcbPlcfbtePapx = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcfsea );
+ m_lcbPlcfsea = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcSttbfffn );
+ m_lcbSttbfffn = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcffldMom );
+ m_lcbPlcffldMom = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcffldHdr );
+ m_lcbPlcffldHdr = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcffldFootnote );
+ m_lcbPlcffldFootnote = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcffldAtn );
+ m_lcbPlcffldAtn = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcffldMcr );
+ m_lcbPlcffldMcr = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcSttbfbkmk );
+ m_lcbSttbfbkmk = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcfbkf );
+ m_lcbPlcfbkf = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcfbkl );
+ m_lcbPlcfbkl = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcCmds );
+ m_lcbCmds = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcfmcr );
+ m_lcbPlcfmcr = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcSttbfmcr );
+ m_lcbSttbfmcr = Readcb(rSt, eVer);
if (eVer >= ww::eWW2)
{
- rSt.ReadInt32( fcPrDrvr );
- lcbPrDrvr = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPrEnvPort );
- lcbPrEnvPort = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPrEnvLand );
- lcbPrEnvLand = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPrDrvr );
+ m_lcbPrDrvr = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPrEnvPort );
+ m_lcbPrEnvPort = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPrEnvLand );
+ m_lcbPrEnvLand = Readcb(rSt, eVer);
}
else
{
- rSt.ReadInt32( fcPrEnvPort );
- lcbPrEnvPort = Readcb(rSt, eVer);
- }
- rSt.ReadInt32( fcWss );
- lcbWss = Readcb(rSt, eVer);
- rSt.ReadInt32( fcDop );
- lcbDop = Readcb(rSt, eVer);
- rSt.ReadInt32( fcSttbfAssoc );
- lcbSttbfAssoc = Readcb(rSt, eVer);
- rSt.ReadInt32( fcClx );
- lcbClx = Readcb(rSt, eVer);
- rSt.ReadInt32( fcPlcfpgdFootnote );
- lcbPlcfpgdFootnote = Readcb(rSt, eVer);
- rSt.ReadInt32( fcAutosaveSource );
- lcbAutosaveSource = Readcb(rSt, eVer);
- rSt.ReadInt32( fcGrpStAtnOwners );
- lcbGrpStAtnOwners = Readcb(rSt, eVer);
- rSt.ReadInt32( fcSttbfAtnbkmk );
- lcbSttbfAtnbkmk = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPrEnvPort );
+ m_lcbPrEnvPort = Readcb(rSt, eVer);
+ }
+ rSt.ReadInt32( m_fcWss );
+ m_lcbWss = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcDop );
+ m_lcbDop = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcSttbfAssoc );
+ m_lcbSttbfAssoc = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcClx );
+ m_lcbClx = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcPlcfpgdFootnote );
+ m_lcbPlcfpgdFootnote = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcAutosaveSource );
+ m_lcbAutosaveSource = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcGrpStAtnOwners );
+ m_lcbGrpStAtnOwners = Readcb(rSt, eVer);
+ rSt.ReadInt32( m_fcSttbfAtnbkmk );
+ m_lcbSttbfAtnbkmk = Readcb(rSt, eVer);
// only skip more shot at Ver67
if (IsSevenMinus(eVer))
@@ -5713,72 +5713,72 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion,
sal_uInt32 nOffset)
if (eVer > ww::eWW2)
{
- rSt.ReadInt32( fcPlcfdoaMom );
- rSt.ReadInt32( lcbPlcfdoaMom );
- rSt.ReadInt32( fcPlcfdoaHdr );
- rSt.ReadInt32( lcbPlcfdoaHdr );
- rSt.ReadInt32( fcPlcfspaMom );
- rSt.ReadInt32( lcbPlcfspaMom );
- rSt.ReadInt32( fcPlcfspaHdr );
- rSt.ReadInt32( lcbPlcfspaHdr );
-
- rSt.ReadInt32( fcPlcfAtnbkf );
- rSt.ReadInt32( lcbPlcfAtnbkf );
- rSt.ReadInt32( fcPlcfAtnbkl );
- rSt.ReadInt32( lcbPlcfAtnbkl );
- rSt.ReadInt32( fcPms );
- rSt.ReadInt32( lcbPMS );
- rSt.ReadInt32( fcFormFieldSttbf );
- rSt.ReadInt32( lcbFormFieldSttbf );
- rSt.ReadInt32( fcPlcfendRef );
- rSt.ReadInt32( lcbPlcfendRef );
- rSt.ReadInt32( fcPlcfendText );
- rSt.ReadInt32( lcbPlcfendText );
- rSt.ReadInt32( fcPlcffldEdn );
- rSt.ReadInt32( lcbPlcffldEdn );
- rSt.ReadInt32( fcPlcfpgdEdn );
- rSt.ReadInt32( lcbPlcfpgdEdn );
- rSt.ReadInt32( fcDggInfo );
- rSt.ReadInt32( lcbDggInfo );
- rSt.ReadInt32( fcSttbfRMark );
- rSt.ReadInt32( lcbSttbfRMark );
- rSt.ReadInt32( fcSttbfCaption );
- rSt.ReadInt32( lcbSttbfCaption );
- rSt.ReadInt32( fcSttbAutoCaption );
- rSt.ReadInt32( lcbSttbAutoCaption );
- rSt.ReadInt32( fcPlcfwkb );
- rSt.ReadInt32( lcbPlcfwkb );
- rSt.ReadInt32( fcPlcfspl );
- rSt.ReadInt32( lcbPlcfspl );
- rSt.ReadInt32( fcPlcftxbxText );
- rSt.ReadInt32( lcbPlcftxbxText );
- rSt.ReadInt32( fcPlcffldTxbx );
- rSt.ReadInt32( lcbPlcffldTxbx );
- rSt.ReadInt32( fcPlcfHdrtxbxText );
- rSt.ReadInt32( lcbPlcfHdrtxbxText );
- rSt.ReadInt32( fcPlcffldHdrTxbx );
- rSt.ReadInt32( lcbPlcffldHdrTxbx );
- rSt.ReadInt32( fcStwUser );
- rSt.ReadUInt32( lcbStwUser );
- rSt.ReadInt32( fcSttbttmbd );
- rSt.ReadUInt32( lcbSttbttmbd );
+ rSt.ReadInt32( m_fcPlcfdoaMom );
+ rSt.ReadInt32( m_lcbPlcfdoaMom );
+ rSt.ReadInt32( m_fcPlcfdoaHdr );
+ rSt.ReadInt32( m_lcbPlcfdoaHdr );
+ rSt.ReadInt32( m_fcPlcfspaMom );
+ rSt.ReadInt32( m_lcbPlcfspaMom );
+ rSt.ReadInt32( m_fcPlcfspaHdr );
+ rSt.ReadInt32( m_lcbPlcfspaHdr );
+
+ rSt.ReadInt32( m_fcPlcfAtnbkf );
+ rSt.ReadInt32( m_lcbPlcfAtnbkf );
+ rSt.ReadInt32( m_fcPlcfAtnbkl );
+ rSt.ReadInt32( m_lcbPlcfAtnbkl );
+ rSt.ReadInt32( m_fcPms );
+ rSt.ReadInt32( m_lcbPMS );
+ rSt.ReadInt32( m_fcFormFieldSttbf );
+ rSt.ReadInt32( m_lcbFormFieldSttbf );
+ rSt.ReadInt32( m_fcPlcfendRef );
+ rSt.ReadInt32( m_lcbPlcfendRef );
+ rSt.ReadInt32( m_fcPlcfendText );
+ rSt.ReadInt32( m_lcbPlcfendText );
+ rSt.ReadInt32( m_fcPlcffldEdn );
+ rSt.ReadInt32( m_lcbPlcffldEdn );
+ rSt.ReadInt32( m_fcPlcfpgdEdn );
+ rSt.ReadInt32( m_lcbPlcfpgdEdn );
+ rSt.ReadInt32( m_fcDggInfo );
+ rSt.ReadInt32( m_lcbDggInfo );
+ rSt.ReadInt32( m_fcSttbfRMark );
+ rSt.ReadInt32( m_lcbSttbfRMark );
+ rSt.ReadInt32( m_fcSttbfCaption );
+ rSt.ReadInt32( m_lcbSttbfCaption );
+ rSt.ReadInt32( m_fcSttbAutoCaption );
+ rSt.ReadInt32( m_lcbSttbAutoCaption );
+ rSt.ReadInt32( m_fcPlcfwkb );
+ rSt.ReadInt32( m_lcbPlcfwkb );
+ rSt.ReadInt32( m_fcPlcfspl );
+ rSt.ReadInt32( m_lcbPlcfspl );
+ rSt.ReadInt32( m_fcPlcftxbxText );
+ rSt.ReadInt32( m_lcbPlcftxbxText );
+ rSt.ReadInt32( m_fcPlcffldTxbx );
+ rSt.ReadInt32( m_lcbPlcffldTxbx );
+ rSt.ReadInt32( m_fcPlcfHdrtxbxText );
+ rSt.ReadInt32( m_lcbPlcfHdrtxbxText );
+ rSt.ReadInt32( m_fcPlcffldHdrTxbx );
+ rSt.ReadInt32( m_lcbPlcffldHdrTxbx );
+ rSt.ReadInt32( m_fcStwUser );
+ rSt.ReadUInt32( m_lcbStwUser );
+ rSt.ReadInt32( m_fcSttbttmbd );
+ rSt.ReadUInt32( m_lcbSttbttmbd );
}
if( 0 == rSt.GetError() )
{
// set bit flag
- fDot = aBits1 & 0x01 ;
- fGlsy = ( aBits1 & 0x02 ) >> 1;
- fComplex = ( aBits1 & 0x04 ) >> 2;
- fHasPic = ( aBits1 & 0x08 ) >> 3;
- cQuickSaves = ( aBits1 & 0xf0 ) >> 4;
- fEncrypted = aBits2 & 0x01 ;
- fWhichTableStm= ( aBits2 & 0x02 ) >> 1;
- fReadOnlyRecommended = (aBits2 & 0x4) >> 2;
- fWriteReservation = (aBits2 & 0x8) >> 3;
- fExtChar = ( aBits2 & 0x10 ) >> 4;
+ m_fDot = aBits1 & 0x01 ;
+ m_fGlsy = ( aBits1 & 0x02 ) >> 1;
+ m_fComplex = ( aBits1 & 0x04 ) >> 2;
+ m_fHasPic = ( aBits1 & 0x08 ) >> 3;
+ m_cQuickSaves = ( aBits1 & 0xf0 ) >> 4;
+ m_fEncrypted = aBits2 & 0x01 ;
+ m_fWhichTableStm= ( aBits2 & 0x02 ) >> 1;
+ m_fReadOnlyRecommended = (aBits2 & 0x4) >> 2;
+ m_fWriteReservation = (aBits2 & 0x8) >> 3;
+ m_fExtChar = ( aBits2 & 0x10 ) >> 4;
// dummy = ( aBits2 & 0x20 ) >> 5;
- fFarEast = ( aBits2 & 0x40 ) >> 6; // #i90932#
+ m_fFarEast = ( aBits2 & 0x40 ) >> 6; // #i90932#
// dummy = ( aBits2 & 0x80 ) >> 7;
/*
@@ -5787,19 +5787,19 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion,
sal_uInt32 nOffset)
*/
if (IsSevenMinus(eVer))
{
- pnChpFirst = pnChpFirst_Ver67;
- pnPapFirst = pnPapFirst_Ver67;
- cpnBteChp = cpnBteChp_Ver67;
- cpnBtePap = cpnBtePap_Ver67;
+ m_pnChpFirst = pnChpFirst_Ver67;
+ m_pnPapFirst = pnPapFirst_Ver67;
+ m_cpnBteChp = cpnBteChp_Ver67;
+ m_cpnBtePap = cpnBtePap_Ver67;
}
else if (IsEightPlus(eVer))
{
- fMac = aVer8Bits1 & 0x01 ;
- fEmptySpecial = ( aVer8Bits1 & 0x02 ) >> 1;
- fLoadOverridePage = ( aVer8Bits1 & 0x04 ) >> 2;
- fFuturesavedUndo = ( aVer8Bits1 & 0x08 ) >> 3;
- fWord97Saved = ( aVer8Bits1 & 0x10 ) >> 4;
- fWord2000Saved = ( aVer8Bits1 & 0x20 ) >> 5;
+ m_fMac = aVer8Bits1 & 0x01 ;
+ m_fEmptySpecial = ( aVer8Bits1 & 0x02 ) >> 1;
+ m_fLoadOverridePage = ( aVer8Bits1 & 0x04 ) >> 2;
+ m_fFuturesavedUndo = ( aVer8Bits1 & 0x08 ) >> 3;
+ m_fWord97Saved = ( aVer8Bits1 & 0x10 ) >> 4;
+ m_fWord2000Saved = ( aVer8Bits1 & 0x20 ) >> 5;
/*
especially for WW8:
@@ -5809,126 +5809,126 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8
nWantedVersion, sal_uInt32 nOffset)
long nOldPos = rSt.Tell();
rSt.Seek( 0x02da );
- rSt.ReadInt32( fcSttbFnm );
- rSt.ReadInt32( lcbSttbFnm );
- rSt.ReadInt32( fcPlcfLst );
- rSt.ReadInt32( lcbPlcfLst );
- rSt.ReadInt32( fcPlfLfo );
- rSt.ReadInt32( lcbPlfLfo );
- rSt.ReadInt32( fcPlcftxbxBkd );
- rSt.ReadInt32( lcbPlcftxbxBkd );
- rSt.ReadInt32( fcPlcfHdrtxbxBkd );
- rSt.ReadInt32( lcbPlcfHdrtxbxBkd );
+ rSt.ReadInt32( m_fcSttbFnm );
+ rSt.ReadInt32( m_lcbSttbFnm );
+ rSt.ReadInt32( m_fcPlcfLst );
+ rSt.ReadInt32( m_lcbPlcfLst );
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
