summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-05-02 10:13:00 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-05-02 09:23:06 +0000
commit6f56ad53f0fa7108b8eaead3d6995acce0674f69 (patch)
tree1e00e58b204974da51ec069404873a344f283c7c /sw
parent78ef368b8ca6fb53b67330c305f8c2c581cbf68e (diff)
sw: prefix members of SwWW8ImplReader
Change-Id: Ic3d21109097756d22105a8382f344b980f79b898 Reviewed-on: https://gerrit.libreoffice.org/15592 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx374
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx120
-rw-r--r--sw/source/filter/ww8/ww8par.cxx1790
-rw-r--r--sw/source/filter/ww8/ww8par.hxx334
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx694
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx186
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx68
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx538
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx778
9 files changed, 2441 insertions, 2441 deletions
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 7bf2a3858be9..ac6fd98c4f5b 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -169,11 +169,11 @@ bool SwWW8ImplReader::ReadGrafStart(void* pData, short nDataSiz,
if (SVBT16ToShort(pHd->cb) < sizeof(WW8_DPHEAD) + nDataSiz)
{
OSL_ENSURE( false, "+Grafik-Element: Size ?" );
- pStrm->SeekRel(SVBT16ToShort(pHd->cb) - sizeof(WW8_DPHEAD));
+ m_pStrm->SeekRel(SVBT16ToShort(pHd->cb) - sizeof(WW8_DPHEAD));
return false;
}
- bool bCouldRead = checkRead(*pStrm, pData, nDataSiz);
+ bool bCouldRead = checkRead(*m_pStrm, pData, nDataSiz);
OSL_ENSURE(bCouldRead, "Short Graphic header");
if (!bCouldRead)
return false;
@@ -181,21 +181,21 @@ bool SwWW8ImplReader::ReadGrafStart(void* pData, short nDataSiz,
RndStdIds eAnchor = (pDo->by < 2) ? FLY_AT_PAGE : FLY_AT_PARA;
rSet.Put(SwFmtAnchor(eAnchor));
- nDrawXOfs2 = nDrawXOfs;
- nDrawYOfs2 = nDrawYOfs;
+ m_nDrawXOfs2 = m_nDrawXOfs;
+ m_nDrawYOfs2 = m_nDrawYOfs;
if (eAnchor == FLY_AT_PARA)
{
if( pDo->bx == 1 ) // Position: actually left
- nDrawXOfs2 = static_cast< short >(nDrawXOfs2 - maSectionManager.GetPageLeft());
- if( nInTable ) // Object in table
- nDrawXOfs2 = nDrawXOfs2 - GetTableLeft(); // -> see comment
+ m_nDrawXOfs2 = static_cast< short >(m_nDrawXOfs2 - m_aSectionManager.GetPageLeft());
+ if( m_nInTable ) // Object in table
+ m_nDrawXOfs2 = m_nDrawXOfs2 - GetTableLeft(); // -> see comment
// at GetTableLeft()
}
else
{
if( pDo->bx != 1 )
- nDrawXOfs2 = static_cast< short >(nDrawXOfs2 + maSectionManager.GetPageLeft());
+ m_nDrawXOfs2 = static_cast< short >(m_nDrawXOfs2 + m_aSectionManager.GetPageLeft());
}
return true;
@@ -328,8 +328,8 @@ SdrObject* SwWW8ImplReader::ReadLine( WW8_DPHEAD* pHd, const WW8_DO* pDo,
Point& rP0 = aP[0];
Point& rP1 = aP[1];
- rP0.X() = (sal_Int16)SVBT16ToShort( pHd->xa ) + nDrawXOfs2;
- rP0.Y() = (sal_Int16)SVBT16ToShort( pHd->ya ) + nDrawYOfs2;
+ rP0.X() = (sal_Int16)SVBT16ToShort( pHd->xa ) + m_nDrawXOfs2;
+ rP0.Y() = (sal_Int16)SVBT16ToShort( pHd->ya ) + m_nDrawYOfs2;
rP1 = rP0;
rP0.X() += (sal_Int16)SVBT16ToShort( aLine.xaStart );
rP0.Y() += (sal_Int16)SVBT16ToShort( aLine.yaStart );
@@ -356,8 +356,8 @@ SdrObject* SwWW8ImplReader::ReadRect( WW8_DPHEAD* pHd, const WW8_DO* pDo,
if( !ReadGrafStart( (void*)&aRect, sizeof( aRect ), pHd, pDo, rSet ) )
return 0;
- Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + nDrawXOfs2,
- (sal_Int16)SVBT16ToShort( pHd->ya ) + nDrawYOfs2 );
+ Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + m_nDrawXOfs2,
+ (sal_Int16)SVBT16ToShort( pHd->ya ) + m_nDrawYOfs2 );
Point aP1( aP0 );
aP1.X() += (sal_Int16)SVBT16ToShort( pHd->dxa );
aP1.Y() += (sal_Int16)SVBT16ToShort( pHd->dya );
@@ -378,8 +378,8 @@ SdrObject* SwWW8ImplReader::ReadElipse( WW8_DPHEAD* pHd, const WW8_DO* pDo,
if( !ReadGrafStart( (void*)&aElipse, sizeof( aElipse ), pHd, pDo, rSet ) )
return 0;
- Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + nDrawXOfs2,
- (sal_Int16)SVBT16ToShort( pHd->ya ) + nDrawYOfs2 );
+ Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + m_nDrawXOfs2,
+ (sal_Int16)SVBT16ToShort( pHd->ya ) + m_nDrawYOfs2 );
Point aP1( aP0 );
aP1.X() += (sal_Int16)SVBT16ToShort( pHd->dxa );
aP1.Y() += (sal_Int16)SVBT16ToShort( pHd->dya );
@@ -400,8 +400,8 @@ SdrObject* SwWW8ImplReader::ReadArc( WW8_DPHEAD* pHd, const WW8_DO* pDo,
if( !ReadGrafStart( (void*)&aArc, sizeof( aArc ), pHd, pDo, rSet ) )
return 0;
- Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + nDrawXOfs2,
- (sal_Int16)SVBT16ToShort( pHd->ya ) + nDrawYOfs2 );
+ Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + m_nDrawXOfs2,
+ (sal_Int16)SVBT16ToShort( pHd->ya ) + m_nDrawYOfs2 );
Point aP1( aP0 );
aP1.X() += (sal_Int16)SVBT16ToShort( pHd->dxa ) * 2;
aP1.Y() += (sal_Int16)SVBT16ToShort( pHd->dya ) * 2;
@@ -437,7 +437,7 @@ SdrObject* SwWW8ImplReader::ReadPolyLine( WW8_DPHEAD* pHd, const WW8_DO* pDo,
sal_uInt16 nCount = SVBT16ToShort( aPoly.aBits1 ) >> 1 & 0x7fff;
boost::scoped_array<SVBT16> xP(new SVBT16[nCount * 2]);
- bool bCouldRead = checkRead(*pStrm, xP.get(), nCount * 4); // Punkte einlesen
+ bool bCouldRead = checkRead(*m_pStrm, xP.get(), nCount * 4); // Punkte einlesen
OSL_ENSURE(bCouldRead, "Short PolyLine header");
if (!bCouldRead)
return 0;
@@ -446,9 +446,9 @@ SdrObject* SwWW8ImplReader::ReadPolyLine( WW8_DPHEAD* pHd, const WW8_DO* pDo,
Point aPt;
for (sal_uInt16 i=0; i<nCount; ++i)
{
- aPt.X() = SVBT16ToShort( xP[i << 1] ) + nDrawXOfs2
+ aPt.X() = SVBT16ToShort( xP[i << 1] ) + m_nDrawXOfs2
+ (sal_Int16)SVBT16ToShort( pHd->xa );
- aPt.Y() = SVBT16ToShort( xP[( i << 1 ) + 1] ) + nDrawYOfs2
+ aPt.Y() = SVBT16ToShort( xP[( i << 1 ) + 1] ) + m_nDrawYOfs2
+ (sal_Int16)SVBT16ToShort( pHd->ya );
aP[i] = aPt;
}
@@ -463,21 +463,21 @@ SdrObject* SwWW8ImplReader::ReadPolyLine( WW8_DPHEAD* pHd, const WW8_DO* pDo,
ESelection SwWW8ImplReader::GetESelection( long nCpStart, long nCpEnd )
{
- sal_Int32 nPCnt = mpDrawEditEngine->GetParagraphCount();
+ sal_Int32 nPCnt = m_pDrawEditEngine->GetParagraphCount();
sal_Int32 nSP = 0;
sal_Int32 nEP = 0;
while( (nSP < nPCnt)
- && (nCpStart >= mpDrawEditEngine->GetTextLen( nSP ) + 1) )
+ && (nCpStart >= m_pDrawEditEngine->GetTextLen( nSP ) + 1) )
{
- nCpStart -= mpDrawEditEngine->GetTextLen( nSP ) + 1;
+ nCpStart -= m_pDrawEditEngine->GetTextLen( nSP ) + 1;
nSP++;
}
// Beim Ende erst 1 Zeichen spaeter auf naechste Zeile umschalten,
// da sonst Zeilenattribute immer eine Zeile zu weit reichen.
while( (nEP < nPCnt)
- && (nCpEnd > mpDrawEditEngine->GetTextLen( nEP ) + 1) )
+ && (nCpEnd > m_pDrawEditEngine->GetTextLen( nEP ) + 1) )
{
- nCpEnd -= mpDrawEditEngine->GetTextLen( nEP ) + 1;
+ nCpEnd -= m_pDrawEditEngine->GetTextLen( nEP ) + 1;
nEP++;
}
return ESelection( nSP, nCpStart, nEP, nCpEnd );
@@ -508,7 +508,7 @@ void SwWW8ImplReader::InsertTxbxStyAttrs( SfxItemSet& rS, sal_uInt16 nColl )
{
SfxItemPool *pEditPool = rS.GetPool();
sal_uInt16 nWhich = i;
- sal_uInt16 nSlotId = rDoc.GetAttrPool().GetSlotId(nWhich);
+ sal_uInt16 nSlotId = m_rDoc.GetAttrPool().GetSlotId(nWhich);
if (
nSlotId && nWhich != nSlotId &&
0 != (nWhich = pEditPool->GetWhich(nSlotId)) &&
@@ -595,21 +595,21 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
paragraph mark as part of the paragraph text.
*/
WW8ReaderSave aSave(this);
- pPlcxMan = new WW8PLCFMan(pSBase, eType, nStartCp, true);
+ m_pPlcxMan = new WW8PLCFMan(m_pSBase, eType, nStartCp, true);
- WW8_CP nStart = pPlcxMan->Where();
+ WW8_CP nStart = m_pPlcxMan->Where();
WW8_CP nNext, nStartReplace=0;
bool bDoingSymbol = false;
- sal_Unicode cReplaceSymbol = cSymbol;
+ sal_Unicode cReplaceSymbol = m_cSymbol;
- SfxItemSet *pS = new SfxItemSet(mpDrawEditEngine->GetEmptyItemSet());
+ SfxItemSet *pS = new SfxItemSet(m_pDrawEditEngine->GetEmptyItemSet());
WW8PLCFManResult aRes;
std::deque<Chunk> aChunks;
// Here store stack location
- size_t nCurrentCount = pCtrlStck->size();
+ size_t nCurrentCount = m_pCtrlStck->size();
while (nStart < nEndCp)
{
// nStart is the beginning of the attributes for this range, and
@@ -619,8 +619,8 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
nTxtStart = nStartCp;
// get position of next SPRM
- bool bStartAttr = pPlcxMan->Get(&aRes);
- nAktColl = pPlcxMan->GetColl();
+ bool bStartAttr = m_pPlcxMan->Get(&aRes);
+ m_nAktColl = m_pPlcxMan->GetColl();
if (aRes.nSprmId)
{
if( bONLYnPicLocFc )
@@ -628,7 +628,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
if ( (68 == aRes.nSprmId) || (0x6A03 == aRes.nSprmId) )
{
Read_PicLoc(aRes.nSprmId, aRes.pMemPos +
- mpSprmParser->DistanceToData(aRes.nSprmId), 4);
+ m_pSprmParser->DistanceToData(aRes.nSprmId), 4);
// Ok, that's what we were looking for. Now let's get
// out of here!
break;
@@ -642,23 +642,23 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
if (bStartAttr)
{
ImportSprm(aRes.pMemPos, aRes.nSprmId);
- if (!bDoingSymbol && bSymbol)
+ if (!bDoingSymbol && m_bSymbol)
{
bDoingSymbol = true;
nStartReplace = nTxtStart;
- cReplaceSymbol = cSymbol;
+ cReplaceSymbol = m_cSymbol;
}
}
else
{
EndSprm( aRes.nSprmId );
- if (!bSymbol && bDoingSymbol)
+ if (!m_bSymbol && bDoingSymbol)
{
bDoingSymbol = false;
OUStringBuffer sTemp;
comphelper::string::padToLength(sTemp,
nTxtStart - nStartReplace, cReplaceSymbol);
- mpDrawEditEngine->QuickInsertText(sTemp.makeStringAndClear(),
+ m_pDrawEditEngine->QuickInsertText(sTemp.makeStringAndClear(),
GetESelection(nStartReplace - nStartCp,
nTxtStart - nStartCp ) );
}
@@ -668,13 +668,13 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
{
if (bStartAttr)
{
- size_t nCount = pCtrlStck->size();
- if (maFieldStack.empty() && Read_Field(&aRes))
+ size_t nCount = m_pCtrlStck->size();
+ if (m_aFieldStack.empty() && Read_Field(&aRes))
{
OUString sURL;
- for (size_t nI = pCtrlStck->size(); nI > nCount; --nI)
+ for (size_t nI = m_pCtrlStck->size(); nI > nCount; --nI)
{
- const SfxPoolItem *pItem = ((*pCtrlStck)[nI-1]).pAttr;
+ const SfxPoolItem *pItem = ((*m_pCtrlStck)[nI-1]).pAttr;
sal_uInt16 nWhich = pItem->Which();
if (nWhich == RES_TXTATR_INETFMT)
{
@@ -682,21 +682,21 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
static_cast<const SwFmtINetFmt *>(pItem);
sURL = pURL->GetValue();
}
- pCtrlStck->DeleteAndDestroy(nI-1);
+ m_pCtrlStck->DeleteAndDestroy(nI-1);
}
aChunks.push_back(Chunk(nStart, sURL));
}
}
else
{
- if (!maFieldStack.empty() && End_Field())
+ if (!m_aFieldStack.empty() && End_Field())
aChunks.back().SetEndPos(nStart+1);
}
}
}
- pPlcxMan->advance();
- nNext = pPlcxMan->Where();
+ m_pPlcxMan->advance();
+ nNext = m_pPlcxMan->Where();
const WW8_CP nEnd = ( nNext < nEndCp ) ? nNext : nEndCp;
if (!bONLYnPicLocFc && nNext != nStart && nEnd >= nStartCp)
@@ -706,16 +706,16 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
// Here read current properties and convert them into pS
// and put those attrs into the draw box if they can be converted
// to draw attributes
- if (pCtrlStck->size() - nCurrentCount)
+ if (m_pCtrlStck->size() - nCurrentCount)
{
- for (size_t i = nCurrentCount; i < pCtrlStck->size(); ++i)
+ for (size_t i = nCurrentCount; i < m_pCtrlStck->size(); ++i)
{
- const SfxPoolItem *pItem = ((*pCtrlStck)[i]).pAttr;
+ const SfxPoolItem *pItem = ((*m_pCtrlStck)[i]).pAttr;
sal_uInt16 nWhich = pItem->Which();
if( nWhich < RES_FLTRATTR_BEGIN ||
nWhich >= RES_FLTRATTR_END )
{
- sal_uInt16 nSlotId = rDoc.GetAttrPool().GetSlotId(nWhich);
+ sal_uInt16 nSlotId = m_rDoc.GetAttrPool().GetSlotId(nWhich);
if (
nSlotId && nWhich != nSlotId &&
0 != (nWhich = pEditPool->GetWhich(nSlotId)) &&
@@ -731,14 +731,14 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
}
}
// Fill in the remainder from the style
- InsertTxbxStyAttrs(*pS, nAktColl);
+ InsertTxbxStyAttrs(*pS, m_nAktColl);
if( pS->Count() )
{
- mpDrawEditEngine->QuickSetAttribs( *pS,
+ m_pDrawEditEngine->QuickSetAttribs( *pS,
GetESelection( nTxtStart - nStartCp, nEnd - nStartCp ) );
delete pS;
- pS = new SfxItemSet(mpDrawEditEngine->GetEmptyItemSet());
+ pS = new SfxItemSet(m_pDrawEditEngine->GetEmptyItemSet());
}
}
nStart = nNext;
@@ -747,8 +747,8 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
// pop off as far as recorded location just in case there were some left
// unclosed
- for (size_t nI = pCtrlStck->size(); nI > nCurrentCount; --nI)
- pCtrlStck->DeleteAndDestroy(nI-1);
+ for (size_t nI = m_pCtrlStck->size(); nI > nCurrentCount; --nI)
+ m_pCtrlStck->DeleteAndDestroy(nI-1);
typedef std::deque<Chunk>::iterator myIter;
myIter aEnd = aChunks.end();
@@ -756,7 +756,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
{
ESelection aSel(GetESelection(aIter->GetStartPos()-nStartCp,
aIter->GetEndPos()-nStartCp));
- OUString aString(mpDrawEditEngine->GetText(aSel));
+ OUString aString(m_pDrawEditEngine->GetText(aSel));
const sal_Int32 nOrigLen = aString.getLength();
long nDummy(0);
lcl_StripFields(aString, nDummy);
@@ -766,12 +766,12 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
{
SvxURLField aURL(aIter->GetURL(), aString,
SVXURLFORMAT_APPDEFAULT);
- mpDrawEditEngine->QuickInsertField(SvxFieldItem(aURL, EE_FEATURE_FIELD), aSel);
+ m_pDrawEditEngine->QuickInsertField(SvxFieldItem(aURL, EE_FEATURE_FIELD), aSel);
nChanged = nOrigLen - 1;
}
else
{
- mpDrawEditEngine->QuickInsertText(aString, aSel);
+ m_pDrawEditEngine->QuickInsertText(aString, aSel);
nChanged = nOrigLen - aString.getLength();
}
for (myIter aIter2 = aIter+1; aIter2 != aEnd; ++aIter2)
@@ -789,7 +789,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
sal_uInt16 nTxBxS, sal_uInt16 nSequence)
{
// grab the TextBox-PLCF quickly
- WW8PLCFspecial* pT = pPlcxMan ? pPlcxMan->GetTxbx() : 0;
+ WW8PLCFspecial* pT = m_pPlcxMan ? m_pPlcxMan->GetTxbx() : 0;
if( !pT )
{
OSL_ENSURE( false, "+Wo ist der Grafik-Text (1) ?" );
@@ -840,7 +840,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
long nMinStartCp = rStartCp;
long nMaxEndCp = rEndCp;
// rasch den TextBox-Break-Deskriptor-PLCF greifen
- pT = pPlcxMan->GetTxbxBkd();
+ pT = m_pPlcxMan->GetTxbxBkd();
if (!pT) // It can occur on occasion, Caolan
return false;
@@ -885,7 +885,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
// den um -2 (bzw. -1 bei Ver8) korrigierten End-Cp zurueck
bool SwWW8ImplReader::GetRangeAsDrawingString(OUString& rString, long nStartCp, long nEndCp, ManTypes eType)
{
- WW8_CP nOffset = pWwFib->GetBaseCp(eType);
+ WW8_CP nOffset = m_pWwFib->GetBaseCp(eType);
OSL_ENSURE(nStartCp <= nEndCp, "+Wo ist der Grafik-Text (7) ?");
if (nStartCp == nEndCp)
@@ -893,7 +893,7 @@ bool SwWW8ImplReader::GetRangeAsDrawingString(OUString& rString, long nStartCp,
else if (nStartCp < nEndCp)
{
// den Text einlesen: kann sich ueber mehrere Pieces erstrecken!!!
- const sal_Int32 nLen = pSBase->WW8ReadString(*pStrm, rString,
+ const sal_Int32 nLen = m_pSBase->WW8ReadString(*m_pStrm, rString,
nStartCp + nOffset, nEndCp - nStartCp, GetCurrentCharSet());
OSL_ENSURE(nLen, "+Wo ist der Grafik-Text (8) ?");
if (nLen>0)
@@ -914,27 +914,27 @@ OutlinerParaObject* SwWW8ImplReader::ImportAsOutliner(OUString &rString, WW8_CP
if (GetRangeAsDrawingString( rString, nStartCp, nEndCp, eType ))
{
- if (!mpDrawEditEngine)
- mpDrawEditEngine = new EditEngine(0);
+ if (!m_pDrawEditEngine)
+ m_pDrawEditEngine = new EditEngine(0);
- mpDrawEditEngine->SetText(rString);
+ m_pDrawEditEngine->SetText(rString);
InsertAttrsAsDrawingAttrs(nStartCp, nEndCp, eType);
// Annotations typically begin with a (useless) 0x5
- if ((eType == MAN_AND) && mpDrawEditEngine->GetTextLen())
+ if ((eType == MAN_AND) && m_pDrawEditEngine->GetTextLen())
{
ESelection aFirstChar(0, 0, 0, 1);
- if (comphelper::string::equals(mpDrawEditEngine->GetText( aFirstChar ), 0x5))
- mpDrawEditEngine->QuickDelete(aFirstChar);
+ if (comphelper::string::equals(m_pDrawEditEngine->GetText( aFirstChar ), 0x5))
+ m_pDrawEditEngine->QuickDelete(aFirstChar);
}
- EditTextObject* pTemporaryText = mpDrawEditEngine->CreateTextObject();
+ EditTextObject* pTemporaryText = m_pDrawEditEngine->CreateTextObject();
pRet = new OutlinerParaObject(*pTemporaryText);
pRet->SetOutlinerMode( OUTLINERMODE_TEXTOBJECT );
delete pTemporaryText;
- mpDrawEditEngine->SetText( OUString() );
- mpDrawEditEngine->SetParaAttribs(0, mpDrawEditEngine->GetEmptyItemSet());
+ m_pDrawEditEngine->SetText( OUString() );
+ m_pDrawEditEngine->SetParaAttribs(0, m_pDrawEditEngine->GetEmptyItemSet());
// Strip out fields, leaving the result
long nDummy(0);
@@ -959,9 +959,9 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
bool* pbContainsGraphics, SvxMSDffImportRec* pRecord)
{
SwFrmFmt* pFlyFmt = 0;
- sal_uLong nOld = pStrm->Tell();
+ sal_uLong nOld = m_pStrm->Tell();
- ManTypes eType = pPlcxMan->GetManType() == MAN_HDFT ? MAN_TXBX_HDFT : MAN_TXBX;
+ ManTypes eType = m_pPlcxMan->GetManType() == MAN_HDFT ? MAN_TXBX_HDFT : MAN_TXBX;
rbEraseTextObj = false;
@@ -971,10 +971,10 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
bool bTextWasRead = GetTxbxTextSttEndCp( nStartCp, nEndCp, nTxBxS,
nSequence ) && GetRangeAsDrawingString( aString, nStartCp, nEndCp, eType );
- if (!mpDrawEditEngine)
- mpDrawEditEngine = new EditEngine(0);
+ if (!m_pDrawEditEngine)
+ m_pDrawEditEngine = new EditEngine(0);
if( pObjSiz )
- mpDrawEditEngine->SetPaperSize( *pObjSiz );
+ m_pDrawEditEngine->SetPaperSize( *pObjSiz );
const OUString aOrigString(aString);
if( bTextWasRead )
@@ -995,17 +995,17 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
if (!pbTestTxbxContainsText)
{
WW8ReaderSave aSave(this, nNewStartCp -1);
- bool bOldEmbeddObj = bEmbeddObj;
+ bool bOldEmbeddObj = m_bEmbeddObj;
// bEmbedd Ordinarily would have been set by field
// parse, but this is impossible here so...
- bEmbeddObj = true;
+ m_bEmbeddObj = true;
// 1st look for OLE- or Graph-Indicator Sprms
- WW8PLCFx_Cp_FKP* pChp = pPlcxMan->GetChpPLCF();
+ WW8PLCFx_Cp_FKP* pChp = m_pPlcxMan->GetChpPLCF();
WW8PLCFxDesc aDesc;
pChp->GetSprms( &aDesc );
WW8SprmIter aSprmIter(aDesc.pMemPos, aDesc.nSprmsLen,
- *mpSprmParser);
+ *m_pSprmParser);
for( int nLoop = 0; nLoop < 2; ++nLoop )
{
@@ -1039,10 +1039,10 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
}
}
aSave.Restore(this);
- bEmbeddObj=bOldEmbeddObj;
+ m_bEmbeddObj=bOldEmbeddObj;
// then import either an OLE of a Graphic
- if( bObj )
+ if( m_bObj )
{
if( bMakeSdrGrafObj && pTextObj &&
pTextObj->GetUpGroup() )
@@ -1061,7 +1061,7 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
GrafikCtor();
- pNew->SetModel( pDrawModel );
+ pNew->SetModel( m_pDrawModel );
pNew->SetLogicRect( pTextObj->GetCurrentBoundRect() );
pNew->SetLayer( pTextObj->GetLayer() );
@@ -1070,7 +1070,7 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
}
else
pFlyFmt = ImportOle();
- bObj = false;
+ m_bObj = false;
}
else
{
@@ -1082,7 +1082,7 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
}
break;
case 0x8:
- if ( (!pbTestTxbxContainsText) && (!bObj) )
+ if ( (!pbTestTxbxContainsText) && (!m_bObj) )
pFlyFmt = Read_GrafLayer( nPosCp );
break;
default:
@@ -1096,7 +1096,7 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
{
if( pRecord )
{
- SfxItemSet aFlySet( rDoc.GetAttrPool(),
+ SfxItemSet aFlySet( m_rDoc.GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
Rectangle aInnerDist( pRecord->nDxTextLeft,
@@ -1132,12 +1132,12 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
{
if( bTextWasRead )
{
- mpDrawEditEngine->SetText(aOrigString);
+ m_pDrawEditEngine->SetText(aOrigString);
InsertAttrsAsDrawingAttrs(nStartCp, nEndCp, eType);
}
bool bVertical = pTextObj->IsVerticalWriting();
- EditTextObject* pTemporaryText = mpDrawEditEngine->CreateTextObject();
+ EditTextObject* pTemporaryText = m_pDrawEditEngine->CreateTextObject();
OutlinerParaObject* pOp = new OutlinerParaObject(*pTemporaryText);
pOp->SetOutlinerMode( OUTLINERMODE_TEXTOBJECT );
pOp->SetVertical( bVertical );
@@ -1151,11 +1151,11 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
// Vorgehen: Text loeschen = auf 1 Absatz reduzieren
// und an diesem Absatz die Absatzattribute und Styles loeschen
// (Empfehlung JOE)
- mpDrawEditEngine->SetText( OUString() );
- mpDrawEditEngine->SetParaAttribs(0, mpDrawEditEngine->GetEmptyItemSet());
+ m_pDrawEditEngine->SetText( OUString() );
+ m_pDrawEditEngine->SetParaAttribs(0, m_pDrawEditEngine->GetEmptyItemSet());
}
- pStrm->Seek( nOld );
+ m_pStrm->Seek( nOld );
if (pbContainsGraphics)
*pbContainsGraphics = bContainsGraphics;
return pFlyFmt;
@@ -1180,14 +1180,14 @@ SdrObject* SwWW8ImplReader::ReadTxtBox( WW8_DPHEAD* pHd, const WW8_DO* pDo,
if( !ReadGrafStart( (void*)&aTxtB, sizeof( aTxtB ), pHd, pDo, rSet ) )
return 0;
- Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + nDrawXOfs2,
- (sal_Int16)SVBT16ToShort( pHd->ya ) + nDrawYOfs2 );
+ Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + m_nDrawXOfs2,
+ (sal_Int16)SVBT16ToShort( pHd->ya ) + m_nDrawYOfs2 );
Point aP1( aP0 );
aP1.X() += (sal_Int16)SVBT16ToShort( pHd->dxa );
aP1.Y() += (sal_Int16)SVBT16ToShort( pHd->dya );
SdrObject* pObj = new SdrRectObj( OBJ_TEXT, Rectangle( aP0, aP1 ) );
- pObj->SetModel( pDrawModel );
+ pObj->SetModel( m_pDrawModel );
pObj->NbcSetSnapRect(Rectangle(aP0, aP1));
Size aSize( (sal_Int16)SVBT16ToShort( pHd->dxa ) ,
(sal_Int16)SVBT16ToShort( pHd->dya ) );
@@ -1225,7 +1225,7 @@ SdrObject* SwWW8ImplReader::ReadCaptionBox( WW8_DPHEAD* pHd, const WW8_DO* pDo,
sal_uInt16 nCount = SVBT16ToShort( aCallB.dpPolyLine.aBits1 ) >> 1 & 0x7fff;
boost::scoped_array<SVBT16> xP(new SVBT16[nCount * 2]);
- bool bCouldRead = checkRead(*pStrm, xP.get(), nCount * 4); // Punkte einlesen
+ bool bCouldRead = checkRead(*m_pStrm, xP.get(), nCount * 4); // Punkte einlesen
OSL_ENSURE(bCouldRead, "Short CaptionBox header");
if (!bCouldRead)
return 0;
@@ -1235,22 +1235,22 @@ SdrObject* SwWW8ImplReader::ReadCaptionBox( WW8_DPHEAD* pHd, const WW8_DO* pDo,
nTyp = 0;
Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) +
- (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.xa ) + nDrawXOfs2,
+ (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.xa ) + m_nDrawXOfs2,
(sal_Int16)SVBT16ToShort( pHd->ya )
- + (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.ya ) + nDrawYOfs2 );
+ + (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.ya ) + m_nDrawYOfs2 );
Point aP1( aP0 );
aP1.X() += (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.dxa );
aP1.Y() += (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.dya );
Point aP2( (sal_Int16)SVBT16ToShort( pHd->xa )
+ (sal_Int16)SVBT16ToShort( aCallB.dpheadPolyLine.xa )
- + nDrawXOfs2 + (sal_Int16)SVBT16ToShort( xP[0] ),
+ + m_nDrawXOfs2 + (sal_Int16)SVBT16ToShort( xP[0] ),
(sal_Int16)SVBT16ToShort( pHd->ya )
+ (sal_Int16)SVBT16ToShort( aCallB.dpheadPolyLine.ya )
- + nDrawYOfs2 + (sal_Int16)SVBT16ToShort( xP[1] ) );
+ + m_nDrawYOfs2 + (sal_Int16)SVBT16ToShort( xP[1] ) );
xP.reset();
SdrCaptionObj* pObj = new SdrCaptionObj( Rectangle( aP0, aP1 ), aP2 );
- pObj->SetModel( pDrawModel );
+ pObj->SetModel( m_pDrawModel );
pObj->NbcSetSnapRect(Rectangle(aP0, aP1));
Size aSize( (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.dxa ),
(sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.dya ) );
@@ -1280,15 +1280,15 @@ SdrObject *SwWW8ImplReader::ReadGroup( WW8_DPHEAD* pHd, const WW8_DO* pDo,
nGrouped = (sal_Int16)OSL_SWAPWORD( nGrouped );
#endif
- nDrawXOfs = nDrawXOfs + (sal_Int16)SVBT16ToShort( pHd->xa );
- nDrawYOfs = nDrawYOfs + (sal_Int16)SVBT16ToShort( pHd->ya );
+ m_nDrawXOfs = m_nDrawXOfs + (sal_Int16)SVBT16ToShort( pHd->xa );
+ m_nDrawYOfs = m_nDrawYOfs + (sal_Int16)SVBT16ToShort( pHd->ya );
SdrObject* pObj = new SdrObjGroup;
short nLeft = (sal_Int16)SVBT16ToShort( pHd->cb ) - sizeof( WW8_DPHEAD );
for (int i = 0; i < nGrouped; i++)
{
- SfxAllItemSet aSet(pDrawModel->GetItemPool());
+ SfxAllItemSet aSet(m_pDrawModel->GetItemPool());
if (SdrObject *pObject = ReadGrafPrimitive(nLeft, pDo, aSet))
{
// first add and then set ItemSet
@@ -1300,8 +1300,8 @@ SdrObject *SwWW8ImplReader::ReadGroup( WW8_DPHEAD* pHd, const WW8_DO* pDo,
}
}
- nDrawXOfs = nDrawXOfs - (sal_Int16)SVBT16ToShort( pHd->xa );
- nDrawYOfs = nDrawYOfs - (sal_Int16)SVBT16ToShort( pHd->ya );
+ m_nDrawXOfs = m_nDrawXOfs - (sal_Int16)SVBT16ToShort( pHd->xa );
+ m_nDrawYOfs = m_nDrawYOfs - (sal_Int16)SVBT16ToShort( pHd->ya );
return pObj;
}
@@ -1313,7 +1313,7 @@ SdrObject* SwWW8ImplReader::ReadGrafPrimitive( short& rLeft, const WW8_DO* pDo,
// into an object hierarachy with a little effort.
SdrObject *pRet=0;
WW8_DPHEAD aHd; // Lese Draw-Primitive-Header
- bool bCouldRead = checkRead(*pStrm, &aHd, sizeof(WW8_DPHEAD));
+ bool bCouldRead = checkRead(*m_pStrm, &aHd, sizeof(WW8_DPHEAD));
OSL_ENSURE(bCouldRead, "Graphic Primitive header short read" );
if (!bCouldRead)
{
@@ -1351,7 +1351,7 @@ SdrObject* SwWW8ImplReader::ReadGrafPrimitive( short& rLeft, const WW8_DO* pDo,
pRet = ReadCaptionBox( &aHd, pDo, rSet );
break;
default: // unbekannt
- pStrm->SeekRel(SVBT16ToShort(aHd.cb) - sizeof(WW8_DPHEAD));
+ m_pStrm->SeekRel(SVBT16ToShort(aHd.cb) - sizeof(WW8_DPHEAD));
break;
}
}
@@ -1380,14 +1380,14 @@ void SwWW8ImplReader::ReadGrafLayer1( WW8PLCFspecial* pPF, long nGrafAnchorCp )
return;
}
- bool bCouldSeek = checkSeek(*pStrm, SVBT32ToUInt32(pF->fc));
+ bool bCouldSeek = checkSeek(*m_pStrm, SVBT32ToUInt32(pF->fc));
OSL_ENSURE(bCouldSeek, "Invalid Graphic offset");
if (!bCouldSeek)
return;
// Lese Draw-Header
WW8_DO aDo;
- bool bCouldRead = checkRead(*pStrm, &aDo, sizeof(WW8_DO));
+ bool bCouldRead = checkRead(*m_pStrm, &aDo, sizeof(WW8_DO));
OSL_ENSURE(bCouldRead, "Short Graphic header");
if (!bCouldRead)
return;
@@ -1395,13 +1395,13 @@ void SwWW8ImplReader::ReadGrafLayer1( WW8PLCFspecial* pPF, long nGrafAnchorCp )
short nLeft = SVBT16ToShort( aDo.cb ) - sizeof( WW8_DO );
while (nLeft > static_cast<short>(sizeof(WW8_DPHEAD)))
{
- SfxAllItemSet aSet( pDrawModel->GetItemPool() );
+ SfxAllItemSet aSet( m_pDrawModel->GetItemPool() );
if (SdrObject *pObject = ReadGrafPrimitive( nLeft, &aDo, aSet ))
{
- pWWZOrder->InsertDrawingObject(pObject, SVBT16ToShort(aDo.dhgt));
- SwFrmFmt *pFrm = rDoc.getIDocumentContentOperations().InsertDrawObj( *pPaM, *pObject, aSet );
+ m_pWWZOrder->InsertDrawingObject(pObject, SVBT16ToShort(aDo.dhgt));
+ SwFrmFmt *pFrm = m_rDoc.getIDocumentContentOperations().InsertDrawObj( *m_pPaM, *pObject, aSet );
pObject->SetMergedItemSet(aSet);
- pAnchorStck->AddAnchor(*pPaM->GetPoint(), pFrm);
+ m_pAnchorStck->AddAnchor(*m_pPaM->GetPoint(), pFrm);
}
}
}
@@ -1994,7 +1994,7 @@ SwWW8ImplReader::SetAttributesAtGrfNode(SvxMSDffImportRec const*const pRecord,
{
const SwNodeIndex* pIdx = pFlyFmt->GetCntnt(false).GetCntntIdx();
SwGrfNode* pGrfNd;
- if( pIdx && 0 != (pGrfNd = rDoc.GetNodes()[pIdx->GetIndex() + 1]->GetGrfNode() ))
+ if( pIdx && 0 != (pGrfNd = m_rDoc.GetNodes()[pIdx->GetIndex() + 1]->GetGrfNode() ))
{
Size aSz(pGrfNd->GetTwipSize());
// use type <sal_uInt64> instead of sal_uLong to get correct results
@@ -2075,14 +2075,14 @@ SdrObject* SwWW8ImplReader::CreateContactObject(SwFrmFmt* pFlyFmt)
{
if (pFlyFmt)
{
- SdrObject* pNewObject = mbNewDoc ? 0 : pFlyFmt->FindRealSdrObject();
+ SdrObject* pNewObject = m_bNewDoc ? 0 : pFlyFmt->FindRealSdrObject();
if (!pNewObject)
pNewObject = pFlyFmt->FindSdrObject();
if (!pNewObject && pFlyFmt->ISA(SwFlyFrmFmt))
{
SwFlyDrawContact* pContactObject
= new SwFlyDrawContact(static_cast<SwFlyFrmFmt*>(pFlyFmt),
- pDrawModel);
+ m_pDrawModel);
pNewObject = pContactObject->GetMaster();
}
return pNewObject;
@@ -2097,9 +2097,9 @@ bool SwWW8ImplReader::MiserableRTLGraphicsHack(SwTwips &rLeft, SwTwips nWidth,
if (!IsRightToLeft())
return false;
return RTLGraphicsHack(rLeft, nWidth, eHoriOri, eHoriRel,
- maSectionManager.GetPageLeft(),
- maSectionManager.GetPageRight(),
- maSectionManager.GetPageWidth());
+ m_aSectionManager.GetPageLeft(),
+ m_aSectionManager.GetPageRight(),
+ m_aSectionManager.GetPageWidth());
}
RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
@@ -2108,7 +2108,7 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
OSL_ENSURE(pRecord || pFSPA, "give me something! to work with for anchoring");
if (!pRecord && !pFSPA)
return FLY_AT_PAGE;
- bool bCurSectionVertical = maSectionManager.CurrentSectionIsVertical();
+ bool bCurSectionVertical = m_aSectionManager.CurrentSectionIsVertical();
SvxMSDffImportRec aRecordFromFSPA;
if (!pRecord)
@@ -2146,7 +2146,7 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
// by <SwMSDffManager::ProcessObj(..)>
const bool bXYRelHaveDefaultValues = *(pRecord->pXRelTo) == 2 && *(pRecord->pYRelTo) == 2;
if ( bXYRelHaveDefaultValues
- && nInTable > 0
+ && m_nInTable > 0
&& !bCurSectionVertical )
{
if ( pFSPA->nby != *(pRecord->pYRelTo) )
@@ -2162,7 +2162,7 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
RndStdIds eAnchor = IsInlineEscherHack() ? FLY_AS_CHAR : FLY_AT_CHAR; // #i43718#
SwFmtAnchor aAnchor( eAnchor );
- aAnchor.SetAnchor( pPaM->GetPoint() );
+ aAnchor.SetAnchor( m_pPaM->GetPoint() );
rFlySet.Put( aAnchor );
if (pFSPA)
@@ -2267,7 +2267,7 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
// at frame|character and has wrap through, but its attribute
// 'layout in table cell' isn't set, convert its horizontal alignment to page text area.
// #i84783# - use new method <IsObjectLayoutInTableCell()>
- if ( nInTable &&
+ if ( m_nInTable &&
( eHoriRel == text::RelOrientation::FRAME || eHoriRel == text::RelOrientation::CHAR ) &&
pFSPA->nwr == 3 &&
!IsObjectLayoutInTableCell( pRecord->nLayoutInTableCell ) )
@@ -2325,9 +2325,9 @@ bool SwWW8ImplReader::IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTable
{
bool bIsObjectLayoutInTableCell = false;
- if ( bVer8 )
+ if ( m_bVer8 )
{
- const sal_uInt16 nWWVersion = pWwFib->nProduct & 0xE000;
+ const sal_uInt16 nWWVersion = m_pWwFib->nProduct & 0xE000;
switch ( nWWVersion )
{
case 0x0000: // version 8 aka Microsoft Word 97
@@ -2371,30 +2371,30 @@ bool SwWW8ImplReader::IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTable
SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
{
- if( nIniFlags & WW8FL_NO_GRAFLAYER )
+ if( m_nIniFlags & WW8FL_NO_GRAFLAYER )
return 0;
- ::SetProgressState(nProgress, mpDocShell); // Update
+ ::SetProgressState(m_nProgress, m_pDocShell); // Update
- nDrawCpO = pWwFib->GetBaseCp(pPlcxMan->GetManType() == MAN_HDFT ? MAN_TXBX_HDFT : MAN_TXBX);
+ m_nDrawCpO = m_pWwFib->GetBaseCp(m_pPlcxMan->GetManType() == MAN_HDFT ? MAN_TXBX_HDFT : MAN_TXBX);
GrafikCtor();
- WW8PLCFspecial* pPF = pPlcxMan->GetFdoa();
+ WW8PLCFspecial* pPF = m_pPlcxMan->GetFdoa();
if( !pPF )
{
OSL_ENSURE( false, "Where is the graphic (1) ?" );
return 0;
}
- if( bVer67 )
+ if( m_bVer67 )
{
- long nOldPos = pStrm->Tell();
+ long nOldPos = m_pStrm->Tell();
- nDrawXOfs = nDrawYOfs = 0;
+ m_nDrawXOfs = m_nDrawYOfs = 0;
ReadGrafLayer1( pPF, nGrafAnchorCp );
- pStrm->Seek( nOldPos );
+ m_pStrm->Seek( nOldPos );
return 0;
}
@@ -2419,8 +2419,8 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
return 0;
}
- if (!pMSDffManager->GetModel())
- pMSDffManager->SetModel(pDrawModel, 1440);
+ if (!m_pMSDffManager->GetModel())
+ m_pMSDffManager->SetModel(m_pDrawModel, 1440);
Rectangle aRect(pF->nXaLeft, pF->nYaTop, pF->nXaRight, pF->nYaBottom);
SvxMSDffImportData aData( aRect );
@@ -2430,13 +2430,13 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
The SdrOle2Obj will try and manage any ole objects it finds, causing all
sorts of trouble later on
*/
- SwDocShell* pPersist = rDoc.GetDocShell();
- rDoc.SetDocShell(0); // #i20540# Persist guard
+ SwDocShell* pPersist = m_rDoc.GetDocShell();
+ m_rDoc.SetDocShell(0); // #i20540# Persist guard
SdrObject* pObject = 0;
- bool bOk = (pMSDffManager->GetShape(pF->nSpId, pObject, aData) && pObject);
+ bool bOk = (m_pMSDffManager->GetShape(pF->nSpId, pObject, aData) && pObject);
- rDoc.SetDocShell(pPersist); // #i20540# Persist guard
+ m_rDoc.SetDocShell(pPersist); // #i20540# Persist guard
if (!bOk)
{
@@ -2465,7 +2465,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
// when in a header or footer word appears to treat all elements as wrap through
// Umfluss-Modus ermitteln
- SfxItemSet aFlySet(rDoc.GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1);
+ SfxItemSet aFlySet(m_rDoc.GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1);
SwSurround eSurround = SURROUND_PARALLEL;
bool bContour = false;
switch (pF->nwr)
@@ -2545,7 +2545,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
return 0;
const bool bLayoutInTableCell =
- nInTable && IsObjectLayoutInTableCell( pRecord->nLayoutInTableCell );
+ m_nInTable && IsObjectLayoutInTableCell( pRecord->nLayoutInTableCell );
// #i18732# - Switch on 'follow text flow', if object is laid out
// inside table cell and its wrapping isn't 'SURROUND_THROUGH'
@@ -2601,7 +2601,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
// both flags <bBelowText> and <bDrawHell> have to be set to move object into the background.
// #i46794# - it reveals that value of flag <bBelowText> can be neglected.
const bool bMoveToBackgrd = pRecord->bDrawHell ||
- ( ( bIsHeader || bIsFooter ) && pF->nwr == 3 );
+ ( ( m_bIsHeader || m_bIsFooter ) && pF->nwr == 3 );
if ( bMoveToBackgrd )
aFlySet.Put(SvxOpaqueItem(RES_OPAQUE,false));
@@ -2627,7 +2627,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
bReplaceable);
// Should we, and is it possible to make this into a writer textbox
- if ((!(nIniFlags1 & WW8FL_NO_FLY_FOR_TXBX)) && pRecord->bReplaceByFly)
+ if ((!(m_nIniFlags1 & WW8FL_NO_FLY_FOR_TXBX)) && pRecord->bReplaceByFly)
{
pRetFrmFmt = ConvertDrawTextToFly(pObject, pOurNewObject, pRecord,
eAnchor, pF, aFlySet);
@@ -2637,7 +2637,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
if (!bDone)
{
- sw::util::SetLayer aSetLayer(rDoc);
+ sw::util::SetLayer aSetLayer(m_rDoc);
if ( bMoveToBackgrd )
aSetLayer.SendObjectToHell(*pObject);
else
@@ -2647,15 +2647,15 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
{
/* Need to make sure that the correct layer ordering is applied. */
// pass information, if object is in page header|footer to method.
- pWWZOrder->InsertEscherObject( pObject, pF->nSpId,
- bIsHeader || bIsFooter );
+ m_pWWZOrder->InsertEscherObject( pObject, pF->nSpId,
+ m_bIsHeader || m_bIsFooter );
}
else
{
- pWWZOrder->InsertTextLayerObject(pObject);
+ m_pWWZOrder->InsertTextLayerObject(pObject);
}
- pRetFrmFmt = rDoc.getIDocumentContentOperations().InsertDrawObj(*pPaM, *pObject, aFlySet );
+ pRetFrmFmt = m_rDoc.getIDocumentContentOperations().InsertDrawObj(*m_pPaM, *pObject, aFlySet );
OSL_ENSURE(pRetFrmFmt->GetAnchor().GetAnchorId() ==
eAnchor, "Not the anchor type requested!");
@@ -2703,7 +2703,7 @@ SwFrmFmt *SwWW8ImplReader::AddAutoAnchor(SwFrmFmt *pFmt)
*/
if ((pFmt) && (pFmt->GetAnchor().GetAnchorId() != FLY_AS_CHAR))
{
- pAnchorStck->AddAnchor(*pPaM->GetPoint(), pFmt);
+ m_pAnchorStck->AddAnchor(*m_pPaM->GetPoint(), pFmt);
}
return pFmt;
}
@@ -2720,7 +2720,7 @@ SwFrmFmt* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
// Gruppe ein, um den Text zu halten.
pSdrTextObj = new SdrRectObj( OBJ_TEXT, pThisGroup->GetCurrentBoundRect());
- SfxItemSet aSet(pDrawModel->GetItemPool());
+ SfxItemSet aSet(m_pDrawModel->GetItemPool());
aSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
aSet.Put(XLineStyleItem(drawing::LineStyle_NONE));
aSet.Put(SdrTextFitToSizeTypeItem( SDRTEXTFIT_NONE ));
@@ -2770,7 +2770,7 @@ SwFrmFmt* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
if (pSdrTextObj != pNewObj)
{
// Objekt in der Z-Order-Liste ersetzen
- pMSDffManager->ExchangeInShapeOrder(pSdrTextObj, 0,0, pNewObj);
+ m_pMSDffManager->ExchangeInShapeOrder(pSdrTextObj, 0,0, pNewObj);
// Objekt jetzt noch loeschen
SdrObject::Free( pRecord->pObj );
// und das neue Objekt merken.
@@ -2780,13 +2780,13 @@ SwFrmFmt* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
else
{
// Objekt aus der Z-Order-Liste loeschen
- pMSDffManager->RemoveFromShapeOrder( pSdrTextObj );
+ m_pMSDffManager->RemoveFromShapeOrder( pSdrTextObj );
// Objekt aus der Drawing-Page rausnehmen
if( pSdrTextObj->GetPage() )
- pDrawPg->RemoveObject( pSdrTextObj->GetOrdNum() );
+ m_pDrawPg->RemoveObject( pSdrTextObj->GetOrdNum() );
// und FrameFormat entfernen, da durch Grafik ersetzt (dies
// loescht auch das Objekt)
- rDoc.DelFrmFmt( pRetFrmFmt );
+ m_rDoc.DelFrmFmt( pRetFrmFmt );
pRetFrmFmt = 0;
// auch den Objektmerker loeschen
pRecord->pObj = 0;
@@ -2795,7 +2795,7 @@ SwFrmFmt* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
else
{
// ww8-default Randabstand einsetzen
- SfxItemSet aItemSet(pDrawModel->GetItemPool(),
+ SfxItemSet aItemSet(m_pDrawModel->GetItemPool(),
SDRATTR_TEXT_LEFTDIST, SDRATTR_TEXT_LOWERDIST);
aItemSet.Put( makeSdrTextLeftDistItem( pRecord->nDxTextLeft ) );
aItemSet.Put( makeSdrTextRightDistItem( pRecord->nDxTextRight ) );
@@ -2838,7 +2838,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
if (pSdrTextObj && pSdrTextObj->IsVerticalWriting())
rFlySet.Put(SvxFrameDirectionItem(FRMDIR_VERT_TOP_RIGHT, RES_FRAMEDIR));
- pRetFrmFmt = rDoc.MakeFlySection(eAnchor, pPaM->GetPoint(), &rFlySet);
+ pRetFrmFmt = m_rDoc.MakeFlySection(eAnchor, m_pPaM->GetPoint(), &rFlySet);
OSL_ENSURE(pRetFrmFmt->GetAnchor().GetAnchorId() == eAnchor,
"Not the anchor type requested!");
@@ -2847,7 +2847,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
rpOurNewObject = CreateContactObject(pRetFrmFmt);
// remove old object from the Z-Order list
- pMSDffManager->RemoveFromShapeOrder( rpObject );
+ m_pMSDffManager->RemoveFromShapeOrder( rpObject );
// and delete the object
SdrObject::Free( rpObject );
@@ -2868,7 +2868,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
contact object, while a raw rpOutNewObject stored here becomes
deleted and useless.
*/
- pMSDffManager->StoreShapeOrder(pF->nSpId,
+ m_pMSDffManager->StoreShapeOrder(pF->nSpId,
(((sal_uLong)pRecord->aTextId.nTxBxS) << 16) +
pRecord->aTextId.nSequence, 0, pRetFrmFmt);
@@ -2877,8 +2877,8 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
if (!rpOurNewObject->IsInserted())
{
// pass information, if object is in page header|footer to method.
- pWWZOrder->InsertEscherObject( rpOurNewObject, pF->nSpId,
- bIsHeader || bIsFooter );
+ m_pWWZOrder->InsertEscherObject( rpOurNewObject, pF->nSpId,
+ m_bIsHeader || m_bIsFooter );
}
}
@@ -2890,17 +2890,17 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
MoveInsideFly(pRetFrmFmt);
- SwNodeIndex aStart(pPaM->GetPoint()->nNode);
+ SwNodeIndex aStart(m_pPaM->GetPoint()->nNode);
- pWWZOrder->InsideEscher(pF->nSpId);
+ m_pWWZOrder->InsideEscher(pF->nSpId);
// read in the text
- bTxbxFlySection = true;
+ m_bTxbxFlySection = true;
bool bJoined = ReadText(nStartCp, (nEndCp-nStartCp),
- MAN_MAINTEXT == pPlcxMan->GetManType() ?
+ MAN_MAINTEXT == m_pPlcxMan->GetManType() ?
MAN_TXBX : MAN_TXBX_HDFT);
- pWWZOrder->OutsideEscher();
+ m_pWWZOrder->OutsideEscher();
MoveOutsideFly(pRetFrmFmt, aSave.GetStartPos(),!bJoined);
@@ -2945,7 +2945,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
rFlySet.Put(SwFmtFrmSize(ATT_FIX_SIZE, nWidthTw, nHeightTw));
- SfxItemSet aGrSet(rDoc.GetAttrPool(), RES_GRFATR_BEGIN, RES_GRFATR_END-1);
+ SfxItemSet aGrSet(m_rDoc.GetAttrPool(), RES_GRFATR_BEGIN, RES_GRFATR_END-1);
if (pRecord)
{
@@ -2971,14 +2971,14 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
GraphicType eType = pGrf->GetGraphicType();
OUString aGrfName(
URIHelper::SmartRel2Abs(
- INetURLObject(sBaseURL), pGrf->GetFileName(),
+ INetURLObject(m_sBaseURL), pGrf->GetFileName(),
URIHelper::GetMaybeFileHdl()));
// correction of fix for issue #i10939#:
// One of the two conditions have to be true to insert the graphic
// as a linked graphic -
if (GRAPHIC_NONE == eType || CanUseRemoteLink(aGrfName))
{
- pRetFrmFmt = rDoc.getIDocumentContentOperations().Insert(*pPaM, aGrfName, OUString(), 0,
+ pRetFrmFmt = m_rDoc.getIDocumentContentOperations().Insert(*m_pPaM, aGrfName, OUString(), 0,
&rFlySet, &aGrSet, NULL);
bDone = true;
}
@@ -2986,7 +2986,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
if (!bDone)
{
const Graphic& rGraph = pGrf->GetGraphic();
- pRetFrmFmt = rDoc.getIDocumentContentOperations().Insert(*pPaM, OUString(), OUString(), &rGraph,
+ pRetFrmFmt = m_rDoc.getIDocumentContentOperations().Insert(*m_pPaM, OUString(), OUString(), &rGraph,
&rFlySet, &aGrSet, NULL);
}
}
@@ -2999,17 +2999,17 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
SetAttributesAtGrfNode( pRecord, pRetFrmFmt, pF );
}
// mehrfaches Auftreten gleicher Grafik-Namen vermeiden
- maGrfNameGenerator.SetUniqueGraphName(pRetFrmFmt, aObjectName);
+ m_aGrfNameGenerator.SetUniqueGraphName(pRetFrmFmt, aObjectName);
}
// falls alles Ok, Zeiger auf neues Objekt ermitteln und Z-Order-Liste
// entsprechend korrigieren (oder Eintrag loeschen)
rpOurNewObject = CreateContactObject(pRetFrmFmt);
// altes Objekt aus der Z-Order-Liste entfernen
- pMSDffManager->RemoveFromShapeOrder( rpObject );
+ m_pMSDffManager->RemoveFromShapeOrder( rpObject );
// aus der Drawing-Page rausnehmen
if( rpObject->GetPage() )
- pDrawPg->RemoveObject( rpObject->GetOrdNum() );
+ m_pDrawPg->RemoveObject( rpObject->GetOrdNum() );
// und das Objekt loeschen
SdrObject::Free( rpObject );
@@ -3020,16 +3020,16 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
// Kontakt-Objekt in die Z-Order-Liste und die Page aufnehmen
if (rpOurNewObject)
{
- if (!bHdFtFtnEdn)
- pMSDffManager->StoreShapeOrder(pF->nSpId, 0, rpOurNewObject, 0 );
+ if (!m_bHdFtFtnEdn)
+ m_pMSDffManager->StoreShapeOrder(pF->nSpId, 0, rpOurNewObject, 0 );
// Das Kontakt-Objekt MUSS in die Draw-Page gesetzt werden, damit in
// SwWW8ImplReader::LoadDoc1() die Z-Order festgelegt werden kann !!!
if (!rpOurNewObject->IsInserted())
{
// pass information, if object is in page header|footer to method.
- pWWZOrder->InsertEscherObject( rpOurNewObject, pF->nSpId,
- bIsHeader || bIsFooter );
+ m_pWWZOrder->InsertEscherObject( rpOurNewObject, pF->nSpId,
+ m_bIsHeader || m_bIsFooter );
}
}
return pRetFrmFmt;
@@ -3037,30 +3037,30 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
void SwWW8ImplReader::GrafikCtor() // Fuer SVDraw und VCControls und Escher
{
- if (!pDrawModel)
+ if (!m_pDrawModel)
{
- rDoc.getIDocumentDrawModelAccess().GetOrCreateDrawModel(); // #i52858# - method name changed
- pDrawModel = rDoc.getIDocumentDrawModelAccess().GetDrawModel();
- OSL_ENSURE(pDrawModel, "Kann DrawModel nicht anlegen");
- pDrawPg = pDrawModel->GetPage(0);
+ m_rDoc.getIDocumentDrawModelAccess().GetOrCreateDrawModel(); // #i52858# - method name changed
+ m_pDrawModel = m_rDoc.getIDocumentDrawModelAccess().GetDrawModel();
+ OSL_ENSURE(m_pDrawModel, "Kann DrawModel nicht anlegen");
+ m_pDrawPg = m_pDrawModel->GetPage(0);
- pMSDffManager = new SwMSDffManager(*this, mbSkipImages);
- pMSDffManager->SetModel(pDrawModel, 1440);
+ m_pMSDffManager = new SwMSDffManager(*this, m_bSkipImages);
+ m_pMSDffManager->SetModel(m_pDrawModel, 1440);
/*
Now the dff manager always needs a controls // converter as well, but a
control converter may still exist // without a dffmanager. cmc
*/
- pFormImpl = new SwMSConvertControls(mpDocShell, pPaM);
+ m_pFormImpl = new SwMSConvertControls(m_pDocShell, m_pPaM);
- pWWZOrder = new wwZOrderer(sw::util::SetLayer(rDoc), pDrawPg,
- pMSDffManager->GetShapeOrders());
+ m_pWWZOrder = new wwZOrderer(sw::util::SetLayer(m_rDoc), m_pDrawPg,
+ m_pMSDffManager->GetShapeOrders());
}
}
void SwWW8ImplReader::GrafikDtor()
{
- DELETEZ(mpDrawEditEngine); // evtl. von Grafik angelegt
- DELETEZ(pWWZOrder); // dito
+ DELETEZ(m_pDrawEditEngine); // evtl. von Grafik angelegt
+ DELETEZ(m_pWWZOrder); // dito
}
void SwWW8FltAnchorStack::AddAnchor(const SwPosition& rPos, SwFrmFmt *pFmt)
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index cdfe2c418f01..6c5efc2bc0fd 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -257,10 +257,10 @@ bool SwWW8ImplReader::ReadGrafFile(OUString& rFileName, Graphic*& rpGraphic,
case 99: // TIFF-File ( nicht embeddet )
pSt->Seek(nPosFc);
// Name als P-String einlesen
- rFileName = read_uInt8_PascalString(*pSt, eStructCharSet);
+ rFileName = read_uInt8_PascalString(*pSt, m_eStructCharSet);
if (!rFileName.isEmpty())
rFileName = URIHelper::SmartRel2Abs(
- INetURLObject(sBaseURL), rFileName,
+ INetURLObject(m_sBaseURL), rFileName,
URIHelper::GetMaybeFileHdl());
*pbInDoc = false; // Datei anschliessend nicht loeschen
return !rFileName.isEmpty(); // Einlesen OK
@@ -273,7 +273,7 @@ bool SwWW8ImplReader::ReadGrafFile(OUString& rFileName, Graphic*& rpGraphic,
if (!bOk || pSt->GetError() || !aWMF.GetActionSize())
return false;
- if (pWwFib->envr != 1) // !MAC als Creator
+ if (m_pWwFib->envr != 1) // !MAC als Creator
{
rpGraphic = new Graphic( aWMF );
return true;
@@ -355,23 +355,23 @@ SwFlyFrmFmt* SwWW8ImplReader::MakeGrafNotInCntnt(const WW8PicDesc& rPD,
// Vertikale Verschiebung durch Zeilenabstand
sal_Int32 nNetHeight = nHeight + rPD.nCT + rPD.nCB;
- if( pSFlyPara->nLineSpace && pSFlyPara->nLineSpace > nNetHeight )
- pSFlyPara->nYPos =
- (sal_uInt16)( pSFlyPara->nYPos + pSFlyPara->nLineSpace - nNetHeight );
+ if( m_pSFlyPara->nLineSpace && m_pSFlyPara->nLineSpace > nNetHeight )
+ m_pSFlyPara->nYPos =
+ (sal_uInt16)( m_pSFlyPara->nYPos + m_pSFlyPara->nLineSpace - nNetHeight );
- WW8FlySet aFlySet(*this, pWFlyPara, pSFlyPara, true);
+ WW8FlySet aFlySet(*this, m_pWFlyPara, m_pSFlyPara, true);
- SwFmtAnchor aAnchor(pSFlyPara->eAnchor);
- aAnchor.SetAnchor(pPaM->GetPoint());
+ SwFmtAnchor aAnchor(m_pSFlyPara->eAnchor);
+ aAnchor.SetAnchor(m_pPaM->GetPoint());
aFlySet.Put(aAnchor);
aFlySet.Put( SwFmtFrmSize( ATT_FIX_SIZE, nWidth, nHeight ) );
- SwFlyFrmFmt* pFlyFmt = rDoc.getIDocumentContentOperations().Insert(*pPaM, rFileName, OUString(), pGraph,
+ SwFlyFrmFmt* pFlyFmt = m_rDoc.getIDocumentContentOperations().Insert(*m_pPaM, rFileName, OUString(), pGraph,
&aFlySet, &rGrfSet, NULL);
// Damit die Frames bei Einfuegen in existierendes Doc erzeugt werden:
- if (rDoc.getIDocumentLayoutAccess().GetCurrentViewShell() &&
+ if (m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell() &&
(FLY_AT_PARA == pFlyFmt->GetAnchor().GetAnchorId()))
{
pFlyFmt->MakeFrms();
@@ -384,24 +384,24 @@ SwFrmFmt* SwWW8ImplReader::MakeGrafInCntnt(const WW8_PIC& rPic,
const WW8PicDesc& rPD, const Graphic* pGraph, const OUString& rFileName,
const SfxItemSet& rGrfSet)
{
- WW8FlySet aFlySet(*this, pPaM, rPic, rPD.nWidth, rPD.nHeight);
+ WW8FlySet aFlySet(*this, m_pPaM, rPic, rPD.nWidth, rPD.nHeight);
SwFrmFmt* pFlyFmt = 0;
- if (rFileName.isEmpty() && nObjLocFc) // dann sollte ists ein OLE-Object
+ if (rFileName.isEmpty() && m_nObjLocFc) // dann sollte ists ein OLE-Object
pFlyFmt = ImportOle(pGraph, &aFlySet, &rGrfSet);
if( !pFlyFmt ) // dann eben als Graphic
{
- pFlyFmt = rDoc.getIDocumentContentOperations().Insert( *pPaM, rFileName, OUString(), pGraph, &aFlySet,
+ pFlyFmt = m_rDoc.getIDocumentContentOperations().Insert( *m_pPaM, rFileName, OUString(), pGraph, &aFlySet,
&rGrfSet, NULL);
}
// Grafik im Rahmen ? ok, Rahmen auf Bildgroesse vergroessern
// ( nur wenn Auto-Breite )
- if( pSFlyPara )
- pSFlyPara->BoxUpWidth( rPD.nWidth );
+ if( m_pSFlyPara )
+ m_pSFlyPara->BoxUpWidth( rPD.nWidth );
return pFlyFmt;
}
@@ -425,14 +425,14 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf1(WW8_PIC& rPic, SvStream* pSt,
WW8PicDesc aPD( rPic );
- SwAttrSet aGrfSet( rDoc.GetAttrPool(), RES_GRFATR_BEGIN, RES_GRFATR_END-1);
+ SwAttrSet aGrfSet( m_rDoc.GetAttrPool(), RES_GRFATR_BEGIN, RES_GRFATR_END-1);
if( aPD.nCL || aPD.nCR || aPD.nCT || aPD.nCB )
{
SwCropGrf aCrop( aPD.nCL, aPD.nCR, aPD.nCT, aPD.nCB) ;
aGrfSet.Put( aCrop );
}
- if( pWFlyPara && pWFlyPara->bGrafApo )
+ if( m_pWFlyPara && m_pWFlyPara->bGrafApo )
pRet = MakeGrafNotInCntnt(aPD,pGraph,aFileName,aGrfSet);
else
pRet = MakeGrafInCntnt(rPic,aPD,pGraph,aFileName,aGrfSet);
@@ -460,14 +460,14 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
{
SwFrmFmt* pRet = 0;
if (
- ((pStrm == pDataStream ) && !nPicLocFc) ||
- (nIniFlags & WW8FL_NO_GRAF)
+ ((m_pStrm == m_pDataStream ) && !m_nPicLocFc) ||
+ (m_nIniFlags & WW8FL_NO_GRAF)
)
{
return 0;
}
- ::SetProgressState(nProgress, mpDocShell); // Update
+ ::SetProgressState(m_nProgress, m_pDocShell); // Update
GrafikCtor();
@@ -477,36 +477,36 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
Wir mappen ansonsten die Variable pDataStream auf pStream.
*/
- sal_uLong nOldPos = pDataStream->Tell();
+ sal_uLong nOldPos = m_pDataStream->Tell();
WW8_PIC aPic;
- pDataStream->Seek( nPicLocFc );
- PicRead( pDataStream, &aPic, bVer67);
+ m_pDataStream->Seek( m_nPicLocFc );
+ PicRead( m_pDataStream, &aPic, m_bVer67);
// Plausibilitaetstest ist noetig, da z.B. bei CheckBoxen im
// Feld-Result ein WMF-aehnliches Struct vorkommt.
- if ((aPic.lcb >= 58) && !pDataStream->GetError())
+ if ((aPic.lcb >= 58) && !m_pDataStream->GetError())
{
- if( pFlyFmtOfJustInsertedGraphic )
+ if( m_pFlyFmtOfJustInsertedGraphic )
{
// Soeben haben wir einen Grafik-Link ins Doc inserted.
// Wir muessen ihn jetzt noch Positioniern und Skalieren.
WW8PicDesc aPD( aPic );
- WW8FlySet aFlySet( *this, pPaM, aPic, aPD.nWidth, aPD.nHeight );
+ WW8FlySet aFlySet( *this, m_pPaM, aPic, aPD.nWidth, aPD.nHeight );
// the correct anchor is set in Read_F_IncludePicture and the current PaM point
// is after the position if it is anchored in content; because this anchor add
// a character into the textnode. #i2806#
if (FLY_AS_CHAR ==
- pFlyFmtOfJustInsertedGraphic->GetAnchor().GetAnchorId() )
+ m_pFlyFmtOfJustInsertedGraphic->GetAnchor().GetAnchorId() )
{
aFlySet.ClearItem( RES_ANCHOR );
}
- pFlyFmtOfJustInsertedGraphic->SetFmtAttr( aFlySet );
+ m_pFlyFmtOfJustInsertedGraphic->SetFmtAttr( aFlySet );
- pFlyFmtOfJustInsertedGraphic = 0;
+ m_pFlyFmtOfJustInsertedGraphic = 0;
}
else if((0x64 == aPic.MFP.mm) || (0x66 == aPic.MFP.mm))
{
@@ -514,8 +514,8 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
SdrObject* pObject = 0;
WW8PicDesc aPD( aPic );
- if (!pMSDffManager)
- pMSDffManager = new SwMSDffManager(*this, mbSkipImages);
+ if (!m_pMSDffManager)
+ m_pMSDffManager = new SwMSDffManager(*this, m_bSkipImages);
/*
##835##
Disable use of main stream as fallback stream for inline direct
@@ -524,26 +524,26 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
incorrect fallback graphic being found if other escher graphics
have been inserted in the document
*/
- pMSDffManager->DisableFallbackStream();
- if( !pMSDffManager->GetModel() )
- pMSDffManager->SetModel(pDrawModel, 1440);
+ m_pMSDffManager->DisableFallbackStream();
+ if( !m_pMSDffManager->GetModel() )
+ m_pMSDffManager->SetModel(m_pDrawModel, 1440);
if (0x66 == aPic.MFP.mm)
{
//These ones have names prepended
sal_uInt8 nNameLen=0;
- pDataStream->ReadUChar( nNameLen );
- pDataStream->SeekRel( nNameLen );
+ m_pDataStream->ReadUChar( nNameLen );
+ m_pDataStream->SeekRel( nNameLen );
}
Rectangle aChildRect;
Rectangle aClientRect( 0,0, aPD.nWidth, aPD.nHeight);
SvxMSDffImportData aData( aClientRect );
- pObject = pMSDffManager->ImportObj(*pDataStream, &aData, aClientRect, aChildRect );
+ pObject = m_pMSDffManager->ImportObj(*m_pDataStream, &aData, aClientRect, aChildRect );
if (pObject)
{
// fuer den Rahmen
- SfxItemSet aAttrSet( rDoc.GetAttrPool(), RES_FRMATR_BEGIN,
+ SfxItemSet aAttrSet( m_rDoc.GetAttrPool(), RES_FRMATR_BEGIN,
RES_FRMATR_END-1 );
SvxMSDffImportRec const*const pRecord = (1 == aData.size())
@@ -562,9 +562,9 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
if( relativeWidth != 0 )
{
aPic.mx = msword_cast<sal_uInt16>(
- maSectionManager.GetPageWidth() -
- maSectionManager.GetPageRight() -
- maSectionManager.GetPageLeft()) * relativeWidth / 1000;
+ m_aSectionManager.GetPageWidth() -
+ m_aSectionManager.GetPageRight() -
+ m_aSectionManager.GetPageLeft()) * relativeWidth / 1000;
aPD = WW8PicDesc( aPic );
// This SetSnapRect() call adjusts the size of the object itself,
// no idea why it's this call (or even what the call actually does),
@@ -575,19 +575,19 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
//A graphic of this type in this location is always
//inline, and uses the pic in the same mould as ww6
//graphics.
- if (pWFlyPara && pWFlyPara->bGrafApo)
+ if (m_pWFlyPara && m_pWFlyPara->bGrafApo)
{
- WW8FlySet aFlySet(*this, pWFlyPara, pSFlyPara, true);
+ WW8FlySet aFlySet(*this, m_pWFlyPara, m_pSFlyPara, true);
- SwFmtAnchor aAnchor(pSFlyPara->eAnchor);
- aAnchor.SetAnchor(pPaM->GetPoint());
+ SwFmtAnchor aAnchor(m_pSFlyPara->eAnchor);
+ aAnchor.SetAnchor(m_pPaM->GetPoint());
aFlySet.Put(aAnchor);
aAttrSet.Put(aFlySet);
}
else
{
- WW8FlySet aFlySet( *this, pPaM, aPic, aPD.nWidth,
+ WW8FlySet aFlySet( *this, m_pPaM, aPic, aPD.nWidth,
aPD.nHeight );
aAttrSet.Put(aFlySet);
@@ -606,7 +606,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
}
// for the Grafik
- SfxItemSet aGrSet( rDoc.GetAttrPool(), RES_GRFATR_BEGIN,
+ SfxItemSet aGrSet( m_rDoc.GetAttrPool(), RES_GRFATR_BEGIN,
RES_GRFATR_END-1 );
if( aPD.nCL || aPD.nCR || aPD.nCT || aPD.nCB )
@@ -651,17 +651,17 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
// Nun den Link bzw. die Grafik ins Doc stopfen
const Graphic& rGraph = pGraphObject->GetGraphic();
- if (nObjLocFc) // is it a OLE-Object?
+ if (m_nObjLocFc) // is it a OLE-Object?
pRet = ImportOle(&rGraph, &aAttrSet, &aGrSet, pObject->GetBLIPSizeRectangle());
if (!pRet)
{
- pRet = rDoc.getIDocumentContentOperations().Insert(*pPaM, OUString(), OUString(),
+ pRet = m_rDoc.getIDocumentContentOperations().Insert(*m_pPaM, OUString(), OUString(),
&rGraph, &aAttrSet, &aGrSet, NULL );
}
}
else
- pRet = rDoc.getIDocumentContentOperations().InsertDrawObj(*pPaM, *pObject, aAttrSet );
+ pRet = m_rDoc.getIDocumentContentOperations().InsertDrawObj(*m_pPaM, *pObject, aAttrSet );
}
}
@@ -683,37 +683,37 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
{
if (pOurNewObject != pObject)
{
- pMSDffManager->ExchangeInShapeOrder( pObject, 0, 0,
+ m_pMSDffManager->ExchangeInShapeOrder( pObject, 0, 0,
pOurNewObject );
// altes SdrGrafObj aus der Page loeschen und
// zerstoeren
if (pObject->GetPage())
- pDrawPg->RemoveObject(pObject->GetOrdNum());
+ m_pDrawPg->RemoveObject(pObject->GetOrdNum());
SdrObject::Free( pObject );
}
}
else
- pMSDffManager->RemoveFromShapeOrder( pObject );
+ m_pMSDffManager->RemoveFromShapeOrder( pObject );
}
else
- pMSDffManager->RemoveFromShapeOrder( pObject );
+ m_pMSDffManager->RemoveFromShapeOrder( pObject );
// auch das ggfs. Page loeschen, falls nicht gruppiert,
if (pTextObj && !bTextObjWasGrouped && pTextObj->GetPage())
- pDrawPg->RemoveObject( pTextObj->GetOrdNum() );
+ m_pDrawPg->RemoveObject( pTextObj->GetOrdNum() );
}
- pMSDffManager->EnableFallbackStream();
+ m_pMSDffManager->EnableFallbackStream();
}
else if (aPic.lcb >= 58)
- pRet = ImportGraf1(aPic, pDataStream, nPicLocFc);
+ pRet = ImportGraf1(aPic, m_pDataStream, m_nPicLocFc);
}
- pDataStream->Seek( nOldPos );
+ m_pDataStream->Seek( nOldPos );
if (pRet)
{
SdrObject* pOurNewObject = CreateContactObject(pRet);
- pWWZOrder->InsertTextLayerObject(pOurNewObject);
+ m_pWWZOrder->InsertTextLayerObject(pOurNewObject);
}
return AddAutoAnchor(pRet);
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 14ef17bbdbfe..5f61b6a441e4 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -526,8 +526,8 @@ Sttb::getStringAtIndex( sal_uInt32 index )
}
SwMSDffManager::SwMSDffManager( SwWW8ImplReader& rRdr, bool bSkipImages )
- : SvxMSDffManager(*rRdr.pTableStream, rRdr.GetBaseURL(), rRdr.pWwFib->fcDggInfo,
- rRdr.pDataStream, 0, 0, COL_WHITE, 12, rRdr.pStrm, bSkipImages),
+ : SvxMSDffManager(*rRdr.m_pTableStream, rRdr.GetBaseURL(), rRdr.m_pWwFib->fcDggInfo,
+ rRdr.m_pDataStream, 0, 0, COL_WHITE, 12, rRdr.m_pStrm, bSkipImages),
rReader(rRdr), pFallbackStream(0)
{
SetSvxMSDffSettings( GetSvxMSDffSettings() );
@@ -580,10 +580,10 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId,
{
SvStorageRef xSrc = xSrcStg->OpenSotStorage( sStorageName,
STREAM_READWRITE| StreamMode::SHARE_DENYALL );
- OSL_ENSURE(rReader.pFormImpl, "No Form Implementation!");
+ OSL_ENSURE(rReader.m_pFormImpl, "No Form Implementation!");
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape;
- if ( (!(rReader.bIsHeader || rReader.bIsFooter)) &&
- rReader.pFormImpl->ReadOCXStream(xSrc,&xShape,true))
+ if ( (!(rReader.m_bIsHeader || rReader.m_bIsFooter)) &&
+ rReader.m_pFormImpl->ReadOCXStream(xSrc,&xShape,true))
{
pRet = GetSdrObjectFromXShape(xShape);
}
@@ -617,24 +617,24 @@ void SwMSDffManager::EnableFallbackStream()
sal_uInt16 SwWW8ImplReader::GetToggleAttrFlags() const
{
- return pCtrlStck ? pCtrlStck->GetToggleAttrFlags() : 0;
+ return m_pCtrlStck ? m_pCtrlStck->GetToggleAttrFlags() : 0;
}
sal_uInt16 SwWW8ImplReader::GetToggleBiDiAttrFlags() const
{
- return pCtrlStck ? pCtrlStck->GetToggleBiDiAttrFlags() : 0;
+ return m_pCtrlStck ? m_pCtrlStck->GetToggleBiDiAttrFlags() : 0;
}
void SwWW8ImplReader::SetToggleAttrFlags(sal_uInt16 nFlags)
{
- if (pCtrlStck)
- pCtrlStck->SetToggleAttrFlags(nFlags);
+ if (m_pCtrlStck)
+ m_pCtrlStck->SetToggleAttrFlags(nFlags);
}
void SwWW8ImplReader::SetToggleBiDiAttrFlags(sal_uInt16 nFlags)
{
- if (pCtrlStck)
- pCtrlStck->SetToggleBiDiAttrFlags(nFlags);
+ if (m_pCtrlStck)
+ m_pCtrlStck->SetToggleBiDiAttrFlags(nFlags);
}
SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
@@ -1158,7 +1158,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
bool bRet = 4 <= mnStreamSize;
if( bRet )
aMemStream.ReadUInt16( mnRawRecId ).ReadUInt16( mnRawRecSize );
- SwDocShell* pDocShell = rReader.mpDocShell;
+ SwDocShell* pDocShell = rReader.m_pDocShell;
if(pDocShell)
{
SwWW8ImplReader::ReadEmbeddedData( aMemStream, pDocShell, hlStr);
@@ -1191,18 +1191,18 @@ void SwWW8ImplReader::Read_StyleCode( sal_uInt16, const sal_uInt8* pData, short
{
if (nLen < 0)
{
- bCpxStyle = false;
+ m_bCpxStyle = false;
return;
}
sal_uInt16 nColl = 0;
- if (pWwFib->GetFIBVersion() <= ww::eWW2)
+ if (m_pWwFib->GetFIBVersion() <= ww::eWW2)
nColl = *pData;
else
nColl = SVBT16ToShort(pData);
- if (nColl < vColl.size())
+ if (nColl < m_vColl.size())
{
- SetTxtFmtCollAndListLevel( *pPaM, vColl[nColl] );
- bCpxStyle = true;
+ SetTxtFmtCollAndListLevel( *m_pPaM, m_vColl[nColl] );
+ m_bCpxStyle = true;
}
}
@@ -1237,7 +1237,7 @@ SwFltStackEntry* SwWW8FltControlStack::SetAttr(const SwPosition& rPos, sal_uInt1
// Doing a textbox, and using the control stack only as a temporary
// collection point for properties which will are not to be set into
// the real document
- if (rReader.pPlcxMan && rReader.pPlcxMan->GetDoingDrawTextBox())
+ if (rReader.m_pPlcxMan && rReader.m_pPlcxMan->GetDoingDrawTextBox())
{
size_t nCnt = size();
for (size_t i=0; i < nCnt; ++i)
@@ -1450,12 +1450,12 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
{
// #i103711#
const bool bFirstLineIndentSet =
- ( rReader.maTxtNodesHavingFirstLineOfstSet.end() !=
- rReader.maTxtNodesHavingFirstLineOfstSet.find( pNode ) );
+ ( rReader.m_aTxtNodesHavingFirstLineOfstSet.end() !=
+ rReader.m_aTxtNodesHavingFirstLineOfstSet.find( pNode ) );
// #i105414#
const bool bLeftIndentSet =
- ( rReader.maTxtNodesHavingLeftIndentSet.end() !=
- rReader.maTxtNodesHavingLeftIndentSet.find( pNode ) );
+ ( rReader.m_aTxtNodesHavingLeftIndentSet.end() !=
+ rReader.m_aTxtNodesHavingLeftIndentSet.find( pNode ) );
SyncIndentWithList( aNewLR, *pNum,
bFirstLineIndentSet,
bLeftIndentSet );
@@ -1539,8 +1539,8 @@ const SfxPoolItem* SwWW8FltControlStack::GetFmtAttr(const SwPosition& rPos,
SfxItemState eState = SfxItemState::DEFAULT;
if (const SfxItemSet *pSet = pNd->GetpSwAttrSet())
eState = pSet->GetItemState(RES_LR_SPACE, false);
- if (eState != SfxItemState::SET && rReader.nAktColl < rReader.vColl.size())
- pItem = &(rReader.vColl[rReader.nAktColl].maWordLR);
+ if (eState != SfxItemState::SET && rReader.m_nAktColl < rReader.m_vColl.size())
+ pItem = &(rReader.m_vColl[rReader.m_nAktColl].maWordLR);
}
/*
@@ -1692,7 +1692,7 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen)
{
if (nLen < 0)
{
- pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_PARATR_TABSTOP);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_PARATR_TABSTOP);
return;
}
@@ -1717,17 +1717,17 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen)
const SwTxtFmtColl* pSty = 0;
sal_uInt16 nTabBase;
- if (pAktColl && nAktColl < vColl.size()) // StyleDef
+ if (m_pAktColl && m_nAktColl < m_vColl.size()) // StyleDef
{
- nTabBase = vColl[nAktColl].nBase;
- if (nTabBase < vColl.size()) // Based On
- pSty = static_cast<const SwTxtFmtColl*>(vColl[nTabBase].pFmt);
+ nTabBase = m_vColl[m_nAktColl].nBase;
+ if (nTabBase < m_vColl.size()) // Based On
+ pSty = static_cast<const SwTxtFmtColl*>(m_vColl[nTabBase].pFmt);
}
else
{ // Text
- nTabBase = nAktColl;
- if (nAktColl < vColl.size())
- pSty = static_cast<const SwTxtFmtColl*>(vColl[nAktColl].pFmt);
+ nTabBase = m_nAktColl;
+ if (m_nAktColl < m_vColl.size())
+ pSty = static_cast<const SwTxtFmtColl*>(m_vColl[m_nAktColl].pFmt);
//TODO: figure out else here
}
@@ -1744,11 +1744,11 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen)
{
sal_uInt16 nOldTabBase = nTabBase;
// If based on another
- if (nTabBase < vColl.size())
- nTabBase = vColl[nTabBase].nBase;
+ if (nTabBase < m_vColl.size())
+ nTabBase = m_vColl[nTabBase].nBase;
if (
- nTabBase < vColl.size() &&
+ nTabBase < m_vColl.size() &&
nOldTabBase != nTabBase &&
nTabBase != ww::stiNil
)
@@ -1756,8 +1756,8 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen)
// #i61789: Stop searching when next style is the same as the
// current one (prevent loop)
aLoopWatch.insert(reinterpret_cast<size_t>(pSty));
- if (nTabBase < vColl.size())
- pSty = static_cast<const SwTxtFmtColl*>(vColl[nTabBase].pFmt);
+ if (nTabBase < m_vColl.size())
+ pSty = static_cast<const SwTxtFmtColl*>(m_vColl[nTabBase].pFmt);
//TODO figure out the else branch
if (aLoopWatch.find(reinterpret_cast<size_t>(pSty)) !=
@@ -1833,12 +1833,12 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen)
// text SwWW8ImplReader::Read_Tab is called at the begin and end of
// the range the attrib affects, and ignoring it would upset the
// balance
- if (!pAktColl) // not importing into a style
+ if (!m_pAktColl) // not importing into a style
{
using namespace sw::util;
SvxTabStopItem aOrig = pSty ?
ItemGet<SvxTabStopItem>(*pSty, RES_PARATR_TABSTOP) :
- DefaultItemGet<SvxTabStopItem>(rDoc, RES_PARATR_TABSTOP);
+ DefaultItemGet<SvxTabStopItem>(m_rDoc, RES_PARATR_TABSTOP);
NewAttr(aOrig);
}
}
@@ -1851,14 +1851,14 @@ void SwWW8ImplReader::ImportDop()
{
// correct the LastPrinted date in DocumentProperties
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
- mpDocShell->GetModel(), uno::UNO_QUERY_THROW);
+ m_pDocShell->GetModel(), uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentProperties> xDocuProps(
xDPS->getDocumentProperties());
OSL_ENSURE(xDocuProps.is(), "DocumentProperties is null");
if (xDocuProps.is())
{
DateTime aLastPrinted(
- msfilter::util::DTTM2DateTime(pWDop->dttmLastPrint));
+ msfilter::util::DTTM2DateTime(m_pWDop->dttmLastPrint));
::util::DateTime uDT = aLastPrinted.GetUNODateTime();
xDocuProps->setPrintDate(uDT);
}
@@ -1867,20 +1867,20 @@ void SwWW8ImplReader::ImportDop()
// #i78951# - remember the unknown compatibility options
// so as to export them out
- rDoc.getIDocumentSettingAccess().Setn32DummyCompatibilityOptions1( pWDop->GetCompatibilityOptions());
- rDoc.getIDocumentSettingAccess().Setn32DummyCompatibilityOptions2( pWDop->GetCompatibilityOptions2());
+ m_rDoc.getIDocumentSettingAccess().Setn32DummyCompatibilityOptions1( m_pWDop->GetCompatibilityOptions());
+ m_rDoc.getIDocumentSettingAccess().Setn32DummyCompatibilityOptions2( m_pWDop->GetCompatibilityOptions2());
// The distance between two paragraphs is the sum of the bottom distance of
// the first paragraph and the top distance of the second one
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::PARA_SPACE_MAX, pWDop->fDontUseHTMLAutoSpacing);
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::PARA_SPACE_MAX_AT_PAGES, true );
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::PARA_SPACE_MAX, m_pWDop->fDontUseHTMLAutoSpacing);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::PARA_SPACE_MAX_AT_PAGES, true );
// move tabs on alignment
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::TAB_COMPAT, true);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::TAB_COMPAT, true);
// #i24363# tab stops relative to indent
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::TABS_RELATIVE_TO_INDENT, false);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::TABS_RELATIVE_TO_INDENT, false);
// Import Default Tabs
- long nDefTabSiz = pWDop->dxaTab;
+ long nDefTabSiz = m_pWDop->dxaTab;
if( nDefTabSiz < 56 )
nDefTabSiz = 709;
@@ -1888,19 +1888,19 @@ void SwWW8ImplReader::ImportDop()
SvxTabStopItem aNewTab( 1, sal_uInt16(nDefTabSiz), SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP );
const_cast<SvxTabStop&>(aNewTab[0]).GetAdjustment() = SVX_TAB_ADJUST_DEFAULT;
- rDoc.GetAttrPool().SetPoolDefaultItem( aNewTab );
+ m_rDoc.GetAttrPool().SetPoolDefaultItem( aNewTab );
// Import zoom factor
- if (pWDop->wScaleSaved)
+ if (m_pWDop->wScaleSaved)
{
uno::Sequence<beans::PropertyValue> aViewProps(3);
aViewProps[0].Name = "ZoomFactor";
- aViewProps[0].Value <<= sal_Int16(pWDop->wScaleSaved);
+ aViewProps[0].Value <<= sal_Int16(m_pWDop->wScaleSaved);
aViewProps[1].Name = "VisibleBottom";
aViewProps[1].Value <<= sal_Int32(0);
aViewProps[2].Name = "ZoomType";
//Import zoom type
- switch (pWDop->zkSaved) {
+ switch (m_pWDop->zkSaved) {
case 1: aViewProps[2].Value <<= sal_Int16(SvxZoomType::WHOLEPAGE); break;
case 2: aViewProps[2].Value <<= sal_Int16(SvxZoomType::PAGEWIDTH); break;
case 3: aViewProps[2].Value <<= sal_Int16(SvxZoomType::OPTIMAL); break;
@@ -1911,59 +1911,59 @@ void SwWW8ImplReader::ImportDop()
uno::Reference<container::XIndexContainer> xBox = document::IndexedPropertyValues::create(xComponentContext);
xBox->insertByIndex(sal_Int32(0), uno::makeAny(aViewProps));
uno::Reference<container::XIndexAccess> xIndexAccess(xBox, uno::UNO_QUERY);
- uno::Reference<document::XViewDataSupplier> xViewDataSupplier(mpDocShell->GetModel(), uno::UNO_QUERY);
+ uno::Reference<document::XViewDataSupplier> xViewDataSupplier(m_pDocShell->GetModel(), uno::UNO_QUERY);
xViewDataSupplier->setViewData(xIndexAccess);
}
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::USE_VIRTUAL_DEVICE, !pWDop->fUsePrinterMetrics);
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::USE_HIRES_VIRTUAL_DEVICE, true);
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::ADD_FLY_OFFSETS, true );
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::ADD_EXT_LEADING, !pWDop->fNoLeading);
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::OLD_NUMBERING, false);
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING, false); // #i47448#
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK, !pWDop->fExpShRtn); // #i49277#, #i56856#
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT, false); // #i53199#
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::OLD_LINE_SPACING, false);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::USE_VIRTUAL_DEVICE, !m_pWDop->fUsePrinterMetrics);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::USE_HIRES_VIRTUAL_DEVICE, true);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::ADD_FLY_OFFSETS, true );
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::ADD_EXT_LEADING, !m_pWDop->fNoLeading);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::OLD_NUMBERING, false);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING, false); // #i47448#
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK, !m_pWDop->fExpShRtn); // #i49277#, #i56856#
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT, false); // #i53199#
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::OLD_LINE_SPACING, false);
// #i25901# - set new compatibility option
// 'Add paragraph and table spacing at bottom of table cells'
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS, true);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS, true);
// #i11860# - set new compatibility option
// 'Use former object positioning' to <false>
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::USE_FORMER_OBJECT_POS, false);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::USE_FORMER_OBJECT_POS, false);
// #i27767# - set new compatibility option
// 'Conder Wrapping mode when positioning object' to <true>
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION, true);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION, true);
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::USE_FORMER_TEXT_WRAPPING, false); // #i13832#, #i24135#
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::USE_FORMER_TEXT_WRAPPING, false); // #i13832#, #i24135#
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::TABLE_ROW_KEEP, true); //SetTableRowKeep( true );
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::TABLE_ROW_KEEP, true); //SetTableRowKeep( true );
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION, true); // #i3952#
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION, true); // #i3952#
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::INVERT_BORDER_SPACING, true);
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::COLLAPSE_EMPTY_CELL_PARA, true);
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::TAB_OVERFLOW, true);
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::UNBREAKABLE_NUMBERINGS, true);
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::CLIPPED_PICTURES, true);
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::TAB_OVER_MARGIN, true);
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::SURROUND_TEXT_WRAP_SMALL, true);
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::PROP_LINE_SPACING_SHRINKS_FIRST_LINE, true);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::INVERT_BORDER_SPACING, true);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::COLLAPSE_EMPTY_CELL_PARA, true);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::TAB_OVERFLOW, true);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::UNBREAKABLE_NUMBERINGS, true);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::CLIPPED_PICTURES, true);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::TAB_OVER_MARGIN, true);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::SURROUND_TEXT_WRAP_SMALL, true);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::PROP_LINE_SPACING_SHRINKS_FIRST_LINE, true);
// COMPATIBILITY FLAGS END
// Import magic doptypography information, if its there
- if (pWwFib->nFib > 105)
- ImportDopTypography(pWDop->doptypography);
+ if (m_pWwFib->nFib > 105)
+ ImportDopTypography(m_pWDop->doptypography);
// disable form design mode to be able to use imported controls directly
// #i31239# always disable form design mode, not only in protected docs
{
using namespace com::sun::star;
- uno::Reference<lang::XComponent> xModelComp(mpDocShell->GetModel(),
+ uno::Reference<lang::XComponent> xModelComp(m_pDocShell->GetModel(),
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xDocProps(xModelComp,
uno::UNO_QUERY);
@@ -1983,12 +1983,12 @@ void SwWW8ImplReader::ImportDop()
}
// Still allow editing of form fields.
- if (!pWDop->fProtEnabled)
- mpDocShell->SetModifyPasswordHash(pWDop->lKeyProtDoc);
+ if (!m_pWDop->fProtEnabled)
+ m_pDocShell->SetModifyPasswordHash(m_pWDop->lKeyProtDoc);
const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
if (rOpt.IsUseEnhancedFields())
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::PROTECT_FORM, pWDop->fProtEnabled );
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::PROTECT_FORM, m_pWDop->fProtEnabled );
}
void SwWW8ImplReader::ImportDopTypography(const WW8DopTypography &rTypo)
@@ -2000,7 +2000,7 @@ void SwWW8ImplReader::ImportDopTypography(const WW8DopTypography &rTypo)
{
i18n::ForbiddenCharacters aForbidden(rTypo.rgxchFPunct,
rTypo.rgxchLPunct);
- rDoc.getIDocumentSettingAccess().setForbiddenCharacters(rTypo.GetConvertedLang(),
+ m_rDoc.getIDocumentSettingAccess().setForbiddenCharacters(rTypo.GetConvertedLang(),
aForbidden);
// Obviously cannot set the standard level 1 for japanese, so
// bail out now while we can.
@@ -2022,120 +2022,120 @@ void SwWW8ImplReader::ImportDopTypography(const WW8DopTypography &rTypo)
{
i18n::ForbiddenCharacters aForbidden(WW8DopTypography::GetJapanNotBeginLevel1(),
WW8DopTypography::GetJapanNotEndLevel1());
- rDoc.getIDocumentSettingAccess().setForbiddenCharacters(LANGUAGE_JAPANESE,aForbidden);
+ m_rDoc.getIDocumentSettingAccess().setForbiddenCharacters(LANGUAGE_JAPANESE,aForbidden);
}
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::KERN_ASIAN_PUNCTUATION, rTypo.fKerningPunct);
- rDoc.getIDocumentSettingAccess().setCharacterCompressionType(static_cast<SwCharCompressType>(rTypo.iJustification));
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::KERN_ASIAN_PUNCTUATION, rTypo.fKerningPunct);
+ m_rDoc.getIDocumentSettingAccess().setCharacterCompressionType(static_cast<SwCharCompressType>(rTypo.iJustification));
}
/**
* Footnotes and Endnotes
*/
WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr ,WW8_CP nStartCp) :
- maTmpPos(*pRdr->pPaM->GetPoint()),
- mpOldStck(pRdr->pCtrlStck),
- mpOldAnchorStck(pRdr->pAnchorStck),
- mpOldRedlines(pRdr->mpRedlineStack),
- mpOldPlcxMan(pRdr->pPlcxMan),
- mpWFlyPara(pRdr->pWFlyPara),
- mpSFlyPara(pRdr->pSFlyPara),
- mpPreviousNumPaM(pRdr->pPreviousNumPaM),
- mpPrevNumRule(pRdr->pPrevNumRule),
- mpTableDesc(pRdr->pTableDesc),
- mnInTable(pRdr->nInTable),
- mnAktColl(pRdr->nAktColl),
- mcSymbol(pRdr->cSymbol),
- mbIgnoreText(pRdr->bIgnoreText),
- mbSymbol(pRdr->bSymbol),
- mbHdFtFtnEdn(pRdr->bHdFtFtnEdn),
- mbTxbxFlySection(pRdr->bTxbxFlySection),
- mbAnl(pRdr->bAnl),
- mbInHyperlink(pRdr->bInHyperlink),
- mbPgSecBreak(pRdr->bPgSecBreak),
- mbWasParaEnd(pRdr->bWasParaEnd),
- mbHasBorder(pRdr->bHasBorder),
- mbFirstPara(pRdr->bFirstPara)
+ maTmpPos(*pRdr->m_pPaM->GetPoint()),
+ mpOldStck(pRdr->m_pCtrlStck),
+ mpOldAnchorStck(pRdr->m_pAnchorStck),
+ mpOldRedlines(pRdr->m_pRedlineStack),
+ mpOldPlcxMan(pRdr->m_pPlcxMan),
+ mpWFlyPara(pRdr->m_pWFlyPara),
+ mpSFlyPara(pRdr->m_pSFlyPara),
+ mpPreviousNumPaM(pRdr->m_pPreviousNumPaM),
+ mpPrevNumRule(pRdr->m_pPrevNumRule),
+ mpTableDesc(pRdr->m_pTableDesc),
+ mnInTable(pRdr->m_nInTable),
+ mnAktColl(pRdr->m_nAktColl),
+ mcSymbol(pRdr->m_cSymbol),
+ mbIgnoreText(pRdr->m_bIgnoreText),
+ mbSymbol(pRdr->m_bSymbol),
+ mbHdFtFtnEdn(pRdr->m_bHdFtFtnEdn),
+ mbTxbxFlySection(pRdr->m_bTxbxFlySection),
+ mbAnl(pRdr->m_bAnl),
+ mbInHyperlink(pRdr->m_bInHyperlink),
+ mbPgSecBreak(pRdr->m_bPgSecBreak),
+ mbWasParaEnd(pRdr->m_bWasParaEnd),
+ mbHasBorder(pRdr->m_bHasBorder),
+ mbFirstPara(pRdr->m_bFirstPara)
{
- pRdr->bSymbol = false;
- pRdr->bHdFtFtnEdn = true;
- pRdr->bTxbxFlySection = pRdr->bAnl = pRdr->bPgSecBreak = pRdr->bWasParaEnd
- = pRdr->bHasBorder = false;
- pRdr->bFirstPara = true;
- pRdr->nInTable = 0;
- pRdr->pWFlyPara = 0;
- pRdr->pSFlyPara = 0;
- pRdr->pPreviousNumPaM = 0;
- pRdr->pPrevNumRule = 0;
- pRdr->pTableDesc = 0;
- pRdr->nAktColl = 0;
-
- pRdr->pCtrlStck = new SwWW8FltControlStack(&pRdr->rDoc, pRdr->nFieldFlags,
+ pRdr->m_bSymbol = false;
+ pRdr->m_bHdFtFtnEdn = true;
+ pRdr->m_bTxbxFlySection = pRdr->m_bAnl = pRdr->m_bPgSecBreak = pRdr->m_bWasParaEnd
+ = pRdr->m_bHasBorder = false;
+ pRdr->m_bFirstPara = true;
+ pRdr->m_nInTable = 0;
+ pRdr->m_pWFlyPara = 0;
+ pRdr->m_pSFlyPara = 0;
+ pRdr->m_pPreviousNumPaM = 0;
+ pRdr->m_pPrevNumRule = 0;
+ pRdr->m_pTableDesc = 0;
+ pRdr->m_nAktColl = 0;
+
+ pRdr->m_pCtrlStck = new SwWW8FltControlStack(&pRdr->m_rDoc, pRdr->m_nFieldFlags,
*pRdr);
- pRdr->mpRedlineStack = new sw::util::RedlineStack(pRdr->rDoc);
+ pRdr->m_pRedlineStack = new sw::util::RedlineStack(pRdr->m_rDoc);
- pRdr->pAnchorStck = new SwWW8FltAnchorStack(&pRdr->rDoc, pRdr->nFieldFlags);
+ pRdr->m_pAnchorStck = new SwWW8FltAnchorStack(&pRdr->m_rDoc, pRdr->m_nFieldFlags);
// Save the attribute manager: we need this as the newly created PLCFx Manager
// access the same FKPs as the old one and their Start-End position changes.
- if (pRdr->pPlcxMan)
- pRdr->pPlcxMan->SaveAllPLCFx(maPLCFxSave);
+ if (pRdr->m_pPlcxMan)
+ pRdr->m_pPlcxMan->SaveAllPLCFx(maPLCFxSave);
if (nStartCp != -1)
{
- pRdr->pPlcxMan = new WW8PLCFMan(pRdr->pSBase,
+ pRdr->m_pPlcxMan = new WW8PLCFMan(pRdr->m_pSBase,
mpOldPlcxMan->GetManType(), nStartCp);
}
maOldApos.push_back(false);
- maOldApos.swap(pRdr->maApos);
- maOldFieldStack.swap(pRdr->maFieldStack);
+ maOldApos.swap(pRdr->m_aApos);
+ maOldFieldStack.swap(pRdr->m_aFieldStack);
}
void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr )
{
- pRdr->pWFlyPara = mpWFlyPara;
- pRdr->pSFlyPara = mpSFlyPara;
- pRdr->pPreviousNumPaM = mpPreviousNumPaM;
- pRdr->pPrevNumRule = mpPrevNumRule;
- pRdr->pTableDesc = mpTableDesc;
- pRdr->cSymbol = mcSymbol;
- pRdr->bSymbol = mbSymbol;
- pRdr->bIgnoreText = mbIgnoreText;
- pRdr->bHdFtFtnEdn = mbHdFtFtnEdn;
- pRdr->bTxbxFlySection = mbTxbxFlySection;
- pRdr->nInTable = mnInTable;
- pRdr->bAnl = mbAnl;
- pRdr->bInHyperlink = mbInHyperlink;
- pRdr->bWasParaEnd = mbWasParaEnd;
- pRdr->bPgSecBreak = mbPgSecBreak;
- pRdr->nAktColl = mnAktColl;
- pRdr->bHasBorder = mbHasBorder;
- pRdr->bFirstPara = mbFirstPara;
+ pRdr->m_pWFlyPara = mpWFlyPara;
+ pRdr->m_pSFlyPara = mpSFlyPara;
+ pRdr->m_pPreviousNumPaM = mpPreviousNumPaM;
+ pRdr->m_pPrevNumRule = mpPrevNumRule;
+ pRdr->m_pTableDesc = mpTableDesc;
+ pRdr->m_cSymbol = mcSymbol;
+ pRdr->m_bSymbol = mbSymbol;
+ pRdr->m_bIgnoreText = mbIgnoreText;
+ pRdr->m_bHdFtFtnEdn = mbHdFtFtnEdn;
+ pRdr->m_bTxbxFlySection = mbTxbxFlySection;
+ pRdr->m_nInTable = mnInTable;
+ pRdr->m_bAnl = mbAnl;
+ pRdr->m_bInHyperlink = mbInHyperlink;
+ pRdr->m_bWasParaEnd = mbWasParaEnd;
+ pRdr->m_bPgSecBreak = mbPgSecBreak;
+ pRdr->m_nAktColl = mnAktColl;
+ pRdr->m_bHasBorder = mbHasBorder;
+ pRdr->m_bFirstPara = mbFirstPara;
// Close all attributes as attributes could be created that extend the Fly
pRdr->DeleteCtrlStk();
- pRdr->pCtrlStck = mpOldStck;
+ pRdr->m_pCtrlStck = mpOldStck;
- pRdr->mpRedlineStack->closeall(*pRdr->pPaM->GetPoint());
- delete pRdr->mpRedlineStack;
- pRdr->mpRedlineStack = mpOldRedlines;
+ pRdr->m_pRedlineStack->closeall(*pRdr->m_pPaM->GetPoint());
+ delete pRdr->m_pRedlineStack;
+ pRdr->m_pRedlineStack = mpOldRedlines;
pRdr->DeleteAnchorStk();
- pRdr->pAnchorStck = mpOldAnchorStck;
+ pRdr->m_pAnchorStck = mpOldAnchorStck;
- *pRdr->pPaM->GetPoint() = maTmpPos;
+ *pRdr->m_pPaM->GetPoint() = maTmpPos;
- if (mpOldPlcxMan != pRdr->pPlcxMan)
+ if (mpOldPlcxMan != pRdr->m_pPlcxMan)
{
- delete pRdr->pPlcxMan;
- pRdr->pPlcxMan = mpOldPlcxMan;
+ delete pRdr->m_pPlcxMan;
+ pRdr->m_pPlcxMan = mpOldPlcxMan;
}
- if (pRdr->pPlcxMan)
- pRdr->pPlcxMan->RestoreAllPLCFx(maPLCFxSave);
- pRdr->maApos.swap(maOldApos);
- pRdr->maFieldStack.swap(maOldFieldStack);
+ if (pRdr->m_pPlcxMan)
+ pRdr->m_pPlcxMan->RestoreAllPLCFx(maPLCFxSave);
+ pRdr->m_aApos.swap(maOldApos);
+ pRdr->m_aFieldStack.swap(maOldFieldStack);
}
void SwWW8ImplReader::Read_HdFtFtnText( const SwNodeIndex* pSttIdx,
@@ -2144,8 +2144,8 @@ void SwWW8ImplReader::Read_HdFtFtnText( const SwNodeIndex* pSttIdx,
// Saves Flags (amongst other things) and resets them
WW8ReaderSave aSave( this );
- pPaM->GetPoint()->nNode = pSttIdx->GetIndex() + 1;
- pPaM->GetPoint()->nContent.Assign( pPaM->GetCntntNode(), 0 );
+ m_pPaM->GetPoint()->nNode = pSttIdx->GetIndex() + 1;
+ m_pPaM->GetPoint()->nContent.Assign( m_pPaM->GetCntntNode(), 0 );
// Read Text for Header, Footer or Footnote
ReadText( nStartCp, nLen, nType ); // Ignore Sepx when doing so
@@ -2157,13 +2157,13 @@ void SwWW8ImplReader::Read_HdFtFtnText( const SwNodeIndex* pSttIdx,
*/
long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
{
- WW8PLCFx_SubDoc* pSD = pPlcxMan->GetAtn();
+ WW8PLCFx_SubDoc* pSD = m_pPlcxMan->GetAtn();
if( !pSD )
return 0;
OUString sAuthor;
OUString sInitials;
- if( bVer67 )
+ if( m_bVer67 )
{
const WW67_ATRD* pDescri = static_cast<const WW67_ATRD*>(pSD->GetData());
const OUString* pA = GetAnnotationAuthor(SVBT16ToShort(pDescri->ibst));
@@ -2194,10 +2194,10 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
sal_uInt32 nDateTime = 0;
- if (sal_uInt8 * pExtended = pPlcxMan->GetExtendedAtrds()) // Word < 2002 has no date data for comments
+ 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 (pWwFib->lcbAtrdExtra/18 > nIndex)
+ if (m_pWwFib->lcbAtrdExtra/18 > nIndex)
nDateTime = SVBT32ToUInt32(*reinterpret_cast<SVBT32*>(pExtended+(nIndex*18)));
}
@@ -2207,18 +2207,18 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
OutlinerParaObject *pOutliner = ImportAsOutliner( sTxt, pRes->nCp2OrIdx,
pRes->nCp2OrIdx + pRes->nMemLen, MAN_AND );
- this->pFmtOfJustInsertedApo = 0;
+ m_pFmtOfJustInsertedApo = 0;
SwPostItField aPostIt(
- static_cast<SwPostItFieldType*>(rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD)), sAuthor,
+ static_cast<SwPostItFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD)), sAuthor,
sTxt, sInitials, OUString(), aDate );
aPostIt.SetTextObject(pOutliner);
- SwPaM aEnd(*pPaM->End(), *pPaM->End());
- pCtrlStck->NewAttr(*aEnd.GetPoint(), SvxCharHiddenItem(false, RES_CHRATR_HIDDEN));
- rDoc.getIDocumentContentOperations().InsertPoolItem(aEnd, SwFmtFld(aPostIt));
- pCtrlStck->SetAttr(*aEnd.GetPoint(), RES_CHRATR_HIDDEN);
+ SwPaM aEnd(*m_pPaM->End(), *m_pPaM->End());
+ m_pCtrlStck->NewAttr(*aEnd.GetPoint(), SvxCharHiddenItem(false, RES_CHRATR_HIDDEN));
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem(aEnd, SwFmtFld(aPostIt));
+ m_pCtrlStck->SetAttr(*aEnd.GetPoint(), RES_CHRATR_HIDDEN);
// If this is a range, make sure that it ends after the just inserted character, not before it.
- pReffedStck->MoveAttrs(*aEnd.GetPoint());
+ m_pReffedStck->MoveAttrs(*aEnd.GetPoint());
return 0;
}
@@ -2231,12 +2231,12 @@ void SwWW8ImplReader::Read_HdFtTextAsHackedFrame(long nStart, long nLen,
if (!pSttIdx)
return;
- SwPosition aTmpPos(*pPaM->GetPoint());
+ SwPosition aTmpPos(*m_pPaM->GetPoint());
- pPaM->GetPoint()->nNode = pSttIdx->GetIndex() + 1;
- pPaM->GetPoint()->nContent.Assign(pPaM->GetCntntNode(), 0);
+ m_pPaM->GetPoint()->nNode = pSttIdx->GetIndex() + 1;
+ m_pPaM->GetPoint()->nContent.Assign(m_pPaM->GetCntntNode(), 0);
- SwFlyFrmFmt *pFrame = rDoc.MakeFlySection(FLY_AT_PARA, pPaM->GetPoint());
+ SwFlyFrmFmt *pFrame = m_rDoc.MakeFlySection(FLY_AT_PARA, m_pPaM->GetPoint());
SwFmtAnchor aAnch( pFrame->GetAnchor() );
aAnch.SetType( FLY_AT_PARA );
@@ -2273,23 +2273,23 @@ void SwWW8ImplReader::Read_HdFtText(long nStart, long nLen, SwFrmFmt* pHdFtFmt)
if (!pSttIdx)
return;
- SwPosition aTmpPos( *pPaM->GetPoint() ); // Remember old cursor position
+ SwPosition aTmpPos( *m_pPaM->GetPoint() ); // Remember old cursor position
Read_HdFtFtnText(pSttIdx, nStart, nLen - 1, MAN_HDFT);
- *pPaM->GetPoint() = aTmpPos;
+ *m_pPaM->GetPoint() = aTmpPos;
}
bool SwWW8ImplReader::isValid_HdFt_CP(WW8_CP nHeaderCP) const
{
// Each CP of Plcfhdd MUST be less than FibRgLw97.ccpHdd
- return (nHeaderCP < pWwFib->ccpHdr);
+ return (nHeaderCP < m_pWwFib->ccpHdr);
}
bool SwWW8ImplReader::HasOwnHeaderFooter(sal_uInt8 nWhichItems, sal_uInt8 grpfIhdt,
int nSect)
{
- if (pHdFt)
+ if (m_pHdFt)
{
WW8_CP start;
long nLen;
@@ -2300,11 +2300,11 @@ bool SwWW8ImplReader::HasOwnHeaderFooter(sal_uInt8 nWhichItems, sal_uInt8 grpfIh
if (nI & nWhichItems)
{
bool bOk = true;
- if( bVer67 )
- bOk = ( pHdFt->GetTextPos(grpfIhdt, nI, start, nLen ) && nLen >= 2 );
+ if( m_bVer67 )
+ bOk = ( m_pHdFt->GetTextPos(grpfIhdt, nI, start, nLen ) && nLen >= 2 );
else
{
- pHdFt->GetTextPosExact( static_cast< short >(nNumber + (nSect+1)*6), start, nLen);
+ m_pHdFt->GetTextPosExact( static_cast< short >(nNumber + (nSect+1)*6), start, nLen);
bOk = ( 2 <= nLen ) && isValid_HdFt_CP(start);
}
@@ -2322,7 +2322,7 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const SwPageDesc *pPrev,
sal_uInt8 grpfIhdt = rSection.maSep.grpfIhdt;
SwPageDesc *pPD = rSection.mpPage;
- if( pHdFt )
+ if( m_pHdFt )
{
WW8_CP start;
long nLen;
@@ -2336,11 +2336,11 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const SwPageDesc *pPrev,
if (nI & grpfIhdt)
{
bool bOk = true;
- if( bVer67 )
- bOk = ( pHdFt->GetTextPos(grpfIhdt, nI, start, nLen ) && nLen >= 2 );
+ if( m_bVer67 )
+ bOk = ( m_pHdFt->GetTextPos(grpfIhdt, nI, start, nLen ) && nLen >= 2 );
else
{
- pHdFt->GetTextPosExact( static_cast< short >(nNumber + (nSect+1)*6), start, nLen);
+ m_pHdFt->GetTextPosExact( static_cast< short >(nNumber + (nSect+1)*6), start, nLen);
bOk = ( 2 <= nLen ) && isValid_HdFt_CP(start);
}
@@ -2366,7 +2366,7 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const SwPageDesc *pPrev,
bool bNoFirst = !(grpfIhdt & WW8_HEADER_FIRST) && !(grpfIhdt & WW8_FOOTER_FIRST);
if (bFooter)
{
- bIsFooter = true;
+ m_bIsFooter = true;
//#i17196# Cannot have left without right
if (!bDisabledFirst
&& !pPD->GetMaster().GetFooter().GetFooterFmt())
@@ -2379,7 +2379,7 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const SwPageDesc *pPrev,
}
else
{
- bIsHeader = true;
+ m_bIsHeader = true;
//#i17196# Cannot have left without right
if (!bDisabledFirst
&& !pPD->GetMaster().GetHeader().GetHeaderFmt())
@@ -2394,9 +2394,9 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const SwPageDesc *pPrev,
if (bOk)
{
bool bHackRequired = false;
- if (bIsHeader && rSection.IsFixedHeightHeader())
+ if (m_bIsHeader && rSection.IsFixedHeightHeader())
bHackRequired = true;
- else if (bIsFooter && rSection.IsFixedHeightFooter())
+ else if (m_bIsFooter && rSection.IsFixedHeightFooter())
bHackRequired = true;
if (bHackRequired)
@@ -2410,7 +2410,7 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const SwPageDesc *pPrev,
else if (!bOk && pPrev)
CopyPageDescHdFt(pPrev, pPD, nI);
- bIsHeader = bIsFooter = false;
+ m_bIsHeader = m_bIsFooter = false;
}
}
}
@@ -2418,7 +2418,7 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const SwPageDesc *pPrev,
bool wwSectionManager::SectionIsProtected(const wwSection &rSection) const
{
- return (mrReader.pWwFib->fReadOnlyRecommended && !rSection.IsNotProtected());
+ return (mrReader.m_pWwFib->fReadOnlyRecommended && !rSection.IsNotProtected());
}
void wwSectionManager::SetHdFt(wwSection &rSection, int nSect,
@@ -2437,14 +2437,14 @@ void wwSectionManager::SetHdFt(wwSection &rSection, int nSect,
// Header/Footer - Update Index
// So that the index is still valid later on
- if (mrReader.pHdFt)
- mrReader.pHdFt->UpdateIndex(rSection.maSep.grpfIhdt);
+ if (mrReader.m_pHdFt)
+ mrReader.m_pHdFt->UpdateIndex(rSection.maSep.grpfIhdt);
}
void SwWW8ImplReader::AppendTxtNode(SwPosition& rPos)
{
- SwTxtNode* pTxt = pPaM->GetNode().GetTxtNode();
+ SwTxtNode* pTxt = m_pPaM->GetNode().GetTxtNode();
const SwNumRule* pRule = NULL;
@@ -2452,59 +2452,59 @@ void SwWW8ImplReader::AppendTxtNode(SwPosition& rPos)
pRule = sw::util::GetNumRuleFromTxtNode(*pTxt);
if (
- pRule && !pWDop->fDontUseHTMLAutoSpacing &&
- (bParaAutoBefore || bParaAutoAfter)
+ pRule && !m_pWDop->fDontUseHTMLAutoSpacing &&
+ (m_bParaAutoBefore || m_bParaAutoAfter)
)
{
// If after spacing is set to auto, set the after space to 0
- if (bParaAutoAfter)
- SetLowerSpacing(*pPaM, 0);
+ if (m_bParaAutoAfter)
+ SetLowerSpacing(*m_pPaM, 0);
// If the previous textnode had numbering and
// and before spacing is set to auto, set before space to 0
- if(pPrevNumRule && bParaAutoBefore)
- SetUpperSpacing(*pPaM, 0);
+ if(m_pPrevNumRule && m_bParaAutoBefore)
+ SetUpperSpacing(*m_pPaM, 0);
// If the previous numbering rule was different we need
// to insert a space after the previous paragraph
- if((pRule != pPrevNumRule) && pPreviousNumPaM)
- SetLowerSpacing(*pPreviousNumPaM, GetParagraphAutoSpace(pWDop->fDontUseHTMLAutoSpacing));
+ if((pRule != m_pPrevNumRule) && m_pPreviousNumPaM)
+ SetLowerSpacing(*m_pPreviousNumPaM, GetParagraphAutoSpace(m_pWDop->fDontUseHTMLAutoSpacing));
// cache current paragraph
- if(pPreviousNumPaM)
- delete pPreviousNumPaM, pPreviousNumPaM = 0;
+ if(m_pPreviousNumPaM)
+ delete m_pPreviousNumPaM, m_pPreviousNumPaM = 0;
- pPreviousNumPaM = new SwPaM(*pPaM, pPaM);
- pPrevNumRule = pRule;
+ m_pPreviousNumPaM = new SwPaM(*m_pPaM, m_pPaM);
+ m_pPrevNumRule = pRule;
}
- else if(!pRule && pPreviousNumPaM)
+ else if(!pRule && m_pPreviousNumPaM)
{
// If the previous paragraph has numbering but the current one does not
// we need to add a space after the previous paragraph
- SetLowerSpacing(*pPreviousNumPaM, GetParagraphAutoSpace(pWDop->fDontUseHTMLAutoSpacing));
- delete pPreviousNumPaM, pPreviousNumPaM = 0;
- pPrevNumRule = 0;
+ SetLowerSpacing(*m_pPreviousNumPaM, GetParagraphAutoSpace(m_pWDop->fDontUseHTMLAutoSpacing));
+ delete m_pPreviousNumPaM, m_pPreviousNumPaM = 0;
+ m_pPrevNumRule = 0;
}
else
{
// clear paragraph cache
- if(pPreviousNumPaM)
- delete pPreviousNumPaM, pPreviousNumPaM = 0;
- pPrevNumRule = pRule;
+ if(m_pPreviousNumPaM)
+ delete m_pPreviousNumPaM, m_pPreviousNumPaM = 0;
+ m_pPrevNumRule = pRule;
}
// If this is the first paragraph in the document and
// Auto-spacing before paragraph is set,
// set the upper spacing value to 0
- if(bParaAutoBefore && bFirstPara && !pWDop->fDontUseHTMLAutoSpacing)
- SetUpperSpacing(*pPaM, 0);
+ if(m_bParaAutoBefore && m_bFirstPara && !m_pWDop->fDontUseHTMLAutoSpacing)
+ SetUpperSpacing(*m_pPaM, 0);
- bFirstPara = false;
+ m_bFirstPara = false;
- rDoc.getIDocumentContentOperations().AppendTxtNode(rPos);
+ m_rDoc.getIDocumentContentOperations().AppendTxtNode(rPos);
// We can flush all anchored graphics at the end of a paragraph.
- pAnchorStck->Flush();
+ m_pAnchorStck->Flush();
}
bool SwWW8ImplReader::SetSpacing(SwPaM &rMyPam, int nSpace, bool bIsUpper )
@@ -2512,7 +2512,7 @@ bool SwWW8ImplReader::SetSpacing(SwPaM &rMyPam, int nSpace, bool bIsUpper )
bool bRet = false;
const SwPosition* pSpacingPos = rMyPam.GetPoint();
- const SvxULSpaceItem* pULSpaceItem = static_cast<const SvxULSpaceItem*>(pCtrlStck->GetFmtAttr(*pSpacingPos, RES_UL_SPACE));
+ const SvxULSpaceItem* pULSpaceItem = static_cast<const SvxULSpaceItem*>(m_pCtrlStck->GetFmtAttr(*pSpacingPos, RES_UL_SPACE));
if(pULSpaceItem != 0)
{
@@ -2525,9 +2525,9 @@ bool SwWW8ImplReader::SetSpacing(SwPaM &rMyPam, int nSpace, bool bIsUpper )
const sal_Int32 nEnd = pSpacingPos->nContent.GetIndex();
rMyPam.GetPoint()->nContent.Assign(rMyPam.GetCntntNode(), 0);
- pCtrlStck->NewAttr(*pSpacingPos, aUL);
+ m_pCtrlStck->NewAttr(*pSpacingPos, aUL);
rMyPam.GetPoint()->nContent.Assign(rMyPam.GetCntntNode(), nEnd);
- pCtrlStck->SetAttr(*pSpacingPos, RES_UL_SPACE);
+ m_pCtrlStck->SetAttr(*pSpacingPos, RES_UL_SPACE);
bRet = true;
}
return bRet;
@@ -2545,7 +2545,7 @@ bool SwWW8ImplReader::SetUpperSpacing(SwPaM &rMyPam, int nSpace)
sal_uInt16 SwWW8ImplReader::TabRowSprm(int nLevel) const
{
- if (bVer67)
+ if (m_bVer67)
return 25;
return nLevel ? 0x244C : 0x2417;
}
@@ -2553,36 +2553,36 @@ sal_uInt16 SwWW8ImplReader::TabRowSprm(int nLevel) const
void SwWW8ImplReader::EndSpecial()
{
// Frame/Table/Anl
- if (bAnl)
+ if (m_bAnl)
StopAllAnl(); // -> bAnl = false
- while(maApos.size() > 1)
+ while(m_aApos.size() > 1)
{
StopTable();
- maApos.pop_back();
- --nInTable;
- if (maApos[nInTable])
+ m_aApos.pop_back();
+ --m_nInTable;
+ if (m_aApos[m_nInTable])
StopApo();
}
- if (maApos[0])
+ if (m_aApos[0])
StopApo();
- OSL_ENSURE(!nInTable, "unclosed table!");
+ OSL_ENSURE(!m_nInTable, "unclosed table!");
}
bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp)
{
// Frame/Table/Anl
- if (bInHyperlink)
+ if (m_bInHyperlink)
return false;
rbReSync = false;
- OSL_ENSURE(nInTable >= 0,"nInTable < 0!");
+ OSL_ENSURE(m_nInTable >= 0,"nInTable < 0!");
// TabRowEnd
- bool bTableRowEnd = (pPlcxMan->HasParaSprm(bVer67 ? 25 : 0x2417) != 0 );
+ bool bTableRowEnd = (m_pPlcxMan->HasParaSprm(m_bVer67 ? 25 : 0x2417) != 0 );
// Unfortunately, for every paragraph we need to check first whether
// they contain a sprm 29 (0x261B), which starts an APO.
@@ -2612,39 +2612,39 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp)
// be considered, the sprm 6649 gives the level of the table
sal_uInt8 nCellLevel = 0;
- if (bVer67)
- nCellLevel = int(0 != pPlcxMan->HasParaSprm(24));
+ if (m_bVer67)
+ nCellLevel = int(0 != m_pPlcxMan->HasParaSprm(24));
else
{
- nCellLevel = int(0 != pPlcxMan->HasParaSprm(0x2416));
+ nCellLevel = int(0 != m_pPlcxMan->HasParaSprm(0x2416));
if (!nCellLevel)
- nCellLevel = int(0 != pPlcxMan->HasParaSprm(0x244B));
+ nCellLevel = int(0 != m_pPlcxMan->HasParaSprm(0x244B));
}
do
{
WW8_TablePos *pTabPos=0;
WW8_TablePos aTabPos;
- if(nCellLevel && !bVer67)
+ if(nCellLevel && !m_bVer67)
{
WW8PLCFxSave1 aSave;
- pPlcxMan->GetPap()->Save( aSave );
+ m_pPlcxMan->GetPap()->Save( aSave );
rbReSync = true;
- WW8PLCFx_Cp_FKP* pPap = pPlcxMan->GetPapPLCF();
+ WW8PLCFx_Cp_FKP* pPap = m_pPlcxMan->GetPapPLCF();
WW8_CP nMyStartCp=nStartCp;
- if (const sal_uInt8 *pLevel = pPlcxMan->HasParaSprm(0x6649))
+ if (const sal_uInt8 *pLevel = m_pPlcxMan->HasParaSprm(0x6649))
nCellLevel = *pLevel;
- bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, (nInTable<nCellLevel?nInTable:nCellLevel-1));
+ bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, (m_nInTable<nCellLevel?m_nInTable:nCellLevel-1));
// Bad Table, remain unchanged in level, e.g. #i19667#
if (!bHasRowEnd)
- nCellLevel = static_cast< sal_uInt8 >(nInTable);
+ nCellLevel = static_cast< sal_uInt8 >(m_nInTable);
if (bHasRowEnd && ParseTabPos(&aTabPos,pPap))
pTabPos = &aTabPos;
- pPlcxMan->GetPap()->Restore( aSave );
+ m_pPlcxMan->GetPap()->Restore( aSave );
}
// Then look if we are in an Apo
@@ -2652,24 +2652,24 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp)
ApoTestResults aApo = TestApo(nCellLevel, bTableRowEnd, pTabPos);
// Look to see if we are in a Table, but Table in foot/end note not allowed
- bool bStartTab = (nInTable < nCellLevel) && !bFtnEdn;
+ bool bStartTab = (m_nInTable < nCellLevel) && !m_bFtnEdn;
- bool bStopTab = bWasTabRowEnd && (nInTable > nCellLevel) && !bFtnEdn;
+ bool bStopTab = m_bWasTabRowEnd && (m_nInTable > nCellLevel) && !m_bFtnEdn;
- bWasTabRowEnd = false; // must be deactivated right here to prevent next
+ m_bWasTabRowEnd = false; // must be deactivated right here to prevent next
// WW8TabDesc::TableCellEnd() from making nonsense
- if (nInTable && !bTableRowEnd && !bStopTab && (nInTable == nCellLevel && aApo.HasStartStop()))
+ if (m_nInTable && !bTableRowEnd && !bStopTab && (m_nInTable == nCellLevel && aApo.HasStartStop()))
bStopTab = bStartTab = true; // Required to stop and start table
// Test for Anl (Numbering) and process all events in the right order
- if( bAnl && !bTableRowEnd )
+ if( m_bAnl && !bTableRowEnd )
{
- const sal_uInt8* pSprm13 = pPlcxMan->HasParaSprm( 13 );
+ const sal_uInt8* pSprm13 = m_pPlcxMan->HasParaSprm( 13 );
if( pSprm13 )
{ // Still Anl left?
sal_uInt8 nT = static_cast< sal_uInt8 >(GetNumType( *pSprm13 ));
- if( ( nT != WW8_Pause && nT != nWwNumType ) // Anl change
+ if( ( nT != WW8_Pause && nT != m_nWwNumType ) // Anl change
|| aApo.HasStartStop() // Forced Anl end
|| bStopTab || bStartTab )
{
@@ -2688,13 +2688,13 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp)
if (bStopTab)
{
StopTable();
- maApos.pop_back();
- --nInTable;
+ m_aApos.pop_back();
+ --m_nInTable;
}
if (aApo.mbStopApo)
{
StopApo();
- maApos[nInTable] = false;
+ m_aApos[m_nInTable] = false;
}
// So that SwWW8ImplReader::StartApo() can write into this, and
@@ -2703,7 +2703,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp)
if (aApo.mbStartApo)
{
- maApos[nInTable] = StartApo(aApo, pTabPos, &aULSpaceItem);
+ m_aApos[m_nInTable] = StartApo(aApo, pTabPos, &aULSpaceItem);
// We need an ReSync after StartApo
// (actually only if the Apo extends past a FKP border)
rbReSync = true;
@@ -2711,30 +2711,30 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp)
if (bStartTab)
{
WW8PLCFxSave1 aSave;
- pPlcxMan->GetPap()->Save( aSave );
+ m_pPlcxMan->GetPap()->Save( aSave );
// Numbering for cell borders causes a crash -> no Anls in Tables
- if (bAnl)
+ if (m_bAnl)
StopAllAnl();
- if(nInTable < nCellLevel)
+ if(m_nInTable < nCellLevel)
{
if (StartTable(nStartCp, &aULSpaceItem))
- ++nInTable;
+ ++m_nInTable;
else
break;
- maApos.push_back(false);
+ m_aApos.push_back(false);
}
- if(nInTable >= nCellLevel)
+ if(m_nInTable >= nCellLevel)
{
// We need an ReSync after StartTable
// (actually only if the Apo extends past a FKP border)
rbReSync = true;
- pPlcxMan->GetPap()->Restore( aSave );
+ m_pPlcxMan->GetPap()->Restore( aSave );
}
}
- } while (!bFtnEdn && (nInTable < nCellLevel));
+ } while (!m_bFtnEdn && (m_nInTable < nCellLevel));
return bTableRowEnd;
}
@@ -2782,15 +2782,15 @@ rtl_TextEncoding SwWW8ImplReader::GetCurrentCharSet()
character run that has set the charset, if not then fallback to the
current underlying paragraph style.
*/
- rtl_TextEncoding eSrcCharSet = eHardCharSet;
+ rtl_TextEncoding eSrcCharSet = m_eHardCharSet;
if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW)
{
- if (!maFontSrcCharSets.empty())
- eSrcCharSet = maFontSrcCharSets.top();
- if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && nCharFmt >= 0 && (size_t)nCharFmt < vColl.size() )
- eSrcCharSet = vColl[nCharFmt].GetCharSet();
- if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && StyleExists(nAktColl) && nAktColl < vColl.size())
- eSrcCharSet = vColl[nAktColl].GetCharSet();
+ if (!m_aFontSrcCharSets.empty())
+ eSrcCharSet = m_aFontSrcCharSets.top();
+ if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFmt >= 0 && (size_t)m_nCharFmt < m_vColl.size() )
+ eSrcCharSet = m_vColl[m_nCharFmt].GetCharSet();
+ if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && StyleExists(m_nAktColl) && m_nAktColl < m_vColl.size())
+ eSrcCharSet = m_vColl[m_nAktColl].GetCharSet();
if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW)
eSrcCharSet = GetCharSetFromLanguage();
}
@@ -2806,15 +2806,15 @@ rtl_TextEncoding SwWW8ImplReader::GetCurrentCJKCharSet()
character run that has set the charset, if not then fallback to the
current underlying paragraph style.
*/
- rtl_TextEncoding eSrcCharSet = eHardCharSet;
+ rtl_TextEncoding eSrcCharSet = m_eHardCharSet;
if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW)
{
- if (!maFontSrcCJKCharSets.empty())
- eSrcCharSet = maFontSrcCJKCharSets.top();
- if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && nCharFmt >= 0 && (size_t)nCharFmt < vColl.size() )
- eSrcCharSet = vColl[nCharFmt].GetCJKCharSet();
- if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW && StyleExists(nAktColl) && nAktColl < vColl.size())
- eSrcCharSet = vColl[nAktColl].GetCJKCharSet();
+ if (!m_aFontSrcCJKCharSets.empty())
+ eSrcCharSet = m_aFontSrcCJKCharSets.top();
+ if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFmt >= 0 && (size_t)m_nCharFmt < m_vColl.size() )
+ eSrcCharSet = m_vColl[m_nCharFmt].GetCJKCharSet();
+ if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW && StyleExists(m_nAktColl) && m_nAktColl < m_vColl.size())
+ eSrcCharSet = m_vColl[m_nAktColl].GetCJKCharSet();
if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW)
eSrcCharSet = GetCJKCharSetFromLanguage();
}
@@ -2823,25 +2823,25 @@ rtl_TextEncoding SwWW8ImplReader::GetCurrentCJKCharSet()
void SwWW8ImplReader::PostProcessAttrs()
{
- if (mpPostProcessAttrsInfo != NULL)
+ if (m_pPostProcessAttrsInfo != NULL)
{
- SfxItemIter aIter(mpPostProcessAttrsInfo->mItemSet);
+ SfxItemIter aIter(m_pPostProcessAttrsInfo->mItemSet);
const SfxPoolItem * pItem = aIter.GetCurItem();
if (pItem != NULL)
{
do
{
- pCtrlStck->NewAttr(*mpPostProcessAttrsInfo->mPaM.GetPoint(),
+ m_pCtrlStck->NewAttr(*m_pPostProcessAttrsInfo->mPaM.GetPoint(),
*pItem);
- pCtrlStck->SetAttr(*mpPostProcessAttrsInfo->mPaM.GetMark(),
+ m_pCtrlStck->SetAttr(*m_pPostProcessAttrsInfo->mPaM.GetMark(),
pItem->Which(), true);
}
while (!aIter.IsAtEnd() && 0 != (pItem = aIter.NextItem()));
}
- delete mpPostProcessAttrsInfo;
- mpPostProcessAttrsInfo = NULL;
+ delete m_pPostProcessAttrsInfo;
+ m_pPostProcessAttrsInfo = NULL;
}
}
@@ -2958,8 +2958,8 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, sal_Int32 nEnd, sal_Int32 nCp
if (nRequestedStrLen <= 0)
return true;
- sal_Int32 nRequestedPos = pSBase->WW8Cp2Fc(nCpOfs+rPos, &bIsUnicode);
- bool bValidPos = checkSeek(*pStrm, nRequestedPos);
+ sal_Int32 nRequestedPos = m_pSBase->WW8Cp2Fc(nCpOfs+rPos, &m_bIsUnicode);
+ bool bValidPos = checkSeek(*m_pStrm, nRequestedPos);
OSL_ENSURE(bValidPos, "Document claimed to have more text than available");
if (!bValidPos)
{
@@ -2968,7 +2968,7 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, sal_Int32 nEnd, sal_Int32 nCp
return true;
}
- sal_Size nAvailableStrLen = pStrm->remainingSize() / (bIsUnicode ? 2 : 1);
+ sal_Size nAvailableStrLen = m_pStrm->remainingSize() / (m_bIsUnicode ? 2 : 1);
OSL_ENSURE(nAvailableStrLen, "Document claimed to have more text than available");
if (!nAvailableStrLen)
{
@@ -2984,9 +2984,9 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, sal_Int32 nEnd, sal_Int32 nCp
// the correct FilePos has already been reached.
const sal_Int32 nStrLen = std::min(nValidStrLen, SAL_MAX_INT32-1);
- rtl_TextEncoding eSrcCharSet = bVer67 ? GetCurrentCharSet() :
+ rtl_TextEncoding eSrcCharSet = m_bVer67 ? GetCurrentCharSet() :
RTL_TEXTENCODING_MS_1252;
- if (bVer67 && eSrcCharSet == RTL_TEXTENCODING_MS_932)
+ if (m_bVer67 && eSrcCharSet == RTL_TEXTENCODING_MS_932)
{
/*
fdo#82904
@@ -3029,7 +3029,7 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, sal_Int32 nEnd, sal_Int32 nCp
eSrcCharSet = GetCharSetFromLanguage();
}
}
- const rtl_TextEncoding eSrcCJKCharSet = bVer67 ? GetCurrentCJKCharSet() :
+ const rtl_TextEncoding eSrcCJKCharSet = m_bVer67 ? GetCurrentCJKCharSet() :
RTL_TEXTENCODING_MS_1252;
// allocate unicode string data
@@ -3040,10 +3040,10 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, sal_Int32 nEnd, sal_Int32 nCp
sal_Char* p8Bits = NULL;
rtl_TextToUnicodeConverter hConverter = 0;
- if (!bIsUnicode || bVer67)
+ if (!m_bIsUnicode || m_bVer67)
hConverter = rtl_createTextToUnicodeConverter(eSrcCharSet);
- if (!bIsUnicode)
+ if (!m_bIsUnicode)
p8Bits = new sal_Char[nStrLen];
// read the stream data
@@ -3058,15 +3058,15 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, sal_Int32 nEnd, sal_Int32 nCp
sal_Int32 nL2;
for( nL2 = 0; nL2 < nStrLen; ++nL2, ++pWork )
{
- if (bIsUnicode)
- pStrm->ReadUInt16( nUCode ); // unicode --> read 2 bytes
+ if (m_bIsUnicode)
+ m_pStrm->ReadUInt16( nUCode ); // unicode --> read 2 bytes
else
{
- pStrm->ReadUChar( nBCode ); // old code --> read 1 byte
+ m_pStrm->ReadUChar( nBCode ); // old code --> read 1 byte
nUCode = nBCode;
}
- if (pStrm->GetError())
+ if (m_pStrm->GetError())
{
rPos = WW8_CP_MAX-10; // -> eof or other error
rtl_freeMemory(pStr);
@@ -3076,13 +3076,13 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, sal_Int32 nEnd, sal_Int32 nCp
if ((32 > nUCode) || (0xa0 == nUCode))
{
- pStrm->SeekRel( bIsUnicode ? -2 : -1 );
+ m_pStrm->SeekRel( m_bIsUnicode ? -2 : -1 );
break; // Special character < 32, == 0xa0 found
}
- if (bIsUnicode)
+ if (m_bIsUnicode)
{
- if (!bVer67)
+ if (!m_bVer67)
*pWork = nUCode;
else
{
@@ -3108,12 +3108,12 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, sal_Int32 nEnd, sal_Int32 nCp
if (nL2)
{
- const sal_Int32 nEndUsed = !bIsUnicode
+ const sal_Int32 nEndUsed = !m_bIsUnicode
? Custom8BitToUnicode(hConverter, p8Bits, nL2, pBuffer, nStrLen)
: nL2;
for( sal_Int32 nI = 0; nI < nStrLen; ++nI, ++pBuffer )
- if (m_bRegardHindiDigits && bBidi && LangUsesHindiNumbers(nCTLLang))
+ if (m_bRegardHindiDigits && m_bBidi && LangUsesHindiNumbers(nCTLLang))
*pBuffer = TranslateToHindiNumbers(*pBuffer);
pStr->buffer[nEndUsed] = 0;
@@ -3122,8 +3122,8 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, sal_Int32 nEnd, sal_Int32 nCp
emulateMSWordAddTextToParagraph(OUString(pStr, SAL_NO_ACQUIRE));
pStr = NULL;
rPos += nL2;
- if (!maApos.back()) // a para end in apo doesn't count
- bWasParaEnd = false; // No CR
+ if (!m_aApos.back()) // a para end in apo doesn't count
+ m_bWasParaEnd = false; // No CR
}
if (hConverter)
@@ -3243,7 +3243,7 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const OUString& rAddString
sal_Int32 nLen = rAddString.getLength();
OUString sParagraphText;
- const SwCntntNode *pCntNd = pPaM->GetCntntNode();
+ const SwCntntNode *pCntNd = m_pPaM->GetCntntNode();
const SwTxtNode* pNd = pCntNd ? pCntNd->GetTxtNode() : NULL;
if (pNd)
sParagraphText = pNd->GetTxt();
@@ -3264,7 +3264,7 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const OUString& rAddString
int nLclIdctHint = 0xFF;
if (nScript == i18n::ScriptType::WEAK)
- nLclIdctHint = nIdctHint;
+ nLclIdctHint = m_nIdctHint;
else if (nScript == MSASCII) // Force weak chars in ascii range to use LATIN font
nLclIdctHint = 0;
@@ -3328,11 +3328,11 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const OUString& rAddString
if (aForced[i])
{
pOverriddenItems[i] =
- static_cast<const SvxFontItem*>(pCtrlStck->GetStackAttr(*pPaM->GetPoint(), aIds[i]));
+ static_cast<const SvxFontItem*>(m_pCtrlStck->GetStackAttr(*m_pPaM->GetPoint(), aIds[i]));
SvxFontItem aForceFont(*pSourceFont);
aForceFont.SetWhich(aIds[i]);
- pCtrlStck->NewAttr(*pPaM->GetPoint(), aForceFont);
+ m_pCtrlStck->NewAttr(*m_pPaM->GetPoint(), aForceFont);
}
}
}
@@ -3344,9 +3344,9 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const OUString& rAddString
{
if (aForced[i])
{
- pCtrlStck->SetAttr(*pPaM->GetPoint(), aIds[i]);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), aIds[i]);
if (pOverriddenItems[i])
- pCtrlStck->NewAttr(*pPaM->GetPoint(), *(pOverriddenItems[i]));
+ m_pCtrlStck->NewAttr(*m_pPaM->GetPoint(), *(pOverriddenItems[i]));
}
}
@@ -3368,7 +3368,7 @@ void SwWW8ImplReader::simpleAddTextToParagraph(const OUString& rAddString)
}
#endif
- const SwCntntNode *pCntNd = pPaM->GetCntntNode();
+ const SwCntntNode *pCntNd = m_pPaM->GetCntntNode();
const SwTxtNode* pNd = pCntNd ? pCntNd->GetTxtNode() : NULL;
OSL_ENSURE(pNd, "What the hell, where's my text node");
@@ -3381,22 +3381,22 @@ void SwWW8ImplReader::simpleAddTextToParagraph(const OUString& rAddString)
{
if (rAddString.getLength() <= nCharsLeft)
{
- rDoc.getIDocumentContentOperations().InsertString(*pPaM, rAddString);
+ m_rDoc.getIDocumentContentOperations().InsertString(*m_pPaM, rAddString);
}
else
{
- rDoc.getIDocumentContentOperations().InsertString(*pPaM, rAddString.copy(0, nCharsLeft));
- AppendTxtNode(*pPaM->GetPoint());
- rDoc.getIDocumentContentOperations().InsertString(*pPaM, rAddString.copy(nCharsLeft));
+ m_rDoc.getIDocumentContentOperations().InsertString(*m_pPaM, rAddString.copy(0, nCharsLeft));
+ AppendTxtNode(*m_pPaM->GetPoint());
+ m_rDoc.getIDocumentContentOperations().InsertString(*m_pPaM, rAddString.copy(nCharsLeft));
}
}
else
{
- AppendTxtNode(*pPaM->GetPoint());
- rDoc.getIDocumentContentOperations().InsertString(*pPaM, rAddString);
+ AppendTxtNode(*m_pPaM->GetPoint());
+ m_rDoc.getIDocumentContentOperations().InsertString(*m_pPaM, rAddString);
}
- bReadTable = false;
+ m_bReadTable = false;
}
/**
@@ -3407,17 +3407,17 @@ bool SwWW8ImplReader::ReadChars(WW8_CP& rPos, WW8_CP nNextAttr, long nTextEnd,
{
long nEnd = ( nNextAttr < nTextEnd ) ? nNextAttr : nTextEnd;
- if (bSymbol || bIgnoreText)
+ if (m_bSymbol || m_bIgnoreText)
{
- if( bSymbol ) // Insert special chars
+ if( m_bSymbol ) // Insert special chars
{
for(sal_uInt16 nCh = 0; nCh < nEnd - rPos; ++nCh)
{
- rDoc.getIDocumentContentOperations().InsertString( *pPaM, OUString(cSymbol) );
+ m_rDoc.getIDocumentContentOperations().InsertString( *m_pPaM, OUString(m_cSymbol) );
}
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_FONT );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_FONT );
}
- pStrm->SeekRel( nEnd- rPos );
+ m_pStrm->SeekRel( nEnd- rPos );
rPos = nEnd; // Ignore until attribute end
return false;
}
@@ -3429,7 +3429,7 @@ bool SwWW8ImplReader::ReadChars(WW8_CP& rPos, WW8_CP nNextAttr, long nTextEnd,
bool bStartLine = ReadChar(rPos, nCpOfs);
rPos++;
- if (bPgSecBreak || bStartLine || rPos == nEnd) // CR or Done
+ if (m_bPgSecBreak || bStartLine || rPos == nEnd) // CR or Done
{
return bStartLine;
}
@@ -3441,31 +3441,31 @@ bool SwWW8ImplReader::HandlePageBreakChar()
bool bParaEndAdded = false;
// #i1909# section/page breaks should not occur in tables, word
// itself ignores them in this case.
- if (!nInTable)
+ if (!m_nInTable)
{
bool IsTemp=true;
- SwTxtNode* pTemp = pPaM->GetNode().GetTxtNode();
+ SwTxtNode* pTemp = m_pPaM->GetNode().GetTxtNode();
if (pTemp && pTemp->GetTxt().isEmpty()
- && (bFirstPara || bFirstParaOfPage))
+ && (m_bFirstPara || m_bFirstParaOfPage))
{
IsTemp = false;
- AppendTxtNode(*pPaM->GetPoint());
+ AppendTxtNode(*m_pPaM->GetPoint());
pTemp->SetAttr(*GetDfltAttr(RES_PARATR_NUMRULE));
}
- bPgSecBreak = true;
- pCtrlStck->KillUnlockedAttrs(*pPaM->GetPoint());
+ m_bPgSecBreak = true;
+ m_pCtrlStck->KillUnlockedAttrs(*m_pPaM->GetPoint());
/*
If it's a 0x0c without a paragraph end before it, act like a
paragraph end, but nevertheless, numbering (and perhaps other
similar constructs) do not exist on the para.
*/
- if (!bWasParaEnd && IsTemp)
+ if (!m_bWasParaEnd && IsTemp)
{
bParaEndAdded = true;
- if (0 >= pPaM->GetPoint()->nContent.GetIndex())
+ if (0 >= m_pPaM->GetPoint()->nContent.GetIndex())
{
- if (SwTxtNode* pTxtNode = pPaM->GetNode().GetTxtNode())
+ if (SwTxtNode* pTxtNode = m_pPaM->GetNode().GetTxtNode())
{
pTxtNode->SetAttr(
*GetDfltAttr(RES_PARATR_NUMRULE));
@@ -3482,17 +3482,17 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
// Reset Unicode flag and correct FilePos if needed.
// Note: Seek is not expensive, as we're checking inline whether or not
// the correct FilePos has already been reached.
- sal_Size nRequestedPos = pSBase->WW8Cp2Fc(nCpOfs+nPosCp, &bIsUnicode);
- if (!checkSeek(*pStrm, nRequestedPos))
+ sal_Size nRequestedPos = m_pSBase->WW8Cp2Fc(nCpOfs+nPosCp, &m_bIsUnicode);
+ if (!checkSeek(*m_pStrm, nRequestedPos))
return false;
sal_uInt8 nBCode(0);
sal_uInt16 nWCharVal(0);
- if( bIsUnicode )
- pStrm->ReadUInt16( nWCharVal ); // unicode --> read 2 bytes
+ if( m_bIsUnicode )
+ m_pStrm->ReadUInt16( nWCharVal ); // unicode --> read 2 bytes
else
{
- pStrm -> ReadUChar( nBCode ); // old code --> read 1 byte
+ m_pStrm -> ReadUChar( nBCode ); // old code --> read 1 byte
nWCharVal = nBCode;
}
@@ -3500,7 +3500,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
bool bParaMark = false;
if ( 0xc != nWCharVal )
- bFirstParaOfPage = false;
+ m_bFirstParaOfPage = false;
switch (nWCharVal)
{
@@ -3508,47 +3508,47 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
{
// Page number
SwPageNumberField aFld(
- static_cast<SwPageNumberFieldType*>(rDoc.getIDocumentFieldsAccess().GetSysFldType(
+ static_cast<SwPageNumberFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType(
RES_PAGENUMBERFLD )), PG_RANDOM, SVX_NUM_ARABIC);
- rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM, SwFmtFld(aFld));
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
}
break;
case 0xe:
// if there is only one column word treats a column break like a pagebreak.
- if (maSectionManager.CurrentSectionColCount() < 2)
+ if (m_aSectionManager.CurrentSectionColCount() < 2)
bParaMark = HandlePageBreakChar();
- else if (!nInTable)
+ else if (!m_nInTable)
{
// Always insert a txtnode for a column break, e.g. ##
- SwCntntNode *pCntNd=pPaM->GetCntntNode();
+ SwCntntNode *pCntNd=m_pPaM->GetCntntNode();
if (pCntNd!=NULL && pCntNd->Len()>0) // if par is empty not break is needed
- AppendTxtNode(*pPaM->GetPoint());
- rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM, SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK));
+ AppendTxtNode(*m_pPaM->GetPoint());
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK));
}
break;
case 0x7:
bNewParaEnd = true;
- if (pPlcxMan->GetPapPLCF()->Where() == nCpOfs+nPosCp+1)
+ if (m_pPlcxMan->GetPapPLCF()->Where() == nCpOfs+nPosCp+1)
TabCellEnd(); // Table cell/row end
else
bParaMark = true;
break;
case 0xf:
- if( !bSpec ) // "Satellite"
+ if( !m_bSpec ) // "Satellite"
cInsert = sal_Unicode('\xa4');
break;
case 0x14:
- if( !bSpec ) // "Para End" char
+ if( !m_bSpec ) // "Para End" char
cInsert = sal_Unicode('\xb5');
break;
case 0x15:
- if( !bSpec ) // Juristenparagraph
+ if( !m_bSpec ) // Juristenparagraph
{
- cp_set::iterator aItr = maTOXEndCps.find((WW8_CP)nPosCp);
- if (aItr == maTOXEndCps.end())
+ cp_set::iterator aItr = m_aTOXEndCps.find((WW8_CP)nPosCp);
+ if (aItr == m_aTOXEndCps.end())
cInsert = sal_Unicode('\xa7');
else
- maTOXEndCps.erase(aItr);
+ m_aTOXEndCps.erase(aItr);
}
break;
case 0x9:
@@ -3561,13 +3561,13 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
bParaMark = HandlePageBreakChar();
break;
case 0x1e: // Non-breaking hyphen
- rDoc.getIDocumentContentOperations().InsertString( *pPaM, OUString(CHAR_HARDHYPHEN) );
+ m_rDoc.getIDocumentContentOperations().InsertString( *m_pPaM, OUString(CHAR_HARDHYPHEN) );
break;
case 0x1f: // Non-required hyphens
- rDoc.getIDocumentContentOperations().InsertString( *pPaM, OUString(CHAR_SOFTHYPHEN) );
+ m_rDoc.getIDocumentContentOperations().InsertString( *m_pPaM, OUString(CHAR_SOFTHYPHEN) );
break;
case 0xa0: // Non-breaking spaces
- rDoc.getIDocumentContentOperations().InsertString( *pPaM, OUString(CHAR_HARDBLANK) );
+ m_rDoc.getIDocumentContentOperations().InsertString( *m_pPaM, OUString(CHAR_HARDBLANK) );
break;
case 0x1:
/*
@@ -3583,53 +3583,53 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
bool bReadObj = IsInlineEscherHack();
if( bReadObj )
{
- long nCurPos = pStrm->Tell();
+ long nCurPos = m_pStrm->Tell();
sal_uInt16 nWordCode(0);
- if( bIsUnicode )
- pStrm->ReadUInt16( nWordCode );
+ if( m_bIsUnicode )
+ m_pStrm->ReadUInt16( nWordCode );
else
{
sal_uInt8 nByteCode(0);
- pStrm->ReadUChar( nByteCode );
+ m_pStrm->ReadUChar( nByteCode );
nWordCode = nByteCode;
}
if( nWordCode == 0x1 )
bReadObj = false;
- pStrm->Seek( nCurPos );
+ m_pStrm->Seek( nCurPos );
}
if( !bReadObj )
{
SwFrmFmt *pResult = 0;
- if (bObj)
+ if (m_bObj)
pResult = ImportOle();
- else if (bSpec)
+ else if (m_bSpec)
pResult = ImportGraf();
// If we have a bad 0x1 insert a space instead.
if (!pResult)
{
cInsert = ' ';
- OSL_ENSURE(!bObj && !bEmbeddObj && !nObjLocFc,
+ OSL_ENSURE(!m_bObj && !m_bEmbeddObj && !m_nObjLocFc,
"WW8: Please report this document, it may have a "
"missing graphic");
}
else
{
// reset the flags.
- bObj = bEmbeddObj = false;
- nObjLocFc = 0;
+ m_bObj = m_bEmbeddObj = false;
+ m_nObjLocFc = 0;
}
}
}
break;
case 0x8:
- if( !bObj )
+ if( !m_bObj )
Read_GrafLayer( nPosCp );
break;
case 0xd:
bNewParaEnd = bParaMark = true;
- if (nInTable > 1)
+ if (m_nInTable > 1)
{
/*
#i9666#/#i23161#
@@ -3639,7 +3639,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
set. I also think btw that the third byte of the 4 byte
value is the level of the cell
*/
- WW8PLCFspecial* pTest = pPlcxMan->GetMagicTables();
+ WW8PLCFspecial* pTest = m_pPlcxMan->GetMagicTables();
if (pTest && pTest->SeekPosExact(nPosCp+1+nCpOfs) &&
pTest->Where() == nPosCp+1+nCpOfs)
{
@@ -3653,21 +3653,21 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
bParaMark = false;
}
}
- else if (bWasTabCellEnd)
+ else if (m_bWasTabCellEnd)
{
TabCellEnd();
bParaMark = false;
}
}
- bWasTabCellEnd = false;
+ m_bWasTabCellEnd = false;
break; // line end
case 0x5: // Annotation reference
case 0x13:
break;
case 0x2: // TODO: Auto-Footnote-Number, should be replaced by SwWW8ImplReader::End_Ftn later
- if (!maFtnStack.empty())
+ if (!m_aFtnStack.empty())
cInsert = 0x2;
break;
default:
@@ -3680,49 +3680,49 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
OUString sInsert(cInsert);
emulateMSWordAddTextToParagraph(sInsert);
}
- if (!maApos.back()) // a para end in apo doesn't count
- bWasParaEnd = bNewParaEnd;
+ if (!m_aApos.back()) // a para end in apo doesn't count
+ m_bWasParaEnd = bNewParaEnd;
return bParaMark;
}
void SwWW8ImplReader::ProcessAktCollChange(WW8PLCFManResult& rRes,
bool* pStartAttr, bool bCallProcessSpecial)
{
- sal_uInt16 nOldColl = nAktColl;
- nAktColl = pPlcxMan->GetColl();
+ sal_uInt16 nOldColl = m_nAktColl;
+ m_nAktColl = m_pPlcxMan->GetColl();
// Invalid Style-Id
- if (nAktColl >= vColl.size() || !vColl[nAktColl].pFmt || !vColl[nAktColl].bColl)
+ if (m_nAktColl >= m_vColl.size() || !m_vColl[m_nAktColl].pFmt || !m_vColl[m_nAktColl].bColl)
{
- nAktColl = 0;
- bParaAutoBefore = false;
- bParaAutoAfter = false;
+ m_nAktColl = 0;
+ m_bParaAutoBefore = false;
+ m_bParaAutoAfter = false;
}
else
{
- bParaAutoBefore = vColl[nAktColl].bParaAutoBefore;
- bParaAutoAfter = vColl[nAktColl].bParaAutoAfter;
+ m_bParaAutoBefore = m_vColl[m_nAktColl].bParaAutoBefore;
+ m_bParaAutoAfter = m_vColl[m_nAktColl].bParaAutoAfter;
}
- if (nOldColl >= vColl.size())
+ if (nOldColl >= m_vColl.size())
nOldColl = 0; // guess! TODO make sure this is what we want
bool bTabRowEnd = false;
- if( pStartAttr && bCallProcessSpecial && !bInHyperlink )
+ if( pStartAttr && bCallProcessSpecial && !m_bInHyperlink )
{
bool bReSync;
// Frame/Table/Autonumbering List Level
- bTabRowEnd = ProcessSpecial(bReSync, rRes.nAktCp+pPlcxMan->GetCpOfs());
+ bTabRowEnd = ProcessSpecial(bReSync, rRes.nAktCp+m_pPlcxMan->GetCpOfs());
if( bReSync )
- *pStartAttr = pPlcxMan->Get( &rRes ); // Get Attribut-Pos again
+ *pStartAttr = m_pPlcxMan->Get( &rRes ); // Get Attribut-Pos again
}
- if (!bTabRowEnd && StyleExists(nAktColl))
+ if (!bTabRowEnd && StyleExists(m_nAktColl))
{
- SetTxtFmtCollAndListLevel( *pPaM, vColl[ nAktColl ]);
- ChkToggleAttr(vColl[ nOldColl ].n81Flags, vColl[ nAktColl ].n81Flags);
- ChkToggleBiDiAttr(vColl[nOldColl].n81BiDiFlags,
- vColl[nAktColl].n81BiDiFlags);
+ SetTxtFmtCollAndListLevel( *m_pPaM, m_vColl[ m_nAktColl ]);
+ ChkToggleAttr(m_vColl[ nOldColl ].n81Flags, m_vColl[ m_nAktColl ].n81Flags);
+ ChkToggleBiDiAttr(m_vColl[nOldColl].n81BiDiFlags,
+ m_vColl[m_nAktColl].n81BiDiFlags);
}
}
@@ -3731,20 +3731,20 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTxtPos, bool& rbStartLine)
long nSkipChars = 0;
WW8PLCFManResult aRes;
- OSL_ENSURE(pPaM->GetNode().GetTxtNode(), "Missing txtnode");
- bool bStartAttr = pPlcxMan->Get(&aRes); // Get Attribute position again
+ OSL_ENSURE(m_pPaM->GetNode().GetTxtNode(), "Missing txtnode");
+ bool bStartAttr = m_pPlcxMan->Get(&aRes); // Get Attribute position again
aRes.nAktCp = rTxtPos; // Current Cp position
- bool bNewSection = (aRes.nFlags & MAN_MASK_NEW_SEP) && !bIgnoreText;
+ bool bNewSection = (aRes.nFlags & MAN_MASK_NEW_SEP) && !m_bIgnoreText;
if ( bNewSection ) // New Section
{
- OSL_ENSURE(pPaM->GetNode().GetTxtNode(), "Missing txtnode");
+ OSL_ENSURE(m_pPaM->GetNode().GetTxtNode(), "Missing txtnode");
// Create PageDesc and fill it
- maSectionManager.CreateSep(rTxtPos, bPgSecBreak);
+ m_aSectionManager.CreateSep(rTxtPos, m_bPgSecBreak);
// -> 0xc was a Sectionbreak, but not a Pagebreak;
// Create PageDesc and fill it
- bPgSecBreak = false;
- OSL_ENSURE(pPaM->GetNode().GetTxtNode(), "Missing txtnode");
+ m_bPgSecBreak = false;
+ OSL_ENSURE(m_pPaM->GetNode().GetTxtNode(), "Missing txtnode");
}
// New paragraph over Plcx.Fkp.papx
@@ -3752,7 +3752,7 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTxtPos, bool& rbStartLine)
{
ProcessAktCollChange( aRes, &bStartAttr,
MAN_MASK_NEW_PAP == (aRes.nFlags & MAN_MASK_NEW_PAP) &&
- !bIgnoreText );
+ !m_bIgnoreText );
rbStartLine = false;
}
@@ -3791,47 +3791,47 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTxtPos, bool& rbStartLine)
}
}
- pStrm->Seek(pSBase->WW8Cp2Fc( pPlcxMan->GetCpOfs() + rTxtPos, &bIsUnicode));
+ m_pStrm->Seek(m_pSBase->WW8Cp2Fc( m_pPlcxMan->GetCpOfs() + rTxtPos, &m_bIsUnicode));
// Find next Attr position (and Skip attributes of field contents if needed)
- if (nSkipChars && !bIgnoreText)
- pCtrlStck->MarkAllAttrsOld();
- bool bOldIgnoreText = bIgnoreText;
- bIgnoreText = true;
- sal_uInt16 nOldColl = nAktColl;
+ if (nSkipChars && !m_bIgnoreText)
+ m_pCtrlStck->MarkAllAttrsOld();
+ bool bOldIgnoreText = m_bIgnoreText;
+ m_bIgnoreText = true;
+ sal_uInt16 nOldColl = m_nAktColl;
bool bDoPlcxManPlusPLus = true;
long nNext;
do
{
if( bDoPlcxManPlusPLus )
- pPlcxMan->advance();
- nNext = pPlcxMan->Where();
+ m_pPlcxMan->advance();
+ nNext = m_pPlcxMan->Where();
- if (mpPostProcessAttrsInfo &&
- mpPostProcessAttrsInfo->mnCpStart == nNext)
+ if (m_pPostProcessAttrsInfo &&
+ m_pPostProcessAttrsInfo->mnCpStart == nNext)
{
- mpPostProcessAttrsInfo->mbCopy = true;
+ m_pPostProcessAttrsInfo->mbCopy = true;
}
if( (0 <= nNext) && (nSkipPos >= nNext) )
{
nNext = ReadTextAttr( rTxtPos, rbStartLine );
bDoPlcxManPlusPLus = false;
- bIgnoreText = true;
+ m_bIgnoreText = true;
}
- if (mpPostProcessAttrsInfo &&
- nNext > mpPostProcessAttrsInfo->mnCpEnd)
+ if (m_pPostProcessAttrsInfo &&
+ nNext > m_pPostProcessAttrsInfo->mnCpEnd)
{
- mpPostProcessAttrsInfo->mbCopy = false;
+ m_pPostProcessAttrsInfo->mbCopy = false;
}
}
while( nSkipPos >= nNext );
- bIgnoreText = bOldIgnoreText;
+ m_bIgnoreText = bOldIgnoreText;
if( nSkipChars )
{
- pCtrlStck->KillUnlockedAttrs( *pPaM->GetPoint() );
- if( nOldColl != pPlcxMan->GetColl() )
+ m_pCtrlStck->KillUnlockedAttrs( *m_pPaM->GetPoint() );
+ if( nOldColl != m_pPlcxMan->GetColl() )
ProcessAktCollChange(aRes, 0, false);
}
@@ -3845,7 +3845,7 @@ bool SwWW8ImplReader::IsParaEndInCPs(sal_Int32 nStart, sal_Int32 nEnd,bool bSdOD
if (nStart == -1 || nEnd == -1 || nEnd < nStart )
return false;
- for (cp_vector::const_reverse_iterator aItr = maEndParaPos.rbegin(); aItr!= maEndParaPos.rend(); ++aItr)
+ for (cp_vector::const_reverse_iterator aItr = m_aEndParaPos.rbegin(); aItr!= m_aEndParaPos.rend(); ++aItr)
{
//Revised 2012.8.16,to the 0x0D,the attribute will have two situations
//*********within***********exact******
@@ -3862,8 +3862,8 @@ bool SwWW8ImplReader::IsParaEndInCPs(sal_Int32 nStart, sal_Int32 nEnd,bool bSdOD
//Clear the para end position recorded in reader intermittently for the least impact on loading performance
void SwWW8ImplReader::ClearParaEndPosition()
{
- if ( maEndParaPos.size() > 0 )
- maEndParaPos.clear();
+ if ( m_aEndParaPos.size() > 0 )
+ m_aEndParaPos.clear();
}
void SwWW8ImplReader::ReadAttrs(WW8_CP& rNext, WW8_CP& rTxtPos, bool& rbStartLine)
@@ -3873,7 +3873,7 @@ void SwWW8ImplReader::ReadAttrs(WW8_CP& rNext, WW8_CP& rTxtPos, bool& rbStartLin
{
do
{
- maCurrAttrCP = rTxtPos;
+ m_aCurrAttrCP = rTxtPos;
rNext = ReadTextAttr( rTxtPos, rbStartLine );
}
while( rTxtPos >= rNext );
@@ -3887,8 +3887,8 @@ void SwWW8ImplReader::ReadAttrs(WW8_CP& rNext, WW8_CP& rTxtPos, bool& rbStartLin
* is false.
* Due to this we need to set the template here as a kind of special treatment.
*/
- if (!bCpxStyle && nAktColl < vColl.size())
- SetTxtFmtCollAndListLevel(*pPaM, vColl[nAktColl]);
+ if (!m_bCpxStyle && m_nAktColl < m_vColl.size())
+ SetTxtFmtCollAndListLevel(*m_pPaM, m_vColl[m_nAktColl]);
rbStartLine = false;
}
}
@@ -3903,7 +3903,7 @@ void SwWW8ImplReader::CloseAttrEnds()
// If there are any unclosed sprms then copy them to
// another stack and close the ones that must be closed
std::stack<sal_uInt16> aStack;
- pPlcxMan->TransferOpenSprms(aStack);
+ m_pPlcxMan->TransferOpenSprms(aStack);
while (!aStack.empty())
{
@@ -3924,30 +3924,30 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
short nCrCount = 0;
short nDistance = 0;
- bWasParaEnd = false;
- nAktColl = 0;
- pAktItemSet = 0;
- nCharFmt = -1;
- bSpec = false;
- bPgSecBreak = false;
+ m_bWasParaEnd = false;
+ m_nAktColl = 0;
+ m_pAktItemSet = 0;
+ m_nCharFmt = -1;
+ m_bSpec = false;
+ m_bPgSecBreak = false;
- pPlcxMan = new WW8PLCFMan( pSBase, nType, nStartCp );
- long nCpOfs = pPlcxMan->GetCpOfs(); // Offset for Header/Footer, Footnote
+ m_pPlcxMan = new WW8PLCFMan( m_pSBase, nType, nStartCp );
+ long nCpOfs = m_pPlcxMan->GetCpOfs(); // Offset for Header/Footer, Footnote
- WW8_CP nNext = pPlcxMan->Where();
+ WW8_CP nNext = m_pPlcxMan->Where();
SwTxtNode* pPreviousNode = 0;
sal_uInt8 nDropLines = 0;
SwCharFmt* pNewSwCharFmt = 0;
const SwCharFmt* pFmt = 0;
- pStrm->Seek( pSBase->WW8Cp2Fc( nStartCp + nCpOfs, &bIsUnicode ) );
+ m_pStrm->Seek( m_pSBase->WW8Cp2Fc( nStartCp + nCpOfs, &m_bIsUnicode ) );
WW8_CP l = nStartCp;
while ( l<nStartCp+nTextLen )
{
ReadAttrs( nNext, l, bStartLine );// Takes SectionBreaks into account, too
- OSL_ENSURE(pPaM->GetNode().GetTxtNode(), "Missing txtnode");
+ OSL_ENSURE(m_pPaM->GetNode().GetTxtNode(), "Missing txtnode");
- if (mpPostProcessAttrsInfo != NULL)
+ if (m_pPostProcessAttrsInfo != NULL)
PostProcessAttrs();
if( l>= nStartCp + nTextLen )
@@ -3960,36 +3960,36 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
if (bStartLine && !pPreviousNode) // Line end
{
bool bSplit = true;
- if (mbCareFirstParaEndInToc)
+ if (m_bCareFirstParaEndInToc)
{
- mbCareFirstParaEndInToc = false;
- if (pPaM->End() && pPaM->End()->nNode.GetNode().GetTxtNode() && pPaM->End()->nNode.GetNode().GetTxtNode()->Len() == 0)
+ m_bCareFirstParaEndInToc = false;
+ if (m_pPaM->End() && m_pPaM->End()->nNode.GetNode().GetTxtNode() && m_pPaM->End()->nNode.GetNode().GetTxtNode()->Len() == 0)
bSplit = false;
}
- if (mbCareLastParaEndInToc)
+ if (m_bCareLastParaEndInToc)
{
- mbCareLastParaEndInToc = false;
- if (pPaM->End() && pPaM->End()->nNode.GetNode().GetTxtNode() && pPaM->End()->nNode.GetNode().GetTxtNode()->Len() == 0)
+ m_bCareLastParaEndInToc = false;
+ if (m_pPaM->End() && m_pPaM->End()->nNode.GetNode().GetTxtNode() && m_pPaM->End()->nNode.GetNode().GetTxtNode()->Len() == 0)
bSplit = false;
}
if (bSplit)
{
// We will record the CP of a paragraph end ('0x0D'), if current loading contents is from main stream;
- if (mbOnLoadingMain)
- maEndParaPos.push_back(l-1);
- AppendTxtNode(*pPaM->GetPoint());
+ if (m_bOnLoadingMain)
+ m_aEndParaPos.push_back(l-1);
+ AppendTxtNode(*m_pPaM->GetPoint());
}
}
if (pPreviousNode && bStartLine)
{
- SwTxtNode* pEndNd = pPaM->GetNode().GetTxtNode();
+ SwTxtNode* pEndNd = m_pPaM->GetNode().GetTxtNode();
const sal_Int32 nDropCapLen = pPreviousNode->GetTxt().getLength();
// Need to reset the font size and text position for the dropcap
{
SwPaM aTmp(*pEndNd, 0, *pEndNd, nDropCapLen+1);
- pCtrlStck->Delete(aTmp);
+ m_pCtrlStck->Delete(aTmp);
}
// Get the default document dropcap which we can use as our template
@@ -4009,60 +4009,60 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
aDrop.SetCharFmt(const_cast<SwCharFmt*>(pNewSwCharFmt));
SwPosition aStart(*pEndNd);
- pCtrlStck->NewAttr(aStart, aDrop);
- pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_PARATR_DROP);
+ m_pCtrlStck->NewAttr(aStart, aDrop);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_PARATR_DROP);
pPreviousNode = 0;
}
- else if (bDropCap)
+ else if (m_bDropCap)
{
// If we have found a dropcap store the textnode
- pPreviousNode = pPaM->GetNode().GetTxtNode();
+ pPreviousNode = m_pPaM->GetNode().GetTxtNode();
const sal_uInt8 *pDCS;
- if (bVer67)
- pDCS = pPlcxMan->GetPapPLCF()->HasSprm(46);
+ if (m_bVer67)
+ pDCS = m_pPlcxMan->GetPapPLCF()->HasSprm(46);
else
- pDCS = pPlcxMan->GetPapPLCF()->HasSprm(0x442C);
+ pDCS = m_pPlcxMan->GetPapPLCF()->HasSprm(0x442C);
if (pDCS)
nDropLines = (*pDCS) >> 3;
else // There is no Drop Cap Specifier hence no dropcap
pPreviousNode = 0;
- if (const sal_uInt8 *pDistance = pPlcxMan->GetPapPLCF()->HasSprm(0x842F))
+ if (const sal_uInt8 *pDistance = m_pPlcxMan->GetPapPLCF()->HasSprm(0x842F))
nDistance = SVBT16ToShort( pDistance );
else
nDistance = 0;
const SwFmtCharFmt *pSwFmtCharFmt = 0;
- if(pAktItemSet)
- pSwFmtCharFmt = &(ItemGet<SwFmtCharFmt>(*pAktItemSet, RES_TXTATR_CHARFMT));
+ if(m_pAktItemSet)
+ pSwFmtCharFmt = &(ItemGet<SwFmtCharFmt>(*m_pAktItemSet, RES_TXTATR_CHARFMT));
if(pSwFmtCharFmt)
pFmt = pSwFmtCharFmt->GetCharFmt();
- if(pAktItemSet && !pFmt)
+ if(m_pAktItemSet && !pFmt)
{
- OUString sPrefix(OUStringBuffer("WW8Dropcap").append(nDropCap++).makeStringAndClear());
- pNewSwCharFmt = rDoc.MakeCharFmt(sPrefix, (SwCharFmt*)rDoc.GetDfltCharFmt());
- pAktItemSet->ClearItem(RES_CHRATR_ESCAPEMENT);
- pNewSwCharFmt->SetFmtAttr( *pAktItemSet );
+ OUString sPrefix(OUStringBuffer("WW8Dropcap").append(m_nDropCap++).makeStringAndClear());
+ pNewSwCharFmt = m_rDoc.MakeCharFmt(sPrefix, (SwCharFmt*)m_rDoc.GetDfltCharFmt());
+ m_pAktItemSet->ClearItem(RES_CHRATR_ESCAPEMENT);
+ pNewSwCharFmt->SetFmtAttr( *m_pAktItemSet );
}
- delete pAktItemSet;
- pAktItemSet = 0;
- bDropCap=false;
+ delete m_pAktItemSet;
+ m_pAktItemSet = 0;
+ m_bDropCap=false;
}
- if (bStartLine || bWasTabRowEnd)
+ if (bStartLine || m_bWasTabRowEnd)
{
// Call all 64 CRs; not for Header and the like
if ((nCrCount++ & 0x40) == 0 && nType == MAN_MAINTEXT)
{
- nProgress = (sal_uInt16)( l * 100 / nTextLen );
- ::SetProgressState(nProgress, mpDocShell); // Update
+ m_nProgress = (sal_uInt16)( l * 100 / nTextLen );
+ ::SetProgressState(m_nProgress, m_pDocShell); // Update
}
}
@@ -4070,189 +4070,189 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
// pagebreak then look it up to see if it is a section break, and
// if it is not then insert a page break. If it is a section break
// it will be handled as such in the ReadAttrs of the next loop
- if (bPgSecBreak)
+ if (m_bPgSecBreak)
{
// We need only to see if a section is ending at this cp,
// the plcf will already be sitting on the correct location
// if it is there.
WW8PLCFxDesc aTemp;
aTemp.nStartPos = aTemp.nEndPos = WW8_CP_MAX;
- if (pPlcxMan->GetSepPLCF())
- pPlcxMan->GetSepPLCF()->GetSprms(&aTemp);
+ if (m_pPlcxMan->GetSepPLCF())
+ m_pPlcxMan->GetSepPLCF()->GetSprms(&aTemp);
if ((aTemp.nStartPos != l) && (aTemp.nEndPos != l))
{
// #i39251# - insert text node for page break, if no one inserted.
// #i43118# - refine condition: the anchor
// control stack has to have entries, otherwise it's not needed
// to insert a text node.
- if (!bStartLine && !pAnchorStck->empty())
+ if (!bStartLine && !m_pAnchorStck->empty())
{
- AppendTxtNode(*pPaM->GetPoint());
+ AppendTxtNode(*m_pPaM->GetPoint());
}
- rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM,
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM,
SvxFmtBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK));
- bFirstParaOfPage = true;
- bPgSecBreak = false;
+ m_bFirstParaOfPage = true;
+ m_bPgSecBreak = false;
}
}
}
- if (pPaM->GetPoint()->nContent.GetIndex())
- AppendTxtNode(*pPaM->GetPoint());
+ if (m_pPaM->GetPoint()->nContent.GetIndex())
+ AppendTxtNode(*m_pPaM->GetPoint());
- if (!bInHyperlink)
- bJoined = JoinNode(*pPaM);
+ if (!m_bInHyperlink)
+ bJoined = JoinNode(*m_pPaM);
CloseAttrEnds();
- delete pPlcxMan, pPlcxMan = 0;
+ delete m_pPlcxMan, m_pPlcxMan = 0;
return bJoined;
}
SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage,
SvStream* pSt, SwDoc& rD, const OUString& rBaseURL, bool bNewDoc, bool bSkipImages)
- : mpDocShell(rD.GetDocShell())
- , pStg(pStorage)
- , pStrm(pSt)
- , pTableStream(0)
- , pDataStream(0)
- , rDoc(rD)
- , pPaM(0)
- , pCtrlStck(0)
- , mpRedlineStack(0)
- , pReffedStck(0)
- , pReffingStck(0)
- , pAnchorStck(0)
- , maSectionManager(*this)
+ : m_pDocShell(rD.GetDocShell())
+ , m_pStg(pStorage)
+ , m_pStrm(pSt)
+ , m_pTableStream(0)
+ , m_pDataStream(0)
+ , m_rDoc(rD)
+ , m_pPaM(0)
+ , m_pCtrlStck(0)
+ , m_pRedlineStack(0)
+ , m_pReffedStck(0)
+ , m_pReffingStck(0)
+ , m_pAnchorStck(0)
+ , m_aSectionManager(*this)
, m_aExtraneousParas(rD)
- , maInsertedTables(rD)
- , maSectionNameGenerator(rD, OUString("WW"))
- , mpSprmParser(NULL)
- , maGrfNameGenerator(bNewDoc, OUString('G'))
- , maParaStyleMapper(rD)
- , maCharStyleMapper(rD)
- , pFormImpl(0)
- , pFlyFmtOfJustInsertedGraphic(0)
- , pFmtOfJustInsertedApo(0)
- , pPreviousNumPaM(0)
- , pPrevNumRule(0)
- , mpPostProcessAttrsInfo(0)
- , pWwFib(0)
- , pFonts(0)
- , pWDop(0)
- , pLstManager(0)
- , pSBase(0)
- , pPlcxMan(0)
- , maTxtNodesHavingFirstLineOfstSet()
- , maTxtNodesHavingLeftIndentSet()
- , pStyles(0)
- , pAktColl(0)
- , pAktItemSet(0)
- , pDfltTxtFmtColl(0)
- , pStandardFmtColl(0)
- , pHdFt(0)
- , pWFlyPara(0)
- , pSFlyPara(0)
- , pTableDesc(0)
- , pNumOlst(0)
- , pNode_FLY_AT_PARA(0)
- , pDrawModel(0)
- , pDrawPg(0)
- , mpDrawEditEngine(0)
- , pWWZOrder(0)
- , pNumFldType(0)
- , pMSDffManager(0)
- , mpAtnNames(0)
- , sBaseURL(rBaseURL)
- , nIniFlags(0)
- , nIniFlags1(0)
- , nFieldFlags(0)
+ , m_aInsertedTables(rD)
+ , m_aSectionNameGenerator(rD, OUString("WW"))
+ , m_pSprmParser(NULL)
+ , m_aGrfNameGenerator(bNewDoc, OUString('G'))
+ , m_aParaStyleMapper(rD)
+ , m_aCharStyleMapper(rD)
+ , m_pFormImpl(0)
+ , m_pFlyFmtOfJustInsertedGraphic(0)
+ , m_pFmtOfJustInsertedApo(0)
+ , m_pPreviousNumPaM(0)
+ , m_pPrevNumRule(0)
+ , m_pPostProcessAttrsInfo(0)
+ , m_pWwFib(0)
+ , m_pFonts(0)
+ , m_pWDop(0)
+ , m_pLstManager(0)
+ , m_pSBase(0)
+ , m_pPlcxMan(0)
+ , m_aTxtNodesHavingFirstLineOfstSet()
+ , m_aTxtNodesHavingLeftIndentSet()
+ , m_pStyles(0)
+ , m_pAktColl(0)
+ , m_pAktItemSet(0)
+ , m_pDfltTxtFmtColl(0)
+ , m_pStandardFmtColl(0)
+ , m_pHdFt(0)
+ , m_pWFlyPara(0)
+ , m_pSFlyPara(0)
+ , m_pTableDesc(0)
+ , m_pNumOlst(0)
+ , m_pNode_FLY_AT_PARA(0)
+ , m_pDrawModel(0)
+ , m_pDrawPg(0)
+ , m_pDrawEditEngine(0)
+ , m_pWWZOrder(0)
+ , m_pNumFldType(0)
+ , m_pMSDffManager(0)
+ , m_pAtnNames(0)
+ , m_sBaseURL(rBaseURL)
+ , m_nIniFlags(0)
+ , m_nIniFlags1(0)
+ , m_nFieldFlags(0)
, m_bRegardHindiDigits( false )
- , nDrawCpO(0)
- , nPicLocFc(0)
- , nObjLocFc(0)
- , nIniFlyDx(0)
- , nIniFlyDy(0)
- , eTextCharSet(RTL_TEXTENCODING_ASCII_US)
- , eStructCharSet(RTL_TEXTENCODING_ASCII_US)
- , eHardCharSet(RTL_TEXTENCODING_DONTKNOW)
- , nProgress(0)
- , nAktColl(0)
- , nFldNum(0)
- , nLFOPosition(USHRT_MAX)
- , nCharFmt(0)
- , nDrawXOfs(0)
- , nDrawYOfs(0)
- , nDrawXOfs2(0)
- , nDrawYOfs2(0)
- , cSymbol(0)
- , nWantedVersion(nVersionPara)
- , nSwNumLevel(0xff)
- , nWwNumType(0xff)
- , nListLevel(WW8ListManager::nMaxLevel)
- , nPgChpDelim(0)
- , nPgChpLevel(0)
- , mbNewDoc(bNewDoc)
- , mbSkipImages(bSkipImages)
- , bReadNoTbl(false)
- , bPgSecBreak(false)
- , bSpec(false)
- , bObj(false)
- , bTxbxFlySection(false)
- , bHasBorder(false)
- , bSymbol(false)
- , bIgnoreText(false)
- , nInTable(0)
- , bWasTabRowEnd(false)
- , bWasTabCellEnd(false)
- , bAnl(false)
- , bHdFtFtnEdn(false)
- , bFtnEdn(false)
- , bIsHeader(false)
- , bIsFooter(false)
- , bIsUnicode(false)
- , bCpxStyle(false)
- , bStyNormal(false)
- , bWWBugNormal(false)
- , bNoAttrImport(false)
- , bInHyperlink(false)
- , bWasParaEnd(false)
- , bVer67(false)
- , bVer6(false)
- , bVer7(false)
- , bVer8(false)
- , bEmbeddObj(false)
- , bAktAND_fNumberAcross(false)
- , bNoLnNumYet(true)
- , bFirstPara(true)
- , bFirstParaOfPage(false)
- , bParaAutoBefore(false)
- , bParaAutoAfter(false)
- , bDropCap(false)
- , nDropCap(0)
- , nIdctHint(0)
- , bBidi(false)
- , bReadTable(false)
- , mbLoadingTOXCache(false)
- , mnEmbeddedTOXLevel(0)
- , mbLoadingTOXHyperlink(false)
- , mpPosAfterTOC(0)
- , mbCareFirstParaEndInToc(false)
- , mbCareLastParaEndInToc(false)
- , maTOXEndCps()
- , maCurrAttrCP(-1)
- , mbOnLoadingMain(false)
+ , m_nDrawCpO(0)
+ , m_nPicLocFc(0)
+ , m_nObjLocFc(0)
+ , m_nIniFlyDx(0)
+ , m_nIniFlyDy(0)
+ , m_eTextCharSet(RTL_TEXTENCODING_ASCII_US)
+ , m_eStructCharSet(RTL_TEXTENCODING_ASCII_US)
+ , m_eHardCharSet(RTL_TEXTENCODING_DONTKNOW)
+ , m_nProgress(0)
+ , m_nAktColl(0)
+ , m_nFldNum(0)
+ , m_nLFOPosition(USHRT_MAX)
+ , m_nCharFmt(0)
+ , m_nDrawXOfs(0)
+ , m_nDrawYOfs(0)
+ , m_nDrawXOfs2(0)
+ , m_nDrawYOfs2(0)
+ , m_cSymbol(0)
+ , m_nWantedVersion(nVersionPara)
+ , m_nSwNumLevel(0xff)
+ , m_nWwNumType(0xff)
+ , m_nListLevel(WW8ListManager::nMaxLevel)
+ , m_nPgChpDelim(0)
+ , m_nPgChpLevel(0)
+ , m_bNewDoc(bNewDoc)
+ , m_bSkipImages(bSkipImages)
+ , m_bReadNoTbl(false)
+ , m_bPgSecBreak(false)
+ , m_bSpec(false)
+ , m_bObj(false)
+ , m_bTxbxFlySection(false)
+ , m_bHasBorder(false)
+ , m_bSymbol(false)
+ , m_bIgnoreText(false)
+ , m_nInTable(0)
+ , m_bWasTabRowEnd(false)
+ , m_bWasTabCellEnd(false)
+ , m_bAnl(false)
+ , m_bHdFtFtnEdn(false)
+ , m_bFtnEdn(false)
+ , m_bIsHeader(false)
+ , m_bIsFooter(false)
+ , m_bIsUnicode(false)
+ , m_bCpxStyle(false)
+ , m_bStyNormal(false)
+ , m_bWWBugNormal(false)
+ , m_bNoAttrImport(false)
+ , m_bInHyperlink(false)
+ , m_bWasParaEnd(false)
+ , m_bVer67(false)
+ , m_bVer6(false)
+ , m_bVer7(false)
+ , m_bVer8(false)
+ , m_bEmbeddObj(false)
+ , m_bAktAND_fNumberAcross(false)
+ , m_bNoLnNumYet(true)
+ , m_bFirstPara(true)
+ , m_bFirstParaOfPage(false)
+ , m_bParaAutoBefore(false)
+ , m_bParaAutoAfter(false)
+ , m_bDropCap(false)
+ , m_nDropCap(0)
+ , m_nIdctHint(0)
+ , m_bBidi(false)
+ , m_bReadTable(false)
+ , m_bLoadingTOXCache(false)
+ , m_nEmbeddedTOXLevel(0)
+ , m_bLoadingTOXHyperlink(false)
+ , m_pPosAfterTOC(0)
+ , m_bCareFirstParaEndInToc(false)
+ , m_bCareLastParaEndInToc(false)
+ , m_aTOXEndCps()
+ , m_aCurrAttrCP(-1)
+ , m_bOnLoadingMain(false)
{
- pStrm->SetEndian( SvStreamEndian::LITTLE );
- maApos.push_back(false);
+ m_pStrm->SetEndian( SvStreamEndian::LITTLE );
+ m_aApos.push_back(false);
}
void SwWW8ImplReader::DeleteStk(SwFltControlStack* pStck)
{
if( pStck )
{
- pStck->SetAttr( *pPaM->GetPoint(), 0, false);
- pStck->SetAttr( *pPaM->GetPoint(), 0, false);
+ pStck->SetAttr( *m_pPaM->GetPoint(), 0, false);
+ pStck->SetAttr( *m_pPaM->GetPoint(), 0, false);
delete pStck;
}
else
@@ -4270,15 +4270,15 @@ void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection,
SwFrmFmt &rFmt = rPage.GetMaster();
- if(mrReader.pWDop->fUseBackGroundInAllmodes) // #i56806# Make sure mrReader is initialized
+ if(mrReader.m_pWDop->fUseBackGroundInAllmodes) // #i56806# Make sure mrReader is initialized
mrReader.GrafikCtor();
- if (mrReader.pWDop->fUseBackGroundInAllmodes && mrReader.pMSDffManager)
+ if (mrReader.m_pWDop->fUseBackGroundInAllmodes && mrReader.m_pMSDffManager)
{
Rectangle aRect(0, 0, 100, 100); // A dummy, we don't care about the size
SvxMSDffImportData aData(aRect);
SdrObject* pObject = 0;
- if (mrReader.pMSDffManager->GetShape(0x401, pObject, aData))
+ if (mrReader.m_pMSDffManager->GetShape(0x401, pObject, aData))
{
// Only handle shape if it is a background shape
if ((aData.begin()->nFlags & 0x400) != 0)
@@ -4307,12 +4307,12 @@ void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection,
void wwSectionManager::SetUseOn(wwSection &rSection)
{
- bool bMirror = mrReader.pWDop->fMirrorMargins ||
- mrReader.pWDop->doptypography.f2on1;
+ bool bMirror = mrReader.m_pWDop->fMirrorMargins ||
+ mrReader.m_pWDop->doptypography.f2on1;
UseOnPage eUseBase = bMirror ? nsUseOnPage::PD_MIRROR : nsUseOnPage::PD_ALL;
UseOnPage eUse = eUseBase;
- if (!mrReader.pWDop->fFacingPages)
+ if (!mrReader.m_pWDop->fFacingPages)
eUse = (UseOnPage)(eUse | nsUseOnPage::PD_HEADERSHARE | nsUseOnPage::PD_FOOTERSHARE);
if (!rSection.HasTitlePage())
eUse = (UseOnPage)(eUse | nsUseOnPage::PD_FIRSTSHARE);
@@ -4363,11 +4363,11 @@ SwFmtPageDesc wwSectionManager::SetSwFmtPageDesc(mySegIter &rIter,
if (IsNewDoc() && rIter == rStart)
{
rIter->mpPage =
- mrReader.rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool(RES_POOLPAGE_STANDARD);
+ mrReader.m_rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool(RES_POOLPAGE_STANDARD);
}
else
{
- rIter->mpPage = mrReader.rDoc.MakePageDesc(
+ rIter->mpPage = mrReader.m_rDoc.MakePageDesc(
SwViewShell::GetShellRes()->GetPageDescName(mnDesc, ShellResource::NORMAL_PAGE),
0, false);
}
@@ -4398,7 +4398,7 @@ SwFmtPageDesc wwSectionManager::SetSwFmtPageDesc(mySegIter &rIter,
bool wwSectionManager::IsNewDoc() const
{
- return mrReader.mbNewDoc;
+ return mrReader.m_bNewDoc;
}
void wwSectionManager::InsertSegments()
@@ -4415,7 +4415,7 @@ void wwSectionManager::InsertSegments()
if ( aIter->maSep.bkc == 1 && aIter->maSep.ccolM1 > 0 )
{
SwPaM start( aIter->maStart );
- mrReader.rDoc.getIDocumentContentOperations().InsertPoolItem( start, SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK));
+ mrReader.m_rDoc.getIDocumentContentOperations().InsertPoolItem( start, SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK));
continue;
}
@@ -4434,11 +4434,11 @@ void wwSectionManager::InsertSegments()
|| aIter->maSep.dxaLeft != aPrev->maSep.dxaLeft || aIter->maSep.dxaRight != aPrev->maSep.dxaRight )
bInsertPageDesc = true;
bool bProtected = SectionIsProtected(*aIter); // do we really need this ?? I guess I have a different logic in editshell which disables this...
- if (bUseEnhFields && mrReader.pWDop->fProtEnabled && aIter->IsNotProtected())
+ if (bUseEnhFields && mrReader.m_pWDop->fProtEnabled && aIter->IsNotProtected())
{
// here we have the special case that the whole document is protected, with the exception of this section.
// I want to address this when I do the section rework, so for the moment we disable the overall protection then...
- mrReader.rDoc.getIDocumentSettingAccess().set(DocumentSettingId::PROTECT_FORM, false );
+ mrReader.m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::PROTECT_FORM, false );
}
if (bInsertPageDesc)
@@ -4496,14 +4496,14 @@ void wwSectionManager::InsertSegments()
aDesc.GetPageDesc()->SetFollow( aFollow.GetPageDesc() );
}
- GiveNodePageDesc(aIter->maStart, aDesc, mrReader.rDoc);
+ GiveNodePageDesc(aIter->maStart, aDesc, mrReader.m_rDoc);
}
SwTxtNode* pTxtNd = 0;
if (bInsertSection)
{
// Start getting the bounds of this section
- SwPaM aSectPaM(*mrReader.pPaM, mrReader.pPaM);
+ SwPaM aSectPaM(*mrReader.m_pPaM, mrReader.m_pPaM);
SwNodeIndex aAnchor(aSectPaM.GetPoint()->nNode);
if (aNext != aEnd)
{
@@ -4520,8 +4520,8 @@ void wwSectionManager::InsertSegments()
if (pTableNd)
{
pTxtNd =
- mrReader.rDoc.GetNodes().MakeTxtNode(aAnchor,
- mrReader.rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT ));
+ mrReader.m_rDoc.GetNodes().MakeTxtNode(aAnchor,
+ mrReader.m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT ));
aSectPaM.GetPoint()->nNode = SwNodeIndex(*pTxtNd);
aSectPaM.GetPoint()->nContent.Assign(
@@ -4562,13 +4562,13 @@ void wwSectionManager::InsertSegments()
sal_uLong nEnd = aSectPaM.End()->nNode.GetIndex();
for(; nStart <= nEnd; ++nStart)
{
- SwNode* pNode = mrReader.rDoc.GetNodes()[nStart];
+ SwNode* pNode = mrReader.m_rDoc.GetNodes()[nStart];
if (!pNode)
continue;
if (sw::util::HasPageBreak(*pNode))
{
SwNodeIndex aIdx(*pNode);
- GiveNodePageDesc(aIdx, aDesc, mrReader.rDoc);
+ GiveNodePageDesc(aIdx, aDesc, mrReader.m_rDoc);
bFailed = false;
break;
}
@@ -4586,7 +4586,7 @@ void wwSectionManager::InsertSegments()
if (pRet)
{
// Set the columns to be UnBalanced if that compatibility option is set
- if (mrReader.pWDop->fNoColumnBalance)
+ if (mrReader.m_pWDop->fNoColumnBalance)
pRet->SetFmtAttr(SwFmtNoBalancedColumns(true));
else
{
@@ -4603,7 +4603,7 @@ void wwSectionManager::InsertSegments()
{
SwNodeIndex aIdx(*pTxtNd);
SwPaM aTest(aIdx);
- mrReader.rDoc.getIDocumentContentOperations().DelFullPara(aTest);
+ mrReader.m_rDoc.getIDocumentContentOperations().DelFullPara(aTest);
pTxtNd = 0;
}
}
@@ -4625,11 +4625,11 @@ void wwExtraneousParas::delete_all_from_doc()
void SwWW8ImplReader::StoreMacroCmds()
{
- if (pWwFib->lcbCmds)
+ if (m_pWwFib->lcbCmds)
{
- pTableStream->Seek(pWwFib->fcCmds);
+ m_pTableStream->Seek(m_pWwFib->fcCmds);
- uno::Reference < embed::XStorage > xRoot(mpDocShell->GetStorage());
+ uno::Reference < embed::XStorage > xRoot(m_pDocShell->GetStorage());
if (!xRoot.is())
return;
@@ -4640,9 +4640,9 @@ void SwWW8ImplReader::StoreMacroCmds()
xRoot->openStreamElement( OUString(SL::aMSMacroCmds), embed::ElementModes::READWRITE );
SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( xStream );
- sal_uInt8 *pBuffer = new sal_uInt8[pWwFib->lcbCmds];
- pWwFib->lcbCmds = pTableStream->Read(pBuffer, pWwFib->lcbCmds);
- pStream->Write(pBuffer, pWwFib->lcbCmds);
+ sal_uInt8 *pBuffer = new sal_uInt8[m_pWwFib->lcbCmds];
+ m_pWwFib->lcbCmds = m_pTableStream->Read(pBuffer, m_pWwFib->lcbCmds);
+ pStream->Write(pBuffer, m_pWwFib->lcbCmds);
delete[] pBuffer;
delete pStream;
}
@@ -4657,14 +4657,14 @@ void SwWW8ImplReader::ReadDocVars()
std::vector<OUString> aDocVarStrings;
std::vector<ww::bytes> aDocVarStringIds;
std::vector<OUString> aDocValueStrings;
- WW8ReadSTTBF(!bVer67, *pTableStream, pWwFib->fcStwUser,
- pWwFib->lcbStwUser, bVer67 ? 2 : 0, eStructCharSet,
+ WW8ReadSTTBF(!m_bVer67, *m_pTableStream, m_pWwFib->fcStwUser,
+ m_pWwFib->lcbStwUser, m_bVer67 ? 2 : 0, m_eStructCharSet,
aDocVarStrings, &aDocVarStringIds, &aDocValueStrings);
- if (!bVer67) {
+ if (!m_bVer67) {
using namespace ::com::sun::star;
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
- mpDocShell->GetModel(), uno::UNO_QUERY_THROW);
+ m_pDocShell->GetModel(), uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentProperties> xDocProps(
xDPS->getDocumentProperties());
OSL_ENSURE(xDocProps.is(), "DocumentProperties is null");
@@ -4693,19 +4693,19 @@ void SwWW8ImplReader::ReadDocVars()
*/
void SwWW8ImplReader::ReadDocInfo()
{
- if( pStg )
+ if( m_pStg )
{
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
- mpDocShell->GetModel(), uno::UNO_QUERY_THROW);
+ m_pDocShell->GetModel(), uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentProperties> xDocProps(
xDPS->getDocumentProperties());
OSL_ENSURE(xDocProps.is(), "DocumentProperties is null");
if (xDocProps.is()) {
- if ( pWwFib->fDot )
+ if ( m_pWwFib->fDot )
{
OUString sTemplateURL;
- SfxMedium* pMedium = mpDocShell->GetMedium();
+ SfxMedium* pMedium = m_pDocShell->GetMedium();
if ( pMedium )
{
OUString aName = pMedium->GetName();
@@ -4715,14 +4715,14 @@ void SwWW8ImplReader::ReadDocInfo()
xDocProps->setTemplateURL( sTemplateURL );
}
}
- else if (pWwFib->lcbSttbfAssoc) // not a template, and has a SttbfAssoc
+ else if (m_pWwFib->lcbSttbfAssoc) // not a template, and has a SttbfAssoc
{
- long nCur = pTableStream->Tell();
+ long nCur = m_pTableStream->Tell();
Sttb aSttb;
- pTableStream->Seek( pWwFib->fcSttbfAssoc ); // point at tgc record
- if (!aSttb.Read( *pTableStream ) )
+ m_pTableStream->Seek( m_pWwFib->fcSttbfAssoc ); // point at tgc record
+ if (!aSttb.Read( *m_pTableStream ) )
OSL_TRACE("** Read of SttbAssoc data failed!!!! ");
- pTableStream->Seek( nCur ); // return to previous position, is that necessary?
+ m_pTableStream->Seek( nCur ); // return to previous position, is that necessary?
#if OSL_DEBUG_LEVEL > 1
aSttb.Print( stderr );
#endif
@@ -4737,7 +4737,7 @@ void SwWW8ImplReader::ReadDocInfo()
xDocProps->setTemplateURL( sPath );
}
- sfx2::LoadOlePropertySet(xDocProps, pStg);
+ sfx2::LoadOlePropertySet(xDocProps, m_pStg);
}
}
}
@@ -4844,9 +4844,9 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom,
SotStorageRef rRoot = new SotStorage( aURL, STREAM_STD_READWRITE, STORAGE_TRANSACTED );
- BasicProjImportHelper aBasicImporter( *mpDocShell );
+ BasicProjImportHelper aBasicImporter( *m_pDocShell );
// Import vba via oox filter
- aBasicImporter.import( mpDocShell->GetMedium()->GetInputStream() );
+ aBasicImporter.import( m_pDocShell->GetMedium()->GetInputStream() );
lcl_createTemplateToProjectEntry( xPrjNameCache, aURL, aBasicImporter.getProjectName() );
// Read toolbars & menus
SvStorageStreamRef refMainStream = rRoot->OpenSotStream( OUString( "WordDocument" ));
@@ -4858,7 +4858,7 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom,
{
xTableStream->SetEndian(SvStreamEndian::LITTLE);
WW8Customizations aGblCustomisations( xTableStream, aWwFib );
- aGblCustomisations.Import( mpDocShell );
+ aGblCustomisations.Import( m_pDocShell );
}
}
return bRes;
@@ -4868,127 +4868,127 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
{
sal_uLong nErrRet = 0;
- rDoc.SetDocumentType( SwDoc::DOCTYPE_MSWORD );
- if (mbNewDoc && pStg && !pGloss)
+ m_rDoc.SetDocumentType( SwDoc::DOCTYPE_MSWORD );
+ if (m_bNewDoc && m_pStg && !pGloss)
ReadDocInfo();
::ww8::WW8FibData * pFibData = new ::ww8::WW8FibData();
- if (pWwFib->fReadOnlyRecommended)
+ if (m_pWwFib->fReadOnlyRecommended)
pFibData->setReadOnlyRecommended(true);
else
pFibData->setReadOnlyRecommended(false);
- if (pWwFib->fWriteReservation)
+ if (m_pWwFib->fWriteReservation)
pFibData->setWriteReservation(true);
else
pFibData->setWriteReservation(false);
::sw::tExternalDataPointer pExternalFibData(pFibData);
- rDoc.getIDocumentExternalData().setExternalData(::sw::tExternalDataType::FIB, pExternalFibData);
+ m_rDoc.getIDocumentExternalData().setExternalData(::sw::tExternalDataType::FIB, pExternalFibData);
::sw::tExternalDataPointer pSttbfAsoc
- (new ::ww8::WW8Sttb<ww8::WW8Struct>(*pTableStream, pWwFib->fcSttbfAssoc, pWwFib->lcbSttbfAssoc));
+ (new ::ww8::WW8Sttb<ww8::WW8Struct>(*m_pTableStream, m_pWwFib->fcSttbfAssoc, m_pWwFib->lcbSttbfAssoc));
- rDoc.getIDocumentExternalData().setExternalData(::sw::tExternalDataType::STTBF_ASSOC, pSttbfAsoc);
+ m_rDoc.getIDocumentExternalData().setExternalData(::sw::tExternalDataType::STTBF_ASSOC, pSttbfAsoc);
- if (pWwFib->fWriteReservation || pWwFib->fReadOnlyRecommended)
+ if (m_pWwFib->fWriteReservation || m_pWwFib->fReadOnlyRecommended)
{
- SwDocShell * pDocShell = rDoc.GetDocShell();
+ SwDocShell * pDocShell = m_rDoc.GetDocShell();
if (pDocShell)
pDocShell->SetReadOnlyUI(true);
}
- pPaM = rDoc.CreateUnoCrsr(rPos);
+ m_pPaM = m_rDoc.CreateUnoCrsr(rPos);
- pCtrlStck = new SwWW8FltControlStack( &rDoc, nFieldFlags, *this );
+ m_pCtrlStck = new SwWW8FltControlStack( &m_rDoc, m_nFieldFlags, *this );
- mpRedlineStack = new sw::util::RedlineStack(rDoc);
+ m_pRedlineStack = new sw::util::RedlineStack(m_rDoc);
/*
RefFldStck: Keeps track of bookmarks which may be inserted as
variables intstead.
*/
- pReffedStck = new SwWW8ReferencedFltEndStack(&rDoc, nFieldFlags);
- pReffingStck = new SwWW8FltRefStack(&rDoc, nFieldFlags);
+ m_pReffedStck = new SwWW8ReferencedFltEndStack(&m_rDoc, m_nFieldFlags);
+ m_pReffingStck = new SwWW8FltRefStack(&m_rDoc, m_nFieldFlags);
- pAnchorStck = new SwWW8FltAnchorStack(&rDoc, nFieldFlags);
+ m_pAnchorStck = new SwWW8FltAnchorStack(&m_rDoc, m_nFieldFlags);
- sal_uInt16 nPageDescOffset = rDoc.GetPageDescCnt();
+ sal_uInt16 nPageDescOffset = m_rDoc.GetPageDescCnt();
- SwNodeIndex aSttNdIdx( rDoc.GetNodes() );
- SwRelNumRuleSpaces aRelNumRule(rDoc, mbNewDoc);
+ SwNodeIndex aSttNdIdx( m_rDoc.GetNodes() );
+ SwRelNumRuleSpaces aRelNumRule(m_rDoc, m_bNewDoc);
sal_uInt16 eMode = nsRedlineMode_t::REDLINE_SHOW_INSERT;
- mpSprmParser = new wwSprmParser(pWwFib->GetFIBVersion());
+ m_pSprmParser = new wwSprmParser(m_pWwFib->GetFIBVersion());
// Set handy helper variables
- bVer6 = (6 == pWwFib->nVersion);
- bVer7 = (7 == pWwFib->nVersion);
- bVer67 = bVer6 || bVer7;
- bVer8 = (8 == pWwFib->nVersion);
+ m_bVer6 = (6 == m_pWwFib->nVersion);
+ m_bVer7 = (7 == m_pWwFib->nVersion);
+ m_bVer67 = m_bVer6 || m_bVer7;
+ m_bVer8 = (8 == m_pWwFib->nVersion);
- eTextCharSet = WW8Fib::GetFIBCharset(pWwFib->chse, pWwFib->lid);
- eStructCharSet = WW8Fib::GetFIBCharset(pWwFib->chseTables, pWwFib->lid);
+ m_eTextCharSet = WW8Fib::GetFIBCharset(m_pWwFib->chse, m_pWwFib->lid);
+ m_eStructCharSet = WW8Fib::GetFIBCharset(m_pWwFib->chseTables, m_pWwFib->lid);
- bWWBugNormal = pWwFib->nProduct == 0xc03d;
+ m_bWWBugNormal = m_pWwFib->nProduct == 0xc03d;
- if (!mbNewDoc)
- aSttNdIdx = pPaM->GetPoint()->nNode;
+ if (!m_bNewDoc)
+ aSttNdIdx = m_pPaM->GetPoint()->nNode;
- ::StartProgress(STR_STATSTR_W4WREAD, 0, 100, mpDocShell);
+ ::StartProgress(STR_STATSTR_W4WREAD, 0, 100, m_pDocShell);
// read Font Table
- pFonts = new WW8Fonts( *pTableStream, *pWwFib );
+ m_pFonts = new WW8Fonts( *m_pTableStream, *m_pWwFib );
// Document Properties
- pWDop = new WW8Dop( *pTableStream, pWwFib->nFib, pWwFib->fcDop,
- pWwFib->lcbDop );
+ m_pWDop = new WW8Dop( *m_pTableStream, m_pWwFib->nFib, m_pWwFib->fcDop,
+ m_pWwFib->lcbDop );
- if (mbNewDoc)
+ if (m_bNewDoc)
ImportDop();
/*
Import revisioning data: author names
*/
- if( pWwFib->lcbSttbfRMark )
+ if( m_pWwFib->lcbSttbfRMark )
{
- ReadRevMarkAuthorStrTabl( *pTableStream,
- pWwFib->fcSttbfRMark,
- pWwFib->lcbSttbfRMark, rDoc );
+ ReadRevMarkAuthorStrTabl( *m_pTableStream,
+ m_pWwFib->fcSttbfRMark,
+ m_pWwFib->lcbSttbfRMark, m_rDoc );
}
// Initialize our String/ID map for Linked Sections
std::vector<OUString> aLinkStrings;
std::vector<ww::bytes> aStringIds;
- WW8ReadSTTBF(!bVer67, *pTableStream, pWwFib->fcSttbFnm,
- pWwFib->lcbSttbFnm, bVer67 ? 2 : 0, eStructCharSet,
+ WW8ReadSTTBF(!m_bVer67, *m_pTableStream, m_pWwFib->fcSttbFnm,
+ m_pWwFib->lcbSttbFnm, m_bVer67 ? 2 : 0, m_eStructCharSet,
aLinkStrings, &aStringIds);
for (size_t i=0; i < aLinkStrings.size() && i < aStringIds.size(); ++i)
{
ww::bytes stringId = aStringIds[i];
WW8_STRINGID *stringIdStruct = reinterpret_cast<WW8_STRINGID*>(&stringId[0]);
- aLinkStringMap[SVBT16ToShort(stringIdStruct->nStringId)] =
+ m_aLinkStringMap[SVBT16ToShort(stringIdStruct->nStringId)] =
aLinkStrings[i];
}
ReadDocVars(); // import document variables as meta information.
- ::SetProgressState(nProgress, mpDocShell); // Update
+ ::SetProgressState(m_nProgress, m_pDocShell); // Update
- pLstManager = new WW8ListManager( *pTableStream, *this );
+ m_pLstManager = new WW8ListManager( *m_pTableStream, *this );
/*
zuerst(!) alle Styles importieren (siehe WW8PAR2.CXX)
VOR dem Import der Listen !!
*/
- ::SetProgressState(nProgress, mpDocShell); // Update
- pStyles = new WW8RStyle( *pWwFib, this ); // Styles
- pStyles->Import();
+ ::SetProgressState(m_nProgress, m_pDocShell); // Update
+ m_pStyles = new WW8RStyle( *m_pWwFib, this ); // Styles
+ m_pStyles->Import();
/*
In the end: (also see WW8PAR3.CXX)
@@ -4996,13 +4996,13 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
Go through all Styles and attach respective List Format
AFTER we imported the Styles and AFTER we imported the Lists!
*/
- ::SetProgressState(nProgress, mpDocShell); // Update
- pStyles->PostProcessStyles();
+ ::SetProgressState(m_nProgress, m_pDocShell); // Update
+ m_pStyles->PostProcessStyles();
- if (!vColl.empty())
+ if (!m_vColl.empty())
SetOutlineStyles();
- pSBase = new WW8ScannerBase(pStrm,pTableStream,pDataStream,pWwFib);
+ m_pSBase = new WW8ScannerBase(m_pStrm,m_pTableStream,m_pDataStream,m_pWwFib);
static const SvxExtNumType eNumTA[16] =
{
@@ -5014,7 +5014,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
SVX_NUM_ARABIC, SVX_NUM_ARABIC
};
- if (pSBase->AreThereFootnotes())
+ if (m_pSBase->AreThereFootnotes())
{
static const SwFtnNum eNumA[4] =
{
@@ -5022,92 +5022,92 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
};
SwFtnInfo aInfo;
- aInfo = rDoc.GetFtnInfo(); // Copy-Ctor private
+ aInfo = m_rDoc.GetFtnInfo(); // Copy-Ctor private
aInfo.ePos = FTNPOS_PAGE;
- aInfo.eNum = eNumA[pWDop->rncFtn];
- sal_uInt16 nfcFtnRef = pWDop->nfcFtnRef & 0xF;
+ aInfo.eNum = eNumA[m_pWDop->rncFtn];
+ sal_uInt16 nfcFtnRef = m_pWDop->nfcFtnRef & 0xF;
aInfo.aFmt.SetNumberingType( static_cast< sal_uInt16 >(eNumTA[nfcFtnRef]) );
- if( pWDop->nFtn )
- aInfo.nFtnOffset = pWDop->nFtn - 1;
- rDoc.SetFtnInfo( aInfo );
+ if( m_pWDop->nFtn )
+ aInfo.nFtnOffset = m_pWDop->nFtn - 1;
+ m_rDoc.SetFtnInfo( aInfo );
}
- if( pSBase->AreThereEndnotes() )
+ if( m_pSBase->AreThereEndnotes() )
{
SwEndNoteInfo aInfo;
- aInfo = rDoc.GetEndNoteInfo(); // Same as for Ftn
- sal_uInt16 nfcEdnRef = pWDop->nfcEdnRef & 0xF;
+ aInfo = m_rDoc.GetEndNoteInfo(); // Same as for Ftn
+ sal_uInt16 nfcEdnRef = m_pWDop->nfcEdnRef & 0xF;
aInfo.aFmt.SetNumberingType( static_cast< sal_uInt16 >(eNumTA[nfcEdnRef]) );
- if( pWDop->nEdn )
- aInfo.nFtnOffset = pWDop->nEdn - 1;
- rDoc.SetEndNoteInfo( aInfo );
+ if( m_pWDop->nEdn )
+ aInfo.nFtnOffset = m_pWDop->nEdn - 1;
+ m_rDoc.SetEndNoteInfo( aInfo );
}
- if( pWwFib->lcbPlcfhdd )
- pHdFt = new WW8PLCF_HdFt( pTableStream, *pWwFib, *pWDop );
+ if( m_pWwFib->lcbPlcfhdd )
+ m_pHdFt = new WW8PLCF_HdFt( m_pTableStream, *m_pWwFib, *m_pWDop );
- if (!mbNewDoc)
+ if (!m_bNewDoc)
{
// inserting into an existing document:
// As only complete paragraphs are inserted, the current one
// needs to be splitted - once or even twice.
- const SwPosition* pPos = pPaM->GetPoint();
+ const SwPosition* pPos = m_pPaM->GetPoint();
// split current paragraph to get new paragraph for the insertion
- rDoc.getIDocumentContentOperations().SplitNode( *pPos, false );
+ m_rDoc.getIDocumentContentOperations().SplitNode( *pPos, false );
// another split, if insertion position was not at the end of the current paragraph.
SwTxtNode const*const pTxtNd = pPos->nNode.GetNode().GetTxtNode();
if ( pTxtNd->GetTxt().getLength() )
{
- rDoc.getIDocumentContentOperations().SplitNode( *pPos, false );
+ m_rDoc.getIDocumentContentOperations().SplitNode( *pPos, false );
// move PaM back to the newly empty paragraph
- pPaM->Move( fnMoveBackward );
+ m_pPaM->Move( fnMoveBackward );
}
// suppress insertion of tables inside footnotes.
const sal_uLong nNd = pPos->nNode.GetIndex();
- bReadNoTbl = ( nNd < rDoc.GetNodes().GetEndOfInserts().GetIndex() &&
- rDoc.GetNodes().GetEndOfInserts().StartOfSectionIndex() < nNd );
+ m_bReadNoTbl = ( nNd < m_rDoc.GetNodes().GetEndOfInserts().GetIndex() &&
+ m_rDoc.GetNodes().GetEndOfInserts().StartOfSectionIndex() < nNd );
}
- ::SetProgressState(nProgress, mpDocShell); // Update
+ ::SetProgressState(m_nProgress, m_pDocShell); // Update
// loop for each glossary entry and add dummy section node
if (pGloss)
{
- WW8PLCF aPlc(*pTableStream, pWwFib->fcPlcfglsy, pWwFib->lcbPlcfglsy, 0);
+ WW8PLCF aPlc(*m_pTableStream, m_pWwFib->fcPlcfglsy, m_pWwFib->lcbPlcfglsy, 0);
WW8_CP nStart, nEnd;
void* pDummy;
for (int i = 0; i < pGloss->GetNoStrings(); ++i, aPlc.advance())
{
- SwNodeIndex aIdx( rDoc.GetNodes().GetEndOfContent());
+ SwNodeIndex aIdx( m_rDoc.GetNodes().GetEndOfContent());
SwTxtFmtColl* pColl =
- rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD,
+ m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD,
false);
SwStartNode *pNode =
- rDoc.GetNodes().MakeTextSection(aIdx,
+ m_rDoc.GetNodes().MakeTextSection(aIdx,
SwNormalStartNode,pColl);
- pPaM->GetPoint()->nNode = pNode->GetIndex()+1;
- pPaM->GetPoint()->nContent.Assign(pPaM->GetCntntNode(),0);
+ m_pPaM->GetPoint()->nNode = pNode->GetIndex()+1;
+ m_pPaM->GetPoint()->nContent.Assign(m_pPaM->GetCntntNode(),0);
aPlc.Get( nStart, nEnd, pDummy );
ReadText(nStart,nEnd-nStart-1,MAN_MAINTEXT);
}
}
else // ordinary case
{
- if (mbNewDoc && pStg && !pGloss) /*meaningless for a glossary, cmc*/
+ if (m_bNewDoc && m_pStg && !pGloss) /*meaningless for a glossary, cmc*/
{
- mpDocShell->SetIsTemplate( pWwFib->fDot ); // point at tgc record
+ m_pDocShell->SetIsTemplate( m_pWwFib->fDot ); // point at tgc record
uno::Reference<document::XDocumentPropertiesSupplier> const
- xDocPropSupp(mpDocShell->GetModel(), uno::UNO_QUERY_THROW);
+ xDocPropSupp(m_pDocShell->GetModel(), uno::UNO_QUERY_THROW);
uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
OUString sCreatedFrom = xDocProps->getTemplateURL();
uno::Reference< container::XNameContainer > xPrjNameCache;
- uno::Reference< lang::XMultiServiceFactory> xSF(mpDocShell->GetModel(), uno::UNO_QUERY);
+ uno::Reference< lang::XMultiServiceFactory> xSF(m_pDocShell->GetModel(), uno::UNO_QUERY);
if ( xSF.is() )
xPrjNameCache.set( xSF->createInstance( "ooo.vba.VBAProjectNameProvider" ), uno::UNO_QUERY );
@@ -5117,7 +5117,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
// Create and insert Word vba Globals
uno::Any aGlobs;
uno::Sequence< uno::Any > aArgs(1);
- aArgs[ 0 ] <<= mpDocShell->GetModel();
+ aArgs[ 0 ] <<= m_pDocShell->GetModel();
try
{
aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( "ooo.vba.word.Globals", aArgs );
@@ -5128,42 +5128,42 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
}
#if HAVE_FEATURE_SCRIPTING
- BasicManager *pBasicMan = mpDocShell->GetBasicManager();
+ BasicManager *pBasicMan = m_pDocShell->GetBasicManager();
if (pBasicMan)
pBasicMan->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
#endif
- BasicProjImportHelper aBasicImporter( *mpDocShell );
+ BasicProjImportHelper aBasicImporter( *m_pDocShell );
// Import vba via oox filter
- bool bRet = aBasicImporter.import( mpDocShell->GetMedium()->GetInputStream() );
+ bool bRet = aBasicImporter.import( m_pDocShell->GetMedium()->GetInputStream() );
lcl_createTemplateToProjectEntry( xPrjNameCache, sCreatedFrom, aBasicImporter.getProjectName() );
- WW8Customizations aCustomisations( pTableStream, *pWwFib );
- aCustomisations.Import( mpDocShell );
+ WW8Customizations aCustomisations( m_pTableStream, *m_pWwFib );
+ aCustomisations.Import( m_pDocShell );
if( bRet )
- rDoc.SetContainsMSVBasic(true);
+ m_rDoc.SetContainsMSVBasic(true);
StoreMacroCmds();
}
- mbOnLoadingMain = true;
- ReadText(0, pWwFib->ccpText, MAN_MAINTEXT);
- mbOnLoadingMain = false;
+ m_bOnLoadingMain = true;
+ ReadText(0, m_pWwFib->ccpText, MAN_MAINTEXT);
+ m_bOnLoadingMain = false;
}
- ::SetProgressState(nProgress, mpDocShell); // Update
+ ::SetProgressState(m_nProgress, m_pDocShell); // Update
- if (pDrawPg && pMSDffManager && pMSDffManager->GetShapeOrders())
+ if (m_pDrawPg && m_pMSDffManager && m_pMSDffManager->GetShapeOrders())
{
// Helper array to chain the inserted frames (instead of SdrTxtObj)
SvxMSDffShapeTxBxSort aTxBxSort;
// Ensure correct z-order of read Escher objects
- sal_uInt16 nShapeCount = pMSDffManager->GetShapeOrders()->size();
+ sal_uInt16 nShapeCount = m_pMSDffManager->GetShapeOrders()->size();
for (sal_uInt16 nShapeNum=0; nShapeNum < nShapeCount; nShapeNum++)
{
SvxMSDffShapeOrder *pOrder =
- &(*pMSDffManager->GetShapeOrders())[nShapeNum];
+ &(*m_pMSDffManager->GetShapeOrders())[nShapeNum];
// Insert Pointer into new Sort array
if (pOrder->nTxBxComp && pOrder->pFly)
aTxBxSort.insert(pOrder);
@@ -5213,39 +5213,39 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
}
}
- if (mbNewDoc)
+ if (m_bNewDoc)
{
- if( pWDop->fRevMarking )
+ if( m_pWDop->fRevMarking )
eMode |= nsRedlineMode_t::REDLINE_ON;
- if( pWDop->fRMView )
+ if( m_pWDop->fRMView )
eMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE;
}
- maInsertedTables.DelAndMakeTblFrms();
- maSectionManager.InsertSegments();
+ m_aInsertedTables.DelAndMakeTblFrms();
+ m_aSectionManager.InsertSegments();
- vColl.clear();
+ m_vColl.clear();
- DELETEZ( pStyles );
+ DELETEZ( m_pStyles );
- if( pFormImpl )
+ if( m_pFormImpl )
DeleteFormImpl();
GrafikDtor();
- DELETEZ( pMSDffManager );
- DELETEZ( pHdFt );
- DELETEZ( pSBase );
- delete pWDop;
- DELETEZ( pFonts );
- delete mpAtnNames;
- delete mpSprmParser;
- ::EndProgress(mpDocShell);
-
- pDataStream = 0;
- pTableStream = 0;
+ DELETEZ( m_pMSDffManager );
+ DELETEZ( m_pHdFt );
+ DELETEZ( m_pSBase );
+ delete m_pWDop;
+ DELETEZ( m_pFonts );
+ delete m_pAtnNames;
+ delete m_pSprmParser;
+ ::EndProgress(m_pDocShell);
+
+ m_pDataStream = 0;
+ m_pTableStream = 0;
DeleteCtrlStk();
- mpRedlineStack->closeall(*pPaM->GetPoint());
- delete mpRedlineStack;
+ m_pRedlineStack->closeall(*m_pPaM->GetPoint());
+ delete m_pRedlineStack;
DeleteAnchorStk();
DeleteRefStks();
@@ -5254,7 +5254,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
std::vector<const SwGrfNode*> vecBulletGrf;
std::vector<SwFrmFmt*> vecFrmFmt;
- IDocumentMarkAccess* const pMarkAccess = rDoc.getIDocumentMarkAccess();
+ IDocumentMarkAccess* const pMarkAccess = m_rDoc.getIDocumentMarkAccess();
if ( pMarkAccess )
{
IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->findBookmark( "_PictureBullets" );
@@ -5287,10 +5287,10 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
}
}
// update graphic bullet information
- size_t nCount = pLstManager->GetWW8LSTInfoNum();
+ size_t nCount = m_pLstManager->GetWW8LSTInfoNum();
for (size_t i = 0; i < nCount; ++i)
{
- SwNumRule* pRule = pLstManager->GetNumRule(i);
+ SwNumRule* pRule = m_pLstManager->GetNumRule(i);
for (sal_uInt16 j = 0; j < MAXLEVEL; ++j)
{
SwNumFmt aNumFmt(pRule->Get(j));
@@ -5323,12 +5323,12 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
// Remove additional pictures
for (sal_uInt16 i = 0; i < vecFrmFmt.size(); ++i)
{
- rDoc.getIDocumentLayoutAccess().DelLayoutFmt(vecFrmFmt[i]);
+ m_rDoc.getIDocumentLayoutAccess().DelLayoutFmt(vecFrmFmt[i]);
}
}
}
}
- DELETEZ( pLstManager );
+ DELETEZ( m_pLstManager );
}
// remove extra paragraphs after attribute ctrl
@@ -5339,15 +5339,15 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
UpdateFields();
// delete the pam before the call for hide all redlines (Bug 73683)
- if (mbNewDoc)
- rDoc.getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)( eMode ));
+ if (m_bNewDoc)
+ m_rDoc.getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)( eMode ));
- SAL_WARN_IF(mpTableEndPaM, "sw.ww8", "document ended without table ending");
- mpTableEndPaM.reset(); //ensure this is deleted before pPaM
- delete pPaM, pPaM = 0;
- mpLastAnchorPos.reset();//ensure this is deleted before UpdatePageDescs
+ SAL_WARN_IF(m_pTableEndPaM, "sw.ww8", "document ended without table ending");
+ m_pTableEndPaM.reset(); //ensure this is deleted before pPaM
+ delete m_pPaM, m_pPaM = 0;
+ m_pLastAnchorPos.reset();//ensure this is deleted before UpdatePageDescs
- UpdatePageDescs(rDoc, nPageDescOffset);
+ UpdatePageDescs(m_rDoc, nPageDescOffset);
return nErrRet;
}
@@ -5357,38 +5357,38 @@ sal_uLong SwWW8ImplReader::SetSubStreams(SvStorageStreamRef &rTableStream,
{
sal_uLong nErrRet = 0;
// 6 stands for "6 OR 7", 7 stands for "ONLY 7"
- switch (pWwFib->nVersion)
+ switch (m_pWwFib->nVersion)
{
case 6:
case 7:
- pTableStream = pStrm;
- pDataStream = pStrm;
+ m_pTableStream = m_pStrm;
+ m_pDataStream = m_pStrm;
break;
case 8:
- if(!pStg)
+ if(!m_pStg)
{
- OSL_ENSURE( pStg, "Version 8 always needs to have a Storage!!" );
+ OSL_ENSURE( m_pStg, "Version 8 always needs to have a Storage!!" );
nErrRet = ERR_SWG_READ_ERROR;
break;
}
- rTableStream = pStg->OpenSotStream( OUString::createFromAscii(
- pWwFib->fWhichTblStm ? SL::a1Table : SL::a0Table),
+ rTableStream = m_pStg->OpenSotStream( OUString::createFromAscii(
+ m_pWwFib->fWhichTblStm ? SL::a1Table : SL::a0Table),
STREAM_STD_READ);
- pTableStream = &rTableStream;
- pTableStream->SetEndian( SvStreamEndian::LITTLE );
+ m_pTableStream = &rTableStream;
+ m_pTableStream->SetEndian( SvStreamEndian::LITTLE );
- rDataStream = pStg->OpenSotStream(OUString(SL::aData),
+ rDataStream = m_pStg->OpenSotStream(OUString(SL::aData),
STREAM_STD_READ | StreamMode::NOCREATE );
if (rDataStream.Is() && SVSTREAM_OK == rDataStream->GetError())
{
- pDataStream = &rDataStream;
- pDataStream->SetEndian(SvStreamEndian::LITTLE);
+ m_pDataStream = &rDataStream;
+ m_pDataStream->SetEndian(SvStreamEndian::LITTLE);
}
else
- pDataStream = pStrm;
+ m_pDataStream = m_pStrm;
break;
default:
// Program error!
@@ -5577,11 +5577,11 @@ sal_uLong SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGlos
{
sal_uLong nErrRet = 0;
if (pGloss)
- pWwFib = pGloss->GetFib();
+ m_pWwFib = pGloss->GetFib();
else
- pWwFib = new WW8Fib(*pStrm, nWantedVersion);
+ m_pWwFib = new WW8Fib(*m_pStrm, m_nWantedVersion);
- if (pWwFib->nFibError)
+ if (m_pWwFib->nFibError)
nErrRet = ERR_SWG_READ_ERROR;
SvStorageStreamRef xTableStream, xDataStream;
@@ -5598,22 +5598,22 @@ sal_uLong SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGlos
bool bDecrypt = false;
enum {RC4, XOR, Other} eAlgo = Other;
- if (pWwFib->fEncrypted && !nErrRet)
+ if (m_pWwFib->fEncrypted && !nErrRet)
{
if (!pGloss)
{
bDecrypt = true;
- if (8 != pWwFib->nVersion)
+ if (8 != m_pWwFib->nVersion)
eAlgo = XOR;
else
{
- if (pWwFib->nKey != 0)
+ if (m_pWwFib->nKey != 0)
eAlgo = XOR;
else
{
- pTableStream->Seek(0);
+ m_pTableStream->Seek(0);
sal_uInt32 nEncType;
- pTableStream->ReadUInt32( nEncType );
+ m_pTableStream->ReadUInt32( nEncType );
if (nEncType == 0x10001)
eAlgo = RC4;
}
@@ -5624,7 +5624,7 @@ sal_uLong SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGlos
if (bDecrypt)
{
nErrRet = ERRCODE_SVX_WRONGPASS;
- SfxMedium* pMedium = mpDocShell->GetMedium();
+ SfxMedium* pMedium = m_pDocShell->GetMedium();
if ( pMedium )
{
@@ -5636,40 +5636,40 @@ sal_uLong SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGlos
case XOR:
{
msfilter::MSCodec_XorWord95 aCtx;
- uno::Sequence< beans::NamedValue > aEncryptionData = InitXorWord95Codec( aCtx, *pMedium, pWwFib );
+ uno::Sequence< beans::NamedValue > aEncryptionData = InitXorWord95Codec( aCtx, *pMedium, m_pWwFib );
// if initialization has failed the EncryptionData should be empty
- if ( aEncryptionData.getLength() && aCtx.VerifyKey( pWwFib->nKey, pWwFib->nHash ) )
+ if ( aEncryptionData.getLength() && aCtx.VerifyKey( m_pWwFib->nKey, m_pWwFib->nHash ) )
{
nErrRet = 0;
pTempMain = MakeTemp(aDecryptMain);
- pStrm->Seek(0);
+ m_pStrm->Seek(0);
size_t nUnencryptedHdr =
- (8 == pWwFib->nVersion) ? 0x44 : 0x34;
+ (8 == m_pWwFib->nVersion) ? 0x44 : 0x34;
sal_uInt8 *pIn = new sal_uInt8[nUnencryptedHdr];
- nUnencryptedHdr = pStrm->Read(pIn, nUnencryptedHdr);
+ nUnencryptedHdr = m_pStrm->Read(pIn, nUnencryptedHdr);
aDecryptMain.Write(pIn, nUnencryptedHdr);
delete [] pIn;
- DecryptXOR(aCtx, *pStrm, aDecryptMain);
+ DecryptXOR(aCtx, *m_pStrm, aDecryptMain);
- if (!pTableStream || pTableStream == pStrm)
- pTableStream = &aDecryptMain;
+ if (!m_pTableStream || m_pTableStream == m_pStrm)
+ m_pTableStream = &aDecryptMain;
else
{
pTempTable = MakeTemp(aDecryptTable);
- DecryptXOR(aCtx, *pTableStream, aDecryptTable);
- pTableStream = &aDecryptTable;
+ DecryptXOR(aCtx, *m_pTableStream, aDecryptTable);
+ m_pTableStream = &aDecryptTable;
}
- if (!pDataStream || pDataStream == pStrm)
- pDataStream = &aDecryptMain;
+ if (!m_pDataStream || m_pDataStream == m_pStrm)
+ m_pDataStream = &aDecryptMain;
else
{
pTempData = MakeTemp(aDecryptData);
- DecryptXOR(aCtx, *pDataStream, aDecryptData);
- pDataStream = &aDecryptData;
+ DecryptXOR(aCtx, *m_pDataStream, aDecryptData);
+ m_pDataStream = &aDecryptData;
}
pMedium->GetItemSet()->ClearItem( SID_PASSWORD );
@@ -5684,9 +5684,9 @@ sal_uLong SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGlos
sal_uInt8 aSaltHash[ 16 ];
bool bCouldReadHeaders =
- checkRead(*pTableStream, aDocId, 16) &&
- checkRead(*pTableStream, aSaltData, 16) &&
- checkRead(*pTableStream, aSaltHash, 16);
+ checkRead(*m_pTableStream, aDocId, 16) &&
+ checkRead(*m_pTableStream, aSaltData, 16) &&
+ checkRead(*m_pTableStream, aSaltHash, 16);
msfilter::MSCodec_Std97 aCtx;
// if initialization has failed the EncryptionData should be empty
@@ -5699,28 +5699,28 @@ sal_uLong SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGlos
pTempMain = MakeTemp(aDecryptMain);
- pStrm->Seek(0);
+ m_pStrm->Seek(0);
sal_Size nUnencryptedHdr = 0x44;
sal_uInt8 *pIn = new sal_uInt8[nUnencryptedHdr];
- nUnencryptedHdr = pStrm->Read(pIn, nUnencryptedHdr);
+ nUnencryptedHdr = m_pStrm->Read(pIn, nUnencryptedHdr);
- DecryptRC4(aCtx, *pStrm, aDecryptMain);
+ DecryptRC4(aCtx, *m_pStrm, aDecryptMain);
aDecryptMain.Seek(0);
aDecryptMain.Write(pIn, nUnencryptedHdr);
delete [] pIn;
pTempTable = MakeTemp(aDecryptTable);
- DecryptRC4(aCtx, *pTableStream, aDecryptTable);
- pTableStream = &aDecryptTable;
+ DecryptRC4(aCtx, *m_pTableStream, aDecryptTable);
+ m_pTableStream = &aDecryptTable;
- if (!pDataStream || pDataStream == pStrm)
- pDataStream = &aDecryptMain;
+ if (!m_pDataStream || m_pDataStream == m_pStrm)
+ m_pDataStream = &aDecryptMain;
else
{
pTempData = MakeTemp(aDecryptData);
- DecryptRC4(aCtx, *pDataStream, aDecryptData);
- pDataStream = &aDecryptData;
+ DecryptRC4(aCtx, *m_pDataStream, aDecryptData);
+ m_pDataStream = &aDecryptData;
}
pMedium->GetItemSet()->ClearItem( SID_PASSWORD );
@@ -5733,11 +5733,11 @@ sal_uLong SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGlos
if (nErrRet == 0)
{
- pStrm = &aDecryptMain;
+ m_pStrm = &aDecryptMain;
- delete pWwFib;
- pWwFib = new WW8Fib(*pStrm, nWantedVersion);
- if (pWwFib->nFibError)
+ delete m_pWwFib;
+ m_pWwFib = new WW8Fib(*m_pStrm, m_nWantedVersion);
+ if (m_pWwFib->nFibError)
nErrRet = ERR_SWG_READ_ERROR;
}
}
@@ -5750,7 +5750,7 @@ sal_uLong SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGlos
delete pTempData;
if (!pGloss)
- delete pWwFib;
+ delete m_pWwFib;
return nErrRet;
}
@@ -5759,9 +5759,9 @@ void SwWW8ImplReader::SetOutlineStyles()
// If we are inserted into a document then don't clobber existing outline
// levels.
sal_uInt16 nOutlineStyleListLevelWithAssignment = 0;
- if (!mbNewDoc)
+ if (!m_bNewDoc)
{
- sw::ParaStyles aOutLined(sw::util::GetParaStyles(rDoc));
+ sw::ParaStyles aOutLined(sw::util::GetParaStyles(m_rDoc));
sw::util::SortByAssignedOutlineStyleListLevel(aOutLined);
sw::ParaStyles::reverse_iterator aEnd = aOutLined.rend();
for ( sw::ParaStyles::reverse_iterator aIter = aOutLined.rbegin(); aIter < aEnd; ++aIter)
@@ -5782,9 +5782,9 @@ void SwWW8ImplReader::SetOutlineStyles()
const SwNumRule* pChosenWW8ListStyle = NULL;
{
std::map<const SwNumRule*, int> aWW8ListStyleCounts;
- for (sal_uInt16 nI = 0; nI < vColl.size(); ++nI)
+ for (sal_uInt16 nI = 0; nI < m_vColl.size(); ++nI)
{
- SwWW8StyInf& rSI = vColl[nI];
+ SwWW8StyInf& rSI = m_vColl[nI];
if (!rSI.IsWW8BuiltInHeadingStyle() || !rSI.HasWW8OutlineLevel())
{
@@ -5834,7 +5834,7 @@ void SwWW8ImplReader::SetOutlineStyles()
// the Outline Style is removed. A potential applied WW8 list style is
// assigned directly and
// its default outline level is applied.
- SwNumRule aOutlineRule(*rDoc.GetOutlineNumRule());
+ SwNumRule aOutlineRule(*m_rDoc.GetOutlineNumRule());
bool bAppliedChangedOutlineStyle = false;
std::vector<SwWW8StyInf*>::iterator aStylesIterEnd
= aWW8BuiltInHeadingStyles.end();
@@ -5900,43 +5900,43 @@ void SwWW8ImplReader::SetOutlineStyles()
if (bAppliedChangedOutlineStyle)
{
- rDoc.SetOutlineNumRule(aOutlineRule);
+ m_rDoc.SetOutlineNumRule(aOutlineRule);
}
}
const OUString* SwWW8ImplReader::GetAnnotationAuthor(sal_uInt16 nIdx)
{
- if (!mpAtnNames && pWwFib->lcbGrpStAtnOwners)
+ if (!m_pAtnNames && m_pWwFib->lcbGrpStAtnOwners)
{
// Determine authors: can be found in the TableStream
- mpAtnNames = new ::std::vector<OUString>;
- SvStream& rStrm = *pTableStream;
+ m_pAtnNames = new ::std::vector<OUString>;
+ SvStream& rStrm = *m_pTableStream;
long nOldPos = rStrm.Tell();
- rStrm.Seek( pWwFib->fcGrpStAtnOwners );
+ rStrm.Seek( m_pWwFib->fcGrpStAtnOwners );
- long nRead = 0, nCount = pWwFib->lcbGrpStAtnOwners;
+ long nRead = 0, nCount = m_pWwFib->lcbGrpStAtnOwners;
while (nRead < nCount)
{
- if( bVer67 )
+ if( m_bVer67 )
{
- mpAtnNames->push_back(read_uInt8_PascalString(rStrm,
+ m_pAtnNames->push_back(read_uInt8_PascalString(rStrm,
RTL_TEXTENCODING_MS_1252));
- nRead += mpAtnNames->rbegin()->getLength() + 1; // Length + sal_uInt8 count
+ nRead += m_pAtnNames->rbegin()->getLength() + 1; // Length + sal_uInt8 count
}
else
{
- mpAtnNames->push_back(read_uInt16_PascalString(rStrm));
+ m_pAtnNames->push_back(read_uInt16_PascalString(rStrm));
// Unicode: double the length + sal_uInt16 count
- nRead += (mpAtnNames->rbegin()->getLength() + 1)*2;
+ nRead += (m_pAtnNames->rbegin()->getLength() + 1)*2;
}
}
rStrm.Seek( nOldPos );
}
const OUString *pRet = 0;
- if (mpAtnNames && nIdx < mpAtnNames->size())
- pRet = &((*mpAtnNames)[nIdx]);
+ if (m_pAtnNames && nIdx < m_pAtnNames->size())
+ pRet = &((*m_pAtnNames)[nIdx]);
return pRet;
}
@@ -5957,27 +5957,27 @@ sal_uLong SwWW8ImplReader::LoadDoc( SwPaM& rPaM,WW8Glossary *pGloss)
SwFilterOptions aOpt( 13, aNames, aVal );
- nIniFlags = aVal[ 0 ];
- nIniFlags1= aVal[ 1 ];
+ m_nIniFlags = aVal[ 0 ];
+ m_nIniFlags1= aVal[ 1 ];
// Moves Flys by x twips to the right or left
- nIniFlyDx = aVal[ 3 ];
- nIniFlyDy = aVal[ 4 ];
-
- nFieldFlags = aVal[ 5 ];
- nFieldTagAlways[0] = aVal[ 6 ];
- nFieldTagAlways[1] = aVal[ 7 ];
- nFieldTagAlways[2] = aVal[ 8 ];
- nFieldTagBad[0] = aVal[ 9 ];
- nFieldTagBad[1] = aVal[ 10 ];
- nFieldTagBad[2] = aVal[ 11 ];
+ m_nIniFlyDx = aVal[ 3 ];
+ m_nIniFlyDy = aVal[ 4 ];
+
+ m_nFieldFlags = aVal[ 5 ];
+ m_nFieldTagAlways[0] = aVal[ 6 ];
+ m_nFieldTagAlways[1] = aVal[ 7 ];
+ m_nFieldTagAlways[2] = aVal[ 8 ];
+ m_nFieldTagBad[0] = aVal[ 9 ];
+ m_nFieldTagBad[1] = aVal[ 10 ];
+ m_nFieldTagBad[2] = aVal[ 11 ];
m_bRegardHindiDigits = aVal[ 12 ] > 0;
}
sal_uInt16 nMagic(0);
- pStrm->ReadUInt16( nMagic );
+ m_pStrm->ReadUInt16( nMagic );
// Remember: 6 means "6 OR 7", 7 means "JUST 7"
- switch (nWantedVersion)
+ switch (m_nWantedVersion)
{
case 6:
case 7:
@@ -5988,17 +5988,17 @@ sal_uLong SwWW8ImplReader::LoadDoc( SwPaM& rPaM,WW8Glossary *pGloss)
)
{
// Test for own 97 fake!
- if (pStg && 0xa5ec == nMagic)
+ if (m_pStg && 0xa5ec == nMagic)
{
- sal_uLong nCurPos = pStrm->Tell();
- if (pStrm->Seek(nCurPos + 22))
+ sal_uLong nCurPos = m_pStrm->Tell();
+ if (m_pStrm->Seek(nCurPos + 22))
{
sal_uInt32 nfcMin;
- pStrm->ReadUInt32( nfcMin );
+ m_pStrm->ReadUInt32( nfcMin );
if (0x300 != nfcMin)
nErrRet = ERR_WW6_NO_WW6_FILE_ERR;
}
- pStrm->Seek( nCurPos );
+ m_pStrm->Seek( nCurPos );
}
else
nErrRet = ERR_WW6_NO_WW6_FILE_ERR;
@@ -6017,7 +6017,7 @@ sal_uLong SwWW8ImplReader::LoadDoc( SwPaM& rPaM,WW8Glossary *pGloss)
if (!nErrRet)
nErrRet = LoadThroughDecryption(rPaM ,pGloss);
- rDoc.PropagateOutlineRule();
+ m_rDoc.PropagateOutlineRule();
return nErrRet;
}
@@ -6154,13 +6154,13 @@ bool SwMSDffManager::GetOLEStorageName(long nOLEId, OUString& rStorageName,
bool bRet = false;
sal_Int32 nPictureId = 0;
- if (rReader.pStg)
+ if (rReader.m_pStg)
{
// Via the TextBox-PLCF we get the right char Start-End positions
// We should then find the EmbedField and the corresponding Sprms
// in that Area.
// We only need the Sprm for the Picture Id.
- long nOldPos = rReader.pStrm->Tell();
+ long nOldPos = rReader.m_pStrm->Tell();
{
// #i32596# - consider return value of method
// <rReader.GetTxbxTextSttEndCp(..)>. If it returns false, method
@@ -6174,12 +6174,12 @@ bool SwMSDffManager::GetOLEStorageName(long nOLEId, OUString& rStorageName,
{
WW8PLCFxSaveAll aSave;
memset( &aSave, 0, sizeof( aSave ) );
- rReader.pPlcxMan->SaveAllPLCFx( aSave );
+ rReader.m_pPlcxMan->SaveAllPLCFx( aSave );
- nStartCp += rReader.nDrawCpO;
- nEndCp += rReader.nDrawCpO;
- WW8PLCFx_Cp_FKP* pChp = rReader.pPlcxMan->GetChpPLCF();
- wwSprmParser aSprmParser(rReader.pWwFib->GetFIBVersion());
+ nStartCp += rReader.m_nDrawCpO;
+ nEndCp += rReader.m_nDrawCpO;
+ WW8PLCFx_Cp_FKP* pChp = rReader.m_pPlcxMan->GetChpPLCF();
+ wwSprmParser aSprmParser(rReader.m_pWwFib->GetFIBVersion());
while (nStartCp <= nEndCp && !nPictureId)
{
if (!pChp->SeekPos( nStartCp))
@@ -6213,22 +6213,22 @@ bool SwMSDffManager::GetOLEStorageName(long nOLEId, OUString& rStorageName,
nStartCp = aDesc.nEndPos;
}
- rReader.pPlcxMan->RestoreAllPLCFx( aSave );
+ rReader.m_pPlcxMan->RestoreAllPLCFx( aSave );
}
}
- rReader.pStrm->Seek( nOldPos );
+ rReader.m_pStrm->Seek( nOldPos );
}
if( bRet )
{
rStorageName = "_";
rStorageName += OUString::number(nPictureId);
- rSrcStorage = rReader.pStg->OpenSotStorage(OUString(
+ rSrcStorage = rReader.m_pStg->OpenSotStorage(OUString(
SL::aObjectPool));
- if (!rReader.mpDocShell)
+ if (!rReader.m_pDocShell)
bRet=false;
else
- rDestStorage = rReader.mpDocShell->GetStorage();
+ rDestStorage = rReader.m_pDocShell->GetStorage();
}
return bRet;
}
@@ -6250,12 +6250,12 @@ bool SwWW8ImplReader::InEqualOrHigherApo(int nLvl) const
if (nLvl)
--nLvl;
// #i60827# - check size of <maApos> to assure that <maApos.begin() + nLvl> can be performed.
- if ( sal::static_int_cast< sal_Int32>(nLvl) >= sal::static_int_cast< sal_Int32>(maApos.size()) )
+ if ( sal::static_int_cast< sal_Int32>(nLvl) >= sal::static_int_cast< sal_Int32>(m_aApos.size()) )
{
return false;
}
- mycApoIter aIter = std::find(maApos.begin() + nLvl, maApos.end(), true);
- if (aIter != maApos.end())
+ mycApoIter aIter = std::find(m_aApos.begin() + nLvl, m_aApos.end(), true);
+ if (aIter != m_aApos.end())
return true;
else
return false;
@@ -6266,9 +6266,9 @@ bool SwWW8ImplReader::InEqualApo(int nLvl) const
// If we are in a table, see if an apo was inserted at the level below the table.
if (nLvl)
--nLvl;
- if (nLvl < 0 || static_cast<size_t>(nLvl) >= maApos.size())
+ if (nLvl < 0 || static_cast<size_t>(nLvl) >= m_aApos.size())
return false;
- return maApos[nLvl];
+ return m_aApos[nLvl];
}
namespace sw
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index cee4cd42fae0..67cc51245ddb 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1073,7 +1073,7 @@ typedef std::vector<WW8_CP> cp_vector;
class SwWW8ImplReader
{
private:
- SwDocShell *mpDocShell; // The Real DocShell
+ SwDocShell *m_pDocShell; // The Real DocShell
friend class WW8RStyle;
friend class WW8TabDesc;
@@ -1088,29 +1088,29 @@ friend class wwSectionManager;
private:
- SvStorage* pStg; // Input-Storage
- SvStream* pStrm; // Input-(Storage)Stream
- SvStream* pTableStream; // Input-(Storage)Stream
- SvStream* pDataStream; // Input-(Storage)Stream
+ SvStorage* m_pStg; // Input-Storage
+ SvStream* m_pStrm; // Input-(Storage)Stream
+ SvStream* m_pTableStream; // Input-(Storage)Stream
+ SvStream* m_pDataStream; // Input-(Storage)Stream
// allgemeines
- SwDoc& rDoc;
- SwPaM* pPaM;
+ SwDoc& m_rDoc;
+ SwPaM* m_pPaM;
- SwWW8FltControlStack* pCtrlStck; // Stack fuer die Attribute
+ SwWW8FltControlStack* m_pCtrlStck; // Stack fuer die Attribute
/*
This stack is for redlines, because their sequence of discovery can
be out of order of their order of insertion into the document.
*/
- sw::util::RedlineStack *mpRedlineStack;
+ sw::util::RedlineStack *m_pRedlineStack;
/*
This stack is for fields that get referenced later, e.g. BookMarks and TOX.
They get inserted at the end of the document, it is the same stack for
headers/footers/main text/textboxes/tables etc...
*/
- SwWW8ReferencedFltEndStack *pReffedStck;
+ SwWW8ReferencedFltEndStack *m_pReffedStck;
/*
This stack is for fields whose true conversion cannot be determined until
@@ -1118,7 +1118,7 @@ private:
text/textboxes/tables etc... They are things that reference other things
e.g. NoteRef and Ref, they are processed after pReffedStck
*/
- SwWW8FltRefStack *pReffingStck;
+ SwWW8FltRefStack *m_pReffingStck;
/*
For graphics anchors. Determines the graphics whose anchors are in the
@@ -1126,7 +1126,7 @@ private:
anchored to character before a character to be anchored to has been
inserted. Is emptied at the end of each paragraph.
*/
- SwWW8FltAnchorStack* pAnchorStck;
+ SwWW8FltAnchorStack* m_pAnchorStck;
/*
A stack of fields identifiers to keep track of any open fields that need
@@ -1138,18 +1138,18 @@ private:
where the end point will fall, to do so fully correctly duplicates the
main logic of the filter itself.
*/
- std::deque<WW8FieldEntry> maFieldStack;
+ std::deque<WW8FieldEntry> m_aFieldStack;
typedef std::deque<WW8FieldEntry>::const_iterator mycFieldIter;
/*
A stack of open footnotes. Should only be one in it at any time.
*/
- std::deque<FtnDescriptor> maFtnStack;
+ std::deque<FtnDescriptor> m_aFtnStack;
/*
A queue of the ms sections in the document
*/
- wwSectionManager maSectionManager;
+ wwSectionManager m_aSectionManager;
/*
A vector of surplus-to-requirements paragraph in the final document,
@@ -1162,224 +1162,224 @@ private:
A map of tables to their follow nodes for use in inserting tables into
already existing document, i.e. insert file
*/
- sw::util::InsertedTablesManager maInsertedTables;
+ sw::util::InsertedTablesManager m_aInsertedTables;
/*
Creates unique names to give to (file link) sections (WW1/WW2/...)
*/
- wwSectionNamer maSectionNameGenerator;
+ wwSectionNamer m_aSectionNameGenerator;
/*
Knows how to split a series of bytes into sprms and their arguments
*/
- wwSprmParser *mpSprmParser;
+ wwSprmParser *m_pSprmParser;
/*
Creates unique names to give to graphics
*/
- wwFrameNamer maGrfNameGenerator;
+ wwFrameNamer m_aGrfNameGenerator;
/*
Knows which writer style a given word style should be imported as.
*/
- sw::util::ParaStyleMapper maParaStyleMapper;
- sw::util::CharStyleMapper maCharStyleMapper;
+ sw::util::ParaStyleMapper m_aParaStyleMapper;
+ sw::util::CharStyleMapper m_aCharStyleMapper;
/*
Stack of textencoding being used as we progress through the document text
*/
- std::stack<rtl_TextEncoding> maFontSrcCharSets;
- std::stack<rtl_TextEncoding> maFontSrcCJKCharSets;
+ std::stack<rtl_TextEncoding> m_aFontSrcCharSets;
+ std::stack<rtl_TextEncoding> m_aFontSrcCJKCharSets;
- SwMSConvertControls *pFormImpl; // Control-Implementierung
+ SwMSConvertControls *m_pFormImpl; // Control-Implementierung
- SwFlyFrmFmt* pFlyFmtOfJustInsertedGraphic;
- SwFrmFmt* pFmtOfJustInsertedApo;
- SwPaM* pPreviousNumPaM;
- const SwNumRule* pPrevNumRule;
+ SwFlyFrmFmt* m_pFlyFmtOfJustInsertedGraphic;
+ SwFrmFmt* m_pFmtOfJustInsertedApo;
+ SwPaM* m_pPreviousNumPaM;
+ const SwNumRule* m_pPrevNumRule;
//Keep track of APO environments
- std::deque<bool> maApos;
+ std::deque<bool> m_aApos;
typedef std::deque<bool>::const_iterator mycApoIter;
/*
Keep track of generated Ruby character formats we can minimize the
number of character formats created
*/
- std::vector<const SwCharFmt*> aRubyCharFmts;
+ std::vector<const SwCharFmt*> m_aRubyCharFmts;
- WW8PostProcessAttrsInfo * mpPostProcessAttrsInfo;
+ WW8PostProcessAttrsInfo * m_pPostProcessAttrsInfo;
- WW8Fib* pWwFib;
- WW8Fonts* pFonts;
- WW8Dop* pWDop;
- WW8ListManager* pLstManager;
- WW8ScannerBase* pSBase;
- WW8PLCFMan* pPlcxMan;
- std::map<short, OUString> aLinkStringMap;
+ WW8Fib* m_pWwFib;
+ WW8Fonts* m_pFonts;
+ WW8Dop* m_pWDop;
+ WW8ListManager* m_pLstManager;
+ WW8ScannerBase* m_pSBase;
+ WW8PLCFMan* m_pPlcxMan;
+ std::map<short, OUString> m_aLinkStringMap;
- std::set<const SwNode*> maTxtNodesHavingFirstLineOfstSet; // #i103711#
- std::set<const SwNode*> maTxtNodesHavingLeftIndentSet; // #i105414#
+ std::set<const SwNode*> m_aTxtNodesHavingFirstLineOfstSet; // #i103711#
+ std::set<const SwNode*> m_aTxtNodesHavingLeftIndentSet; // #i105414#
- WW8RStyle* pStyles; // Pointer auf die Style-Einleseklasse
- SwFmt* pAktColl; // gerade zu erzeugende Collection
+ WW8RStyle* m_pStyles; // Pointer auf die Style-Einleseklasse
+ SwFmt* m_pAktColl; // gerade zu erzeugende Collection
// ( ist ausserhalb einer Style-Def immer 0 )
- SfxItemSet* pAktItemSet;// gerade einzulesende Zeichenattribute
+ SfxItemSet* m_pAktItemSet;// gerade einzulesende Zeichenattribute
// (ausserhalb des WW8ListManager Ctor's immer 0)
- std::vector<SwWW8StyInf> vColl;
- const SwTxtFmtColl* pDfltTxtFmtColl; // Default
- SwFmt* pStandardFmtColl;// "Standard"
+ std::vector<SwWW8StyInf> m_vColl;
+ const SwTxtFmtColl* m_pDfltTxtFmtColl; // Default
+ SwFmt* m_pStandardFmtColl;// "Standard"
- WW8PLCF_HdFt* pHdFt; // Pointer auf Header / Footer - Scannerklasse
+ WW8PLCF_HdFt* m_pHdFt; // Pointer auf Header / Footer - Scannerklasse
- WW8FlyPara* pWFlyPara; // WW-Parameter
- WW8SwFlyPara* pSFlyPara; // daraus erzeugte Sw-Parameter
+ WW8FlyPara* m_pWFlyPara; // WW-Parameter
+ WW8SwFlyPara* m_pSFlyPara; // daraus erzeugte Sw-Parameter
- WW8TabDesc* pTableDesc; // Beschreibung der Tabelleneigenschaften
+ WW8TabDesc* m_pTableDesc; // Beschreibung der Tabelleneigenschaften
//Keep track of tables within tables
- std::stack<WW8TabDesc*> maTableStack;
+ std::stack<WW8TabDesc*> m_aTableStack;
- ANLDRuleMap maANLDRules;
- WW8_OLST* pNumOlst; // Gliederung im Text
+ ANLDRuleMap m_aANLDRules;
+ WW8_OLST* m_pNumOlst; // Gliederung im Text
- SwNode* pNode_FLY_AT_PARA; // set: WW8SwFlyPara() read: CreateSwTable()
+ SwNode* m_pNode_FLY_AT_PARA; // set: WW8SwFlyPara() read: CreateSwTable()
- SdrModel* pDrawModel;
- SdrPage* pDrawPg;
- EditEngine* mpDrawEditEngine;
- wwZOrderer *pWWZOrder;
+ SdrModel* m_pDrawModel;
+ SdrPage* m_pDrawPg;
+ EditEngine* m_pDrawEditEngine;
+ wwZOrderer *m_pWWZOrder;
- SwFieldType* pNumFldType; // fuer Nummernkreis
+ SwFieldType* m_pNumFldType; // fuer Nummernkreis
- SwMSDffManager* pMSDffManager;
+ SwMSDffManager* m_pMSDffManager;
- std::vector<OUString>* mpAtnNames;
- boost::shared_ptr< std::map<sal_uInt32, int> > mpAtnIndexes;
- boost::shared_ptr<WW8PLCFspecial> mpAtnStarts;
- boost::shared_ptr<WW8PLCFspecial> mpAtnEnds;
+ std::vector<OUString>* m_pAtnNames;
+ boost::shared_ptr< std::map<sal_uInt32, int> > m_pAtnIndexes;
+ boost::shared_ptr<WW8PLCFspecial> m_pAtnStarts;
+ boost::shared_ptr<WW8PLCFspecial> m_pAtnEnds;
sw::util::AuthorInfos m_aAuthorInfos;
- OUString sBaseURL;
+ OUString m_sBaseURL;
// Ini-Flags:
- sal_uInt32 nIniFlags; // Flags aus der writer.ini
- sal_uInt32 nIniFlags1; // dito ( zusaetzliche Flags )
- sal_uInt32 nFieldFlags; // dito fuer Feldern
- sal_uInt32 nFieldTagAlways[3]; // dito fuers Taggen von Feldern
- sal_uInt32 nFieldTagBad[3]; // dito fuers Taggen von nicht importierbaren F.
+ sal_uInt32 m_nIniFlags; // Flags aus der writer.ini
+ sal_uInt32 m_nIniFlags1; // dito ( zusaetzliche Flags )
+ sal_uInt32 m_nFieldFlags; // dito fuer Feldern
+ sal_uInt32 m_nFieldTagAlways[3]; // dito fuers Taggen von Feldern
+ sal_uInt32 m_nFieldTagBad[3]; // dito fuers Taggen von nicht importierbaren F.
bool m_bRegardHindiDigits; // import digits in CTL scripts as Hindi numbers
- WW8_CP nDrawCpO; // Anfang der Txbx-SubDocs
+ WW8_CP m_nDrawCpO; // Anfang der Txbx-SubDocs
- sal_uLong nPicLocFc; // Picture Location in File (FC)
- sal_uLong nObjLocFc; // Object Location in File (FC)
+ sal_uLong m_nPicLocFc; // Picture Location in File (FC)
+ sal_uLong m_nObjLocFc; // Object Location in File (FC)
- sal_Int32 nIniFlyDx; // X-Verschiebung von Flys
- sal_Int32 nIniFlyDy; // Y-Verschiebung von Flys
+ sal_Int32 m_nIniFlyDx; // X-Verschiebung von Flys
+ sal_Int32 m_nIniFlyDy; // Y-Verschiebung von Flys
- rtl_TextEncoding eTextCharSet; // Default charset for Text
- rtl_TextEncoding eStructCharSet; // rtl_TextEncoding for structures
- rtl_TextEncoding eHardCharSet; // Hard rtl_TextEncoding-Attribute
- sal_uInt16 nProgress; // %-Angabe fuer Progressbar
- sal_uInt16 nAktColl; // gemaess WW-Zaehlung
- sal_uInt16 nFldNum; // laufende Nummer dafuer
- sal_uInt16 nLFOPosition;
+ rtl_TextEncoding m_eTextCharSet; // Default charset for Text
+ rtl_TextEncoding m_eStructCharSet; // rtl_TextEncoding for structures
+ rtl_TextEncoding m_eHardCharSet; // Hard rtl_TextEncoding-Attribute
+ sal_uInt16 m_nProgress; // %-Angabe fuer Progressbar
+ sal_uInt16 m_nAktColl; // gemaess WW-Zaehlung
+ sal_uInt16 m_nFldNum; // laufende Nummer dafuer
+ sal_uInt16 m_nLFOPosition;
- short nCharFmt; // gemaess WW-Zaehlung, <0 fuer keine
+ short m_nCharFmt; // gemaess WW-Zaehlung, <0 fuer keine
- short nDrawXOfs, nDrawYOfs;
- short nDrawXOfs2, nDrawYOfs2;
+ short m_nDrawXOfs, m_nDrawYOfs;
+ short m_nDrawXOfs2, m_nDrawYOfs2;
- sal_Unicode cSymbol; // aktuell einzulesendes Symbolzeichen
+ sal_Unicode m_cSymbol; // aktuell einzulesendes Symbolzeichen
- sal_uInt8 nWantedVersion; // urspruenglich vom Writer
+ sal_uInt8 m_nWantedVersion; // urspruenglich vom Writer
// angeforderte WW-Doc-Version
- sal_uInt8 nSwNumLevel; // LevelNummer fuer Outline / Nummerierung
- sal_uInt8 nWwNumType; // Gliederung / Nummerg / Aufzaehlg
- sal_uInt8 nListLevel;
-
- sal_uInt8 nPgChpDelim; // ChapterDelim from PageNum
- sal_uInt8 nPgChpLevel; // ChapterLevel of Heading from PageNum
-
- bool mbNewDoc; // Neues Dokument ?
- bool mbSkipImages; // skip images for text extraction/indexing
- bool bReadNoTbl; // Keine Tabellen
- bool bPgSecBreak; // Page- oder Sectionbreak ist noch einzufuegen
- bool bSpec; // Special-Char im Text folgt
- bool bObj; // Obj im Text
- bool bTxbxFlySection; // FlyFrame, der als Ersatz fuer Winword Textbox eingefuegt wurde
- bool bHasBorder; // fuer Buendelung der Border
- bool bSymbol; // z.B. Symbol statt Times
- bool bIgnoreText; // z.B. fuer FieldVanish
- int nInTable; // wird gerade eine Tabelle eingelesen
- bool bWasTabRowEnd; // Tabelle : Row End Mark
- bool bWasTabCellEnd; // table: Cell End Mark
-
- bool bAnl; // Nummerierung in Bearbeitung
+ sal_uInt8 m_nSwNumLevel; // LevelNummer fuer Outline / Nummerierung
+ sal_uInt8 m_nWwNumType; // Gliederung / Nummerg / Aufzaehlg
+ sal_uInt8 m_nListLevel;
+
+ sal_uInt8 m_nPgChpDelim; // ChapterDelim from PageNum
+ sal_uInt8 m_nPgChpLevel; // ChapterLevel of Heading from PageNum
+
+ bool m_bNewDoc; // Neues Dokument ?
+ bool m_bSkipImages; // skip images for text extraction/indexing
+ bool m_bReadNoTbl; // Keine Tabellen
+ bool m_bPgSecBreak; // Page- oder Sectionbreak ist noch einzufuegen
+ bool m_bSpec; // Special-Char im Text folgt
+ bool m_bObj; // Obj im Text
+ bool m_bTxbxFlySection; // FlyFrame, der als Ersatz fuer Winword Textbox eingefuegt wurde
+ bool m_bHasBorder; // fuer Buendelung der Border
+ bool m_bSymbol; // z.B. Symbol statt Times
+ bool m_bIgnoreText; // z.B. fuer FieldVanish
+ int m_nInTable; // wird gerade eine Tabelle eingelesen
+ bool m_bWasTabRowEnd; // Tabelle : Row End Mark
+ bool m_bWasTabCellEnd; // table: Cell End Mark
+
+ bool m_bAnl; // Nummerierung in Bearbeitung
// Anl heisst Autonumber level
- bool bHdFtFtnEdn; // Spezialtext: Kopf- Fuss- usw.
- bool bFtnEdn; // Fussnote oder Endnote
- bool bIsHeader; // Text aus Header wird gelesen ( Zeilenhoehe )
- bool bIsFooter; // Text aus Footer wird gelesen ( Zeilenhoehe )
+ bool m_bHdFtFtnEdn; // Spezialtext: Kopf- Fuss- usw.
+ bool m_bFtnEdn; // Fussnote oder Endnote
+ bool m_bIsHeader; // Text aus Header wird gelesen ( Zeilenhoehe )
+ bool m_bIsFooter; // Text aus Footer wird gelesen ( Zeilenhoehe )
- bool bIsUnicode; // aktuelles Text-Stueck ist als 2-Bytiger-Unicode kodiert
+ bool m_bIsUnicode; // aktuelles Text-Stueck ist als 2-Bytiger-Unicode kodiert
// bitte NICHT als Bitfeld kodieren!
- bool bCpxStyle; // Style im Complex Part
- bool bStyNormal; // Style mit Id 0 wird gelesen
- bool bWWBugNormal; // WW-Version nit Bug Dya in Style Normal
- bool bNoAttrImport; // Attribute ignorieren zum Ignorieren v. Styles
- bool bInHyperlink; // Sonderfall zum einlesen eines 0x01
+ bool m_bCpxStyle; // Style im Complex Part
+ bool m_bStyNormal; // Style mit Id 0 wird gelesen
+ bool m_bWWBugNormal; // WW-Version nit Bug Dya in Style Normal
+ bool m_bNoAttrImport; // Attribute ignorieren zum Ignorieren v. Styles
+ bool m_bInHyperlink; // Sonderfall zum einlesen eines 0x01
// siehe: SwWW8ImplReader::Read_F_Hyperlink()
- bool bWasParaEnd;
+ bool m_bWasParaEnd;
// praktische Hilfsvariablen:
- bool bVer67; // ( (6 == nVersion) || (7 == nVersion) );
- bool bVer6; // (6 == nVersion);
- bool bVer7; // (7 == nVersion);
- bool bVer8; // (8 == nVersion);
+ bool m_bVer67; // ( (6 == nVersion) || (7 == nVersion) );
+ bool m_bVer6; // (6 == nVersion);
+ bool m_bVer7; // (7 == nVersion);
+ bool m_bVer8; // (8 == nVersion);
- bool bEmbeddObj; // EmbeddField gelesen
+ bool m_bEmbeddObj; // EmbeddField gelesen
- bool bAktAND_fNumberAcross; // current active Annotated List Deskriptor - ROW flag
+ bool m_bAktAND_fNumberAcross; // current active Annotated List Deskriptor - ROW flag
- bool bNoLnNumYet; // no Line Numbering has been activated yet (we import
+ bool m_bNoLnNumYet; // no Line Numbering has been activated yet (we import
// the very 1st Line Numbering and ignore the rest)
- bool bFirstPara; // first paragraph?
- bool bFirstParaOfPage;
- bool bParaAutoBefore;
- bool bParaAutoAfter;
+ bool m_bFirstPara; // first paragraph?
+ bool m_bFirstParaOfPage;
+ bool m_bParaAutoBefore;
+ bool m_bParaAutoAfter;
- bool bDropCap;
- sal_Int32 nDropCap;
+ bool m_bDropCap;
+ sal_Int32 m_nDropCap;
- int nIdctHint;
- bool bBidi;
- bool bReadTable;
- boost::shared_ptr<SwPaM> mpTableEndPaM;
+ int m_nIdctHint;
+ bool m_bBidi;
+ bool m_bReadTable;
+ boost::shared_ptr<SwPaM> m_pTableEndPaM;
// Indicate that currently on loading a TOC, managed by Read_F_TOX() and End_Field()
- bool mbLoadingTOXCache;
- int mnEmbeddedTOXLevel;
+ bool m_bLoadingTOXCache;
+ int m_nEmbeddedTOXLevel;
// Indicate that current on loading a hyperlink, which is inside a TOC; Managed by Read_F_Hyperlink() and End_Field()
- bool mbLoadingTOXHyperlink;
+ bool m_bLoadingTOXHyperlink;
// a document position recorded the after-position of TOC section, managed by Read_F_TOX() and End_Field()
- SwPaM* mpPosAfterTOC;
+ SwPaM* m_pPosAfterTOC;
- boost::scoped_ptr< SwPosition > mpLastAnchorPos;
+ boost::scoped_ptr< SwPosition > m_pLastAnchorPos;
- bool mbCareFirstParaEndInToc;
- bool mbCareLastParaEndInToc;
- cp_set maTOXEndCps;
+ bool m_bCareFirstParaEndInToc;
+ bool m_bCareLastParaEndInToc;
+ cp_set m_aTOXEndCps;
- cp_vector maEndParaPos;
- WW8_CP maCurrAttrCP;
- bool mbOnLoadingMain:1;
+ cp_vector m_aEndParaPos;
+ WW8_CP m_aCurrAttrCP;
+ bool m_bOnLoadingMain:1;
const SprmReadInfo& GetSprmReadInfo(sal_uInt16 nId) const;
- bool StyleExists(unsigned int nColl) const { return (nColl < vColl.size()); }
+ bool StyleExists(unsigned int nColl) const { return (nColl < m_vColl.size()); }
SwWW8StyInf *GetStyle(sal_uInt16 nColl) const;
void AppendTxtNode(SwPosition& rPos);
@@ -1399,15 +1399,15 @@ private:
SwPageDesc* pNewPageDesc, sal_uInt8 nCode );
void DeleteStk(SwFltControlStack* prStck);
- void DeleteCtrlStk() { DeleteStk( pCtrlStck ); pCtrlStck = 0; }
+ void DeleteCtrlStk() { DeleteStk( m_pCtrlStck ); m_pCtrlStck = 0; }
void DeleteRefStks()
{
- DeleteStk( pReffedStck );
- pReffedStck = 0;
- DeleteStk( pReffingStck );
- pReffingStck = 0;
+ DeleteStk( m_pReffedStck );
+ m_pReffedStck = 0;
+ DeleteStk( m_pReffingStck );
+ m_pReffingStck = 0;
}
- void DeleteAnchorStk() { DeleteStk( pAnchorStck ); pAnchorStck = 0; }
+ void DeleteAnchorStk() { DeleteStk( m_pAnchorStck ); m_pAnchorStck = 0; }
void emulateMSWordAddTextToParagraph(const OUString& rAddString);
void simpleAddTextToParagraph(const OUString& rAddString);
bool HandlePageBreakChar();
@@ -1486,7 +1486,7 @@ private:
SwFrmFmt *pFlyFmt, WW8_FSPA *pF);
bool IsDropCap();
- bool IsListOrDropcap() { return (!pAktItemSet || bDropCap); };
+ bool IsListOrDropcap() { return (!m_pAktItemSet || m_bDropCap); };
//Apo == Absolutely Positioned Object, MSWord's old-style frames
WW8FlyPara *ConstructApo(const ApoTestResults &rApo,
@@ -1544,7 +1544,7 @@ private:
bool StartTable(WW8_CP nStartCp, SvxULSpaceItem* pULSpaceItem = 0);
bool InEqualApo(int nLvl) const;
- bool InLocalApo() const { return InEqualApo(nInTable); }
+ bool InLocalApo() const { return InEqualApo(m_nInTable); }
bool InEqualOrHigherApo(int nLvl) const;
bool InAnyApo() const { return InEqualOrHigherApo(1); }
void TabCellEnd();
@@ -1663,7 +1663,7 @@ private:
void ChkToggleAttr( sal_uInt16 nOldStyle81Mask, sal_uInt16 nNewStyle81Mask )
{
if( nOldStyle81Mask != nNewStyle81Mask &&
- pCtrlStck->GetToggleAttrFlags() )
+ m_pCtrlStck->GetToggleAttrFlags() )
_ChkToggleAttr( nOldStyle81Mask, nNewStyle81Mask );
}
@@ -1672,7 +1672,7 @@ private:
void ChkToggleBiDiAttr( sal_uInt16 nOldStyle81Mask, sal_uInt16 nNewStyle81Mask )
{
if( nOldStyle81Mask != nNewStyle81Mask &&
- pCtrlStck->GetToggleBiDiAttrFlags() )
+ m_pCtrlStck->GetToggleBiDiAttrFlags() )
_ChkToggleBiDiAttr( nOldStyle81Mask, nNewStyle81Mask );
}
@@ -1688,7 +1688,7 @@ private:
bool SetLowerSpacing(SwPaM &rMyPam, int nSpace);
bool IsInlineEscherHack() const
- { return !maFieldStack.empty() && maFieldStack.back().mnFieldId == 95; };
+ { return !m_aFieldStack.empty() && m_aFieldStack.back().mnFieldId == 95; };
void StoreMacroCmds();
@@ -1703,7 +1703,7 @@ public: // eigentlich private, geht aber leider nur public
sal_uInt16 GetToggleBiDiAttrFlags() const;
void SetToggleAttrFlags(sal_uInt16 nFlags);
void SetToggleBiDiAttrFlags(sal_uInt16 nFlags);
- WW8_CP GetCurrAttrCP() const {return maCurrAttrCP;}
+ WW8_CP GetCurrAttrCP() const {return m_aCurrAttrCP;}
bool IsParaEndInCPs(sal_Int32 , sal_Int32,bool bSdOD=true) const;
//Clear the para end position recorded in reader intermittently for the least impact on loading performance
void ClearParaEndPosition();
@@ -1880,11 +1880,11 @@ public: // eigentlich private, geht aber leider nur public
bool SearchRowEnd(WW8PLCFx_Cp_FKP* pPap,WW8_CP &rStartCp, int nLevel) const;
- const WW8Fib& GetFib() const { return *pWwFib; }
- SwDoc& GetDoc() const { return rDoc; }
- sal_uInt16 GetNAktColl() const { return nAktColl; }
- void SetNAktColl( sal_uInt16 nColl ) { nAktColl = nColl; }
- void SetAktItemSet( SfxItemSet* pItemSet ) { pAktItemSet = pItemSet; }
+ const WW8Fib& GetFib() const { return *m_pWwFib; }
+ SwDoc& GetDoc() const { return m_rDoc; }
+ sal_uInt16 GetNAktColl() const { return m_nAktColl; }
+ void SetNAktColl( sal_uInt16 nColl ) { m_nAktColl = nColl; }
+ void SetAktItemSet( SfxItemSet* pItemSet ) { m_pAktItemSet = pItemSet; }
sal_uInt16 StyleUsingLFO( sal_uInt16 nLFOIndex ) const ;
const SwFmt* GetStyleWithOrgWWName( OUString& rName ) const ;
@@ -1897,7 +1897,7 @@ public: // eigentlich private, geht aber leider nur public
SwWW8ImplReader( sal_uInt8 nVersionPara, SvStorage* pStorage, SvStream* pSt,
SwDoc& rD, const OUString& rBaseURL, bool bNewDoc, bool bSkipImages );
- const OUString& GetBaseURL() const { return sBaseURL; }
+ const OUString& GetBaseURL() const { return m_sBaseURL; }
// Laden eines kompletten DocFiles
sal_uLong LoadDoc( SwPaM&,WW8Glossary *pGloss=0);
rtl_TextEncoding GetCurrentCharSet();
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 6c04df25f447..ed54f3bcac38 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -273,23 +273,23 @@ sal_uInt16 SwWW8ImplReader::End_Ftn()
Ignoring Footnote outside of the normal Text. People will put footnotes
into field results and field commands.
*/
- if (bIgnoreText ||
- pPaM->GetPoint()->nNode < rDoc.GetNodes().GetEndOfExtras().GetIndex())
+ if (m_bIgnoreText ||
+ m_pPaM->GetPoint()->nNode < m_rDoc.GetNodes().GetEndOfExtras().GetIndex())
{
return 0;
}
- OSL_ENSURE(!maFtnStack.empty(), "footnote end without start");
- if (maFtnStack.empty())
+ OSL_ENSURE(!m_aFtnStack.empty(), "footnote end without start");
+ if (m_aFtnStack.empty())
return 0;
bool bFtEdOk = false;
- const FtnDescriptor &rDesc = maFtnStack.back();
+ const FtnDescriptor &rDesc = m_aFtnStack.back();
//Get the footnote character and remove it from the txtnode. We'll
//replace it with the footnote
- SwTxtNode* pTxt = pPaM->GetNode().GetTxtNode();
- sal_Int32 nPos = pPaM->GetPoint()->nContent.GetIndex();
+ SwTxtNode* pTxt = m_pPaM->GetNode().GetTxtNode();
+ sal_Int32 nPos = m_pPaM->GetPoint()->nContent.GetIndex();
OUString sChar;
SwTxtAttr* pFN = 0;
@@ -297,10 +297,10 @@ sal_uInt16 SwWW8ImplReader::End_Ftn()
if (pTxt && nPos)
{
sChar += OUString(pTxt->GetTxt()[--nPos]);
- pPaM->SetMark();
- --pPaM->GetMark()->nContent;
- rDoc.getIDocumentContentOperations().DeleteRange( *pPaM );
- pPaM->DeleteMark();
+ m_pPaM->SetMark();
+ --m_pPaM->GetMark()->nContent;
+ m_rDoc.getIDocumentContentOperations().DeleteRange( *m_pPaM );
+ m_pPaM->DeleteMark();
SwFmtFtn aFtn(rDesc.meType == MAN_EDN);
pFN = pTxt->InsertItem(aFtn, nPos, nPos);
}
@@ -308,23 +308,23 @@ sal_uInt16 SwWW8ImplReader::End_Ftn()
if (pFN)
{
- SwPosition aTmpPos( *pPaM->GetPoint() ); // remember old cursor position
+ SwPosition aTmpPos( *m_pPaM->GetPoint() ); // remember old cursor position
WW8PLCFxSaveAll aSave;
- pPlcxMan->SaveAllPLCFx( aSave );
- WW8PLCFMan* pOldPlcxMan = pPlcxMan;
+ m_pPlcxMan->SaveAllPLCFx( aSave );
+ WW8PLCFMan* pOldPlcxMan = m_pPlcxMan;
const SwNodeIndex* pSttIdx = static_cast<SwTxtFtn*>(pFN)->GetStartNode();
OSL_ENSURE(pSttIdx, "Probleme beim Anlegen des Fussnoten-Textes");
- static_cast<SwTxtFtn*>(pFN)->SetSeqNo( rDoc.GetFtnIdxs().size() );
+ static_cast<SwTxtFtn*>(pFN)->SetSeqNo( m_rDoc.GetFtnIdxs().size() );
- bool bOld = bFtnEdn;
- bFtnEdn = true;
+ bool bOld = m_bFtnEdn;
+ m_bFtnEdn = true;
// read content of Ft-/End-Note
Read_HdFtFtnText( pSttIdx, rDesc.mnStartCp, rDesc.mnLen, rDesc.meType);
bFtEdOk = true;
- bFtnEdn = bOld;
+ m_bFtnEdn = bOld;
OSL_ENSURE(sChar.getLength()==1 && ((rDesc.mbAutoNum == (sChar[0] == 2))),
"footnote autonumbering must be 0x02, and everything else must not be");
@@ -339,7 +339,7 @@ sal_uInt16 SwWW8ImplReader::End_Ftn()
as usual. Might not be if the user has already deleted it, e.g.
#i14737#
*/
- SwNodeIndex& rNIdx = pPaM->GetPoint()->nNode;
+ SwNodeIndex& rNIdx = m_pPaM->GetPoint()->nNode;
rNIdx = pSttIdx->GetIndex() + 1;
SwTxtNode* pTNd = rNIdx.GetNode().GetTxtNode();
if (pTNd && !pTNd->GetTxt().isEmpty() && !sChar.isEmpty())
@@ -347,28 +347,28 @@ sal_uInt16 SwWW8ImplReader::End_Ftn()
const OUString &rTxt = pTNd->GetTxt();
if (rTxt[0] == sChar[0])
{
- pPaM->GetPoint()->nContent.Assign( pTNd, 0 );
- pPaM->SetMark();
+ m_pPaM->GetPoint()->nContent.Assign( pTNd, 0 );
+ m_pPaM->SetMark();
// Strip out tabs we may have inserted on export #i24762#
if (rTxt.getLength() > 1 && rTxt[1] == 0x09)
- ++pPaM->GetMark()->nContent;
- ++pPaM->GetMark()->nContent;
- pReffingStck->Delete(*pPaM);
- rDoc.getIDocumentContentOperations().DeleteRange( *pPaM );
- pPaM->DeleteMark();
+ ++m_pPaM->GetMark()->nContent;
+ ++m_pPaM->GetMark()->nContent;
+ m_pReffingStck->Delete(*m_pPaM);
+ m_rDoc.getIDocumentContentOperations().DeleteRange( *m_pPaM );
+ m_pPaM->DeleteMark();
}
}
- *pPaM->GetPoint() = aTmpPos; // restore Cursor
+ *m_pPaM->GetPoint() = aTmpPos; // restore Cursor
- pPlcxMan = pOldPlcxMan; // Restore attributes
- pPlcxMan->RestoreAllPLCFx( aSave );
+ m_pPlcxMan = pOldPlcxMan; // Restore attributes
+ m_pPlcxMan->RestoreAllPLCFx( aSave );
}
if (bFtEdOk)
- maSectionManager.SetCurrentSectionHasFootnote();
+ m_aSectionManager.SetCurrentSectionHasFootnote();
- maFtnStack.pop_back();
+ m_aFtnStack.pop_back();
return 0;
}
@@ -378,8 +378,8 @@ long SwWW8ImplReader::Read_Ftn(WW8PLCFManResult* pRes)
Ignoring Footnote outside of the normal Text. People will put footnotes
into field results and field commands.
*/
- if (bIgnoreText ||
- pPaM->GetPoint()->nNode < rDoc.GetNodes().GetEndOfExtras().GetIndex())
+ if (m_bIgnoreText ||
+ m_pPaM->GetPoint()->nNode < m_rDoc.GetNodes().GetEndOfExtras().GetIndex())
{
return 0;
}
@@ -389,20 +389,20 @@ long SwWW8ImplReader::Read_Ftn(WW8PLCFManResult* pRes)
if (eEDN == pRes->nSprmId)
{
aDesc.meType = MAN_EDN;
- if (pPlcxMan->GetEdn())
- aDesc.mbAutoNum = 0 != *static_cast<short const *>(pPlcxMan->GetEdn()->GetData());
+ if (m_pPlcxMan->GetEdn())
+ aDesc.mbAutoNum = 0 != *static_cast<short const *>(m_pPlcxMan->GetEdn()->GetData());
}
else
{
aDesc.meType = MAN_FTN;
- if (pPlcxMan->GetFtn())
- aDesc.mbAutoNum = 0 != *static_cast<short const *>(pPlcxMan->GetFtn()->GetData());
+ if (m_pPlcxMan->GetFtn())
+ aDesc.mbAutoNum = 0 != *static_cast<short const *>(m_pPlcxMan->GetFtn()->GetData());
}
aDesc.mnStartCp = pRes->nCp2OrIdx;
aDesc.mnLen = pRes->nMemLen;
- maFtnStack.push_back(aDesc);
+ m_aFtnStack.push_back(aDesc);
return 0;
}
@@ -459,8 +459,8 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
ApoTestResults aRet;
// Frame in Style Definition (word appears to ignore them if inside an
// text autoshape)
- if (!bTxbxFlySection && nAktColl < vColl.size())
- aRet.mpStyleApo = StyleExists(nAktColl) ? vColl[nAktColl].pWWFly : 0;
+ if (!m_bTxbxFlySection && m_nAktColl < m_vColl.size())
+ aRet.mpStyleApo = StyleExists(m_nAktColl) ? m_vColl[m_nAktColl].pWWFly : 0;
/*
#i1140#
@@ -481,8 +481,8 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
to see if we are still in that frame.
*/
- aRet.m_bHasSprm37 = pPlcxMan->HasParaSprm( bVer67 ? 37 : 0x2423 );
- const sal_uInt8 *pSrpm29 = pPlcxMan->HasParaSprm( bVer67 ? 29 : 0x261B );
+ aRet.m_bHasSprm37 = m_pPlcxMan->HasParaSprm( m_bVer67 ? 37 : 0x2423 );
+ const sal_uInt8 *pSrpm29 = m_pPlcxMan->HasParaSprm( m_bVer67 ? 29 : 0x261B );
aRet.m_bHasSprm29 = pSrpm29 != NULL;
aRet.m_nSprm29 = pSrpm29 ? *pSrpm29 : 0;
@@ -496,7 +496,7 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
bNowApo = false;
}
- bool bTestAllowed = !bTxbxFlySection && !bTableRowEnd;
+ bool bTestAllowed = !m_bTxbxFlySection && !bTableRowEnd;
if (bTestAllowed)
{
//Test is allowed if there is no table.
@@ -505,16 +505,16 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
//(And only if the row we are inside is at the
//same level as the previous row, think tables
//in tables)
- if (nCellLevel == nInTable)
+ if (nCellLevel == m_nInTable)
{
- if (!nInTable)
+ if (!m_nInTable)
bTestAllowed = true;
else
{
- if (!pTableDesc)
+ if (!m_pTableDesc)
{
- OSL_ENSURE(pTableDesc, "What!");
+ OSL_ENSURE(m_pTableDesc, "What!");
bTestAllowed = false;
}
else
@@ -524,9 +524,9 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
// The cell isn't valid, if e.g. there is a new row
// <pTableDesc->nAktRow> >= <pTableDesc->pTabLines->Count()>
bTestAllowed =
- pTableDesc->GetAktCol() == 0 &&
- ( !pTableDesc->IsValidCell( pTableDesc->GetAktCol() ) ||
- pTableDesc->InFirstParaInCell() );
+ m_pTableDesc->GetAktCol() == 0 &&
+ ( !m_pTableDesc->IsValidCell( m_pTableDesc->GetAktCol() ) ||
+ m_pTableDesc->InFirstParaInCell() );
}
}
}
@@ -627,13 +627,13 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFmt &rNum, WW8_ANLV const &rAV,
const sal_uInt8* pTxt, bool bOutline)
{
bool bInsert = false; // Default
- rtl_TextEncoding eCharSet = eStructCharSet;
+ rtl_TextEncoding eCharSet = m_eStructCharSet;
- const WW8_FFN* pF = pFonts->GetFont(SVBT16ToShort(rAV.ftc)); // FontInfo
+ const WW8_FFN* pF = m_pFonts->GetFont(SVBT16ToShort(rAV.ftc)); // FontInfo
bool bListSymbol = pF && ( pF->chs == 2 ); // Symbol/WingDings/...
OUString sTxt;
- if (bVer67)
+ if (m_bVer67)
{
sTxt = OUString(reinterpret_cast<char const *>(pTxt), rAV.cbTextBefore + rAV.cbTextAfter, eCharSet);
}
@@ -721,7 +721,7 @@ void SwWW8ImplReader::SetAnld(SwNumRule* pNumR, WW8_ANLD const * pAD, sal_uInt8
SwNumFmt aNF;
if (pAD)
{ // there is a Anld-Sprm
- bAktAND_fNumberAcross = 0 != pAD->fNumberAcross;
+ m_bAktAND_fNumberAcross = 0 != pAD->fNumberAcross;
WW8_ANLV const &rAV = pAD->eAnlv;
SetBaseAnlv(aNF, rAV, nSwLevel); // set the base format
SetAnlvStrings(aNF, rAV, pAD->rgchAnld, bOutLine ); // set the rest
@@ -736,45 +736,45 @@ void SwWW8ImplReader::SetAnld(SwNumRule* pNumR, WW8_ANLD const * pAD, sal_uInt8
SwNumRule* SwWW8ImplReader::GetStyRule()
{
- if( pStyles->pStyRule ) // Bullet-Style already present
- return pStyles->pStyRule;
+ if( m_pStyles->pStyRule ) // Bullet-Style already present
+ return m_pStyles->pStyRule;
const OUString aBaseName("WW8StyleNum");
- const OUString aName( rDoc.GetUniqueNumRuleName( &aBaseName, false) );
+ const OUString aName( m_rDoc.GetUniqueNumRuleName( &aBaseName, false) );
// #i86652#
- sal_uInt16 nRul = rDoc.MakeNumRule( aName, 0, false,
+ sal_uInt16 nRul = m_rDoc.MakeNumRule( aName, 0, false,
SvxNumberFormat::LABEL_ALIGNMENT );
- pStyles->pStyRule = rDoc.GetNumRuleTbl()[nRul];
+ m_pStyles->pStyRule = m_rDoc.GetNumRuleTbl()[nRul];
// Auto == false-> Nummerierungsvorlage
- pStyles->pStyRule->SetAutoRule(false);
+ m_pStyles->pStyRule->SetAutoRule(false);
- return pStyles->pStyRule;
+ return m_pStyles->pStyRule;
}
// Sprm 13
void SwWW8ImplReader::Read_ANLevelNo( sal_uInt16, const sal_uInt8* pData, short nLen )
{
- nSwNumLevel = 0xff; // Default: invalid
+ m_nSwNumLevel = 0xff; // Default: invalid
if( nLen <= 0 )
return;
// StyleDef ?
- if( pAktColl )
+ if( m_pAktColl )
{
// only for SwTxtFmtColl, not CharFmt
// WW: 0 = no Numbering
- SwWW8StyInf * pColl = GetStyle(nAktColl);
+ SwWW8StyInf * pColl = GetStyle(m_nAktColl);
if (pColl != NULL && pColl->bColl && *pData)
{
// Range WW:1..9 -> SW:0..8 no bullets / numbering
if (*pData <= MAXLEVEL && *pData <= 9)
{
- nSwNumLevel = *pData - 1;
- if (!bNoAttrImport)
- static_cast<SwTxtFmtColl*>(pAktColl)->AssignToListLevelOfOutlineStyle( nSwNumLevel );
+ m_nSwNumLevel = *pData - 1;
+ if (!m_bNoAttrImport)
+ static_cast<SwTxtFmtColl*>(m_pAktColl)->AssignToListLevelOfOutlineStyle( m_nSwNumLevel );
// For WW-NoNumbering also NO_NUMBERING could be used.
// ( For normal numberierung NO_NUM has to be used:
// NO_NUM : pauses numbering,
@@ -784,14 +784,14 @@ void SwWW8ImplReader::Read_ANLevelNo( sal_uInt16, const sal_uInt8* pData, short
else if( *pData == 10 || *pData == 11 )
{
// remember type, the rest happens at Sprm 12
- pStyles->nWwNumLevel = *pData;
+ m_pStyles->nWwNumLevel = *pData;
}
}
}
else
{
//Not StyleDef
- if (!bAnl)
+ if (!m_bAnl)
StartAnl(pData); // begin of outline / bullets
NextAnlLine(pData);
}
@@ -799,37 +799,37 @@ void SwWW8ImplReader::Read_ANLevelNo( sal_uInt16, const sal_uInt8* pData, short
void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, short nLen ) // Sprm 12
{
- SwWW8StyInf * pStyInf = GetStyle(nAktColl);
- if( !pAktColl || nLen <= 0 // only for Styledef
+ SwWW8StyInf * pStyInf = GetStyle(m_nAktColl);
+ if( !m_pAktColl || nLen <= 0 // only for Styledef
|| (pStyInf && !pStyInf->bColl) // ignore CharFmt ->
- || ( nIniFlags & WW8FL_NO_OUTLINE ) )
+ || ( m_nIniFlags & WW8FL_NO_OUTLINE ) )
{
- nSwNumLevel = 0xff;
+ m_nSwNumLevel = 0xff;
return;
}
- if( nSwNumLevel <= MAXLEVEL // Value range mapping WW:1..9 -> SW:0..8
- && nSwNumLevel <= 9 ){ // No Bullets or Numbering
+ if( m_nSwNumLevel <= MAXLEVEL // Value range mapping WW:1..9 -> SW:0..8
+ && m_nSwNumLevel <= 9 ){ // No Bullets or Numbering
// If NumRuleItems were set, either directly or through inheritance, disable them now
- pAktColl->SetFmtAttr( SwNumRuleItem() );
+ m_pAktColl->SetFmtAttr( SwNumRuleItem() );
const OUString aName("Outline");
- SwNumRule aNR( rDoc.GetUniqueNumRuleName( &aName ),
+ SwNumRule aNR( m_rDoc.GetUniqueNumRuleName( &aName ),
SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
OUTLINE_RULE );
- aNR = *rDoc.GetOutlineNumRule();
+ aNR = *m_rDoc.GetOutlineNumRule();
- SetAnld(&aNR, reinterpret_cast<WW8_ANLD const *>(pData), nSwNumLevel, true);
+ SetAnld(&aNR, reinterpret_cast<WW8_ANLD const *>(pData), m_nSwNumLevel, true);
// Missing Levels need not be replenished
- rDoc.SetOutlineNumRule( aNR );
- }else if( pStyles->nWwNumLevel == 10 || pStyles->nWwNumLevel == 11 ){
+ m_rDoc.SetOutlineNumRule( aNR );
+ }else if( m_pStyles->nWwNumLevel == 10 || m_pStyles->nWwNumLevel == 11 ){
SwNumRule* pNR = GetStyRule();
SetAnld(pNR, reinterpret_cast<WW8_ANLD const *>(pData), 0, false);
- pAktColl->SetFmtAttr( SwNumRuleItem( pNR->GetName() ) );
+ m_pAktColl->SetFmtAttr( SwNumRuleItem( pNR->GetName() ) );
- pStyInf = GetStyle(nAktColl);
+ pStyInf = GetStyle(m_nAktColl);
if (pStyInf != NULL)
pStyInf->bHasStyNumRule = true;
}
@@ -852,7 +852,7 @@ void SwWW8ImplReader::SetNumOlst(SwNumRule* pNumR, WW8_OLST* pO, sal_uInt8 nSwLe
for (i = 0, pAV1 = pO->rganlv; i < nSwLevel; ++i, ++pAV1)
nTxtOfs += pAV1->cbTextBefore + pAV1->cbTextAfter;
- if (!bVer67)
+ if (!m_bVer67)
nTxtOfs *= 2;
SetAnlvStrings(aNF, rAV, pO->rgch + nTxtOfs, true); // and apply
pNumR->Set(nSwLevel, aNF);
@@ -864,16 +864,16 @@ void SwWW8ImplReader::SetNumOlst(SwNumRule* pNumR, WW8_OLST* pO, sal_uInt8 nSwLe
// when outline-paragraphs occur.
void SwWW8ImplReader::Read_OLST( sal_uInt16, const sal_uInt8* pData, short nLen )
{
- delete pNumOlst;
+ delete m_pNumOlst;
if (nLen <= 0)
{
- pNumOlst = 0;
+ m_pNumOlst = 0;
return;
}
- pNumOlst = new WW8_OLST;
+ m_pNumOlst = new WW8_OLST;
if( nLen < sal::static_int_cast< sal_Int32 >(sizeof( WW8_OLST )) ) // fill if to short
- memset( pNumOlst, 0, sizeof( *pNumOlst ) );
- *pNumOlst = *reinterpret_cast<WW8_OLST const *>(pData);
+ memset( m_pNumOlst, 0, sizeof( *m_pNumOlst ) );
+ *m_pNumOlst = *reinterpret_cast<WW8_OLST const *>(pData);
}
WW8LvlType GetNumType(sal_uInt8 nWwLevelNo)
@@ -907,42 +907,42 @@ void ANLDRuleMap::SetNumRule(SwNumRule *pRule, sal_uInt8 nNumType)
// outline / numbering / bullets
void SwWW8ImplReader::StartAnl(const sal_uInt8* pSprm13)
{
- bAktAND_fNumberAcross = false;
+ m_bAktAND_fNumberAcross = false;
sal_uInt8 nT = static_cast< sal_uInt8 >(GetNumType(*pSprm13));
if (nT == WW8_Pause || nT == WW8_None)
return;
- nWwNumType = nT;
- SwNumRule *pNumRule = maANLDRules.GetNumRule(nWwNumType);
+ m_nWwNumType = nT;
+ SwNumRule *pNumRule = m_aANLDRules.GetNumRule(m_nWwNumType);
// check for COL numbering:
const sal_uInt8* pS12 = 0;// sprmAnld
OUString sNumRule;
- if (pTableDesc)
+ if (m_pTableDesc)
{
- sNumRule = pTableDesc->GetNumRuleName();
+ sNumRule = m_pTableDesc->GetNumRuleName();
if (!sNumRule.isEmpty())
{
- pNumRule = rDoc.FindNumRulePtr(sNumRule);
+ pNumRule = m_rDoc.FindNumRulePtr(sNumRule);
if (!pNumRule)
sNumRule.clear();
else
{
// this is ROW numbering ?
- pS12 = pPlcxMan->HasParaSprm(bVer67 ? 12 : 0xC63E); // sprmAnld
+ pS12 = m_pPlcxMan->HasParaSprm(m_bVer67 ? 12 : 0xC63E); // sprmAnld
if (pS12 && 0 != reinterpret_cast<WW8_ANLD const *>(pS12)->fNumberAcross)
sNumRule.clear();
}
}
}
- SwWW8StyInf * pStyInf = GetStyle(nAktColl);
+ SwWW8StyInf * pStyInf = GetStyle(m_nAktColl);
if (sNumRule.isEmpty() && pStyInf != NULL && pStyInf->bHasStyNumRule)
{
sNumRule = pStyInf->pFmt->GetNumRule().GetValue();
- pNumRule = rDoc.FindNumRulePtr(sNumRule);
+ pNumRule = m_rDoc.FindNumRulePtr(sNumRule);
if (!pNumRule)
sNumRule.clear();
}
@@ -952,37 +952,37 @@ void SwWW8ImplReader::StartAnl(const sal_uInt8* pSprm13)
if (!pNumRule)
{
// #i86652#
- pNumRule = rDoc.GetNumRuleTbl()[
- rDoc.MakeNumRule( sNumRule, 0, false,
+ pNumRule = m_rDoc.GetNumRuleTbl()[
+ m_rDoc.MakeNumRule( sNumRule, 0, false,
SvxNumberFormat::LABEL_ALIGNMENT ) ];
}
- if (pTableDesc)
+ if (m_pTableDesc)
{
if (!pS12)
- pS12 = pPlcxMan->HasParaSprm(bVer67 ? 12 : 0xC63E); // sprmAnld
+ pS12 = m_pPlcxMan->HasParaSprm(m_bVer67 ? 12 : 0xC63E); // sprmAnld
if (!pS12 || !reinterpret_cast<WW8_ANLD const *>(pS12)->fNumberAcross)
- pTableDesc->SetNumRuleName(pNumRule->GetName());
+ m_pTableDesc->SetNumRuleName(pNumRule->GetName());
}
}
- bAnl = true;
+ m_bAnl = true;
sNumRule = pNumRule ? pNumRule->GetName() : OUString();
// set NumRules via stack
- pCtrlStck->NewAttr(*pPaM->GetPoint(),
+ m_pCtrlStck->NewAttr(*m_pPaM->GetPoint(),
SfxStringItem(RES_FLTR_NUMRULE, sNumRule));
- maANLDRules.SetNumRule(pNumRule, nWwNumType);
+ m_aANLDRules.SetNumRule(pNumRule, m_nWwNumType);
}
// NextAnlLine() is called once for every row of a
// outline / numbering / bullet
void SwWW8ImplReader::NextAnlLine(const sal_uInt8* pSprm13)
{
- if (!bAnl)
+ if (!m_bAnl)
return;
- SwNumRule *pNumRule = maANLDRules.GetNumRule(nWwNumType);
+ SwNumRule *pNumRule = m_aANLDRules.GetNumRule(m_nWwNumType);
// pNd->UpdateNum ohne Regelwerk gibt GPF spaetestens beim Speichern als
// sdw3
@@ -990,46 +990,46 @@ void SwWW8ImplReader::NextAnlLine(const sal_uInt8* pSprm13)
// WW:10 = numberierung -> SW:0 & WW:11 = bullets -> SW:0
if (*pSprm13 == 10 || *pSprm13 == 11)
{
- nSwNumLevel = 0;
- if (!pNumRule->GetNumFmt(nSwNumLevel))
+ m_nSwNumLevel = 0;
+ if (!pNumRule->GetNumFmt(m_nSwNumLevel))
{
// not defined yet
// sprmAnld o. 0
- const sal_uInt8* pS12 = pPlcxMan->HasParaSprm(bVer67 ? 12 : 0xC63E);
- SetAnld(pNumRule, reinterpret_cast<WW8_ANLD const *>(pS12), nSwNumLevel, false);
+ const sal_uInt8* pS12 = m_pPlcxMan->HasParaSprm(m_bVer67 ? 12 : 0xC63E);
+ SetAnld(pNumRule, reinterpret_cast<WW8_ANLD const *>(pS12), m_nSwNumLevel, false);
}
}
else if( *pSprm13 > 0 && *pSprm13 <= MAXLEVEL ) // range WW:1..9 -> SW:0..8
{
- nSwNumLevel = *pSprm13 - 1; // outline
+ m_nSwNumLevel = *pSprm13 - 1; // outline
// undefined
- if (!pNumRule->GetNumFmt(nSwNumLevel))
+ if (!pNumRule->GetNumFmt(m_nSwNumLevel))
{
- if (pNumOlst) // there was a OLST
+ if (m_pNumOlst) // there was a OLST
{
//Assure upper levels are set, #i9556#
- for (sal_uInt8 nI = 0; nI < nSwNumLevel; ++nI)
+ for (sal_uInt8 nI = 0; nI < m_nSwNumLevel; ++nI)
{
if (!pNumRule->GetNumFmt(nI))
- SetNumOlst(pNumRule, pNumOlst, nI);
+ SetNumOlst(pNumRule, m_pNumOlst, nI);
}
- SetNumOlst(pNumRule, pNumOlst , nSwNumLevel);
+ SetNumOlst(pNumRule, m_pNumOlst , m_nSwNumLevel);
}
else // no Olst -> use Anld
{
// sprmAnld
- const sal_uInt8* pS12 = pPlcxMan->HasParaSprm(bVer67 ? 12 : 0xC63E);
- SetAnld(pNumRule, reinterpret_cast<WW8_ANLD const *>(pS12), nSwNumLevel, false);
+ const sal_uInt8* pS12 = m_pPlcxMan->HasParaSprm(m_bVer67 ? 12 : 0xC63E);
+ SetAnld(pNumRule, reinterpret_cast<WW8_ANLD const *>(pS12), m_nSwNumLevel, false);
}
}
}
else
- nSwNumLevel = 0xff; // no number
+ m_nSwNumLevel = 0xff; // no number
- SwTxtNode* pNd = pPaM->GetNode().GetTxtNode();
- if (nSwNumLevel < MAXLEVEL)
- pNd->SetAttrListLevel( nSwNumLevel );
+ SwTxtNode* pNd = m_pPaM->GetNode().GetTxtNode();
+ if (m_nSwNumLevel < MAXLEVEL)
+ pNd->SetAttrListLevel( m_nSwNumLevel );
else
{
pNd->SetAttrListLevel(0);
@@ -1048,29 +1048,29 @@ void SwWW8ImplReader::StopAnlToRestart(sal_uInt8 nNewType, bool bGoBack)
{
if (bGoBack)
{
- SwPosition aTmpPos(*pPaM->GetPoint());
- pPaM->Move(fnMoveBackward, fnGoCntnt);
- pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_FLTR_NUMRULE);
- *pPaM->GetPoint() = aTmpPos;
+ SwPosition aTmpPos(*m_pPaM->GetPoint());
+ m_pPaM->Move(fnMoveBackward, fnGoCntnt);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_FLTR_NUMRULE);
+ *m_pPaM->GetPoint() = aTmpPos;
}
else
- pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_FLTR_NUMRULE);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_FLTR_NUMRULE);
- maANLDRules.mpNumberingNumRule = 0;
+ m_aANLDRules.mpNumberingNumRule = 0;
/*
#i18816#
my take on this problem is that moving either way from an outline to a
numbering doesn't halt the outline, while the numbering is always halted
*/
bool bNumberingNotStopOutline =
- (((nWwNumType == WW8_Outline) && (nNewType == WW8_Numbering)) ||
- ((nWwNumType == WW8_Numbering) && (nNewType == WW8_Outline)));
+ (((m_nWwNumType == WW8_Outline) && (nNewType == WW8_Numbering)) ||
+ ((m_nWwNumType == WW8_Numbering) && (nNewType == WW8_Outline)));
if (!bNumberingNotStopOutline)
- maANLDRules.mpOutlineNumRule = 0;
+ m_aANLDRules.mpOutlineNumRule = 0;
- nSwNumLevel = 0xff;
- nWwNumType = WW8_None;
- bAnl = false;
+ m_nSwNumLevel = 0xff;
+ m_nWwNumType = WW8_None;
+ m_bAnl = false;
}
WW8TabBandDesc::WW8TabBandDesc( WW8TabBandDesc& rBand )
@@ -1732,9 +1732,9 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) :
pTable(0),
pParentPos(0),
pFlyFmt(0),
- aItemSet(pIo->rDoc.GetAttrPool(),RES_FRMATR_BEGIN,RES_FRMATR_END-1)
+ aItemSet(pIo->m_rDoc.GetAttrPool(),RES_FRMATR_BEGIN,RES_FRMATR_END-1)
{
- pIo->bAktAND_fNumberAcross = false;
+ pIo->m_bAktAND_fNumberAcross = false;
static const sal_Int16 aOriArr[] =
{
@@ -1745,9 +1745,9 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) :
WW8_TablePos aTabPos;
WW8PLCFxSave1 aSave;
- pIo->pPlcxMan->GetPap()->Save( aSave );
+ pIo->m_pPlcxMan->GetPap()->Save( aSave );
- WW8PLCFx_Cp_FKP* pPap = pIo->pPlcxMan->GetPapPLCF();
+ WW8PLCFx_Cp_FKP* pPap = pIo->m_pPlcxMan->GetPapPLCF();
eOri = text::HoriOrientation::LEFT;
@@ -1768,7 +1768,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) :
WW8_TablePos *pTabPos = 0;
// search end of a tab row
- if(!(pIo->SearchRowEnd(pPap, nStartCp, pIo->nInTable)))
+ if(!(pIo->SearchRowEnd(pPap, nStartCp, pIo->m_nInTable)))
{
bOk = false;
break;
@@ -1970,14 +1970,14 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) :
const sal_uInt8 *pLevel = pPap->HasSprm(0x6649);
// InTable
if (!pParams || (1 != *pParams) ||
- (pLevel && (*pLevel <= pIo->nInTable)))
+ (pLevel && (*pLevel <= pIo->m_nInTable)))
{
break;
}
//Get the end of row new table positioning data
WW8_CP nMyStartCp=nStartCp;
- if (pIo->SearchRowEnd(pPap, nMyStartCp, pIo->nInTable))
+ if (pIo->SearchRowEnd(pPap, nMyStartCp, pIo->m_nInTable))
if (pIo->ParseTabPos(&aTabPos, pPap))
pTabPos = &aTabPos;
@@ -1987,7 +1987,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) :
// PlcxMan currently points too far ahead so we need to bring
// it back to where we are trying to make a table
- pIo->pPlcxMan->GetPap()->nOrigStartPos = aRes.nStartPos;
+ pIo->m_pPlcxMan->GetPap()->nOrigStartPos = aRes.nStartPos;
if (!(pPap->SeekPos(aRes.nStartPos)))
{
aRes.nEndPos = WW8_CP_MAX;
@@ -1998,7 +1998,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) :
//Does this row match up with the last row closely enough to be
//considered part of the same table
- ApoTestResults aApo = pIo->TestApo(pIo->nInTable + 1, false, pTabPos);
+ ApoTestResults aApo = pIo->TestApo(pIo->m_nInTable + 1, false, pTabPos);
/*
##513##, #79474# If this is not sufficient, then we should look at
@@ -2039,7 +2039,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) :
}
delete pNewBand;
- pIo->pPlcxMan->GetPap()->Restore( aSave );
+ pIo->m_pPlcxMan->GetPap()->Restore( aSave );
}
WW8TabDesc::~WW8TabDesc()
@@ -2310,11 +2310,11 @@ void wwSectionManager::PrependedInlineNode(const SwPosition &rPos,
void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
{
- ::SetProgressState(pIo->nProgress, pIo->mpDocShell); // Update
+ ::SetProgressState(pIo->m_nProgress, pIo->m_pDocShell); // Update
// if there is already some content on the Node append new node to ensure
// that this content remains ABOVE the table
- SwPosition* pPoint = pIo->pPaM->GetPoint();
+ SwPosition* pPoint = pIo->m_pPaM->GetPoint();
bool bInsNode = pPoint->nContent.GetIndex() != 0;
bool bSetMinHeight = false;
@@ -2323,18 +2323,18 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
Set fly anchor to its anchor pos, so that if a table starts immediately
at this position a new node will be inserted before inserting the table.
*/
- if (!bInsNode && pIo->pFmtOfJustInsertedApo)
+ if (!bInsNode && pIo->m_pFmtOfJustInsertedApo)
{
const SwPosition* pAPos =
- pIo->pFmtOfJustInsertedApo->GetAnchor().GetCntntAnchor();
+ pIo->m_pFmtOfJustInsertedApo->GetAnchor().GetCntntAnchor();
if (pAPos && &pAPos->nNode.GetNode() == &pPoint->nNode.GetNode())
{
bInsNode = true;
bSetMinHeight = true;
- SwFmtSurround aSur(pIo->pFmtOfJustInsertedApo->GetSurround());
+ SwFmtSurround aSur(pIo->m_pFmtOfJustInsertedApo->GetSurround());
aSur.SetAnchorOnly(true);
- pIo->pFmtOfJustInsertedApo->SetFmtAttr(aSur);
+ pIo->m_pFmtOfJustInsertedApo->SetFmtAttr(aSur);
}
}
@@ -2344,19 +2344,19 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
// set font size to 1 point to minimize y-growth of Hd/Ft
SvxFontHeightItem aSz(20, 100, RES_CHRATR_FONTSIZE);
pIo->NewAttr( aSz );
- pIo->pCtrlStck->SetAttr(*pPoint, RES_CHRATR_FONTSIZE);
+ pIo->m_pCtrlStck->SetAttr(*pPoint, RES_CHRATR_FONTSIZE);
}
if (bInsNode)
pIo->AppendTxtNode(*pPoint);
- pTmpPos = new SwPosition( *pIo->pPaM->GetPoint() );
+ pTmpPos = new SwPosition( *pIo->m_pPaM->GetPoint() );
// The table is small: The number of columns is the lowest count of
// columns of the origin, because inserting is faster than deleting.
// The number of rows is the count of bands because (identically)
// rows of a band can be duplicated easy.
- pTable = pIo->rDoc.InsertTable(
+ pTable = pIo->m_rDoc.InsertTable(
SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 0 ),
*pTmpPos, nBands, nDefaultSwCols, eOri, 0, 0, false, true );
@@ -2371,7 +2371,7 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
OSL_ENSURE(pTableNode, "no table node!");
if (pTableNode)
{
- pIo->maSectionManager.PrependedInlineNode(*pIo->pPaM->GetPoint(),
+ pIo->m_aSectionManager.PrependedInlineNode(*pIo->m_pPaM->GetPoint(),
*pTableNode);
}
@@ -2413,22 +2413,22 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
if (text::HoriOrientation::LEFT_AND_WIDTH == eOri)
{
- if (!pIo->nInTable && pIo->InLocalApo() && pIo->pSFlyPara->pFlyFmt &&
+ if (!pIo->m_nInTable && pIo->InLocalApo() && pIo->m_pSFlyPara->pFlyFmt &&
GetMinLeft())
{
//If we are inside a frame and we have a border, the frames
//placement does not consider the tables border, which word
//displays outside the frame, so adjust here.
- SwFmtHoriOrient aHori(pIo->pSFlyPara->pFlyFmt->GetHoriOrient());
+ SwFmtHoriOrient aHori(pIo->m_pSFlyPara->pFlyFmt->GetHoriOrient());
sal_Int16 eHori = aHori.GetHoriOrient();
if ((eHori == text::HoriOrientation::NONE) || (eHori == text::HoriOrientation::LEFT) ||
(eHori == text::HoriOrientation::LEFT_AND_WIDTH))
{
//With multiple table, use last table settings. Perhaps
//the maximum is what word does ?
- aHori.SetPos(pIo->pSFlyPara->nXPos + GetMinLeft());
+ aHori.SetPos(pIo->m_pSFlyPara->nXPos + GetMinLeft());
aHori.SetHoriOrient(text::HoriOrientation::NONE);
- pIo->pSFlyPara->pFlyFmt->SetFmtAttr(aHori);
+ pIo->m_pSFlyPara->pFlyFmt->SetFmtAttr(aHori);
}
}
else
@@ -2448,7 +2448,7 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
{
if (nPreferredWidth)
{
- nLeft = pIo->maSectionManager.GetTextAreaWidth();
+ nLeft = pIo->m_aSectionManager.GetTextAreaWidth();
nLeft = nLeft - nPreferredWidth - nOrgDxaLeft;
}
else
@@ -2461,8 +2461,8 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
}
}
- mpOldRedlineStack = pIo->mpRedlineStack;
- pIo->mpRedlineStack = new sw::util::RedlineStack(pIo->rDoc);
+ mpOldRedlineStack = pIo->m_pRedlineStack;
+ pIo->m_pRedlineStack = new sw::util::RedlineStack(pIo->m_rDoc);
}
void WW8TabDesc::UseSwTable()
@@ -2483,15 +2483,15 @@ void WW8TabDesc::UseSwTable()
// insert extra cells if needed and something like this
AdjustNewBand();
- WW8DupProperties aDup(pIo->rDoc,pIo->pCtrlStck);
- pIo->pCtrlStck->SetAttr(*pIo->pPaM->GetPoint(), 0, false);
+ WW8DupProperties aDup(pIo->m_rDoc,pIo->m_pCtrlStck);
+ pIo->m_pCtrlStck->SetAttr(*pIo->m_pPaM->GetPoint(), 0, false);
// now set the correct PaM and prepare first merger group if any
SetPamInCell(nAktCol, true);
- aDup.Insert(*pIo->pPaM->GetPoint());
+ aDup.Insert(*pIo->m_pPaM->GetPoint());
- pIo->bWasTabRowEnd = false;
- pIo->bWasTabCellEnd = false;
+ pIo->m_bWasTabRowEnd = false;
+ pIo->m_bWasTabCellEnd = false;
}
void WW8TabDesc::MergeCells()
@@ -2636,16 +2636,16 @@ void WW8TabDesc::ParkPaM()
sal_uLong nSttNd = pTabBox2->GetSttIdx() + 1,
nEndNd = pTabBox2->GetSttNd()->EndOfSectionIndex();
- if (pIo->pPaM->GetPoint()->nNode != nSttNd)
+ if (pIo->m_pPaM->GetPoint()->nNode != nSttNd)
{
do
{
- pIo->pPaM->GetPoint()->nNode = nSttNd;
+ pIo->m_pPaM->GetPoint()->nNode = nSttNd;
}
- while (pIo->pPaM->GetNode().GetNodeType() != ND_TEXTNODE && ++nSttNd < nEndNd);
+ while (pIo->m_pPaM->GetNode().GetNodeType() != ND_TEXTNODE && ++nSttNd < nEndNd);
- pIo->pPaM->GetPoint()->nContent.Assign(pIo->pPaM->GetCntntNode(), 0);
- pIo->rDoc.SetTxtFmtColl(*pIo->pPaM, const_cast<SwTxtFmtColl*>(pIo->pDfltTxtFmtColl));
+ pIo->m_pPaM->GetPoint()->nContent.Assign(pIo->m_pPaM->GetCntntNode(), 0);
+ pIo->m_rDoc.SetTxtFmtColl(*pIo->m_pPaM, const_cast<SwTxtFmtColl*>(pIo->m_pDfltTxtFmtColl));
}
}
@@ -2653,28 +2653,28 @@ void WW8TabDesc::MoveOutsideTable()
{
OSL_ENSURE(pTmpPos && pIo, "I've forgotten where the table is anchored");
if (pTmpPos && pIo)
- *pIo->pPaM->GetPoint() = *pTmpPos;
+ *pIo->m_pPaM->GetPoint() = *pTmpPos;
}
void WW8TabDesc::FinishSwTable()
{
- pIo->mpRedlineStack->closeall(*pIo->pPaM->GetPoint());
- delete pIo->mpRedlineStack;
- pIo->mpRedlineStack = mpOldRedlineStack;
+ pIo->m_pRedlineStack->closeall(*pIo->m_pPaM->GetPoint());
+ delete pIo->m_pRedlineStack;
+ pIo->m_pRedlineStack = mpOldRedlineStack;
mpOldRedlineStack = 0;
- WW8DupProperties aDup(pIo->rDoc,pIo->pCtrlStck);
- pIo->pCtrlStck->SetAttr( *pIo->pPaM->GetPoint(), 0, false);
+ WW8DupProperties aDup(pIo->m_rDoc,pIo->m_pCtrlStck);
+ pIo->m_pCtrlStck->SetAttr( *pIo->m_pPaM->GetPoint(), 0, false);
MoveOutsideTable();
delete pTmpPos, pTmpPos = 0;
- aDup.Insert(*pIo->pPaM->GetPoint());
+ aDup.Insert(*pIo->m_pPaM->GetPoint());
- pIo->bWasTabRowEnd = false;
- pIo->bWasTabCellEnd = false;
+ pIo->m_bWasTabRowEnd = false;
+ pIo->m_bWasTabCellEnd = false;
- pIo->maInsertedTables.InsertTable(*pTblNd, *pIo->pPaM);
+ pIo->m_aInsertedTables.InsertTable(*pTblNd, *pIo->m_pPaM);
MergeCells();
@@ -2702,7 +2702,7 @@ void WW8TabDesc::FinishSwTable()
}
}
}
- pIo->pFmtOfJustInsertedApo = 0;
+ pIo->m_pFmtOfJustInsertedApo = 0;
aMergeGroups.clear();
}
}
@@ -2786,7 +2786,7 @@ bool WW8TabDesc::InFirstParaInCell() const
if (!IsValidCell(GetAktCol()))
return false;
- if (pIo->pPaM->GetPoint()->nNode == pTabBox->GetSttIdx() + 1)
+ if (pIo->m_pPaM->GetPoint()->nNode == pTabBox->GetSttIdx() + 1)
return true;
return false;
@@ -2797,7 +2797,7 @@ void WW8TabDesc::StartMiserableHackForUnsupportedDirection(short nWwCol)
OSL_ENSURE(pActBand, "Impossible");
if (pActBand && pActBand->maDirections[nWwCol] == 3)
{
- pIo->pCtrlStck->NewAttr(*pIo->pPaM->GetPoint(),
+ pIo->m_pCtrlStck->NewAttr(*pIo->m_pPaM->GetPoint(),
SvxCharRotateItem(900, false, RES_CHRATR_ROTATE));
}
}
@@ -2806,7 +2806,7 @@ void WW8TabDesc::EndMiserableHackForUnsupportedDirection(short nWwCol)
{
OSL_ENSURE(pActBand, "Impossible");
if (pActBand && pActBand->maDirections[nWwCol] == 3)
- pIo->pCtrlStck->SetAttr(*pIo->pPaM->GetPoint(), RES_CHRATR_ROTATE);
+ pIo->m_pCtrlStck->SetAttr(*pIo->m_pPaM->GetPoint(), RES_CHRATR_ROTATE);
}
bool WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
@@ -2835,17 +2835,17 @@ bool WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
// The first paragraph in a cell with upper autospacing has upper
// spacing set to 0
if (
- pIo->bParaAutoBefore && pIo->bFirstPara &&
- !pIo->pWDop->fDontUseHTMLAutoSpacing
+ pIo->m_bParaAutoBefore && pIo->m_bFirstPara &&
+ !pIo->m_pWDop->fDontUseHTMLAutoSpacing
)
{
- pIo->SetUpperSpacing(*pIo->pPaM, 0);
+ pIo->SetUpperSpacing(*pIo->m_pPaM, 0);
}
// The last paragraph in a cell with lower autospacing has lower
// spacing set to 0
- if (pIo->bParaAutoAfter && !pIo->pWDop->fDontUseHTMLAutoSpacing)
- pIo->SetLowerSpacing(*pIo->pPaM, 0);
+ if (pIo->m_bParaAutoAfter && !pIo->m_pWDop->fDontUseHTMLAutoSpacing)
+ pIo->SetLowerSpacing(*pIo->m_pPaM, 0);
ParkPaM();
}
@@ -2864,12 +2864,12 @@ bool WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
pAktWWCell = &pActBand->pTCs[ nWwCol ];
// The first paragraph in a cell with upper autospacing has upper spacing set to 0
- if(pIo->bParaAutoBefore && pIo->bFirstPara && !pIo->pWDop->fDontUseHTMLAutoSpacing)
- pIo->SetUpperSpacing(*pIo->pPaM, 0);
+ if(pIo->m_bParaAutoBefore && pIo->m_bFirstPara && !pIo->m_pWDop->fDontUseHTMLAutoSpacing)
+ pIo->SetUpperSpacing(*pIo->m_pPaM, 0);
// The last paragraph in a cell with lower autospacing has lower spacing set to 0
- if(pIo->bParaAutoAfter && !pIo->pWDop->fDontUseHTMLAutoSpacing)
- pIo->SetLowerSpacing(*pIo->pPaM, 0);
+ if(pIo->m_bParaAutoAfter && !pIo->m_pWDop->fDontUseHTMLAutoSpacing)
+ pIo->SetLowerSpacing(*pIo->m_pPaM, 0);
//We need to set the pPaM on the first cell, invalid
//or not so that we can collect paragraph proproties over
@@ -2877,23 +2877,23 @@ bool WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
//want to reset the fmt properties
sal_uLong nSttNd = pTabBox->GetSttIdx() + 1,
nEndNd = pTabBox->GetSttNd()->EndOfSectionIndex();
- if (pIo->pPaM->GetPoint()->nNode != nSttNd)
+ if (pIo->m_pPaM->GetPoint()->nNode != nSttNd)
{
do
{
- pIo->pPaM->GetPoint()->nNode = nSttNd;
+ pIo->m_pPaM->GetPoint()->nNode = nSttNd;
}
- while (pIo->pPaM->GetNode().GetNodeType() != ND_TEXTNODE && ++nSttNd < nEndNd);
- pIo->pPaM->GetPoint()->nContent.Assign(pIo->pPaM->GetCntntNode(), 0);
+ while (pIo->m_pPaM->GetNode().GetNodeType() != ND_TEXTNODE && ++nSttNd < nEndNd);
+ pIo->m_pPaM->GetPoint()->nContent.Assign(pIo->m_pPaM->GetCntntNode(), 0);
// Precautionally set now, otherwise the style is not set for cells
// that are inserted for margin balancing.
- pIo->rDoc.SetTxtFmtColl(*pIo->pPaM, const_cast<SwTxtFmtColl*>(pIo->pDfltTxtFmtColl));
+ pIo->m_rDoc.SetTxtFmtColl(*pIo->m_pPaM, const_cast<SwTxtFmtColl*>(pIo->m_pDfltTxtFmtColl));
// because this cells are invisible helper constructions only to simulate
// the frayed view of WW-tables we do NOT need SetTxtFmtCollAndListLevel()
}
// Better to turn Snap to Grid off for all paragraphs in tables
- if(SwTxtNode *pNd = pIo->pPaM->GetNode().GetTxtNode())
+ if(SwTxtNode *pNd = pIo->m_pPaM->GetNode().GetTxtNode())
{
const SfxPoolItem &rItm = pNd->SwCntntNode::GetAttr(RES_PARATR_SNAPTOGRID);
const SvxParaGridItem &rSnapToGrid = static_cast<const SvxParaGridItem&>(rItm);
@@ -2903,13 +2903,13 @@ bool WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
SvxParaGridItem aGridItem( rSnapToGrid );
aGridItem.SetValue(false);
- SwPosition* pGridPos = pIo->pPaM->GetPoint();
+ SwPosition* pGridPos = pIo->m_pPaM->GetPoint();
const sal_Int32 nEnd = pGridPos->nContent.GetIndex();
- pGridPos->nContent.Assign(pIo->pPaM->GetCntntNode(), 0);
- pIo->pCtrlStck->NewAttr(*pGridPos, aGridItem);
- pGridPos->nContent.Assign(pIo->pPaM->GetCntntNode(), nEnd);
- pIo->pCtrlStck->SetAttr(*pGridPos, RES_PARATR_SNAPTOGRID);
+ pGridPos->nContent.Assign(pIo->m_pPaM->GetCntntNode(), 0);
+ pIo->m_pCtrlStck->NewAttr(*pGridPos, aGridItem);
+ pGridPos->nContent.Assign(pIo->m_pPaM->GetCntntNode(), nEnd);
+ pIo->m_pCtrlStck->SetAttr(*pGridPos, RES_PARATR_SNAPTOGRID);
}
}
@@ -2924,8 +2924,8 @@ void WW8TabDesc::InsertCells( short nIns )
pTabBoxes = &pTabLine->GetTabBoxes();
pTabBox = (*pTabBoxes)[0];
- pIo->rDoc.GetNodes().InsBoxen( pTblNd, pTabLine, static_cast<SwTableBoxFmt*>(pTabBox->GetFrmFmt()),
- const_cast<SwTxtFmtColl*>(pIo->pDfltTxtFmtColl), 0, pTabBoxes->size(), nIns );
+ pIo->m_rDoc.GetNodes().InsBoxen( pTblNd, pTabLine, static_cast<SwTableBoxFmt*>(pTabBox->GetFrmFmt()),
+ const_cast<SwTxtFmtColl*>(pIo->m_pDfltTxtFmtColl), 0, pTabBoxes->size(), nIns );
// The third parameter contains the FrmFmt of the boxes.
// Here it is possible to optimize to save (reduce) FrmFmts.
}
@@ -3005,7 +3005,7 @@ void WW8TabDesc::SetTabShades( SwTableBox* pBox, short nWwIdx )
if (!rSHD.GetValue()) // auto
return;
- SwWW8Shade aSh( pIo->bVer67, rSHD );
+ SwWW8Shade aSh( pIo->m_bVer67, rSHD );
pBox->GetFrmFmt()->SetFmtAttr(SvxBrushItem(aSh.aColor, RES_BACKGROUND));
}
}
@@ -3187,12 +3187,12 @@ void WW8TabDesc::AdjustNewBand()
void WW8TabDesc::TableCellEnd()
{
- ::SetProgressState(pIo->nProgress, pIo->mpDocShell); // Update
+ ::SetProgressState(pIo->m_nProgress, pIo->m_pDocShell); // Update
EndMiserableHackForUnsupportedDirection(nAktCol);
// new line/row
- if( pIo->bWasTabRowEnd )
+ if( pIo->m_bWasTabRowEnd )
{
// bWasTabRowEnd will be deactivated in
// SwWW8ImplReader::ProcessSpecial()
@@ -3225,7 +3225,7 @@ void WW8TabDesc::TableCellEnd()
{
SwTableBox* pBox = (*pTabBoxes)[0];
SwSelBoxes aBoxes;
- pIo->rDoc.InsertRow( pTable->SelLineFromBox( pBox, aBoxes ) );
+ pIo->m_rDoc.InsertRow( pTable->SelLineFromBox( pBox, aBoxes ) );
}
}
}
@@ -3236,7 +3236,7 @@ void WW8TabDesc::TableCellEnd()
SetPamInCell(nAktCol, true);
// finish Annotated Level Numbering ?
- if (pIo->bAnl && !pIo->bAktAND_fNumberAcross && pActBand)
+ if (pIo->m_bAnl && !pIo->m_bAktAND_fNumberAcross && pActBand)
pIo->StopAllAnl(IsValidCell(nAktCol));
}
@@ -3316,14 +3316,14 @@ void WW8TabDesc::SetNumRuleName( const OUString& rName )
bool SwWW8ImplReader::StartTable(WW8_CP nStartCp, SvxULSpaceItem* pULSpaceItem)
{
// Entering a table so make sure the FirstPara flag gets set
- bFirstPara = true;
+ m_bFirstPara = true;
// keine rekursiven Tabellen Nicht bei EinfuegenDatei in Tabelle oder
// Fussnote
- if (bReadNoTbl)
+ if (m_bReadNoTbl)
return false;
- if (pTableDesc)
- maTableStack.push(pTableDesc);
+ if (m_pTableDesc)
+ m_aTableStack.push(m_pTableDesc);
// #i33818# - determine absolute position object attributes,
// if possible. It's needed for nested tables.
@@ -3333,32 +3333,32 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp, SvxULSpaceItem* pULSpaceItem)
// only at-character, if absolute position object attributes are available.
// Thus, default anchor type is as-character anchored.
RndStdIds eAnchor( FLY_AS_CHAR );
- if ( nInTable )
+ if ( m_nInTable )
{
WW8_TablePos* pNestedTabPos( 0L );
WW8_TablePos aNestedTabPos;
WW8PLCFxSave1 aSave;
- pPlcxMan->GetPap()->Save( aSave );
- WW8PLCFx_Cp_FKP* pPap = pPlcxMan->GetPapPLCF();
+ m_pPlcxMan->GetPap()->Save( aSave );
+ WW8PLCFx_Cp_FKP* pPap = m_pPlcxMan->GetPapPLCF();
WW8_CP nMyStartCp = nStartCp;
- if ( SearchRowEnd( pPap, nMyStartCp, nInTable ) &&
+ if ( SearchRowEnd( pPap, nMyStartCp, m_nInTable ) &&
ParseTabPos( &aNestedTabPos, pPap ) )
{
pNestedTabPos = &aNestedTabPos;
}
- pPlcxMan->GetPap()->Restore( aSave );
+ m_pPlcxMan->GetPap()->Restore( aSave );
if ( pNestedTabPos )
{
- ApoTestResults aApo = TestApo( nInTable + 1, false, pNestedTabPos );
+ ApoTestResults aApo = TestApo( m_nInTable + 1, false, pNestedTabPos );
pTableWFlyPara = ConstructApo( aApo, pNestedTabPos );
if ( pTableWFlyPara )
{
// <WW8SwFlyPara> constructor has changed - new 4th parameter
// containing WW8 page top margin.
- pTableSFlyPara = new WW8SwFlyPara(*pPaM, *this, *pTableWFlyPara,
- maSectionManager.GetWWPageTopMargin(),
- maSectionManager.GetPageLeft(), maSectionManager.GetTextAreaWidth(),
- nIniFlyDx, nIniFlyDy);
+ pTableSFlyPara = new WW8SwFlyPara(*m_pPaM, *this, *pTableWFlyPara,
+ m_aSectionManager.GetWWPageTopMargin(),
+ m_aSectionManager.GetPageLeft(), m_aSectionManager.GetTextAreaWidth(),
+ m_nIniFlyDx, m_nIniFlyDy);
// #i45301# - anchor nested table Writer fly frame at-character
eAnchor = FLY_AT_CHAR;
@@ -3366,57 +3366,57 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp, SvxULSpaceItem* pULSpaceItem)
}
}
- pTableDesc = new WW8TabDesc( this, nStartCp );
+ m_pTableDesc = new WW8TabDesc( this, nStartCp );
- if( pTableDesc->Ok() )
+ if( m_pTableDesc->Ok() )
{
- int nNewInTable = nInTable + 1;
+ int nNewInTable = m_nInTable + 1;
if ((eAnchor == FLY_AT_CHAR)
- && !maTableStack.empty() && !InEqualApo(nNewInTable) )
+ && !m_aTableStack.empty() && !InEqualApo(nNewInTable) )
{
- pTableDesc->pParentPos = new SwPosition(*pPaM->GetPoint());
- SfxItemSet aItemSet(rDoc.GetAttrPool(),
+ m_pTableDesc->pParentPos = new SwPosition(*m_pPaM->GetPoint());
+ SfxItemSet aItemSet(m_rDoc.GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1);
// #i33818# - anchor the Writer fly frame for the nested table at-character.
// #i45301#
SwFmtAnchor aAnchor( eAnchor );
- aAnchor.SetAnchor( pTableDesc->pParentPos );
+ aAnchor.SetAnchor( m_pTableDesc->pParentPos );
aItemSet.Put( aAnchor );
- pTableDesc->pFlyFmt = rDoc.MakeFlySection( eAnchor,
- pTableDesc->pParentPos, &aItemSet);
- OSL_ENSURE( pTableDesc->pFlyFmt->GetAnchor().GetAnchorId() == eAnchor,
+ m_pTableDesc->pFlyFmt = m_rDoc.MakeFlySection( eAnchor,
+ m_pTableDesc->pParentPos, &aItemSet);
+ OSL_ENSURE( m_pTableDesc->pFlyFmt->GetAnchor().GetAnchorId() == eAnchor,
"Not the anchor type requested!" );
- MoveInsideFly(pTableDesc->pFlyFmt);
+ MoveInsideFly(m_pTableDesc->pFlyFmt);
}
- pTableDesc->CreateSwTable(pULSpaceItem);
- if (pTableDesc->pFlyFmt)
+ m_pTableDesc->CreateSwTable(pULSpaceItem);
+ if (m_pTableDesc->pFlyFmt)
{
- pTableDesc->SetSizePosition(pTableDesc->pFlyFmt);
+ m_pTableDesc->SetSizePosition(m_pTableDesc->pFlyFmt);
// #i33818# - Use absolute position object attributes,
// if existing, and apply them to the created Writer fly frame.
if ( pTableWFlyPara && pTableSFlyPara )
{
WW8FlySet aFlySet( *this, pTableWFlyPara, pTableSFlyPara, false );
SwFmtAnchor aAnchor( FLY_AT_CHAR );
- aAnchor.SetAnchor( pTableDesc->pParentPos );
+ aAnchor.SetAnchor( m_pTableDesc->pParentPos );
aFlySet.Put( aAnchor );
- pTableDesc->pFlyFmt->SetFmtAttr( aFlySet );
+ m_pTableDesc->pFlyFmt->SetFmtAttr( aFlySet );
}
else
{
SwFmtHoriOrient aHori =
- pTableDesc->pTable->GetFrmFmt()->GetHoriOrient();
- pTableDesc->pFlyFmt->SetFmtAttr(aHori);
- pTableDesc->pFlyFmt->SetFmtAttr( SwFmtSurround( SURROUND_NONE ) );
+ m_pTableDesc->pTable->GetFrmFmt()->GetHoriOrient();
+ m_pTableDesc->pFlyFmt->SetFmtAttr(aHori);
+ m_pTableDesc->pFlyFmt->SetFmtAttr( SwFmtSurround( SURROUND_NONE ) );
}
// #i33818# - The nested table doesn't have to leave
// the table cell. Thus, the Writer fly frame has to follow the text flow.
- pTableDesc->pFlyFmt->SetFmtAttr( SwFmtFollowTextFlow( true ) );
+ m_pTableDesc->pFlyFmt->SetFmtAttr( SwFmtFollowTextFlow( true ) );
}
else
- pTableDesc->SetSizePosition(0);
- pTableDesc->UseSwTable();
+ m_pTableDesc->SetSizePosition(0);
+ m_pTableDesc->UseSwTable();
}
else
PopTableDesc();
@@ -3425,66 +3425,66 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp, SvxULSpaceItem* pULSpaceItem)
delete pTableWFlyPara;
delete pTableSFlyPara;
- return 0 != pTableDesc;
+ return 0 != m_pTableDesc;
}
void SwWW8ImplReader::TabCellEnd()
{
- if (nInTable && pTableDesc)
- pTableDesc->TableCellEnd();
+ if (m_nInTable && m_pTableDesc)
+ m_pTableDesc->TableCellEnd();
- bFirstPara = true; // We have come to the end of a cell so FirstPara flag
- bReadTable = false;
- mpTableEndPaM.reset();
+ m_bFirstPara = true; // We have come to the end of a cell so FirstPara flag
+ m_bReadTable = false;
+ m_pTableEndPaM.reset();
}
void SwWW8ImplReader::Read_TabCellEnd( sal_uInt16, const sal_uInt8* pData, short nLen)
{
if( ( nLen > 0 ) && ( *pData == 1 ) )
- bWasTabCellEnd = true;
+ m_bWasTabCellEnd = true;
}
void SwWW8ImplReader::Read_TabRowEnd( sal_uInt16, const sal_uInt8* pData, short nLen ) // Sprm25
{
if( ( nLen > 0 ) && ( *pData == 1 ) )
- bWasTabRowEnd = true;
+ m_bWasTabRowEnd = true;
}
void SwWW8ImplReader::PopTableDesc()
{
- if (pTableDesc && pTableDesc->pFlyFmt)
+ if (m_pTableDesc && m_pTableDesc->pFlyFmt)
{
- MoveOutsideFly(pTableDesc->pFlyFmt,*pTableDesc->pParentPos);
+ MoveOutsideFly(m_pTableDesc->pFlyFmt,*m_pTableDesc->pParentPos);
}
- delete pTableDesc;
- if (maTableStack.empty())
- pTableDesc = 0;
+ delete m_pTableDesc;
+ if (m_aTableStack.empty())
+ m_pTableDesc = 0;
else
{
- pTableDesc = maTableStack.top();
- maTableStack.pop();
+ m_pTableDesc = m_aTableStack.top();
+ m_aTableStack.pop();
}
}
void SwWW8ImplReader::StopTable()
{
- OSL_ENSURE(pTableDesc, "Panic, stop table with no table!");
- if (!pTableDesc)
+ OSL_ENSURE(m_pTableDesc, "Panic, stop table with no table!");
+ if (!m_pTableDesc)
return;
// We are leaving a table so make sure the next paragraph doesn't think
// it's the first paragraph
- bFirstPara = false;
+ m_bFirstPara = false;
- pTableDesc->FinishSwTable();
+ m_pTableDesc->FinishSwTable();
PopTableDesc();
- bReadTable = true;
+ m_bReadTable = true;
// #i101116# - Keep PaM on table end only for nested tables
- if ( nInTable > 1 )
+ if ( m_nInTable > 1 )
{
- mpTableEndPaM.reset(new SwPaM(*pPaM, pPaM));
+ m_pTableEndPaM.reset(new SwPaM(*m_pPaM, m_pPaM));
}
}
@@ -3493,17 +3493,17 @@ void SwWW8ImplReader::StopTable()
// the table; SW uses the left table margin.
short SwWW8ImplReader::GetTableLeft()
{
- return (pTableDesc) ? pTableDesc->GetMinLeft() : 0;
+ return (m_pTableDesc) ? m_pTableDesc->GetMinLeft() : 0;
}
bool SwWW8ImplReader::IsInvalidOrToBeMergedTabCell() const
{
- if( !pTableDesc )
+ if( !m_pTableDesc )
return false;
- const WW8_TCell* pCell = pTableDesc->GetAktWWCell();
+ const WW8_TCell* pCell = m_pTableDesc->GetAktWWCell();
- return !pTableDesc->IsValidCell( pTableDesc->GetAktCol() )
+ return !m_pTableDesc->IsValidCell( m_pTableDesc->GetAktCol() )
|| ( pCell
&& ( !pCell->bFirstMerged
&& ( pCell->bMerged
@@ -3518,11 +3518,11 @@ bool SwWW8ImplReader::IsInvalidOrToBeMergedTabCell() const
sal_uInt16 SwWW8ImplReader::StyleUsingLFO( sal_uInt16 nLFOIndex ) const
{
sal_uInt16 nRes = USHRT_MAX;
- if( !vColl.empty() )
+ if( !m_vColl.empty() )
{
- for(sal_uInt16 nI = 0; nI < pStyles->GetCount(); nI++ )
- if( vColl[ nI ].bValid
- && (nLFOIndex == vColl[ nI ].nLFOIndex) )
+ for(sal_uInt16 nI = 0; nI < m_pStyles->GetCount(); nI++ )
+ if( m_vColl[ nI ].bValid
+ && (nLFOIndex == m_vColl[ nI ].nLFOIndex) )
nRes = nI;
}
return nRes;
@@ -3531,13 +3531,13 @@ sal_uInt16 SwWW8ImplReader::StyleUsingLFO( sal_uInt16 nLFOIndex ) const
const SwFmt* SwWW8ImplReader::GetStyleWithOrgWWName( OUString& rName ) const
{
SwFmt* pRet = 0;
- if( !vColl.empty() )
+ if( !m_vColl.empty() )
{
- for(sal_uInt16 nI = 0; nI < pStyles->GetCount(); nI++ )
- if( vColl[ nI ].bValid
- && (rName.equals( vColl[ nI ].GetOrgWWName())) )
+ for(sal_uInt16 nI = 0; nI < m_pStyles->GetCount(); nI++ )
+ if( m_vColl[ nI ].bValid
+ && (rName.equals( m_vColl[ nI ].GetOrgWWName())) )
{
- pRet = vColl[ nI ].pFmt;
+ pRet = m_vColl[ nI ].pFmt;
break;
}
}
@@ -3669,10 +3669,10 @@ void WW8RStyle::ImportGrupx(short nLen, bool bPara, bool bOdd)
}
WW8RStyle::WW8RStyle(WW8Fib& _rFib, SwWW8ImplReader* pI)
- : WW8Style(*pI->pTableStream, _rFib)
+ : WW8Style(*pI->m_pTableStream, _rFib)
, maSprmParser(_rFib.GetFIBVersion())
, pIo(pI)
- , pStStrm(pI->pTableStream)
+ , pStStrm(pI->m_pTableStream)
, pStyRule(0)
, pParaSprms(0)
, nSprmsLen(0)
@@ -3685,7 +3685,7 @@ WW8RStyle::WW8RStyle(WW8Fib& _rFib, SwWW8ImplReader* pI)
, bFCTLSizeChanged(false)
, bWidowsChanged(false)
{
- pIo->vColl.resize(cstd);
+ pIo->m_vColl.resize(cstd);
}
void WW8RStyle::Set1StyleDefaults()
@@ -3701,19 +3701,19 @@ void WW8RStyle::Set1StyleDefaults()
if (!bFontChanged) // Style has no Font? set the default,
pIo->SetNewFontAttr(ftcAsci, true, RES_CHRATR_FONT);
- if( !pIo->bNoAttrImport )
+ if( !pIo->m_bNoAttrImport )
{
// Style has no text color set, winword default is auto
if ( !bTxtColChanged )
- pIo->pAktColl->SetFmtAttr(SvxColorItem(Color(COL_AUTO), RES_CHRATR_COLOR));
+ pIo->m_pAktColl->SetFmtAttr(SvxColorItem(Color(COL_AUTO), RES_CHRATR_COLOR));
// Style has no FontSize ? WinWord Default is 10pt for western and asian
if( !bFSizeChanged )
{
SvxFontHeightItem aAttr(200, 100, RES_CHRATR_FONTSIZE);
- pIo->pAktColl->SetFmtAttr(aAttr);
+ pIo->m_pAktColl->SetFmtAttr(aAttr);
aAttr.SetWhich(RES_CHRATR_CJK_FONTSIZE);
- pIo->pAktColl->SetFmtAttr(aAttr);
+ pIo->m_pAktColl->SetFmtAttr(aAttr);
}
// Style has no FontSize ? WinWord Default is 10pt for western and asian
@@ -3721,13 +3721,13 @@ void WW8RStyle::Set1StyleDefaults()
{
SvxFontHeightItem aAttr(200, 100, RES_CHRATR_FONTSIZE);
aAttr.SetWhich(RES_CHRATR_CTL_FONTSIZE);
- pIo->pAktColl->SetFmtAttr(aAttr);
+ pIo->m_pAktColl->SetFmtAttr(aAttr);
}
if( !bWidowsChanged ) // Widows ?
{
- pIo->pAktColl->SetFmtAttr( SvxWidowsItem( 2, RES_PARATR_WIDOWS ) );
- pIo->pAktColl->SetFmtAttr( SvxOrphansItem( 2, RES_PARATR_ORPHANS ) );
+ pIo->m_pAktColl->SetFmtAttr( SvxWidowsItem( 2, RES_PARATR_WIDOWS ) );
+ pIo->m_pAktColl->SetFmtAttr( SvxOrphansItem( 2, RES_PARATR_ORPHANS ) );
}
}
}
@@ -3741,7 +3741,7 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
{
// Para-Style
sw::util::ParaStyleMapper::StyleResult aResult =
- pIo->maParaStyleMapper.GetStyle(rSI.GetOrgWWName(), eSti);
+ pIo->m_aParaStyleMapper.GetStyle(rSI.GetOrgWWName(), eSti);
pColl = aResult.first;
bStyExist = aResult.second;
}
@@ -3749,22 +3749,22 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
{
// Char-Style
sw::util::CharStyleMapper::StyleResult aResult =
- pIo->maCharStyleMapper.GetStyle(rSI.GetOrgWWName(), eSti);
+ pIo->m_aCharStyleMapper.GetStyle(rSI.GetOrgWWName(), eSti);
pColl = aResult.first;
bStyExist = aResult.second;
}
- bool bImport = !bStyExist || pIo->mbNewDoc; // import content ?
+ bool bImport = !bStyExist || pIo->m_bNewDoc; // import content ?
// Do not override character styles the list import code created earlier.
if (bImport && bStyExist && rSI.GetOrgWWName().startsWith("WW8Num"))
bImport = false;
- bool bOldNoImp = pIo->bNoAttrImport;
+ bool bOldNoImp = pIo->m_bNoAttrImport;
rSI.bImportSkipped = !bImport;
if( !bImport )
- pIo->bNoAttrImport = true;
+ pIo->m_bNoAttrImport = true;
else
{
if (bStyExist)
@@ -3773,7 +3773,7 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
}
pColl->SetAuto(false); // suggested by JP
} // but changes the UI
- pIo->pAktColl = pColl;
+ pIo->m_pAktColl = pColl;
rSI.pFmt = pColl; // remember translation WW->SW
rSI.bImportSkipped = !bImport;
@@ -3781,7 +3781,7 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
sal_uInt16 j = rSI.nBase;
if (j != nThisStyle && j < cstd )
{
- SwWW8StyInf* pj = &pIo->vColl[j];
+ SwWW8StyInf* pj = &pIo->m_vColl[j];
if (rSI.pFmt && pj->pFmt && rSI.bColl == pj->bColl)
{
rSI.pFmt->SetDerivedFrom( pj->pFmt ); // ok, set Based on
@@ -3798,10 +3798,10 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
rSI.bParaAutoAfter = pj->bParaAutoAfter;
if (pj->pWWFly)
- rSI.pWWFly = new WW8FlyPara(pIo->bVer67, pj->pWWFly);
+ rSI.pWWFly = new WW8FlyPara(pIo->m_bVer67, pj->pWWFly);
}
}
- else if( pIo->mbNewDoc && bStyExist )
+ else if( pIo->m_bNewDoc && bStyExist )
rSI.pFmt->SetDerivedFrom(0);
rSI.nFollow = nNextStyle; // remember Follow
@@ -3810,7 +3810,7 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
bTxtColChanged = bFontChanged = bCJKFontChanged = bCTLFontChanged =
bFSizeChanged = bFCTLSizeChanged = bWidowsChanged = false;
pIo->SetNAktColl( nThisStyle );
- pIo->bStyNormal = nThisStyle == 0;
+ pIo->m_bStyNormal = nThisStyle == 0;
return bOldNoImp;
}
@@ -3818,11 +3818,11 @@ void WW8RStyle::PostStyle(SwWW8StyInf &rSI, bool bOldNoImp)
{
// Reset attribute flags, because there are no style-ends.
- pIo->bHasBorder = pIo->bSpec = pIo->bObj = pIo->bSymbol = false;
- pIo->nCharFmt = -1;
+ pIo->m_bHasBorder = pIo->m_bSpec = pIo->m_bObj = pIo->m_bSymbol = false;
+ pIo->m_nCharFmt = -1;
// If Style basiert auf Nichts oder Basis ignoriert
- if ((rSI.nBase >= cstd || pIo->vColl[rSI.nBase].bImportSkipped) && rSI.bColl)
+ if ((rSI.nBase >= cstd || pIo->m_vColl[rSI.nBase].bImportSkipped) && rSI.bColl)
{
// If Char-Styles does not work
// -> set hard WW-Defaults
@@ -3830,20 +3830,20 @@ void WW8RStyle::PostStyle(SwWW8StyInf &rSI, bool bOldNoImp)
}
pStyRule = 0; // to be on the safe side
- pIo->bStyNormal = false;
+ pIo->m_bStyNormal = false;
pIo->SetNAktColl( 0 );
- pIo->bNoAttrImport = bOldNoImp;
+ pIo->m_bNoAttrImport = bOldNoImp;
// reset the list-remember-fields, if used when reading styles
- pIo->nLFOPosition = USHRT_MAX;
- pIo->nListLevel = WW8ListManager::nMaxLevel;
+ pIo->m_nLFOPosition = USHRT_MAX;
+ pIo->m_nListLevel = WW8ListManager::nMaxLevel;
}
void WW8RStyle::Import1Style( sal_uInt16 nNr )
{
- if (nNr >= pIo->vColl.size())
+ if (nNr >= pIo->m_vColl.size())
return;
- SwWW8StyInf &rSI = pIo->vColl[nNr];
+ SwWW8StyInf &rSI = pIo->m_vColl[nNr];
if( rSI.bImported || !rSI.bValid )
return;
@@ -3852,7 +3852,7 @@ void WW8RStyle::Import1Style( sal_uInt16 nNr )
// valid and not NUL and not yet imported
- if( rSI.nBase < cstd && !pIo->vColl[rSI.nBase].bImported )
+ if( rSI.nBase < cstd && !pIo->m_vColl[rSI.nBase].bImported )
Import1Style( rSI.nBase );
pStStrm->Seek( rSI.nFilePos );
@@ -3894,16 +3894,16 @@ void WW8RStyle::Import1Style( sal_uInt16 nNr )
void WW8RStyle::RecursiveReg(sal_uInt16 nNr)
{
- if (nNr >= pIo->vColl.size())
+ if (nNr >= pIo->m_vColl.size())
return;
- SwWW8StyInf &rSI = pIo->vColl[nNr];
+ SwWW8StyInf &rSI = pIo->m_vColl[nNr];
if( rSI.bImported || !rSI.bValid )
return;
rSI.bImported = true;
- if( rSI.nBase < cstd && !pIo->vColl[rSI.nBase].bImported )
+ if( rSI.nBase < cstd && !pIo->m_vColl[rSI.nBase].bImported )
RecursiveReg(rSI.nBase);
pIo->RegisterNumFmtOnStyle(nNr);
@@ -3923,7 +3923,7 @@ void WW8RStyle::PostProcessStyles()
formats and use it to mark handled ones
*/
for (i=0; i < cstd; ++i)
- pIo->vColl[i].bImported = false;
+ pIo->m_vColl[i].bImported = false;
/*
Register the num formats and tabstop changes on the styles recursively.
@@ -3938,7 +3938,7 @@ void WW8RStyle::PostProcessStyles()
*/
for (i=0; i < cstd; ++i)
{
- if (pIo->vColl[i].bValid)
+ if (pIo->m_vColl[i].bValid)
{
RecursiveReg(i);
}
@@ -3950,7 +3950,7 @@ void WW8RStyle::ScanStyles() // investigate style dependencies
for (sal_uInt16 i = 0; i < cstd; ++i)
{
short nSkip;
- SwWW8StyInf &rSI = pIo->vColl[i];
+ SwWW8StyInf &rSI = pIo->m_vColl[i];
rSI.nFilePos = pStStrm->Tell(); // remember FilePos
WW8_STD* pStd = Read1Style( nSkip, 0, 0 ); // read STD
@@ -4207,13 +4207,13 @@ void WW8RStyle::ImportOldFormatStyles()
{
for (sal_uInt16 i=0; i < cstd; ++i)
{
- pIo->vColl[i].bColl = true;
+ pIo->m_vColl[i].bColl = true;
//every chain must end eventually at the null style (style code 222)
- pIo->vColl[i].nBase = 222;
+ pIo->m_vColl[i].nBase = 222;
}
rtl_TextEncoding eStructChrSet = WW8Fib::GetFIBCharset(
- pIo->pWwFib->chseTables, pIo->pWwFib->lid);
+ pIo->m_pWwFib->chseTables, pIo->m_pWwFib->lid);
sal_uInt16 cstcStd(0);
rSt.ReadUInt16( cstcStd );
@@ -4236,10 +4236,10 @@ void WW8RStyle::ImportOldFormatStyles()
nByteCount++;
sal_uInt8 stc = static_cast< sal_uInt8 >((stcp - cstcStd) & 255);
- if (stc >=pIo->vColl.size())
+ if (stc >=pIo->m_vColl.size())
continue;
- SwWW8StyInf &rSI = pIo->vColl[stc];
+ SwWW8StyInf &rSI = pIo->m_vColl[stc];
OUString sName;
if (nCount != 0xFF) // undefined style
@@ -4378,7 +4378,7 @@ void WW8RStyle::ImportOldFormatStyles()
if (stc == stcBase)
stcBase = 222;
- SwWW8StyInf &rSI = pIo->vColl[stc];
+ SwWW8StyInf &rSI = pIo->m_vColl[stc];
rSI.nBase = stcBase;
ww::sti eSti = ww::GetCanonicalStiFromStc(stc);
@@ -4389,7 +4389,7 @@ void WW8RStyle::ImportOldFormatStyles()
rSI.bValid = true;
if (ww::StandardStiIsCharStyle(eSti) && !aPAPXOffsets[stcp].mnSize)
- pIo->vColl[stc].bColl = false;
+ pIo->m_vColl[stc].bColl = false;
bool bOldNoImp = PrepareStyle(rSI, eSti, stc, stcNext);
@@ -4410,13 +4410,13 @@ void WW8RStyle::ImportNewFormatStyles()
ScanStyles(); // Scan Based On
for (sal_uInt16 i = 0; i < cstd; ++i) // import Styles
- if (pIo->vColl[i].bValid)
+ if (pIo->m_vColl[i].bValid)
Import1Style( i );
}
void WW8RStyle::ImportStyles()
{
- if (pIo->pWwFib->GetFIBVersion() <= ww::eWW2)
+ if (pIo->m_pWwFib->GetFIBVersion() <= ww::eWW2)
ImportOldFormatStyles();
else
ImportNewFormatStyles();
@@ -4424,11 +4424,11 @@ void WW8RStyle::ImportStyles()
void WW8RStyle::Import()
{
- pIo->pDfltTxtFmtColl = pIo->rDoc.GetDfltTxtFmtColl();
- pIo->pStandardFmtColl =
- pIo->rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD, false);
+ pIo->m_pDfltTxtFmtColl = pIo->m_rDoc.GetDfltTxtFmtColl();
+ pIo->m_pStandardFmtColl =
+ pIo->m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD, false);
- if( pIo->nIniFlags & WW8FL_NO_STYLES )
+ if( pIo->m_nIniFlags & WW8FL_NO_STYLES )
return;
ImportStyles();
@@ -4436,11 +4436,11 @@ void WW8RStyle::Import()
for (sal_uInt16 i = 0; i < cstd; ++i)
{
// Follow chain
- SwWW8StyInf* pi = &pIo->vColl[i];
+ SwWW8StyInf* pi = &pIo->m_vColl[i];
sal_uInt16 j = pi->nFollow;
if( j < cstd )
{
- SwWW8StyInf* pj = &pIo->vColl[j];
+ SwWW8StyInf* pj = &pIo->m_vColl[j];
if ( j != i // rational Index ?
&& pi->pFmt // Format ok ?
&& pj->pFmt // Derived-Format ok ?
@@ -4461,17 +4461,17 @@ void WW8RStyle::Import()
// for e.g. tables an always valid Std-Style is necessary
- if( pIo->StyleExists(0) && !pIo->vColl.empty() &&
- pIo->vColl[0].pFmt && pIo->vColl[0].bColl && pIo->vColl[0].bValid )
- pIo->pDfltTxtFmtColl = static_cast<SwTxtFmtColl*>(pIo->vColl[0].pFmt);
+ if( pIo->StyleExists(0) && !pIo->m_vColl.empty() &&
+ pIo->m_vColl[0].pFmt && pIo->m_vColl[0].bColl && pIo->m_vColl[0].bValid )
+ pIo->m_pDfltTxtFmtColl = static_cast<SwTxtFmtColl*>(pIo->m_vColl[0].pFmt);
else
- pIo->pDfltTxtFmtColl = pIo->rDoc.GetDfltTxtFmtColl();
+ pIo->m_pDfltTxtFmtColl = pIo->m_rDoc.GetDfltTxtFmtColl();
// set Hyphenation flag on BASIC para-style
- if (pIo->mbNewDoc && pIo->pStandardFmtColl)
+ if (pIo->m_bNewDoc && pIo->m_pStandardFmtColl)
{
- if (pIo->pWDop->fAutoHyphen
- && SfxItemState::SET != pIo->pStandardFmtColl->GetItemState(
+ if (pIo->m_pWDop->fAutoHyphen
+ && SfxItemState::SET != pIo->m_pStandardFmtColl->GetItemState(
RES_PARATR_HYPHENZONE, false) )
{
SvxHyphenZoneItem aAttr(true, RES_PARATR_HYPHENZONE);
@@ -4479,7 +4479,7 @@ void WW8RStyle::Import()
aAttr.GetMinTrail() = 2;
aAttr.GetMaxHyphens() = 0;
- pIo->pStandardFmtColl->SetFmtAttr( aAttr );
+ pIo->m_pStandardFmtColl->SetFmtAttr( aAttr );
}
/*
@@ -4487,16 +4487,16 @@ void WW8RStyle::Import()
the page/sections rtl setting the standard style lack of rtl still
means ltr
*/
- if (SfxItemState::SET != pIo->pStandardFmtColl->GetItemState(RES_FRAMEDIR,
+ if (SfxItemState::SET != pIo->m_pStandardFmtColl->GetItemState(RES_FRAMEDIR,
false))
{
- pIo->pStandardFmtColl->SetFmtAttr(
+ pIo->m_pStandardFmtColl->SetFmtAttr(
SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR));
}
}
// we do not read styles anymore:
- pIo->pAktColl = 0;
+ pIo->m_pAktColl = 0;
}
rtl_TextEncoding SwWW8StyInf::GetCharSet() const
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 386b049e773f..b269eccb5edb 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -94,9 +94,9 @@ using namespace sw::mark;
//cmc, OCX i.e. word 97 form controls
eF_ResT SwWW8ImplReader::Read_F_OCX( WW8FieldDesc*, OUString& )
{
- if( bObj && nPicLocFc )
- nObjLocFc = nPicLocFc;
- bEmbeddObj = true;
+ if( m_bObj && m_nPicLocFc )
+ m_nObjLocFc = m_nPicLocFc;
+ m_bEmbeddObj = true;
return FLD_TEXT;
}
@@ -127,7 +127,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, OUString& rStr )
aFormula.msDefault = GetFieldResult(pF);
SwInputField aFld(
- static_cast<SwInputFieldType*>(rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_INPUTFLD )),
+ static_cast<SwInputFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_INPUTFLD )),
aFormula.msDefault,
aFormula.msTitle,
INP_TXT,
@@ -135,12 +135,12 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, OUString& rStr )
aFld.SetHelp(aFormula.msHelp);
aFld.SetToolTip(aFormula.msToolTip);
- rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM, SwFmtFld(aFld));
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
return FLD_OK;
}
else
{
- WW8PLCFx_Book* pB = pPlcxMan->GetBook();
+ WW8PLCFx_Book* pB = m_pPlcxMan->GetBook();
OUString aBookmarkName;
if (pB!=NULL) {
WW8_CP currentCP=pF->nSCode;
@@ -162,12 +162,12 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, OUString& rStr )
}
if (!aBookmarkName.isEmpty()) {
- maFieldStack.back().SetBookmarkName(aBookmarkName);
- maFieldStack.back().SetBookmarkType(ODF_FORMTEXT);
- maFieldStack.back().getParameters()["Description"] = uno::makeAny(OUString(aFormula.msToolTip));
- maFieldStack.back().getParameters()["Name"] = uno::makeAny(OUString(aFormula.msTitle));
+ m_aFieldStack.back().SetBookmarkName(aBookmarkName);
+ m_aFieldStack.back().SetBookmarkType(ODF_FORMTEXT);
+ m_aFieldStack.back().getParameters()["Description"] = uno::makeAny(OUString(aFormula.msToolTip));
+ m_aFieldStack.back().getParameters()["Name"] = uno::makeAny(OUString(aFormula.msTitle));
if (aFormula.mnMaxLen)
- maFieldStack.back().getParameters()["MaxLength"] = uno::makeAny(OUString::number(aFormula.mnMaxLen));
+ m_aFieldStack.back().getParameters()["MaxLength"] = uno::makeAny(OUString::number(aFormula.mnMaxLen));
}
return FLD_TEXT;
}
@@ -177,8 +177,8 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, OUString& rStr )
{
WW8FormulaCheckBox aFormula(*this);
- if (!pFormImpl)
- pFormImpl = new SwMSConvertControls(mpDocShell, pPaM);
+ if (!m_pFormImpl)
+ m_pFormImpl = new SwMSConvertControls(m_pDocShell, m_pPaM);
if (rStr[pF->nLCode-1]==0x01)
ImportFormulaControl(aFormula,pF->nSCode+pF->nLCode-1, WW8_CT_CHECKBOX);
@@ -187,12 +187,12 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, OUString& rStr )
if (!bUseEnhFields)
{
- pFormImpl->InsertFormula(aFormula);
+ m_pFormImpl->InsertFormula(aFormula);
return FLD_OK;
}
OUString aBookmarkName;
- WW8PLCFx_Book* pB = pPlcxMan->GetBook();
+ WW8PLCFx_Book* pB = m_pPlcxMan->GetBook();
if (pB!=NULL) {
WW8_CP currentCP=pF->nSCode;
WW8_CP currentLen=pF->nLen;
@@ -214,9 +214,9 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, OUString& rStr )
if (!aBookmarkName.isEmpty())
{
- IDocumentMarkAccess* pMarksAccess = rDoc.getIDocumentMarkAccess( );
+ IDocumentMarkAccess* pMarksAccess = m_rDoc.getIDocumentMarkAccess( );
IFieldmark* pFieldmark = dynamic_cast<IFieldmark*>( pMarksAccess->makeNoTextFieldBookmark(
- *pPaM, aBookmarkName, ODF_FORMCHECKBOX ) );
+ *m_pPaM, aBookmarkName, ODF_FORMCHECKBOX ) );
OSL_ENSURE(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
if (pFieldmark!=NULL) {
IFieldmark::parameter_map_t* const pParameters = pFieldmark->GetParameters();
@@ -244,7 +244,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr)
if (!bUseEnhFields)
{
- SwDropDownField aFld(static_cast<SwDropDownFieldType*>(rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DROPDOWN)));
+ SwDropDownField aFld(static_cast<SwDropDownFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DROPDOWN)));
aFld.SetName(aFormula.msTitle);
aFld.SetHelp(aFormula.msHelp);
@@ -257,14 +257,14 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr)
aFld.SetSelectedItem(aFormula.maListEntries[nIndex]);
}
- rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM, SwFmtFld(aFld));
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
return FLD_OK;
}
else
{
// TODO: review me
OUString aBookmarkName;
- WW8PLCFx_Book* pB = pPlcxMan->GetBook();
+ WW8PLCFx_Book* pB = m_pPlcxMan->GetBook();
if (pB!=NULL)
{
WW8_CP currentCP=pF->nSCode;
@@ -286,9 +286,9 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr)
if (!aBookmarkName.isEmpty())
{
- IDocumentMarkAccess* pMarksAccess = rDoc.getIDocumentMarkAccess( );
+ IDocumentMarkAccess* pMarksAccess = m_rDoc.getIDocumentMarkAccess( );
IFieldmark *pFieldmark = dynamic_cast<IFieldmark*>(
- pMarksAccess->makeNoTextFieldBookmark( *pPaM, aBookmarkName, ODF_FORMDROPDOWN ) );
+ pMarksAccess->makeNoTextFieldBookmark( *m_pPaM, aBookmarkName, ODF_FORMDROPDOWN ) );
OSL_ENSURE(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
if ( pFieldmark != NULL )
{
@@ -307,15 +307,15 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr)
eF_ResT SwWW8ImplReader::Read_F_HTMLControl(WW8FieldDesc*, OUString&)
{
- if( bObj && nPicLocFc )
- nObjLocFc = nPicLocFc;
- bEmbeddObj = true;
+ if( m_bObj && m_nPicLocFc )
+ m_nObjLocFc = m_nPicLocFc;
+ m_bEmbeddObj = true;
return FLD_TEXT;
}
void SwWW8ImplReader::DeleteFormImpl()
{
- delete pFormImpl, pFormImpl = 0;
+ delete m_pFormImpl, m_pFormImpl = 0;
}
// Hilfs-Deklarationen
@@ -1683,8 +1683,8 @@ bool SwWW8ImplReader::SetTxtFmtCollAndListLevel(const SwPaM& rRg,
bool bRes = true;
if( rStyleInfo.pFmt && rStyleInfo.bColl )
{
- bRes = rDoc.SetTxtFmtColl(rRg, static_cast<SwTxtFmtColl*>(rStyleInfo.pFmt));
- SwTxtNode* pTxtNode = pPaM->GetNode().GetTxtNode();
+ bRes = m_rDoc.SetTxtFmtColl(rRg, static_cast<SwTxtFmtColl*>(rStyleInfo.pFmt));
+ SwTxtNode* pTxtNode = m_pPaM->GetNode().GetTxtNode();
OSL_ENSURE( pTxtNode, "No Text-Node at PaM-Position" );
if ( !pTxtNode )
{
@@ -1748,15 +1748,15 @@ void SetStyleIndent(SwWW8StyInf &rStyle, const SwNumFmt &rFmt)
void SwWW8ImplReader::SetStylesList(sal_uInt16 nStyle, sal_uInt16 nActLFO,
sal_uInt8 nActLevel)
{
- if (nStyle >= vColl.size())
+ if (nStyle >= m_vColl.size())
return;
- SwWW8StyInf &rStyleInf = vColl[nStyle];
+ SwWW8StyInf &rStyleInf = m_vColl[nStyle];
if (rStyleInf.bValid)
{
- OSL_ENSURE(pAktColl, "Cannot be called outside of style import");
+ OSL_ENSURE(m_pAktColl, "Cannot be called outside of style import");
// Phase 1: Nummerierungsattribute beim Einlesen einer StyleDef
- if( pAktColl )
+ if( m_pAktColl )
{
// jetzt nur die Parameter vermerken: die tatsaechliche Liste wird
// spaeter drangehaengt, wenn die Listendefinitionen gelesen sind...
@@ -1775,7 +1775,7 @@ void SwWW8ImplReader::SetStylesList(sal_uInt16 nStyle, sal_uInt16 nActLFO,
{
std::vector<sal_uInt8> aParaSprms;
SwNumRule *pNmRule =
- pLstManager->GetNumRuleForActivation(nActLFO,
+ m_pLstManager->GetNumRuleForActivation(nActLFO,
nActLevel, aParaSprms);
if (pNmRule)
UseListIndent(rStyleInf, pNmRule->Get(nActLevel));
@@ -1788,10 +1788,10 @@ void SwWW8ImplReader::SetStylesList(sal_uInt16 nStyle, sal_uInt16 nActLFO,
void SwWW8ImplReader::RegisterNumFmtOnStyle(sal_uInt16 nStyle)
{
- if (nStyle >= vColl.size())
+ if (nStyle >= m_vColl.size())
return;
- SwWW8StyInf &rStyleInf = vColl[nStyle];
+ SwWW8StyInf &rStyleInf = m_vColl[nStyle];
if (rStyleInf.bValid && rStyleInf.pFmt)
{
//Save old pre-list modified indent, which are the word indent values
@@ -1808,7 +1808,7 @@ void SwWW8ImplReader::RegisterNumFmtOnStyle(sal_uInt16 nStyle)
)
{
std::vector<sal_uInt8> aParaSprms;
- pNmRule = pLstManager->GetNumRuleForActivation(nLFO, nLevel,
+ pNmRule = m_pLstManager->GetNumRuleForActivation(nLFO, nLevel,
aParaSprms);
if (pNmRule != NULL)
@@ -1841,22 +1841,22 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
// stellt sie NUR den Level ein, im Vertrauen darauf, dass am STYLE eine
// NumRule haengt - dies wird NICHT ueberprueft !!!
- if (pLstManager) // sind die Listendeklarationen gelesen?
+ if (m_pLstManager) // sind die Listendeklarationen gelesen?
{
- SwTxtNode* pTxtNd = pPaM->GetNode().GetTxtNode();
+ SwTxtNode* pTxtNd = m_pPaM->GetNode().GetTxtNode();
OSL_ENSURE(pTxtNd, "No Text-Node at PaM-Position");
if (!pTxtNd)
return;
std::vector<sal_uInt8> aParaSprms;
const SwNumRule* pRule = bSetAttr ?
- pLstManager->GetNumRuleForActivation( nActLFO, nActLevel,
+ m_pLstManager->GetNumRuleForActivation( nActLFO, nActLevel,
aParaSprms, pTxtNd) : 0;
if (pRule != NULL || !bSetAttr)
{
if (bSetAttr && pTxtNd->GetNumRule() != pRule
- && pTxtNd->GetNumRule() != rDoc.GetOutlineNumRule())
+ && pTxtNd->GetNumRule() != m_rDoc.GetOutlineNumRule())
{
pTxtNd->SetAttr(SwNumRuleItem(pRule->GetName()));
}
@@ -1886,7 +1886,7 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
if (bApplyListLevelIndentDirectlyAtPara)
{
- SfxItemSet aListIndent(rDoc.GetAttrPool(), RES_LR_SPACE,
+ SfxItemSet aListIndent(m_rDoc.GetAttrPool(), RES_LR_SPACE,
RES_LR_SPACE);
const SvxLRSpaceItem *pItem = static_cast<const SvxLRSpaceItem*>(
GetFmtAttr(RES_LR_SPACE));
@@ -1901,7 +1901,7 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
*/
if (short nLen = static_cast< short >(aParaSprms.size()))
{
- SfxItemSet* pOldAktItemSet = pAktItemSet;
+ SfxItemSet* pOldAktItemSet = m_pAktItemSet;
SetAktItemSet(&aListIndent);
sal_uInt8* pSprms1 = &aParaSprms[0];
@@ -1920,8 +1920,8 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
OSL_ENSURE(pLR, "Impossible");
if (pLR)
{
- pCtrlStck->NewAttr(*pPaM->GetPoint(), *pLR);
- pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_LR_SPACE);
+ m_pCtrlStck->NewAttr(*m_pPaM->GetPoint(), *pLR);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_LR_SPACE);
}
}
}
@@ -1931,8 +1931,8 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
void SwWW8ImplReader::RegisterNumFmt(sal_uInt16 nActLFO, sal_uInt8 nActLevel)
{
// sind wir erst beim Einlesen der StyleDef ?
- if (pAktColl)
- SetStylesList( nAktColl , nActLFO, nActLevel);
+ if (m_pAktColl)
+ SetStylesList( m_nAktColl , nActLFO, nActLevel);
else
RegisterNumFmtOnTxtNode(nActLFO, nActLevel);
}
@@ -1940,15 +1940,15 @@ void SwWW8ImplReader::RegisterNumFmt(sal_uInt16 nActLFO, sal_uInt8 nActLevel)
void SwWW8ImplReader::Read_ListLevel(sal_uInt16, const sal_uInt8* pData,
short nLen)
{
- if (pPlcxMan && pPlcxMan->GetDoingDrawTextBox())
+ if (m_pPlcxMan && m_pPlcxMan->GetDoingDrawTextBox())
return;
if( nLen < 0 )
{
// the actual level is finished, what should we do ?
- nListLevel = WW8ListManager::nMaxLevel;
- if (pStyles && !bVer67)
- pStyles->nWwNumLevel = 0;
+ m_nListLevel = WW8ListManager::nMaxLevel;
+ if (m_pStyles && !m_bVer67)
+ m_pStyles->nWwNumLevel = 0;
}
else
{
@@ -1957,9 +1957,9 @@ void SwWW8ImplReader::Read_ListLevel(sal_uInt16, const sal_uInt8* pData,
return;
// die Streamdaten sind hier Null basiert, so wie wir es brauchen
- nListLevel = *pData;
+ m_nListLevel = *pData;
- if (pStyles && !bVer67)
+ if (m_pStyles && !m_bVer67)
{
/*
if this is the case, then if the numbering is actually stored in
@@ -1967,20 +1967,20 @@ void SwWW8ImplReader::Read_ListLevel(sal_uInt16, const sal_uInt8* pData,
to set the ww6 list level information which we will need when we
reach the true ww6 list def. So set it now
*/
- pStyles->nWwNumLevel = nListLevel;
+ m_pStyles->nWwNumLevel = m_nListLevel;
}
- if (WW8ListManager::nMaxLevel <= nListLevel )
- nListLevel = WW8ListManager::nMaxLevel;
+ if (WW8ListManager::nMaxLevel <= m_nListLevel )
+ m_nListLevel = WW8ListManager::nMaxLevel;
else if
(
- (USHRT_MAX > nLFOPosition) &&
- (WW8ListManager::nMaxLevel > nListLevel)
+ (USHRT_MAX > m_nLFOPosition) &&
+ (WW8ListManager::nMaxLevel > m_nListLevel)
)
{
- RegisterNumFmt(nLFOPosition, nListLevel);
- nLFOPosition = USHRT_MAX;
- nListLevel = WW8ListManager::nMaxLevel;
+ RegisterNumFmt(m_nLFOPosition, m_nListLevel);
+ m_nLFOPosition = USHRT_MAX;
+ m_nListLevel = WW8ListManager::nMaxLevel;
}
}
}
@@ -1988,14 +1988,14 @@ void SwWW8ImplReader::Read_ListLevel(sal_uInt16, const sal_uInt8* pData,
void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
short nLen)
{
- if (pPlcxMan && pPlcxMan->GetDoingDrawTextBox())
+ if (m_pPlcxMan && m_pPlcxMan->GetDoingDrawTextBox())
return;
if( nLen < 0 )
{
// the actual level is finished, what should we do ?
- nLFOPosition = USHRT_MAX;
- nListLevel = WW8ListManager::nMaxLevel;
+ m_nLFOPosition = USHRT_MAX;
+ m_nListLevel = WW8ListManager::nMaxLevel;
}
else
{
@@ -2018,17 +2018,17 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
ww8par6.cxx#SwWW8ImplReader::Read_LR
*/
- if (pAktColl)
+ if (m_pAktColl)
{
// here a "named" style is being configured
// disable the numbering/list in the style currently configured
- pAktColl->SetFmtAttr(*GetDfltAttr(RES_PARATR_NUMRULE));
+ m_pAktColl->SetFmtAttr(*GetDfltAttr(RES_PARATR_NUMRULE));
// reset/blank the indent
- pAktColl->SetFmtAttr(SvxLRSpaceItem(RES_LR_SPACE));
+ m_pAktColl->SetFmtAttr(SvxLRSpaceItem(RES_LR_SPACE));
}
- else if (SwTxtNode* pTxtNode = pPaM->GetNode().GetTxtNode())
+ else if (SwTxtNode* pTxtNode = m_pPaM->GetNode().GetTxtNode())
{
// here a paragraph is being directly formatted
@@ -2052,11 +2052,11 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
pTxtNode->SetAttr( aLR );
}
- nLFOPosition = USHRT_MAX;
+ m_nLFOPosition = USHRT_MAX;
}
else
{
- nLFOPosition = (sal_uInt16)nData-1;
+ m_nLFOPosition = (sal_uInt16)nData-1;
/*
If we are a ww8+ style with ww7- style lists then there is a
bizarre broken word bug where when the list is removed from a para
@@ -2064,30 +2064,30 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
indentation. Setting this flag will allow us to recover from this
braindeadness
*/
- if (pAktColl && (nLFOPosition == 2047-1) && nAktColl < vColl.size())
- vColl[nAktColl].bHasBrokenWW6List = true;
+ if (m_pAktColl && (m_nLFOPosition == 2047-1) && m_nAktColl < m_vColl.size())
+ m_vColl[m_nAktColl].bHasBrokenWW6List = true;
// die Streamdaten sind hier 1 basiert, wir ziehen EINS ab
- if (USHRT_MAX > nLFOPosition)
+ if (USHRT_MAX > m_nLFOPosition)
{
- if (nLFOPosition != 2047-1) //Normal ww8+ list behaviour
+ if (m_nLFOPosition != 2047-1) //Normal ww8+ list behaviour
{
- if (WW8ListManager::nMaxLevel == nListLevel)
- nListLevel = 0;
- if (WW8ListManager::nMaxLevel > nListLevel)
+ if (WW8ListManager::nMaxLevel == m_nListLevel)
+ m_nListLevel = 0;
+ if (WW8ListManager::nMaxLevel > m_nListLevel)
{
- RegisterNumFmt(nLFOPosition, nListLevel);
- nLFOPosition = USHRT_MAX;
- nListLevel = WW8ListManager::nMaxLevel;
+ RegisterNumFmt(m_nLFOPosition, m_nListLevel);
+ m_nLFOPosition = USHRT_MAX;
+ m_nListLevel = WW8ListManager::nMaxLevel;
}
}
- else if (pPlcxMan && pPlcxMan->HasParaSprm(0xC63E))
+ else if (m_pPlcxMan && m_pPlcxMan->HasParaSprm(0xC63E))
{
/*
#i8114# Horrific backwards compatible ww7- lists in ww8+
docs
*/
- Read_ANLevelNo(13 /*equiv ww7- sprm no*/, &nListLevel, 1);
+ Read_ANLevelNo(13 /*equiv ww7- sprm no*/, &m_nListLevel, 1);
}
}
}
@@ -2110,34 +2110,34 @@ bool SwWW8ImplReader::ImportFormulaControl(WW8FormulaControl &aFormula,
WW8ReaderSave aSave(this,nStart);
WW8PLCFManResult aRes;
- nStart = pPlcxMan->Where();
+ nStart = m_pPlcxMan->Where();
while(nStart <= nEndCp)
{
- if ( pPlcxMan->Get(&aRes)
+ if ( m_pPlcxMan->Get(&aRes)
&& aRes.pMemPos && aRes.nSprmId )
{
//only interested in sprms which would set nPicLocFc
if ( (68 == aRes.nSprmId) || (0x6A03 == aRes.nSprmId) )
{
Read_PicLoc( aRes.nSprmId, aRes.pMemPos +
- mpSprmParser->DistanceToData(aRes.nSprmId), 4);
+ m_pSprmParser->DistanceToData(aRes.nSprmId), 4);
break;
}
}
- pPlcxMan->advance();
- nStart = pPlcxMan->Where();
+ m_pPlcxMan->advance();
+ nStart = m_pPlcxMan->Where();
}
- sal_uLong nOffset = nPicLocFc;
+ sal_uLong nOffset = m_nPicLocFc;
aSave.Restore(this);
- sal_uLong nOldPos = pDataStream->Tell();
+ sal_uLong nOldPos = m_pDataStream->Tell();
WW8_PIC aPic;
- pDataStream->Seek( nOffset);
- PicRead( pDataStream, &aPic, bVer67);
+ m_pDataStream->Seek( nOffset);
+ PicRead( m_pDataStream, &aPic, m_bVer67);
- if((aPic.lcb > 0x3A) && !pDataStream->GetError() )
+ if((aPic.lcb > 0x3A) && !m_pDataStream->GetError() )
{
- aFormula.FormulaRead(nWhich,pDataStream);
+ aFormula.FormulaRead(nWhich,m_pDataStream);
bRet = true;
}
@@ -2146,7 +2146,7 @@ bool SwWW8ImplReader::ImportFormulaControl(WW8FormulaControl &aFormula,
is too big for the WW95 files, it needs to be modified to check the
version C.
*/
- pDataStream->Seek( nOldPos );
+ m_pDataStream->Seek( nOldPos );
return bRet;
}
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 72f04ed2521d..52173692c22a 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -200,7 +200,7 @@ static bool SwWw6ReadMacPICTStream(Graphic& rGraph, SvStorageRef& rSrc1)
SwFlyFrmFmt* SwWW8ImplReader::InsertOle(SdrOle2Obj &rObject,
const SfxItemSet &rFlySet, const SfxItemSet &rGrfSet)
{
- SfxObjectShell *pPersist = rDoc.GetPersist();
+ SfxObjectShell *pPersist = m_rDoc.GetPersist();
OSL_ENSURE(pPersist, "No persist, cannot insert objects correctly");
if (!pPersist)
return 0;
@@ -238,7 +238,7 @@ SwFlyFrmFmt* SwWW8ImplReader::InsertOle(SdrOle2Obj &rObject,
if (bSuccess)
{
const SfxItemSet *pFlySet = pMathFlySet ? pMathFlySet : &rFlySet;
- pRet = rDoc.getIDocumentContentOperations().InsertOLE(*pPaM, sNewName, rObject.GetAspect(), pFlySet, &rGrfSet, 0);
+ pRet = m_rDoc.getIDocumentContentOperations().InsertOLE(*m_pPaM, sNewName, rObject.GetAspect(), pFlySet, &rGrfSet, 0);
}
delete pMathFlySet;
return pRet;
@@ -247,7 +247,7 @@ SwFlyFrmFmt* SwWW8ImplReader::InsertOle(SdrOle2Obj &rObject,
SwFrmFmt* SwWW8ImplReader::ImportOle(const Graphic* pGrf,
const SfxItemSet* pFlySet, const SfxItemSet *pGrfSet, const Rectangle& aVisArea )
{
- ::SetProgressState(nProgress, mpDocShell); // Update
+ ::SetProgressState(m_nProgress, m_pDocShell); // Update
SwFrmFmt* pFmt = 0;
GrafikCtor();
@@ -259,17 +259,17 @@ SwFrmFmt* SwWW8ImplReader::ImportOle(const Graphic* pGrf,
SfxItemSet* pTempSet = 0;
if( !pFlySet )
{
- pTempSet = new SfxItemSet( rDoc.GetAttrPool(), RES_FRMATR_BEGIN,
+ pTempSet = new SfxItemSet( m_rDoc.GetAttrPool(), RES_FRMATR_BEGIN,
RES_FRMATR_END-1);
pFlySet = pTempSet;
// Abstand/Umrandung raus
- if (!mbNewDoc)
+ if (!m_bNewDoc)
Reader::ResetFrmFmtAttrs( *pTempSet );
SwFmtAnchor aAnchor( FLY_AS_CHAR );
- aAnchor.SetAnchor( pPaM->GetPoint() );
+ aAnchor.SetAnchor( m_pPaM->GetPoint() );
pTempSet->Put( aAnchor );
const Size aSizeTwip = OutputDevice::LogicToLogic(
@@ -279,11 +279,11 @@ SwFrmFmt* SwWW8ImplReader::ImportOle(const Graphic* pGrf,
aSizeTwip.Height() ) );
pTempSet->Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
- if( pSFlyPara )
+ if( m_pSFlyPara )
{
// OLE im Rahmen ? ok, Rahmen auf Bildgroesse vergroessern (
// nur wenn Auto-Breite )
- pSFlyPara->BoxUpWidth( aSizeTwip.Width() );
+ m_pSFlyPara->BoxUpWidth( aSizeTwip.Width() );
}
}
@@ -295,14 +295,14 @@ SwFrmFmt* SwWW8ImplReader::ImportOle(const Graphic* pGrf,
SdrObject::Free( pRet ); // das brauchen wir nicht mehr
}
else
- pFmt = rDoc.getIDocumentContentOperations().InsertDrawObj(*pPaM, *pRet, *pFlySet );
+ pFmt = m_rDoc.getIDocumentContentOperations().InsertDrawObj(*m_pPaM, *pRet, *pFlySet );
}
else if (
GRAPHIC_GDIMETAFILE == aGraph.GetType() ||
GRAPHIC_BITMAP == aGraph.GetType()
)
{
- pFmt = rDoc.getIDocumentContentOperations().Insert(*pPaM, OUString(), OUString(), &aGraph, pFlySet,
+ pFmt = m_rDoc.getIDocumentContentOperations().Insert(*m_pPaM, OUString(), OUString(), &aGraph, pFlySet,
pGrfSet, NULL);
}
delete pTempSet;
@@ -338,18 +338,18 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
const Graphic* pGrf, const SfxItemSet* pFlySet, const Rectangle& aVisArea )
{
SdrObject* pRet = 0;
- OSL_ENSURE( pStg, "ohne storage geht hier fast gar nichts!" );
+ OSL_ENSURE( m_pStg, "ohne storage geht hier fast gar nichts!" );
- ::SetProgressState( nProgress, rDoc.GetDocShell() ); // Update
+ ::SetProgressState( m_nProgress, m_rDoc.GetDocShell() ); // Update
long nX=0, nY=0; // nX, nY is graphic size
bool bOleOk = true;
OUString aSrcStgName('_');
// ergibt Name "_4711"
- aSrcStgName += OUString::number( nObjLocFc );
+ aSrcStgName += OUString::number( m_nObjLocFc );
- SvStorageRef xSrc0 = pStg->OpenSotStorage(OUString(SL::aObjectPool));
+ SvStorageRef xSrc0 = m_pStg->OpenSotStorage(OUString(SL::aObjectPool));
SvStorageRef xSrc1 = xSrc0->OpenSotStorage( aSrcStgName,
STREAM_READWRITE| StreamMode::SHARE_DENYALL );
@@ -390,12 +390,12 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
}
}
- if (!(bIsHeader || bIsFooter))
+ if (!(m_bIsHeader || m_bIsFooter))
{
//Can't put them in headers/footers :-(
uno::Reference< drawing::XShape > xRef;
- OSL_ENSURE(pFormImpl, "Impossible");
- if (pFormImpl && pFormImpl->ReadOCXStream(xSrc1, &xRef, false))
+ OSL_ENSURE(m_pFormImpl, "Impossible");
+ if (m_pFormImpl && m_pFormImpl->ReadOCXStream(xSrc1, &xRef, false))
{
pRet = GetSdrObjectFromXShape(xRef);
OSL_ENSURE(pRet, "Impossible");
@@ -408,17 +408,17 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
if (GRAPHIC_GDIMETAFILE == rGraph.GetType() ||
GRAPHIC_BITMAP == rGraph.GetType())
{
- ::SetProgressState(nProgress, mpDocShell); // Update
+ ::SetProgressState(m_nProgress, m_pDocShell); // Update
if (bOleOk)
{
- sal_uLong nOldPos = pDataStream->Tell();
- pDataStream->Seek(STREAM_SEEK_TO_END);
+ sal_uLong nOldPos = m_pDataStream->Tell();
+ m_pDataStream->Seek(STREAM_SEEK_TO_END);
SvStream *pTmpData = 0;
- if (nObjLocFc < pDataStream->Tell())
+ if (m_nObjLocFc < m_pDataStream->Tell())
{
- pTmpData = pDataStream;
- pTmpData->Seek( nObjLocFc );
+ pTmpData = m_pDataStream;
+ pTmpData->Seek( m_nObjLocFc );
}
sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
@@ -437,9 +437,9 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
ErrCode nError = ERRCODE_NONE;
pRet = SvxMSDffManager::CreateSdrOLEFromStorage(
- aSrcStgName, xSrc0, mpDocShell->GetStorage(), rGraph, aRect, aVisArea, pTmpData, nError,
+ aSrcStgName, xSrc0, m_pDocShell->GetStorage(), rGraph, aRect, aVisArea, pTmpData, nError,
SwMSDffManager::GetFilterFlags(), nAspect );
- pDataStream->Seek( nOldPos );
+ m_pDataStream->Seek( nOldPos );
}
}
return pRet;
@@ -449,8 +449,8 @@ void SwWW8ImplReader::ReadRevMarkAuthorStrTabl( SvStream& rStrm,
sal_Int32 nTblPos, sal_Int32 nTblSiz, SwDoc& rDocOut )
{
::std::vector<OUString> aAuthorNames;
- WW8ReadSTTBF( !bVer67, rStrm, nTblPos, nTblSiz, bVer67 ? 2 : 0,
- eStructCharSet, aAuthorNames );
+ WW8ReadSTTBF( !m_bVer67, rStrm, nTblPos, nTblSiz, m_bVer67 ? 2 : 0,
+ m_eStructCharSet, aAuthorNames );
sal_uInt16 nCount = static_cast< sal_uInt16 >(aAuthorNames.size());
for( sal_uInt16 nAuthor = 0; nAuthor < nCount; ++nAuthor )
@@ -471,7 +471,7 @@ void SwWW8ImplReader::Read_CRevisionMark(RedlineType_t eType,
{
// there *must* be a SprmCIbstRMark[Del] and a SprmCDttmRMark[Del]
// pointing to the very same char position as our SprmCFRMark[Del]
- if (!pPlcxMan)
+ if (!m_pPlcxMan)
return;
const sal_uInt8* pSprmCIbstRMark;
const sal_uInt8* pSprmCDttmRMark;
@@ -489,26 +489,26 @@ void SwWW8ImplReader::Read_CRevisionMark(RedlineType_t eType,
*/
std::vector<const sal_uInt8 *> aResult;
bool bIns = (nsRedlineType_t::REDLINE_INSERT == eType);
- if( bVer67 )
+ if( m_bVer67 )
{
- pPlcxMan->HasCharSprm(69, aResult);
+ m_pPlcxMan->HasCharSprm(69, aResult);
pSprmCIbstRMark = aResult.empty() ? 0 : aResult.back();
aResult.clear();
- pPlcxMan->HasCharSprm(70, aResult);
+ m_pPlcxMan->HasCharSprm(70, aResult);
pSprmCDttmRMark = aResult.empty() ? 0 : aResult.back();
}
else
{
- pPlcxMan->HasCharSprm( bIns ? 0x4804 : 0x4863, aResult);
+ m_pPlcxMan->HasCharSprm( bIns ? 0x4804 : 0x4863, aResult);
pSprmCIbstRMark = aResult.empty() ? 0 : aResult.back();
aResult.clear();
- pPlcxMan->HasCharSprm( bIns ? 0x6805 : NS_sprm::LN_CDttmRMarkDel, aResult);
+ m_pPlcxMan->HasCharSprm( bIns ? 0x6805 : NS_sprm::LN_CDttmRMarkDel, aResult);
pSprmCDttmRMark = aResult.empty() ? 0 : aResult.back();
}
}
if (nLen < 0)
- mpRedlineStack->close(*pPaM->GetPoint(), eType, pTableDesc );
+ m_pRedlineStack->close(*m_pPaM->GetPoint(), eType, m_pTableDesc );
else
{
// start of new revision mark, if not there default to first entry
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index bc69c7927e55..70f39f67d7b0 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -119,7 +119,7 @@ namespace
long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
{
// should also work via pRes.nCo2OrIdx
- WW8PLCFx_Book* pB = pPlcxMan->GetBook();
+ WW8PLCFx_Book* pB = m_pPlcxMan->GetBook();
if( !pB )
{
OSL_ENSURE( pB, "WW8PLCFx_Book - Pointer does not exist" );
@@ -132,7 +132,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
if (pB->GetIsEnd())
{
- pReffedStck->SetAttr(*pPaM->GetPoint(), RES_FLTR_BOOKMARK, true,
+ m_pReffedStck->SetAttr(*m_pPaM->GetPoint(), RES_FLTR_BOOKMARK, true,
pB->GetHandle(), (eB & BOOK_FIELD)!=0);
return 0;
}
@@ -150,17 +150,17 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
// do NOT call ToUpper as the bookmark name can also be a hyperlink target!
OUString aVal;
- if( SwFltGetFlag( nFieldFlags, SwFltControlStack::BOOK_TO_VAR_REF ) )
+ if( SwFltGetFlag( m_nFieldFlags, SwFltControlStack::BOOK_TO_VAR_REF ) )
{
// set variable for translation bookmark
long nLen = pB->GetLen();
if( nLen > MAX_FIELDLEN )
nLen = MAX_FIELDLEN;
- long nOldPos = pStrm->Tell();
- nLen = pSBase->WW8ReadString( *pStrm, aVal, pB->GetStartPos(), nLen,
- eStructCharSet );
- pStrm->Seek( nOldPos );
+ long nOldPos = m_pStrm->Tell();
+ nLen = m_pSBase->WW8ReadString( *m_pStrm, aVal, pB->GetStartPos(), nLen,
+ m_eStructCharSet );
+ m_pStrm->Seek( nOldPos );
// now here the implementation of the old "QuoteString" and
// I hope with a better performance as before. It's also only
@@ -169,7 +169,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
OUString sHex("\\x");
bool bSetAsHex;
- bool bAllowCr = SwFltGetFlag(nFieldFlags,
+ bool bAllowCr = SwFltGetFlag(m_nFieldFlags,
SwFltControlStack::ALLOW_FLD_CR);
for( sal_Int32 nI = 0;
@@ -217,27 +217,27 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
//e.g. inserting bookmark around field result, so we need to put
//it around the entire writer field, as we don't have the separation
//of field and field result of word, see #i16941#
- SwPosition aStart(*pPaM->GetPoint());
- if (!maFieldStack.empty())
+ SwPosition aStart(*m_pPaM->GetPoint());
+ if (!m_aFieldStack.empty())
{
- const WW8FieldEntry &rTest = maFieldStack.back();
+ const WW8FieldEntry &rTest = m_aFieldStack.back();
aStart = rTest.maStartPos;
}
const OUString sOrigName = BookmarkToWriter(*pName);
- pReffedStck->NewAttr( aStart,
+ m_pReffedStck->NewAttr( aStart,
SwFltBookmark( EnsureTOCBookmarkName( sOrigName ), aVal, pB->GetHandle(), IsTOCBookmarkName( sOrigName ) ));
return 0;
}
long SwWW8ImplReader::Read_AtnBook(WW8PLCFManResult*)
{
- if (WW8PLCFx_AtnBook* pAtnBook = pPlcxMan->GetAtnBook())
+ if (WW8PLCFx_AtnBook* pAtnBook = m_pPlcxMan->GetAtnBook())
{
if (pAtnBook->getIsEnd())
- pReffedStck->SetAttr(*pPaM->GetPoint(), RES_FLTR_ANNOTATIONMARK, true, pAtnBook->getHandle());
+ m_pReffedStck->SetAttr(*m_pPaM->GetPoint(), RES_FLTR_ANNOTATIONMARK, true, pAtnBook->getHandle());
else
- pReffedStck->NewAttr(*pPaM->GetPoint(), CntUInt16Item(RES_FLTR_ANNOTATIONMARK, pAtnBook->getHandle()));
+ m_pReffedStck->NewAttr(*m_pPaM->GetPoint(), CntUInt16Item(RES_FLTR_ANNOTATIONMARK, pAtnBook->getHandle()));
}
return 0;
}
@@ -259,7 +259,7 @@ OUString SwWW8ImplReader::ConvertFFileName(const OUString& rOrg)
// Need the more sophisticated url converter.
if (!aName.isEmpty())
aName = URIHelper::SmartRel2Abs(
- INetURLObject(sBaseURL), aName, Link<OUString *, bool>(), false);
+ INetURLObject(m_sBaseURL), aName, Link<OUString *, bool>(), false);
return aName;
}
@@ -413,9 +413,9 @@ short SwWW8ImplReader::GetTimeDatePara(OUString& rStr, sal_uInt32& rFormat,
sal_uInt16 &rLang, int nWhichDefault, bool bHijri)
{
bool bRTL = false;
- if (pPlcxMan && !bVer67)
+ if (m_pPlcxMan && !m_bVer67)
{
- const sal_uInt8 *pResult = pPlcxMan->HasCharSprm(0x85A);
+ const sal_uInt8 *pResult = m_pPlcxMan->HasCharSprm(0x85A);
if (pResult && *pResult)
bRTL = true;
}
@@ -424,7 +424,7 @@ short SwWW8ImplReader::GetTimeDatePara(OUString& rStr, sal_uInt32& rFormat,
OSL_ENSURE(pLang, "impossible");
rLang = pLang ? pLang->GetValue() : LANGUAGE_ENGLISH_US;
- SvNumberFormatter* pFormatter = rDoc.GetNumberFormatter();
+ SvNumberFormatter* pFormatter = m_rDoc.GetNumberFormatter();
OUString sParams( FindPara( rStr, '@', '@' ) );// Date/Time
if (sParams.isEmpty())
{
@@ -478,14 +478,14 @@ short SwWW8ImplReader::GetTimeDatePara(OUString& rStr, sal_uInt32& rFormat,
// Am Ende des Einlesens entsprechende Felder updaten ( z.Zt. die Referenzen )
void SwWW8ImplReader::UpdateFields()
{
- rDoc.getIDocumentState().SetUpdateExpFldStat(true); // JP: neu fuer alles wichtige
- rDoc.SetInitDBFields(true); // Datenbank-Felder auch
+ m_rDoc.getIDocumentState().SetUpdateExpFldStat(true); // JP: neu fuer alles wichtige
+ m_rDoc.SetInitDBFields(true); // Datenbank-Felder auch
}
sal_uInt16 SwWW8ImplReader::End_Field()
{
sal_uInt16 nRet = 0;
- WW8PLCFx_FLD* pF = pPlcxMan->GetFld();
+ WW8PLCFx_FLD* pF = m_pPlcxMan->GetFld();
OSL_ENSURE(pF, "WW8PLCFx_FLD - Pointer nicht da");
WW8_CP nCP = 0;
if (!pF || !pF->EndPosIsFieldEnd(nCP))
@@ -494,27 +494,27 @@ sal_uInt16 SwWW8ImplReader::End_Field()
const SvtFilterOptions &rOpt = SvtFilterOptions::Get();
bool bUseEnhFields = rOpt.IsUseEnhancedFields();
- OSL_ENSURE(!maFieldStack.empty(), "Empty field stack\n");
- if (!maFieldStack.empty())
+ OSL_ENSURE(!m_aFieldStack.empty(), "Empty field stack\n");
+ if (!m_aFieldStack.empty())
{
/*
only hyperlinks currently need to be handled like this, for the other
cases we have inserted a field not an attribute with an unknown end
point
*/
- nRet = maFieldStack.back().mnFieldId;
+ nRet = m_aFieldStack.back().mnFieldId;
switch (nRet)
{
case 70:
- if (bUseEnhFields && pPaM!=NULL && pPaM->GetPoint()!=NULL) {
- SwPosition aEndPos = *pPaM->GetPoint();
- SwPaM aFldPam( maFieldStack.back().GetPtNode(), maFieldStack.back().GetPtCntnt(), aEndPos.nNode, aEndPos.nContent.GetIndex());
- IDocumentMarkAccess* pMarksAccess = rDoc.getIDocumentMarkAccess( );
+ if (bUseEnhFields && m_pPaM!=NULL && m_pPaM->GetPoint()!=NULL) {
+ SwPosition aEndPos = *m_pPaM->GetPoint();
+ SwPaM aFldPam( m_aFieldStack.back().GetPtNode(), m_aFieldStack.back().GetPtCntnt(), aEndPos.nNode, aEndPos.nContent.GetIndex());
+ IDocumentMarkAccess* pMarksAccess = m_rDoc.getIDocumentMarkAccess( );
IFieldmark *pFieldmark = dynamic_cast<IFieldmark*>( pMarksAccess->makeFieldBookmark(
- aFldPam, maFieldStack.back().GetBookmarkName(), ODF_FORMTEXT ) );
+ aFldPam, m_aFieldStack.back().GetBookmarkName(), ODF_FORMTEXT ) );
OSL_ENSURE(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
if (pFieldmark!=NULL) {
- const IFieldmark::parameter_map_t& pParametersToAdd = maFieldStack.back().getParameters();
+ const IFieldmark::parameter_map_t& pParametersToAdd = m_aFieldStack.back().getParameters();
pFieldmark->GetParameters()->insert(pParametersToAdd.begin(), pParametersToAdd.end());
}
}
@@ -522,74 +522,74 @@ sal_uInt16 SwWW8ImplReader::End_Field()
// Doing corresponding status management for TOX field, index field, hyperlink field and page reference field
case 13://TOX
case 8://index
- if (mbLoadingTOXCache)
+ if (m_bLoadingTOXCache)
{
- if (mnEmbeddedTOXLevel > 0)
+ if (m_nEmbeddedTOXLevel > 0)
{
- JoinNode(*pPaM);
- --mnEmbeddedTOXLevel;
+ JoinNode(*m_pPaM);
+ --m_nEmbeddedTOXLevel;
}
else
{
- maTOXEndCps.insert(nCP);
- mbLoadingTOXCache = false;
- if ( pPaM->End() &&
- pPaM->End()->nNode.GetNode().GetTxtNode() &&
- pPaM->End()->nNode.GetNode().GetTxtNode()->Len() == 0 )
+ m_aTOXEndCps.insert(nCP);
+ m_bLoadingTOXCache = false;
+ if ( m_pPaM->End() &&
+ m_pPaM->End()->nNode.GetNode().GetTxtNode() &&
+ m_pPaM->End()->nNode.GetNode().GetTxtNode()->Len() == 0 )
{
- JoinNode(*pPaM);
+ JoinNode(*m_pPaM);
}
else
{
- mbCareLastParaEndInToc = true;
+ m_bCareLastParaEndInToc = true;
}
- if (mpPosAfterTOC)
+ if (m_pPosAfterTOC)
{
- *pPaM = *mpPosAfterTOC;
- delete mpPosAfterTOC;
- mpPosAfterTOC = 0;
+ *m_pPaM = *m_pPosAfterTOC;
+ delete m_pPosAfterTOC;
+ m_pPosAfterTOC = 0;
}
}
}
break;
case 37: //REF
- if (mbLoadingTOXCache && !mbLoadingTOXHyperlink)
+ if (m_bLoadingTOXCache && !m_bLoadingTOXHyperlink)
{
- pCtrlStck->SetAttr(*pPaM->GetPoint(),RES_TXTATR_INETFMT);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(),RES_TXTATR_INETFMT);
}
break;
case 88:
- if (mbLoadingTOXHyperlink)
- mbLoadingTOXHyperlink = false;
- pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_TXTATR_INETFMT);
+ if (m_bLoadingTOXHyperlink)
+ m_bLoadingTOXHyperlink = false;
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_TXTATR_INETFMT);
break;
case 36:
case 68:
//Move outside the section associated with this type of field
- *pPaM->GetPoint() = maFieldStack.back().maStartPos;
+ *m_pPaM->GetPoint() = m_aFieldStack.back().maStartPos;
break;
default:
- OUString aCode = maFieldStack.back().GetBookmarkCode();
+ OUString aCode = m_aFieldStack.back().GetBookmarkCode();
if ( !aCode.isEmpty() )
{
// Unhandled field with stored code
- SwPosition aEndPos = *pPaM->GetPoint();
+ SwPosition aEndPos = *m_pPaM->GetPoint();
SwPaM aFldPam(
- maFieldStack.back().GetPtNode(), maFieldStack.back().GetPtCntnt(),
+ m_aFieldStack.back().GetPtNode(), m_aFieldStack.back().GetPtCntnt(),
aEndPos.nNode, aEndPos.nContent.GetIndex());
- IDocumentMarkAccess* pMarksAccess = rDoc.getIDocumentMarkAccess( );
+ IDocumentMarkAccess* pMarksAccess = m_rDoc.getIDocumentMarkAccess( );
IFieldmark* pFieldmark = pMarksAccess->makeFieldBookmark(
aFldPam,
- maFieldStack.back().GetBookmarkName(),
+ m_aFieldStack.back().GetBookmarkName(),
ODF_UNHANDLED );
if ( pFieldmark )
{
- const IFieldmark::parameter_map_t& pParametersToAdd = maFieldStack.back().getParameters();
+ const IFieldmark::parameter_map_t& pParametersToAdd = m_aFieldStack.back().getParameters();
pFieldmark->GetParameters()->insert(pParametersToAdd.begin(), pParametersToAdd.end());
- OUString sFieldId = OUString::number( maFieldStack.back().mnFieldId );
+ OUString sFieldId = OUString::number( m_aFieldStack.back().mnFieldId );
pFieldmark->GetParameters()->insert(
std::pair< OUString, uno::Any > (
ODF_ID_PARAM,
@@ -599,13 +599,13 @@ sal_uInt16 SwWW8ImplReader::End_Field()
ODF_CODE_PARAM,
uno::makeAny( aCode ) ) );
- if ( maFieldStack.back().mnObjLocFc > 0 )
+ if ( m_aFieldStack.back().mnObjLocFc > 0 )
{
// Store the OLE object as an internal link
OUString sOleId('_');
- sOleId += OUString::number( maFieldStack.back().mnObjLocFc );
+ sOleId += OUString::number( m_aFieldStack.back().mnObjLocFc );
- SvStorageRef xSrc0 = pStg->OpenSotStorage(OUString(SL::aObjectPool));
+ SvStorageRef xSrc0 = m_pStg->OpenSotStorage(OUString(SL::aObjectPool));
SvStorageRef xSrc1 = xSrc0->OpenSotStorage( sOleId, StreamMode::READ );
// Store it now!
@@ -639,7 +639,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
break;
}
- maFieldStack.pop_back();
+ m_aFieldStack.pop_back();
}
return nRet;
}
@@ -816,17 +816,17 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
OSL_ENSURE( ( sizeof( aWW8FieldTab ) / sizeof( *aWW8FieldTab ) == eMax+1 ),
"FeldFunc-Tabelle stimmt nicht" );
- WW8PLCFx_FLD* pF = pPlcxMan->GetFld();
+ WW8PLCFx_FLD* pF = m_pPlcxMan->GetFld();
OSL_ENSURE(pF, "WW8PLCFx_FLD - Pointer nicht da");
if (!pF || !pF->StartPosIsFieldStart())
return 0;
bool bNested = false;
- if (!maFieldStack.empty())
+ if (!m_aFieldStack.empty())
{
- mycFieldIter aEnd = maFieldStack.end();
- for(mycFieldIter aIter = maFieldStack.begin(); aIter != aEnd; ++aIter)
+ mycFieldIter aEnd = m_aFieldStack.end();
+ for(mycFieldIter aIter = m_aFieldStack.begin(); aIter != aEnd; ++aIter)
{
bNested = !AcceptableNestedField(aIter->mnFieldId);
if (bNested)
@@ -842,7 +842,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
bool bCodeNest = aF.bCodeNest;
if ( aF.nId == 6 ) bCodeNest = false; // We can handle them and lose the inner data
- maFieldStack.push_back(WW8FieldEntry(*pPaM->GetPoint(), aF.nId));
+ m_aFieldStack.push_back(WW8FieldEntry(*m_pPaM->GetPoint(), aF.nId));
if (bNested)
return 0;
@@ -851,13 +851,13 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
sal_uInt16 nI = n / 32; // # des sal_uInt32
sal_uInt32 nMask = 1 << ( n % 32 ); // Maske fuer Bits
- if ((sizeof(nFieldTagAlways)/sizeof(nFieldTagAlways[0])) <= nI)
+ if ((sizeof(m_nFieldTagAlways)/sizeof(m_nFieldTagAlways[0])) <= nI)
{ // if indexes larger than 95 are needed, then a new configuration
// item has to be added, and nFieldTagAlways/nFieldTagBad expanded!
return aF.nLen;
}
- if( nFieldTagAlways[nI] & nMask ) // Flag: Tag it
+ if( m_nFieldTagAlways[nI] & nMask ) // Flag: Tag it
return Read_F_Tag( &aF ); // Resultat nicht als Text
if( !bOk || !aF.nId ) // Feld kaputt
@@ -865,30 +865,30 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
if( aF.nId > eMax - 1) // WW: Nested Field
{
- if( nFieldTagBad[nI] & nMask ) // Flag: Tag it when bad
+ if( m_nFieldTagBad[nI] & nMask ) // Flag: Tag it when bad
return Read_F_Tag( &aF ); // Resultat nicht als Text
else
return aF.nLen;
}
//Only one type of field (hyperlink) in drawing textboxes exists
- if (aF.nId != 88 && pPlcxMan->GetDoingDrawTextBox())
+ if (aF.nId != 88 && m_pPlcxMan->GetDoingDrawTextBox())
return aF.nLen;
// keine Routine vorhanden
if (bNested || !aWW8FieldTab[aF.nId] || bCodeNest)
{
- if( nFieldTagBad[nI] & nMask ) // Flag: Tag it when bad
+ if( m_nFieldTagBad[nI] & nMask ) // Flag: Tag it when bad
return Read_F_Tag( &aF ); // Resultat nicht als Text
// Lese nur Resultat
if (aF.bResNest && !AcceptableNestedField(aF.nId))
return aF.nLen; // Result nested -> nicht brauchbar
- long nOldPos = pStrm->Tell();
+ long nOldPos = m_pStrm->Tell();
OUString aStr;
- aF.nLCode = pSBase->WW8ReadString( *pStrm, aStr, pPlcxMan->GetCpOfs()+
- aF.nSCode, aF.nLCode, eTextCharSet );
- pStrm->Seek( nOldPos );
+ aF.nLCode = m_pSBase->WW8ReadString( *m_pStrm, aStr, m_pPlcxMan->GetCpOfs()+
+ aF.nSCode, aF.nLCode, m_eTextCharSet );
+ m_pStrm->Seek( nOldPos );
// field codes which contain '/' or '.' are not displayed in WinWord
// skip if it is formula field or found space before. see #i119446, #i119585.
@@ -907,27 +907,27 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
// Link fields aren't supported, but they are bound to an OLE object
// that needs to be roundtripped
if ( aF.nId == 56 )
- bEmbeddObj = true;
+ m_bEmbeddObj = true;
// Field not supported: store the field code for later use
- maFieldStack.back().SetBookmarkCode( aStr );
+ m_aFieldStack.back().SetBookmarkCode( aStr );
return aF.nLen - aF.nLRes - 1; // so viele ueberlesen, das Resultfeld
// wird wie Haupttext eingelesen
}
}
else
{ // Lies Feld
- long nOldPos = pStrm->Tell();
+ long nOldPos = m_pStrm->Tell();
OUString aStr;
if ( aF.nId == 6 && aF.bCodeNest )
{
// TODO Extract the whole code string using the nested codes
- aF.nLCode = pSBase->WW8ReadString( *pStrm, aStr, pPlcxMan->GetCpOfs() +
- aF.nSCode, aF.nSRes - aF.nSCode - 1, eTextCharSet );
+ aF.nLCode = m_pSBase->WW8ReadString( *m_pStrm, aStr, m_pPlcxMan->GetCpOfs() +
+ aF.nSCode, aF.nSRes - aF.nSCode - 1, m_eTextCharSet );
}
else
{
- aF.nLCode = pSBase->WW8ReadString( *pStrm, aStr, pPlcxMan->GetCpOfs()+
- aF.nSCode, aF.nLCode, eTextCharSet );
+ aF.nLCode = m_pSBase->WW8ReadString( *m_pStrm, aStr, m_pPlcxMan->GetCpOfs()+
+ aF.nSCode, aF.nLCode, m_eTextCharSet );
}
// #i51312# - graphics inside field code not supported by Writer.
@@ -938,14 +938,14 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
}
eF_ResT eRes = (this->*aWW8FieldTab[aF.nId])( &aF, aStr );
- pStrm->Seek( nOldPos );
+ m_pStrm->Seek( nOldPos );
switch ( eRes )
{
case FLD_OK:
return aF.nLen; // alles OK
case FLD_TAGTXT:
- if ((nFieldTagBad[nI] & nMask)) // Flag: Tag bad
+ if ((m_nFieldTagBad[nI] & nMask)) // Flag: Tag bad
return Read_F_Tag(&aF); // Taggen
//fall through...
case FLD_TEXT:
@@ -958,7 +958,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
else
return aF.nLen;
case FLD_TAGIGN:
- if( ( nFieldTagBad[nI] & nMask ) ) // Flag: Tag bad
+ if( ( m_nFieldTagBad[nI] & nMask ) ) // Flag: Tag bad
return Read_F_Tag( &aF ); // Taggen
return aF.nLen; // oder ignorieren
case FLD_READ_FSPA:
@@ -977,8 +977,8 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
void SwWW8ImplReader::MakeTagString( OUString& rStr, const OUString& rOrg )
{
OUString sHex("\\x");
- bool bAllowCr = SwFltGetFlag( nFieldFlags, SwFltControlStack::TAGS_IN_TEXT )
- || SwFltGetFlag( nFieldFlags, SwFltControlStack::ALLOW_FLD_CR );
+ bool bAllowCr = SwFltGetFlag( m_nFieldFlags, SwFltControlStack::TAGS_IN_TEXT )
+ || SwFltGetFlag( m_nFieldFlags, SwFltControlStack::ALLOW_FLD_CR );
sal_Unicode cChar;
rStr = rOrg;
@@ -1045,31 +1045,31 @@ void SwWW8ImplReader::MakeTagString( OUString& rStr, const OUString& rOrg )
void SwWW8ImplReader::InsertTagField( const sal_uInt16 nId, const OUString& rTagText )
{
OUString aName("WwFieldTag");
- if( SwFltGetFlag( nFieldFlags, SwFltControlStack::TAGS_DO_ID ) ) // Nummer?
+ if( SwFltGetFlag( m_nFieldFlags, SwFltControlStack::TAGS_DO_ID ) ) // Nummer?
aName += OUString::number( nId ); // ausgeben ?
- if( SwFltGetFlag(nFieldFlags, SwFltControlStack::TAGS_IN_TEXT))
+ if( SwFltGetFlag(m_nFieldFlags, SwFltControlStack::TAGS_IN_TEXT))
{
aName += rTagText; // als Txt taggen
- rDoc.getIDocumentContentOperations().InsertString(*pPaM, aName,
+ m_rDoc.getIDocumentContentOperations().InsertString(*m_pPaM, aName,
SwInsertFlags::NOHINTEXPAND);
}
else
{ // normal tagggen
- SwFieldType* pFT = rDoc.getIDocumentFieldsAccess().InsertFldType(
- SwSetExpFieldType( &rDoc, aName, nsSwGetSetExpType::GSE_STRING ) );
+ SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFldType(
+ SwSetExpFieldType( &m_rDoc, aName, nsSwGetSetExpType::GSE_STRING ) );
SwSetExpField aFld( static_cast<SwSetExpFieldType*>(pFT), rTagText ); // SUB_INVISIBLE
- sal_uInt16 nSubType = ( SwFltGetFlag( nFieldFlags, SwFltControlStack::TAGS_VISIBLE ) ) ? 0 : nsSwExtendedSubType::SUB_INVISIBLE;
+ sal_uInt16 nSubType = ( SwFltGetFlag( m_nFieldFlags, SwFltControlStack::TAGS_VISIBLE ) ) ? 0 : nsSwExtendedSubType::SUB_INVISIBLE;
aFld.SetSubType(nSubType | nsSwGetSetExpType::GSE_STRING);
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) );
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
}
}
long SwWW8ImplReader::Read_F_Tag( WW8FieldDesc* pF )
{
- long nOldPos = pStrm->Tell();
+ long nOldPos = m_pStrm->Tell();
WW8_CP nStart = pF->nSCode - 1; // mit 0x19 am Anfang
long nL = pF->nLen; // Gesamtlaenge mit Resultat u. Nest
@@ -1077,14 +1077,14 @@ long SwWW8ImplReader::Read_F_Tag( WW8FieldDesc* pF )
nL = MAX_FIELDLEN; // MaxLaenge, durch Quoten
// max. 4* so gross
OUString sFTxt;
- nL = pSBase->WW8ReadString( *pStrm, sFTxt,
- pPlcxMan->GetCpOfs() + nStart, nL, eStructCharSet);
+ nL = m_pSBase->WW8ReadString( *m_pStrm, sFTxt,
+ m_pPlcxMan->GetCpOfs() + nStart, nL, m_eStructCharSet);
OUString aTagText;
MakeTagString( aTagText, sFTxt );
InsertTagField( pF->nId, aTagText );
- pStrm->Seek( nOldPos );
+ m_pStrm->Seek( nOldPos );
return pF->nLen;
}
@@ -1118,9 +1118,9 @@ eF_ResT SwWW8ImplReader::Read_F_Input( WW8FieldDesc* pF, OUString& rStr )
if ( pF->nId != 0x01 ) // 0x01 fields have no result
{
- SwInputField aFld( static_cast<SwInputFieldType*>(rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_INPUTFLD )),
+ SwInputField aFld( static_cast<SwInputFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_INPUTFLD )),
aDef, aQ, INP_TXT, 0, false );
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) );
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
}
return FLD_OK;
@@ -1129,7 +1129,7 @@ eF_ResT SwWW8ImplReader::Read_F_Input( WW8FieldDesc* pF, OUString& rStr )
// GetFieldResult alloziert einen String und liest das Feld-Resultat ein
OUString SwWW8ImplReader::GetFieldResult( WW8FieldDesc* pF )
{
- long nOldPos = pStrm->Tell();
+ long nOldPos = m_pStrm->Tell();
WW8_CP nStart = pF->nSRes; // result start
long nL = pF->nLRes; // result length
@@ -1141,10 +1141,10 @@ OUString SwWW8ImplReader::GetFieldResult( WW8FieldDesc* pF )
// max. 4* as big
OUString sRes;
- nL = pSBase->WW8ReadString( *pStrm, sRes, pPlcxMan->GetCpOfs() + nStart,
- nL, eStructCharSet );
+ nL = m_pSBase->WW8ReadString( *m_pStrm, sRes, m_pPlcxMan->GetCpOfs() + nStart,
+ nL, m_eStructCharSet );
- pStrm->Seek( nOldPos );
+ m_pStrm->Seek( nOldPos );
//replace both CR 0x0D and VT 0x0B with LF 0x0A
return sRes.replace(0x0D, 0x0A).replace(0x0B, 0x0A);
@@ -1192,30 +1192,30 @@ the appropriate set/ask field.
long SwWW8ImplReader::MapBookmarkVariables(const WW8FieldDesc* pF,
OUString &rOrigName, const OUString &rData)
{
- OSL_ENSURE(pPlcxMan,"No pPlcxMan");
+ OSL_ENSURE(m_pPlcxMan,"No pPlcxMan");
long nNo;
/*
If there was no bookmark associated with this set field, then we create a
pseudo one and insert it in the document.
*/
sal_uInt16 nIndex;
- pPlcxMan->GetBook()->MapName(rOrigName);
- OUString sName = pPlcxMan->GetBook()->GetBookmark(
+ m_pPlcxMan->GetBook()->MapName(rOrigName);
+ OUString sName = m_pPlcxMan->GetBook()->GetBookmark(
pF->nSCode, pF->nSCode + pF->nLen, nIndex);
if (!sName.isEmpty())
{
- pPlcxMan->GetBook()->SetStatus(nIndex, BOOK_IGNORE);
+ m_pPlcxMan->GetBook()->SetStatus(nIndex, BOOK_IGNORE);
nNo = nIndex;
}
else
{
- nNo = pReffingStck->aFieldVarNames.size()+1;
+ nNo = m_pReffingStck->aFieldVarNames.size()+1;
sName = "WWSetBkmk" + OUString::number(nNo);
- nNo += pPlcxMan->GetBook()->GetIMax();
+ nNo += m_pPlcxMan->GetBook()->GetIMax();
}
- pReffedStck->NewAttr(*pPaM->GetPoint(),
+ m_pReffedStck->NewAttr(*m_pPaM->GetPoint(),
SwFltBookmark( BookmarkToWriter(sName), rData, nNo ));
- pReffingStck->aFieldVarNames[rOrigName] = sName;
+ m_pReffingStck->aFieldVarNames[rOrigName] = sName;
return nNo;
}
@@ -1256,15 +1256,15 @@ SwFltStackEntry *SwWW8FltRefStack::RefToVar(const SwField* pFld,
OUString SwWW8ImplReader::GetMappedBookmark(const OUString &rOrigName)
{
OUString sName(BookmarkToWriter(rOrigName));
- OSL_ENSURE(pPlcxMan,"no pPlcxMan");
- pPlcxMan->GetBook()->MapName(sName);
+ OSL_ENSURE(m_pPlcxMan,"no pPlcxMan");
+ m_pPlcxMan->GetBook()->MapName(sName);
//See if there has been a variable set with this name, if so get
//the pseudo bookmark name that was set with it.
::std::map<OUString, OUString, SwWW8::ltstr>::const_iterator aResult =
- pReffingStck->aFieldVarNames.find(sName);
+ m_pReffingStck->aFieldVarNames.find(sName);
- return (aResult == pReffingStck->aFieldVarNames.end())
+ return (aResult == m_pReffingStck->aFieldVarNames.end())
? sName : (*aResult).second;
}
@@ -1311,30 +1311,30 @@ eF_ResT SwWW8ImplReader::Read_F_InputVar( WW8FieldDesc* pF, OUString& rStr )
const long nNo = MapBookmarkVariables(pF, sOrigName, aResult);
- SwSetExpFieldType* pFT = static_cast<SwSetExpFieldType*>(rDoc.getIDocumentFieldsAccess().InsertFldType(
- SwSetExpFieldType(&rDoc, sOrigName, nsSwGetSetExpType::GSE_STRING)));
+ SwSetExpFieldType* pFT = static_cast<SwSetExpFieldType*>(m_rDoc.getIDocumentFieldsAccess().InsertFldType(
+ SwSetExpFieldType(&m_rDoc, sOrigName, nsSwGetSetExpType::GSE_STRING)));
SwSetExpField aFld(pFT, aResult);
aFld.SetSubType(nsSwExtendedSubType::SUB_INVISIBLE | nsSwGetSetExpType::GSE_STRING);
aFld.SetInputFlag(true);
aFld.SetPromptText( aQ );
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) );
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
- pReffedStck->SetAttr(*pPaM->GetPoint(), RES_FLTR_BOOKMARK, true, nNo);
+ m_pReffedStck->SetAttr(*m_pPaM->GetPoint(), RES_FLTR_BOOKMARK, true, nNo);
return FLD_OK;
}
// "AUTONR"
eF_ResT SwWW8ImplReader::Read_F_ANumber( WW8FieldDesc*, OUString& rStr )
{
- if( !pNumFldType ){ // 1. Mal
- SwSetExpFieldType aT( &rDoc, OUString("AutoNr"), nsSwGetSetExpType::GSE_SEQ );
- pNumFldType = rDoc.getIDocumentFieldsAccess().InsertFldType( aT );
+ if( !m_pNumFldType ){ // 1. Mal
+ SwSetExpFieldType aT( &m_rDoc, OUString("AutoNr"), nsSwGetSetExpType::GSE_SEQ );
+ m_pNumFldType = m_rDoc.getIDocumentFieldsAccess().InsertFldType( aT );
}
- SwSetExpField aFld( static_cast<SwSetExpFieldType*>(pNumFldType), OUString(),
+ SwSetExpField aFld( static_cast<SwSetExpFieldType*>(m_pNumFldType), OUString(),
GetNumberPara( rStr ) );
- aFld.SetValue( ++nFldNum );
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) );
+ aFld.SetValue( ++m_nFldNum );
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
return FLD_OK;
}
@@ -1398,8 +1398,8 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*, OUString& rStr )
if (aSequenceName.isEmpty() && aBook.isEmpty())
return FLD_TAGIGN;
- SwSetExpFieldType* pFT = static_cast<SwSetExpFieldType*>(rDoc.getIDocumentFieldsAccess().InsertFldType(
- SwSetExpFieldType( &rDoc, aSequenceName, nsSwGetSetExpType::GSE_SEQ ) ) );
+ SwSetExpFieldType* pFT = static_cast<SwSetExpFieldType*>(m_rDoc.getIDocumentFieldsAccess().InsertFldType(
+ SwSetExpFieldType( &m_rDoc, aSequenceName, nsSwGetSetExpType::GSE_SEQ ) ) );
SwSetExpField aFld( pFT, OUString(), eNumFormat );
//#i120654# Add bHidden for /h flag (/h: Hide the field result.)
@@ -1411,7 +1411,7 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*, OUString& rStr )
else if (!bCountOn)
aFld.SetFormula(aSequenceName);
- rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM, SwFmtFld(aFld));
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
return FLD_OK;
}
@@ -1531,8 +1531,8 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, OUString& rStr )
if( !bFldFound )
{
SwDocInfoField aFld( static_cast<SwDocInfoFieldType*>(
- rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )), DI_CUSTOM|nReg, aDocProperty, GetFieldResult( pF ) );
- rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM, SwFmtFld(aFld));
+ m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )), DI_CUSTOM|nReg, aDocProperty, GetFieldResult( pF ) );
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
return FLD_OK;
}
@@ -1638,10 +1638,10 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, OUString& rStr )
}
SwDocInfoField aFld( static_cast<SwDocInfoFieldType*>(
- rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )), nSub|nReg, aData, nFormat );
+ m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )), nSub|nReg, aData, nFormat );
if (bDateTime)
ForceFieldLanguage(aFld, nLang);
- rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM, SwFmtFld(aFld));
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
return FLD_OK;
}
@@ -1651,17 +1651,17 @@ eF_ResT SwWW8ImplReader::Read_F_Author( WW8FieldDesc*, OUString& )
// SH: Das SwAuthorField bezeichnet nicht den urspruenglichen
// Autor, sondern den aktuellen Benutzer, also besser ueber DocInfo
SwDocInfoField aFld( static_cast<SwDocInfoFieldType*>(
- rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )),
+ m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )),
DI_CREATE|DI_SUB_AUTHOR, OUString() );
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) );
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
return FLD_OK;
}
eF_ResT SwWW8ImplReader::Read_F_TemplName( WW8FieldDesc*, OUString& )
{
SwTemplNameField aFld( static_cast<SwTemplNameFieldType*>(
- rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_TEMPLNAMEFLD )), FF_NAME );
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) );
+ m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_TEMPLNAMEFLD )), FF_NAME );
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
return FLD_OK;
}
@@ -1701,13 +1701,13 @@ eF_ResT SwWW8ImplReader::Read_F_DateTime( WW8FieldDesc*pF, OUString& rStr )
if (32 == pF->nId)
{
nDT = css::util::NumberFormat::TIME;
- nFormat = rDoc.GetNumberFormatter()->GetFormatIndex(
+ nFormat = m_rDoc.GetNumberFormatter()->GetFormatIndex(
NF_TIME_START, LANGUAGE_SYSTEM );
}
else
{
nDT = css::util::NumberFormat::DATE;
- nFormat = rDoc.GetNumberFormatter()->GetFormatIndex(
+ nFormat = m_rDoc.GetNumberFormatter()->GetFormatIndex(
NF_DATE_START, LANGUAGE_SYSTEM );
}
}
@@ -1715,16 +1715,16 @@ eF_ResT SwWW8ImplReader::Read_F_DateTime( WW8FieldDesc*pF, OUString& rStr )
if (nDT & css::util::NumberFormat::DATE)
{
SwDateTimeField aFld(static_cast<SwDateTimeFieldType*>(
- rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DATETIMEFLD )), DATEFLD, nFormat);
+ m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DATETIMEFLD )), DATEFLD, nFormat);
ForceFieldLanguage(aFld, nLang);
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) );
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
}
else if (nDT == css::util::NumberFormat::TIME)
{
SwDateTimeField aFld(static_cast<SwDateTimeFieldType*>(
- rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DATETIMEFLD)), TIMEFLD, nFormat);
+ m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DATETIMEFLD)), TIMEFLD, nFormat);
ForceFieldLanguage(aFld, nLang);
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) );
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
}
return FLD_OK;
@@ -1755,8 +1755,8 @@ eF_ResT SwWW8ImplReader::Read_F_FileName(WW8FieldDesc*, OUString &rStr)
}
SwFileNameField aFld(
- static_cast<SwFileNameFieldType*>(rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_FILENAMEFLD)), eType);
- rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM, SwFmtFld(aFld));
+ static_cast<SwFileNameFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_FILENAMEFLD)), eType);
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
return FLD_OK;
}
@@ -1768,9 +1768,9 @@ eF_ResT SwWW8ImplReader::Read_F_Anz( WW8FieldDesc* pF, OUString& rStr )
case 28: nSub = DS_CHAR; break; // number of characters
}
SwDocStatField aFld( static_cast<SwDocStatFieldType*>(
- rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCSTATFLD )), nSub,
+ m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCSTATFLD )), nSub,
GetNumberPara( rStr ) );
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) );
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
return FLD_OK;
}
@@ -1778,10 +1778,10 @@ eF_ResT SwWW8ImplReader::Read_F_CurPage( WW8FieldDesc*, OUString& rStr )
{
// page number
SwPageNumberField aFld( static_cast<SwPageNumberFieldType*>(
- rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_PAGENUMBERFLD )), PG_RANDOM,
+ m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_PAGENUMBERFLD )), PG_RANDOM,
GetNumberPara(rStr, true));
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) );
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
return FLD_OK;
}
@@ -1837,16 +1837,16 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, OUString& rStr )
NewAttr(aSz);
}
- rDoc.getIDocumentContentOperations().InsertString(*pPaM, OUString(cChar));
+ m_rDoc.getIDocumentContentOperations().InsertString(*m_pPaM, OUString(cChar));
if (nSize > 0)
- pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_CHRATR_FONTSIZE);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_CHRATR_FONTSIZE);
if (!aName.isEmpty())
- pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_CHRATR_FONT);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_CHRATR_FONT);
}
else
{
- rDoc.getIDocumentContentOperations().InsertString(*pPaM, OUString("###"));
+ m_rDoc.getIDocumentContentOperations().InsertString(*m_pPaM, OUString("###"));
}
return FLD_OK;
@@ -1875,9 +1875,9 @@ eF_ResT SwWW8ImplReader::Read_F_Embedd( WW8FieldDesc*, OUString& rStr )
}
}
- if( bObj && nPicLocFc )
- nObjLocFc = nPicLocFc;
- bEmbeddObj = true;
+ if( m_bObj && m_nPicLocFc )
+ m_nObjLocFc = m_nPicLocFc;
+ m_bEmbeddObj = true;
return FLD_TEXT;
}
@@ -1905,14 +1905,14 @@ eF_ResT SwWW8ImplReader::Read_F_Set( WW8FieldDesc* pF, OUString& rStr )
const long nNo = MapBookmarkVariables(pF, sOrigName, sVal);
- SwFieldType* pFT = rDoc.getIDocumentFieldsAccess().InsertFldType( SwSetExpFieldType( &rDoc, sOrigName,
+ SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFldType( SwSetExpFieldType( &m_rDoc, sOrigName,
nsSwGetSetExpType::GSE_STRING ) );
SwSetExpField aFld( static_cast<SwSetExpFieldType*>(pFT), sVal, ULONG_MAX );
aFld.SetSubType(nsSwExtendedSubType::SUB_INVISIBLE | nsSwGetSetExpType::GSE_STRING);
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) );
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
- pReffedStck->SetAttr(*pPaM->GetPoint(), RES_FLTR_BOOKMARK, true, nNo);
+ m_pReffedStck->SetAttr(*m_pPaM->GetPoint(), RES_FLTR_BOOKMARK, true, nNo);
return FLD_OK;
}
@@ -1975,11 +1975,11 @@ eF_ResT SwWW8ImplReader::Read_F_Ref( WW8FieldDesc*, OUString& rStr )
{
sBkmName = EnsureTOCBookmarkName(sBkmName);
// track <sBookmarkName> as referenced TOC bookmark.
- pReffedStck->aReferencedTOCBookmarks.insert( sBkmName );
+ m_pReffedStck->aReferencedTOCBookmarks.insert( sBkmName );
}
SwGetRefField aFld(
- static_cast<SwGetRefFieldType*>(rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD )),
+ static_cast<SwGetRefFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD )),
sBkmName,REF_BOOKMARK,0,eFormat);
if (eFormat == REF_CONTENT)
@@ -1990,12 +1990,12 @@ eF_ResT SwWW8ImplReader::Read_F_Ref( WW8FieldDesc*, OUString& rStr )
must store it until the end of the document to see if it was,
in which case we'll turn it into a show variable
*/
- pReffingStck->NewAttr( *pPaM->GetPoint(), SwFmtFld(aFld) );
- pReffingStck->SetAttr( *pPaM->GetPoint(), RES_TXTATR_FIELD);
+ m_pReffingStck->NewAttr( *m_pPaM->GetPoint(), SwFmtFld(aFld) );
+ m_pReffingStck->SetAttr( *m_pPaM->GetPoint(), RES_TXTATR_FIELD);
}
else
{
- rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM, SwFmtFld(aFld));
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
}
return FLD_OK;
}
@@ -2035,17 +2035,17 @@ eF_ResT SwWW8ImplReader::Read_F_NoteReference( WW8FieldDesc*, OUString& rStr )
// set Sequence No of corresponding Foot-/Endnote to Zero
// (will be corrected in
SwGetRefField aFld( static_cast<SwGetRefFieldType*>(
- rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD )), aBkmName, REF_FOOTNOTE, 0,
+ m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD )), aBkmName, REF_FOOTNOTE, 0,
REF_ONLYNUMBER );
- pReffingStck->NewAttr(*pPaM->GetPoint(), SwFmtFld(aFld));
- pReffingStck->SetAttr(*pPaM->GetPoint(), RES_TXTATR_FIELD);
+ m_pReffingStck->NewAttr(*m_pPaM->GetPoint(), SwFmtFld(aFld));
+ m_pReffingStck->SetAttr(*m_pPaM->GetPoint(), RES_TXTATR_FIELD);
if (bAboveBelow)
{
SwGetRefField aFld2( static_cast<SwGetRefFieldType*>(
- rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD )),aBkmName, REF_FOOTNOTE, 0,
+ m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD )),aBkmName, REF_FOOTNOTE, 0,
REF_UPDOWN );
- pReffingStck->NewAttr(*pPaM->GetPoint(), SwFmtFld(aFld2));
- pReffingStck->SetAttr(*pPaM->GetPoint(), RES_TXTATR_FIELD);
+ m_pReffingStck->NewAttr(*m_pPaM->GetPoint(), SwFmtFld(aFld2));
+ m_pReffingStck->SetAttr(*m_pPaM->GetPoint(), RES_TXTATR_FIELD);
}
return FLD_OK;
}
@@ -2069,12 +2069,12 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, OUString& rStr )
const OUString sName(GetMappedBookmark(sOrigName));
// loading page reference field in TOX
- if (mbLoadingTOXCache)
+ if (m_bLoadingTOXCache)
{
// insert page ref representation as plain text --> return FLD_TEXT
// if there is no hyperlink settings for current toc and referenced bookmark is available,
// assign link to current ref area
- if (!mbLoadingTOXHyperlink && !sName.isEmpty())
+ if (!m_bLoadingTOXHyperlink && !sName.isEmpty())
{
// #i120879# add cross reference bookmark name prefix, if it
// matches internal TOC bookmark naming convention
@@ -2083,7 +2083,7 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, OUString& rStr )
{
sBookmarkName = EnsureTOCBookmarkName(sName);
// track <sBookmarkName> as referenced TOC bookmark.
- pReffedStck->aReferencedTOCBookmarks.insert( sBookmarkName );
+ m_pReffedStck->aReferencedTOCBookmarks.insert( sBookmarkName );
}
else
{
@@ -2097,7 +2097,7 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, OUString& rStr )
SwStyleNameMapper::GetPoolIdFromUIName( sLinkStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
aURL.SetVisitedFmtAndId( sLinkStyle, nPoolId);
aURL.SetINetFmtAndId( sLinkStyle, nPoolId );
- pCtrlStck->NewAttr( *pPaM->GetPoint(), aURL );
+ m_pCtrlStck->NewAttr( *m_pPaM->GetPoint(), aURL );
}
return FLD_TEXT;
}
@@ -2109,15 +2109,15 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, OUString& rStr )
{
sPageRefBookmarkName = EnsureTOCBookmarkName(sName);
// track <sPageRefBookmarkName> as referenced TOC bookmark.
- pReffedStck->aReferencedTOCBookmarks.insert( sPageRefBookmarkName );
+ m_pReffedStck->aReferencedTOCBookmarks.insert( sPageRefBookmarkName );
}
else
{
sPageRefBookmarkName = sName;
}
- SwGetRefField aFld( static_cast<SwGetRefFieldType*>(rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD )),
+ SwGetRefField aFld( static_cast<SwGetRefFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD )),
sPageRefBookmarkName, REF_BOOKMARK, 0, REF_PAGE );
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) );
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
return FLD_OK;
}
@@ -2195,27 +2195,27 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, OUString& rStr)
aName = "StarOffice.Standard.Modul1." + aName;
SwMacroField aFld( static_cast<SwMacroFieldType*>(
- rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_MACROFLD )), aName, aVText );
+ m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_MACROFLD )), aName, aVText );
if( !bApplyWingdings )
{
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) );
- WW8_CP nOldCp = pPlcxMan->Where();
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+ WW8_CP nOldCp = m_pPlcxMan->Where();
WW8_CP nCp = nOldCp + nOffset;
- SwPaM aPaM(*pPaM, pPaM);
+ SwPaM aPaM(*m_pPaM, m_pPaM);
aPaM.SetMark();
aPaM.Move(fnMoveBackward);
aPaM.Exchange();
- mpPostProcessAttrsInfo = new WW8PostProcessAttrsInfo(nCp, nCp, aPaM);
+ m_pPostProcessAttrsInfo = new WW8PostProcessAttrsInfo(nCp, nCp, aPaM);
}
else
{
//set Wingdings font
sal_uInt16 i = 0;
- for ( ; i < pFonts->GetMax(); i++ )
+ for ( ; i < m_pFonts->GetMax(); i++ )
{
FontFamily eFamily;
OUString aFontName;
@@ -2228,12 +2228,12 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, OUString& rStr)
}
}
- if ( i < pFonts->GetMax() )
+ if ( i < m_pFonts->GetMax() )
{
SetNewFontAttr( i, true, RES_CHRATR_FONT );
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) );
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_FONT );
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_FONT );
ResetCharSetVars();
}
}
@@ -2317,17 +2317,17 @@ eF_ResT SwWW8ImplReader::Read_F_IncludePicture( WW8FieldDesc*, OUString& rStr )
erkannt, dass wir soeben einen Grafik-Link inserted haben und
das passende SwAttrSet wird ins Frame-Format eingesetzt.
*/
- SfxItemSet aFlySet( rDoc.GetAttrPool(), RES_FRMATR_BEGIN,
+ SfxItemSet aFlySet( m_rDoc.GetAttrPool(), RES_FRMATR_BEGIN,
RES_FRMATR_END-1 );
aFlySet.Put( SwFmtAnchor( FLY_AS_CHAR ) );
aFlySet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
- pFlyFmtOfJustInsertedGraphic = rDoc.getIDocumentContentOperations().Insert( *pPaM,
+ m_pFlyFmtOfJustInsertedGraphic = m_rDoc.getIDocumentContentOperations().Insert( *m_pPaM,
aGrfName,
OUString(),
0, // Graphic*
&aFlySet,
0, 0); // SwFrmFmt*
- maGrfNameGenerator.SetUniqueGraphName(pFlyFmtOfJustInsertedGraphic,
+ m_aGrfNameGenerator.SetUniqueGraphName(m_pFlyFmtOfJustInsertedGraphic,
INetURLObject(aGrfName).GetBase());
}
return FLD_READ_FSPA;
@@ -2381,15 +2381,15 @@ eF_ResT SwWW8ImplReader::Read_F_IncludeText( WW8FieldDesc* /*pF*/, OUString& rSt
case the file is not available we will fill in the section with the stored
content of this winword field as a fallback.
*/
- SwPosition aTmpPos(*pPaM->GetPoint());
+ SwPosition aTmpPos(*m_pPaM->GetPoint());
SwSectionData aSection(FILE_LINK_SECTION,
- maSectionNameGenerator.UniqueName());
+ m_aSectionNameGenerator.UniqueName());
aSection.SetLinkFileName( aPara );
aSection.SetProtectFlag(true);
SwSection *const pSection =
- rDoc.InsertSwSection(*pPaM, aSection, 0, 0, false);
+ m_rDoc.InsertSwSection(*m_pPaM, aSection, 0, 0, false);
OSL_ENSURE(pSection, "no section inserted");
if (!pSection)
return FLD_TEXT;
@@ -2398,12 +2398,12 @@ eF_ResT SwWW8ImplReader::Read_F_IncludeText( WW8FieldDesc* /*pF*/, OUString& rSt
if (!pSectionNode)
return FLD_TEXT;
- pPaM->GetPoint()->nNode = pSectionNode->GetIndex()+1;
- pPaM->GetPoint()->nContent.Assign(pPaM->GetCntntNode(), 0 );
+ m_pPaM->GetPoint()->nNode = pSectionNode->GetIndex()+1;
+ m_pPaM->GetPoint()->nContent.Assign(m_pPaM->GetCntntNode(), 0 );
//we have inserted a section before this point, so adjust pos
//for future page/section segment insertion
- maSectionManager.PrependedInlineNode(aTmpPos, pPaM->GetNode());
+ m_aSectionManager.PrependedInlineNode(aTmpPos, m_pPaM->GetNode());
return FLD_TEXT;
}
@@ -2430,21 +2430,21 @@ eF_ResT SwWW8ImplReader::Read_F_DBField( WW8FieldDesc* pF, OUString& rStr )
break;
}
}
- SwDBFieldType aD( &rDoc, aName, SwDBData() ); // Datenbank: Nichts
+ SwDBFieldType aD( &m_rDoc, aName, SwDBData() ); // Datenbank: Nichts
- SwFieldType* pFT = rDoc.getIDocumentFieldsAccess().InsertFldType( aD );
+ SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFldType( aD );
SwDBField aFld( static_cast<SwDBFieldType*>(pFT) );
aFld.SetFieldCode( rStr );
OUString aResult;
- pSBase->WW8ReadString( *pStrm, aResult, pPlcxMan->GetCpOfs()+
- pF->nSRes, pF->nLRes, eTextCharSet );
+ m_pSBase->WW8ReadString( *m_pStrm, aResult, m_pPlcxMan->GetCpOfs()+
+ pF->nSRes, pF->nLRes, m_eTextCharSet );
aResult = aResult.replace( '\xb', '\n' );
aFld.InitContent(aResult);
- rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM, SwFmtFld( aFld ));
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld( aFld ));
#endif
return FLD_OK;
}
@@ -2454,10 +2454,10 @@ eF_ResT SwWW8ImplReader::Read_F_DBNext( WW8FieldDesc*, OUString& )
{
#if HAVE_FEATURE_DBCONNECTIVITY
SwDBNextSetFieldType aN;
- SwFieldType* pFT = rDoc.getIDocumentFieldsAccess().InsertFldType( aN );
+ SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFldType( aN );
SwDBNextSetField aFld( static_cast<SwDBNextSetFieldType*>(pFT), OUString(), OUString(),
SwDBData() ); // Datenbank: Nichts
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) );
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
#endif
return FLD_OK;
}
@@ -2467,10 +2467,10 @@ eF_ResT SwWW8ImplReader::Read_F_DBNum( WW8FieldDesc*, OUString& )
{
#if HAVE_FEATURE_DBCONNECTIVITY
SwDBSetNumberFieldType aN;
- SwFieldType* pFT = rDoc.getIDocumentFieldsAccess().InsertFldType( aN );
+ SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFldType( aN );
SwDBSetNumberField aFld( static_cast<SwDBSetNumberFieldType*>(pFT),
SwDBData() ); // Datenbank: Nichts
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) );
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
#endif
return FLD_OK;
}
@@ -2494,15 +2494,15 @@ eF_ResT SwWW8ImplReader::Read_F_Equation( WW8FieldDesc*, OUString& rStr )
if (aResult.sType == "Input")
{
- SwInputField aFld( static_cast<SwInputFieldType*>(rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_INPUTFLD )),
+ SwInputField aFld( static_cast<SwInputFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_INPUTFLD )),
aResult.sResult, aResult.sResult, INP_TXT, 0 );
- rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ) ); // insert input field
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) ); // insert input field
}
else if (aResult.sType == "CombinedCharacters")
{
SwCombinedCharField aFld(static_cast<SwCombinedCharFieldType*>(
- rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_COMBINED_CHARS)), aResult.sType);
- rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM, SwFmtFld(aFld));
+ m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_COMBINED_CHARS)), aResult.sType);
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
}
}
else if ('*' == cChar)
@@ -2627,9 +2627,9 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
//Check to see if we already have a ruby charstyle that this fits
std::vector<const SwCharFmt*>::const_iterator aEnd =
- aRubyCharFmts.end();
+ m_aRubyCharFmts.end();
for(std::vector<const SwCharFmt*>::const_iterator aIter
- = aRubyCharFmts.begin(); aIter != aEnd; ++aIter)
+ = m_aRubyCharFmts.begin(); aIter != aEnd; ++aIter)
{
const SvxFontHeightItem &rFH =
ItemGet<SvxFontHeightItem>(*(*aIter),
@@ -2653,8 +2653,8 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
OUString aNm;
//Take this as the base name
SwStyleNameMapper::FillUIName(RES_POOLCHR_RUBYTEXT,aNm);
- aNm+=OUString::number(aRubyCharFmts.size()+1);
- pFmt = rDoc.MakeCharFmt(aNm,(SwCharFmt*)rDoc.GetDfltCharFmt());
+ aNm+=OUString::number(m_aRubyCharFmts.size()+1);
+ pFmt = m_rDoc.MakeCharFmt(aNm,(SwCharFmt*)m_rDoc.GetDfltCharFmt());
SvxFontHeightItem aHeightItem(nFontSize*10, 100, RES_CHRATR_FONTSIZE);
SvxFontItem aFontItem(FAMILY_DONTKNOW,sFontName,
OUString(), PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, RES_CHRATR_FONT);
@@ -2662,7 +2662,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
aFontItem.SetWhich(GetWhichOfScript(RES_CHRATR_FONT,nScript));
pFmt->SetFmtAttr(aHeightItem);
pFmt->SetFmtAttr(aFontItem);
- aRubyCharFmts.push_back(pFmt);
+ m_aRubyCharFmts.push_back(pFmt);
pCharFmt = pFmt;
}
@@ -2672,8 +2672,8 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
aRuby.SetAdjustment(nJustificationCode);
NewAttr(aRuby);
- rDoc.getIDocumentContentOperations().InsertString( *pPaM, sText );
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_TXTATR_CJK_RUBY );
+ m_rDoc.getIDocumentContentOperations().InsertString( *m_pPaM, sText );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_TXTATR_CJK_RUBY );
}
}
@@ -2824,15 +2824,15 @@ static sal_uInt16 lcl_GetMaxValidWordTOCLevel(const SwForm &rForm)
eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr )
{
- if (!mbLoadingTOXCache)
+ if (!m_bLoadingTOXCache)
{
- mbLoadingTOXCache = true;
+ m_bLoadingTOXCache = true;
}
else
{
// Embedded TOX --> continue reading its content, but no further TOX
// field
- ++mnEmbeddedTOXLevel;
+ ++m_nEmbeddedTOXLevel;
return FLD_TEXT;
}
@@ -2857,10 +2857,10 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr )
sal_uInt16 nIndexCols = 1;
- const SwTOXType* pType = rDoc.GetTOXType( eTox, 0 );
+ const SwTOXType* pType = m_rDoc.GetTOXType( eTox, 0 );
SwForm aOrigForm(eTox);
SwTOXBase* pBase = new SwTOXBase( pType, aOrigForm, nCreateOf, OUString() );
- pBase->SetProtected(maSectionManager.CurrentSectionIsProtected());
+ pBase->SetProtected(m_aSectionManager.CurrentSectionIsProtected());
switch( eTox ){
case TOX_INDEX:
{
@@ -2982,7 +2982,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr )
break;
case 'a':
case 'c':
- lcl_toxMatchACSwitch(*this, rDoc, *pBase, aReadParam,
+ lcl_toxMatchACSwitch(*this, m_rDoc, *pBase, aReadParam,
('c' == nRet)
? CAPTION_COMPLETE
: CAPTION_TEXT );
@@ -3184,9 +3184,9 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr )
// the entry correctly, but I currently have no clue how to obtain
// the tab stop position. It is _not_ set at the paragraph style.
SwForm* pForm = 0;
- for (sal_uInt16 nI = 0; nI < vColl.size(); ++nI)
+ for (sal_uInt16 nI = 0; nI < m_vColl.size(); ++nI)
{
- const SwWW8StyInf& rSI = vColl[nI];
+ const SwWW8StyInf& rSI = m_vColl[nI];
if (rSI.IsOutlineNumbered())
{
sal_uInt16 nStyleLevel = rSI.mnWW8OutlineLevel;
@@ -3272,20 +3272,20 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr )
} // ToxBase fertig
// #i21237# - propagate tab stops from paragraph styles used in TOX to patterns of the TOX
- pBase->AdjustTabStops( rDoc );
+ pBase->AdjustTabStops( m_rDoc );
//#i10028# inserting a toc implicltly acts like a parabreak in word and writer
- if ( pPaM->End() &&
- pPaM->End()->nNode.GetNode().GetTxtNode() &&
- pPaM->End()->nNode.GetNode().GetTxtNode()->Len() != 0 )
+ if ( m_pPaM->End() &&
+ m_pPaM->End()->nNode.GetNode().GetTxtNode() &&
+ m_pPaM->End()->nNode.GetNode().GetTxtNode()->Len() != 0 )
{
- mbCareFirstParaEndInToc = true;
+ m_bCareFirstParaEndInToc = true;
}
- if (pPaM->GetPoint()->nContent.GetIndex())
- AppendTxtNode(*pPaM->GetPoint());
+ if (m_pPaM->GetPoint()->nContent.GetIndex())
+ AppendTxtNode(*m_pPaM->GetPoint());
- const SwPosition* pPos = pPaM->GetPoint();
+ const SwPosition* pPos = m_pPaM->GetPoint();
SwFltTOX aFltTOX( pBase, nIndexCols );
@@ -3304,33 +3304,33 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr )
//Will there be a new pagebreak at this position (don't know what type
//until later)
- if (maSectionManager.WillHavePageDescHere(pPos->nNode))
+ if (m_aSectionManager.WillHavePageDescHere(pPos->nNode))
aFltTOX.SetHadPageDescItem(true);
// Setze Anfang in Stack
- pReffedStck->NewAttr( *pPos, aFltTOX );
+ m_pReffedStck->NewAttr( *pPos, aFltTOX );
- rDoc.InsertTableOf(*pPaM->GetPoint(), *aFltTOX.GetBase());
+ m_rDoc.InsertTableOf(*m_pPaM->GetPoint(), *aFltTOX.GetBase());
//The TOC field representation contents should be inserted into TOC section, but not after TOC section.
//So we need update the document position when loading TOC representation and after loading TOC;
- if (mpPosAfterTOC)
+ if (m_pPosAfterTOC)
{
- delete mpPosAfterTOC;
+ delete m_pPosAfterTOC;
}
- mpPosAfterTOC = new SwPaM(*pPaM, pPaM);
- (*pPaM).Move(fnMoveBackward);
- SwPaM aRegion(*pPaM, pPaM);
+ m_pPosAfterTOC = new SwPaM(*m_pPaM, m_pPaM);
+ (*m_pPaM).Move(fnMoveBackward);
+ SwPaM aRegion(*m_pPaM, m_pPaM);
- OSL_ENSURE(rDoc.GetCurTOX(*aRegion.GetPoint()), "Misunderstood how toc works");
- if (SwTOXBase* pBase2 = (SwTOXBase*)rDoc.GetCurTOX(*aRegion.GetPoint()))
+ OSL_ENSURE(m_rDoc.GetCurTOX(*aRegion.GetPoint()), "Misunderstood how toc works");
+ if (SwTOXBase* pBase2 = (SwTOXBase*)m_rDoc.GetCurTOX(*aRegion.GetPoint()))
{
pBase2->SetMSTOCExpression(rStr);
if ( nIndexCols > 1 )
{
// Set the column number for index
- SfxItemSet aSet( rDoc.GetAttrPool(), RES_COL, RES_COL );
+ SfxItemSet aSet( m_rDoc.GetAttrPool(), RES_COL, RES_COL );
SwFmtCol aCol;
aCol.Init( nIndexCols, 708, USHRT_MAX );
aSet.Put( aCol );
@@ -3339,14 +3339,14 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr )
// inserting a toc inserts a section before this point, so adjust pos
// for future page/section segment insertion
- maSectionManager.PrependedInlineNode( *mpPosAfterTOC->GetPoint(), aRegion.GetNode() );
+ m_aSectionManager.PrependedInlineNode( *m_pPosAfterTOC->GetPoint(), aRegion.GetNode() );
}
// Setze Ende in Stack
- pReffedStck->SetAttr( *pPos, RES_FLTR_TOX );
+ m_pReffedStck->SetAttr( *pPos, RES_FLTR_TOX );
- if (!maApos.back()) //a para end in apo doesn't count
- bWasParaEnd = true;
+ if (!m_aApos.back()) //a para end in apo doesn't count
+ m_bWasParaEnd = true;
//Return FLD_TEXT, instead of FLD_OK
//FLD_TEXT means the following content, commonly indicate the field representation content should be parsed
@@ -3407,12 +3407,12 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, OUString& rStr
{
sMark = EnsureTOCBookmarkName(sMark);
// track <sMark> as referenced TOC bookmark.
- pReffedStck->aReferencedTOCBookmarks.insert( sMark );
+ m_pReffedStck->aReferencedTOCBookmarks.insert( sMark );
}
- if (mbLoadingTOXCache)
+ if (m_bLoadingTOXCache)
{
- mbLoadingTOXHyperlink = true; //on loading a TOC field nested hyperlink field
+ m_bLoadingTOXHyperlink = true; //on loading a TOC field nested hyperlink field
}
}
break;
@@ -3440,7 +3440,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, OUString& rStr
SwFmtINetFmt aURL(sURL, sTarget);
// If on loading TOC field, change the default style into the "index link"
- if (mbLoadingTOXCache)
+ if (m_bLoadingTOXCache)
{
OUString sLinkStyle("Index Link");
sal_uInt16 nPoolId =
@@ -3453,7 +3453,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, OUString& rStr
//EndExtSprm in conjunction with the maFieldStack. If there are flyfrms
//between the start and begin, their hyperlinks will be set at that time
//as well.
- pCtrlStck->NewAttr( *pPaM->GetPoint(), aURL );
+ m_pCtrlStck->NewAttr( *m_pPaM->GetPoint(), aURL );
return FLD_TEXT;
}
@@ -3541,13 +3541,13 @@ void sw::ms::ImportXE(SwDoc &rDoc, SwPaM &rPaM, const OUString &rStr)
void SwWW8ImplReader::ImportTox( int nFldId, const OUString& aStr )
{
bool bIdx = (nFldId != 9);
- lcl_ImportTox(rDoc, *pPaM, aStr, bIdx);
+ lcl_ImportTox(m_rDoc, *m_pPaM, aStr, bIdx);
}
void SwWW8ImplReader::Read_FldVanish( sal_uInt16, const sal_uInt8*, short nLen )
{
//Meaningless in a style
- if (pAktColl || !pPlcxMan)
+ if (m_pAktColl || !m_pPlcxMan)
return;
const int nChunk = 64; //number of characters to read at one time
@@ -3559,23 +3559,23 @@ void SwWW8ImplReader::Read_FldVanish( sal_uInt16, const sal_uInt8*, short nLen )
if( nLen < 0 )
{
- bIgnoreText = false;
+ m_bIgnoreText = false;
return;
}
// our methode was called from
// ''Skip attributes of field contents'' loop within ReadTextAttr()
- if( bIgnoreText )
+ if( m_bIgnoreText )
return;
- bIgnoreText = true;
- long nOldPos = pStrm->Tell();
+ m_bIgnoreText = true;
+ long nOldPos = m_pStrm->Tell();
- WW8_CP nStartCp = pPlcxMan->Where() + pPlcxMan->GetCpOfs();
+ WW8_CP nStartCp = m_pPlcxMan->Where() + m_pPlcxMan->GetCpOfs();
OUString sFieldName;
- sal_Int32 nFieldLen = pSBase->WW8ReadString( *pStrm, sFieldName, nStartCp,
- nChunk, eStructCharSet );
+ sal_Int32 nFieldLen = m_pSBase->WW8ReadString( *m_pStrm, sFieldName, nStartCp,
+ nChunk, m_eStructCharSet );
nStartCp+=nFieldLen;
sal_Int32 nC = 0;
@@ -3585,8 +3585,8 @@ void SwWW8ImplReader::Read_FldVanish( sal_uInt16, const sal_uInt8*, short nLen )
{
// If Field End Mark found
if( nFieldLen && sFieldName[nC]==0x15 )
- bIgnoreText = false;
- pStrm->Seek( nOldPos );
+ m_bIgnoreText = false;
+ m_pStrm->Seek( nOldPos );
return; // kein Feld zu finden
}
@@ -3600,15 +3600,15 @@ void SwWW8ImplReader::Read_FldVanish( sal_uInt16, const sal_uInt8*, short nLen )
if (nFnd != -1)
break;
OUString sTemp;
- nFieldLen = pSBase->WW8ReadString( *pStrm, sTemp,
- nStartCp, nChunk, eStructCharSet );
+ nFieldLen = m_pSBase->WW8ReadString( *m_pStrm, sTemp,
+ nStartCp, nChunk, m_eStructCharSet );
sFieldName+=sTemp;
nStartCp+=nFieldLen;
if (!nFieldLen)
break;
}
- pStrm->Seek( nOldPos );
+ m_pStrm->Seek( nOldPos );
//if we have no 0x15 give up, otherwise erase everything from the 0x15
//onwards
@@ -3631,8 +3631,8 @@ void SwWW8ImplReader::Read_FldVanish( sal_uInt16, const sal_uInt8*, short nLen )
break; // keine Mehrfachnennungen moeglich
}
}
- bIgnoreText = true;
- pStrm->Seek( nOldPos );
+ m_bIgnoreText = true;
+ m_pStrm->Seek( nOldPos );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 9ac0f0e176f0..3bbfafdc9743 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -210,7 +210,7 @@ bool wwSection::IsVertical() const
*/
void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection)
{
- if (bVer67)
+ if (m_bVer67)
return;
rFmt.SetFmtAttr(SvxFrameDirectionItem(rSection.meDir, RES_FRAMEDIR));
@@ -259,21 +259,21 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection)
// seem to not add external leading in word, or the character would run across
// two line in some cases.
if (eType != GRID_NONE)
- rDoc.getIDocumentSettingAccess().set(DocumentSettingId::ADD_EXT_LEADING, false);
+ m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::ADD_EXT_LEADING, false);
//force to set document as standard page mode
bool bSquaredMode = false;
- rDoc.SetDefaultPageMode( bSquaredMode );
+ m_rDoc.SetDefaultPageMode( bSquaredMode );
aGrid.SetSquaredMode( bSquaredMode );
//Get the size of word's default styles font
sal_uInt32 nCharWidth=240;
- for (sal_uInt16 nI = 0; nI < pStyles->GetCount(); ++nI)
+ for (sal_uInt16 nI = 0; nI < m_pStyles->GetCount(); ++nI)
{
- if (vColl[nI].bValid && vColl[nI].pFmt &&
- vColl[nI].IsWW8BuiltInDefaultStyle())
+ if (m_vColl[nI].bValid && m_vColl[nI].pFmt &&
+ m_vColl[nI].IsWW8BuiltInDefaultStyle())
{
- nCharWidth = ItemGet<SvxFontHeightItem>(*(vColl[nI].pFmt),
+ nCharWidth = ItemGet<SvxFontHeightItem>(*(m_vColl[nI].pFmt),
RES_CHRATR_CJK_FONTSIZE).GetHeight();
break;
}
@@ -312,7 +312,7 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection)
void SwWW8ImplReader::Read_ParaBiDi(sal_uInt16, const sal_uInt8* pData, short nLen)
{
if( nLen < 0 )
- pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_FRAMEDIR);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_FRAMEDIR);
else
{
SvxFrameDirection eDir =
@@ -385,7 +385,7 @@ void wwSectionManager::SetLeftRight(wwSection &rSection)
*/
if (rSection.maSep.fRTLGutter)
nWWRi += nWWGu;
- else if (!mrReader.pWDop->iGutterPos)
+ else if (!mrReader.m_pWDop->iGutterPos)
nWWLe += nWWGu;
// Left / Right
@@ -527,7 +527,7 @@ void wwSectionManager::GetPageULData(const wwSection &rSection,
pages, that way the pages are at least the right size.
*/
if (
- (!mrReader.bVer67 && mrReader.pWDop->iGutterPos &&
+ (!mrReader.m_bVer67 && mrReader.m_pWDop->iGutterPos &&
rSection.maSep.fRTLGutter)
)
{
@@ -645,23 +645,23 @@ SwSectionFmt *wwSectionManager::InsertSection(
SwPaM& rMyPaM, wwSection &rSection)
{
SwSectionData aSection( CONTENT_SECTION,
- mrReader.rDoc.GetUniqueSectionName() );
+ mrReader.m_rDoc.GetUniqueSectionName() );
- SfxItemSet aSet( mrReader.rDoc.GetAttrPool(), aFrmFmtSetRange );
+ SfxItemSet aSet( mrReader.m_rDoc.GetAttrPool(), aFrmFmtSetRange );
bool nRTLPgn = !maSegments.empty() && maSegments.back().IsBiDi();
aSet.Put(SvxFrameDirectionItem(
nRTLPgn ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR));
- if (2 == mrReader.pWDop->fpc)
+ if (2 == mrReader.m_pWDop->fpc)
aSet.Put( SwFmtFtnAtTxtEnd(FTNEND_ATTXTEND));
- if (0 == mrReader.pWDop->epc)
+ if (0 == mrReader.m_pWDop->epc)
aSet.Put( SwFmtEndAtTxtEnd(FTNEND_ATTXTEND));
aSection.SetProtectFlag(SectionIsProtected(rSection));
rSection.mpSection =
- mrReader.rDoc.InsertSwSection( rMyPaM, aSection, 0, & aSet );
+ mrReader.m_rDoc.InsertSwSection( rMyPaM, aSection, 0, & aSet );
OSL_ENSURE(rSection.mpSection, "section not inserted!");
if (!rSection.mpSection)
return 0;
@@ -677,7 +677,7 @@ SwSectionFmt *wwSectionManager::InsertSection(
OSL_ENSURE(pPage, "no page outside this section!");
if (!pPage)
- pPage = &mrReader.rDoc.GetPageDesc(0);
+ pPage = &mrReader.m_rDoc.GetPageDesc(0);
if (!pPage)
return 0;
@@ -706,14 +706,14 @@ SwSectionFmt *wwSectionManager::InsertSection(
void SwWW8ImplReader::HandleLineNumbering(const wwSection &rSection)
{
// check if Line Numbering must be activated or resetted
- if (mbNewDoc && rSection.maSep.nLnnMod)
+ if (m_bNewDoc && rSection.maSep.nLnnMod)
{
// restart-numbering-mode: 0 per page, 1 per section, 2 never restart
bool bRestartLnNumPerSection = (1 == rSection.maSep.lnc);
- if (bNoLnNumYet)
+ if (m_bNoLnNumYet)
{
- SwLineNumberInfo aInfo( rDoc.GetLineNumberInfo() );
+ SwLineNumberInfo aInfo( m_rDoc.GetLineNumberInfo() );
aInfo.SetPaintLineNumbers(true);
@@ -731,13 +731,13 @@ void SwWW8ImplReader::HandleLineNumbering(const wwSection &rSection)
SvxNumberType aNumType; // this sets SVX_NUM_ARABIC per default
aInfo.SetNumType( aNumType );
- rDoc.SetLineNumberInfo( aInfo );
- bNoLnNumYet = false;
+ m_rDoc.SetLineNumberInfo( aInfo );
+ m_bNoLnNumYet = false;
}
if (
(0 < rSection.maSep.lnnMin) ||
- (bRestartLnNumPerSection && !bNoLnNumYet)
+ (bRestartLnNumPerSection && !m_bNoLnNumYet)
)
{
SwFmtLineNumber aLN;
@@ -748,9 +748,9 @@ void SwWW8ImplReader::HandleLineNumbering(const wwSection &rSection)
}
aLN.SetStartValue(1 + rSection.maSep.lnnMin);
NewAttr(aLN);
- pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_LINENUMBER);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_LINENUMBER);
}
- bNoLnNumYet = false;
+ m_bNoLnNumYet = false;
}
}
@@ -788,31 +788,31 @@ void wwSectionManager::CreateSep(const long nTxtPos, bool /*bMustHaveBreak*/)
elements like frames. Word itself ignores them in this case. The bug is
more likely that this filter created such documents in the past!
*/
- if (mrReader.nInTable || mrReader.bTxbxFlySection || mrReader.InLocalApo())
+ if (mrReader.m_nInTable || mrReader.m_bTxbxFlySection || mrReader.InLocalApo())
return;
- WW8PLCFx_SEPX* pSep = mrReader.pPlcxMan->GetSepPLCF();
+ WW8PLCFx_SEPX* pSep = mrReader.m_pPlcxMan->GetSepPLCF();
OSL_ENSURE(pSep, "impossible!");
if (!pSep)
return;
- if (!maSegments.empty() && mrReader.mpLastAnchorPos.get() && *mrReader.mpLastAnchorPos == *mrReader.pPaM->GetPoint())
+ if (!maSegments.empty() && mrReader.m_pLastAnchorPos.get() && *mrReader.m_pLastAnchorPos == *mrReader.m_pPaM->GetPoint())
{
bool insert = true;
- SwPaM pam( *mrReader.mpLastAnchorPos );
+ SwPaM pam( *mrReader.m_pLastAnchorPos );
if( pam.Move(fnMoveBackward, fnGoNode))
if( SwTxtNode* txtNode = pam.GetPoint()->nNode.GetNode().GetTxtNode())
if( txtNode->Len() == 0 )
insert = false;
if( insert )
- mrReader.AppendTxtNode(*mrReader.pPaM->GetPoint());
+ mrReader.AppendTxtNode(*mrReader.m_pPaM->GetPoint());
}
ww::WordVersion eVer = mrReader.GetFib().GetFIBVersion();
// M.M. Create a linked section if the WkbPLCF
// has an entry for one at this cp
- WW8PLCFspecial* pWkb = mrReader.pPlcxMan->GetWkbPLCF();
+ WW8PLCFspecial* pWkb = mrReader.m_pPlcxMan->GetWkbPLCF();
if (pWkb && pWkb->SeekPosExact(nTxtPos) &&
pWkb->Where() == nTxtPos)
{
@@ -821,24 +821,24 @@ void wwSectionManager::CreateSep(const long nTxtPos, bool /*bMustHaveBreak*/)
bool bSuccess = pWkb->Get(nTest, pData);
if (!bSuccess)
return;
- OUString sSectionName = mrReader.aLinkStringMap[SVBT16ToShort( static_cast<WW8_WKB*>(pData)->nLinkId) ];
+ OUString sSectionName = mrReader.m_aLinkStringMap[SVBT16ToShort( static_cast<WW8_WKB*>(pData)->nLinkId) ];
sSectionName = mrReader.ConvertFFileName(sSectionName);
SwSectionData aSection(FILE_LINK_SECTION, sSectionName);
aSection.SetLinkFileName( sSectionName );
aSection.SetProtectFlag(true);
// #i19922# - improvement: return value of method <Insert> not used.
- mrReader.rDoc.InsertSwSection(*mrReader.pPaM, aSection, 0, 0, false);
+ mrReader.m_rDoc.InsertSwSection(*mrReader.m_pPaM, aSection, 0, 0, false);
}
- wwSection aLastSection(*mrReader.pPaM->GetPoint());
+ wwSection aLastSection(*mrReader.m_pPaM->GetPoint());
if (!maSegments.empty())
aLastSection = maSegments.back();
//Here
- sal_uInt16 nLIdx = ( ( mrReader.pWwFib->lid & 0xff ) == 0x9 ) ? 1 : 0;
+ sal_uInt16 nLIdx = ( ( mrReader.m_pWwFib->lid & 0xff ) == 0x9 ) ? 1 : 0;
//BEGIN read section values
- wwSection aNewSection(*mrReader.pPaM->GetPoint());
+ wwSection aNewSection(*mrReader.m_pPaM->GetPoint());
static const sal_uInt16 aVer2Ids0[] =
{
@@ -1017,7 +1017,7 @@ void wwSectionManager::CreateSep(const long nTxtPos, bool /*bMustHaveBreak*/)
// #i31806# but only swap if 2page in 1sheet is enabled.
// its not clear if dmOrientPage is the correct member to
// decide on this but I am not about to 2nd guess cmc.
- if(mrReader.pWDop->doptypography.f2on1 &&
+ if(mrReader.m_pWDop->doptypography.f2on1 &&
aNewSection.maSep.dmOrientPage == 2)
std::swap(aNewSection.maSep.dxaLeft, aNewSection.maSep.dxaRight);
@@ -1123,7 +1123,7 @@ void wwSectionManager::CreateSep(const long nTxtPos, bool /*bMustHaveBreak*/)
if (eVer <= ww::eWW7)
aNewSection.maSep.grpfIhdt = ReadBSprm(pSep, eVer <= ww::eWW2 ? 128 : 153, 0);
- else if (mrReader.pHdFt)
+ else if (mrReader.m_pHdFt)
{
aNewSection.maSep.grpfIhdt = WW8_HEADER_ODD | WW8_FOOTER_ODD
| WW8_HEADER_FIRST | WW8_FOOTER_FIRST;
@@ -1134,7 +1134,7 @@ void wwSectionManager::CreateSep(const long nTxtPos, bool /*bMustHaveBreak*/)
// but aNewSection.HasTitlePage() will be false.
// Likewise for first page footer.
- if (mrReader.pWDop->fFacingPages)
+ if (mrReader.m_pWDop->fFacingPages)
aNewSection.maSep.grpfIhdt |= WW8_HEADER_EVEN | WW8_FOOTER_EVEN;
//See if we have a header or footer for each enabled possibility
@@ -1145,7 +1145,7 @@ void wwSectionManager::CreateSep(const long nTxtPos, bool /*bMustHaveBreak*/)
{
WW8_CP nStart;
long nLen;
- mrReader.pHdFt->GetTextPosExact( static_cast< short >(nI + ( maSegments.size() + 1) * 6), nStart, nLen);
+ mrReader.m_pHdFt->GetTextPosExact( static_cast< short >(nI + ( maSegments.size() + 1) * 6), nStart, nLen);
//No header or footer, inherit pervious one, or set to zero
//if no previous one
if (!nLen)
@@ -1178,37 +1178,37 @@ void SwWW8ImplReader::CopyPageDescHdFt(const SwPageDesc* pOrgPageDesc,
// copy odd header content section
if( nCode & WW8_HEADER_ODD )
{
- rDoc.CopyHeader(pOrgPageDesc->GetMaster(),
+ m_rDoc.CopyHeader(pOrgPageDesc->GetMaster(),
pNewPageDesc->GetMaster() );
}
// copy odd footer content section
if( nCode & WW8_FOOTER_ODD )
{
- rDoc.CopyFooter(pOrgPageDesc->GetMaster(),
+ m_rDoc.CopyFooter(pOrgPageDesc->GetMaster(),
pNewPageDesc->GetMaster());
}
// copy even header content section
if( nCode & WW8_HEADER_EVEN )
{
- rDoc.CopyHeader(pOrgPageDesc->GetLeft(),
+ m_rDoc.CopyHeader(pOrgPageDesc->GetLeft(),
pNewPageDesc->GetLeft());
}
// copy even footer content section
if( nCode & WW8_FOOTER_EVEN )
{
- rDoc.CopyFooter(pOrgPageDesc->GetLeft(),
+ m_rDoc.CopyFooter(pOrgPageDesc->GetLeft(),
pNewPageDesc->GetLeft());
}
// copy first page header content section
if( nCode & WW8_HEADER_FIRST )
{
- rDoc.CopyHeader(pOrgPageDesc->GetFirstMaster(),
+ m_rDoc.CopyHeader(pOrgPageDesc->GetFirstMaster(),
pNewPageDesc->GetFirstMaster());
}
// copy first page footer content section
if( nCode & WW8_FOOTER_FIRST )
{
- rDoc.CopyFooter(pOrgPageDesc->GetFirstMaster(),
+ m_rDoc.CopyFooter(pOrgPageDesc->GetFirstMaster(),
pNewPageDesc->GetFirstMaster());
}
}
@@ -1607,7 +1607,7 @@ void WW8FlyPara::Read(sal_uInt8 nOrigSp29, WW8PLCFx_Cp_FKP* pPap)
void WW8FlyPara::ReadFull(sal_uInt8 nOrigSp29, SwWW8ImplReader* pIo)
{
- WW8PLCFMan* pPlcxMan = pIo->pPlcxMan;
+ WW8PLCFMan* pPlcxMan = pIo->m_pPlcxMan;
WW8PLCFx_Cp_FKP* pPap = pPlcxMan->GetPapPLCF();
Read(nOrigSp29, pPap); // Lies Apo-Parameter
@@ -1615,10 +1615,10 @@ void WW8FlyPara::ReadFull(sal_uInt8 nOrigSp29, SwWW8ImplReader* pIo)
do{ // Block zum rausspringen
if( nSp45 != 0 /* || nSp28 != 0 */ )
break; // bGrafApo nur bei Hoehe automatisch
- if( pIo->pWwFib->fComplex )
+ if( pIo->m_pWwFib->fComplex )
break; // (*pPap)++ geht bei FastSave schief
// -> bei FastSave kein Test auf Grafik-APO
- SvStream* pIoStrm = pIo->pStrm;
+ SvStream* pIoStrm = pIo->m_pStrm;
sal_uLong nPos = pIoStrm->Tell();
WW8PLCFxSave1 aSave;
pPlcxMan->GetPap()->Save( aSave );
@@ -1650,9 +1650,9 @@ void WW8FlyPara::ReadFull(sal_uInt8 nOrigSp29, SwWW8ImplReader* pIo)
WW8FlyPara *pNowStyleApo=0;
sal_uInt16 nColl = pPap->GetIstd();
ww::sti eSti = eVer < ww::eWW6 ? ww::GetCanonicalStiFromStc( static_cast< sal_uInt8 >(nColl) ) : static_cast<ww::sti>(nColl);
- while (eSti != ww::stiNil && nColl < pIo->vColl.size() && 0 == (pNowStyleApo = pIo->vColl[nColl].pWWFly))
+ while (eSti != ww::stiNil && nColl < pIo->m_vColl.size() && 0 == (pNowStyleApo = pIo->m_vColl[nColl].pWWFly))
{
- nColl = pIo->vColl[nColl].nBase;
+ nColl = pIo->m_vColl[nColl].nBase;
eSti = eVer < ww::eWW6 ? ww::GetCanonicalStiFromStc( static_cast< sal_uInt8 >(nColl) ) : static_cast<ww::sti>(nColl);
}
@@ -1756,7 +1756,7 @@ WW8SwFlyPara::WW8SwFlyPara( SwPaM& rPaM,
eSurround = ( rWW.nSp37 > 1 ) ? SURROUND_IDEAL : SURROUND_NONE;
//#i119466 mapping "Around" wrap setting to "Parallel" for table
- const bool bIsTable = rIo.pPlcxMan->HasParaSprm(0x2416);
+ const bool bIsTable = rIo.m_pPlcxMan->HasParaSprm(0x2416);
if ( bIsTable && rWW.nSp37 == 2 )
eSurround = SURROUND_PARALLEL;
@@ -1816,7 +1816,7 @@ WW8SwFlyPara::WW8SwFlyPara( SwPaM& rPaM,
//#i53725# - absolute positioned objects have to be
// anchored at-paragraph to assure its correct anchor position.
eAnchor = FLY_AT_PARA;
- rIo.mpLastAnchorPos.reset( new SwPosition(*rPaM.GetPoint()));
+ rIo.m_pLastAnchorPos.reset( new SwPosition(*rPaM.GetPoint()));
switch (nYBind)
{
@@ -2009,9 +2009,9 @@ void WW8SwFlyPara::BoxUpWidth( long nInWidth )
// WW8FlySet-ctor fuer Apos und Graf-Apos
WW8FlySet::WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW,
const WW8SwFlyPara* pFS, bool bGraf)
- : SfxItemSet(rReader.rDoc.GetAttrPool(),RES_FRMATR_BEGIN,RES_FRMATR_END-1)
+ : SfxItemSet(rReader.m_rDoc.GetAttrPool(),RES_FRMATR_BEGIN,RES_FRMATR_END-1)
{
- if (!rReader.mbNewDoc)
+ if (!rReader.m_bNewDoc)
Reader::ResetFrmFmtAttrs(*this); // Abstand/Umrandung raus
// Position
Put(SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR));
@@ -2065,7 +2065,7 @@ WW8FlySet::WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW,
// WW8FlySet-ctor fuer zeichengebundene Grafiken
WW8FlySet::WW8FlySet( SwWW8ImplReader& rReader, const SwPaM* pPaM,
const WW8_PIC& rPic, long nWidth, long nHeight )
- : SfxItemSet(rReader.rDoc.GetAttrPool(),RES_FRMATR_BEGIN,RES_FRMATR_END-1)
+ : SfxItemSet(rReader.m_rDoc.GetAttrPool(),RES_FRMATR_BEGIN,RES_FRMATR_END-1)
{
Init(rReader, pPaM);
@@ -2099,7 +2099,7 @@ WW8FlySet::WW8FlySet( SwWW8ImplReader& rReader, const SwPaM* pPaM,
void WW8FlySet::Init(const SwWW8ImplReader& rReader, const SwPaM* pPaM)
{
- if (!rReader.mbNewDoc)
+ if (!rReader.m_bNewDoc)
Reader::ResetFrmFmtAttrs(*this); // Abstand/Umrandung raus
Put(SvxLRSpaceItem(RES_LR_SPACE)); //inline writer ole2 objects start with 0.2cm l/r
@@ -2110,7 +2110,7 @@ void WW8FlySet::Init(const SwWW8ImplReader& rReader, const SwPaM* pPaM)
//The horizontal default is on the baseline, the vertical is centered
//around the character center it appears
- if (rReader.maSectionManager.CurrentSectionIsVertical())
+ if (rReader.m_aSectionManager.CurrentSectionIsVertical())
Put(SwFmtVertOrient(0, text::VertOrientation::CHAR_CENTER,text::RelOrientation::CHAR));
else
Put(SwFmtVertOrient(0, text::VertOrientation::TOP, text::RelOrientation::FRAME));
@@ -2164,17 +2164,17 @@ void WW8DupProperties::Insert(const SwPosition &rPos)
void SwWW8ImplReader::MoveInsideFly(const SwFrmFmt *pFlyFmt)
{
- WW8DupProperties aDup(rDoc,pCtrlStck);
+ WW8DupProperties aDup(m_rDoc,m_pCtrlStck);
- pCtrlStck->SetAttr(*pPaM->GetPoint(), 0, false);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), 0, false);
// Setze Pam in den FlyFrame
const SwFmtCntnt& rCntnt = pFlyFmt->GetCntnt();
OSL_ENSURE( rCntnt.GetCntntIdx(), "Kein Inhalt vorbereitet." );
- pPaM->GetPoint()->nNode = rCntnt.GetCntntIdx()->GetIndex() + 1;
- pPaM->GetPoint()->nContent.Assign( pPaM->GetCntntNode(), 0 );
+ m_pPaM->GetPoint()->nNode = rCntnt.GetCntntIdx()->GetIndex() + 1;
+ m_pPaM->GetPoint()->nContent.Assign( m_pPaM->GetCntntNode(), 0 );
- aDup.Insert(*pPaM->GetPoint());
+ aDup.Insert(*m_pPaM->GetPoint());
}
SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrmFmt *pFlyFmt,
@@ -2185,8 +2185,8 @@ SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrmFmt *pFlyFmt,
return nRetWidth;
// Alle Attribute schliessen, da sonst Attribute entstehen koennen,
// die aus Flys rausragen
- WW8DupProperties aDup(rDoc,pCtrlStck);
- pCtrlStck->SetAttr(*pPaM->GetPoint(), 0, false);
+ WW8DupProperties aDup(m_rDoc,m_pCtrlStck);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), 0, false);
/*
#i1291
@@ -2250,8 +2250,8 @@ SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrmFmt *pFlyFmt,
}
}
- *pPaM->GetPoint() = rPos;
- aDup.Insert(*pPaM->GetPoint());
+ *m_pPaM->GetPoint() = rPos;
+ aDup.Insert(*m_pPaM->GetPoint());
return nRetWidth;
}
@@ -2262,7 +2262,7 @@ WW8FlyPara *SwWW8ImplReader::ConstructApo(const ApoTestResults &rApo,
OSL_ENSURE(rApo.HasFrame() || pTabPos,
"If no frame found, *MUST* be in a table");
- pRet = new WW8FlyPara(bVer67, rApo.mpStyleApo);
+ pRet = new WW8FlyPara(m_bVer67, rApo.mpStyleApo);
// APO-Parameter ermitteln und Test auf bGrafApo
if (rApo.HasFrame())
@@ -2280,14 +2280,14 @@ bool SwWW8ImplReader::IsDropCap()
// Find the DCS (Drop Cap Specifier) for the paragraph
// if does not exist or if the first three bits are 0
// then there is no dropcap on the paragraph
- WW8PLCFx_Cp_FKP *pPap = pPlcxMan ? pPlcxMan->GetPapPLCF() : 0;
+ WW8PLCFx_Cp_FKP *pPap = m_pPlcxMan ? m_pPlcxMan->GetPapPLCF() : 0;
if (pPap)
{
const sal_uInt8 *pDCS;
- if (bVer67)
+ if (m_bVer67)
pDCS = pPap->HasSprm(46);
else
- pDCS = pPlcxMan->GetPapPLCF()->HasSprm(0x442C);
+ pDCS = m_pPlcxMan->GetPapPLCF()->HasSprm(0x442C);
if(pDCS)
{
/*
@@ -2308,26 +2308,26 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo,
const WW8_TablePos *pTabPos,
SvxULSpaceItem* pULSpaceItem)
{
- if (0 == (pWFlyPara = ConstructApo(rApo, pTabPos)))
+ if (0 == (m_pWFlyPara = ConstructApo(rApo, pTabPos)))
return false;
// <WW8SwFlyPara> constructor has changed - new 4th parameter
// containing WW8 page top margin.
- pSFlyPara = new WW8SwFlyPara( *pPaM, *this, *pWFlyPara,
- maSectionManager.GetWWPageTopMargin(),
- maSectionManager.GetPageLeft(),
- maSectionManager.GetTextAreaWidth(),
- nIniFlyDx, nIniFlyDy);
+ m_pSFlyPara = new WW8SwFlyPara( *m_pPaM, *this, *m_pWFlyPara,
+ m_aSectionManager.GetWWPageTopMargin(),
+ m_aSectionManager.GetPageLeft(),
+ m_aSectionManager.GetTextAreaWidth(),
+ m_nIniFlyDx, m_nIniFlyDy);
// If this paragraph is a Dropcap set the flag and we will deal with it later
if (IsDropCap())
{
- bDropCap = true;
- pAktItemSet = new SfxItemSet( rDoc.GetAttrPool(), RES_CHRATR_BEGIN, RES_PARATR_END - 1 );
+ m_bDropCap = true;
+ m_pAktItemSet = new SfxItemSet( m_rDoc.GetAttrPool(), RES_CHRATR_BEGIN, RES_PARATR_END - 1 );
return false;
}
- if( !pWFlyPara->bGrafApo )
+ if( !m_pWFlyPara->bGrafApo )
{
// Within the GrafApo text attributes have to be ignored, because
@@ -2336,11 +2336,11 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo,
// frame, pWFlyPara and pSFlyPara are retained and the resulting
// attributes applied to the image when inserting the image.
- WW8FlySet aFlySet(*this, pWFlyPara, pSFlyPara, false);
+ WW8FlySet aFlySet(*this, m_pWFlyPara, m_pSFlyPara, false);
if (pTabPos && pTabPos->bNoFly)
{
- pSFlyPara->pFlyFmt = 0;
+ m_pSFlyPara->pFlyFmt = 0;
if (pULSpaceItem)
{
// Word positioned tables can have a position (like a
@@ -2359,37 +2359,37 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo,
}
else
{
- pSFlyPara->pFlyFmt = rDoc.MakeFlySection( pSFlyPara->eAnchor,
- pPaM->GetPoint(), &aFlySet );
- OSL_ENSURE(pSFlyPara->pFlyFmt->GetAnchor().GetAnchorId() ==
- pSFlyPara->eAnchor, "Not the anchor type requested!");
+ m_pSFlyPara->pFlyFmt = m_rDoc.MakeFlySection( m_pSFlyPara->eAnchor,
+ m_pPaM->GetPoint(), &aFlySet );
+ OSL_ENSURE(m_pSFlyPara->pFlyFmt->GetAnchor().GetAnchorId() ==
+ m_pSFlyPara->eAnchor, "Not the anchor type requested!");
}
- if (pSFlyPara->pFlyFmt)
+ if (m_pSFlyPara->pFlyFmt)
{
- if (!pDrawModel)
+ if (!m_pDrawModel)
GrafikCtor();
- SdrObject* pOurNewObject = CreateContactObject(pSFlyPara->pFlyFmt);
- pWWZOrder->InsertTextLayerObject(pOurNewObject);
+ SdrObject* pOurNewObject = CreateContactObject(m_pSFlyPara->pFlyFmt);
+ m_pWWZOrder->InsertTextLayerObject(pOurNewObject);
}
- if (FLY_AS_CHAR != pSFlyPara->eAnchor && pSFlyPara->pFlyFmt)
+ if (FLY_AS_CHAR != m_pSFlyPara->eAnchor && m_pSFlyPara->pFlyFmt)
{
- pAnchorStck->AddAnchor(*pPaM->GetPoint(),pSFlyPara->pFlyFmt);
+ m_pAnchorStck->AddAnchor(*m_pPaM->GetPoint(),m_pSFlyPara->pFlyFmt);
}
// remember Pos in body text
- pSFlyPara->pMainTextPos = new SwPosition( *pPaM->GetPoint() );
+ m_pSFlyPara->pMainTextPos = new SwPosition( *m_pPaM->GetPoint() );
//remove fltanchors, otherwise they will be closed inside the
//frame, which makes no sense, restore them after the frame is
//closed
- pSFlyPara->pOldAnchorStck = pAnchorStck;
- pAnchorStck = new SwWW8FltAnchorStack(&rDoc, nFieldFlags);
+ m_pSFlyPara->pOldAnchorStck = m_pAnchorStck;
+ m_pAnchorStck = new SwWW8FltAnchorStack(&m_rDoc, m_nFieldFlags);
- if (pSFlyPara->pFlyFmt)
- MoveInsideFly(pSFlyPara->pFlyFmt);
+ if (m_pSFlyPara->pFlyFmt)
+ MoveInsideFly(m_pSFlyPara->pFlyFmt);
// 1) ReadText() is not called recursively because the length of
// the Apo is unknown at that time, and ReadText() needs it.
@@ -2417,11 +2417,11 @@ bool SwWW8ImplReader::JoinNode(SwPaM &rPam, bool bStealAttr)
if (SwTxtNode* pNode = aPref.GetNode().GetTxtNode())
{
- maSectionManager.JoinNode(*rPam.GetPoint(), aPref.GetNode());
+ m_aSectionManager.JoinNode(*rPam.GetPoint(), aPref.GetNode());
rPam.GetPoint()->nNode = aPref;
rPam.GetPoint()->nContent.Assign(pNode, pNode->GetTxt().getLength());
if (bStealAttr)
- pCtrlStck->StealAttr(rPam.GetPoint()->nNode);
+ m_pCtrlStck->StealAttr(rPam.GetPoint()->nNode);
pNode->JoinNext();
@@ -2458,21 +2458,21 @@ void SwWW8ImplReader::StripNegativeAfterIndent(SwFrmFmt *pFlyFmt) const
void SwWW8ImplReader::StopApo()
{
- OSL_ENSURE(pWFlyPara, "no pWFlyPara to close");
- if (!pWFlyPara)
+ OSL_ENSURE(m_pWFlyPara, "no pWFlyPara to close");
+ if (!m_pWFlyPara)
return;
- if (pWFlyPara->bGrafApo)
+ if (m_pWFlyPara->bGrafApo)
{
// image frame that has not been inserted: delete empty paragraph + attr
- JoinNode(*pPaM, true);
+ JoinNode(*m_pPaM, true);
}
else
{
- if (!pSFlyPara->pMainTextPos || !pWFlyPara)
+ if (!m_pSFlyPara->pMainTextPos || !m_pWFlyPara)
{
- OSL_ENSURE( pSFlyPara->pMainTextPos, "StopApo: pMainTextPos ist 0" );
- OSL_ENSURE( pWFlyPara, "StopApo: pWFlyPara ist 0" );
+ OSL_ENSURE( m_pSFlyPara->pMainTextPos, "StopApo: pMainTextPos ist 0" );
+ OSL_ENSURE( m_pWFlyPara, "StopApo: pWFlyPara ist 0" );
return;
}
@@ -2490,17 +2490,17 @@ void SwWW8ImplReader::StopApo()
that comes with the frame by default so that as normal we don't end up
with one more paragraph than we wanted.
*/
- SwNodeIndex aPref(pPaM->GetPoint()->nNode, -1);
+ SwNodeIndex aPref(m_pPaM->GetPoint()->nNode, -1);
SwTwips nNewWidth =
- MoveOutsideFly(pSFlyPara->pFlyFmt, *pSFlyPara->pMainTextPos);
+ MoveOutsideFly(m_pSFlyPara->pFlyFmt, *m_pSFlyPara->pMainTextPos);
if (nNewWidth)
- pSFlyPara->BoxUpWidth(nNewWidth);
+ m_pSFlyPara->BoxUpWidth(nNewWidth);
Color aBg(0xFE, 0xFF, 0xFF, 0xFF); //Transparent by default
SwTxtNode* pNd = aPref.GetNode().GetTxtNode();
- if (pNd && pSFlyPara->pFlyFmt)
+ if (pNd && m_pSFlyPara->pFlyFmt)
{
/*
#i582#
@@ -2517,22 +2517,22 @@ void SwWW8ImplReader::StopApo()
pNd->JoinNext();
}
- if (pSFlyPara->pFlyFmt)
- pSFlyPara->pFlyFmt->SetFmtAttr(SvxBrushItem(aBg, RES_BACKGROUND));
+ if (m_pSFlyPara->pFlyFmt)
+ m_pSFlyPara->pFlyFmt->SetFmtAttr(SvxBrushItem(aBg, RES_BACKGROUND));
DeleteAnchorStk();
- pAnchorStck = pSFlyPara->pOldAnchorStck;
+ m_pAnchorStck = m_pSFlyPara->pOldAnchorStck;
// When inserting a graphic into the fly frame using the auto
// function, the extension of the SW-fly has to be set
// manually as the SW fly has no auto function to adjust the
// frame´s size.
- if(pSFlyPara->nNewNetWidth > MINFLY && pSFlyPara->pFlyFmt) // BoxUpWidth ?
+ if(m_pSFlyPara->nNewNetWidth > MINFLY && m_pSFlyPara->pFlyFmt) // BoxUpWidth ?
{
- long nW = pSFlyPara->nNewNetWidth;
- nW += pSFlyPara->nWidth - pSFlyPara->nNetWidth; // Rand dazu
- pSFlyPara->pFlyFmt->SetFmtAttr(
- SwFmtFrmSize( pSFlyPara->eHeightFix, nW, pSFlyPara->nHeight ) );
+ long nW = m_pSFlyPara->nNewNetWidth;
+ nW += m_pSFlyPara->nWidth - m_pSFlyPara->nNetWidth; // Rand dazu
+ m_pSFlyPara->pFlyFmt->SetFmtAttr(
+ SwFmtFrmSize( m_pSFlyPara->eHeightFix, nW, m_pSFlyPara->nHeight ) );
}
/*
Word set *no* width meaning its an automatic width. The
@@ -2542,47 +2542,47 @@ void SwWW8ImplReader::StopApo()
#i27204# Added AutoWidth setting. Left the old CalculateFlySize in place
so that if the user unselects autowidth, the width doesn't max out
*/
- else if( !pWFlyPara->nSp28 && pSFlyPara->pFlyFmt)
+ else if( !m_pWFlyPara->nSp28 && m_pSFlyPara->pFlyFmt)
{
using namespace sw::util;
- SfxItemSet aFlySet( pSFlyPara->pFlyFmt->GetAttrSet() );
+ SfxItemSet aFlySet( m_pSFlyPara->pFlyFmt->GetAttrSet() );
SwFmtFrmSize aSize(ItemGet<SwFmtFrmSize>(aFlySet, RES_FRM_SIZE));
aFlySet.ClearItem(RES_FRM_SIZE);
- CalculateFlySize(aFlySet, pSFlyPara->pMainTextPos->nNode,
- pSFlyPara->nWidth);
+ CalculateFlySize(aFlySet, m_pSFlyPara->pMainTextPos->nNode,
+ m_pSFlyPara->nWidth);
nNewWidth = ItemGet<SwFmtFrmSize>(aFlySet, RES_FRM_SIZE).GetWidth();
aSize.SetWidth(nNewWidth);
aSize.SetWidthSizeType(ATT_VAR_SIZE);
- pSFlyPara->pFlyFmt->SetFmtAttr(aSize);
+ m_pSFlyPara->pFlyFmt->SetFmtAttr(aSize);
}
- delete pSFlyPara->pMainTextPos, pSFlyPara->pMainTextPos = 0;
+ delete m_pSFlyPara->pMainTextPos, m_pSFlyPara->pMainTextPos = 0;
// To create the SwFrms when inserting into an existing document, fltshell.cxx
// will call pFlyFrm->MakeFrms() when setting the FltAnchor attribute
}
//#i8062#
- if (pSFlyPara && pSFlyPara->pFlyFmt)
- pFmtOfJustInsertedApo = pSFlyPara->pFlyFmt;
+ if (m_pSFlyPara && m_pSFlyPara->pFlyFmt)
+ m_pFmtOfJustInsertedApo = m_pSFlyPara->pFlyFmt;
- DELETEZ( pSFlyPara );
- DELETEZ( pWFlyPara );
+ DELETEZ( m_pSFlyPara );
+ DELETEZ( m_pWFlyPara );
}
// TestSameApo() returns if it's the same Apo or a different one
bool SwWW8ImplReader::TestSameApo(const ApoTestResults &rApo,
const WW8_TablePos *pTabPos)
{
- if( !pWFlyPara )
+ if( !m_pWFlyPara )
{
- OSL_ENSURE( pWFlyPara, " Wo ist mein pWFlyPara ? " );
+ OSL_ENSURE( m_pWFlyPara, " Wo ist mein pWFlyPara ? " );
return true;
}
@@ -2592,53 +2592,53 @@ bool SwWW8ImplReader::TestSameApo(const ApoTestResults &rApo,
// die harten Attrs angewendet, und dann verglichen
// Zum Vergleich
- WW8FlyPara aF(bVer67, rApo.mpStyleApo);
+ WW8FlyPara aF(m_bVer67, rApo.mpStyleApo);
// WWPara fuer akt. Para
if (rApo.HasFrame())
- aF.Read(rApo.m_nSprm29, pPlcxMan->GetPapPLCF());
+ aF.Read(rApo.m_nSprm29, m_pPlcxMan->GetPapPLCF());
aF.ApplyTabPos(pTabPos);
- return aF == *pWFlyPara;
+ return aF == *m_pWFlyPara;
}
void SwWW8ImplReader::NewAttr( const SfxPoolItem& rAttr,
const bool bFirstLineOfStSet,
const bool bLeftIndentSet )
{
- if( !bNoAttrImport ) // zum Ignorieren von Styles beim Doc-Einfuegen
+ if( !m_bNoAttrImport ) // zum Ignorieren von Styles beim Doc-Einfuegen
{
- if (pAktColl)
+ if (m_pAktColl)
{
OSL_ENSURE(rAttr.Which() != RES_FLTR_REDLINE, "redline in style!");
- pAktColl->SetFmtAttr(rAttr);
+ m_pAktColl->SetFmtAttr(rAttr);
}
- else if (pAktItemSet)
+ else if (m_pAktItemSet)
{
- pAktItemSet->Put(rAttr);
+ m_pAktItemSet->Put(rAttr);
}
else if (rAttr.Which() == RES_FLTR_REDLINE)
{
- mpRedlineStack->open(*pPaM->GetPoint(), rAttr);
+ m_pRedlineStack->open(*m_pPaM->GetPoint(), rAttr);
}
else
{
- pCtrlStck->NewAttr(*pPaM->GetPoint(), rAttr);
+ m_pCtrlStck->NewAttr(*m_pPaM->GetPoint(), rAttr);
// #i103711#
if ( bFirstLineOfStSet )
{
- const SwNode* pNd = &(pPaM->GetPoint()->nNode.GetNode());
- maTxtNodesHavingFirstLineOfstSet.insert( pNd );
+ const SwNode* pNd = &(m_pPaM->GetPoint()->nNode.GetNode());
+ m_aTxtNodesHavingFirstLineOfstSet.insert( pNd );
}
// #i105414#
if ( bLeftIndentSet )
{
- const SwNode* pNd = &(pPaM->GetPoint()->nNode.GetNode());
- maTxtNodesHavingLeftIndentSet.insert( pNd );
+ const SwNode* pNd = &(m_pPaM->GetPoint()->nNode.GetNode());
+ m_aTxtNodesHavingLeftIndentSet.insert( pNd );
}
}
- if (mpPostProcessAttrsInfo && mpPostProcessAttrsInfo->mbCopy)
- mpPostProcessAttrsInfo->mItemSet.Put(rAttr);
+ if (m_pPostProcessAttrsInfo && m_pPostProcessAttrsInfo->mbCopy)
+ m_pPostProcessAttrsInfo->mItemSet.Put(rAttr);
}
}
@@ -2646,34 +2646,34 @@ void SwWW8ImplReader::NewAttr( const SfxPoolItem& rAttr,
const SfxPoolItem* SwWW8ImplReader::GetFmtAttr( sal_uInt16 nWhich )
{
const SfxPoolItem* pRet = 0;
- if (pAktColl)
- pRet = &(pAktColl->GetFmtAttr(nWhich));
- else if (pAktItemSet)
+ if (m_pAktColl)
+ pRet = &(m_pAktColl->GetFmtAttr(nWhich));
+ else if (m_pAktItemSet)
{
- pRet = pAktItemSet->GetItem(nWhich);
+ pRet = m_pAktItemSet->GetItem(nWhich);
if (!pRet)
- pRet = pStandardFmtColl ? &(pStandardFmtColl->GetFmtAttr(nWhich)) : 0;
+ pRet = m_pStandardFmtColl ? &(m_pStandardFmtColl->GetFmtAttr(nWhich)) : 0;
if (!pRet)
- pRet = &rDoc.GetAttrPool().GetDefaultItem(nWhich);
+ pRet = &m_rDoc.GetAttrPool().GetDefaultItem(nWhich);
}
- else if (pPlcxMan && pPlcxMan->GetDoingDrawTextBox())
+ else if (m_pPlcxMan && m_pPlcxMan->GetDoingDrawTextBox())
{
- pRet = pCtrlStck->GetStackAttr(*pPaM->GetPoint(), nWhich);
+ pRet = m_pCtrlStck->GetStackAttr(*m_pPaM->GetPoint(), nWhich);
if (!pRet)
{
- if (nAktColl < vColl.size() && vColl[nAktColl].pFmt &&
- vColl[nAktColl].bColl)
+ if (m_nAktColl < m_vColl.size() && m_vColl[m_nAktColl].pFmt &&
+ m_vColl[m_nAktColl].bColl)
{
- pRet = &(vColl[nAktColl].pFmt->GetFmtAttr(nWhich));
+ pRet = &(m_vColl[m_nAktColl].pFmt->GetFmtAttr(nWhich));
}
}
if (!pRet)
- pRet = pStandardFmtColl ? &(pStandardFmtColl->GetFmtAttr(nWhich)) : 0;
+ pRet = m_pStandardFmtColl ? &(m_pStandardFmtColl->GetFmtAttr(nWhich)) : 0;
if (!pRet)
- pRet = &rDoc.GetAttrPool().GetDefaultItem(nWhich);
+ pRet = &m_rDoc.GetAttrPool().GetDefaultItem(nWhich);
}
else
- pRet = pCtrlStck->GetFmtAttr(*pPaM->GetPoint(), nWhich);
+ pRet = m_pCtrlStck->GetFmtAttr(*m_pPaM->GetPoint(), nWhich);
return pRet;
}
@@ -2683,31 +2683,31 @@ void SwWW8ImplReader::Read_Special(sal_uInt16, const sal_uInt8* pData, short nLe
{
if( nLen < 0 )
{
- bSpec = false;
+ m_bSpec = false;
return;
}
- bSpec = ( *pData != 0 );
+ m_bSpec = ( *pData != 0 );
}
// Read_Obj wird fuer fObj und fuer fOle2 benutzt !
void SwWW8ImplReader::Read_Obj(sal_uInt16 , const sal_uInt8* pData, short nLen)
{
if( nLen < 0 )
- bObj = false;
+ m_bObj = false;
else
{
- bObj = 0 != *pData;
+ m_bObj = 0 != *pData;
- if( bObj && nPicLocFc && bEmbeddObj )
+ if( m_bObj && m_nPicLocFc && m_bEmbeddObj )
{
- if (!maFieldStack.empty() && maFieldStack.back().mnFieldId == 56)
+ if (!m_aFieldStack.empty() && m_aFieldStack.back().mnFieldId == 56)
{
// For LINK fields, store the nObjLocFc value in the field entry
- maFieldStack.back().mnObjLocFc = nPicLocFc;
+ m_aFieldStack.back().mnObjLocFc = m_nPicLocFc;
}
else
{
- nObjLocFc = nPicLocFc;
+ m_nObjLocFc = m_nPicLocFc;
}
}
}
@@ -2717,16 +2717,16 @@ void SwWW8ImplReader::Read_PicLoc(sal_uInt16 , const sal_uInt8* pData, short nLe
{
if( nLen < 0 )
{
- nPicLocFc = 0;
- bSpec = false; // Stimmt das immer ?
+ m_nPicLocFc = 0;
+ m_bSpec = false; // Stimmt das immer ?
}
else
{
- nPicLocFc = SVBT32ToUInt32( pData );
- bSpec = true;
+ m_nPicLocFc = SVBT32ToUInt32( pData );
+ m_bSpec = true;
- if( bObj && nPicLocFc && bEmbeddObj )
- nObjLocFc = nPicLocFc;
+ if( m_bObj && m_nPicLocFc && m_bEmbeddObj )
+ m_nObjLocFc = m_nPicLocFc;
}
}
@@ -2734,13 +2734,13 @@ void SwWW8ImplReader::Read_POutLvl(sal_uInt16, const sal_uInt8* pData, short nLe
{
if (nLen < 0)
{
- pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_PARATR_OUTLINELEVEL);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_PARATR_OUTLINELEVEL);
return;
}
- if (pAktColl != NULL)
+ if (m_pAktColl != NULL)
{
- SwWW8StyInf* pSI = GetStyle(nAktColl);
+ SwWW8StyInf* pSI = GetStyle(m_nAktColl);
if (pSI != NULL)
{
pSI->mnWW8OutlineLevel =
@@ -2748,7 +2748,7 @@ void SwWW8ImplReader::Read_POutLvl(sal_uInt16, const sal_uInt8* pData, short nLe
NewAttr( SfxUInt16Item( RES_PARATR_OUTLINELEVEL, SwWW8StyInf::WW8OutlineLevelToOutlinelevel( pSI->mnWW8OutlineLevel ) ) );
}
}
- else if (pPaM != NULL)
+ else if (m_pPaM != NULL)
{
const sal_uInt8 nOutlineLevel
= SwWW8StyInf::WW8OutlineLevelToOutlinelevel(
@@ -2759,14 +2759,14 @@ void SwWW8ImplReader::Read_POutLvl(sal_uInt16, const sal_uInt8* pData, short nLe
void SwWW8ImplReader::Read_Symbol(sal_uInt16, const sal_uInt8* pData, short nLen )
{
- if( !bIgnoreText )
+ if( !m_bIgnoreText )
{
if( nLen < 0 )
{
//otherwise disable after we print the char
- if (pPlcxMan && pPlcxMan->GetDoingDrawTextBox())
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_FONT );
- bSymbol = false;
+ if (m_pPlcxMan && m_pPlcxMan->GetDoingDrawTextBox())
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_FONT );
+ m_bSymbol = false;
}
else
{
@@ -2779,19 +2779,19 @@ void SwWW8ImplReader::Read_Symbol(sal_uInt16, const sal_uInt8* pData, short nLen
//themselves so they don't need to add it to the stack either.
if (SetNewFontAttr(SVBT16ToShort( pData ), false, RES_CHRATR_FONT))
{
- if( bVer67 )
+ if( m_bVer67 )
{
//convert single byte from MS1252 to Unicode
- cSymbol = OUString(
+ m_cSymbol = OUString(
reinterpret_cast<const sal_Char*>(pData+2), 1,
RTL_TEXTENCODING_MS_1252).toChar();
}
else
{
//already is Unicode
- cSymbol = SVBT16ToShort( pData+2 );
+ m_cSymbol = SVBT16ToShort( pData+2 );
}
- bSymbol = true;
+ m_bSymbol = true;
}
}
}
@@ -2799,7 +2799,7 @@ void SwWW8ImplReader::Read_Symbol(sal_uInt16, const sal_uInt8* pData, short nLen
SwWW8StyInf *SwWW8ImplReader::GetStyle(sal_uInt16 nColl) const
{
- return const_cast<SwWW8StyInf *>(nColl < vColl.size() ? &vColl[nColl] : 0);
+ return const_cast<SwWW8StyInf *>(nColl < m_vColl.size() ? &m_vColl[nColl] : 0);
}
// Read_BoldUsw fuer Italic, Bold, Kapitaelchen, Versalien, durchgestrichen,
@@ -2825,7 +2825,7 @@ void SwWW8ImplReader::Read_BoldUsw( sal_uInt16 nId, const sal_uInt8* pData, shor
RES_CHRATR_CTL_WEIGHT, RES_CHRATR_CTL_POSTURE
};
- ww::WordVersion eVersion = pWwFib->GetFIBVersion();
+ ww::WordVersion eVersion = m_pWwFib->GetFIBVersion();
sal_uInt8 nI;
// die Attribut-Nr fuer "doppelt durchgestrichen" tanzt aus der Reihe
@@ -2852,35 +2852,35 @@ void SwWW8ImplReader::Read_BoldUsw( sal_uInt16 nId, const sal_uInt8* pData, shor
{
// reset the CTL Weight and Posture, because they are the same as their
// western equivalents in ww6
- pCtrlStck->SetAttr( *pPaM->GetPoint(), nEndIds[ nWestern + nEastern + nI ] );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), nEndIds[ nWestern + nEastern + nI ] );
}
// reset the CJK Weight and Posture, because they are the same as their
// western equivalents in word
- pCtrlStck->SetAttr( *pPaM->GetPoint(), nEndIds[ nWestern + nI ] );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), nEndIds[ nWestern + nI ] );
}
- pCtrlStck->SetAttr( *pPaM->GetPoint(), nEndIds[ nI ] );
- pCtrlStck->SetToggleAttr(nI, false);
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), nEndIds[ nI ] );
+ m_pCtrlStck->SetToggleAttr(nI, false);
return;
}
// Wert: 0 = Aus, 1 = An, 128 = Wie Style, 129 entgegen Style
bool bOn = *pData & 1;
- SwWW8StyInf* pSI = GetStyle(nAktColl);
- if (pPlcxMan && eVersion > ww::eWW2)
+ SwWW8StyInf* pSI = GetStyle(m_nAktColl);
+ if (m_pPlcxMan && eVersion > ww::eWW2)
{
const sal_uInt8 *pCharIstd =
- pPlcxMan->GetChpPLCF()->HasSprm(bVer67 ? 80 : 0x4A30);
+ m_pPlcxMan->GetChpPLCF()->HasSprm(m_bVer67 ? 80 : 0x4A30);
if (pCharIstd)
pSI = GetStyle(SVBT16ToShort(pCharIstd));
}
- if( pAktColl ) // StyleDef -> Flags merken
+ if( m_pAktColl ) // StyleDef -> Flags merken
{
if (pSI)
{
// The style based on has Bit 7 set ?
if (
- pSI->nBase < vColl.size() && (*pData & 0x80) &&
- (vColl[pSI->nBase].n81Flags & nMask)
+ pSI->nBase < m_vColl.size() && (*pData & 0x80) &&
+ (m_vColl[pSI->nBase].n81Flags & nMask)
)
{
bOn = !bOn; // umdrehen
@@ -2901,7 +2901,7 @@ void SwWW8ImplReader::Read_BoldUsw( sal_uInt16 nId, const sal_uInt8* pData, shor
if (pSI && pSI->n81Flags & nMask) // und in StyleDef an ?
bOn = !bOn; // dann invertieren
// am Stack vermerken, das dieses ein Toggle-Attribut ist
- pCtrlStck->SetToggleAttr(nI, true);
+ m_pCtrlStck->SetToggleAttr(nI, true);
}
}
@@ -2912,12 +2912,12 @@ void SwWW8ImplReader::Read_Bidi(sal_uInt16, const sal_uInt8* pData, short nLen)
{
if( nLen < 0 ) //Property end
{
- bBidi = false;
- pCtrlStck->SetAttr(*pPaM->GetPoint(),RES_CHRATR_BIDIRTL);
+ m_bBidi = false;
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(),RES_CHRATR_BIDIRTL);
}
else //Property start
{
- bBidi = true;
+ m_bBidi = true;
sal_uInt8 nBidi = *pData;
NewAttr( SfxInt16Item( RES_CHRATR_BIDIRTL, (nBidi!=0)? 1 : 0 ) );
}
@@ -2933,7 +2933,7 @@ void SwWW8ImplReader::Read_BoldBiDiUsw(sal_uInt16 nId, const sal_uInt8* pData,
};
sal_uInt8 nI;
- ww::WordVersion eVersion = pWwFib->GetFIBVersion();
+ ww::WordVersion eVersion = m_pWwFib->GetFIBVersion();
if (eVersion <= ww::eWW2)
nI = static_cast< sal_uInt8 >(nId - 80);
else if (eVersion < ww::eWW8)
@@ -2949,27 +2949,27 @@ void SwWW8ImplReader::Read_BoldBiDiUsw(sal_uInt16 nId, const sal_uInt8* pData,
if( nLen < 0 )
{
- pCtrlStck->SetAttr(*pPaM->GetPoint(),nEndIds[nI]);
- pCtrlStck->SetToggleBiDiAttr(nI, false);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(),nEndIds[nI]);
+ m_pCtrlStck->SetToggleBiDiAttr(nI, false);
return;
}
bool bOn = *pData & 1;
- SwWW8StyInf* pSI = GetStyle(nAktColl);
- if (pPlcxMan)
+ SwWW8StyInf* pSI = GetStyle(m_nAktColl);
+ if (m_pPlcxMan)
{
const sal_uInt8 *pCharIstd =
- pPlcxMan->GetChpPLCF()->HasSprm(bVer67 ? 80 : 0x4A30);
+ m_pPlcxMan->GetChpPLCF()->HasSprm(m_bVer67 ? 80 : 0x4A30);
if (pCharIstd)
pSI = GetStyle(SVBT16ToShort(pCharIstd));
}
- if (pAktColl && eVersion > ww::eWW2) // StyleDef -> Flags merken
+ if (m_pAktColl && eVersion > ww::eWW2) // StyleDef -> Flags merken
{
if (pSI)
{
- if( pSI->nBase < vColl.size() // Style Based on
+ if( pSI->nBase < m_vColl.size() // Style Based on
&& ( *pData & 0x80 ) // Bit 7 gesetzt ?
- && ( vColl[pSI->nBase].n81BiDiFlags & nMask ) ) // BasisMaske ?
+ && ( m_vColl[pSI->nBase].n81BiDiFlags & nMask ) ) // BasisMaske ?
bOn = !bOn; // umdrehen
if( bOn )
@@ -2987,7 +2987,7 @@ void SwWW8ImplReader::Read_BoldBiDiUsw(sal_uInt16 nId, const sal_uInt8* pData,
if (pSI && pSI->n81BiDiFlags & nMask) // und in StyleDef an ?
bOn = !bOn; // dann invertieren
// am Stack vermerken, das dieses ein Toggle-Attribut ist
- pCtrlStck->SetToggleBiDiAttr(nI, true);
+ m_pCtrlStck->SetToggleBiDiAttr(nI, true);
}
}
@@ -3021,7 +3021,7 @@ void SwWW8ImplReader::SetToggleBiDiAttr(sal_uInt8 nAttrId, bool bOn)
void SwWW8ImplReader::SetToggleAttr(sal_uInt8 nAttrId, bool bOn)
{
- ww::WordVersion eVersion = pWwFib->GetFIBVersion();
+ ww::WordVersion eVersion = m_pWwFib->GetFIBVersion();
switch (nAttrId)
{
@@ -3084,7 +3084,7 @@ void SwWW8ImplReader::SetToggleAttr(sal_uInt8 nAttrId, bool bOn)
void SwWW8ImplReader::_ChkToggleAttr( sal_uInt16 nOldStyle81Mask,
sal_uInt16 nNewStyle81Mask )
{
- sal_uInt16 i = 1, nToggleAttrFlags = pCtrlStck->GetToggleAttrFlags();
+ sal_uInt16 i = 1, nToggleAttrFlags = m_pCtrlStck->GetToggleAttrFlags();
for (sal_uInt8 n = 0; n < 7; ++n, i <<= 1)
{
if (
@@ -3100,7 +3100,7 @@ void SwWW8ImplReader::_ChkToggleAttr( sal_uInt16 nOldStyle81Mask,
void SwWW8ImplReader::_ChkToggleBiDiAttr( sal_uInt16 nOldStyle81Mask,
sal_uInt16 nNewStyle81Mask )
{
- sal_uInt16 i = 1, nToggleAttrFlags = pCtrlStck->GetToggleBiDiAttrFlags();
+ sal_uInt16 i = 1, nToggleAttrFlags = m_pCtrlStck->GetToggleBiDiAttrFlags();
for (sal_uInt8 n = 0; n < 7; ++n, i <<= 1)
{
if (
@@ -3116,7 +3116,7 @@ void SwWW8ImplReader::_ChkToggleBiDiAttr( sal_uInt16 nOldStyle81Mask,
void SwWW8ImplReader::Read_SubSuper( sal_uInt16, const sal_uInt8* pData, short nLen )
{
if( nLen < 0 ){
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_ESCAPEMENT );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_ESCAPEMENT );
return;
}
@@ -3184,20 +3184,20 @@ bool SwWW8ImplReader::ConvertSubToGraphicPlacement()
*/
bool bIsGraphicPlacementHack = false;
sal_uInt16 nPos;
- if (pCtrlStck->GetFmtStackAttr(RES_CHRATR_ESCAPEMENT, &nPos))
+ if (m_pCtrlStck->GetFmtStackAttr(RES_CHRATR_ESCAPEMENT, &nPos))
{
- SwPaM aRegion(*pPaM->GetPoint());
+ SwPaM aRegion(*m_pPaM->GetPoint());
- SwFltPosition aMkPos((*pCtrlStck)[nPos].m_aMkPos);
- SwFltPosition aPtPos(*pPaM->GetPoint());
+ SwFltPosition aMkPos((*m_pCtrlStck)[nPos].m_aMkPos);
+ SwFltPosition aPtPos(*m_pPaM->GetPoint());
SwFrmFmt *pFlyFmt = 0;
if (
- SwFltStackEntry::MakeRegion(&rDoc,aRegion,false,aMkPos,aPtPos) &&
+ SwFltStackEntry::MakeRegion(&m_rDoc,aRegion,false,aMkPos,aPtPos) &&
0 != (pFlyFmt = ContainsSingleInlineGraphic(aRegion))
)
{
- pCtrlStck->DeleteAndDestroy(nPos);
+ m_pCtrlStck->DeleteAndDestroy(nPos);
pFlyFmt->SetFmtAttr(SwFmtVertOrient(0, text::VertOrientation::CHAR_CENTER, text::RelOrientation::CHAR));
bIsGraphicPlacementHack = true;
}
@@ -3210,11 +3210,11 @@ void SwWW8ImplReader::Read_SubSuperProp( sal_uInt16, const sal_uInt8* pData, sho
if( nLen < 0 )
{
if (!ConvertSubToGraphicPlacement())
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_ESCAPEMENT );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_ESCAPEMENT );
return;
}
- ww::WordVersion eVersion = pWwFib->GetFIBVersion();
+ ww::WordVersion eVersion = m_pWwFib->GetFIBVersion();
// Font-Position in HalfPoints
short nPos = eVersion <= ww::eWW2 ? static_cast< sal_Int8 >( *pData ) : SVBT16ToShort( pData );
@@ -3271,8 +3271,8 @@ void SwWW8ImplReader::Read_Underline( sal_uInt16, const sal_uInt8* pData, short
// dann Stack ggfs. verwursteln und exit!
if( nLen < 0 )
{
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_UNDERLINE );
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_WORDLINEMODE );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_UNDERLINE );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_WORDLINEMODE );
}
else
{
@@ -3295,8 +3295,8 @@ void SwWW8ImplReader::Read_DoubleLine_Rotate( sal_uInt16, const sal_uInt8* pData
{
if( nLen < 0 ) // close the tag
{
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_TWO_LINES );
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_ROTATE );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_TWO_LINES );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_ROTATE );
}
else if( pData && 6 == nLen )
{
@@ -3329,11 +3329,11 @@ void SwWW8ImplReader::Read_DoubleLine_Rotate( sal_uInt16, const sal_uInt8* pData
void SwWW8ImplReader::Read_TxtColor( sal_uInt16, const sal_uInt8* pData, short nLen )
{
//Has newer colour variant, ignore this old variant
- if (!bVer67 && pPlcxMan && pPlcxMan->GetChpPLCF()->HasSprm(NS_sprm::LN_CCv))
+ if (!m_bVer67 && m_pPlcxMan && m_pPlcxMan->GetChpPLCF()->HasSprm(NS_sprm::LN_CCv))
return;
if( nLen < 0 )
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_COLOR );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_COLOR );
else
{
sal_uInt8 b = *pData; // Parameter: 0 = Auto, 1..16 Farben
@@ -3342,21 +3342,21 @@ void SwWW8ImplReader::Read_TxtColor( sal_uInt16, const sal_uInt8* pData, short n
b = 0;
NewAttr( SvxColorItem(Color(GetCol(b)), RES_CHRATR_COLOR));
- if (pAktColl && pStyles)
- pStyles->bTxtColChanged = true;
+ if (m_pAktColl && m_pStyles)
+ m_pStyles->bTxtColChanged = true;
}
}
void SwWW8ImplReader::Read_TxtForeColor(sal_uInt16, const sal_uInt8* pData, short nLen)
{
if( nLen < 0 )
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_COLOR );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_COLOR );
else
{
Color aColor(msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)));
NewAttr(SvxColorItem(aColor, RES_CHRATR_COLOR));
- if (pAktColl && pStyles)
- pStyles->bTxtColChanged = true;
+ if (m_pAktColl && m_pStyles)
+ m_pStyles->bTxtColChanged = true;
}
}
@@ -3372,36 +3372,36 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh
}
else
{
- if ( pAktColl ) //importing style
+ if ( m_pAktColl ) //importing style
{
- if( SfxItemState::SET == pAktColl->GetItemState( RES_CHRATR_UNDERLINE, false ) )
+ if( SfxItemState::SET == m_pAktColl->GetItemState( RES_CHRATR_UNDERLINE, false ) )
{
- const SwAttrSet& aSet = pAktColl->GetAttrSet();
+ const SwAttrSet& aSet = m_pAktColl->GetAttrSet();
SvxUnderlineItem *pUnderline
= static_cast<SvxUnderlineItem *>(aSet.Get( RES_CHRATR_UNDERLINE, false ).Clone());
if(pUnderline){
pUnderline->SetColor( Color( msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)) ) );
- pAktColl->SetFmtAttr( *pUnderline );
+ m_pAktColl->SetFmtAttr( *pUnderline );
delete pUnderline;
}
}
}
- else if ( pAktItemSet )
+ else if ( m_pAktItemSet )
{
- if ( SfxItemState::SET == pAktItemSet->GetItemState( RES_CHRATR_UNDERLINE, false ) )
+ if ( SfxItemState::SET == m_pAktItemSet->GetItemState( RES_CHRATR_UNDERLINE, false ) )
{
SvxUnderlineItem *pUnderline
- = static_cast<SvxUnderlineItem *>(pAktItemSet->Get( RES_CHRATR_UNDERLINE, false ) .Clone());
+ = static_cast<SvxUnderlineItem *>(m_pAktItemSet->Get( RES_CHRATR_UNDERLINE, false ) .Clone());
if(pUnderline){
pUnderline->SetColor( Color( msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)) ) );
- pAktItemSet->Put( *pUnderline );
+ m_pAktItemSet->Put( *pUnderline );
delete pUnderline;
}
}
}
else
{
- SvxUnderlineItem* pUnderlineAttr = const_cast<SvxUnderlineItem*>(static_cast<const SvxUnderlineItem*>(pCtrlStck->GetOpenStackAttr( *pPaM->GetPoint(), RES_CHRATR_UNDERLINE )));
+ SvxUnderlineItem* pUnderlineAttr = const_cast<SvxUnderlineItem*>(static_cast<const SvxUnderlineItem*>(m_pCtrlStck->GetOpenStackAttr( *m_pPaM->GetPoint(), RES_CHRATR_UNDERLINE )));
if( pUnderlineAttr != NULL )
pUnderlineAttr->SetColor( Color( msfilter::util::BGRToRGB(SVBT32ToUInt32( pData ))));
}
@@ -3422,7 +3422,7 @@ bool SwWW8ImplReader::GetFontParams( sal_uInt16 nFCode, FontFamily& reFamily,
FAMILY_SCRIPT, FAMILY_DECORATIVE, FAMILY_DONTKNOW, FAMILY_DONTKNOW
};
- const WW8_FFN* pF = pFonts->GetFont( nFCode ); // Info dazu
+ const WW8_FFN* pF = m_pFonts->GetFont( nFCode ); // Info dazu
if( !pF ) // FontNummer unbekannt ?
return false; // dann ignorieren
@@ -3433,13 +3433,13 @@ bool SwWW8ImplReader::GetFontParams( sal_uInt16 nFCode, FontFamily& reFamily,
// pF->chs: Charset
if( 77 == pF->chs ) // Mac-Font im Mac-Charset oder
- reCharSet = eTextCharSet; // auf ANSI-Charset uebersetzt
+ reCharSet = m_eTextCharSet; // auf ANSI-Charset uebersetzt
else
{ // patch from cmc for #i52786#
// #i52786#, for word 67 we'll assume that ANSI is basically invalid,
// might be true for (above) mac as well, but would need a mac example
// that exercises this to be sure
- if (bVer67 && pF->chs == 0)
+ if (m_bVer67 && pF->chs == 0)
reCharSet = RTL_TEXTENCODING_DONTKNOW;
else
reCharSet = rtl_getTextEncodingFromWindowsCharset( pF->chs );
@@ -3495,33 +3495,33 @@ bool SwWW8ImplReader::SetNewFontAttr(sal_uInt16 nFCode, bool bSetEnums,
//If we fail (and are not doing a style) then put something into the
//character encodings stack anyway so that the property end that pops
//off the stack will keep in sync
- if (!pAktColl && IsListOrDropcap())
+ if (!m_pAktColl && IsListOrDropcap())
{
if (nWhich == RES_CHRATR_CJK_FONT)
{
- if (!maFontSrcCJKCharSets.empty())
+ if (!m_aFontSrcCJKCharSets.empty())
{
- eSrcCharSet = maFontSrcCJKCharSets.top();
+ eSrcCharSet = m_aFontSrcCJKCharSets.top();
}
else
{
eSrcCharSet = RTL_TEXTENCODING_DONTKNOW;
}
- maFontSrcCJKCharSets.push(eSrcCharSet);
+ m_aFontSrcCJKCharSets.push(eSrcCharSet);
}
else
{
- if (!maFontSrcCharSets.empty())
+ if (!m_aFontSrcCharSets.empty())
{
- eSrcCharSet = maFontSrcCharSets.top();
+ eSrcCharSet = m_aFontSrcCharSets.top();
}
else
{
eSrcCharSet = RTL_TEXTENCODING_DONTKNOW;
}
- maFontSrcCharSets.push(eSrcCharSet);
+ m_aFontSrcCharSets.push(eSrcCharSet);
}
}
return false;
@@ -3533,19 +3533,19 @@ bool SwWW8ImplReader::SetNewFontAttr(sal_uInt16 nFCode, bool bSetEnums,
if( bSetEnums )
{
- if( pAktColl && nAktColl < vColl.size() ) // StyleDef
+ if( m_pAktColl && m_nAktColl < m_vColl.size() ) // StyleDef
{
switch(nWhich)
{
default:
case RES_CHRATR_FONT:
- vColl[nAktColl].eLTRFontSrcCharSet = eSrcCharSet;
+ m_vColl[m_nAktColl].eLTRFontSrcCharSet = eSrcCharSet;
break;
case RES_CHRATR_CTL_FONT:
- vColl[nAktColl].eRTLFontSrcCharSet = eSrcCharSet;
+ m_vColl[m_nAktColl].eRTLFontSrcCharSet = eSrcCharSet;
break;
case RES_CHRATR_CJK_FONT:
- vColl[nAktColl].eCJKFontSrcCharSet = eSrcCharSet;
+ m_vColl[m_nAktColl].eCJKFontSrcCharSet = eSrcCharSet;
break;
}
}
@@ -3553,9 +3553,9 @@ bool SwWW8ImplReader::SetNewFontAttr(sal_uInt16 nFCode, bool bSetEnums,
{
//Add character text encoding to stack
if (nWhich == RES_CHRATR_CJK_FONT)
- maFontSrcCJKCharSets.push(eSrcCharSet);
+ m_aFontSrcCJKCharSets.push(eSrcCharSet);
else
- maFontSrcCharSets.push(eSrcCharSet);
+ m_aFontSrcCharSets.push(eSrcCharSet);
}
}
@@ -3566,35 +3566,35 @@ bool SwWW8ImplReader::SetNewFontAttr(sal_uInt16 nFCode, bool bSetEnums,
void SwWW8ImplReader::ResetCharSetVars()
{
- OSL_ENSURE(!maFontSrcCharSets.empty(),"no charset to remove");
- if (!maFontSrcCharSets.empty())
- maFontSrcCharSets.pop();
+ OSL_ENSURE(!m_aFontSrcCharSets.empty(),"no charset to remove");
+ if (!m_aFontSrcCharSets.empty())
+ m_aFontSrcCharSets.pop();
}
void SwWW8ImplReader::ResetCJKCharSetVars()
{
- OSL_ENSURE(!maFontSrcCJKCharSets.empty(),"no charset to remove");
- if (!maFontSrcCJKCharSets.empty())
- maFontSrcCJKCharSets.pop();
+ OSL_ENSURE(!m_aFontSrcCJKCharSets.empty(),"no charset to remove");
+ if (!m_aFontSrcCJKCharSets.empty())
+ m_aFontSrcCJKCharSets.pop();
}
void SwWW8ImplReader::openFont(sal_uInt16 nFCode, sal_uInt16 nId)
{
- if (SetNewFontAttr(nFCode, true, nId) && pAktColl && pStyles)
+ if (SetNewFontAttr(nFCode, true, nId) && m_pAktColl && m_pStyles)
{
// merken zur Simulation Default-Font
if (RES_CHRATR_CJK_FONT == nId)
- pStyles->bCJKFontChanged = true;
+ m_pStyles->bCJKFontChanged = true;
else if (RES_CHRATR_CTL_FONT == nId)
- pStyles->bCTLFontChanged = true;
+ m_pStyles->bCTLFontChanged = true;
else
- pStyles->bFontChanged = true;
+ m_pStyles->bFontChanged = true;
}
}
void SwWW8ImplReader::closeFont(sal_uInt16 nId)
{
- pCtrlStck->SetAttr( *pPaM->GetPoint(), nId );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), nId );
if (nId == RES_CHRATR_CJK_FONT)
ResetCJKCharSetVars();
else
@@ -3606,7 +3606,7 @@ void SwWW8ImplReader::closeFont(sal_uInt16 nId)
*/
void SwWW8ImplReader::Read_FontCode( sal_uInt16 nId, const sal_uInt8* pData, short nLen )
{
- if (!bSymbol) // falls bSymbol, gilt der am Symbol
+ if (!m_bSymbol) // falls bSymbol, gilt der am Symbol
{ // (siehe sprmCSymbol) gesetzte Font !
switch( nId )
{
@@ -3628,7 +3628,7 @@ void SwWW8ImplReader::Read_FontCode( sal_uInt16 nId, const sal_uInt8* pData, sho
return ;
}
- ww::WordVersion eVersion = pWwFib->GetFIBVersion();
+ ww::WordVersion eVersion = m_pWwFib->GetFIBVersion();
if( nLen < 0 ) // Ende des Attributes
{
@@ -3670,15 +3670,15 @@ void SwWW8ImplReader::Read_FontSize( sal_uInt16 nId, const sal_uInt8* pData, sho
return ;
}
- ww::WordVersion eVersion = pWwFib->GetFIBVersion();
+ ww::WordVersion eVersion = m_pWwFib->GetFIBVersion();
if( nLen < 0 ) // Ende des Attributes
{
- pCtrlStck->SetAttr( *pPaM->GetPoint(), nId );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), nId );
if (eVersion <= ww::eWW6) // reset additionally the CTL size
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_CTL_FONTSIZE );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_CTL_FONTSIZE );
if (RES_CHRATR_FONTSIZE == nId) // reset additionally the CJK size
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_CJK_FONTSIZE );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_CJK_FONTSIZE );
}
else
{
@@ -3698,16 +3698,16 @@ void SwWW8ImplReader::Read_FontSize( sal_uInt16 nId, const sal_uInt8* pData, sho
aSz.SetWhich( RES_CHRATR_CTL_FONTSIZE );
NewAttr( aSz );
}
- if (pAktColl && pStyles) // Style-Def ?
+ if (m_pAktColl && m_pStyles) // Style-Def ?
{
// merken zur Simulation Default-FontSize
if (nId == RES_CHRATR_CTL_FONTSIZE)
- pStyles->bFCTLSizeChanged = true;
+ m_pStyles->bFCTLSizeChanged = true;
else
{
- pStyles->bFSizeChanged = true;
+ m_pStyles->bFSizeChanged = true;
if (eVersion <= ww::eWW6)
- pStyles->bFCTLSizeChanged= true;
+ m_pStyles->bFCTLSizeChanged= true;
}
}
}
@@ -3717,15 +3717,15 @@ void SwWW8ImplReader::Read_CharSet(sal_uInt16 , const sal_uInt8* pData, short nL
{
if( nLen < 0 )
{ // Ende des Attributes
- eHardCharSet = RTL_TEXTENCODING_DONTKNOW;
+ m_eHardCharSet = RTL_TEXTENCODING_DONTKNOW;
return;
}
sal_uInt8 nfChsDiff = *pData;
if( nfChsDiff )
- eHardCharSet = rtl_getTextEncodingFromWindowsCharset( *(pData + 1) );
+ m_eHardCharSet = rtl_getTextEncodingFromWindowsCharset( *(pData + 1) );
else
- eHardCharSet = RTL_TEXTENCODING_DONTKNOW;
+ m_eHardCharSet = RTL_TEXTENCODING_DONTKNOW;
}
void SwWW8ImplReader::Read_Language( sal_uInt16 nId, const sal_uInt8* pData, short nLen )
@@ -3751,7 +3751,7 @@ void SwWW8ImplReader::Read_Language( sal_uInt16 nId, const sal_uInt8* pData, sho
}
if( nLen < 0 ) // Ende des Attributes
- pCtrlStck->SetAttr( *pPaM->GetPoint(), nId );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), nId );
else
{
sal_uInt16 nLang = SVBT16ToShort( pData ); // Language-Id
@@ -3765,27 +3765,27 @@ void SwWW8ImplReader::Read_Language( sal_uInt16 nId, const sal_uInt8* pData, sho
void SwWW8ImplReader::Read_CColl( sal_uInt16, const sal_uInt8* pData, short nLen )
{
if( nLen < 0 ){ // Ende des Attributes
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_TXTATR_CHARFMT );
- nCharFmt = -1;
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_TXTATR_CHARFMT );
+ m_nCharFmt = -1;
return;
}
sal_uInt16 nId = SVBT16ToShort( pData ); // Style-Id (NICHT Sprm-Id!)
- if( nId >= vColl.size() || !vColl[nId].pFmt // ungueltige Id ?
- || vColl[nId].bColl ) // oder Para-Style ?
+ if( nId >= m_vColl.size() || !m_vColl[nId].pFmt // ungueltige Id ?
+ || m_vColl[nId].bColl ) // oder Para-Style ?
return; // dann ignorieren
// if current on loading a TOX field, and current trying to apply a hyperlink character style,
// just ignore. For the hyperlinks inside TOX in MS Word is not same with a common hyperlink
// Character styles: without underline and blue font color. And such type style will be applied in others
// processes.
- if (mbLoadingTOXCache && vColl[nId].GetWWStyleId() == ww::stiHyperlink)
+ if (m_bLoadingTOXCache && m_vColl[nId].GetWWStyleId() == ww::stiHyperlink)
{
return;
}
- NewAttr( SwFmtCharFmt( static_cast<SwCharFmt*>(vColl[nId].pFmt) ) );
- nCharFmt = (short) nId;
+ NewAttr( SwFmtCharFmt( static_cast<SwCharFmt*>(m_vColl[nId].pFmt) ) );
+ m_nCharFmt = (short) nId;
}
/*
@@ -3794,7 +3794,7 @@ void SwWW8ImplReader::Read_CColl( sal_uInt16, const sal_uInt8* pData, short nLen
void SwWW8ImplReader::Read_Kern( sal_uInt16, const sal_uInt8* pData, short nLen )
{
if( nLen < 0 ){ // Ende des Attributes
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_KERNING );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_KERNING );
return;
}
sal_Int16 nKern = SVBT16ToShort( pData ); // Kerning in Twips
@@ -3804,7 +3804,7 @@ void SwWW8ImplReader::Read_Kern( sal_uInt16, const sal_uInt8* pData, short nLen
void SwWW8ImplReader::Read_FontKern( sal_uInt16, const sal_uInt8* , short nLen )
{
if( nLen < 0 ) // Ende des Attributes
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_AUTOKERN );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_AUTOKERN );
else
NewAttr(SvxAutoKernItem(true, RES_CHRATR_AUTOKERN));
}
@@ -3812,18 +3812,18 @@ void SwWW8ImplReader::Read_FontKern( sal_uInt16, const sal_uInt8* , short nLen )
void SwWW8ImplReader::Read_CharShadow( sal_uInt16, const sal_uInt8* pData, short nLen )
{
//Has newer colour variant, ignore this old variant
- if (!bVer67 && pPlcxMan && pPlcxMan->GetChpPLCF()->HasSprm(0xCA71))
+ if (!m_bVer67 && m_pPlcxMan && m_pPlcxMan->GetChpPLCF()->HasSprm(0xCA71))
return;
if( nLen <= 0 )
{
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_BACKGROUND );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_BACKGROUND );
}
else
{
WW8_SHD aSHD;
aSHD.SetWWValue( *reinterpret_cast<SVBT16 const *>(pData) );
- SwWW8Shade aSh( bVer67, aSHD );
+ SwWW8Shade aSh( m_bVer67, aSHD );
NewAttr( SvxBrushItem( aSh.aColor, RES_CHRATR_BACKGROUND ));
@@ -3839,14 +3839,14 @@ void SwWW8ImplReader::Read_TxtBackColor(sal_uInt16, const sal_uInt8* pData, shor
{
if( nLen <= 0 )
{
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_BACKGROUND );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_BACKGROUND );
}
else
{
OSL_ENSURE(nLen == 10, "Len of para back colour not 10!");
if (nLen != 10)
return;
- Color aColour(ExtractColour(pData, bVer67));
+ Color aColour(ExtractColour(pData, m_bVer67));
NewAttr(SvxBrushItem(aColour, RES_CHRATR_BACKGROUND));
// Add a marker to the grabbag indicating that character background was imported from MSO shading
@@ -3861,7 +3861,7 @@ void SwWW8ImplReader::Read_CharHighlight(sal_uInt16, const sal_uInt8* pData, sho
{
if( nLen <= 0 )
{
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_HIGHLIGHT );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_HIGHLIGHT );
}
else
{
@@ -3879,7 +3879,7 @@ void SwWW8ImplReader::Read_NoLineNumb(sal_uInt16 , const sal_uInt8* pData, short
{
if( nLen < 0 ) // Ende des Attributes
{
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_LINENUMBER );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_LINENUMBER );
return;
}
SwFmtLineNumber aLN;
@@ -3910,7 +3910,7 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
{
if (nLen < 0) // End of the Attributes
{
- pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_LR_SPACE);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_LR_SPACE);
return;
}
@@ -3926,7 +3926,7 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
// for list levels of mode LABEL_ALIGNMENT.(see ww8par3.cxx
// W8ImplReader::RegisterNumFmtOnTxtNode).
// Need to apply the list format to the paragraph here.
- SwTxtNode* pTxtNode = pPaM->GetNode().GetTxtNode();
+ SwTxtNode* pTxtNode = m_pPaM->GetNode().GetTxtNode();
if( pTxtNode && pTxtNode->AreListLevelIndentsApplicable() )
{
SwNumRule * pNumRule = pTxtNode->GetNumRule();
@@ -3980,9 +3980,9 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
case 0x840F:
case 0x845E:
aLR.SetTxtLeft( nPara );
- if (pAktColl && nAktColl < vColl.size())
+ if (m_pAktColl && m_nAktColl < m_vColl.size())
{
- vColl[nAktColl].bListReleventIndentSet = true;
+ m_vColl[m_nAktColl].bListReleventIndentSet = true;
}
bLeftIndentSet = true; // #i105414#
break;
@@ -4001,13 +4001,13 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
been removed then we will factor the original list applied hanging
into our calculation.
*/
- if (pPlcxMan && nAktColl < vColl.size() && vColl[nAktColl].bHasBrokenWW6List)
+ if (m_pPlcxMan && m_nAktColl < m_vColl.size() && m_vColl[m_nAktColl].bHasBrokenWW6List)
{
- const sal_uInt8 *pIsZeroed = pPlcxMan->GetPapPLCF()->HasSprm(0x460B);
+ const sal_uInt8 *pIsZeroed = m_pPlcxMan->GetPapPLCF()->HasSprm(0x460B);
if (pIsZeroed && *pIsZeroed == 0)
{
const SvxLRSpaceItem &rLR =
- ItemGet<SvxLRSpaceItem>(*(vColl[nAktColl].pFmt),
+ ItemGet<SvxLRSpaceItem>(*(m_vColl[m_nAktColl].pFmt),
RES_LR_SPACE);
nPara = nPara - rLR.GetTxtFirstLineOfst();
}
@@ -4015,27 +4015,27 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
aLR.SetTxtFirstLineOfst(nPara);
- if (!pAktColl)
+ if (!m_pAktColl)
{
- if (const SwTxtNode* pNode = pPaM->GetNode().GetTxtNode())
+ if (const SwTxtNode* pNode = m_pPaM->GetNode().GetTxtNode())
{
if ( const SwNumFmt *pNumFmt = GetNumFmtFromTxtNode(*pNode) )
{
- if (!lcl_HasExplicitLeft(pPlcxMan, bVer67))
+ if (!lcl_HasExplicitLeft(m_pPlcxMan, m_bVer67))
{
aLR.SetTxtLeft(pNumFmt->GetIndentAt());
// If have not explicit left, set number format list tab position is doc default tab
- const SvxTabStopItem *pDefaultStopItem = static_cast<const SvxTabStopItem *>(rDoc.GetAttrPool().GetPoolDefaultItem(RES_PARATR_TABSTOP));
+ const SvxTabStopItem *pDefaultStopItem = static_cast<const SvxTabStopItem *>(m_rDoc.GetAttrPool().GetPoolDefaultItem(RES_PARATR_TABSTOP));
if ( pDefaultStopItem && pDefaultStopItem->Count() > 0 )
const_cast<SwNumFmt*>(pNumFmt)->SetListtabPos( ((SvxTabStop&)(*pDefaultStopItem)[0]).GetTabPos() );
}
}
}
}
- if (pAktColl && nAktColl < vColl.size())
+ if (m_pAktColl && m_nAktColl < m_vColl.size())
{
- vColl[nAktColl].bListReleventIndentSet = true;
+ m_vColl[m_nAktColl].bListReleventIndentSet = true;
}
bFirstLinOfstSet = true; // #i103711#
break;
@@ -4056,18 +4056,18 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
void SwWW8ImplReader::Read_LineSpace( sal_uInt16, const sal_uInt8* pData, short nLen )
{
// Kommentear siehe Read_UL()
- if (bStyNormal && bWWBugNormal)
+ if (m_bStyNormal && m_bWWBugNormal)
return;
if( nLen < 0 ){
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_PARATR_LINESPACING );
- if( !( nIniFlags & WW8FL_NO_IMPLPASP ) )
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_UL_SPACE );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_PARATR_LINESPACING );
+ if( !( m_nIniFlags & WW8FL_NO_IMPLPASP ) )
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_UL_SPACE );
return;
}
short nSpace = SVBT16ToShort( pData );
- ww::WordVersion eVersion = pWwFib->GetFIBVersion();
+ ww::WordVersion eVersion = m_pWwFib->GetFIBVersion();
short nMulti = (eVersion <= ww::eWW2) ? 1 : SVBT16ToShort( pData + 2 );
SvxLineSpace eLnSpc;
@@ -4113,8 +4113,8 @@ void SwWW8ImplReader::Read_LineSpace( sal_uInt16, const sal_uInt8* pData, short
aLSpc.GetLineSpaceRule() = eLnSpc;
}
NewAttr( aLSpc );
- if( pSFlyPara )
- pSFlyPara->nLineSpace = nSpaceTw; // LineSpace fuer Graf-Apos
+ if( m_pSFlyPara )
+ m_pSFlyPara->nLineSpace = nSpaceTw; // LineSpace fuer Graf-Apos
}
//#i18519# AutoSpace value depends on Dop fDontUseHTMLAutoSpacing setting
@@ -4130,26 +4130,26 @@ void SwWW8ImplReader::Read_ParaAutoBefore(sal_uInt16, const sal_uInt8 *pData, sh
{
if (nLen < 0)
{
- pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_UL_SPACE);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_UL_SPACE);
return;
}
if (*pData)
{
SvxULSpaceItem aUL(*static_cast<const SvxULSpaceItem*>(GetFmtAttr(RES_UL_SPACE)));
- aUL.SetUpper(GetParagraphAutoSpace(pWDop->fDontUseHTMLAutoSpacing));
+ aUL.SetUpper(GetParagraphAutoSpace(m_pWDop->fDontUseHTMLAutoSpacing));
NewAttr(aUL);
- if (pAktColl && nAktColl < vColl.size())
- vColl[nAktColl].bParaAutoBefore = true;
+ if (m_pAktColl && m_nAktColl < m_vColl.size())
+ m_vColl[m_nAktColl].bParaAutoBefore = true;
else
- bParaAutoBefore = true;
+ m_bParaAutoBefore = true;
}
else
{
- if (pAktColl && nAktColl < vColl.size())
- vColl[nAktColl].bParaAutoBefore = false;
+ if (m_pAktColl && m_nAktColl < m_vColl.size())
+ m_vColl[m_nAktColl].bParaAutoBefore = false;
else
- bParaAutoBefore = false;
+ m_bParaAutoBefore = false;
}
}
@@ -4157,26 +4157,26 @@ void SwWW8ImplReader::Read_ParaAutoAfter(sal_uInt16, const sal_uInt8 *pData, sho
{
if (nLen < 0)
{
- pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_UL_SPACE);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_UL_SPACE);
return;
}
if (*pData)
{
SvxULSpaceItem aUL(*static_cast<const SvxULSpaceItem*>(GetFmtAttr(RES_UL_SPACE)));
- aUL.SetLower(GetParagraphAutoSpace(pWDop->fDontUseHTMLAutoSpacing));
+ aUL.SetLower(GetParagraphAutoSpace(m_pWDop->fDontUseHTMLAutoSpacing));
NewAttr(aUL);
- if (pAktColl && nAktColl < vColl.size())
- vColl[nAktColl].bParaAutoAfter = true;
+ if (m_pAktColl && m_nAktColl < m_vColl.size())
+ m_vColl[m_nAktColl].bParaAutoAfter = true;
else
- bParaAutoAfter = true;
+ m_bParaAutoAfter = true;
}
else
{
- if (pAktColl && nAktColl < vColl.size())
- vColl[nAktColl].bParaAutoAfter = false;
+ if (m_pAktColl && m_nAktColl < m_vColl.size())
+ m_vColl[m_nAktColl].bParaAutoAfter = false;
else
- bParaAutoAfter = false;
+ m_bParaAutoAfter = false;
}
}
@@ -4198,7 +4198,7 @@ void SwWW8ImplReader::Read_UL( sal_uInt16 nId, const sal_uInt8* pData, short nLe
if( nLen < 0 )
{
// Ende des Attributes
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_UL_SPACE );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_UL_SPACE );
return;
}
short nPara = SVBT16ToShort( pData );
@@ -4230,7 +4230,7 @@ void SwWW8ImplReader::Read_ParaContextualSpacing( sal_uInt16, const sal_uInt8* p
{
if( nLen < 0 )
{
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_UL_SPACE );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_UL_SPACE );
return;
}
SvxULSpaceItem aUL( *static_cast<const SvxULSpaceItem*>(GetFmtAttr( RES_UL_SPACE )));
@@ -4247,7 +4247,7 @@ void SwWW8ImplReader::Read_IdctHint( sal_uInt16, const sal_uInt8* pData, short n
// when this value is 1, text properties bias towards far east properties.
if( nLen < 0 ) //Property end
{
- pCtrlStck->SetAttr(*pPaM->GetPoint(),RES_CHRATR_IDCTHINT);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(),RES_CHRATR_IDCTHINT);
}
else //Property start
{
@@ -4260,7 +4260,7 @@ void SwWW8ImplReader::Read_Justify( sal_uInt16, const sal_uInt8* pData, short nL
{
if( nLen < 0 )
{
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_PARATR_ADJUST );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_PARATR_ADJUST );
return;
}
@@ -4296,7 +4296,7 @@ bool SwWW8ImplReader::IsRightToLeft()
{
bool bRTL = false;
const sal_uInt8 *pDir =
- pPlcxMan ? pPlcxMan->GetPapPLCF()->HasSprm(0x2441) : 0;
+ m_pPlcxMan ? m_pPlcxMan->GetPapPLCF()->HasSprm(0x2441) : 0;
if (pDir)
bRTL = *pDir != 0;
else
@@ -4313,7 +4313,7 @@ void SwWW8ImplReader::Read_RTLJustify( sal_uInt16, const sal_uInt8* pData, short
{
if( nLen < 0 )
{
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_PARATR_ADJUST );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_PARATR_ADJUST );
return;
}
@@ -4371,7 +4371,7 @@ void SwWW8ImplReader::Read_BoolItem( sal_uInt16 nId, const sal_uInt8* pData, sho
}
if( nLen < 0 )
- pCtrlStck->SetAttr( *pPaM->GetPoint(), nId );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), nId );
else
{
SfxBoolItem* pI = static_cast<SfxBoolItem*>(GetDfltAttr( nId )->Clone());
@@ -4384,7 +4384,7 @@ void SwWW8ImplReader::Read_BoolItem( sal_uInt16 nId, const sal_uInt8* pData, sho
void SwWW8ImplReader::Read_Emphasis( sal_uInt16, const sal_uInt8* pData, short nLen )
{
if( nLen < 0 )
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_EMPHASIS_MARK );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_EMPHASIS_MARK );
else
{
LanguageType nLang;
@@ -4393,7 +4393,7 @@ void SwWW8ImplReader::Read_Emphasis( sal_uInt16, const sal_uInt8* pData, short n
//Only the cjk language setting seems to matter to word, the western
//one is ignored
const sal_uInt8 *pLang =
- pPlcxMan ? pPlcxMan->GetChpPLCF()->HasSprm(0x486E) : 0;
+ m_pPlcxMan ? m_pPlcxMan->GetChpPLCF()->HasSprm(0x486E) : 0;
if (pLang)
nLang = SVBT16ToShort( pLang );
@@ -4441,7 +4441,7 @@ void SwWW8ImplReader::Read_Emphasis( sal_uInt16, const sal_uInt8* pData, short n
void SwWW8ImplReader::Read_ScaleWidth( sal_uInt16, const sal_uInt8* pData, short nLen )
{
if( nLen < 0 )
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_SCALEW );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_SCALEW );
else
{
sal_uInt16 nVal = SVBT16ToShort( pData );
@@ -4455,7 +4455,7 @@ void SwWW8ImplReader::Read_ScaleWidth( sal_uInt16, const sal_uInt8* pData, short
void SwWW8ImplReader::Read_Relief( sal_uInt16 nId, const sal_uInt8* pData, short nLen )
{
if( nLen < 0 )
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_RELIEF );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_RELIEF );
else
{
if( *pData )
@@ -4482,7 +4482,7 @@ void SwWW8ImplReader::Read_Relief( sal_uInt16 nId, const sal_uInt8* pData, short
void SwWW8ImplReader::Read_TxtAnim(sal_uInt16 /*nId*/, const sal_uInt8* pData, short nLen)
{
if (nLen < 0)
- pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_CHRATR_BLINK);
+ m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_CHRATR_BLINK);
else
{
if (*pData)
@@ -4640,19 +4640,19 @@ void SwWW8Shade::SetShade(ColorData nFore, ColorData nBack, sal_uInt16 nIndex)
void SwWW8ImplReader::Read_Shade( sal_uInt16, const sal_uInt8* pData, short nLen )
{
- if (!bVer67 && pPlcxMan && pPlcxMan->GetPapPLCF()->HasSprm(0xC64D))
+ if (!m_bVer67 && m_pPlcxMan && m_pPlcxMan->GetPapPLCF()->HasSprm(0xC64D))
return;
if (nLen <= 0)
{
// Ende des Attributes
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_BACKGROUND );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_BACKGROUND );
}
else
{
WW8_SHD aSHD;
aSHD.SetWWValue( *reinterpret_cast<SVBT16 const *>(pData) );
- SwWW8Shade aSh( bVer67, aSHD );
+ SwWW8Shade aSh( m_bVer67, aSHD );
NewAttr(SvxBrushItem(aSh.aColor, RES_BACKGROUND));
}
@@ -4663,14 +4663,14 @@ void SwWW8ImplReader::Read_ParaBackColor(sal_uInt16, const sal_uInt8* pData, sho
if (nLen <= 0)
{
// Ende des Attributes
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_BACKGROUND );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_BACKGROUND );
}
else
{
OSL_ENSURE(nLen == 10, "Len of para back colour not 10!");
if (nLen != 10)
return;
- NewAttr(SvxBrushItem(Color(ExtractColour(pData, bVer67)), RES_BACKGROUND));
+ NewAttr(SvxBrushItem(Color(ExtractColour(pData, m_bVer67)), RES_BACKGROUND));
}
}
@@ -4698,33 +4698,33 @@ void SwWW8ImplReader::Read_Border(sal_uInt16 , const sal_uInt8*, short nLen)
{
if( nLen < 0 )
{
- if( bHasBorder )
+ if( m_bHasBorder )
{
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_BOX );
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_SHADOW );
- bHasBorder = false;
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_BOX );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_SHADOW );
+ m_bHasBorder = false;
}
}
- else if( !bHasBorder )
+ else if( !m_bHasBorder )
{
// die Borders auf allen 4 Seiten werden gebuendelt. dieses
// vereinfacht die Verwaltung, d.h. die Box muss nicht 4 mal auf den
// CtrlStack und wieder runter
- bHasBorder = true;
+ m_bHasBorder = true;
WW8_BRCVer9_5 aBrcs; // Top, Left, Bottom, Right, Between
sal_uInt8 nBorder;
- if( pAktColl )
- nBorder = ::lcl_ReadBorders(bVer67, aBrcs, 0, pStyles);
+ if( m_pAktColl )
+ nBorder = ::lcl_ReadBorders(m_bVer67, aBrcs, 0, m_pStyles);
else
- nBorder = ::lcl_ReadBorders(bVer67, aBrcs, pPlcxMan ? pPlcxMan->GetPapPLCF() : NULL);
+ nBorder = ::lcl_ReadBorders(m_bVer67, aBrcs, m_pPlcxMan ? m_pPlcxMan->GetPapPLCF() : NULL);
if( nBorder ) // Border
{
bool bIsB = IsBorder(aBrcs, true);
if (!InLocalApo() || !bIsB ||
- (pWFlyPara && !pWFlyPara->bBorderLines ))
+ (m_pWFlyPara && !m_pWFlyPara->bBorderLines ))
{
// in Apo keine Umrandungen *ein*-schalten, da ich
// sonst die Flyumrandungen doppelt bekomme
@@ -4776,8 +4776,8 @@ void SwWW8ImplReader::Read_CharBorder(sal_uInt16 nId, const sal_uInt8* pData, sh
if( nLen < 0 )
{
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_BOX );
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_SHADOW );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_BOX );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_SHADOW );
}
else
{
@@ -4788,7 +4788,7 @@ void SwWW8ImplReader::Read_CharBorder(sal_uInt16 nId, const sal_uInt8* pData, sh
SvxBoxItem aBoxItem(RES_CHRATR_BOX);
aBoxItem = *pBox;
WW8_BRCVer9 aBrc;
- int nBrcVer = (nId == NS_sprm::LN_CBrc) ? 9 : (bVer67 ? 6 : 8);
+ int nBrcVer = (nId == NS_sprm::LN_CBrc) ? 9 : (m_bVer67 ? 6 : 8);
_SetWW8_BRC(nBrcVer, aBrc, pData);
@@ -4815,7 +4815,7 @@ void SwWW8ImplReader::Read_Hyphenation( sal_uInt16, const sal_uInt8* pData, shor
{
// set Hyphenation flag
if( nLen <= 0 )
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_PARATR_HYPHENZONE );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_PARATR_HYPHENZONE );
else
{
SvxHyphenZoneItem aAttr(
@@ -4838,8 +4838,8 @@ void SwWW8ImplReader::Read_WidowControl( sal_uInt16, const sal_uInt8* pData, sho
{
if( nLen <= 0 )
{
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_PARATR_WIDOWS );
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_PARATR_ORPHANS );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_PARATR_WIDOWS );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_PARATR_ORPHANS );
}
else
{
@@ -4848,8 +4848,8 @@ void SwWW8ImplReader::Read_WidowControl( sal_uInt16, const sal_uInt8* pData, sho
NewAttr( SvxWidowsItem( nL, RES_PARATR_WIDOWS ) ); // Aus -> nLines = 0
NewAttr( SvxOrphansItem( nL, RES_PARATR_ORPHANS ) );
- if( pAktColl && pStyles ) // Style-Def ?
- pStyles->bWidowsChanged = true; // merken zur Simulation
+ if( m_pAktColl && m_pStyles ) // Style-Def ?
+ m_pStyles->bWidowsChanged = true; // merken zur Simulation
// Default-Widows
}
}
@@ -4857,10 +4857,10 @@ void SwWW8ImplReader::Read_WidowControl( sal_uInt16, const sal_uInt8* pData, sho
void SwWW8ImplReader::Read_UsePgsuSettings(sal_uInt16,const sal_uInt8* pData,short nLen)
{
if( nLen <= 0 )
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_PARATR_SNAPTOGRID);
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_PARATR_SNAPTOGRID);
else
{
- if(nInTable)
+ if(m_nInTable)
NewAttr( SvxParaGridItem(false, RES_PARATR_SNAPTOGRID) );
else
NewAttr( SvxParaGridItem(*pData, RES_PARATR_SNAPTOGRID) );
@@ -4870,7 +4870,7 @@ void SwWW8ImplReader::Read_UsePgsuSettings(sal_uInt16,const sal_uInt8* pData,sho
void SwWW8ImplReader::Read_AlignFont( sal_uInt16, const sal_uInt8* pData, short nLen )
{
if( nLen <= 0 )
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_PARATR_VERTALIGN);
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_PARATR_VERTALIGN);
else
{
sal_uInt16 nVal = SVBT16ToShort( pData );
@@ -4903,7 +4903,7 @@ void SwWW8ImplReader::Read_AlignFont( sal_uInt16, const sal_uInt8* pData, short
void SwWW8ImplReader::Read_KeepLines( sal_uInt16, const sal_uInt8* pData, short nLen )
{
if( nLen <= 0 )
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_PARATR_SPLIT );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_PARATR_SPLIT );
else
NewAttr( SvxFmtSplitItem( ( *pData & 1 ) == 0, RES_PARATR_SPLIT ) );
}
@@ -4911,7 +4911,7 @@ void SwWW8ImplReader::Read_KeepLines( sal_uInt16, const sal_uInt8* pData, short
void SwWW8ImplReader::Read_KeepParas( sal_uInt16, const sal_uInt8* pData, short nLen )
{
if( nLen <= 0 )
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_KEEP );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_KEEP );
else
NewAttr( SvxFmtKeepItem( ( *pData & 1 ) != 0 , RES_KEEP) );
}
@@ -4919,7 +4919,7 @@ void SwWW8ImplReader::Read_KeepParas( sal_uInt16, const sal_uInt8* pData, short
void SwWW8ImplReader::Read_BreakBefore( sal_uInt16, const sal_uInt8* pData, short nLen )
{
if( nLen <= 0 )
- pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_BREAK );
+ m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_BREAK );
else
NewAttr( SvxFmtBreakItem(
( *pData & 1 ) ? SVX_BREAK_PAGE_BEFORE : SVX_BREAK_NONE, RES_BREAK ) );
@@ -4927,14 +4927,14 @@ void SwWW8ImplReader::Read_BreakBefore( sal_uInt16, const sal_uInt8* pData, shor
void SwWW8ImplReader::Read_ApoPPC( sal_uInt16, const sal_uInt8* pData, short )
{
- if (pAktColl && nAktColl < vColl.size()) // only for Styledef, sonst anders geloest
+ if (m_pAktColl && m_nAktColl < m_vColl.size()) // only for Styledef, sonst anders geloest
{
- SwWW8StyInf& rSI = vColl[nAktColl];
- WW8FlyPara* pFly = rSI.pWWFly ? rSI.pWWFly : new WW8FlyPara(bVer67);
- vColl[nAktColl].pWWFly = pFly;
- pFly->Read(*pData, pStyles);
+ SwWW8StyInf& rSI = m_vColl[m_nAktColl];
+ WW8FlyPara* pFly = rSI.pWWFly ? rSI.pWWFly : new WW8FlyPara(m_bVer67);
+ m_vColl[m_nAktColl].pWWFly = pFly;
+ pFly->Read(*pData, m_pStyles);
if (pFly->IsEmpty())
- delete vColl[nAktColl].pWWFly, vColl[nAktColl].pWWFly = 0;
+ delete m_vColl[m_nAktColl].pWWFly, m_vColl[m_nAktColl].pWWFly = 0;
}
}
@@ -4966,13 +4966,13 @@ bool SwWW8ImplReader::ParseTabPos(WW8_TablePos *pTabPos, WW8PLCFx_Cp_FKP* pPap)
WW8TabBandDesc aDesc;
aDesc.ReadDef(false, pRes);
int nTableWidth = aDesc.nCenter[aDesc.nWwCols] - aDesc.nCenter[0];
- int nTextAreaWidth = maSectionManager.GetTextAreaWidth();
+ int nTextAreaWidth = m_aSectionManager.GetTextAreaWidth();
// If the table is wider than the text area, then don't create a fly
// for the table: no wrapping will be performed anyway, but multi-page
// tables will be broken.
// If there are columns, do create a fly, as the flow of the columns
// would otherwise restrict the table.
- pTabPos->bNoFly = nTableWidth >= nTextAreaWidth && maSectionManager.CurrentSectionColCount() < 2;
+ pTabPos->bNoFly = nTableWidth >= nTextAreaWidth && m_aSectionManager.CurrentSectionColCount() < 2;
}
return bRet;
}
@@ -6158,7 +6158,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
const SprmReadInfo& SwWW8ImplReader::GetSprmReadInfo(sal_uInt16 nId) const
{
- ww::WordVersion eVersion = pWwFib->GetFIBVersion();
+ ww::WordVersion eVersion = m_pWwFib->GetFIBVersion();
const wwSprmDispatcher *pDispatcher;
if (eVersion <= ww::eWW2)
pDispatcher = GetWW2SprmDispatcher();
@@ -6195,14 +6195,14 @@ void SwWW8ImplReader::EndSprm( sal_uInt16 nId )
short SwWW8ImplReader::ImportSprm(const sal_uInt8* pPos,sal_uInt16 nId)
{
if (!nId)
- nId = mpSprmParser->GetSprmId(pPos);
+ nId = m_pSprmParser->GetSprmId(pPos);
OSL_ENSURE( nId != 0xff, "Sprm FF !!!!" );
const SprmReadInfo& rSprm = GetSprmReadInfo(nId);
- sal_uInt16 nFixedLen = mpSprmParser->DistanceToData(nId);
- sal_uInt16 nL = mpSprmParser->GetSprmSize(nId, pPos);
+ sal_uInt16 nFixedLen = m_pSprmParser->DistanceToData(nId);
+ sal_uInt16 nL = m_pSprmParser->GetSprmSize(nId, pPos);
if (rSprm.pReadFnc)
(this->*rSprm.pReadFnc)(nId, pPos + nFixedLen, nL - nFixedLen);
generated by cgit (git 2.34.1) at 2025-03-01 15:51:17 +0000