[Libreoffice-commits] core.git: sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Sat May 2 02:23:30 PDT 2015
sw/source/filter/ww8/ww8graf.cxx | 374 +++----
sw/source/filter/ww8/ww8graf2.cxx | 120 +-
sw/source/filter/ww8/ww8par.cxx | 1790 +++++++++++++++++++-------------------
sw/source/filter/ww8/ww8par.hxx | 334 +++----
sw/source/filter/ww8/ww8par2.cxx | 694 +++++++-------
sw/source/filter/ww8/ww8par3.cxx | 186 +--
sw/source/filter/ww8/ww8par4.cxx | 68 -
sw/source/filter/ww8/ww8par5.cxx | 538 +++++------
sw/source/filter/ww8/ww8par6.cxx | 778 ++++++++--------
9 files changed, 2441 insertions(+), 2441 deletions(-)
New commits:
commit 6f56ad53f0fa7108b8eaead3d6995acce0674f69
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sat May 2 10:13:00 2015 +0200
sw: prefix members of SwWW8ImplReader
Change-Id: Ic3d21109097756d22105a8382f344b980f79b898
Reviewed-on: https://gerrit.libreoffice.org/15592
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 7bf2a38..ac6fd98 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 cdfe2c4..6c5efc2 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 14ef17bb..5f61b6a 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,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list