summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-11-05 10:13:37 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-11-05 10:32:39 +0100
commit87f0fa6b57bab798c5c6c2acfa619a8ea9f1b2aa (patch)
treeb7d1968a5befbea5afcfba1c654eb3ec119f083d /sw
parent0e93ef3ec1fe19a088e70810904140f4bbd60244 (diff)
sw: prefix members of SwHTMLParser
Change-Id: I3d4b39a79c49f847c6814215593d86e8d992b38a
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/html/htmlbas.cxx88
-rw-r--r--sw/source/filter/html/htmlcss1.cxx156
-rw-r--r--sw/source/filter/html/htmlctxt.cxx102
-rw-r--r--sw/source/filter/html/htmldrawreader.cxx70
-rw-r--r--sw/source/filter/html/htmlfld.cxx82
-rw-r--r--sw/source/filter/html/htmlform.cxx232
-rw-r--r--sw/source/filter/html/htmlftn.cxx78
-rw-r--r--sw/source/filter/html/htmlgrin.cxx208
-rw-r--r--sw/source/filter/html/htmlnumreader.cxx66
-rw-r--r--sw/source/filter/html/htmlplug.cxx102
-rw-r--r--sw/source/filter/html/htmlsect.cxx112
-rw-r--r--sw/source/filter/html/htmltab.cxx536
-rw-r--r--sw/source/filter/html/swhtml.cxx1386
-rw-r--r--sw/source/filter/html/swhtml.hxx186
14 files changed, 1702 insertions, 1702 deletions
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 251fa71eefaa..303d8e1e22d3 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -60,13 +60,13 @@ static HTMLOutEvent aBodyEventTable[] =
void SwHTMLParser::NewScript()
{
- ParseScriptOptions( aScriptType, sBaseURL, eScriptLang, aScriptURL,
- aBasicLib, aBasicModule );
+ ParseScriptOptions( m_aScriptType, m_sBaseURL, m_eScriptLang, m_aScriptURL,
+ m_aBasicLib, m_aBasicModule );
- if( !aScriptURL.isEmpty() )
+ if( !m_aScriptURL.isEmpty() )
{
// Den Inhalt des Script-Tags ignorieren
- bIgnoreRawData = true;
+ m_bIgnoreRawData = true;
}
}
@@ -75,7 +75,7 @@ void SwHTMLParser::EndScript()
bool bInsIntoBasic = false,
bInsSrcIntoField = false;
- switch( eScriptLang )
+ switch( m_eScriptLang )
{
case HTML_SL_STARBASIC:
bInsIntoBasic = true;
@@ -85,34 +85,34 @@ void SwHTMLParser::EndScript()
break;
}
- bIgnoreRawData = false;
- aScriptSource = convertLineEnd(aScriptSource, GetSystemLineEnd());
+ m_bIgnoreRawData = false;
+ m_aScriptSource = convertLineEnd(m_aScriptSource, GetSystemLineEnd());
// Ausser StarBasic und unbenutzem JavaScript jedes Script oder den
// Modulnamen in einem Feld merken merken
- if( bInsSrcIntoField && !bIgnoreHTMLComments )
+ if( bInsSrcIntoField && !m_bIgnoreHTMLComments )
{
SwScriptFieldType *pType =
- static_cast<SwScriptFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_SCRIPTFLD ));
+ static_cast<SwScriptFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_SCRIPTFLD ));
- SwScriptField aField( pType, aScriptType,
- !aScriptURL.isEmpty() ? aScriptURL : aScriptSource,
- !aScriptURL.isEmpty() );
+ SwScriptField aField( pType, m_aScriptType,
+ !m_aScriptURL.isEmpty() ? m_aScriptURL : m_aScriptSource,
+ !m_aScriptURL.isEmpty() );
InsertAttr( SwFormatField( aField ) );
}
- SwDocShell *pDocSh = pDoc->GetDocShell();
- if( !aScriptSource.isEmpty() && pDocSh &&
+ SwDocShell *pDocSh = m_pDoc->GetDocShell();
+ if( !m_aScriptSource.isEmpty() && pDocSh &&
bInsIntoBasic && IsNewDoc() )
{
// Fuer JavaScript und StarBasic noch ein Basic-Modul anlegen
// Das Basic entfernt natuerlich weiterhin keine SGML-Kommentare
- RemoveSGMLComment( aScriptSource, true );
+ RemoveSGMLComment( m_aScriptSource, true );
// get library name
OUString aLibName;
- if( !aBasicLib.isEmpty() )
- aLibName = aBasicLib;
+ if( !m_aBasicLib.isEmpty() )
+ aLibName = m_aBasicLib;
else
aLibName = "Standard";
@@ -136,24 +136,24 @@ void SwHTMLParser::EndScript()
if ( xModLib.is() )
{
- if( aBasicModule.isEmpty() )
+ if( m_aBasicModule.isEmpty() )
{
// create module name
bool bFound = true;
while( bFound )
{
- aBasicModule = "Modul";
- aBasicModule += OUString::number( (sal_Int32)(++nSBModuleCnt) );
- bFound = xModLib->hasByName( aBasicModule );
+ m_aBasicModule = "Modul";
+ m_aBasicModule += OUString::number( (sal_Int32)(++m_nSBModuleCnt) );
+ bFound = xModLib->hasByName( m_aBasicModule );
}
}
// create module
- OUString aModName( aBasicModule );
+ OUString aModName( m_aBasicModule );
if ( !xModLib->hasByName( aModName ) )
{
Any aElement;
- aElement <<= OUString( aScriptSource );
+ aElement <<= OUString( m_aScriptSource );
xModLib->insertByName( aModName , aElement );
}
}
@@ -172,63 +172,63 @@ void SwHTMLParser::EndScript()
}
}
- aScriptSource.clear();
- aScriptType.clear();
- aScriptURL.clear();
+ m_aScriptSource.clear();
+ m_aScriptType.clear();
+ m_aScriptURL.clear();
- aBasicLib.clear();
- aBasicModule.clear();
+ m_aBasicLib.clear();
+ m_aBasicModule.clear();
}
void SwHTMLParser::AddScriptSource()
{
// Hier merken wir und nur ein par Strings
if( aToken.getLength() > 2 &&
- (HTML_SL_STARBASIC==eScriptLang && aToken[ 0 ] == '\'') )
+ (HTML_SL_STARBASIC==m_eScriptLang && aToken[ 0 ] == '\'') )
{
sal_Int32 nPos = -1;
- if( aBasicLib.isEmpty() )
+ if( m_aBasicLib.isEmpty() )
{
nPos = aToken.indexOf( OOO_STRING_SVTOOLS_HTML_SB_library );
if( nPos != -1 )
{
- aBasicLib =
+ m_aBasicLib =
aToken.copy( nPos + sizeof(OOO_STRING_SVTOOLS_HTML_SB_library) - 1 );
- aBasicLib = comphelper::string::strip(aBasicLib, ' ');
+ m_aBasicLib = comphelper::string::strip(m_aBasicLib, ' ');
}
}
- if( aBasicModule.isEmpty() && nPos == -1 )
+ if( m_aBasicModule.isEmpty() && nPos == -1 )
{
nPos = aToken.indexOf( OOO_STRING_SVTOOLS_HTML_SB_module );
if( nPos != -1 )
{
- aBasicModule =
+ m_aBasicModule =
aToken.copy( nPos + sizeof(OOO_STRING_SVTOOLS_HTML_SB_module) - 1 );
- aBasicModule = comphelper::string::strip(aBasicModule, ' ');
+ m_aBasicModule = comphelper::string::strip(m_aBasicModule, ' ');
}
}
if( nPos == -1 )
{
- if( !aScriptSource.isEmpty() )
- aScriptSource += "\n";
- aScriptSource += aToken;
+ if( !m_aScriptSource.isEmpty() )
+ m_aScriptSource += "\n";
+ m_aScriptSource += aToken;
}
}
- else if( !aScriptSource.isEmpty() || !aToken.isEmpty() )
+ else if( !m_aScriptSource.isEmpty() || !aToken.isEmpty() )
{
// Leerzeilen am Anfang werden ignoriert
- if( !aScriptSource.isEmpty() )
+ if( !m_aScriptSource.isEmpty() )
{
- aScriptSource += "\n";
+ m_aScriptSource += "\n";
}
else
{
// Wir stehen hinter dem CR/LF der Zeile davor
- nScriptStartLineNr = GetLineNr() - 1;
+ m_nScriptStartLineNr = GetLineNr() - 1;
}
- aScriptSource += aToken;
+ m_aScriptSource += aToken;
}
}
@@ -240,7 +240,7 @@ void SwHTMLParser::InsertBasicDocEvent( const OUString& aEvent, const OUString&
if( rName.isEmpty() )
return;
- SwDocShell *pDocSh = pDoc->GetDocShell();
+ SwDocShell *pDocSh = m_pDoc->GetDocShell();
OSL_ENSURE( pDocSh, "Wo ist die DocShell?" );
if( !pDocSh )
return;
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index ee3faef3cdb1..0b996e6f4cb3 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1549,119 +1549,119 @@ _HTMLAttr **SwHTMLParser::GetAttrTabEntry( sal_uInt16 nWhich )
switch( nWhich )
{
case RES_CHRATR_BLINK:
- ppAttr = &aAttrTab.pBlink;
+ ppAttr = &m_aAttrTab.pBlink;
break;
case RES_CHRATR_CASEMAP:
- ppAttr = &aAttrTab.pCaseMap;
+ ppAttr = &m_aAttrTab.pCaseMap;
break;
case RES_CHRATR_COLOR:
- ppAttr = &aAttrTab.pFontColor;
+ ppAttr = &m_aAttrTab.pFontColor;
break;
case RES_CHRATR_CROSSEDOUT:
- ppAttr = &aAttrTab.pStrike;
+ ppAttr = &m_aAttrTab.pStrike;
break;
case RES_CHRATR_ESCAPEMENT:
- ppAttr = &aAttrTab.pEscapement;
+ ppAttr = &m_aAttrTab.pEscapement;
break;
case RES_CHRATR_FONT:
- ppAttr = &aAttrTab.pFont;
+ ppAttr = &m_aAttrTab.pFont;
break;
case RES_CHRATR_CJK_FONT:
- ppAttr = &aAttrTab.pFontCJK;
+ ppAttr = &m_aAttrTab.pFontCJK;
break;
case RES_CHRATR_CTL_FONT:
- ppAttr = &aAttrTab.pFontCTL;
+ ppAttr = &m_aAttrTab.pFontCTL;
break;
case RES_CHRATR_FONTSIZE:
- ppAttr = &aAttrTab.pFontHeight;
+ ppAttr = &m_aAttrTab.pFontHeight;
break;
case RES_CHRATR_CJK_FONTSIZE:
- ppAttr = &aAttrTab.pFontHeightCJK;
+ ppAttr = &m_aAttrTab.pFontHeightCJK;
break;
case RES_CHRATR_CTL_FONTSIZE:
- ppAttr = &aAttrTab.pFontHeightCTL;
+ ppAttr = &m_aAttrTab.pFontHeightCTL;
break;
case RES_CHRATR_KERNING:
- ppAttr = &aAttrTab.pKerning;
+ ppAttr = &m_aAttrTab.pKerning;
break;
case RES_CHRATR_POSTURE:
- ppAttr = &aAttrTab.pItalic;
+ ppAttr = &m_aAttrTab.pItalic;
break;
case RES_CHRATR_CJK_POSTURE:
- ppAttr = &aAttrTab.pItalicCJK;
+ ppAttr = &m_aAttrTab.pItalicCJK;
break;
case RES_CHRATR_CTL_POSTURE:
- ppAttr = &aAttrTab.pItalicCTL;
+ ppAttr = &m_aAttrTab.pItalicCTL;
break;
case RES_CHRATR_UNDERLINE:
- ppAttr = &aAttrTab.pUnderline;
+ ppAttr = &m_aAttrTab.pUnderline;
break;
case RES_CHRATR_WEIGHT:
- ppAttr = &aAttrTab.pBold;
+ ppAttr = &m_aAttrTab.pBold;
break;
case RES_CHRATR_CJK_WEIGHT:
- ppAttr = &aAttrTab.pBoldCJK;
+ ppAttr = &m_aAttrTab.pBoldCJK;
break;
case RES_CHRATR_CTL_WEIGHT:
- ppAttr = &aAttrTab.pBoldCTL;
+ ppAttr = &m_aAttrTab.pBoldCTL;
break;
case RES_CHRATR_BACKGROUND:
- ppAttr = &aAttrTab.pCharBrush;
+ ppAttr = &m_aAttrTab.pCharBrush;
break;
case RES_CHRATR_BOX:
- ppAttr = &aAttrTab.pCharBox;
+ ppAttr = &m_aAttrTab.pCharBox;
break;
case RES_PARATR_LINESPACING:
- ppAttr = &aAttrTab.pLineSpacing;
+ ppAttr = &m_aAttrTab.pLineSpacing;
break;
case RES_PARATR_ADJUST:
- ppAttr = &aAttrTab.pAdjust;
+ ppAttr = &m_aAttrTab.pAdjust;
break;
case RES_LR_SPACE:
- ppAttr = &aAttrTab.pLRSpace;
+ ppAttr = &m_aAttrTab.pLRSpace;
break;
case RES_UL_SPACE:
- ppAttr = &aAttrTab.pULSpace;
+ ppAttr = &m_aAttrTab.pULSpace;
break;
case RES_BOX:
- ppAttr = &aAttrTab.pBox;
+ ppAttr = &m_aAttrTab.pBox;
break;
case RES_BACKGROUND:
- ppAttr = &aAttrTab.pBrush;
+ ppAttr = &m_aAttrTab.pBrush;
break;
case RES_BREAK:
- ppAttr = &aAttrTab.pBreak;
+ ppAttr = &m_aAttrTab.pBreak;
break;
case RES_PAGEDESC:
- ppAttr = &aAttrTab.pPageDesc;
+ ppAttr = &m_aAttrTab.pPageDesc;
break;
case RES_PARATR_SPLIT:
- ppAttr = &aAttrTab.pSplit;
+ ppAttr = &m_aAttrTab.pSplit;
break;
case RES_PARATR_WIDOWS:
- ppAttr = &aAttrTab.pWidows;
+ ppAttr = &m_aAttrTab.pWidows;
break;
case RES_PARATR_ORPHANS:
- ppAttr = &aAttrTab.pOrphans;
+ ppAttr = &m_aAttrTab.pOrphans;
break;
case RES_KEEP:
- ppAttr = &aAttrTab.pKeep;
+ ppAttr = &m_aAttrTab.pKeep;
break;
case RES_CHRATR_LANGUAGE:
- ppAttr = &aAttrTab.pLanguage;
+ ppAttr = &m_aAttrTab.pLanguage;
break;
case RES_CHRATR_CJK_LANGUAGE:
- ppAttr = &aAttrTab.pLanguageCJK;
+ ppAttr = &m_aAttrTab.pLanguageCJK;
break;
case RES_CHRATR_CTL_LANGUAGE:
- ppAttr = &aAttrTab.pLanguageCTL;
+ ppAttr = &m_aAttrTab.pLanguageCTL;
break;
case RES_FRAMEDIR:
- ppAttr = &aAttrTab.pDirection;
+ ppAttr = &m_aAttrTab.pDirection;
break;
}
@@ -1680,18 +1680,18 @@ void SwHTMLParser::NewStyle()
sType = rOption.GetString();
}
- bIgnoreRawData = sType.getLength() &&
+ m_bIgnoreRawData = sType.getLength() &&
!sType.getToken(0,';').equalsAscii(sCSS_mimetype);
}
void SwHTMLParser::EndStyle()
{
- bIgnoreRawData = false;
+ m_bIgnoreRawData = false;
- if( !aStyleSource.isEmpty() )
+ if( !m_aStyleSource.isEmpty() )
{
- pCSS1Parser->ParseStyleSheet( aStyleSource );
- aStyleSource.clear();
+ m_pCSS1Parser->ParseStyleSheet( m_aStyleSource );
+ m_aStyleSource.clear();
}
}
@@ -1716,8 +1716,8 @@ bool SwHTMLParser::FileDownload( const OUString& rURL,
}
// wurde abgebrochen?
- if( ( pDoc->GetDocShell() && pDoc->GetDocShell()->IsAbortingImport() )
- || 1 == pDoc->getReferenceCount() )
+ if( ( m_pDoc->GetDocShell() && m_pDoc->GetDocShell()->IsAbortingImport() )
+ || 1 == m_pDoc->getReferenceCount() )
{
// wurde der Import vom SFX abgebrochen?
eState = SVPAR_ERROR;
@@ -1735,15 +1735,15 @@ bool SwHTMLParser::FileDownload( const OUString& rURL,
void SwHTMLParser::InsertLink()
{
bool bFinishDownload = false;
- if( pPendStack )
+ if( m_pPendStack )
{
OSL_ENSURE( ShouldFinishFileDownload(),
"Pending-Stack ohne File-Download?" );
- SwPendingStack* pTmp = pPendStack->pNext;
- delete pPendStack;
- pPendStack = pTmp;
- OSL_ENSURE( !pPendStack, "Wo kommt der Pending-Stack her?" );
+ SwPendingStack* pTmp = m_pPendStack->pNext;
+ delete m_pPendStack;
+ m_pPendStack = pTmp;
+ OSL_ENSURE( !m_pPendStack, "Wo kommt der Pending-Stack her?" );
bFinishDownload = true;
}
@@ -1761,7 +1761,7 @@ void SwHTMLParser::InsertLink()
sRel = rOption.GetString();
break;
case HTML_O_HREF:
- sHRef = URIHelper::SmartRel2Abs( INetURLObject( sBaseURL ), rOption.GetString(), Link<OUString *, bool>(), false );
+ sHRef = URIHelper::SmartRel2Abs( INetURLObject( m_sBaseURL ), rOption.GetString(), Link<OUString *, bool>(), false );
break;
case HTML_O_TYPE:
sType = rOption.GetString();
@@ -1788,7 +1788,7 @@ void SwHTMLParser::InsertLink()
// Der Style wird asynchron geladen und ist erst beim
// naechsten Continue-Aufruf da. Wir muessen deshalb einen
// Pending-Stack anlegen, damit wir hierher zurueckkehren
- pPendStack = new SwPendingStack( HTML_LINK, pPendStack );
+ m_pPendStack = new SwPendingStack( HTML_LINK, m_pPendStack );
}
}
else
@@ -1796,7 +1796,7 @@ void SwHTMLParser::InsertLink()
// File synchron holen
OUString sSource;
if( FileDownload( sHRef, sSource ) )
- pCSS1Parser->ParseStyleSheet( sSource );
+ m_pCSS1Parser->ParseStyleSheet( sSource );
}
}
}
@@ -1805,7 +1805,7 @@ void SwHTMLParser::InsertLink()
{
OUString sSource;
if( FinishFileDownload( sSource ) && !sSource.isEmpty() )
- pCSS1Parser->ParseStyleSheet( sSource );
+ m_pCSS1Parser->ParseStyleSheet( sSource );
}
}
@@ -1875,7 +1875,7 @@ bool SwHTMLParser::ParseStyleOptions( const OUString &rStyle,
{
OUString aClass( rClass );
SwCSS1Parser::GetScriptFromClass( aClass );
- const SvxCSS1MapEntry *pClass = pCSS1Parser->GetClass( aClass );
+ const SvxCSS1MapEntry *pClass = m_pCSS1Parser->GetClass( aClass );
if( pClass )
{
SvxCSS1Parser::MergeStyles( pClass->GetItemSet(),
@@ -1887,7 +1887,7 @@ bool SwHTMLParser::ParseStyleOptions( const OUString &rStyle,
if( !rId.isEmpty() )
{
- const SvxCSS1MapEntry *pId = pCSS1Parser->GetId( rId );
+ const SvxCSS1MapEntry *pId = m_pCSS1Parser->GetId( rId );
if( pId )
SvxCSS1Parser::MergeStyles( pId->GetItemSet(),
pId->GetPropertyInfo(),
@@ -1898,7 +1898,7 @@ bool SwHTMLParser::ParseStyleOptions( const OUString &rStyle,
if( !rStyle.isEmpty() )
{
- pCSS1Parser->ParseStyleOption( rStyle, rItemSet, rPropInfo );
+ m_pCSS1Parser->ParseStyleOption( rStyle, rItemSet, rPropInfo );
bRet = true;
}
@@ -1962,7 +1962,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
// sie nicht schon in einem Rahmen stehen und sonst
// Rahmengebunden.
const SwStartNode *pFlySttNd =
- pPam->GetPoint()->nNode.GetNode().FindFlyStartNode();
+ m_pPam->GetPoint()->nNode.GetNode().FindFlyStartNode();
if( pFlySttNd )
{
aAnchor.SetType( FLY_AT_FLY );
@@ -1980,7 +1980,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
else
{
aAnchor.SetType( FLY_AT_PARA );
- aAnchor.SetAnchor( pPam->GetPoint() );
+ aAnchor.SetAnchor( m_pPam->GetPoint() );
eVertOri = text::VertOrientation::TOP;
eVertRel = text::RelOrientation::CHAR;
if( SVX_CSS1_LTYPE_TWIP == rPropInfo.eLeftType )
@@ -2002,11 +2002,11 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
// der Absatz noch leer ist und sonst auto-gebunden.
// Auto-gebundene Rahmen werden zunaechst an der Position davor
// eingefuegt und erst spaeter verschoben.
- const sal_Int32 nContent = pPam->GetPoint()->nContent.GetIndex();
+ const sal_Int32 nContent = m_pPam->GetPoint()->nContent.GetIndex();
if( nContent )
{
aAnchor.SetType( FLY_AT_CHAR );
- pPam->Move( fnMoveBackward );
+ m_pPam->Move( fnMoveBackward );
eVertOri = text::VertOrientation::CHAR_BOTTOM;
eVertRel = text::RelOrientation::CHAR;
}
@@ -2017,10 +2017,10 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
eVertRel = text::RelOrientation::PRINT_AREA;
}
- aAnchor.SetAnchor( pPam->GetPoint() );
+ aAnchor.SetAnchor( m_pPam->GetPoint() );
if( nContent )
- pPam->Move( fnMoveForward );
+ m_pPam->Move( fnMoveForward );
sal_uInt16 nLeftSpace = 0, nRightSpace = 0;
short nIndent = 0;
@@ -2129,17 +2129,17 @@ void SwHTMLParser::SetFrameFormatAttrs( SfxItemSet &rItemSet,
_HTMLAttrContext *SwHTMLParser::PopContext( sal_uInt16 nToken, sal_uInt16 nLimit,
bool bRemove )
{
- _HTMLAttrContexts::size_type nPos = aContexts.size();
- if( nPos <= nContextStMin )
+ _HTMLAttrContexts::size_type nPos = m_aContexts.size();
+ if( nPos <= m_nContextStMin )
return 0;
bool bFound = 0==nToken;
if( nToken )
{
// Stack-Eintrag zu dem Token suchen
- while( nPos > nContextStMin )
+ while( nPos > m_nContextStMin )
{
- sal_uInt16 nCntxtToken = aContexts[--nPos]->GetToken();
+ sal_uInt16 nCntxtToken = m_aContexts[--nPos]->GetToken();
if( nCntxtToken == nToken )
{
bFound = true;
@@ -2159,9 +2159,9 @@ _HTMLAttrContext *SwHTMLParser::PopContext( sal_uInt16 nToken, sal_uInt16 nLimit
_HTMLAttrContext *pCntxt = 0;
if( bFound )
{
- pCntxt = aContexts[nPos];
+ pCntxt = m_aContexts[nPos];
if( bRemove )
- aContexts.erase( aContexts.begin() + nPos );
+ m_aContexts.erase( m_aContexts.begin() + nPos );
}
return pCntxt;
@@ -2172,7 +2172,7 @@ bool SwHTMLParser::GetMarginsFromContext( sal_uInt16& nLeft,
short& nIndent,
bool bIgnoreTopContext ) const
{
- _HTMLAttrContexts::size_type nPos = aContexts.size();
+ _HTMLAttrContexts::size_type nPos = m_aContexts.size();
if( bIgnoreTopContext )
{
if( !nPos )
@@ -2181,9 +2181,9 @@ bool SwHTMLParser::GetMarginsFromContext( sal_uInt16& nLeft,
nPos--;
}
- while( nPos > nContextStAttrMin )
+ while( nPos > m_nContextStAttrMin )
{
- const _HTMLAttrContext *pCntxt = aContexts[--nPos];
+ const _HTMLAttrContext *pCntxt = m_aContexts[--nPos];
if( pCntxt->IsLRSpaceChanged() )
{
pCntxt->GetMargins( nLeft, nRight, nIndent );
@@ -2218,10 +2218,10 @@ void SwHTMLParser::GetULSpaceFromContext( sal_uInt16& nUpper,
sal_uInt16 nDfltColl = 0;
OUString aDfltClass;
- _HTMLAttrContexts::size_type nPos = aContexts.size();
- while( nPos > nContextStAttrMin )
+ _HTMLAttrContexts::size_type nPos = m_aContexts.size();
+ while( nPos > m_nContextStAttrMin )
{
- const _HTMLAttrContext *pCntxt = aContexts[--nPos];
+ const _HTMLAttrContext *pCntxt = m_aContexts[--nPos];
if( pCntxt->IsULSpaceChanged() )
{
pCntxt->GetULSpace( nUpper, nLower );
@@ -2239,7 +2239,7 @@ void SwHTMLParser::GetULSpaceFromContext( sal_uInt16& nUpper,
nDfltColl = RES_POOLCOLL_TEXT;
const SwTextFormatColl *pColl =
- pCSS1Parser->GetTextFormatColl( nDfltColl, aDfltClass );
+ m_pCSS1Parser->GetTextFormatColl( nDfltColl, aDfltClass );
const SvxULSpaceItem& rULSpace = pColl->GetULSpace();
nUpper = rULSpace.GetUpper();
nLower = rULSpace.GetLower();
@@ -2255,7 +2255,7 @@ void SwHTMLParser::EndContextAttrs( _HTMLAttrContext *pContext, bool bRemove )
// Fuer DropCaps noch die Anzahl der Zeichen anpassen. Wenn
// es am Ende 0 sind, wird das Attribut invalidiert und dann
// von _SetAttr gar nicht erst gesetzt.
- sal_Int32 nChars = pPam->GetPoint()->nContent.GetIndex();
+ sal_Int32 nChars = m_pPam->GetPoint()->nContent.GetIndex();
if( nChars < 1 )
pAttr->Invalidate();
else if( nChars > MAX_DROPCAP_CHARS )
@@ -2286,10 +2286,10 @@ void SwHTMLParser::InsertParaAttrs( const SfxItemSet& rItemSet )
NewAttr( ppAttr, *pItem );
if( RES_PARATR_BEGIN > nWhich )
(*ppAttr)->SetLikePara();
- aParaAttrs.push_back( *ppAttr );
+ m_aParaAttrs.push_back( *ppAttr );
bool bSuccess = EndAttr( *ppAttr, 0, false );
if (!bSuccess)
- aParaAttrs.pop_back();
+ m_aParaAttrs.pop_back();
}
pItem = aIter.NextItem();
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index 665384db7d5b..e333bb78c52c 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -127,13 +127,13 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos )
{
// preliminary paragraph attributes are not allowed here, they could
// be set here and then the pointers become invalid!
- OSL_ENSURE(aParaAttrs.empty(),
+ OSL_ENSURE(m_aParaAttrs.empty(),
"Danger: there are non-final paragraph attributes");
- if( !aParaAttrs.empty() )
- aParaAttrs.clear();
+ if( !m_aParaAttrs.empty() )
+ m_aParaAttrs.clear();
- const SwNodeIndex* pOldEndPara = &pPam->GetPoint()->nNode;
- sal_Int32 nOldEndCnt = pPam->GetPoint()->nContent.GetIndex();
+ const SwNodeIndex* pOldEndPara = &m_pPam->GetPoint()->nNode;
+ sal_Int32 nOldEndCnt = m_pPam->GetPoint()->nContent.GetIndex();
const SwNodeIndex& rNewSttPara = rNewPos.nNode;
sal_Int32 nNewSttCnt = rNewPos.nContent.GetIndex();
@@ -142,7 +142,7 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos )
// alle noch offenen Attribute beenden und hinter der Tabelle
// neu aufspannen
- _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&aAttrTab);
+ _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&m_aAttrTab);
for (auto nCnt = sizeof(_HTMLAttrTable) / sizeof(_HTMLAttr*); nCnt--; ++pHTMLAttributes)
{
_HTMLAttr *pAttr = *pHTMLAttributes;
@@ -159,14 +159,14 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos )
// beendet werden
if( !bMoveBack )
{
- bMoveBack = pPam->Move( fnMoveBackward );
- nOldEndCnt = pPam->GetPoint()->nContent.GetIndex();
+ bMoveBack = m_pPam->Move( fnMoveBackward );
+ nOldEndCnt = m_pPam->GetPoint()->nContent.GetIndex();
}
}
else if( bMoveBack )
{
- pPam->Move( fnMoveForward );
- nOldEndCnt = pPam->GetPoint()->nContent.GetIndex();
+ m_pPam->Move( fnMoveForward );
+ nOldEndCnt = m_pPam->GetPoint()->nContent.GetIndex();
}
if( (RES_PARATR_BEGIN <= nWhich && bMoveBack) ||
@@ -186,9 +186,9 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos )
else
{
if (pSetAttr->bInsAtStart)
- aSetAttrTab.push_front( pSetAttr );
+ m_aSetAttrTab.push_front( pSetAttr );
else
- aSetAttrTab.push_back( pSetAttr );
+ m_aSetAttrTab.push_back( pSetAttr );
}
}
else if( pPrev )
@@ -201,9 +201,9 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos )
else
{
if (pPrev->bInsAtStart)
- aSetAttrTab.push_front( pPrev );
+ m_aSetAttrTab.push_front( pPrev );
else
- aSetAttrTab.push_back( pPrev );
+ m_aSetAttrTab.push_back( pPrev );
}
}
@@ -219,7 +219,7 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos )
}
if( bMoveBack )
- pPam->Move( fnMoveForward );
+ m_pPam->Move( fnMoveForward );
}
@@ -257,21 +257,21 @@ void SwHTMLParser::SaveDocContext( _HTMLAttrContext *pCntxt,
SaveAttrTab( *pSaveAttrTab );
}
- pSave->SetPos( *pPam->GetPoint() );
- *pPam->GetPoint() = *pNewPos;
+ pSave->SetPos( *m_pPam->GetPoint() );
+ *m_pPam->GetPoint() = *pNewPos;
}
// Mit dem Setzen von nContextStMin koennen automatisch auch
// keine gerade offenen Listen (DL/OL/UL) mehr beendet werden.
if( (HTML_CNTXT_PROTECT_STACK & nFlags) != 0 )
{
- pSave->SetContextStMin( nContextStMin );
- nContextStMin = aContexts.size();
+ pSave->SetContextStMin( m_nContextStMin );
+ m_nContextStMin = m_aContexts.size();
if( (HTML_CNTXT_KEEP_ATTRS & nFlags) == 0 )
{
- pSave->SetContextStAttrMin( nContextStAttrMin );
- nContextStAttrMin = aContexts.size();
+ pSave->SetContextStAttrMin( m_nContextStAttrMin );
+ m_nContextStAttrMin = m_aContexts.size();
}
}
}
@@ -303,7 +303,7 @@ void SwHTMLParser::RestoreDocContext( _HTMLAttrContext *pCntxt )
RestoreAttrTab( *pSaveAttrTab );
}
- *pPam->GetPoint() = *pSave->GetPos();
+ *m_pPam->GetPoint() = *pSave->GetPos();
// Die bisherigen Attribute koennen wir schonmal setzen.
SetAttr();
@@ -311,9 +311,9 @@ void SwHTMLParser::RestoreDocContext( _HTMLAttrContext *pCntxt )
if( SIZE_MAX != pSave->GetContextStMin() )
{
- nContextStMin = pSave->GetContextStMin();
+ m_nContextStMin = pSave->GetContextStMin();
if( SIZE_MAX != pSave->GetContextStAttrMin() )
- nContextStAttrMin = pSave->GetContextStAttrMin();
+ m_nContextStAttrMin = pSave->GetContextStAttrMin();
}
if( !pSave->GetKeepNumRules() )
@@ -331,7 +331,7 @@ void SwHTMLParser::EndContext( _HTMLAttrContext *pContext )
{
// Alle noch offenen Kontexte beenden. Der eigene
// Kontext muss bereits geloscht sein!
- while( aContexts.size() > nContextStMin )
+ while( m_aContexts.size() > m_nContextStMin )
{
_HTMLAttrContext *pCntxt = PopContext();
OSL_ENSURE( pCntxt != pContext,
@@ -360,7 +360,7 @@ void SwHTMLParser::EndContext( _HTMLAttrContext *pContext )
// Ggf. noch einen Ansatz-Umbruch einfuegen
if( AM_NONE != pContext->GetAppendMode() &&
- pPam->GetPoint()->nContent.GetIndex() )
+ m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( pContext->GetAppendMode() );
// PRE-/LISTING- und XMP-Umgebungen wieder starten
@@ -423,7 +423,7 @@ bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet,
// - es wurde eine Breite angegeben (in beiden Faellen noetig)
if( SwCSS1Parser::MayBePositioned( rPropInfo ) )
{
- SfxItemSet aFrmItemSet( pDoc->GetAttrPool(),
+ SfxItemSet aFrmItemSet( m_pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs(aFrmItemSet );
@@ -463,7 +463,7 @@ bool SwHTMLParser::CreateContainer( const OUString& rClass,
SwCSS1Parser::MayBePositioned( rPropInfo ) )
{
// Container-Klasse
- SfxItemSet *pFrmItemSet = pContext->GetFrmItemSet( pDoc );
+ SfxItemSet *pFrmItemSet = pContext->GetFrmItemSet( m_pDoc );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs( *pFrmItemSet );
@@ -489,32 +489,32 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
{
// Ein DropCap-Attribut basteln, wenn auf Zeichen-Ebene vor dem
// ersten Zeichen ein float: left vorkommt
- if( bCharLvl && !pPam->GetPoint()->nContent.GetIndex() &&
+ if( bCharLvl && !m_pPam->GetPoint()->nContent.GetIndex() &&
SVX_ADJUST_LEFT == rPropInfo.eFloat )
{
SwFormatDrop aDrop;
aDrop.GetChars() = 1;
- pCSS1Parser->FillDropCap( aDrop, rItemSet );
+ m_pCSS1Parser->FillDropCap( aDrop, rItemSet );
// Nur wenn das Initial auch ueber mehrere Zeilen geht, wird das
// DropCap-Attribut gesetzt. Sonst setzten wir die Attribute hart.
if( aDrop.GetLines() > 1 )
{
- NewAttr( &aAttrTab.pDropCap, aDrop );
+ NewAttr( &m_aAttrTab.pDropCap, aDrop );
_HTMLAttrs &rAttrs = pContext->GetAttrs();
- rAttrs.push_back( aAttrTab.pDropCap );
+ rAttrs.push_back( m_aAttrTab.pDropCap );
return;
}
}
if( !bCharLvl )
- pCSS1Parser->SetFormatBreak( rItemSet, rPropInfo );
+ m_pCSS1Parser->SetFormatBreak( rItemSet, rPropInfo );
- OSL_ENSURE(aContexts.size() <= nContextStAttrMin ||
- aContexts.back() != pContext,
+ OSL_ENSURE(m_aContexts.size() <= m_nContextStAttrMin ||
+ m_aContexts.back() != pContext,
"SwHTMLParser::InsertAttrs: Context already on the Stack");
SfxItemIter aIter( rItemSet );
@@ -539,8 +539,8 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
// obersten Kontext, denn den veraendern wir ja gerade) ...
sal_uInt16 nOldLeft = 0, nOldRight = 0;
short nOldIndent = 0;
- bool bIgnoreTop = aContexts.size() > nContextStMin &&
- aContexts.back() == pContext;
+ bool bIgnoreTop = m_aContexts.size() > m_nContextStMin &&
+ m_aContexts.back() == pContext;
GetMarginsFromContext( nOldLeft, nOldRight, nOldIndent,
bIgnoreTop );
@@ -588,8 +588,8 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
aLRItem.SetTextFirstLineOfst( nIndent );
aLRItem.SetTextLeft( nLeft );
aLRItem.SetRight( nRight );
- NewAttr( &aAttrTab.pLRSpace, aLRItem );
- EndAttr( aAttrTab.pLRSpace, 0, false );
+ NewAttr( &m_aAttrTab.pLRSpace, aLRItem );
+ EndAttr( m_aAttrTab.pLRSpace, 0, false );
}
break;
@@ -604,33 +604,33 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
if( !rPropInfo.bBottomMargin )
aULSpace.SetLower( nLower );
- NewAttr( &aAttrTab.pULSpace, aULSpace );
+ NewAttr( &m_aAttrTab.pULSpace, aULSpace );
// ... und noch die Kontext-Information speichern
_HTMLAttrs &rAttrs = pContext->GetAttrs();
- rAttrs.push_back( aAttrTab.pULSpace );
+ rAttrs.push_back( m_aAttrTab.pULSpace );
pContext->SetULSpace( aULSpace.GetUpper(), aULSpace.GetLower() );
}
else
{
- ppAttr = &aAttrTab.pULSpace;
+ ppAttr = &m_aAttrTab.pULSpace;
}
break;
case RES_CHRATR_FONTSIZE:
// es werden keine Attribute mit %-Angaben gesetzt
if( static_cast<const SvxFontHeightItem *>(pItem)->GetProp() == 100 )
- ppAttr = &aAttrTab.pFontHeight;
+ ppAttr = &m_aAttrTab.pFontHeight;
break;
case RES_CHRATR_CJK_FONTSIZE:
// es werden keine Attribute mit %-Angaben gesetzt
if( static_cast<const SvxFontHeightItem *>(pItem)->GetProp() == 100 )
- ppAttr = &aAttrTab.pFontHeightCJK;
+ ppAttr = &m_aAttrTab.pFontHeightCJK;
break;
case RES_CHRATR_CTL_FONTSIZE:
// es werden keine Attribute mit %-Angaben gesetzt
if( static_cast<const SvxFontHeightItem *>(pItem)->GetProp() == 100 )
- ppAttr = &aAttrTab.pFontHeightCTL;
+ ppAttr = &m_aAttrTab.pFontHeightCTL;
break;
case RES_BACKGROUND:
@@ -641,16 +641,16 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
aBrushItem.SetWhich( RES_CHRATR_BACKGROUND );
// Das Attribut setzen ...
- NewAttr( &aAttrTab.pCharBrush, aBrushItem );
+ NewAttr( &m_aAttrTab.pCharBrush, aBrushItem );
// ... und noch die Kontext-Information speichern
_HTMLAttrs &rAttrs = pContext->GetAttrs();
- rAttrs.push_back( aAttrTab.pCharBrush );
+ rAttrs.push_back( m_aAttrTab.pCharBrush );
}
else if( pContext->GetToken() != HTML_TABLEHEADER_ON &&
pContext->GetToken() != HTML_TABLEDATA_ON )
{
- ppAttr = &aAttrTab.pBrush;
+ ppAttr = &m_aAttrTab.pBrush;
}
break;
@@ -660,14 +660,14 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
SvxBoxItem aBoxItem( *static_cast<const SvxBoxItem *>(pItem) );
aBoxItem.SetWhich( RES_CHRATR_BOX );
- NewAttr( &aAttrTab.pCharBox, aBoxItem );
+ NewAttr( &m_aAttrTab.pCharBox, aBoxItem );
_HTMLAttrs &rAttrs = pContext->GetAttrs();
- rAttrs.push_back( aAttrTab.pCharBox );
+ rAttrs.push_back( m_aAttrTab.pCharBox );
}
else
{
- ppAttr = &aAttrTab.pBox;
+ ppAttr = &m_aAttrTab.pBox;
}
break;
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx
index b5cc039b48c0..4f47da9e8055 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -81,9 +81,9 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
// always on top of text.
// but in invisible layer. <ConnectToLayout> will move the object
// to the visible layer.
- pNewDrawObj->SetLayer( pDoc->getIDocumentDrawModelAccess().GetInvisibleHeavenId() );
+ pNewDrawObj->SetLayer( m_pDoc->getIDocumentDrawModelAccess().GetInvisibleHeavenId() );
- SfxItemSet aFrmSet( pDoc->GetAttrPool(),
+ SfxItemSet aFrmSet( m_pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs( aFrmSet );
@@ -159,7 +159,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType )
{
const SwStartNode *pFlySttNd =
- pPam->GetPoint()->nNode.GetNode().FindFlyStartNode();
+ m_pPam->GetPoint()->nNode.GetNode().FindFlyStartNode();
if( pFlySttNd )
{
@@ -196,11 +196,11 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
}
else if( FLY_AT_FLY != aAnchor.GetAnchorId() )
{
- aAnchor.SetAnchor( pPam->GetPoint() );
+ aAnchor.SetAnchor( m_pPam->GetPoint() );
}
aFrmSet.Put( aAnchor );
- pDoc->getIDocumentContentOperations().InsertDrawObj( *pPam, *pNewDrawObj, aFrmSet );
+ m_pDoc->getIDocumentContentOperations().InsertDrawObj( *m_pPam, *pNewDrawObj, aFrmSet );
}
static void PutEEPoolItem( SfxItemSet &rEEItemSet,
@@ -251,8 +251,8 @@ static void PutEEPoolItem( SfxItemSet &rEEItemSet,
void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
{
- OSL_ENSURE( !pMarquee, "Marquee in Marquee???" );
- aContents.clear();
+ OSL_ENSURE( !m_pMarquee, "Marquee in Marquee???" );
+ m_aContents.clear();
OUString aId, aStyle, aClass;
@@ -359,14 +359,14 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
// Ein DrawTextobj anlegen
// #i52858# - method name changed
- SwDrawModel* pModel = pDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel();
+ SwDrawModel* pModel = m_pDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel();
SdrPage* pPg = pModel->GetPage( 0 );
- pMarquee = SdrObjFactory::MakeNewObject( SdrInventor,
+ m_pMarquee = SdrObjFactory::MakeNewObject( SdrInventor,
OBJ_TEXT, pPg, pModel );
- if( !pMarquee )
+ if( !m_pMarquee )
return;
- pPg->InsertObject( pMarquee );
+ pPg->InsertObject( m_pMarquee );
if( !aId.isEmpty() )
InsertBookmark( aId );
@@ -400,7 +400,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
// die Default-Farbe (aus der Standard-Vorlage) setzen, damit ueberhaupt
// eine sinnvolle Farbe gesetzt ist.
const Color& rDfltColor =
- pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD )
+ m_pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD )
->GetColor().GetValue();
aItemSet.Put( SvxColorItem( rDfltColor, EE_CHAR_COLOR ) );
@@ -418,7 +418,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
0
};
SwTextNode const*const pTextNd =
- pPam->GetPoint()->nNode.GetNode().GetTextNode();
+ m_pPam->GetPoint()->nNode.GetNode().GetTextNode();
if( pTextNd )
{
const SfxItemSet& rItemSet = pTextNd->GetAnyFormatColl().GetAttrSet();
@@ -431,7 +431,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
}
// die Attribute der Umgebung am Draw-Objekt setzen
- _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&aAttrTab);
+ _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&m_aAttrTab);
for (auto nCnt = sizeof(_HTMLAttrTable) / sizeof(_HTMLAttr*); nCnt--; ++pHTMLAttributes)
{
_HTMLAttr *pAttr = *pHTMLAttributes;
@@ -447,8 +447,8 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
// Styles parsen (funktioniert hier nur fuer Attribute, die auch
// am Zeichen-Objekt gesetzt werden koennen)
- SfxItemSet aStyleItemSet( pDoc->GetAttrPool(),
- pCSS1Parser->GetWhichMap() );
+ SfxItemSet aStyleItemSet( m_pDoc->GetAttrPool(),
+ m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( HasStyleOptions( aStyle, aId, aClass ) &&
ParseStyleOptions( aStyle, aId, aClass, aStyleItemSet, aPropInfo ) )
@@ -480,10 +480,10 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
if( SVX_CSS1_LTYPE_TWIP== aPropInfo.eHeightType )
aTwipSz.Height() = aPropInfo.nHeight;
- bFixMarqueeWidth = false;
+ m_bFixMarqueeWidth = false;
if( !nWidth || bPrcWidth )
{
- if( pTable )
+ if( m_pTable )
{
if( !pCurTable )
{
@@ -491,7 +491,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
// in einer Zelle. Da jetzt keine vernuenftige Zuordung
// zu einer Zelle moeglich ist, passen wir hir die
// Breite dem Inhalt der Laufschrift an.
- bFixMarqueeWidth = true;
+ m_bFixMarqueeWidth = true;
}
else if( !nWidth )
{
@@ -516,14 +516,14 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
aTwipSz.Height() = MINFLY;
aItemSet.Put( makeSdrTextMinFrameHeightItem( aTwipSz.Height() ) );
- pMarquee->SetMergedItemSetAndBroadcast(aItemSet);
+ m_pMarquee->SetMergedItemSetAndBroadcast(aItemSet);
if( aTwipSz.Width() < MINFLY )
aTwipSz.Width() = MINFLY;
- pMarquee->SetLogicRect( Rectangle( 0, 0, aTwipSz.Width(), aTwipSz.Height() ) );
+ m_pMarquee->SetLogicRect( Rectangle( 0, 0, aTwipSz.Width(), aTwipSz.Height() ) );
// und das Objekt in das Dok einfuegen
- InsertDrawObject( pMarquee, aSpace, eVertOri, eHoriOri, aStyleItemSet,
+ InsertDrawObject( m_pMarquee, aSpace, eVertOri, eHoriOri, aStyleItemSet,
aPropInfo );
// Das Zeichen-Objekt der Tabelle bekanntmachen. Ist ein bisserl
@@ -533,44 +533,44 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
// pTable kann uebrigens auch nicht verwendet werden, denn die
// Laufschrift kann sich auch mal in einer Sub-Tabelle befinden.
if( pCurTable && bPrcWidth)
- RegisterDrawObjectToTable( pCurTable, pMarquee, (sal_uInt8)nWidth );
+ RegisterDrawObjectToTable( pCurTable, m_pMarquee, (sal_uInt8)nWidth );
}
void SwHTMLParser::EndMarquee()
{
- OSL_ENSURE( pMarquee && OBJ_TEXT==pMarquee->GetObjIdentifier(),
+ OSL_ENSURE( m_pMarquee && OBJ_TEXT==m_pMarquee->GetObjIdentifier(),
"kein Marquee oder falscher Typ" );
- if( bFixMarqueeWidth )
+ if( m_bFixMarqueeWidth )
{
// Da es keine fixe Hoehe gibt, das Text-Objekt erstmal breiter
// als den Text machen, damit nicht umgebrochen wird.
- const Rectangle& rOldRect = pMarquee->GetLogicRect();
- pMarquee->SetLogicRect( Rectangle( rOldRect.TopLeft(),
+ const Rectangle& rOldRect = m_pMarquee->GetLogicRect();
+ m_pMarquee->SetLogicRect( Rectangle( rOldRect.TopLeft(),
Size( USHRT_MAX, 240 ) ) );
}
// den gesammelten Text einfuegen
- static_cast<SdrTextObj*>(pMarquee)->SetText( aContents );
- pMarquee->SetMergedItemSetAndBroadcast( pMarquee->GetMergedItemSet() );
+ static_cast<SdrTextObj*>(m_pMarquee)->SetText( m_aContents );
+ m_pMarquee->SetMergedItemSetAndBroadcast( m_pMarquee->GetMergedItemSet() );
- if( bFixMarqueeWidth )
+ if( m_bFixMarqueeWidth )
{
// die Groesse dem Text anpassen.
- static_cast<SdrTextObj*>(pMarquee)->FitFrameToTextSize();
+ static_cast<SdrTextObj*>(m_pMarquee)->FitFrameToTextSize();
}
- aContents.clear();
- pMarquee = 0;
+ m_aContents.clear();
+ m_pMarquee = 0;
}
void SwHTMLParser::InsertMarqueeText()
{
- OSL_ENSURE( pMarquee && OBJ_TEXT==pMarquee->GetObjIdentifier(),
+ OSL_ENSURE( m_pMarquee && OBJ_TEXT==m_pMarquee->GetObjIdentifier(),
"kein Marquee oder falscher Typ" );
// das akteulle Textstueck an den Text anhaengen
- aContents += aToken;
+ m_aContents += aToken;
}
void SwHTMLParser::ResizeDrawObject( SdrObject* pObj, SwTwips nWidth )
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index 9e3a9d9c6c06..f6fcb5d261e0 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -264,7 +264,7 @@ void SwHTMLParser::NewField()
{
SvtUserOptions aOpt;
const OUString& rUser = aOpt.GetFullName();
- SwDocShell *pDocShell(pDoc->GetDocShell());
+ SwDocShell *pDocShell(m_pDoc->GetDocShell());
OSL_ENSURE(pDocShell, "no SwDocShell");
if (pDocShell) {
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
@@ -284,7 +284,7 @@ void SwHTMLParser::NewField()
if( RES_DATEFLD==nType || RES_TIMEFLD==nType )
nWhich = RES_DATETIMEFLD;
- SwFieldType* pType = pDoc->getIDocumentFieldsAccess().GetSysFieldType( nWhich );
+ SwFieldType* pType = m_pDoc->getIDocumentFieldsAccess().GetSysFieldType( nWhich );
SwField *pNewField = 0;
bool bInsOnEndTag = false;
@@ -347,7 +347,7 @@ void SwHTMLParser::NewField()
if( !aValue.isEmpty() )
nSub |= FIXEDFLD;
- SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter();
+ SvNumberFormatter *pFormatter = m_pDoc->GetNumberFormatter();
if( pFormatOption )
{
const OUString& rFormat = pFormatOption->GetString();
@@ -378,12 +378,12 @@ void SwHTMLParser::NewField()
{
sal_uInt16 nSub = 0;
- SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter();
+ SvNumberFormatter *pFormatter = m_pDoc->GetNumberFormatter();
sal_uInt32 nNumFormat;
LanguageType eLang;
double dValue = GetTableDataOptionsValNum(
nNumFormat, eLang, aNumValue, aNumFormat,
- *pDoc->GetNumberFormatter() );
+ *m_pDoc->GetNumberFormatter() );
short nFormatType = pFormatter->GetType( nNumFormat );
switch( nFormatType )
{
@@ -456,7 +456,7 @@ void SwHTMLParser::NewField()
LanguageType eLang;
dValue = GetTableDataOptionsValNum(
nNumFormat, eLang, aNumValue, aNumFormat,
- *pDoc->GetNumberFormatter() );
+ *m_pDoc->GetNumberFormatter() );
bFixed &= bHasNumValue;
}
else
@@ -493,7 +493,7 @@ void SwHTMLParser::NewField()
if( pFormatOption )
pFormatOption->GetEnum( nFormat, aHTMLPageNumFieldFormatTable );
pNewField = new SwDocStatField(static_cast<SwDocStatFieldType*>(pType), nSub, nFormat);
- bUpdateDocStat |= (DS_PAGE != nFormat);
+ m_bUpdateDocStat |= (DS_PAGE != nFormat);
}
}
break;
@@ -520,77 +520,77 @@ void SwHTMLParser::NewField()
{
if (bInsOnEndTag)
{
- pField = pNewField;
+ m_pField = pNewField;
}
else
{
- pDoc->getIDocumentContentOperations().InsertPoolItem(*pPam, SwFormatField(*pNewField));
+ m_pDoc->getIDocumentContentOperations().InsertPoolItem(*m_pPam, SwFormatField(*pNewField));
delete pNewField;
}
- bInField = true;
+ m_bInField = true;
}
}
void SwHTMLParser::EndField()
{
- if( pField )
+ if( m_pField )
{
- switch( pField->Which() )
+ switch( m_pField->Which() )
{
case RES_DOCINFOFLD:
- OSL_ENSURE( static_cast<SwDocInfoField*>(pField)->IsFixed(),
+ OSL_ENSURE( static_cast<SwDocInfoField*>(m_pField)->IsFixed(),
"DokInfo-Feld haette nicht gemerkt werden muessen" );
- static_cast<SwDocInfoField*>(pField)->SetExpansion( aContents );
+ static_cast<SwDocInfoField*>(m_pField)->SetExpansion( m_aContents );
break;
case RES_EXTUSERFLD:
- OSL_ENSURE( static_cast<SwExtUserField*>(pField)->IsFixed(),
+ OSL_ENSURE( static_cast<SwExtUserField*>(m_pField)->IsFixed(),
"ExtUser-Feld haette nicht gemerkt werden muessen" );
- static_cast<SwExtUserField*>(pField)->SetExpansion( aContents );
+ static_cast<SwExtUserField*>(m_pField)->SetExpansion( m_aContents );
break;
case RES_AUTHORFLD:
- OSL_ENSURE( static_cast<SwAuthorField*>(pField)->IsFixed(),
+ OSL_ENSURE( static_cast<SwAuthorField*>(m_pField)->IsFixed(),
"Author-Feld haette nicht gemerkt werden muessen" );
- static_cast<SwAuthorField*>(pField)->SetExpansion( aContents );
+ static_cast<SwAuthorField*>(m_pField)->SetExpansion( m_aContents );
break;
case RES_FILENAMEFLD:
- OSL_ENSURE( static_cast<SwFileNameField*>(pField)->IsFixed(),
+ OSL_ENSURE( static_cast<SwFileNameField*>(m_pField)->IsFixed(),
"FileName-Feld haette nicht gemerkt werden muessen" );
- static_cast<SwFileNameField*>(pField)->SetExpansion( aContents );
+ static_cast<SwFileNameField*>(m_pField)->SetExpansion( m_aContents );
break;
}
- pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, SwFormatField(*pField) );
- delete pField;
- pField = 0;
+ m_pDoc->getIDocumentContentOperations().InsertPoolItem( *m_pPam, SwFormatField(*m_pField) );
+ delete m_pField;
+ m_pField = 0;
}
- bInField = false;
- aContents.clear();
+ m_bInField = false;
+ m_aContents.clear();
}
void SwHTMLParser::InsertFieldText()
{
- if( pField )
+ if( m_pField )
{
// das aktuelle Textstueck an den Text anhaengen
- aContents += aToken;
+ m_aContents += aToken;
}
}
void SwHTMLParser::InsertCommentText( const sal_Char *pTag )
{
- bool bEmpty = aContents.isEmpty();
+ bool bEmpty = m_aContents.isEmpty();
if( !bEmpty )
- aContents += "\n";
+ m_aContents += "\n";
- aContents += aToken;
+ m_aContents += aToken;
if( bEmpty && pTag )
{
- OUString aTmp( aContents );
- aContents = "HTML: <" + OUString( *pTag ) + ">" + aTmp;
+ OUString aTmp( m_aContents );
+ m_aContents = "HTML: <" + OUString( *pTag ) + ">" + aTmp;
}
}
@@ -607,18 +607,18 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag
// MIB 24.06.97: Wenn ein PostIt nach einen Space eingefuegt
// werden soll, fuegen wir es vor dem Space ein. Dann gibt es
// weniger Probleme beim Formatieren (bug #40483#)
- const sal_Int32 nPos = pPam->GetPoint()->nContent.GetIndex();
- SwTextNode *pTextNd = pPam->GetNode().GetTextNode();
+ const sal_Int32 nPos = m_pPam->GetPoint()->nContent.GetIndex();
+ SwTextNode *pTextNd = m_pPam->GetNode().GetTextNode();
bool bMoveFwd = false;
if (nPos>0 && pTextNd && (' ' == pTextNd->GetText()[nPos-1]))
{
bMoveFwd = true;
- sal_uLong nNodeIdx = pPam->GetPoint()->nNode.GetIndex();
- const sal_Int32 nIdx = pPam->GetPoint()->nContent.GetIndex();
- for( auto i = aSetAttrTab.size(); i > 0; )
+ sal_uLong nNodeIdx = m_pPam->GetPoint()->nNode.GetIndex();
+ const sal_Int32 nIdx = m_pPam->GetPoint()->nContent.GetIndex();
+ for( auto i = m_aSetAttrTab.size(); i > 0; )
{
- _HTMLAttr *pAttr = aSetAttrTab[--i];
+ _HTMLAttr *pAttr = m_aSetAttrTab[--i];
if( pAttr->GetSttParaIdx() != nNodeIdx ||
pAttr->GetSttCnt() != nIdx )
break;
@@ -632,16 +632,16 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag
}
if( bMoveFwd )
- pPam->Move( fnMoveBackward );
+ m_pPam->Move( fnMoveBackward );
}
SwPostItField aPostItField(
- static_cast<SwPostItFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_POSTITFLD )),
+ static_cast<SwPostItFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_POSTITFLD )),
aEmptyOUStr, aComment, aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM ) );
InsertAttr( SwFormatField( aPostItField ) );
if( bMoveFwd )
- pPam->Move( fnMoveForward );
+ m_pPam->Move( fnMoveForward );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 1941ff4efec8..f9c5ded4e078 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -601,8 +601,8 @@ void SwHTMLImageWatcher::disposing(const lang::EventObject& evt) throw ( uno::Ru
void SwHTMLParser::DeleteFormImpl()
{
- delete pFormImpl;
- pFormImpl = 0;
+ delete m_pFormImpl;
+ m_pFormImpl = 0;
}
static void lcl_html_setFixedFontProperty(
@@ -646,25 +646,25 @@ void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rSha
// das auch vom SwXShape implementiert wird.
uno::Reference< beans::XPropertySet > xPropSet( rShape, UNO_QUERY );
- SwViewShell *pVSh = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
- if( !pVSh && !nEventId )
+ SwViewShell *pVSh = m_pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
+ if( !pVSh && !m_nEventId )
{
// If there is no view shell by now and the doc shell is an internal
// one, no view shell will be created. That for, we have to do that of
// our own. This happens if a linked section is inserted or refreshed.
- SwDocShell *pDocSh = pDoc->GetDocShell();
+ SwDocShell *pDocSh = m_pDoc->GetDocShell();
if( pDocSh )
{
if ( pDocSh->GetMedium() )
{
// if there is no hidden property in the MediaDescriptor it should be removed after loading
const SfxBoolItem* pHiddenItem = SfxItemSet::GetItem<SfxBoolItem>(pDocSh->GetMedium()->GetItemSet(), SID_HIDDEN, false);
- bRemoveHidden = ( pHiddenItem == NULL || !pHiddenItem->GetValue() );
+ m_bRemoveHidden = ( pHiddenItem == NULL || !pHiddenItem->GetValue() );
}
- pTempViewFrame = SfxViewFrame::LoadHiddenDocument( *pDocSh, 0 );
+ m_pTempViewFrame = SfxViewFrame::LoadHiddenDocument( *pDocSh, 0 );
CallStartAction();
- pVSh = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
+ pVSh = m_pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
}
}
@@ -717,7 +717,7 @@ void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rSha
if( -1 == rTextSz.Width() )
{
aTmpSz.Width = 0;
- aTmpSz.Height = nSelectEntryCnt;
+ aTmpSz.Height = m_nSelectEntryCnt;
}
aTmpSz = xLC->getMinimumSize( static_cast< sal_Int16 >(aTmpSz.Width), static_cast< sal_Int16 >(aTmpSz.Height) );
if( rTextSz.Width() )
@@ -873,7 +873,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
uno::Reference< drawing::XShape > xShape;
const uno::Reference< container::XIndexContainer > & rFormComps =
- pFormImpl->GetFormComps();
+ m_pFormImpl->GetFormComps();
Any aAny( &rFComp, cppu::UnoType<XFormComponent>::get());
rFormComps->insertByIndex( rFormComps->getCount(), aAny );
@@ -886,7 +886,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
sal_Int32 nLowerSpace = 0;
const uno::Reference< XMultiServiceFactory > & rServiceFactory =
- pFormImpl->GetServiceFactory();
+ m_pFormImpl->GetServiceFactory();
if( !rServiceFactory.is() )
return xShape;
@@ -1087,7 +1087,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType )
{
const SwStartNode *pFlySttNd =
- pPam->GetPoint()->nNode.GetNode().FindFlyStartNode();
+ m_pPam->GetPoint()->nNode.GetNode().FindFlyStartNode();
if( pFlySttNd )
{
@@ -1172,7 +1172,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
if( !xTextRg.is() )
{
uno::Reference< text::XText > xDummyTextRef; // unsauber, aber laut OS geht das ...
- xTextRg = new SwXTextRange( *pPam, xDummyTextRef );
+ xTextRg = new SwXTextRange( *m_pPam, xDummyTextRef );
}
aTmp.setValue( &xTextRg,
@@ -1198,7 +1198,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
xShapePropSet->setPropertyValue("Surround", aTmp );
}
- pFormImpl->GetShapes()->add(xShape);
+ m_pFormImpl->GetShapes()->add(xShape);
// Das Control-Model am Control-Shape setzen
uno::Reference< drawing::XControlShape > xControlShape( xShape, UNO_QUERY );
@@ -1212,15 +1212,15 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
// gesetzt.
if( !rMacroTable.empty() || !rUnoMacroTable.empty() )
{
- lcl_html_setEvents( pFormImpl->GetControlEventManager(),
+ lcl_html_setEvents( m_pFormImpl->GetControlEventManager(),
rFormComps->getCount() - 1,
rMacroTable, rUnoMacroTable, rUnoMacroParamTable,
- GetScriptTypeString(pFormImpl->GetHeaderAttrs()) );
+ GetScriptTypeString(m_pFormImpl->GetHeaderAttrs()) );
}
if( bSetFCompPropSet )
{
- pFormImpl->SetFCompPropSet( rFCompPropSet );
+ m_pFormImpl->SetFCompPropSet( rFCompPropSet );
}
return xShape;
@@ -1229,28 +1229,28 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
void SwHTMLParser::NewForm( bool bAppend )
{
// Gibt es schon eine Form?
- if( pFormImpl && pFormImpl->GetFormComps().is() )
+ if( m_pFormImpl && m_pFormImpl->GetFormComps().is() )
return;
if( bAppend )
{
- if( pPam->GetPoint()->nContent.GetIndex() )
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( AM_SPACE );
else
AddParSpace();
}
- if( !pFormImpl )
- pFormImpl = new SwHTMLForm_Impl( pDoc->GetDocShell() );
+ if( !m_pFormImpl )
+ m_pFormImpl = new SwHTMLForm_Impl( m_pDoc->GetDocShell() );
- OUString aAction( sBaseURL );
+ OUString aAction( m_sBaseURL );
OUString sName, sTarget;
sal_uInt16 nEncType = FormSubmitEncoding_URL;
sal_uInt16 nMethod = FormSubmitMethod_GET;
SvxMacroTableDtor aMacroTable;
std::vector<OUString> aUnoMacroTable;
std::vector<OUString> aUnoMacroParamTable;
- SvKeyValueIterator *pHeaderAttrs = pFormImpl->GetHeaderAttrs();
+ SvKeyValueIterator *pHeaderAttrs = m_pFormImpl->GetHeaderAttrs();
ScriptType eDfltScriptType = GetScriptType( pHeaderAttrs );
const OUString& rDfltScriptType = GetScriptTypeString( pHeaderAttrs );
@@ -1318,7 +1318,7 @@ void SwHTMLParser::NewForm( bool bAppend )
}
const uno::Reference< XMultiServiceFactory > & rSrvcMgr =
- pFormImpl->GetServiceFactory();
+ m_pFormImpl->GetServiceFactory();
if( !rSrvcMgr.is() )
return;
@@ -1331,7 +1331,7 @@ void SwHTMLParser::NewForm( bool bAppend )
OSL_ENSURE( xForm.is(), "keine Form?" );
uno::Reference< container::XIndexContainer > xFormComps( xForm, UNO_QUERY );
- pFormImpl->SetFormComps( xFormComps );
+ m_pFormImpl->SetFormComps( xFormComps );
uno::Reference< beans::XPropertySet > xFormPropSet( xForm, UNO_QUERY );
@@ -1341,12 +1341,12 @@ void SwHTMLParser::NewForm( bool bAppend )
if( !aAction.isEmpty() )
{
- aAction = URIHelper::SmartRel2Abs(INetURLObject(sBaseURL), aAction, Link<OUString *, bool>(), false);
+ aAction = URIHelper::SmartRel2Abs(INetURLObject(m_sBaseURL), aAction, Link<OUString *, bool>(), false);
}
else
{
// Bei leerer URL das Directory nehmen
- INetURLObject aURLObj( aPathToFile );
+ INetURLObject aURLObj( m_aPathToFile );
aAction = aURLObj.GetPartBeforeLastName();
}
aTmp <<= OUString(aAction);
@@ -1369,11 +1369,11 @@ void SwHTMLParser::NewForm( bool bAppend )
}
const uno::Reference< container::XIndexContainer > & rForms =
- pFormImpl->GetForms();
+ m_pFormImpl->GetForms();
Any aAny( &xForm, cppu::UnoType<XForm>::get());
rForms->insertByIndex( rForms->getCount(), aAny );
if( !aMacroTable.empty() )
- lcl_html_setEvents( pFormImpl->GetFormEventManager(),
+ lcl_html_setEvents( m_pFormImpl->GetFormEventManager(),
rForms->getCount() - 1,
aMacroTable, aUnoMacroTable, aUnoMacroParamTable,
rDfltScriptType );
@@ -1381,25 +1381,25 @@ void SwHTMLParser::NewForm( bool bAppend )
void SwHTMLParser::EndForm( bool bAppend )
{
- if( pFormImpl && pFormImpl->GetFormComps().is() )
+ if( m_pFormImpl && m_pFormImpl->GetFormComps().is() )
{
if( bAppend )
{
- if( pPam->GetPoint()->nContent.GetIndex() )
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( AM_SPACE );
else
AddParSpace();
}
- pFormImpl->ReleaseFormComps();
+ m_pFormImpl->ReleaseFormComps();
}
}
void SwHTMLParser::InsertInput()
{
- assert(pPendStack == 0);
+ assert(m_pPendStack == 0);
- if( !pFormImpl || !pFormImpl->GetFormComps().is() )
+ if( !m_pFormImpl || !m_pFormImpl->GetFormComps().is() )
return;
OUString sImgSrc, aId, aClass, aStyle, sName;
@@ -1418,7 +1418,7 @@ void SwHTMLParser::InsertInput()
long nWidth=0, nHeight=0;
sal_Int16 eVertOri = text::VertOrientation::TOP;
sal_Int16 eHoriOri = text::HoriOrientation::NONE;
- SvKeyValueIterator *pHeaderAttrs = pFormImpl->GetHeaderAttrs();
+ SvKeyValueIterator *pHeaderAttrs = m_pFormImpl->GetHeaderAttrs();
ScriptType eDfltScriptType = GetScriptType( pHeaderAttrs );
const OUString& rDfltScriptType = GetScriptTypeString( pHeaderAttrs );
@@ -1613,7 +1613,7 @@ void SwHTMLParser::InsertInput()
}
const uno::Reference< XMultiServiceFactory > & rServiceFactory =
- pFormImpl->GetServiceFactory();
+ m_pFormImpl->GetServiceFactory();
if( !rServiceFactory.is() )
return;
@@ -1794,7 +1794,7 @@ void SwHTMLParser::InsertInput()
}
}
- SfxItemSet aCSS1ItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aCSS1ItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aCSS1PropInfo;
if( HasStyleOptions( aStyle, aId, aClass ) )
{
@@ -1824,7 +1824,7 @@ void SwHTMLParser::InsertInput()
{
aSz.Width() = HTML_DFLT_IMG_WIDTH;
bSetGrfWidth = true;
- if( pTable != 0 )
+ if( m_pTable != 0 )
IncGrfsThatResizeTable();
}
if( !aSz.Height() )
@@ -1862,7 +1862,7 @@ void SwHTMLParser::InsertInput()
// Die URL erst nach dem Einfuegen setzen, weil sich der
// Download der Grafik erst dann am XModel anmelden kann,
// wenn das Control eingefuegt ist.
- aTmp <<= OUString( URIHelper::SmartRel2Abs(INetURLObject(sBaseURL), sImgSrc, Link<OUString *, bool>(), false));
+ aTmp <<= OUString( URIHelper::SmartRel2Abs(INetURLObject(m_sBaseURL), sImgSrc, Link<OUString *, bool>(), false));
xPropSet->setPropertyValue("ImageURL",
aTmp );
}
@@ -1878,13 +1878,13 @@ void SwHTMLParser::InsertInput()
void SwHTMLParser::NewTextArea()
{
- assert(pPendStack == 0);
+ assert(m_pPendStack == 0);
- OSL_ENSURE( !bTextArea, "TextArea in TextArea???" );
- OSL_ENSURE( !pFormImpl || !pFormImpl->GetFCompPropSet().is(),
+ OSL_ENSURE( !m_bTextArea, "TextArea in TextArea???" );
+ OSL_ENSURE( !m_pFormImpl || !m_pFormImpl->GetFCompPropSet().is(),
"TextArea in Control???" );
- if( !pFormImpl || !pFormImpl->GetFormComps().is() )
+ if( !m_pFormImpl || !m_pFormImpl->GetFormComps().is() )
{
// Spezialbehandlung fuer TextArea auch untem im Parser beenden
FinishTextArea();
@@ -1900,7 +1900,7 @@ void SwHTMLParser::NewTextArea()
sal_uInt16 nRows = 0, nCols = 0;
sal_uInt16 nWrap = HTML_WM_OFF;
bool bDisabled = false;
- SvKeyValueIterator *pHeaderAttrs = pFormImpl->GetHeaderAttrs();
+ SvKeyValueIterator *pHeaderAttrs = m_pFormImpl->GetHeaderAttrs();
ScriptType eDfltScriptType = GetScriptType( pHeaderAttrs );
const OUString& rDfltScriptType = GetScriptTypeString( pHeaderAttrs );
@@ -1997,14 +1997,14 @@ void SwHTMLParser::NewTextArea()
{
sEvent = convertLineEnd(sEvent, GetSystemLineEnd());
if( EXTENDED_STYPE==eScriptType2 )
- aScriptType = rDfltScriptType;
- aMacroTable.Insert( nEvent, SvxMacro( sEvent, aScriptType, eScriptType2 ) );
+ m_aScriptType = rDfltScriptType;
+ aMacroTable.Insert( nEvent, SvxMacro( sEvent, m_aScriptType, eScriptType2 ) );
}
}
}
const uno::Reference< lang::XMultiServiceFactory > & rSrvcMgr =
- pFormImpl->GetServiceFactory();
+ m_pFormImpl->GetServiceFactory();
if( !rSrvcMgr.is() )
{
FinishTextArea();
@@ -2048,7 +2048,7 @@ void SwHTMLParser::NewTextArea()
xPropSet->setPropertyValue("Enabled", makeAny(false) );
}
- OSL_ENSURE( pFormImpl->GetText().isEmpty(), "Text ist nicht leer!" );
+ OSL_ENSURE( m_pFormImpl->GetText().isEmpty(), "Text ist nicht leer!" );
if( !nCols )
nCols = 20;
@@ -2057,7 +2057,7 @@ void SwHTMLParser::NewTextArea()
Size aTextSz( nCols, nRows );
- SfxItemSet aCSS1ItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aCSS1ItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aCSS1PropInfo;
if( HasStyleOptions( aStyle, aId, aClass ) )
{
@@ -2097,25 +2097,25 @@ void SwHTMLParser::NewTextArea()
SplitPREListingXMP( pCntxt );
PushContext( pCntxt );
- bTextArea = true;
- bTAIgnoreNewPara = true;
+ m_bTextArea = true;
+ m_bTAIgnoreNewPara = true;
}
void SwHTMLParser::EndTextArea()
{
- OSL_ENSURE( bTextArea, "keine TextArea oder falscher Typ" );
- OSL_ENSURE( pFormImpl && pFormImpl->GetFCompPropSet().is(),
+ OSL_ENSURE( m_bTextArea, "keine TextArea oder falscher Typ" );
+ OSL_ENSURE( m_pFormImpl && m_pFormImpl->GetFCompPropSet().is(),
"TextArea fehlt" );
const uno::Reference< beans::XPropertySet > & rPropSet =
- pFormImpl->GetFCompPropSet();
+ m_pFormImpl->GetFCompPropSet();
Any aTmp;
- aTmp <<= pFormImpl->GetText();
+ aTmp <<= m_pFormImpl->GetText();
rPropSet->setPropertyValue("DefaultText", aTmp );
- pFormImpl->EraseText();
+ m_pFormImpl->EraseText();
- pFormImpl->ReleaseFCompPropSet();
+ m_pFormImpl->ReleaseFCompPropSet();
// den Kontext holen
_HTMLAttrContext *pCntxt = PopContext( HTML_TEXTAREA_ON );
@@ -2126,23 +2126,23 @@ void SwHTMLParser::EndTextArea()
delete pCntxt;
}
- bTextArea = false;
+ m_bTextArea = false;
}
void SwHTMLParser::InsertTextAreaText( sal_uInt16 nToken )
{
- OSL_ENSURE( bTextArea, "keine TextArea oder falscher Typ" );
- OSL_ENSURE( pFormImpl && pFormImpl->GetFCompPropSet().is(),
+ OSL_ENSURE( m_bTextArea, "keine TextArea oder falscher Typ" );
+ OSL_ENSURE( m_pFormImpl && m_pFormImpl->GetFCompPropSet().is(),
"TextArea fehlt" );
- OUString& rText = pFormImpl->GetText();
+ OUString& rText = m_pFormImpl->GetText();
switch( nToken)
{
case HTML_TEXTTOKEN:
rText += aToken;
break;
case HTML_NEWPARA:
- if( !bTAIgnoreNewPara )
+ if( !m_bTAIgnoreNewPara )
rText += "\n"; // das ist hier richtig!!!
break;
default:
@@ -2156,18 +2156,18 @@ void SwHTMLParser::InsertTextAreaText( sal_uInt16 nToken )
rText += ">";
}
- bTAIgnoreNewPara = false;
+ m_bTAIgnoreNewPara = false;
}
void SwHTMLParser::NewSelect()
{
- assert(pPendStack == 0);
+ assert(m_pPendStack == 0);
- OSL_ENSURE( !bSelect, "Select in Select???" );
- OSL_ENSURE( !pFormImpl || !pFormImpl->GetFCompPropSet().is(),
+ OSL_ENSURE( !m_bSelect, "Select in Select???" );
+ OSL_ENSURE( !m_pFormImpl || !m_pFormImpl->GetFCompPropSet().is(),
"Select in Control???" );
- if( !pFormImpl || !pFormImpl->GetFormComps().is() )
+ if( !m_pFormImpl || !m_pFormImpl->GetFormComps().is() )
return;
OUString aId, aClass, aStyle;
@@ -2178,8 +2178,8 @@ void SwHTMLParser::NewSelect()
std::vector<OUString> aUnoMacroParamTable;
bool bMultiple = false;
bool bDisabled = false;
- nSelectEntryCnt = 1;
- SvKeyValueIterator *pHeaderAttrs = pFormImpl->GetHeaderAttrs();
+ m_nSelectEntryCnt = 1;
+ SvKeyValueIterator *pHeaderAttrs = m_pFormImpl->GetHeaderAttrs();
ScriptType eDfltScriptType = GetScriptType( pHeaderAttrs );
const OUString& rDfltScriptType = GetScriptTypeString( pHeaderAttrs );
@@ -2212,7 +2212,7 @@ void SwHTMLParser::NewSelect()
bDisabled = true;
break;
case HTML_O_SIZE:
- nSelectEntryCnt = (sal_uInt16)rOption.GetNumber();
+ m_nSelectEntryCnt = (sal_uInt16)rOption.GetNumber();
break;
case HTML_O_TABINDEX:
@@ -2265,14 +2265,14 @@ void SwHTMLParser::NewSelect()
{
sEvent = convertLineEnd(sEvent, GetSystemLineEnd());
if( EXTENDED_STYPE==eScriptType2 )
- aScriptType = rDfltScriptType;
- aMacroTable.Insert( nEvent, SvxMacro( sEvent, aScriptType, eScriptType2 ) );
+ m_aScriptType = rDfltScriptType;
+ aMacroTable.Insert( nEvent, SvxMacro( sEvent, m_aScriptType, eScriptType2 ) );
}
}
}
const uno::Reference< lang::XMultiServiceFactory > & rSrvcMgr =
- pFormImpl->GetServiceFactory();
+ m_pFormImpl->GetServiceFactory();
if( !rSrvcMgr.is() )
{
FinishTextArea();
@@ -2308,24 +2308,24 @@ void SwHTMLParser::NewSelect()
Size aTextSz( 0, 0 );
bool bMinWidth = true, bMinHeight = true;
- if( !bMultiple && 1==nSelectEntryCnt )
+ if( !bMultiple && 1==m_nSelectEntryCnt )
{
xPropSet->setPropertyValue("Dropdown", makeAny(true) );
}
else
{
- if( nSelectEntryCnt <= 1 ) // 4 Zeilen als default
- nSelectEntryCnt = 4;
+ if( m_nSelectEntryCnt <= 1 ) // 4 Zeilen als default
+ m_nSelectEntryCnt = 4;
if( bMultiple )
{
xPropSet->setPropertyValue("MultiSelection", makeAny(true) );
}
- aTextSz.Height() = nSelectEntryCnt;
+ aTextSz.Height() = m_nSelectEntryCnt;
bMinHeight = false;
}
- SfxItemSet aCSS1ItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aCSS1ItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aCSS1PropInfo;
if( HasStyleOptions( aStyle, aId, aClass ) )
{
@@ -2335,11 +2335,11 @@ void SwHTMLParser::NewSelect()
}
Size aSz( MINFLY, MINFLY );
- bFixSelectWidth = bFixSelectHeight = true;
+ m_bFixSelectWidth = m_bFixSelectHeight = true;
if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.eWidthType )
{
aSz.Width() = convertTwipToMm100( aCSS1PropInfo.nWidth );
- bFixSelectWidth = false;
+ m_bFixSelectWidth = false;
bMinWidth = false;
}
if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.eHeightType )
@@ -2358,8 +2358,8 @@ void SwHTMLParser::NewSelect()
aCSS1ItemSet, aCSS1PropInfo,
aMacroTable, aUnoMacroTable,
aUnoMacroParamTable );
- if( bFixSelectWidth )
- pFormImpl->SetShape( xShape );
+ if( m_bFixSelectWidth )
+ m_pFormImpl->SetShape( xShape );
if( aTextSz.Height() || bMinWidth || bMinHeight )
SetControlSize( xShape, aTextSz, bMinWidth, bMinHeight );
@@ -2370,22 +2370,22 @@ void SwHTMLParser::NewSelect()
SplitPREListingXMP( pCntxt );
PushContext( pCntxt );
- bSelect = true;
+ m_bSelect = true;
}
void SwHTMLParser::EndSelect()
{
- assert(pPendStack == 0);
+ assert(m_pPendStack == 0);
- OSL_ENSURE( bSelect, "keine Select" );
- OSL_ENSURE( pFormImpl && pFormImpl->GetFCompPropSet().is(),
+ OSL_ENSURE( m_bSelect, "keine Select" );
+ OSL_ENSURE( m_pFormImpl && m_pFormImpl->GetFCompPropSet().is(),
"kein Select-Control" );
const uno::Reference< beans::XPropertySet > & rPropSet =
- pFormImpl->GetFCompPropSet();
+ m_pFormImpl->GetFCompPropSet();
- size_t nEntryCnt = pFormImpl->GetStringList().size();
- if(!pFormImpl->GetStringList().empty())
+ size_t nEntryCnt = m_pFormImpl->GetStringList().size();
+ if(!m_pFormImpl->GetStringList().empty())
{
Sequence<OUString> aList( (sal_Int32)nEntryCnt );
Sequence<OUString> aValueList( (sal_Int32)nEntryCnt );
@@ -2394,11 +2394,11 @@ void SwHTMLParser::EndSelect()
for(size_t i = 0; i < nEntryCnt; ++i)
{
- OUString sText(pFormImpl->GetStringList()[i]);
+ OUString sText(m_pFormImpl->GetStringList()[i]);
sText = comphelper::string::stripEnd(sText, ' ');
pStrings[i] = sText;
- sText = pFormImpl->GetValueList()[i];
+ sText = m_pFormImpl->GetValueList()[i];
pValues[i] = sText;
}
@@ -2413,39 +2413,39 @@ void SwHTMLParser::EndSelect()
rPropSet->setPropertyValue("ListSource", aAny );
- size_t nSelCnt = pFormImpl->GetSelectedList().size();
- if( !nSelCnt && 1 == nSelectEntryCnt && nEntryCnt )
+ size_t nSelCnt = m_pFormImpl->GetSelectedList().size();
+ if( !nSelCnt && 1 == m_nSelectEntryCnt && nEntryCnt )
{
// In einer DropDown-Listbox sollte immer ein Eintrag selektiert
// sein.
- pFormImpl->GetSelectedList().insert( pFormImpl->GetSelectedList().begin(), 0 );
+ m_pFormImpl->GetSelectedList().insert( m_pFormImpl->GetSelectedList().begin(), 0 );
nSelCnt = 1;
}
Sequence<sal_Int16> aSelList( (sal_Int32)nSelCnt );
sal_Int16 *pSels = aSelList.getArray();
for(size_t i = 0; i < nSelCnt; ++i)
{
- pSels[i] = (sal_Int16)pFormImpl->GetSelectedList()[i];
+ pSels[i] = (sal_Int16)m_pFormImpl->GetSelectedList()[i];
}
aAny.setValue( &aSelList,
cppu::UnoType<uno::Sequence<sal_Int16>>::get() );
rPropSet->setPropertyValue("DefaultSelection", aAny );
- pFormImpl->EraseStringList();
- pFormImpl->EraseValueList();
+ m_pFormImpl->EraseStringList();
+ m_pFormImpl->EraseValueList();
}
- pFormImpl->EraseSelectedList();
+ m_pFormImpl->EraseSelectedList();
- if( bFixSelectWidth )
+ if( m_bFixSelectWidth )
{
- OSL_ENSURE( pFormImpl->GetShape().is(), "Kein Shape gemerkt" );
+ OSL_ENSURE( m_pFormImpl->GetShape().is(), "Kein Shape gemerkt" );
Size aTextSz( -1, 0 );
- SetControlSize( pFormImpl->GetShape(), aTextSz, false, false );
+ SetControlSize( m_pFormImpl->GetShape(), aTextSz, false, false );
}
- pFormImpl->ReleaseFCompPropSet();
+ m_pFormImpl->ReleaseFCompPropSet();
// den Kontext holen
_HTMLAttrContext *pCntxt = PopContext( HTML_SELECT_ON );
@@ -2456,16 +2456,16 @@ void SwHTMLParser::EndSelect()
delete pCntxt;
}
- bSelect = false;
+ m_bSelect = false;
}
void SwHTMLParser::InsertSelectOption()
{
- OSL_ENSURE( bSelect, "keine Select" );
- OSL_ENSURE( pFormImpl && pFormImpl->GetFCompPropSet().is(),
+ OSL_ENSURE( m_bSelect, "keine Select" );
+ OSL_ENSURE( m_pFormImpl && m_pFormImpl->GetFCompPropSet().is(),
"kein Select-Control" );
- bLBEntrySelected = false;
+ m_bLBEntrySelected = false;
OUString aValue;
const HTMLOptions& rHTMLOptions = GetOptions();
@@ -2478,7 +2478,7 @@ void SwHTMLParser::InsertSelectOption()
// erstmal weglassen!!!
break;
case HTML_O_SELECTED:
- bLBEntrySelected = true;
+ m_bLBEntrySelected = true;
break;
case HTML_O_VALUE:
aValue = rOption.GetString();
@@ -2488,24 +2488,24 @@ void SwHTMLParser::InsertSelectOption()
}
}
- sal_uInt16 nEntryCnt = pFormImpl->GetStringList().size();
- pFormImpl->GetStringList().push_back(aEmptyOUStr);
- pFormImpl->GetValueList().push_back(aValue);
- if( bLBEntrySelected )
+ sal_uInt16 nEntryCnt = m_pFormImpl->GetStringList().size();
+ m_pFormImpl->GetStringList().push_back(aEmptyOUStr);
+ m_pFormImpl->GetValueList().push_back(aValue);
+ if( m_bLBEntrySelected )
{
- pFormImpl->GetSelectedList().push_back( nEntryCnt );
+ m_pFormImpl->GetSelectedList().push_back( nEntryCnt );
}
}
void SwHTMLParser::InsertSelectText()
{
- OSL_ENSURE( bSelect, "keine Select" );
- OSL_ENSURE( pFormImpl && pFormImpl->GetFCompPropSet().is(),
+ OSL_ENSURE( m_bSelect, "keine Select" );
+ OSL_ENSURE( m_pFormImpl && m_pFormImpl->GetFCompPropSet().is(),
"kein Select-Control" );
- if(!pFormImpl->GetStringList().empty())
+ if(!m_pFormImpl->GetStringList().empty())
{
- OUString& rText = pFormImpl->GetStringList().back();
+ OUString& rText = m_pFormImpl->GetStringList().back();
if( !aToken.isEmpty() && ' '==aToken[ 0 ] )
{
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index f9662ac2b3cd..06a6aa837ef6 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -123,14 +123,14 @@ sal_Int32 lcl_html_getEndNoteInfo( SwEndNoteInfo& rInfo,
void SwHTMLParser::FillEndNoteInfo( const OUString& rContent )
{
- SwEndNoteInfo aInfo( pDoc->GetEndNoteInfo() );
+ SwEndNoteInfo aInfo( m_pDoc->GetEndNoteInfo() );
lcl_html_getEndNoteInfo( aInfo, rContent, true );
- pDoc->SetEndNoteInfo( aInfo );
+ m_pDoc->SetEndNoteInfo( aInfo );
}
void SwHTMLParser::FillFootNoteInfo( const OUString& rContent )
{
- SwFootnoteInfo aInfo( pDoc->GetFootnoteInfo() );
+ SwFootnoteInfo aInfo( m_pDoc->GetFootnoteInfo() );
sal_Int32 nStrPos = lcl_html_getEndNoteInfo( aInfo, rContent, false );
@@ -177,80 +177,80 @@ void SwHTMLParser::FillFootNoteInfo( const OUString& rContent )
}
}
- pDoc->SetFootnoteInfo( aInfo );
+ m_pDoc->SetFootnoteInfo( aInfo );
}
void SwHTMLParser::InsertFootEndNote( const OUString& rName, bool bEndNote,
bool bFixed )
{
- if( !pFootEndNoteImpl )
- pFootEndNoteImpl = new SwHTMLFootEndNote_Impl;
-
- pFootEndNoteImpl->sName = rName;
- if( pFootEndNoteImpl->sName.getLength() > 3 )
- pFootEndNoteImpl->sName = pFootEndNoteImpl->sName.copy( 0, pFootEndNoteImpl->sName.getLength() - 3 );
- pFootEndNoteImpl->sName = pFootEndNoteImpl->sName.toAsciiUpperCase();
- pFootEndNoteImpl->bEndNote = bEndNote;
- pFootEndNoteImpl->bFixed = bFixed;
- pFootEndNoteImpl->sContent = aEmptyOUStr;
+ if( !m_pFootEndNoteImpl )
+ m_pFootEndNoteImpl = new SwHTMLFootEndNote_Impl;
+
+ m_pFootEndNoteImpl->sName = rName;
+ if( m_pFootEndNoteImpl->sName.getLength() > 3 )
+ m_pFootEndNoteImpl->sName = m_pFootEndNoteImpl->sName.copy( 0, m_pFootEndNoteImpl->sName.getLength() - 3 );
+ m_pFootEndNoteImpl->sName = m_pFootEndNoteImpl->sName.toAsciiUpperCase();
+ m_pFootEndNoteImpl->bEndNote = bEndNote;
+ m_pFootEndNoteImpl->bFixed = bFixed;
+ m_pFootEndNoteImpl->sContent = aEmptyOUStr;
}
void SwHTMLParser::FinishFootEndNote()
{
- if( !pFootEndNoteImpl )
+ if( !m_pFootEndNoteImpl )
return;
- SwFormatFootnote aFootnote( pFootEndNoteImpl->bEndNote );
- if( pFootEndNoteImpl->bFixed )
- aFootnote.SetNumStr( pFootEndNoteImpl->sContent );
+ SwFormatFootnote aFootnote( m_pFootEndNoteImpl->bEndNote );
+ if( m_pFootEndNoteImpl->bFixed )
+ aFootnote.SetNumStr( m_pFootEndNoteImpl->sContent );
- pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, aFootnote );
+ m_pDoc->getIDocumentContentOperations().InsertPoolItem( *m_pPam, aFootnote );
SwTextFootnote * const pTextFootnote = static_cast<SwTextFootnote *>(
- pPam->GetNode().GetTextNode()->GetTextAttrForCharAt(
- pPam->GetPoint()->nContent.GetIndex() - 1, RES_TXTATR_FTN ) );
+ m_pPam->GetNode().GetTextNode()->GetTextAttrForCharAt(
+ m_pPam->GetPoint()->nContent.GetIndex() - 1, RES_TXTATR_FTN ) );
// In Kopf- und Fusszeilen duerfen keine Fussnoten eingefuegt werden.
if( pTextFootnote )
{
- pFootEndNoteImpl->aTextFootnotes.push_back( pTextFootnote );
- pFootEndNoteImpl->aNames.push_back(pFootEndNoteImpl->sName);
+ m_pFootEndNoteImpl->aTextFootnotes.push_back( pTextFootnote );
+ m_pFootEndNoteImpl->aNames.push_back(m_pFootEndNoteImpl->sName);
}
- pFootEndNoteImpl->sName = aEmptyOUStr;
- pFootEndNoteImpl->sContent = aEmptyOUStr;
- pFootEndNoteImpl->bFixed = false;
+ m_pFootEndNoteImpl->sName = aEmptyOUStr;
+ m_pFootEndNoteImpl->sContent = aEmptyOUStr;
+ m_pFootEndNoteImpl->bFixed = false;
}
void SwHTMLParser::InsertFootEndNoteText()
{
- if( pFootEndNoteImpl && pFootEndNoteImpl->bFixed )
- pFootEndNoteImpl->sContent += aToken;
+ if( m_pFootEndNoteImpl && m_pFootEndNoteImpl->bFixed )
+ m_pFootEndNoteImpl->sContent += aToken;
}
void SwHTMLParser::DeleteFootEndNoteImpl()
{
- delete pFootEndNoteImpl;
- pFootEndNoteImpl = 0;
+ delete m_pFootEndNoteImpl;
+ m_pFootEndNoteImpl = 0;
}
SwNodeIndex *SwHTMLParser::GetFootEndNoteSection( const OUString& rName )
{
SwNodeIndex *pStartNodeIdx = 0;
- if( pFootEndNoteImpl )
+ if( m_pFootEndNoteImpl )
{
OUString aName(rName.toAsciiUpperCase());
- size_t nCount = pFootEndNoteImpl->aNames.size();
+ size_t nCount = m_pFootEndNoteImpl->aNames.size();
for(size_t i = 0; i < nCount; ++i)
{
- if(pFootEndNoteImpl->aNames[i] == aName)
+ if(m_pFootEndNoteImpl->aNames[i] == aName)
{
- pStartNodeIdx = pFootEndNoteImpl->aTextFootnotes[i]->GetStartNode();
- pFootEndNoteImpl->aNames.erase(pFootEndNoteImpl->aNames.begin() + i);
- pFootEndNoteImpl->aTextFootnotes.erase( pFootEndNoteImpl->aTextFootnotes.begin() + i );
- if(pFootEndNoteImpl->aNames.empty())
+ pStartNodeIdx = m_pFootEndNoteImpl->aTextFootnotes[i]->GetStartNode();
+ m_pFootEndNoteImpl->aNames.erase(m_pFootEndNoteImpl->aNames.begin() + i);
+ m_pFootEndNoteImpl->aTextFootnotes.erase( m_pFootEndNoteImpl->aTextFootnotes.begin() + i );
+ if(m_pFootEndNoteImpl->aNames.empty())
{
- delete pFootEndNoteImpl;
- pFootEndNoteImpl = 0;
+ delete m_pFootEndNoteImpl;
+ m_pFootEndNoteImpl = 0;
}
break;
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 6fc01a929eb9..8bc0b7cf83a2 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -110,13 +110,13 @@ ImageMap *SwHTMLParser::FindImageMap( const OUString& rName ) const
void SwHTMLParser::ConnectImageMaps()
{
- SwNodes& rNds = pDoc->GetNodes();
+ SwNodes& rNds = m_pDoc->GetNodes();
// auf den Start-Node der 1. Section
sal_uLong nIdx = rNds.GetEndOfAutotext().StartOfSectionIndex() + 1;
sal_uLong nEndIdx = rNds.GetEndOfAutotext().GetIndex();
SwGrfNode* pGrfNd;
- while( nMissingImgMaps > 0 && nIdx < nEndIdx )
+ while( m_nMissingImgMaps > 0 && nIdx < nEndIdx )
{
SwNode *pNd = rNds[nIdx + 1];
if( 0 != (pGrfNd = pNd->GetGrfNode()) )
@@ -139,7 +139,7 @@ void SwHTMLParser::ConnectImageMaps()
// Grafik muss nicht skaliert werden
pGrfNd->ScaleImageMap();
}
- nMissingImgMaps--; // eine Map weniger suchen
+ m_nMissingImgMaps--; // eine Map weniger suchen
}
}
nIdx = rNds[nIdx]->EndOfSectionIndex() + 1;
@@ -155,9 +155,9 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
SfxItemSet& rFrmItemSet )
{
const SfxItemSet *pCntnrItemSet = 0;
- auto i = aContexts.size();
- while( !pCntnrItemSet && i > nContextStMin )
- pCntnrItemSet = aContexts[--i]->GetFrmItemSet();
+ auto i = m_aContexts.size();
+ while( !pCntnrItemSet && i > m_nContextStMin )
+ pCntnrItemSet = m_aContexts[--i]->GetFrmItemSet();
if( pCntnrItemSet )
{
@@ -234,14 +234,14 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
if( nUpper )
{
- NewAttr( &aAttrTab.pULSpace, SvxULSpaceItem( 0, nLower, RES_UL_SPACE ) );
- aParaAttrs.push_back( aAttrTab.pULSpace );
- EndAttr( aAttrTab.pULSpace, 0, false );
+ NewAttr( &m_aAttrTab.pULSpace, SvxULSpaceItem( 0, nLower, RES_UL_SPACE ) );
+ m_aParaAttrs.push_back( m_aAttrTab.pULSpace );
+ EndAttr( m_aAttrTab.pULSpace, 0, false );
}
}
// Vertikale Ausrichtung und Verankerung bestimmen.
- const sal_Int32 nContent = pPam->GetPoint()->nContent.GetIndex();
+ const sal_Int32 nContent = m_pPam->GetPoint()->nContent.GetIndex();
if( nContent )
{
aAnchor.SetType( FLY_AT_CHAR );
@@ -263,12 +263,12 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
rFrmSet.Put( SwFormatVertOrient( 0, eVertOri, eVertRel) );
if( bMoveBackward )
- pPam->Move( fnMoveBackward );
+ m_pPam->Move( fnMoveBackward );
- aAnchor.SetAnchor( pPam->GetPoint() );
+ aAnchor.SetAnchor( m_pPam->GetPoint() );
if( bMoveBackward )
- pPam->Move( fnMoveForward );
+ m_pPam->Move( fnMoveForward );
rFrmSet.Put( aAnchor );
}
@@ -281,8 +281,8 @@ void SwHTMLParser::RegisterFlyFrm( SwFrameFormat *pFlyFormat )
(FLY_AT_PARA == pFlyFormat->GetAnchor().GetAnchorId()) &&
SURROUND_THROUGHT == pFlyFormat->GetSurround().GetSurround() )
{
- aMoveFlyFrms.push_back( pFlyFormat );
- aMoveFlyCnts.push_back( pPam->GetPoint()->nContent.GetIndex() );
+ m_aMoveFlyFrms.push_back( pFlyFormat );
+ m_aMoveFlyCnts.push_back( m_pPam->GetPoint()->nContent.GetIndex() );
}
}
@@ -291,7 +291,7 @@ void SwHTMLParser::RegisterFlyFrm( SwFrameFormat *pFlyFormat )
void SwHTMLParser::GetDefaultScriptType( ScriptType& rType,
OUString& rTypeStr ) const
{
- SwDocShell *pDocSh = pDoc->GetDocShell();
+ SwDocShell *pDocSh = m_pDoc->GetDocShell();
SvKeyValueIterator* pHeaderAttrs = pDocSh ? pDocSh->GetHeaderAttributes()
: 0;
rType = GetScriptType( pHeaderAttrs );
@@ -311,7 +311,7 @@ void SwHTMLParser::InsertImage()
long nWidth=0, nHeight=0;
long nVSpace=0, nHSpace=0;
- sal_uInt16 nBorder = (aAttrTab.pINetFormat ? 1 : 0);
+ sal_uInt16 nBorder = (m_aAttrTab.pINetFormat ? 1 : 0);
bool bIsMap = false;
bool bPrcWidth = false;
bool bPrcHeight = false;
@@ -341,7 +341,7 @@ void SwHTMLParser::InsertImage()
case HTML_O_SRC:
sGrfNm = rOption.GetString();
if( !InternalImgToPrivateURL(sGrfNm) )
- sGrfNm = INetURLObject::GetAbsURL( sBaseURL, sGrfNm );
+ sGrfNm = INetURLObject::GetAbsURL( m_sBaseURL, sGrfNm );
break;
case HTML_O_ALIGN:
eVertOri =
@@ -431,12 +431,12 @@ IMAGE_SETEVENT:
// Wenn wir in einer Numerierung stehen und der Absatz noch leer und
// nicht numeriert ist, handelt es sich vielleicht um die Grafik
// einer Bullet-Liste
- if( !pPam->GetPoint()->nContent.GetIndex() &&
+ if( !m_pPam->GetPoint()->nContent.GetIndex() &&
GetNumInfo().GetDepth() > 0 && GetNumInfo().GetDepth() <= MAXLEVEL &&
- !aBulletGrfs[GetNumInfo().GetDepth()-1].isEmpty() &&
- aBulletGrfs[GetNumInfo().GetDepth()-1]==sGrfNm )
+ !m_aBulletGrfs[GetNumInfo().GetDepth()-1].isEmpty() &&
+ m_aBulletGrfs[GetNumInfo().GetDepth()-1]==sGrfNm )
{
- SwTextNode* pTextNode = pPam->GetNode().GetTextNode();
+ SwTextNode* pTextNode = m_pPam->GetNode().GetTextNode();
if( pTextNode && ! pTextNode->IsCountedInList())
{
@@ -469,7 +469,7 @@ IMAGE_SETEVENT:
sGrfNm.clear();
}
}
- else if (sBaseURL.isEmpty()) // sBaseURL is empty if the source is clipboard
+ else if (m_sBaseURL.isEmpty()) // sBaseURL is empty if the source is clipboard
{
if (GRFILTER_OK == GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, aGraphicURL))
sGrfNm.clear();
@@ -489,12 +489,12 @@ IMAGE_SETEVENT:
nHeight = aPixelSize.Height();
}
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( HasStyleOptions( aStyle, aId, aClass ) )
ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
- SfxItemSet aFrmSet( pDoc->GetAttrPool(),
+ SfxItemSet aFrmSet( m_pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs( aFrmSet );
@@ -510,24 +510,24 @@ IMAGE_SETEVENT:
::editeng::SvxBorderLine aHBorderLine( NULL, nHBorderWidth );
::editeng::SvxBorderLine aVBorderLine( NULL, nVBorderWidth );
- if( aAttrTab.pINetFormat )
+ if( m_aAttrTab.pINetFormat )
{
const OUString& rURL =
- static_cast<const SwFormatINetFormat&>(aAttrTab.pINetFormat->GetItem()).GetValue();
+ static_cast<const SwFormatINetFormat&>(m_aAttrTab.pINetFormat->GetItem()).GetValue();
- pCSS1Parser->SetATagStyles();
- sal_uInt16 nPoolId = static_cast< sal_uInt16 >(pDoc->IsVisitedURL( rURL )
+ m_pCSS1Parser->SetATagStyles();
+ sal_uInt16 nPoolId = static_cast< sal_uInt16 >(m_pDoc->IsVisitedURL( rURL )
? RES_POOLCHR_INET_VISIT
: RES_POOLCHR_INET_NORMAL);
- const SwCharFormat *pCharFormat = pCSS1Parser->GetCharFormatFromPool( nPoolId );
+ const SwCharFormat *pCharFormat = m_pCSS1Parser->GetCharFormatFromPool( nPoolId );
aHBorderLine.SetColor( pCharFormat->GetColor().GetValue() );
aVBorderLine.SetColor( aHBorderLine.GetColor() );
}
else
{
- const SvxColorItem& rColorItem = aAttrTab.pFontColor ?
- static_cast<const SvxColorItem &>(aAttrTab.pFontColor->GetItem()) :
- static_cast<const SvxColorItem &>(pDoc->GetDefault(RES_CHRATR_COLOR));
+ const SvxColorItem& rColorItem = m_aAttrTab.pFontColor ?
+ static_cast<const SvxColorItem &>(m_aAttrTab.pFontColor->GetItem()) :
+ static_cast<const SvxColorItem &>(m_pDoc->GetDefault(RES_CHRATR_COLOR));
aHBorderLine.SetColor( rColorItem.GetValue() );
aVBorderLine.SetColor( aHBorderLine.GetColor() );
}
@@ -601,7 +601,7 @@ IMAGE_SETEVENT:
// Wenn die Grfik in einer Tabelle steht, wird sie gleich
// angefordert, damit sie eventuell schon da ist, bevor die
// Tabelle layoutet wird.
- if( pTable!=0 && !nWidth )
+ if( m_pTable!=0 && !nWidth )
{
bRequestGrfNow = true;
IncGrfsThatResizeTable();
@@ -680,7 +680,7 @@ IMAGE_SETEVENT:
ImageMap aEmptyImgMap( aName );
SwFormatURL aURL; aURL.SetMap( &aEmptyImgMap );//wird kopieiert
aFrmSet.Put( aURL );
- nMissingImgMaps++; // es fehlen noch Image-Maps
+ m_nMissingImgMaps++; // es fehlen noch Image-Maps
// die Grafik muss beim SetTwipSize skaliert werden, wenn
// wir keine Groesse am Node gesetzt haben oder die Groesse
@@ -723,9 +723,9 @@ IMAGE_SETEVENT:
aFrmSet.Put( aFrmSize );
// passing empty sGrfNm here, means we don't want the graphic to be linked
- SwFrameFormat *pFlyFormat = pDoc->getIDocumentContentOperations().Insert( *pPam, sGrfNm, aEmptyOUStr, &aGraphic,
+ SwFrameFormat *pFlyFormat = m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, sGrfNm, aEmptyOUStr, &aGraphic,
&aFrmSet, NULL, NULL );
- SwGrfNode *pGrfNd = pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
+ SwGrfNode *pGrfNd = m_pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
->GetIndex()+1 ]->GetGrfNode();
if( !sHTMLGrfName.isEmpty() )
@@ -733,10 +733,10 @@ IMAGE_SETEVENT:
pFlyFormat->SetName( sHTMLGrfName );
// ggfs. eine Grafik anspringen
- if( JUMPTO_GRAPHIC == eJumpTo && sHTMLGrfName == sJmpMark )
+ if( JUMPTO_GRAPHIC == m_eJumpTo && sHTMLGrfName == m_sJmpMark )
{
- bChkJumpMark = true;
- eJumpTo = JUMPTO_NONE;
+ m_bChkJumpMark = true;
+ m_eJumpTo = JUMPTO_NONE;
}
}
@@ -754,10 +754,10 @@ IMAGE_SETEVENT:
pGrfNd->SetScaleImageMap( true );
}
- if( aAttrTab.pINetFormat )
+ if( m_aAttrTab.pINetFormat )
{
const SwFormatINetFormat &rINetFormat =
- static_cast<const SwFormatINetFormat&>(aAttrTab.pINetFormat->GetItem());
+ static_cast<const SwFormatINetFormat&>(m_aAttrTab.pINetFormat->GetItem());
SwFormatURL aURL( pFlyFormat->GetURL() );
@@ -782,23 +782,23 @@ IMAGE_SETEVENT:
}
if ((FLY_AS_CHAR == pFlyFormat->GetAnchor().GetAnchorId()) &&
- aAttrTab.pINetFormat->GetSttPara() ==
- pPam->GetPoint()->nNode &&
- aAttrTab.pINetFormat->GetSttCnt() ==
- pPam->GetPoint()->nContent.GetIndex() - 1 )
+ m_aAttrTab.pINetFormat->GetSttPara() ==
+ m_pPam->GetPoint()->nNode &&
+ m_aAttrTab.pINetFormat->GetSttCnt() ==
+ m_pPam->GetPoint()->nContent.GetIndex() - 1 )
{
// das Attribut wurde unmitellbar vor einer zeichengeb.
// Grafik eingefuegt, also verschieben wir es
- aAttrTab.pINetFormat->SetStart( *pPam->GetPoint() );
+ m_aAttrTab.pINetFormat->SetStart( *m_pPam->GetPoint() );
// Wenn das Attribut auch ein Sprungziel ist, fuegen
// wir noch eine Bookmark vor der Grafik ein, weil das
// SwFormatURL kein Sprungziel ist.
if( !rINetFormat.GetName().isEmpty() )
{
- pPam->Move( fnMoveBackward );
+ m_pPam->Move( fnMoveBackward );
InsertBookmark( rINetFormat.GetName() );
- pPam->Move( fnMoveForward );
+ m_pPam->Move( fnMoveForward );
}
}
@@ -827,8 +827,8 @@ IMAGE_SETEVENT:
void SwHTMLParser::InsertBodyOptions()
{
- pDoc->SetTextFormatColl( *pPam,
- pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_TEXT ) );
+ m_pDoc->SetTextFormatColl( *m_pPam,
+ m_pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_TEXT ) );
OUString aBackGround, aId, aStyle, aLang, aDir;
Color aBGColor, aTextColor, aLinkColor, aVLinkColor;
@@ -928,20 +928,20 @@ void SwHTMLParser::InsertBodyOptions()
}
}
- if( bTextColor && !pCSS1Parser->IsBodyTextSet() )
+ if( bTextColor && !m_pCSS1Parser->IsBodyTextSet() )
{
// Die Textfarbe wird an der Standard-Vorlage gesetzt
- pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD )
+ m_pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD )
->SetFormatAttr( SvxColorItem(aTextColor, RES_CHRATR_COLOR) );
- pCSS1Parser->SetBodyTextSet();
+ m_pCSS1Parser->SetBodyTextSet();
}
// Die Item fuer die Seitenvorlage vorbereiten (Hintergrund, Umrandung)
// Beim BrushItem muessen schon gesetzte werte erhalten bleiben!
- SvxBrushItem aBrushItem( pCSS1Parser->makePageDescBackground() );
+ SvxBrushItem aBrushItem( m_pCSS1Parser->makePageDescBackground() );
bool bSetBrush = false;
- if( bBGColor && !pCSS1Parser->IsBodyBGColorSet() )
+ if( bBGColor && !m_pCSS1Parser->IsBodyBGColorSet() )
{
// Hintergrundfarbe aus "BGCOLOR"
OUString aLink;
@@ -957,28 +957,28 @@ void SwHTMLParser::InsertBodyOptions()
aBrushItem.SetGraphicPos( ePos );
}
bSetBrush = true;
- pCSS1Parser->SetBodyBGColorSet();
+ m_pCSS1Parser->SetBodyBGColorSet();
}
- if( !aBackGround.isEmpty() && !pCSS1Parser->IsBodyBackgroundSet() )
+ if( !aBackGround.isEmpty() && !m_pCSS1Parser->IsBodyBackgroundSet() )
{
// Hintergrundgrafik aus "BACKGROUND"
- aBrushItem.SetGraphicLink( INetURLObject::GetAbsURL( sBaseURL, aBackGround ) );
+ aBrushItem.SetGraphicLink( INetURLObject::GetAbsURL( m_sBaseURL, aBackGround ) );
aBrushItem.SetGraphicPos( GPOS_TILED );
bSetBrush = true;
- pCSS1Parser->SetBodyBackgroundSet();
+ m_pCSS1Parser->SetBodyBackgroundSet();
}
if( !aStyle.isEmpty() || !aDir.isEmpty() )
{
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
OUString aDummy;
ParseStyleOptions( aStyle, aDummy, aDummy, aItemSet, aPropInfo, 0, &aDir );
// Ein par Attribute muessen an der Seitenvorlage gesetzt werden,
// und zwar die, die nicht vererbit werden
- pCSS1Parser->SetPageDescAttrs( bSetBrush ? &aBrushItem : 0,
+ m_pCSS1Parser->SetPageDescAttrs( bSetBrush ? &aBrushItem : 0,
&aItemSet );
const SfxPoolItem *pItem;
@@ -992,7 +992,7 @@ void SwHTMLParser::InsertBodyOptions()
static_cast <const SvxFontHeightItem * >(pItem)->GetProp() != 100)
{
sal_uInt32 nHeight =
- ( aFontHeights[2] *
+ ( m_aFontHeights[2] *
static_cast <const SvxFontHeightItem * >(pItem)->GetProp() ) / 100;
SvxFontHeightItem aNewItem( nHeight, 100, aWhichIds[i] );
aItemSet.Put( aNewItem );
@@ -1001,27 +1001,27 @@ void SwHTMLParser::InsertBodyOptions()
// alle noch uebrigen Optionen koennen an der Standard-Vorlage
// gesetzt werden und gelten dann automatisch als defaults
- pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD )
+ m_pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD )
->SetFormatAttr( aItemSet );
}
else if( bSetBrush )
{
- pCSS1Parser->SetPageDescAttrs( &aBrushItem );
+ m_pCSS1Parser->SetPageDescAttrs( &aBrushItem );
}
- if( bLinkColor && !pCSS1Parser->IsBodyLinkSet() )
+ if( bLinkColor && !m_pCSS1Parser->IsBodyLinkSet() )
{
SwCharFormat *pCharFormat =
- pCSS1Parser->GetCharFormatFromPool(RES_POOLCHR_INET_NORMAL);
+ m_pCSS1Parser->GetCharFormatFromPool(RES_POOLCHR_INET_NORMAL);
pCharFormat->SetFormatAttr( SvxColorItem(aLinkColor, RES_CHRATR_COLOR) );
- pCSS1Parser->SetBodyLinkSet();
+ m_pCSS1Parser->SetBodyLinkSet();
}
- if( bVLinkColor && !pCSS1Parser->IsBodyVLinkSet() )
+ if( bVLinkColor && !m_pCSS1Parser->IsBodyVLinkSet() )
{
SwCharFormat *pCharFormat =
- pCSS1Parser->GetCharFormatFromPool(RES_POOLCHR_INET_VISIT);
+ m_pCSS1Parser->GetCharFormatFromPool(RES_POOLCHR_INET_VISIT);
pCharFormat->SetFormatAttr( SvxColorItem(aVLinkColor, RES_CHRATR_COLOR) );
- pCSS1Parser->SetBodyVLinkSet();
+ m_pCSS1Parser->SetBodyVLinkSet();
}
if( !aLang.isEmpty() )
{
@@ -1046,7 +1046,7 @@ void SwHTMLParser::InsertBodyOptions()
{
SvxLanguageItem aLanguage( eLang, nWhich );
aLanguage.SetWhich( nWhich );
- pDoc->SetDefault( aLanguage );
+ m_pDoc->SetDefault( aLanguage );
}
}
}
@@ -1209,7 +1209,7 @@ ANCHOR_SETEVENT:
// Styles parsen
if( HasStyleOptions( aStyle, aId, aStrippedClass, &aLang, &aDir ) )
{
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) )
@@ -1223,16 +1223,16 @@ ANCHOR_SETEVENT:
{
if( !sHRef.isEmpty() )
{
- sHRef = URIHelper::SmartRel2Abs( INetURLObject(sBaseURL), sHRef, Link<OUString *, bool>(), false );
+ sHRef = URIHelper::SmartRel2Abs( INetURLObject(m_sBaseURL), sHRef, Link<OUString *, bool>(), false );
}
else
{
// Bei leerer URL das Directory nehmen
- INetURLObject aURLObj( aPathToFile );
+ INetURLObject aURLObj( m_aPathToFile );
sHRef = aURLObj.GetPartBeforeLastName();
}
- pCSS1Parser->SetATagStyles();
+ m_pCSS1Parser->SetATagStyles();
SwFormatINetFormat aINetFormat( sHRef, sTarget );
aINetFormat.SetName( aName );
@@ -1240,7 +1240,7 @@ ANCHOR_SETEVENT:
aINetFormat.SetMacroTable( &aMacroTable );
// das Default-Attribut setzen
- InsertAttr( &aAttrTab.pINetFormat, aINetFormat, pCntxt );
+ InsertAttr( &m_aAttrTab.pINetFormat, aINetFormat, pCntxt );
}
else if( !aName.isEmpty() )
{
@@ -1250,11 +1250,11 @@ ANCHOR_SETEVENT:
if( bEnAnchor || bFootnoteAnchor )
{
InsertFootEndNote( aFootnoteName, bEnAnchor, bFixed );
- bInFootEndNoteAnchor = bCallNextToken = true;
+ m_bInFootEndNoteAnchor = m_bCallNextToken = true;
}
else if( bFootnoteEnSymbol )
{
- bInFootEndNoteSymbol = bCallNextToken = true;
+ m_bInFootEndNoteSymbol = m_bCallNextToken = true;
}
// den Kontext merken
@@ -1263,14 +1263,14 @@ ANCHOR_SETEVENT:
void SwHTMLParser::EndAnchor()
{
- if( bInFootEndNoteAnchor )
+ if( m_bInFootEndNoteAnchor )
{
FinishFootEndNote();
- bInFootEndNoteAnchor = false;
+ m_bInFootEndNoteAnchor = false;
}
- else if( bInFootEndNoteSymbol )
+ else if( m_bInFootEndNoteSymbol )
{
- bInFootEndNoteSymbol = false;
+ m_bInFootEndNoteSymbol = false;
}
EndTag( HTML_ANCHOR_OFF );
@@ -1280,24 +1280,24 @@ void SwHTMLParser::EndAnchor()
void SwHTMLParser::InsertBookmark( const OUString& rName )
{
- _HTMLAttr* pTmp = new _HTMLAttr( *pPam->GetPoint(),
+ _HTMLAttr* pTmp = new _HTMLAttr( *m_pPam->GetPoint(),
SfxStringItem( RES_FLTR_BOOKMARK, rName ));
- aSetAttrTab.push_back( pTmp );
+ m_aSetAttrTab.push_back( pTmp );
}
bool SwHTMLParser::HasCurrentParaBookmarks( bool bIgnoreStack ) const
{
bool bHasMarks = false;
- sal_uLong nNodeIdx = pPam->GetPoint()->nNode.GetIndex();
+ sal_uLong nNodeIdx = m_pPam->GetPoint()->nNode.GetIndex();
// first step: are there still bookmark in the attribute-stack?
// bookmarks are added to the end of the stack - thus we only have
// to check the last bookmark
if( !bIgnoreStack )
{
- for( auto i = aSetAttrTab.size(); i; )
+ for( auto i = m_aSetAttrTab.size(); i; )
{
- _HTMLAttr* pAttr = aSetAttrTab[ --i ];
+ _HTMLAttr* pAttr = m_aSetAttrTab[ --i ];
if( RES_FLTR_BOOKMARK == pAttr->pItem->Which() )
{
if( pAttr->GetSttParaIdx() == nNodeIdx )
@@ -1310,7 +1310,7 @@ bool SwHTMLParser::HasCurrentParaBookmarks( bool bIgnoreStack ) const
if( !bHasMarks )
{
// second step: when we didn't find a bookmark, check if there is one set already
- IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
+ IDocumentMarkAccess* const pMarkAccess = m_pDoc->getIDocumentMarkAccess();
for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getAllMarksBegin();
ppMark != pMarkAccess->getAllMarksEnd();
++ppMark)
@@ -1337,15 +1337,15 @@ void SwHTMLParser::StripTrailingPara()
{
bool bSetSmallFont = false;
- SwContentNode* pCNd = pPam->GetContentNode();
- if( !pPam->GetPoint()->nContent.GetIndex() )
+ SwContentNode* pCNd = m_pPam->GetContentNode();
+ if( !m_pPam->GetPoint()->nContent.GetIndex() )
{
if( pCNd && pCNd->StartOfSectionIndex()+2 <
pCNd->EndOfSectionIndex() )
{
- sal_uLong nNodeIdx = pPam->GetPoint()->nNode.GetIndex();
+ sal_uLong nNodeIdx = m_pPam->GetPoint()->nNode.GetIndex();
- const SwFrameFormats& rFrameFormatTable = *pDoc->GetSpzFrameFormats();
+ const SwFrameFormats& rFrameFormatTable = *m_pDoc->GetSpzFrameFormats();
for( auto pFormat : rFrameFormatTable )
{
@@ -1368,7 +1368,7 @@ void SwHTMLParser::StripTrailingPara()
{
// es wurden Felder in den Node eingefuegt, die muessen
// wir jetzt verschieben
- SwTextNode *pPrvNd = pDoc->GetNodes()[nNodeIdx-1]->GetTextNode();
+ SwTextNode *pPrvNd = m_pDoc->GetNodes()[nNodeIdx-1]->GetTextNode();
if( pPrvNd )
{
SwIndex aSrc( pCNd, 0 );
@@ -1377,7 +1377,7 @@ void SwHTMLParser::StripTrailingPara()
}
// jetz muessen wir noch eventuell vorhandene Bookmarks verschieben
- IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
+ IDocumentMarkAccess* const pMarkAccess = m_pDoc->getIDocumentMarkAccess();
for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getAllMarksBegin();
ppMark != pMarkAccess->getAllMarksEnd();
++ppMark)
@@ -1387,7 +1387,7 @@ void SwHTMLParser::StripTrailingPara()
sal_uLong nBookNdIdx = pMark->GetMarkPos().nNode.GetIndex();
if(nBookNdIdx==nNodeIdx)
{
- SwNodeIndex nNewNdIdx(pPam->GetPoint()->nNode);
+ SwNodeIndex nNewNdIdx(m_pPam->GetPoint()->nNode);
SwContentNode* pNd = SwNodes::GoPrevious(&nNewNdIdx);
if(!pNd)
{
@@ -1407,13 +1407,13 @@ void SwHTMLParser::StripTrailingPara()
break;
}
- pPam->GetPoint()->nContent.Assign( 0, 0 );
- pPam->SetMark();
- pPam->DeleteMark();
- pDoc->GetNodes().Delete( pPam->GetPoint()->nNode );
- pPam->Move( fnMoveBackward, fnGoNode );
+ m_pPam->GetPoint()->nContent.Assign( 0, 0 );
+ m_pPam->SetMark();
+ m_pPam->DeleteMark();
+ m_pDoc->GetNodes().Delete( m_pPam->GetPoint()->nNode );
+ m_pPam->Move( fnMoveBackward, fnGoNode );
}
- else if( pCNd && pCNd->IsTextNode() && pTable )
+ else if( pCNd && pCNd->IsTextNode() && m_pTable )
{
// In leeren Zellen stellen wir einen kleinen Font ein, damit die
// Zelle nicht hoeher wird als die Grafik bzw. so niedrig wie
@@ -1421,7 +1421,7 @@ void SwHTMLParser::StripTrailingPara()
bSetSmallFont = true;
}
}
- else if( pCNd && pCNd->IsTextNode() && pTable &&
+ else if( pCNd && pCNd->IsTextNode() && m_pTable &&
pCNd->StartOfSectionIndex()+2 ==
pCNd->EndOfSectionIndex() )
{
@@ -1430,7 +1430,7 @@ void SwHTMLParser::StripTrailingPara()
bSetSmallFont = true;
SwTextNode* pTextNd = pCNd->GetTextNode();
- sal_Int32 nPos = pPam->GetPoint()->nContent.GetIndex();
+ sal_Int32 nPos = m_pPam->GetPoint()->nContent.GetIndex();
while( bSetSmallFont && nPos>0 )
{
--nPos;
diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx
index 0fbcc5224df4..70d76983c627 100644
--- a/sw/source/filter/html/htmlnumreader.cxx
+++ b/sw/source/filter/html/htmlnumreader.cxx
@@ -57,8 +57,8 @@ void SwHTMLParser::NewNumBulList( int nToken )
SwHTMLNumRuleInfo& rInfo = GetNumInfo();
// Erstmal einen neuen Absatz aufmachen
- bool bSpace = (rInfo.GetDepth() + nDefListDeep) == 0;
- if( pPam->GetPoint()->nContent.GetIndex() )
+ bool bSpace = (rInfo.GetDepth() + m_nDefListDeep) == 0;
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( bSpace ? AM_SPACE : AM_NOSPACE, false );
else if( bSpace )
AddParSpace();
@@ -71,8 +71,8 @@ void SwHTMLParser::NewNumBulList( int nToken )
// ggf. ein Regelwerk anlegen
if( !rInfo.GetNumRule() )
{
- sal_uInt16 nPos = pDoc->MakeNumRule( pDoc->GetUniqueNumRuleName() );
- rInfo.SetNumRule( pDoc->GetNumRuleTable()[nPos] );
+ sal_uInt16 nPos = m_pDoc->MakeNumRule( m_pDoc->GetUniqueNumRuleName() );
+ rInfo.SetNumRule( m_pDoc->GetNumRuleTable()[nPos] );
}
// das Format anpassen, falls es fuer den Level noch nicht
@@ -118,7 +118,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
}
aNumFormat.SetAbsLSpace( nAbsLSpace );
aNumFormat.SetFirstLineOffset( nFirstLineIndent );
- aNumFormat.SetCharFormat( pCSS1Parser->GetCharFormatFromPool(nChrFormatPoolId) );
+ aNumFormat.SetCharFormat( m_pCSS1Parser->GetCharFormatFromPool(nChrFormatPoolId) );
bChangeNumFormat = true;
}
@@ -199,7 +199,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
{
aBulletSrc = rOption.GetString();
if( !InternalImgToPrivateURL(aBulletSrc) )
- aBulletSrc = URIHelper::SmartRel2Abs( INetURLObject( sBaseURL ), aBulletSrc, Link<OUString *, bool>(), false );
+ aBulletSrc = URIHelper::SmartRel2Abs( INetURLObject( m_sBaseURL ), aBulletSrc, Link<OUString *, bool>(), false );
}
break;
case HTML_O_WIDTH:
@@ -243,11 +243,11 @@ void SwHTMLParser::NewNumBulList( int nToken )
// Und noch die Grafik merken, um sie in den Absaetzen nicht
// einzufuegen
- aBulletGrfs[nLevel] = aBulletSrc;
+ m_aBulletGrfs[nLevel] = aBulletSrc;
bChangeNumFormat = true;
}
else
- aBulletGrfs[nLevel].clear();
+ m_aBulletGrfs[nLevel].clear();
// den aktuellen Absatz erst einmal nicht numerieren
{
@@ -261,7 +261,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
// Styles parsen
if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) )
{
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) )
@@ -305,7 +305,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
if( bChangeNumFormat )
{
rInfo.GetNumRule()->Set( nLevel, aNumFormat );
- pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
+ m_pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
bChangeNumFormat = false;
}
@@ -318,7 +318,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
if( bChangeNumFormat )
{
rInfo.GetNumRule()->Set( nLevel, aNumFormat );
- pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
+ m_pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
}
PushContext( pCntxt );
@@ -335,17 +335,17 @@ void SwHTMLParser::EndNumBulList( int nToken )
// - der aktuelle nicht leer ist, also Text oder absatzgebundene Objekte
// enthaelt.
// - der aktuelle Absatz numeriert ist.
- bool bAppend = pPam->GetPoint()->nContent.GetIndex() > 0;
+ bool bAppend = m_pPam->GetPoint()->nContent.GetIndex() > 0;
if( !bAppend )
{
- SwTextNode* pTextNode = pPam->GetNode().GetTextNode();
+ SwTextNode* pTextNode = m_pPam->GetNode().GetTextNode();
bAppend = (pTextNode && ! pTextNode->IsOutline() && pTextNode->IsCountedInList()) ||
HasCurrentParaFlys();
}
- bool bSpace = (rInfo.GetDepth() + nDefListDeep) == 1;
+ bool bSpace = (rInfo.GetDepth() + m_nDefListDeep) == 1;
if( bAppend )
AppendTextNode( bSpace ? AM_SPACE : AM_NOSPACE, false );
else if( bSpace )
@@ -394,12 +394,12 @@ void SwHTMLParser::EndNumBulList( int nToken )
}
}
if( bChanged )
- pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
+ m_pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
// Beim letzen Append wurde das NumRule-Item und das
// NodeNum-Objekt mit kopiert. Beides muessen wir noch
// loeschen. Das ResetAttr loescht das NodeNum-Objekt mit!
- pPam->GetNode().GetTextNode()->ResetAttr( RES_PARATR_NUMRULE );
+ m_pPam->GetNode().GetTextNode()->ResetAttr( RES_PARATR_NUMRULE );
rInfo.Clear();
}
@@ -465,9 +465,9 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
}
// einen neuen Absatz aufmachen
- if( pPam->GetPoint()->nContent.GetIndex() )
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( AM_NOSPACE, false );
- bNoParSpace = false; // In <LI> wird kein Abstand eingefuegt!
+ m_bNoParSpace = false; // In <LI> wird kein Abstand eingefuegt!
const bool bCountedInList = nToken != HTML_LISTHEADER_ON;
@@ -480,7 +480,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
}
else
{
- aNumRuleName = pDoc->GetUniqueNumRuleName();
+ aNumRuleName = m_pDoc->GetUniqueNumRuleName();
SwNumRule aNumRule( aNumRuleName,
SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
SwNumFormat aNumFormat( aNumRule.Get( 0 ) );
@@ -491,22 +491,22 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
}
aNumFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
aNumFormat.SetBulletChar( cBulletChar ); // das Bulletzeichen !!
- aNumFormat.SetCharFormat( pCSS1Parser->GetCharFormatFromPool(RES_POOLCHR_BUL_LEVEL) );
+ aNumFormat.SetCharFormat( m_pCSS1Parser->GetCharFormatFromPool(RES_POOLCHR_BUL_LEVEL) );
aNumFormat.SetFirstLineOffset( HTML_NUMBUL_INDENT );
aNumRule.Set( 0, aNumFormat );
- pDoc->MakeNumRule( aNumRuleName, &aNumRule );
+ m_pDoc->MakeNumRule( aNumRuleName, &aNumRule );
- OSL_ENSURE( !nOpenParaToken,
+ OSL_ENSURE( !m_nOpenParaToken,
"Jetzt geht ein offenes Absatz-Element verloren" );
// Wir tun so, als ob wir in einem Absatz sind. Dann wird
// beim naechsten Absatz wenigstens die Numerierung
// weggeschmissen, die nach dem naechsten AppendTextNode uebernommen
// wird.
- nOpenParaToken = static_cast< sal_uInt16 >(nToken);
+ m_nOpenParaToken = static_cast< sal_uInt16 >(nToken);
}
- SwTextNode* pTextNode = pPam->GetNode().GetTextNode();
+ SwTextNode* pTextNode = m_pPam->GetNode().GetTextNode();
static_cast<SwContentNode *>(pTextNode)->SetAttr( SwNumRuleItem(aNumRuleName) );
pTextNode->SetAttrListLevel(nLevel);
// #i57656# - <IsCounted()> state of text node has to be adjusted accordingly.
@@ -531,7 +531,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
// Styles parsen
if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) )
{
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) )
@@ -554,24 +554,24 @@ void SwHTMLParser::EndNumBulListItem( int nToken, bool bSetColl,
bool /*bLastPara*/ )
{
// einen neuen Absatz aufmachen
- if( !nToken && pPam->GetPoint()->nContent.GetIndex() )
+ if( !nToken && m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( AM_NOSPACE );
// Kontext zu dem Token suchen und vom Stack holen
_HTMLAttrContext *pCntxt = 0;
- auto nPos = aContexts.size();
+ auto nPos = m_aContexts.size();
nToken &= ~1;
- while( !pCntxt && nPos>nContextStMin )
+ while( !pCntxt && nPos>m_nContextStMin )
{
- sal_uInt16 nCntxtToken = aContexts[--nPos]->GetToken();
+ sal_uInt16 nCntxtToken = m_aContexts[--nPos]->GetToken();
switch( nCntxtToken )
{
case HTML_LI_ON:
case HTML_LISTHEADER_ON:
if( !nToken || nToken == nCntxtToken )
{
- pCntxt = aContexts[nPos];
- aContexts.erase( aContexts.begin() + nPos );
+ pCntxt = m_aContexts[nPos];
+ m_aContexts.erase( m_aContexts.begin() + nPos );
}
break;
case HTML_ORDERLIST_ON:
@@ -579,7 +579,7 @@ void SwHTMLParser::EndNumBulListItem( int nToken, bool bSetColl,
case HTML_MENULIST_ON:
case HTML_DIRLIST_ON:
// keine LI/LH ausserhalb der aktuellen Liste betrachten
- nPos = nContextStMin;
+ nPos = m_nContextStMin;
break;
}
}
@@ -599,7 +599,7 @@ void SwHTMLParser::EndNumBulListItem( int nToken, bool bSetColl,
void SwHTMLParser::SetNodeNum( sal_uInt8 nLevel, bool bCountedInList )
{
- SwTextNode* pTextNode = pPam->GetNode().GetTextNode();
+ SwTextNode* pTextNode = m_pPam->GetNode().GetTextNode();
OSL_ENSURE( pTextNode, "Kein Text-Node an PaM-Position" );
OSL_ENSURE( GetNumInfo().GetNumRule(), "Kein Numerierungs-Regel" );
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 0ab66acaedf2..34a592a91adb 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -380,7 +380,7 @@ void SwHTMLParser::InsertEmbed()
aCmdLst.Append( rOption.GetTokenString(), rOption.GetString() );
}
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( HasStyleOptions( aStyle, aId, aClass ) )
ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
@@ -406,7 +406,7 @@ void SwHTMLParser::InsertEmbed()
bool bHasURL = !aURL.isEmpty() &&
aURLObj.SetURL(
URIHelper::SmartRel2Abs(
- INetURLObject(sBaseURL), aURL,
+ INetURLObject(m_sBaseURL), aURL,
URIHelper::GetMaybeFileHdl()) );
// do not insert plugin if it has neither URL nor type
@@ -437,7 +437,7 @@ void SwHTMLParser::InsertEmbed()
}
}
- SfxItemSet aFrmSet( pDoc->GetAttrPool(),
+ SfxItemSet aFrmSet( m_pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs( aFrmSet );
@@ -450,7 +450,7 @@ void SwHTMLParser::InsertEmbed()
else
{
SwFormatAnchor aAnchor( FLY_AT_PARA );
- aAnchor.SetAnchor( pPam->GetPoint() );
+ aAnchor.SetAnchor( m_pPam->GetPoint() );
aFrmSet.Put( aAnchor );
aFrmSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::FRAME) );
aFrmSet.Put( SwFormatSurround( SURROUND_THROUGHT ) );
@@ -465,7 +465,7 @@ void SwHTMLParser::InsertEmbed()
// und in das Dok einfuegen
SwFrameFormat* pFlyFormat =
- pDoc->getIDocumentContentOperations().Insert( *pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrmSet, NULL, NULL );
+ m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrmSet, NULL, NULL );
// Namen am FrameFormat setzen
if( !aName.isEmpty() )
@@ -473,7 +473,7 @@ void SwHTMLParser::InsertEmbed()
// den alternativen Text setzen
SwNoTextNode *pNoTextNd =
- pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
+ m_pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
->GetIndex()+1 ]->GetNoTextNode();
pNoTextNd->SetTitle( aAlt );
@@ -500,8 +500,8 @@ void SwHTMLParser::NewObject()
bool bPrcWidth = false, bPrcHeight = false,
bDeclare = false;
// Eine neue Command-List anlegen
- delete pAppletImpl;
- pAppletImpl = new SwApplet_Impl( pDoc->GetAttrPool(),
+ delete m_pAppletImpl;
+ m_pAppletImpl = new SwApplet_Impl( m_pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
const HTMLOptions& rHTMLOptions = GetOptions();
@@ -574,7 +574,7 @@ void SwHTMLParser::NewObject()
break;
}
// Es werden alle Parameter auch an das Applet weitergereicht
- pAppletImpl->AppendParam( rOption.GetTokenString(),
+ m_pAppletImpl->AppendParam( rOption.GetTokenString(),
rOption.GetString() );
}
@@ -599,19 +599,19 @@ void SwHTMLParser::NewObject()
if( !bIsApplet )
{
- delete pAppletImpl;
- pAppletImpl = 0;
+ delete m_pAppletImpl;
+ m_pAppletImpl = 0;
return;
}
- pAppletImpl->SetAltText( aStandBy );
+ m_pAppletImpl->SetAltText( aStandBy );
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( HasStyleOptions( aStyle, aId, aClass ) )
ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
- SfxItemSet& rFrmSet = pAppletImpl->GetItemSet();
+ SfxItemSet& rFrmSet = m_pAppletImpl->GetItemSet();
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs( rFrmSet );
@@ -629,31 +629,31 @@ void SwHTMLParser::NewObject()
void SwHTMLParser::EndObject()
{
#if HAVE_FEATURE_JAVA
- if( !pAppletImpl )
+ if( !m_pAppletImpl )
return;
- if( pAppletImpl->CreateApplet( sBaseURL ) )
+ if( m_pAppletImpl->CreateApplet( m_sBaseURL ) )
{
- pAppletImpl->FinishApplet();
+ m_pAppletImpl->FinishApplet();
// und in das Dok einfuegen
SwFrameFormat* pFlyFormat =
- pDoc->getIDocumentContentOperations().Insert( *pPam,
- ::svt::EmbeddedObjectRef( pAppletImpl->GetApplet(), embed::Aspects::MSOLE_CONTENT ),
- &pAppletImpl->GetItemSet(),
+ m_pDoc->getIDocumentContentOperations().Insert( *m_pPam,
+ ::svt::EmbeddedObjectRef( m_pAppletImpl->GetApplet(), embed::Aspects::MSOLE_CONTENT ),
+ &m_pAppletImpl->GetItemSet(),
NULL,
NULL );
// den alternativen Namen setzen
SwNoTextNode *pNoTextNd =
- pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
+ m_pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
->GetIndex()+1 ]->GetNoTextNode();
- pNoTextNd->SetTitle( pAppletImpl->GetAltText() );
+ pNoTextNd->SetTitle( m_pAppletImpl->GetAltText() );
// Ggf Frames anlegen und auto-geb. Rahmen registrieren
RegisterFlyFrm( pFlyFormat );
- delete pAppletImpl;
- pAppletImpl = 0;
+ delete m_pAppletImpl;
+ m_pAppletImpl = 0;
}
#else
(void) this; // Silence loplugin:staticmethods
@@ -671,8 +671,8 @@ void SwHTMLParser::InsertApplet()
sal_Int16 eHoriOri = text::HoriOrientation::NONE;
// Eine neue Command-List anlegen
- delete pAppletImpl;
- pAppletImpl = new SwApplet_Impl( pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
+ delete m_pAppletImpl;
+ m_pAppletImpl = new SwApplet_Impl( m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
const HTMLOptions& rHTMLOptions = GetOptions();
for (size_t i = rHTMLOptions.size(); i; )
@@ -725,28 +725,28 @@ void SwHTMLParser::InsertApplet()
}
// Es werden alle Parameter auch an das Applet weitergereicht
- pAppletImpl->AppendParam( rOption.GetTokenString(),
+ m_pAppletImpl->AppendParam( rOption.GetTokenString(),
rOption.GetString() );
}
if( aCode.isEmpty() )
{
- delete pAppletImpl;
- pAppletImpl = 0;
+ delete m_pAppletImpl;
+ m_pAppletImpl = 0;
return;
}
if ( !aCodeBase.isEmpty() )
- aCodeBase = INetURLObject::GetAbsURL( sBaseURL, aCodeBase );
- pAppletImpl->CreateApplet( aCode, aName, bMayScript, aCodeBase, sBaseURL );//, aAlt );
- pAppletImpl->SetAltText( aAlt );
+ aCodeBase = INetURLObject::GetAbsURL( m_sBaseURL, aCodeBase );
+ m_pAppletImpl->CreateApplet( aCode, aName, bMayScript, aCodeBase, m_sBaseURL );//, aAlt );
+ m_pAppletImpl->SetAltText( aAlt );
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( HasStyleOptions( aStyle, aId, aClass ) )
ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
- SfxItemSet& rFrmSet = pAppletImpl->GetItemSet();
+ SfxItemSet& rFrmSet = m_pAppletImpl->GetItemSet();
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs( rFrmSet );
@@ -764,30 +764,30 @@ void SwHTMLParser::InsertApplet()
void SwHTMLParser::EndApplet()
{
#if HAVE_FEATURE_JAVA
- if( !pAppletImpl )
+ if( !m_pAppletImpl )
return;
- pAppletImpl->FinishApplet();
+ m_pAppletImpl->FinishApplet();
// und in das Dok einfuegen
SwFrameFormat* pFlyFormat =
- pDoc->getIDocumentContentOperations().Insert( *pPam,
- ::svt::EmbeddedObjectRef( pAppletImpl->GetApplet(), embed::Aspects::MSOLE_CONTENT ),
- &pAppletImpl->GetItemSet(),
+ m_pDoc->getIDocumentContentOperations().Insert( *m_pPam,
+ ::svt::EmbeddedObjectRef( m_pAppletImpl->GetApplet(), embed::Aspects::MSOLE_CONTENT ),
+ &m_pAppletImpl->GetItemSet(),
NULL,
NULL );
// den alternativen Namen setzen
SwNoTextNode *pNoTextNd =
- pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
+ m_pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
->GetIndex()+1 ]->GetNoTextNode();
- pNoTextNd->SetTitle( pAppletImpl->GetAltText() );
+ pNoTextNd->SetTitle( m_pAppletImpl->GetAltText() );
// Ggf Frames anlegen und auto-geb. Rahmen registrieren
RegisterFlyFrm( pFlyFormat );
- delete pAppletImpl;
- pAppletImpl = 0;
+ delete m_pAppletImpl;
+ m_pAppletImpl = 0;
#else
(void) this;
#endif
@@ -796,7 +796,7 @@ void SwHTMLParser::EndApplet()
void SwHTMLParser::InsertParam()
{
#if HAVE_FEATURE_JAVA
- if( !pAppletImpl )
+ if( !m_pAppletImpl )
return;
OUString aName, aValue;
@@ -819,7 +819,7 @@ void SwHTMLParser::InsertParam()
if( aName.isEmpty() )
return;
- pAppletImpl->AppendParam( aName, aValue );
+ m_pAppletImpl->AppendParam( aName, aValue );
#else
(void) this;
#endif
@@ -878,7 +878,7 @@ void SwHTMLParser::InsertFloatingFrame()
// und jetzt die fuer den SfxFrame
SfxFrameDescriptor aFrameDesc;
- SfxFrameHTMLParser::ParseFrameOptions( &aFrameDesc, rHTMLOptions, sBaseURL );
+ SfxFrameHTMLParser::ParseFrameOptions( &aFrameDesc, rHTMLOptions, m_sBaseURL );
// den Floating-Frame anlegen
comphelper::EmbeddedObjectContainer aCnt;
@@ -923,13 +923,13 @@ void SwHTMLParser::InsertFloatingFrame()
{
}
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( HasStyleOptions( aStyle, aId, aClass ) )
ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
// den Itemset holen
- SfxItemSet aFrmSet( pDoc->GetAttrPool(),
+ SfxItemSet aFrmSet( m_pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs( aFrmSet );
@@ -945,18 +945,18 @@ void SwHTMLParser::InsertFloatingFrame()
// und in das Dok einfuegen
SwFrameFormat* pFlyFormat =
- pDoc->getIDocumentContentOperations().Insert( *pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrmSet, NULL, NULL );
+ m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrmSet, NULL, NULL );
// den alternativen Namen setzen
SwNoTextNode *pNoTextNd =
- pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
+ m_pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
->GetIndex()+1 ]->GetNoTextNode();
pNoTextNd->SetTitle( aAlt );
// Ggf Frames anlegen und auto-geb. Rahmen registrieren
RegisterFlyFrm( pFlyFormat );
- bInFloatingFrame = true;
+ m_bInFloatingFrame = true;
}
sal_uInt16 SwHTMLWriter::GuessOLENodeFrmType( const SwNode& rNode )
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 2754775ac817..fc02fad11ed0 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -110,7 +110,7 @@ void SwHTMLParser::NewDivision( int nToken )
}
bool bAppended = false;
- if( pPam->GetPoint()->nContent.GetIndex() )
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
{
AppendTextNode( bHeader||bFooter||!aId.isEmpty()|| !aHRef.isEmpty() ? AM_NORMAL
: AM_NOSPACE );
@@ -120,7 +120,7 @@ void SwHTMLParser::NewDivision( int nToken )
_HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken) );
bool bStyleParsed = false, bPositioned = false;
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) )
{
@@ -144,7 +144,7 @@ void SwHTMLParser::NewDivision( int nToken )
if( !bPositioned && (bHeader || bFooter) && IsNewDoc() )
{
- SwPageDesc *pPageDesc = pCSS1Parser->GetMasterPageDesc();
+ SwPageDesc *pPageDesc = m_pCSS1Parser->GetMasterPageDesc();
SwFrameFormat& rPageFormat = pPageDesc->GetMaster();
SwFrameFormat *pHdFtFormat;
@@ -181,15 +181,15 @@ void SwHTMLParser::NewDivision( int nToken )
if( bNew )
{
- pCNd = pDoc->GetNodes()[rContentStIdx.GetIndex()+1]
+ pCNd = m_pDoc->GetNodes()[rContentStIdx.GetIndex()+1]
->GetContentNode();
}
else
{
// Einen neuen Node zu Beginn der Section anlegen
SwNodeIndex aSttIdx( rContentStIdx, 1 );
- pCNd = pDoc->GetNodes().MakeTextNode( aSttIdx,
- pCSS1Parser->GetTextCollFromPool(RES_POOLCOLL_TEXT));
+ pCNd = m_pDoc->GetNodes().MakeTextNode( aSttIdx,
+ m_pCSS1Parser->GetTextCollFromPool(RES_POOLCOLL_TEXT));
// Den bisherigen Inhalt der Section loeschen
SwPaM aDelPam( aSttIdx );
@@ -199,14 +199,14 @@ void SwHTMLParser::NewDivision( int nToken )
static_cast<const SwStartNode *>( &rContentStIdx.GetNode() );
aDelPam.GetPoint()->nNode = pStNd->EndOfSectionIndex() - 1;
- pDoc->getIDocumentContentOperations().DelFullPara( aDelPam );
+ m_pDoc->getIDocumentContentOperations().DelFullPara( aDelPam );
// Die Seitenvorlage aktualisieren
- for( size_t i=0; i < pDoc->GetPageDescCnt(); i++ )
+ for( size_t i=0; i < m_pDoc->GetPageDescCnt(); i++ )
{
- if( RES_POOLPAGE_HTML == pDoc->GetPageDesc(i).GetPoolFormatId() )
+ if( RES_POOLPAGE_HTML == m_pDoc->GetPageDesc(i).GetPoolFormatId() )
{
- pDoc->ChgPageDesc( i, *pPageDesc );
+ m_pDoc->ChgPageDesc( i, *pPageDesc );
break;
}
}
@@ -230,7 +230,7 @@ void SwHTMLParser::NewDivision( int nToken )
if( pStartNdIdx )
{
SwContentNode *pCNd =
- pDoc->GetNodes()[pStartNdIdx->GetIndex()+1]->GetContentNode();
+ m_pDoc->GetNodes()[pStartNdIdx->GetIndex()+1]->GetContentNode();
SwNodeIndex aTmpSwNodeIndex = SwNodeIndex(*pCNd);
SwPosition aNewPos( aTmpSwNodeIndex, SwIndex( pCNd, 0 ) );
SaveDocContext( pCntxt, CONTEXT_FLAGS_FTN, &aNewPos );
@@ -252,7 +252,7 @@ void SwHTMLParser::NewDivision( int nToken )
// einfuegen. UND IN LOESCHEN!!!
if( !bAppended )
{
- SwNodeIndex aPrvNdIdx( pPam->GetPoint()->nNode, -1 );
+ SwNodeIndex aPrvNdIdx( m_pPam->GetPoint()->nNode, -1 );
if (aPrvNdIdx.GetNode().IsSectionNode())
{
AppendTextNode();
@@ -263,7 +263,7 @@ void SwHTMLParser::NewDivision( int nToken )
SetAttr( true, true, pPostIts );
// Namen der Section eindeutig machen
- const OUString aName( pDoc->GetUniqueSectionName( !aId.isEmpty() ? &aId : 0 ) );
+ const OUString aName( m_pDoc->GetUniqueSectionName( !aId.isEmpty() ? &aId : 0 ) );
if( !aHRef.isEmpty() )
{
@@ -283,11 +283,11 @@ void SwHTMLParser::NewDivision( int nToken )
OUString aURL;
if( nPos == -1 )
{
- aURL = URIHelper::SmartRel2Abs(INetURLObject( sBaseURL ), aHRef, Link<OUString *, bool>(), false);
+ aURL = URIHelper::SmartRel2Abs(INetURLObject( m_sBaseURL ), aHRef, Link<OUString *, bool>(), false);
}
else
{
- aURL = URIHelper::SmartRel2Abs(INetURLObject( sBaseURL ), aHRef.copy( 0, nPos ), Link<OUString *, bool>(), false );
+ aURL = URIHelper::SmartRel2Abs(INetURLObject( m_sBaseURL ), aHRef.copy( 0, nPos ), Link<OUString *, bool>(), false );
aURL += OUString(sfx2::cTokenSeparator);
if( nPos2 == -1 )
{
@@ -313,7 +313,7 @@ void SwHTMLParser::NewDivision( int nToken )
aSection.SetProtectFlag(true);
}
- SfxItemSet aFrmItemSet( pDoc->GetAttrPool(),
+ SfxItemSet aFrmItemSet( m_pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs(aFrmItemSet );
@@ -332,24 +332,24 @@ void SwHTMLParser::NewDivision( int nToken )
aItemSet.ClearItem( RES_FRAMEDIR );
}
- pDoc->InsertSwSection( *pPam, aSection, 0, &aFrmItemSet, false );
+ m_pDoc->InsertSwSection( *m_pPam, aSection, 0, &aFrmItemSet, false );
// ggfs. einen Bereich anspringen
- if( JUMPTO_REGION == eJumpTo && aName == sJmpMark )
+ if( JUMPTO_REGION == m_eJumpTo && aName == m_sJmpMark )
{
- bChkJumpMark = true;
- eJumpTo = JUMPTO_NONE;
+ m_bChkJumpMark = true;
+ m_eJumpTo = JUMPTO_NONE;
}
SwTextNode* pOldTextNd =
- (bAppended) ? 0 : pPam->GetPoint()->nNode.GetNode().GetTextNode();
+ (bAppended) ? 0 : m_pPam->GetPoint()->nNode.GetNode().GetTextNode();
- pPam->Move( fnMoveBackward );
+ m_pPam->Move( fnMoveBackward );
// PageDesc- und SwFormatBreak Attribute vom aktuellen Node in den
// (ersten) Node des Bereich verschieben.
if( pOldTextNd )
- MovePageDescAttrs( pOldTextNd, pPam->GetPoint()->nNode.GetIndex(),
+ MovePageDescAttrs( pOldTextNd, m_pPam->GetPoint()->nNode.GetIndex(),
true );
if( pPostIts )
@@ -374,7 +374,7 @@ void SwHTMLParser::NewDivision( int nToken )
if( SVX_ADJUST_END != eAdjust )
{
- InsertAttr( &aAttrTab.pAdjust, SvxAdjustItem(eAdjust, RES_PARATR_ADJUST), pCntxt );
+ InsertAttr( &m_aAttrTab.pAdjust, SvxAdjustItem(eAdjust, RES_PARATR_ADJUST), pCntxt );
}
// Style parsen
@@ -389,15 +389,15 @@ void SwHTMLParser::EndDivision( int /*nToken*/ )
// Stack-Eintrag zu dem Token suchen (weil wir noch den Div-Stack
// haben unterscheiden wir erst einmal nicht zwischen DIV und CENTER
_HTMLAttrContext *pCntxt = 0;
- auto nPos = aContexts.size();
- while( !pCntxt && nPos>nContextStMin )
+ auto nPos = m_aContexts.size();
+ while( !pCntxt && nPos>m_nContextStMin )
{
- switch( aContexts[--nPos]->GetToken() )
+ switch( m_aContexts[--nPos]->GetToken() )
{
case HTML_CENTER_ON:
case HTML_DIVISION_ON:
- pCntxt = aContexts[nPos];
- aContexts.erase( aContexts.begin() + nPos );
+ pCntxt = m_aContexts[nPos];
+ m_aContexts.erase( m_aContexts.begin() + nPos );
break;
}
}
@@ -415,7 +415,7 @@ void SwHTMLParser::EndDivision( int /*nToken*/ )
void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
const SwPosition *pOldPos )
{
- SwPageDesc *pPageDesc = pCSS1Parser->GetMasterPageDesc();
+ SwPageDesc *pPageDesc = m_pCSS1Parser->GetMasterPageDesc();
SwFrameFormat& rPageFormat = pPageDesc->GetMaster();
SwFrameFormat *pHdFtFormat =
@@ -437,7 +437,7 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
}
sal_uInt16 nSpace = 0;
- SwTextNode *pTextNode = pDoc->GetNodes()[nPrvNxtIdx]->GetTextNode();
+ SwTextNode *pTextNode = m_pDoc->GetNodes()[nPrvNxtIdx]->GetTextNode();
if( pTextNode )
{
const SvxULSpaceItem& rULSpace =
@@ -469,7 +469,7 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
nPrvNxtIdx = rContentStIdx.GetIndex() + 1;
}
- pTextNode = pDoc->GetNodes()[nPrvNxtIdx]
+ pTextNode = m_pDoc->GetNodes()[nPrvNxtIdx]
->GetTextNode();
if( pTextNode )
{
@@ -505,14 +505,14 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
bool SwHTMLParser::EndSection( bool bLFStripped )
{
- SwEndNode *pEndNd = pDoc->GetNodes()[pPam->GetPoint()->nNode.GetIndex()+1]
+ SwEndNode *pEndNd = m_pDoc->GetNodes()[m_pPam->GetPoint()->nNode.GetIndex()+1]
->GetEndNode();
if( pEndNd && pEndNd->StartOfSectionNode()->IsSectionNode() )
{
// den Bereich beenden
if( !bLFStripped )
StripTrailingPara();
- pPam->Move( fnMoveForward );
+ m_pPam->Move( fnMoveForward );
return true;
}
@@ -524,10 +524,10 @@ bool SwHTMLParser::EndSection( bool bLFStripped )
bool SwHTMLParser::EndSections( bool bLFStripped )
{
bool bSectionClosed = false;
- auto nPos = aContexts.size();
- while( nPos>nContextStMin )
+ auto nPos = m_aContexts.size();
+ while( nPos>m_nContextStMin )
{
- _HTMLAttrContext *pCntxt = aContexts[--nPos];
+ _HTMLAttrContext *pCntxt = m_aContexts[--nPos];
if( pCntxt->GetSpansSection() && EndSection( bLFStripped ) )
{
bSectionClosed = true;
@@ -589,13 +589,13 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
//.is the multicol element contained in a container? That may be the
// case for 5.0 documents.
bool bInCntnr = false;
- auto i = aContexts.size();
- while( !bInCntnr && i > nContextStMin )
- bInCntnr = 0 != aContexts[--i]->GetFrmItemSet();
+ auto i = m_aContexts.size();
+ while( !bInCntnr && i > m_nContextStMin )
+ bInCntnr = 0 != m_aContexts[--i]->GetFrmItemSet();
// Parse style sheets, but don't position anything by now.
bool bStyleParsed = false;
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) )
bStyleParsed = ParseStyleOptions( aStyle, aId, aClass,
@@ -618,7 +618,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
bool bPositioned = false;
if( bInCntnr || SwCSS1Parser::MayBePositioned( aPropInfo, true ) )
{
- SfxItemSet aFrmItemSet( pDoc->GetAttrPool(),
+ SfxItemSet aFrmItemSet( m_pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs(aFrmItemSet );
@@ -657,7 +657,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
bool bAppended = false;
if( !bPositioned )
{
- if( pPam->GetPoint()->nContent.GetIndex() )
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
{
AppendTextNode( AM_SPACE );
bAppended = true;
@@ -676,7 +676,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
// If the pam is at the start of a section, a additional text
// node must be inserted. Otherwise, the new section will be
// inserted in front of the old one.
- SwNodeIndex aPrvNdIdx( pPam->GetPoint()->nNode, -1 );
+ SwNodeIndex aPrvNdIdx( m_pPam->GetPoint()->nNode, -1 );
if (aPrvNdIdx.GetNode().IsSectionNode())
{
AppendTextNode();
@@ -687,10 +687,10 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
SetAttr( true, true, pPostIts );
// Make section name unique.
- OUString aName( pDoc->GetUniqueSectionName( !aId.isEmpty() ? &aId : 0 ) );
+ OUString aName( m_pDoc->GetUniqueSectionName( !aId.isEmpty() ? &aId : 0 ) );
SwSectionData aSection( CONTENT_SECTION, aName );
- SfxItemSet aFrmItemSet( pDoc->GetAttrPool(),
+ SfxItemSet aFrmItemSet( m_pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs(aFrmItemSet );
@@ -721,24 +721,24 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
aFrmItemSet.Put( *pItem );
aItemSet.ClearItem( RES_FRAMEDIR );
}
- pDoc->InsertSwSection( *pPam, aSection, 0, &aFrmItemSet, false );
+ m_pDoc->InsertSwSection( *m_pPam, aSection, 0, &aFrmItemSet, false );
// Jump to section, if this is requested.
- if( JUMPTO_REGION == eJumpTo && aName == sJmpMark )
+ if( JUMPTO_REGION == m_eJumpTo && aName == m_sJmpMark )
{
- bChkJumpMark = true;
- eJumpTo = JUMPTO_NONE;
+ m_bChkJumpMark = true;
+ m_eJumpTo = JUMPTO_NONE;
}
SwTextNode* pOldTextNd =
- (bAppended) ? 0 : pPam->GetPoint()->nNode.GetNode().GetTextNode();
+ (bAppended) ? 0 : m_pPam->GetPoint()->nNode.GetNode().GetTextNode();
- pPam->Move( fnMoveBackward );
+ m_pPam->Move( fnMoveBackward );
// Move PageDesc and SwFormatBreak attributes of the current node
// to the section's first node.
if( pOldTextNd )
- MovePageDescAttrs( pOldTextNd, pPam->GetPoint()->nNode.GetIndex(),
+ MovePageDescAttrs( pOldTextNd, m_pPam->GetPoint()->nNode.GetIndex(),
true );
if( pPostIts )
@@ -772,7 +772,7 @@ void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet,
static_cast<const SwFormatAnchor&>(rItemSet.Get( RES_ANCHOR )).GetAnchorId();
// Den Rahmen anlegen
- SwFlyFrameFormat* pFlyFormat = pDoc->MakeFlySection( eAnchorId, pPam->GetPoint(),
+ SwFlyFrameFormat* pFlyFormat = m_pDoc->MakeFlySection( eAnchorId, m_pPam->GetPoint(),
&rItemSet );
// Ggf. den Namen setzen
if( !rName.isEmpty() )
@@ -782,7 +782,7 @@ void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet,
const SwFormatContent& rFlyContent = pFlyFormat->GetContent();
const SwNodeIndex& rFlyCntIdx = *rFlyContent.GetContentIdx();
- SwContentNode *pCNd = pDoc->GetNodes()[rFlyCntIdx.GetIndex()+1]
+ SwContentNode *pCNd = m_pDoc->GetNodes()[rFlyCntIdx.GetIndex()+1]
->GetContentNode();
SwPosition aNewPos( SwNodeIndex( rFlyCntIdx, 1 ), SwIndex( pCNd, 0 ) );
@@ -794,7 +794,7 @@ void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd,
bool bFormatBreak )
{
SwContentNode* pDestContentNd =
- pDoc->GetNodes()[nDestIdx]->GetContentNode();
+ m_pDoc->GetNodes()[nDestIdx]->GetContentNode();
OSL_ENSURE( pDestContentNd, "Wieso ist das Ziel kein Content-Node?" );
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 498d3af13bc4..b97f1fe306cb 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2786,16 +2786,16 @@ const SwStartNode *SwHTMLParser::InsertTableSection
{
OSL_ENSURE( pPrevStNd, "Start-Node ist NULL" );
- pCSS1Parser->SetTDTagStyles();
- SwTextFormatColl *pColl = pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_TABLE );
+ m_pCSS1Parser->SetTDTagStyles();
+ SwTextFormatColl *pColl = m_pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_TABLE );
const SwStartNode *pStNd;
- if (pTable->bFirstCell )
+ if (m_pTable->bFirstCell )
{
- SwNode *const pNd = & pPam->GetPoint()->nNode.GetNode();
+ SwNode *const pNd = & m_pPam->GetPoint()->nNode.GetNode();
pNd->GetTextNode()->ChgFormatColl( pColl );
pStNd = pNd->FindTableBoxStartNode();
- pTable->bFirstCell = false;
+ m_pTable->bFirstCell = false;
}
else
{
@@ -2805,13 +2805,13 @@ const SwStartNode *SwHTMLParser::InsertTableSection
else
pNd = pPrevStNd->EndOfSectionNode();
SwNodeIndex nIdx( *pNd, 1 );
- pStNd = pDoc->GetNodes().MakeTextSection( nIdx, SwTableBoxStartNode,
+ pStNd = m_pDoc->GetNodes().MakeTextSection( nIdx, SwTableBoxStartNode,
pColl );
- pTable->IncBoxCount();
+ m_pTable->IncBoxCount();
}
//Added defaults to CJK and CTL
- SwContentNode *pCNd = pDoc->GetNodes()[pStNd->GetIndex()+1] ->GetContentNode();
+ SwContentNode *pCNd = m_pDoc->GetNodes()[pStNd->GetIndex()+1] ->GetContentNode();
SvxFontHeightItem aFontHeight( 40, 100, RES_CHRATR_FONTSIZE );
pCNd->SetAttr( aFontHeight );
SvxFontHeightItem aFontHeightCJK( 40, 100, RES_CHRATR_CJK_FONTSIZE );
@@ -2827,21 +2827,21 @@ const SwStartNode *SwHTMLParser::InsertTableSection( sal_uInt16 nPoolId )
switch( nPoolId )
{
case RES_POOLCOLL_TABLE_HDLN:
- pCSS1Parser->SetTHTagStyles();
+ m_pCSS1Parser->SetTHTagStyles();
break;
case RES_POOLCOLL_TABLE:
- pCSS1Parser->SetTDTagStyles();
+ m_pCSS1Parser->SetTDTagStyles();
break;
}
- SwTextFormatColl *pColl = pCSS1Parser->GetTextCollFromPool( nPoolId );
+ SwTextFormatColl *pColl = m_pCSS1Parser->GetTextCollFromPool( nPoolId );
- SwNode *const pNd = & pPam->GetPoint()->nNode.GetNode();
+ SwNode *const pNd = & m_pPam->GetPoint()->nNode.GetNode();
const SwStartNode *pStNd;
- if (pTable->bFirstCell)
+ if (m_pTable->bFirstCell)
{
pNd->GetTextNode()->ChgFormatColl( pColl );
- pTable->bFirstCell = false;
+ m_pTable->bFirstCell = false;
pStNd = pNd->FindTableBoxStartNode();
}
else
@@ -2857,13 +2857,13 @@ const SwStartNode *SwHTMLParser::InsertTableSection( sal_uInt16 nPoolId )
} while( pOutTable && pTableNd->GetTable().GetHTMLTableLayout() );
}
SwNodeIndex aIdx( *pTableNd->EndOfSectionNode() );
- pStNd = pDoc->GetNodes().MakeTextSection( aIdx, SwTableBoxStartNode,
+ pStNd = m_pDoc->GetNodes().MakeTextSection( aIdx, SwTableBoxStartNode,
pColl );
- pPam->GetPoint()->nNode = pStNd->GetIndex() + 1;
- SwTextNode *pTextNd = pPam->GetPoint()->nNode.GetNode().GetTextNode();
- pPam->GetPoint()->nContent.Assign( pTextNd, 0 );
- pTable->IncBoxCount();
+ m_pPam->GetPoint()->nNode = pStNd->GetIndex() + 1;
+ SwTextNode *pTextNd = m_pPam->GetPoint()->nNode.GetNode().GetTextNode();
+ m_pPam->GetPoint()->nContent.Assign( pTextNd, 0 );
+ m_pTable->IncBoxCount();
}
return pStNd;
@@ -2871,14 +2871,14 @@ const SwStartNode *SwHTMLParser::InsertTableSection( sal_uInt16 nPoolId )
SwStartNode *SwHTMLParser::InsertTempTableCaptionSection()
{
- SwTextFormatColl *pColl = pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_TEXT );
- SwNodeIndex& rIdx = pPam->GetPoint()->nNode;
- rIdx = pDoc->GetNodes().GetEndOfExtras();
- SwStartNode *pStNd = pDoc->GetNodes().MakeTextSection( rIdx,
+ SwTextFormatColl *pColl = m_pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_TEXT );
+ SwNodeIndex& rIdx = m_pPam->GetPoint()->nNode;
+ rIdx = m_pDoc->GetNodes().GetEndOfExtras();
+ SwStartNode *pStNd = m_pDoc->GetNodes().MakeTextSection( rIdx,
SwNormalStartNode, pColl );
rIdx = pStNd->GetIndex() + 1;
- pPam->GetPoint()->nContent.Assign( rIdx.GetNode().GetTextNode(), 0 );
+ m_pPam->GetPoint()->nContent.Assign( rIdx.GetNode().GetTextNode(), 0 );
return pStNd;
}
@@ -2887,10 +2887,10 @@ sal_Int32 SwHTMLParser::StripTrailingLF()
{
sal_Int32 nStripped = 0;
- const sal_Int32 nLen = pPam->GetPoint()->nContent.GetIndex();
+ const sal_Int32 nLen = m_pPam->GetPoint()->nContent.GetIndex();
if( nLen )
{
- SwTextNode* pTextNd = pPam->GetPoint()->nNode.GetNode().GetTextNode();
+ SwTextNode* pTextNd = m_pPam->GetPoint()->nNode.GetNode().GetTextNode();
// vorsicht, wenn Kommentare nicht uebrlesen werden!!!
if( pTextNd )
{
@@ -2936,7 +2936,7 @@ SvxBrushItem* SwHTMLParser::CreateBrushItem( const Color *pColor,
if( !rStyle.isEmpty() || !rId.isEmpty() || !rClass.isEmpty() )
{
- SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_BACKGROUND,
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), RES_BACKGROUND,
RES_BACKGROUND );
SvxCSS1PropertyInfo aPropInfo;
@@ -2944,19 +2944,19 @@ SvxBrushItem* SwHTMLParser::CreateBrushItem( const Color *pColor,
{
OUString aClass( rClass );
SwCSS1Parser::GetScriptFromClass( aClass );
- const SvxCSS1MapEntry *pClass = pCSS1Parser->GetClass( aClass );
+ const SvxCSS1MapEntry *pClass = m_pCSS1Parser->GetClass( aClass );
if( pClass )
aItemSet.Put( pClass->GetItemSet() );
}
if( !rId.isEmpty() )
{
- const SvxCSS1MapEntry *pId = pCSS1Parser->GetId( rId );
+ const SvxCSS1MapEntry *pId = m_pCSS1Parser->GetId( rId );
if( pId )
aItemSet.Put( pId->GetItemSet() );
}
- pCSS1Parser->ParseStyleOption( rStyle, aItemSet, aPropInfo );
+ m_pCSS1Parser->ParseStyleOption( rStyle, aItemSet, aPropInfo );
const SfxPoolItem *pItem = 0;
if( SfxItemState::SET == aItemSet.GetItemState( RES_BACKGROUND, false,
&pItem ) )
@@ -2974,7 +2974,7 @@ SvxBrushItem* SwHTMLParser::CreateBrushItem( const Color *pColor,
if( !rImageURL.isEmpty() )
{
- pBrushItem->SetGraphicLink( URIHelper::SmartRel2Abs( INetURLObject(sBaseURL), rImageURL, Link<OUString *, bool>(), false) );
+ pBrushItem->SetGraphicLink( URIHelper::SmartRel2Abs( INetURLObject(m_sBaseURL), rImageURL, Link<OUString *, bool>(), false) );
pBrushItem->SetGraphicPos( GPOS_TILED );
}
}
@@ -3008,22 +3008,22 @@ _SectionSaveStruct::_SectionSaveStruct( SwHTMLParser& rParser ) :
m_pTable( 0 )
{
// Font-Stacks einfrieren
- m_nBaseFontStMinSave = rParser.nBaseFontStMin;
- rParser.nBaseFontStMin = rParser.aBaseFontStack.size();
+ m_nBaseFontStMinSave = rParser.m_nBaseFontStMin;
+ rParser.m_nBaseFontStMin = rParser.m_aBaseFontStack.size();
- m_nFontStMinSave = rParser.nFontStMin;
- m_nFontStHeadStartSave = rParser.nFontStHeadStart;
- rParser.nFontStMin = rParser.aFontStack.size();
+ m_nFontStMinSave = rParser.m_nFontStMin;
+ m_nFontStHeadStartSave = rParser.m_nFontStHeadStart;
+ rParser.m_nFontStMin = rParser.m_aFontStack.size();
// Kontext-Stack einfrieren
- m_nContextStMinSave = rParser.nContextStMin;
- m_nContextStAttrMinSave = rParser.nContextStAttrMin;
- rParser.nContextStMin = rParser.aContexts.size();
- rParser.nContextStAttrMin = rParser.nContextStMin;
+ m_nContextStMinSave = rParser.m_nContextStMin;
+ m_nContextStAttrMinSave = rParser.m_nContextStAttrMin;
+ rParser.m_nContextStMin = rParser.m_aContexts.size();
+ rParser.m_nContextStAttrMin = rParser.m_nContextStMin;
// und noch ein par Zaehler retten
- m_nDefListDeepSave = rParser.nDefListDeep;
- rParser.nDefListDeep = 0;
+ m_nDefListDeepSave = rParser.m_nDefListDeep;
+ rParser.m_nDefListDeep = 0;
}
_SectionSaveStruct::~_SectionSaveStruct()
@@ -3032,34 +3032,34 @@ _SectionSaveStruct::~_SectionSaveStruct()
void _SectionSaveStruct::Restore( SwHTMLParser& rParser )
{
// Font-Stacks wieder auftauen
- sal_uInt16 nMin = rParser.nBaseFontStMin;
- if( rParser.aBaseFontStack.size() > nMin )
- rParser.aBaseFontStack.erase( rParser.aBaseFontStack.begin() + nMin,
- rParser.aBaseFontStack.end() );
- rParser.nBaseFontStMin = m_nBaseFontStMinSave;
-
- nMin = rParser.nFontStMin;
- if( rParser.aFontStack.size() > nMin )
- rParser.aFontStack.erase( rParser.aFontStack.begin() + nMin,
- rParser.aFontStack.end() );
- rParser.nFontStMin = m_nFontStMinSave;
- rParser.nFontStHeadStart = m_nFontStHeadStartSave;
-
- OSL_ENSURE( rParser.aContexts.size() == rParser.nContextStMin &&
- rParser.aContexts.size() == rParser.nContextStAttrMin,
+ sal_uInt16 nMin = rParser.m_nBaseFontStMin;
+ if( rParser.m_aBaseFontStack.size() > nMin )
+ rParser.m_aBaseFontStack.erase( rParser.m_aBaseFontStack.begin() + nMin,
+ rParser.m_aBaseFontStack.end() );
+ rParser.m_nBaseFontStMin = m_nBaseFontStMinSave;
+
+ nMin = rParser.m_nFontStMin;
+ if( rParser.m_aFontStack.size() > nMin )
+ rParser.m_aFontStack.erase( rParser.m_aFontStack.begin() + nMin,
+ rParser.m_aFontStack.end() );
+ rParser.m_nFontStMin = m_nFontStMinSave;
+ rParser.m_nFontStHeadStart = m_nFontStHeadStartSave;
+
+ OSL_ENSURE( rParser.m_aContexts.size() == rParser.m_nContextStMin &&
+ rParser.m_aContexts.size() == rParser.m_nContextStAttrMin,
"The Context Stack was not cleaned up" );
- rParser.nContextStMin = m_nContextStMinSave;
- rParser.nContextStAttrMin = m_nContextStAttrMinSave;
+ rParser.m_nContextStMin = m_nContextStMinSave;
+ rParser.m_nContextStAttrMin = m_nContextStAttrMinSave;
// und noch ein par Zaehler rekonstruieren
- rParser.nDefListDeep = m_nDefListDeepSave;
+ rParser.m_nDefListDeep = m_nDefListDeepSave;
// und ein par Flags zuruecksetzen
- rParser.bNoParSpace = false;
- rParser.nOpenParaToken = 0;
+ rParser.m_bNoParSpace = false;
+ rParser.m_nOpenParaToken = 0;
- if( !rParser.aParaAttrs.empty() )
- rParser.aParaAttrs.clear();
+ if( !rParser.m_aParaAttrs.empty() )
+ rParser.m_aParaAttrs.clear();
}
class _CellSaveStruct : public _SectionSaveStruct
@@ -3221,7 +3221,7 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
LanguageType eLang;
nValue = SfxHTMLParser::GetTableDataOptionsValNum(
nNumFormat, eLang, aValue, aNumFormat,
- *rParser.pDoc->GetNumberFormatter() );
+ *rParser.m_pDoc->GetNumberFormatter() );
}
// einen neuen Kontext anlegen, aber das drawing::Alignment-Attribut
@@ -3240,13 +3240,13 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
}
_HTMLAttrContext *pCntxt = new _HTMLAttrContext( nToken, nColl, aEmptyOUStr, true );
if( SVX_ADJUST_END != eAdjust )
- rParser.InsertAttr( &rParser.aAttrTab.pAdjust, SvxAdjustItem(eAdjust, RES_PARATR_ADJUST),
+ rParser.InsertAttr( &rParser.m_aAttrTab.pAdjust, SvxAdjustItem(eAdjust, RES_PARATR_ADJUST),
pCntxt );
if( SwHTMLParser::HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) )
{
- SfxItemSet aItemSet( rParser.pDoc->GetAttrPool(),
- rParser.pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( rParser.m_pDoc->GetAttrPool(),
+ rParser.m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( rParser.ParseStyleOptions( aStyle, aId, aClass, aItemSet,
@@ -3301,9 +3301,9 @@ void _CellSaveStruct::InsertCell( SwHTMLParser& rParser,
// Werte unterschiedlich, wurden ausserhalb der Zelle Kontexte
// angelegt und wir ueberpruefen nichts.
- if( rParser.nContextStAttrMin == GetContextStAttrMin() )
+ if( rParser.m_nContextStAttrMin == GetContextStAttrMin() )
{
- _HTMLAttr** pTable = reinterpret_cast<_HTMLAttr**>(&rParser.aAttrTab);
+ _HTMLAttr** pTable = reinterpret_cast<_HTMLAttr**>(&rParser.m_aAttrTab);
for( auto nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* );
nCnt--; ++pTable )
@@ -3400,10 +3400,10 @@ HTMLTableCnts *SwHTMLParser::InsertTableContents(
}
// Attributierungs-Anfang neu setzen
- const SwNodeIndex& rSttPara = pPam->GetPoint()->nNode;
- sal_Int32 nSttCnt = pPam->GetPoint()->nContent.GetIndex();
+ const SwNodeIndex& rSttPara = m_pPam->GetPoint()->nNode;
+ sal_Int32 nSttCnt = m_pPam->GetPoint()->nContent.GetIndex();
- _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&aAttrTab);
+ _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&m_aAttrTab);
for (sal_uInt16 nCnt = sizeof(_HTMLAttrTable) / sizeof(_HTMLAttr*); nCnt--; ++pHTMLAttributes)
{
_HTMLAttr *pAttr = *pHTMLAttributes;
@@ -3424,7 +3424,7 @@ HTMLTableCnts *SwHTMLParser::InsertTableContents(
sal_uInt16 SwHTMLParser::IncGrfsThatResizeTable()
{
- return pTable ? pTable->IncGrfsThatResize() : 0;
+ return m_pTable ? m_pTable->IncGrfsThatResize() : 0;
}
void SwHTMLParser::RegisterDrawObjectToTable( HTMLTable *pCurTable,
@@ -3436,29 +3436,29 @@ void SwHTMLParser::RegisterDrawObjectToTable( HTMLTable *pCurTable,
void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
bool bHead )
{
- if( !IsParserWorking() && !pPendStack )
+ if( !IsParserWorking() && !m_pPendStack )
return;
_CellSaveStruct* pSaveStruct;
int nToken = 0;
bool bPending = false;
- if( pPendStack )
+ if( m_pPendStack )
{
- pSaveStruct = static_cast<_CellSaveStruct*>(pPendStack->pData);
+ pSaveStruct = static_cast<_CellSaveStruct*>(m_pPendStack->pData);
- SwPendingStack* pTmp = pPendStack->pNext;
- delete pPendStack;
- pPendStack = pTmp;
- nToken = pPendStack ? pPendStack->nToken : GetSaveToken();
- bPending = SVPAR_ERROR == eState && pPendStack != 0;
+ SwPendingStack* pTmp = m_pPendStack->pNext;
+ delete m_pPendStack;
+ m_pPendStack = pTmp;
+ nToken = m_pPendStack ? m_pPendStack->nToken : GetSaveToken();
+ bPending = SVPAR_ERROR == eState && m_pPendStack != 0;
SaveState( nToken );
}
else
{
// <TH> bzw. <TD> wurde bereits gelesen
- if( pTable->IsOverflowing() )
+ if( m_pTable->IsOverflowing() )
{
SaveState( 0 );
return;
@@ -3466,7 +3466,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
if( !pCurTable->GetContext() )
{
- bool bTopTable = pTable==pCurTable;
+ bool bTopTable = m_pTable==pCurTable;
// die Tabelle besitzt noch keinen Inhalt, d.h. die eigentliche
// Tabelle muss erst noch angelegt werden
@@ -3483,7 +3483,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
0
};
- SfxItemSet aItemSet( pDoc->GetAttrPool(), aWhichIds );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), aWhichIds );
SvxCSS1PropertyInfo aPropInfo;
bool bStyleParsed = ParseStyleOptions( pCurTable->GetStyle(),
@@ -3523,7 +3523,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
bool bParentLFStripped = false;
if( bTopTable )
{
- SvxAdjust eTableAdjust = pTable->GetTableAdjust(false);
+ SvxAdjust eTableAdjust = m_pTable->GetTableAdjust(false);
// Wenn die Tabelle links oder rechts ausgerivchtet ist,
// oder in einen Rahmen soll, dann kommt sie auch in einen
@@ -3552,43 +3552,43 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
// wenn der Absatz nicht leer ist, oder Rahmen
// oder text::Bookmarks enthaelt.
bAppend =
- pPam->GetPoint()->nContent.GetIndex() ||
+ m_pPam->GetPoint()->nContent.GetIndex() ||
HasCurrentParaFlys() ||
HasCurrentParaBookmarks();
}
if( bAppend )
{
- if( !pPam->GetPoint()->nContent.GetIndex() )
+ if( !m_pPam->GetPoint()->nContent.GetIndex() )
{
//Set default to CJK and CTL
- pDoc->SetTextFormatColl( *pPam,
- pCSS1Parser->GetTextCollFromPool(RES_POOLCOLL_STANDARD) );
+ m_pDoc->SetTextFormatColl( *m_pPam,
+ m_pCSS1Parser->GetTextCollFromPool(RES_POOLCOLL_STANDARD) );
SvxFontHeightItem aFontHeight( 40, 100, RES_CHRATR_FONTSIZE );
_HTMLAttr* pTmp =
- new _HTMLAttr( *pPam->GetPoint(), aFontHeight );
- aSetAttrTab.push_back( pTmp );
+ new _HTMLAttr( *m_pPam->GetPoint(), aFontHeight );
+ m_aSetAttrTab.push_back( pTmp );
SvxFontHeightItem aFontHeightCJK( 40, 100, RES_CHRATR_CJK_FONTSIZE );
pTmp =
- new _HTMLAttr( *pPam->GetPoint(), aFontHeightCJK );
- aSetAttrTab.push_back( pTmp );
+ new _HTMLAttr( *m_pPam->GetPoint(), aFontHeightCJK );
+ m_aSetAttrTab.push_back( pTmp );
SvxFontHeightItem aFontHeightCTL( 40, 100, RES_CHRATR_CTL_FONTSIZE );
pTmp =
- new _HTMLAttr( *pPam->GetPoint(), aFontHeightCTL );
- aSetAttrTab.push_back( pTmp );
+ new _HTMLAttr( *m_pPam->GetPoint(), aFontHeightCTL );
+ m_aSetAttrTab.push_back( pTmp );
- pTmp = new _HTMLAttr( *pPam->GetPoint(),
+ pTmp = new _HTMLAttr( *m_pPam->GetPoint(),
SvxULSpaceItem( 0, 0, RES_UL_SPACE ) );
- aSetAttrTab.push_front( pTmp ); // ja, 0, weil schon
+ m_aSetAttrTab.push_front( pTmp ); // ja, 0, weil schon
// vom Tabellenende vorher
// was gesetzt sein kann.
}
AppendTextNode( AM_NOSPACE );
bAppended = true;
}
- else if( !aParaAttrs.empty() )
+ else if( !m_aParaAttrs.empty() )
{
if( !bForceFrame )
{
@@ -3596,32 +3596,32 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
// verschoben. Deshalb entfernen wir alle harten
// Attribute des Absatzes
- for( size_t i=0; i<aParaAttrs.size(); i++ )
- aParaAttrs[i]->Invalidate();
+ for( size_t i=0; i<m_aParaAttrs.size(); i++ )
+ m_aParaAttrs[i]->Invalidate();
}
- aParaAttrs.clear();
+ m_aParaAttrs.clear();
}
- pSavePos = new SwPosition( *pPam->GetPoint() );
+ pSavePos = new SwPosition( *m_pPam->GetPoint() );
}
else if( pCurTable->HasParentSection() )
{
bParentLFStripped = StripTrailingLF() > 0;
// Absaetze bzw. ueberschriften beeenden
- nOpenParaToken = 0;
- nFontStHeadStart = nFontStMin;
+ m_nOpenParaToken = 0;
+ m_nFontStHeadStart = m_nFontStMin;
// die harten Attribute an diesem Absatz werden nie mehr ungueltig
- if( !aParaAttrs.empty() )
- aParaAttrs.clear();
+ if( !m_aParaAttrs.empty() )
+ m_aParaAttrs.clear();
}
// einen Tabellen Kontext anlegen
_HTMLTableContext *pTCntxt =
- new _HTMLTableContext( pSavePos, nContextStMin,
- nContextStAttrMin );
+ new _HTMLTableContext( pSavePos, m_nContextStMin,
+ m_nContextStAttrMin );
// alle noch offenen Attribute beenden und hinter der Tabelle
// neu aufspannen
@@ -3638,7 +3638,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
// der sonat nicht geloescht wird.
if( (bTopTable && !bAppended) ||
(!bTopTable && !bParentLFStripped &&
- !pPam->GetPoint()->nContent.GetIndex()) )
+ !m_pPam->GetPoint()->nContent.GetIndex()) )
pPostIts = new _HTMLAttrs;
SetAttr( bTopTable, bTopTable, pPostIts );
}
@@ -3651,7 +3651,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
SetAttr( true, true, pPostIts );
}
}
- bNoParSpace = false;
+ m_bNoParSpace = false;
// Aktuelle Numerierung retten und auschalten.
pTCntxt->SetNumInfo( GetNumInfo() );
@@ -3664,7 +3664,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
{
// Die Tabelle soll in einen Rahmen geschaufelt werden.
- SfxItemSet aFrmSet( pDoc->GetAttrPool(),
+ SfxItemSet aFrmSet( m_pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !pCurTable->IsNewDoc() )
Reader::ResetFrameFormatAttrs( aFrmSet );
@@ -3706,15 +3706,15 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
RndStdIds eAnchorId = static_cast<const SwFormatAnchor&>(aFrmSet.
Get( RES_ANCHOR )).
GetAnchorId();
- SwFrameFormat *pFrameFormat = pDoc->MakeFlySection(
- eAnchorId, pPam->GetPoint(), &aFrmSet );
+ SwFrameFormat *pFrameFormat = m_pDoc->MakeFlySection(
+ eAnchorId, m_pPam->GetPoint(), &aFrmSet );
pTCntxt->SetFrameFormat( pFrameFormat );
const SwFormatContent& rFlyContent = pFrameFormat->GetContent();
- pPam->GetPoint()->nNode = *rFlyContent.GetContentIdx();
+ m_pPam->GetPoint()->nNode = *rFlyContent.GetContentIdx();
SwContentNode *pCNd =
- pDoc->GetNodes().GoNext( &(pPam->GetPoint()->nNode) );
- pPam->GetPoint()->nContent.Assign( pCNd, 0 );
+ m_pDoc->GetNodes().GoNext( &(m_pPam->GetPoint()->nNode) );
+ m_pPam->GetPoint()->nContent.Assign( pCNd, 0 );
}
@@ -3722,29 +3722,29 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
// Inhalt der Box-Section bewegen (der Ausrichtungs-Parameter
// ist erstmal nur ein Dummy und wird spaeter noch richtig
// gesetzt)
- OSL_ENSURE( !pPam->GetPoint()->nContent.GetIndex(),
+ OSL_ENSURE( !m_pPam->GetPoint()->nContent.GetIndex(),
"Der Absatz hinter der Tabelle ist nicht leer!" );
- const SwTable* pSwTable = pDoc->InsertTable(
+ const SwTable* pSwTable = m_pDoc->InsertTable(
SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 1 ),
- *pPam->GetPoint(), 1, 1, text::HoriOrientation::LEFT );
+ *m_pPam->GetPoint(), 1, 1, text::HoriOrientation::LEFT );
if( bForceFrame )
{
- SwNodeIndex aDstIdx( pPam->GetPoint()->nNode );
- pPam->Move( fnMoveBackward );
- pDoc->GetNodes().Delete( aDstIdx );
+ SwNodeIndex aDstIdx( m_pPam->GetPoint()->nNode );
+ m_pPam->Move( fnMoveBackward );
+ m_pDoc->GetNodes().Delete( aDstIdx );
}
else
{
if( bStyleParsed )
{
- pCSS1Parser->SetFormatBreak( aItemSet, aPropInfo );
+ m_pCSS1Parser->SetFormatBreak( aItemSet, aPropInfo );
pSwTable->GetFrameFormat()->SetFormatAttr( aItemSet );
}
- pPam->Move( fnMoveBackward );
+ m_pPam->Move( fnMoveBackward );
}
- SwNode const*const pNd = & pPam->GetPoint()->nNode.GetNode();
+ SwNode const*const pNd = & m_pPam->GetPoint()->nNode.GetNode();
if( !bAppended && !bForceFrame )
{
SwTextNode *const pOldTextNd =
@@ -3817,8 +3817,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
}
}
- SwNode const*const pNd = & pPam->GetPoint()->nNode.GetNode();
- const SwStartNode *pStNd = (pTable->bFirstCell ? pNd->FindTableNode()
+ SwNode const*const pNd = & m_pPam->GetPoint()->nNode.GetNode();
+ const SwStartNode *pStNd = (m_pTable->bFirstCell ? pNd->FindTableNode()
: pNd->FindTableBoxStartNode() );
pCurTable->SetTable( pStNd, pTCntxt, nLeftSpace, nRightSpace );
@@ -3828,8 +3828,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
// irgendwo ausserhalb von Zellen Attribute gesetzt werden.
// Darf nicht frueher passieren, weil eventuell noch im
// Stack gesucht wird!!!
- nContextStMin = aContexts.size();
- nContextStAttrMin = nContextStMin;
+ m_nContextStMin = m_aContexts.size();
+ m_nContextStAttrMin = m_nContextStMin;
}
pSaveStruct = new _CellSaveStruct( *this, pCurTable, bHead,
@@ -3850,9 +3850,9 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
nToken = FilterToken( nToken );
- OSL_ENSURE( pPendStack || !bCallNextToken || pSaveStruct->IsInSection(),
+ OSL_ENSURE( m_pPendStack || !m_bCallNextToken || pSaveStruct->IsInSection(),
"Wo ist die Section gebieben?" );
- if( !pPendStack && bCallNextToken && pSaveStruct->IsInSection() )
+ if( !m_pPendStack && m_bCallNextToken && pSaveStruct->IsInSection() )
{
// NextToken direkt aufrufen (z.B. um den Inhalt von
// Floating-Frames oder Applets zu ignorieren)
@@ -3881,12 +3881,12 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
{
bool bHasToFly = false;
SvxAdjust eTabAdjust = SVX_ADJUST_END;
- if( !pPendStack )
+ if( !m_pPendStack )
{
// nur wenn eine neue Tabelle aufgemacht wird, aber
// nicht wenn nach einem Pending in der Tabelle
// weitergelesen wird!
- pSaveStruct->m_pTable = pTable;
+ pSaveStruct->m_pTable = m_pTable;
// HACK: Eine Section fuer eine Tabelle anlegen, die
// in einen Rahmen kommt.
@@ -3923,8 +3923,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
}
// in der Zelle kann sich ein Bereich befinden!
- eTabAdjust = aAttrTab.pAdjust
- ? static_cast<const SvxAdjustItem&>(aAttrTab.pAdjust->GetItem()).
+ eTabAdjust = m_aAttrTab.pAdjust
+ ? static_cast<const SvxAdjustItem&>(m_aAttrTab.pAdjust->GetItem()).
GetAdjust()
: SVX_ADJUST_END;
}
@@ -3993,18 +3993,18 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
}
}
- pTable = pSaveStruct->m_pTable;
+ m_pTable = pSaveStruct->m_pTable;
}
}
break;
case HTML_NOBR_ON:
// HACK fuer MS: Steht das <NOBR> zu beginn der Zelle?
- pSaveStruct->StartNoBreak( *pPam->GetPoint() );
+ pSaveStruct->StartNoBreak( *m_pPam->GetPoint() );
break;
case HTML_NOBR_OFF:
- pSaveStruct->EndNoBreak( *pPam->GetPoint() );
+ pSaveStruct->EndNoBreak( *m_pPam->GetPoint() );
break;
case HTML_COMMENT:
@@ -4021,7 +4021,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
pSaveStruct->AddContents(
InsertTableContents( bHead ) );
}
- bCallNextToken = true;
+ m_bCallNextToken = true;
NewMarquee( pCurTable );
break;
@@ -4043,7 +4043,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
break;
}
- OSL_ENSURE( !bPending || !pPendStack,
+ OSL_ENSURE( !bPending || !m_pPendStack,
"SwHTMLParser::BuildTableCell: Es gibt wieder einen Pend-Stack" );
bPending = false;
if( IsParserWorking() )
@@ -4055,9 +4055,9 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
if( SVPAR_PENDING == GetStatus() )
{
- pPendStack = new SwPendingStack( bHead ? HTML_TABLEHEADER_ON
- : HTML_TABLEDATA_ON, pPendStack );
- pPendStack->pData = pSaveStruct;
+ m_pPendStack = new SwPendingStack( bHead ? HTML_TABLEHEADER_ON
+ : HTML_TABLEDATA_ON, m_pPendStack );
+ m_pPendStack->pData = pSaveStruct;
return;
}
@@ -4078,7 +4078,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
? RES_POOLCOLL_TABLE_HDLN
: RES_POOLCOLL_TABLE ));
const SwEndNode *pEndNd = pStNd->EndOfSectionNode();
- SwContentNode *pCNd = pDoc->GetNodes()[pEndNd->GetIndex()-1] ->GetContentNode();
+ SwContentNode *pCNd = m_pDoc->GetNodes()[pEndNd->GetIndex()-1] ->GetContentNode();
//Added defaults to CJK and CTL
SvxFontHeightItem aFontHeight( 40, 100, RES_CHRATR_FONTSIZE );
pCNd->SetAttr( aFontHeight );
@@ -4093,12 +4093,12 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
if( pSaveStruct->IsInSection() )
{
- pSaveStruct->CheckNoBreak( *pPam->GetPoint(), pDoc );
+ pSaveStruct->CheckNoBreak( *m_pPam->GetPoint(), m_pDoc );
// Alle noch offenen Kontexte beenden. Wir nehmen hier
// AttrMin, weil nContxtStMin evtl. veraendert wurde.
// Da es durch EndContext wieder restauriert wird, geht das.
- while( aContexts.size() > nContextStAttrMin+1 )
+ while( m_aContexts.size() > m_nContextStAttrMin+1 )
{
_HTMLAttrContext *pCntxt = PopContext();
EndContext( pCntxt );
@@ -4106,7 +4106,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
}
// LFs am Absatz-Ende entfernen
- if( StripTrailingLF()==0 && !pPam->GetPoint()->nContent.GetIndex() )
+ if( StripTrailingLF()==0 && !m_pPam->GetPoint()->nContent.GetIndex() )
StripTrailingPara();
// falls fuer die Zelle eine Ausrichtung gesetzt wurde, muessen
@@ -4118,7 +4118,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
else
{
// Alle noch offenen Kontexte beenden
- while( aContexts.size() > nContextStAttrMin )
+ while( m_aContexts.size() > m_nContextStAttrMin )
{
_HTMLAttrContext *pCntxt = PopContext();
ClearContext( pCntxt );
@@ -4155,22 +4155,22 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions,
{
// <TR> wurde bereist gelesen
- if( !IsParserWorking() && !pPendStack )
+ if( !IsParserWorking() && !m_pPendStack )
return;
int nToken = 0;
_RowSaveStruct* pSaveStruct;
bool bPending = false;
- if( pPendStack )
+ if( m_pPendStack )
{
- pSaveStruct = static_cast<_RowSaveStruct*>(pPendStack->pData);
+ pSaveStruct = static_cast<_RowSaveStruct*>(m_pPendStack->pData);
- SwPendingStack* pTmp = pPendStack->pNext;
- delete pPendStack;
- pPendStack = pTmp;
- nToken = pPendStack ? pPendStack->nToken : GetSaveToken();
- bPending = SVPAR_ERROR == eState && pPendStack != 0;
+ SwPendingStack* pTmp = m_pPendStack->pNext;
+ delete m_pPendStack;
+ m_pPendStack = pTmp;
+ nToken = m_pPendStack ? m_pPendStack->nToken : GetSaveToken();
+ bPending = SVPAR_ERROR == eState && m_pPendStack != 0;
SaveState( nToken );
}
@@ -4246,10 +4246,10 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions,
nToken = FilterToken( nToken );
- OSL_ENSURE( pPendStack || !bCallNextToken ||
+ OSL_ENSURE( m_pPendStack || !m_bCallNextToken ||
pCurTable->GetContext() || pCurTable->HasParentSection(),
"Wo ist die Section gebieben?" );
- if( !pPendStack && bCallNextToken &&
+ if( !m_pPendStack && m_bCallNextToken &&
(pCurTable->GetContext() || pCurTable->HasParentSection()) )
{
// NextToken direkt aufrufen (z.B. um den Inhalt von
@@ -4285,12 +4285,12 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions,
if( SVPAR_PENDING != GetStatus() )
{
pSaveStruct->bHasCells = true;
- bDone = pTable->IsOverflowing();
+ bDone = m_pTable->IsOverflowing();
}
break;
case HTML_CAPTION_ON:
BuildTableCaption( pCurTable );
- bDone = pTable->IsOverflowing();
+ bDone = m_pTable->IsOverflowing();
break;
case HTML_CAPTION_OFF:
case HTML_TABLEHEADER_OFF:
@@ -4331,7 +4331,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions,
break;
}
- OSL_ENSURE( !bPending || !pPendStack,
+ OSL_ENSURE( !bPending || !m_pPendStack,
"SwHTMLParser::BuildTableRow: Es gibt wieder einen Pend-Stack" );
bPending = false;
if( IsParserWorking() )
@@ -4343,8 +4343,8 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions,
if( SVPAR_PENDING == GetStatus() )
{
- pPendStack = new SwPendingStack( HTML_TABLEROW_ON, pPendStack );
- pPendStack->pData = pSaveStruct;
+ m_pPendStack = new SwPendingStack( HTML_TABLEROW_ON, m_pPendStack );
+ m_pPendStack->pData = pSaveStruct;
}
else
{
@@ -4360,22 +4360,22 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
bool bHead )
{
// <THEAD>, <TBODY> bzw. <TFOOT> wurde bereits gelesen
- if( !IsParserWorking() && !pPendStack )
+ if( !IsParserWorking() && !m_pPendStack )
return;
int nToken = 0;
bool bPending = false;
_RowSaveStruct* pSaveStruct;
- if( pPendStack )
+ if( m_pPendStack )
{
- pSaveStruct = static_cast<_RowSaveStruct*>(pPendStack->pData);
+ pSaveStruct = static_cast<_RowSaveStruct*>(m_pPendStack->pData);
- SwPendingStack* pTmp = pPendStack->pNext;
- delete pPendStack;
- pPendStack = pTmp;
- nToken = pPendStack ? pPendStack->nToken : GetSaveToken();
- bPending = SVPAR_ERROR == eState && pPendStack != 0;
+ SwPendingStack* pTmp = m_pPendStack->pNext;
+ delete m_pPendStack;
+ m_pPendStack = pTmp;
+ nToken = m_pPendStack ? m_pPendStack->nToken : GetSaveToken();
+ bPending = SVPAR_ERROR == eState && m_pPendStack != 0;
SaveState( nToken );
}
@@ -4423,10 +4423,10 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
nToken = FilterToken( nToken );
- OSL_ENSURE( pPendStack || !bCallNextToken ||
+ OSL_ENSURE( m_pPendStack || !m_bCallNextToken ||
pCurTable->GetContext() || pCurTable->HasParentSection(),
"Wo ist die Section gebieben?" );
- if( !pPendStack && bCallNextToken &&
+ if( !m_pPendStack && m_bCallNextToken &&
(pCurTable->GetContext() || pCurTable->HasParentSection()) )
{
// NextToken direkt aufrufen (z.B. um den Inhalt von
@@ -4456,7 +4456,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
break;
case HTML_CAPTION_ON:
BuildTableCaption( pCurTable );
- bDone = pTable->IsOverflowing();
+ bDone = m_pTable->IsOverflowing();
break;
case HTML_CAPTION_OFF:
break;
@@ -4465,12 +4465,12 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
SkipToken();
BuildTableRow( pCurTable, false, pSaveStruct->eAdjust,
pSaveStruct->eVertOri );
- bDone = pTable->IsOverflowing();
+ bDone = m_pTable->IsOverflowing();
break;
case HTML_TABLEROW_ON:
BuildTableRow( pCurTable, true, pSaveStruct->eAdjust,
pSaveStruct->eVertOri );
- bDone = pTable->IsOverflowing();
+ bDone = m_pTable->IsOverflowing();
break;
case HTML_MULTICOL_ON:
// spaltige Rahmen koennen wir hier leider nicht einguegen
@@ -4492,7 +4492,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
NextToken( nToken );
}
- OSL_ENSURE( !bPending || !pPendStack,
+ OSL_ENSURE( !bPending || !m_pPendStack,
"SwHTMLParser::BuildTableSection: Es gibt wieder einen Pend-Stack" );
bPending = false;
if( IsParserWorking() )
@@ -4504,9 +4504,9 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
if( SVPAR_PENDING == GetStatus() )
{
- pPendStack = new SwPendingStack( bHead ? HTML_THEAD_ON
- : HTML_TBODY_ON, pPendStack );
- pPendStack->pData = pSaveStruct;
+ m_pPendStack = new SwPendingStack( bHead ? HTML_THEAD_ON
+ : HTML_TBODY_ON, m_pPendStack );
+ m_pPendStack->pData = pSaveStruct;
}
else
{
@@ -4547,22 +4547,22 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
{
// <COLGROUP> wurde bereits gelesen, wenn bReadOptions
- if( !IsParserWorking() && !pPendStack )
+ if( !IsParserWorking() && !m_pPendStack )
return;
int nToken = 0;
bool bPending = false;
_TableColGrpSaveStruct* pSaveStruct;
- if( pPendStack )
+ if( m_pPendStack )
{
- pSaveStruct = static_cast<_TableColGrpSaveStruct*>(pPendStack->pData);
+ pSaveStruct = static_cast<_TableColGrpSaveStruct*>(m_pPendStack->pData);
- SwPendingStack* pTmp = pPendStack->pNext;
- delete pPendStack;
- pPendStack = pTmp;
- nToken = pPendStack ? pPendStack->nToken : GetSaveToken();
- bPending = SVPAR_ERROR == eState && pPendStack != 0;
+ SwPendingStack* pTmp = m_pPendStack->pNext;
+ delete m_pPendStack;
+ m_pPendStack = pTmp;
+ nToken = m_pPendStack ? m_pPendStack->nToken : GetSaveToken();
+ bPending = SVPAR_ERROR == eState && m_pPendStack != 0;
SaveState( nToken );
}
@@ -4617,10 +4617,10 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
nToken = FilterToken( nToken );
- OSL_ENSURE( pPendStack || !bCallNextToken ||
+ OSL_ENSURE( m_pPendStack || !m_bCallNextToken ||
pCurTable->GetContext() || pCurTable->HasParentSection(),
"Wo ist die Section gebieben?" );
- if( !pPendStack && bCallNextToken &&
+ if( !m_pPendStack && m_bCallNextToken &&
(pCurTable->GetContext() || pCurTable->HasParentSection()) )
{
// NextToken direkt aufrufen (z.B. um den Inhalt von
@@ -4708,7 +4708,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
NextToken( nToken );
}
- OSL_ENSURE( !bPending || !pPendStack,
+ OSL_ENSURE( !bPending || !m_pPendStack,
"SwHTMLParser::BuildTableColGrp: Es gibt wieder einen Pend-Stack" );
bPending = false;
if( IsParserWorking() )
@@ -4720,8 +4720,8 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
if( SVPAR_PENDING == GetStatus() )
{
- pPendStack = new SwPendingStack( HTML_COL_ON, pPendStack );
- pPendStack->pData = pSaveStruct;
+ m_pPendStack = new SwPendingStack( HTML_COL_ON, m_pPendStack );
+ m_pPendStack->pData = pSaveStruct;
}
else
{
@@ -4774,27 +4774,27 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
{
// <CAPTION> wurde bereits gelesen
- if( !IsParserWorking() && !pPendStack )
+ if( !IsParserWorking() && !m_pPendStack )
return;
int nToken = 0;
_CaptionSaveStruct* pSaveStruct;
- if( pPendStack )
+ if( m_pPendStack )
{
- pSaveStruct = static_cast<_CaptionSaveStruct*>(pPendStack->pData);
+ pSaveStruct = static_cast<_CaptionSaveStruct*>(m_pPendStack->pData);
- SwPendingStack* pTmp = pPendStack->pNext;
- delete pPendStack;
- pPendStack = pTmp;
- nToken = pPendStack ? pPendStack->nToken : GetSaveToken();
- OSL_ENSURE( !pPendStack, "Wo kommt hier ein Pending-Stack her?" );
+ SwPendingStack* pTmp = m_pPendStack->pNext;
+ delete m_pPendStack;
+ m_pPendStack = pTmp;
+ nToken = m_pPendStack ? m_pPendStack->nToken : GetSaveToken();
+ OSL_ENSURE( !m_pPendStack, "Wo kommt hier ein Pending-Stack her?" );
SaveState( nToken );
}
else
{
- if( pTable->IsOverflowing() )
+ if( m_pTable->IsOverflowing() )
{
SaveState( 0 );
return;
@@ -4816,12 +4816,12 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
}
// Alte PaM-Position retten.
- pSaveStruct = new _CaptionSaveStruct( *this, *pPam->GetPoint() );
+ pSaveStruct = new _CaptionSaveStruct( *this, *m_pPam->GetPoint() );
// Eine Text-Section im Icons-Bereich als Container fuer die
// Ueberschrift anlegen und PaM dort reinstellen.
const SwStartNode *pStNd;
- if( pTable == pCurTable )
+ if( m_pTable == pCurTable )
pStNd = InsertTempTableCaptionSection();
else
pStNd = InsertTableSection( RES_POOLCOLL_TEXT );
@@ -4829,10 +4829,10 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
_HTMLAttrContext *pCntxt = new _HTMLAttrContext( HTML_CAPTION_ON );
// Tabellen-Ueberschriften sind immer zentriert.
- NewAttr( &aAttrTab.pAdjust, SvxAdjustItem(SVX_ADJUST_CENTER, RES_PARATR_ADJUST) );
+ NewAttr( &m_aAttrTab.pAdjust, SvxAdjustItem(SVX_ADJUST_CENTER, RES_PARATR_ADJUST) );
_HTMLAttrs &rAttrs = pCntxt->GetAttrs();
- rAttrs.push_back( aAttrTab.pAdjust );
+ rAttrs.push_back( m_aAttrTab.pAdjust );
PushContext( pCntxt );
@@ -4858,9 +4858,9 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
switch( nToken )
{
case HTML_TABLE_ON:
- if( !pPendStack )
+ if( !m_pPendStack )
{
- pSaveStruct->m_pTable = pTable;
+ pSaveStruct->m_pTable = m_pTable;
bool bHasToFly = pSaveStruct->m_pTable!=pCurTable;
BuildTable( pCurTable->GetTableAdjust( true ),
false, true, bHasToFly );
@@ -4871,7 +4871,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
}
if( SVPAR_PENDING != GetStatus() )
{
- pTable = pSaveStruct->m_pTable;
+ m_pTable = pSaveStruct->m_pTable;
}
break;
case HTML_TABLE_OFF:
@@ -4888,11 +4888,11 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
bDone = true;
break;
default:
- if( pPendStack )
+ if( m_pPendStack )
{
- SwPendingStack* pTmp = pPendStack->pNext;
- delete pPendStack;
- pPendStack = pTmp;
+ SwPendingStack* pTmp = m_pPendStack->pNext;
+ delete m_pPendStack;
+ m_pPendStack = pTmp;
OSL_ENSURE( !pTmp, "weiter kann es nicht gehen!" );
}
@@ -4911,13 +4911,13 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
if( SVPAR_PENDING==GetStatus() )
{
- pPendStack = new SwPendingStack( HTML_CAPTION_ON, pPendStack );
- pPendStack->pData = pSaveStruct;
+ m_pPendStack = new SwPendingStack( HTML_CAPTION_ON, m_pPendStack );
+ m_pPendStack->pData = pSaveStruct;
return;
}
// Alle noch offenen Kontexte beenden
- while( aContexts.size() > nContextStAttrMin+1 )
+ while( m_aContexts.size() > m_nContextStAttrMin+1 )
{
_HTMLAttrContext *pCntxt = PopContext();
EndContext( pCntxt );
@@ -4927,19 +4927,19 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
// LF am Absatz-Ende entfernen
bool bLFStripped = StripTrailingLF() > 0;
- if( pTable==pCurTable )
+ if( m_pTable==pCurTable )
{
// Beim spaeteren verschieben der Beschriftung vor oder hinter
// die Tabelle wird der letzte Absatz nicht mitverschoben.
// Deshalb muss sich am Ende der Section immer ein leerer
// Absatz befinden.
- if( pPam->GetPoint()->nContent.GetIndex() || bLFStripped )
+ if( m_pPam->GetPoint()->nContent.GetIndex() || bLFStripped )
AppendTextNode( AM_NOSPACE );
}
else
{
// LFs am Absatz-Ende entfernen
- if( !pPam->GetPoint()->nContent.GetIndex() && !bLFStripped )
+ if( !m_pPam->GetPoint()->nContent.GetIndex() && !bLFStripped )
StripTrailingPara();
}
@@ -4955,7 +4955,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
pSaveStruct->RestoreAll( *this );
// PaM wiederherstellen.
- *pPam->GetPoint() = pSaveStruct->GetPos();
+ *m_pPam->GetPoint() = pSaveStruct->GetPos();
delete pSaveStruct;
}
@@ -5154,41 +5154,41 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
bool bHasParentSection,
bool bHasToFly )
{
- if( !IsParserWorking() && !pPendStack )
+ if( !IsParserWorking() && !m_pPendStack )
return 0;
int nToken = 0;
bool bPending = false;
_TableSaveStruct* pSaveStruct;
- if( pPendStack )
+ if( m_pPendStack )
{
- pSaveStruct = static_cast<_TableSaveStruct*>(pPendStack->pData);
+ pSaveStruct = static_cast<_TableSaveStruct*>(m_pPendStack->pData);
- SwPendingStack* pTmp = pPendStack->pNext;
- delete pPendStack;
- pPendStack = pTmp;
- nToken = pPendStack ? pPendStack->nToken : GetSaveToken();
- bPending = SVPAR_ERROR == eState && pPendStack != 0;
+ SwPendingStack* pTmp = m_pPendStack->pNext;
+ delete m_pPendStack;
+ m_pPendStack = pTmp;
+ nToken = m_pPendStack ? m_pPendStack->nToken : GetSaveToken();
+ bPending = SVPAR_ERROR == eState && m_pPendStack != 0;
SaveState( nToken );
}
else
{
- pTable = 0;
+ m_pTable = 0;
HTMLTableOptions *pTableOptions =
new HTMLTableOptions( GetOptions(), eParentAdjust );
if( !pTableOptions->aId.isEmpty() )
InsertBookmark( pTableOptions->aId );
- HTMLTable *pCurTable = new HTMLTable( this, pTable,
+ HTMLTable *pCurTable = new HTMLTable( this, m_pTable,
bIsParentHead,
bHasParentSection,
bHasToFly,
pTableOptions );
- if( !pTable )
- pTable = pCurTable;
+ if( !m_pTable )
+ m_pTable = pCurTable;
pSaveStruct = new _TableSaveStruct( pCurTable );
@@ -5212,10 +5212,10 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
nToken = FilterToken( nToken );
- OSL_ENSURE( pPendStack || !bCallNextToken ||
+ OSL_ENSURE( m_pPendStack || !m_bCallNextToken ||
pCurTable->GetContext() || pCurTable->HasParentSection(),
"Wo ist die Section gebieben?" );
- if( !pPendStack && bCallNextToken &&
+ if( !m_pPendStack && m_bCallNextToken &&
(pCurTable->GetContext() || pCurTable->HasParentSection()) )
{
// NextToken direkt aufrufen (z.B. um den Inhalt von
@@ -5239,7 +5239,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
break;
case HTML_CAPTION_ON:
BuildTableCaption( pCurTable );
- bDone = pTable->IsOverflowing();
+ bDone = m_pTable->IsOverflowing();
break;
case HTML_COL_ON:
SkipToken();
@@ -5253,13 +5253,13 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
case HTML_TABLEDATA_ON:
SkipToken();
BuildTableSection( pCurTable, false, false );
- bDone = pTable->IsOverflowing();
+ bDone = m_pTable->IsOverflowing();
break;
case HTML_THEAD_ON:
case HTML_TFOOT_ON:
case HTML_TBODY_ON:
BuildTableSection( pCurTable, true, HTML_THEAD_ON==nToken );
- bDone = pTable->IsOverflowing();
+ bDone = m_pTable->IsOverflowing();
break;
case HTML_MULTICOL_ON:
// spaltige Rahmen koennen wir hier leider nicht einguegen
@@ -5282,7 +5282,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
break;
}
- OSL_ENSURE( !bPending || !pPendStack,
+ OSL_ENSURE( !bPending || !m_pPendStack,
"SwHTMLParser::BuildTable: Es gibt wieder einen Pend-Stack" );
bPending = false;
if( IsParserWorking() )
@@ -5294,8 +5294,8 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
if( SVPAR_PENDING == GetStatus() )
{
- pPendStack = new SwPendingStack( HTML_TABLE_ON, pPendStack );
- pPendStack->pData = pSaveStruct;
+ m_pPendStack = new SwPendingStack( HTML_TABLE_ON, m_pPendStack );
+ m_pPendStack->pData = pSaveStruct;
return 0;
}
@@ -5310,20 +5310,20 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
// ausserhalb von Zellen begonnene Kontexte beenden
// muss vor(!) dem Umsetzten der Attribut Tabelle existieren,
// weil die aktuelle danach nicht mehr existiert
- while( aContexts.size() > nContextStAttrMin )
+ while( m_aContexts.size() > m_nContextStAttrMin )
{
_HTMLAttrContext *pCntxt = PopContext();
ClearContext( pCntxt );
delete pCntxt;
}
- nContextStMin = pTCntxt->GetContextStMin();
- nContextStAttrMin = pTCntxt->GetContextStAttrMin();
+ m_nContextStMin = pTCntxt->GetContextStMin();
+ m_nContextStAttrMin = pTCntxt->GetContextStAttrMin();
- if( pTable==pCurTable )
+ if( m_pTable==pCurTable )
{
// Tabellen-Beschriftung setzen
- const SwStartNode *pCapStNd = pTable->GetCaptionStartNode();
+ const SwStartNode *pCapStNd = m_pTable->GetCaptionStartNode();
if( pCapStNd )
{
// Der letzte Absatz der Section wird nie mitkopiert. Deshalb
@@ -5335,11 +5335,11 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
SwNodeRange aSrcRg( *pCapStNd, 1,
*pCapStNd->EndOfSectionNode(), -1 );
- bool bTop = pTable->IsTopCaption();
+ bool bTop = m_pTable->IsTopCaption();
SwStartNode *pTableStNd = pTCntxt->GetTableNode();
OSL_ENSURE( pTableStNd, "Wo ist der Tabellen-Node" );
- OSL_ENSURE( pTableStNd==pPam->GetNode().FindTableNode(),
+ OSL_ENSURE( pTableStNd==m_pPam->GetNode().FindTableNode(),
"Stehen wir in der falschen Tabelle?" );
SwNode* pNd;
@@ -5349,7 +5349,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
pNd = pTableStNd->EndOfSectionNode();
SwNodeIndex aDstIdx( *pNd, bTop ? 0 : 1 );
- pDoc->getIDocumentContentOperations().MoveNodeRange( aSrcRg, aDstIdx,
+ m_pDoc->getIDocumentContentOperations().MoveNodeRange( aSrcRg, aDstIdx,
SwMoveFlags::DEFAULT );
// Wenn die Caption vor der Tabelle eingefuegt wurde muss
@@ -5365,36 +5365,36 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
}
// Die Section wird jetzt nicht mehr gebraucht.
- pPam->SetMark();
- pPam->DeleteMark();
- pDoc->getIDocumentContentOperations().DeleteSection( const_cast<SwStartNode *>(pCapStNd) );
- pTable->SetCaption( 0, false );
+ m_pPam->SetMark();
+ m_pPam->DeleteMark();
+ m_pDoc->getIDocumentContentOperations().DeleteSection( const_cast<SwStartNode *>(pCapStNd) );
+ m_pTable->SetCaption( 0, false );
}
// SwTable aufbereiten
sal_uInt16 nBrowseWidth = (sal_uInt16)GetCurrentBrowseWidth();
- pSaveStruct->MakeTable( nBrowseWidth, *pPam->GetPoint(), pDoc );
+ pSaveStruct->MakeTable( nBrowseWidth, *m_pPam->GetPoint(), m_pDoc );
}
GetNumInfo().Set( pTCntxt->GetNumInfo() );
pTCntxt->RestorePREListingXMP( *this );
RestoreAttrTab( pTCntxt->aAttrTab );
- if( pTable==pCurTable )
+ if( m_pTable==pCurTable )
{
// oberen Absatz-Abstand einstellen
- bUpperSpace = true;
+ m_bUpperSpace = true;
SetTextCollAttrs();
- nParaCnt = nParaCnt - std::min(nParaCnt,
+ m_nParaCnt = m_nParaCnt - std::min(m_nParaCnt,
pTCntxt->GetTableNode()->GetTable().GetTabSortBoxes().size());
// ggfs. eine Tabelle anspringen
- if( JUMPTO_TABLE == eJumpTo && pTable->GetSwTable() &&
- pTable->GetSwTable()->GetFrameFormat()->GetName() == sJmpMark )
+ if( JUMPTO_TABLE == m_eJumpTo && m_pTable->GetSwTable() &&
+ m_pTable->GetSwTable()->GetFrameFormat()->GetName() == m_sJmpMark )
{
- bChkJumpMark = true;
- eJumpTo = JUMPTO_NONE;
+ m_bChkJumpMark = true;
+ m_eJumpTo = JUMPTO_NONE;
}
// Wenn Import abgebrochen wurde kein erneutes Show
@@ -5403,11 +5403,11 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
// kein Show aufgerufen werden, weil sonst waehrend des
// Reschedules der Parser zerstoert wird, wenn noch ein
// DataAvailable-Link kommt. Deshalb: Nur im WORKING-State.
- if( !nParaCnt && SVPAR_WORKING == GetStatus() )
+ if( !m_nParaCnt && SVPAR_WORKING == GetStatus() )
Show();
}
}
- else if( pTable==pCurTable )
+ else if( m_pTable==pCurTable )
{
// Es wurde gar keine Tabelle gelesen.
@@ -5415,18 +5415,18 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
const SwStartNode *pCapStNd = pCurTable->GetCaptionStartNode();
if( pCapStNd )
{
- pPam->SetMark();
- pPam->DeleteMark();
- pDoc->getIDocumentContentOperations().DeleteSection( const_cast<SwStartNode *>(pCapStNd) );
+ m_pPam->SetMark();
+ m_pPam->DeleteMark();
+ m_pDoc->getIDocumentContentOperations().DeleteSection( const_cast<SwStartNode *>(pCapStNd) );
pCurTable->SetCaption( 0, false );
}
}
- if( pTable == pCurTable )
+ if( m_pTable == pCurTable )
{
delete pSaveStruct->m_pCurrentTable;
pSaveStruct->m_pCurrentTable = 0;
- pTable = 0;
+ m_pTable = 0;
}
HTMLTable* pRetTable = pSaveStruct->m_pCurrentTable;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 2d4c762d7fef..e1dbe40902b4 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -241,110 +241,110 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn,
bool bNoHTMLComments )
: SfxHTMLParser( rIn, bReadNewDoc, pMed ),
SwClient( 0 ),
- aPathToFile( rPath ),
- sBaseURL( rBaseURL ),
- pAppletImpl( 0 ),
- pCSS1Parser( 0 ),
- pNumRuleInfo( new SwHTMLNumRuleInfo ),
- pPendStack( 0 ),
- pDoc( pD ),
- pActionViewShell( 0 ),
- pSttNdIdx( 0 ),
- pTable(0),
- pFormImpl( 0 ),
- pMarquee( 0 ),
- pField( 0 ),
- pImageMap( 0 ),
+ m_aPathToFile( rPath ),
+ m_sBaseURL( rBaseURL ),
+ m_pAppletImpl( 0 ),
+ m_pCSS1Parser( 0 ),
+ m_pNumRuleInfo( new SwHTMLNumRuleInfo ),
+ m_pPendStack( 0 ),
+ m_pDoc( pD ),
+ m_pActionViewShell( 0 ),
+ m_pSttNdIdx( 0 ),
+ m_pTable(0),
+ m_pFormImpl( 0 ),
+ m_pMarquee( 0 ),
+ m_pField( 0 ),
+ m_pImageMap( 0 ),
m_pImageMaps(nullptr),
- pFootEndNoteImpl( 0 ),
- nScriptStartLineNr( 0 ),
- nBaseFontStMin( 0 ),
- nFontStMin( 0 ),
- nDefListDeep( 0 ),
- nFontStHeadStart( 0 ),
- nSBModuleCnt( 0 ),
- nMissingImgMaps( 0 ),
- nParaCnt( 5 ),
+ m_pFootEndNoteImpl( 0 ),
+ m_nScriptStartLineNr( 0 ),
+ m_nBaseFontStMin( 0 ),
+ m_nFontStMin( 0 ),
+ m_nDefListDeep( 0 ),
+ m_nFontStHeadStart( 0 ),
+ m_nSBModuleCnt( 0 ),
+ m_nMissingImgMaps( 0 ),
+ m_nParaCnt( 5 ),
// #i83625#
- nContextStMin( 0 ),
- nContextStAttrMin( 0 ),
- nSelectEntryCnt( 0 ),
- nOpenParaToken( 0 ),
- eJumpTo( JUMPTO_NONE ),
+ m_nContextStMin( 0 ),
+ m_nContextStAttrMin( 0 ),
+ m_nSelectEntryCnt( 0 ),
+ m_nOpenParaToken( 0 ),
+ m_eJumpTo( JUMPTO_NONE ),
#ifdef DBG_UTIL
m_nContinue( 0 ),
#endif
- eParaAdjust( SVX_ADJUST_END ),
- bDocInitalized( false ),
- bSetModEnabled( false ),
- bInFloatingFrame( false ),
- bInField( false ),
- bCallNextToken( false ),
- bIgnoreRawData( false ),
- bLBEntrySelected ( false ),
- bTAIgnoreNewPara ( false ),
- bFixMarqueeWidth ( false ),
- bFixMarqueeHeight ( false ),
- bNoParSpace( false ),
- bInNoEmbed( false ),
- bInTitle( false ),
- bUpdateDocStat( false ),
- bFixSelectWidth( false ),
- bFixSelectHeight( false ),
- bTextArea( false ),
- bSelect( false ),
- bInFootEndNoteAnchor( false ),
- bInFootEndNoteSymbol( false ),
- bIgnoreHTMLComments( bNoHTMLComments ),
- bRemoveHidden( false ),
- pTempViewFrame(0)
+ m_eParaAdjust( SVX_ADJUST_END ),
+ m_bDocInitalized( false ),
+ m_bSetModEnabled( false ),
+ m_bInFloatingFrame( false ),
+ m_bInField( false ),
+ m_bCallNextToken( false ),
+ m_bIgnoreRawData( false ),
+ m_bLBEntrySelected ( false ),
+ m_bTAIgnoreNewPara ( false ),
+ m_bFixMarqueeWidth ( false ),
+ m_bFixMarqueeHeight ( false ),
+ m_bNoParSpace( false ),
+ m_bInNoEmbed( false ),
+ m_bInTitle( false ),
+ m_bUpdateDocStat( false ),
+ m_bFixSelectWidth( false ),
+ m_bFixSelectHeight( false ),
+ m_bTextArea( false ),
+ m_bSelect( false ),
+ m_bInFootEndNoteAnchor( false ),
+ m_bInFootEndNoteSymbol( false ),
+ m_bIgnoreHTMLComments( bNoHTMLComments ),
+ m_bRemoveHidden( false ),
+ m_pTempViewFrame(0)
{
- nEventId = 0;
- bUpperSpace = bViewCreated = bChkJumpMark =
- bSetCrsr = false;
+ m_nEventId = 0;
+ m_bUpperSpace = m_bViewCreated = m_bChkJumpMark =
+ m_bSetCrsr = false;
- eScriptLang = HTML_SL_UNKNOWN;
- bAnyStarBasic = true;
+ m_eScriptLang = HTML_SL_UNKNOWN;
+ m_bAnyStarBasic = true;
rCrsr.DeleteMark();
- pPam = &rCrsr; // re-use existing cursor: avoids spurious ~SwIndexReg assert
- memset( &aAttrTab, 0, sizeof( _HTMLAttrTable ));
+ m_pPam = &rCrsr; // re-use existing cursor: avoids spurious ~SwIndexReg assert
+ memset( &m_aAttrTab, 0, sizeof( _HTMLAttrTable ));
// Die Font-Groessen 1-7 aus der INI-Datei lesen
SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get();
- aFontHeights[0] = rHtmlOptions.GetFontSize( 0 ) * 20;
- aFontHeights[1] = rHtmlOptions.GetFontSize( 1 ) * 20;
- aFontHeights[2] = rHtmlOptions.GetFontSize( 2 ) * 20;
- aFontHeights[3] = rHtmlOptions.GetFontSize( 3 ) * 20;
- aFontHeights[4] = rHtmlOptions.GetFontSize( 4 ) * 20;
- aFontHeights[5] = rHtmlOptions.GetFontSize( 5 ) * 20;
- aFontHeights[6] = rHtmlOptions.GetFontSize( 6 ) * 20;
+ m_aFontHeights[0] = rHtmlOptions.GetFontSize( 0 ) * 20;
+ m_aFontHeights[1] = rHtmlOptions.GetFontSize( 1 ) * 20;
+ m_aFontHeights[2] = rHtmlOptions.GetFontSize( 2 ) * 20;
+ m_aFontHeights[3] = rHtmlOptions.GetFontSize( 3 ) * 20;
+ m_aFontHeights[4] = rHtmlOptions.GetFontSize( 4 ) * 20;
+ m_aFontHeights[5] = rHtmlOptions.GetFontSize( 5 ) * 20;
+ m_aFontHeights[6] = rHtmlOptions.GetFontSize( 6 ) * 20;
- bKeepUnknown = rHtmlOptions.IsImportUnknown();
+ m_bKeepUnknown = rHtmlOptions.IsImportUnknown();
if(bReadNewDoc)
{
//CJK has different defaults, so a different object should be used for this
//RES_CHARTR_CJK_FONTSIZE is a valid value
- SvxFontHeightItem aFontHeight(aFontHeights[2], 100, RES_CHRATR_FONTSIZE);
- pDoc->SetDefault( aFontHeight );
- SvxFontHeightItem aFontHeightCJK(aFontHeights[2], 100, RES_CHRATR_CJK_FONTSIZE);
- pDoc->SetDefault( aFontHeightCJK );
- SvxFontHeightItem aFontHeightCTL(aFontHeights[2], 100, RES_CHRATR_CTL_FONTSIZE);
- pDoc->SetDefault( aFontHeightCTL );
+ SvxFontHeightItem aFontHeight(m_aFontHeights[2], 100, RES_CHRATR_FONTSIZE);
+ m_pDoc->SetDefault( aFontHeight );
+ SvxFontHeightItem aFontHeightCJK(m_aFontHeights[2], 100, RES_CHRATR_CJK_FONTSIZE);
+ m_pDoc->SetDefault( aFontHeightCJK );
+ SvxFontHeightItem aFontHeightCTL(m_aFontHeights[2], 100, RES_CHRATR_CTL_FONTSIZE);
+ m_pDoc->SetDefault( aFontHeightCTL );
// #i18732# - adjust default of option 'FollowTextFlow'
// TODO: not sure what the appropriate default for HTML should be?
- pDoc->SetDefault( SwFormatFollowTextFlow(true) );
+ m_pDoc->SetDefault( SwFormatFollowTextFlow(true) );
}
// Waehrend des Imports in den HTML-Modus schalten, damit die
// richrigen Vorlagen angelegt werden
- bOldIsHTMLMode = pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE);
- pDoc->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, true);
+ m_bOldIsHTMLMode = m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE);
+ m_pDoc->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, true);
- pCSS1Parser = new SwCSS1Parser( pDoc, aFontHeights, sBaseURL, IsNewDoc() );
- pCSS1Parser->SetIgnoreFontFamily( rHtmlOptions.IsIgnoreFontFamily() );
+ m_pCSS1Parser = new SwCSS1Parser( m_pDoc, m_aFontHeights, m_sBaseURL, IsNewDoc() );
+ m_pCSS1Parser->SetIgnoreFontFamily( rHtmlOptions.IsIgnoreFontFamily() );
if( bReadUTF8 )
{
@@ -352,51 +352,51 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn,
}
else
{
- SwDocShell *pDocSh = pDoc->GetDocShell();
+ SwDocShell *pDocSh = m_pDoc->GetDocShell();
SvKeyValueIterator *pHeaderAttrs =
pDocSh->GetHeaderAttributes();
if( pHeaderAttrs )
SetEncodingByHTTPHeader( pHeaderAttrs );
}
- pCSS1Parser->SetDfltEncoding( osl_getThreadTextEncoding() );
+ m_pCSS1Parser->SetDfltEncoding( osl_getThreadTextEncoding() );
// Timer nur bei ganz normalen Dokumenten aufsetzen!
- SwDocShell* pDocSh = pDoc->GetDocShell();
+ SwDocShell* pDocSh = m_pDoc->GetDocShell();
if( pDocSh )
{
- bViewCreated = true; // nicht, synchron laden
+ m_bViewCreated = true; // nicht, synchron laden
// es ist ein Sprungziel vorgegeben.
if( pMed )
{
- sJmpMark = pMed->GetURLObject().GetMark();
- if( !sJmpMark.isEmpty() )
+ m_sJmpMark = pMed->GetURLObject().GetMark();
+ if( !m_sJmpMark.isEmpty() )
{
- eJumpTo = JUMPTO_MARK;
- sal_Int32 nLastPos = sJmpMark.lastIndexOf( cMarkSeparator );
+ m_eJumpTo = JUMPTO_MARK;
+ sal_Int32 nLastPos = m_sJmpMark.lastIndexOf( cMarkSeparator );
sal_Int32 nPos = nLastPos != -1 ? nLastPos : 0;
OUString sCmp;
if (nPos)
{
sCmp = comphelper::string::remove(
- sJmpMark.copy(nPos + 1), ' ');
+ m_sJmpMark.copy(nPos + 1), ' ');
}
if( !sCmp.isEmpty() )
{
sCmp = sCmp.toAsciiLowerCase();
if( sCmp == "region" )
- eJumpTo = JUMPTO_REGION;
+ m_eJumpTo = JUMPTO_REGION;
else if( sCmp == "table" )
- eJumpTo = JUMPTO_TABLE;
+ m_eJumpTo = JUMPTO_TABLE;
else if( sCmp == "graphic" )
- eJumpTo = JUMPTO_GRAPHIC;
+ m_eJumpTo = JUMPTO_GRAPHIC;
else if( sCmp == "outline" ||
sCmp == "text" ||
sCmp == "frame" )
- eJumpTo = JUMPTO_NONE; // das ist nichts gueltiges!
+ m_eJumpTo = JUMPTO_NONE; // das ist nichts gueltiges!
else
// ansonsten ist das ein normaler (Book)Mark
nPos = -1;
@@ -405,9 +405,9 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn,
nPos = -1;
if( nPos != -1 )
- sJmpMark = sJmpMark.copy( 0, nPos );
- if( sJmpMark.isEmpty() )
- eJumpTo = JUMPTO_NONE;
+ m_sJmpMark = m_sJmpMark.copy( 0, nPos );
+ if( m_sJmpMark.isEmpty() )
+ m_eJumpTo = JUMPTO_NONE;
}
}
}
@@ -418,84 +418,84 @@ SwHTMLParser::~SwHTMLParser()
#ifdef DBG_UTIL
OSL_ENSURE( !m_nContinue, "DTOR im Continue!" );
#endif
- bool bAsync = pDoc->IsInLoadAsynchron();
- pDoc->SetInLoadAsynchron( false );
- pDoc->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, bOldIsHTMLMode);
+ bool bAsync = m_pDoc->IsInLoadAsynchron();
+ m_pDoc->SetInLoadAsynchron( false );
+ m_pDoc->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, m_bOldIsHTMLMode);
- if( pDoc->GetDocShell() && nEventId )
- Application::RemoveUserEvent( nEventId );
+ if( m_pDoc->GetDocShell() && m_nEventId )
+ Application::RemoveUserEvent( m_nEventId );
// das DocumentDetected kann ggfs. die DocShells loeschen, darum nochmals
// abfragen
- if( pDoc->GetDocShell() )
+ if( m_pDoc->GetDocShell() )
{
// Gelinkte Bereiche updaten
- sal_uInt16 nLinkMode = pDoc->getIDocumentSettingAccess().getLinkUpdateMode( true );
+ sal_uInt16 nLinkMode = m_pDoc->getIDocumentSettingAccess().getLinkUpdateMode( true );
if( nLinkMode != NEVER && bAsync &&
- SfxObjectCreateMode::INTERNAL!=pDoc->GetDocShell()->GetCreateMode() )
- pDoc->getIDocumentLinksAdministration().GetLinkManager().UpdateAllLinks( nLinkMode == MANUAL );
+ SfxObjectCreateMode::INTERNAL!=m_pDoc->GetDocShell()->GetCreateMode() )
+ m_pDoc->getIDocumentLinksAdministration().GetLinkManager().UpdateAllLinks( nLinkMode == MANUAL );
- if ( pDoc->GetDocShell()->IsLoading() )
+ if ( m_pDoc->GetDocShell()->IsLoading() )
{
// #i59688#
- pDoc->GetDocShell()->LoadingFinished();
+ m_pDoc->GetDocShell()->LoadingFinished();
}
}
- delete pSttNdIdx;
+ delete m_pSttNdIdx;
- if( !aSetAttrTab.empty() )
+ if( !m_aSetAttrTab.empty() )
{
- OSL_ENSURE( aSetAttrTab.empty(),"Es stehen noch Attribute auf dem Stack" );
- for ( _HTMLAttrs::const_iterator it = aSetAttrTab.begin();
- it != aSetAttrTab.end(); ++it )
+ OSL_ENSURE( m_aSetAttrTab.empty(),"Es stehen noch Attribute auf dem Stack" );
+ for ( _HTMLAttrs::const_iterator it = m_aSetAttrTab.begin();
+ it != m_aSetAttrTab.end(); ++it )
delete *it;
- aSetAttrTab.clear();
+ m_aSetAttrTab.clear();
}
- delete pCSS1Parser;
- delete pNumRuleInfo;
+ delete m_pCSS1Parser;
+ delete m_pNumRuleInfo;
DeleteFormImpl();
DeleteFootEndNoteImpl();
- OSL_ENSURE( !pTable, "Es existiert noch eine offene Tabelle" );
+ OSL_ENSURE( !m_pTable, "Es existiert noch eine offene Tabelle" );
delete m_pImageMaps;
- OSL_ENSURE( !pPendStack,
+ OSL_ENSURE( !m_pPendStack,
"SwHTMLParser::~SwHTMLParser: Hier sollte es keinen Pending-Stack mehr geben" );
- while( pPendStack )
+ while( m_pPendStack )
{
- SwPendingStack* pTmp = pPendStack;
- pPendStack = pPendStack->pNext;
+ SwPendingStack* pTmp = m_pPendStack;
+ m_pPendStack = m_pPendStack->pNext;
delete pTmp->pData;
delete pTmp;
}
- if( !pDoc->release() )
+ if( !m_pDoc->release() )
{
// keiner will mehr das Doc haben, also weg damit
- delete pDoc;
- pDoc = NULL;
+ delete m_pDoc;
+ m_pDoc = NULL;
}
- if ( pTempViewFrame )
+ if ( m_pTempViewFrame )
{
- pTempViewFrame->DoClose();
+ m_pTempViewFrame->DoClose();
// the temporary view frame is hidden, so the hidden flag might need to be removed
- if ( bRemoveHidden && pDoc && pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() )
- pDoc->GetDocShell()->GetMedium()->GetItemSet()->ClearItem( SID_HIDDEN );
+ if ( m_bRemoveHidden && m_pDoc && m_pDoc->GetDocShell() && m_pDoc->GetDocShell()->GetMedium() )
+ m_pDoc->GetDocShell()->GetMedium()->GetItemSet()->ClearItem( SID_HIDDEN );
}
}
IMPL_LINK_NOARG_TYPED( SwHTMLParser, AsyncCallback, void*, void )
{
- nEventId=0;
+ m_nEventId=0;
// #i47907# - If the document has already been destructed,
// the parser should be aware of this:
- if( ( pDoc->GetDocShell() && pDoc->GetDocShell()->IsAbortingImport() )
- || 1 == pDoc->getReferenceCount() )
+ if( ( m_pDoc->GetDocShell() && m_pDoc->GetDocShell()->IsAbortingImport() )
+ || 1 == m_pDoc->getReferenceCount() )
{
// wurde der Import vom SFX abgebrochen?
eState = SVPAR_ERROR;
@@ -507,40 +507,40 @@ IMPL_LINK_NOARG_TYPED( SwHTMLParser, AsyncCallback, void*, void )
SvParserState SwHTMLParser::CallParser()
{
// einen temporaeren Index anlegen, auf Pos 0 so wird er nicht bewegt!
- pSttNdIdx = new SwNodeIndex( pDoc->GetNodes() );
+ m_pSttNdIdx = new SwNodeIndex( m_pDoc->GetNodes() );
if( !IsNewDoc() ) // in ein Dokument einfuegen ?
{
- const SwPosition* pPos = pPam->GetPoint();
+ const SwPosition* pPos = m_pPam->GetPoint();
- pDoc->getIDocumentContentOperations().SplitNode( *pPos, false );
+ m_pDoc->getIDocumentContentOperations().SplitNode( *pPos, false );
- *pSttNdIdx = pPos->nNode.GetIndex()-1;
- pDoc->getIDocumentContentOperations().SplitNode( *pPos, false );
+ *m_pSttNdIdx = pPos->nNode.GetIndex()-1;
+ m_pDoc->getIDocumentContentOperations().SplitNode( *pPos, false );
SwPaM aInsertionRangePam( *pPos );
- pPam->Move( fnMoveBackward );
+ m_pPam->Move( fnMoveBackward );
// split any redline over the insertion point
aInsertionRangePam.SetMark();
- *aInsertionRangePam.GetPoint() = *pPam->GetPoint();
+ *aInsertionRangePam.GetPoint() = *m_pPam->GetPoint();
aInsertionRangePam.Move( fnMoveBackward );
- pDoc->getIDocumentRedlineAccess().SplitRedline( aInsertionRangePam );
+ m_pDoc->getIDocumentRedlineAccess().SplitRedline( aInsertionRangePam );
- pDoc->SetTextFormatColl( *pPam,
- pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD ));
+ m_pDoc->SetTextFormatColl( *m_pPam,
+ m_pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD ));
}
if( GetMedium() )
{
- if( !bViewCreated )
+ if( !m_bViewCreated )
{
- nEventId = Application::PostUserEvent( LINK( this, SwHTMLParser, AsyncCallback ) );
+ m_nEventId = Application::PostUserEvent( LINK( this, SwHTMLParser, AsyncCallback ) );
}
else
{
- bViewCreated = true;
- nEventId = 0;
+ m_bViewCreated = true;
+ m_nEventId = 0;
}
}
@@ -550,12 +550,12 @@ SvParserState SwHTMLParser::CallParser()
rInput.Seek(STREAM_SEEK_TO_END);
rInput.ResetError();
::StartProgress( STR_STATSTR_W4WREAD, 0, rInput.Tell(),
- pDoc->GetDocShell() );
+ m_pDoc->GetDocShell() );
rInput.Seek(STREAM_SEEK_TO_BEGIN);
rInput.ResetError();
}
- pDoc->GetPageDesc( 0 ).Add( this );
+ m_pDoc->GetPageDesc( 0 ).Add( this );
SvParserState eRet = HTMLParser::CallParser();
return eRet;
@@ -573,21 +573,21 @@ void SwHTMLParser::Continue( int nToken )
// aufgeraeumt wird.
OSL_ENSURE( SVPAR_ERROR!=eState,
"SwHTMLParser::Continue: bereits ein Fehler gesetzt" );
- if( pDoc->GetDocShell() && pDoc->GetDocShell()->IsAbortingImport() )
+ if( m_pDoc->GetDocShell() && m_pDoc->GetDocShell()->IsAbortingImport() )
eState = SVPAR_ERROR;
// Die SwViewShell vom Dokument holen, merken und als aktuelle setzen.
SwViewShell *pInitVSh = CallStartAction();
- if( SVPAR_ERROR != eState && GetMedium() && !bViewCreated )
+ if( SVPAR_ERROR != eState && GetMedium() && !m_bViewCreated )
{
// Beim ersten Aufruf erstmal returnen, Doc anzeigen
// und auf Timer Callback warten.
// An dieser Stelle wurde im CallParser gerade mal ein Zeichen
// gelesen und ein SaveState(0) gerufen.
eState = SVPAR_PENDING;
- bViewCreated = true;
- pDoc->SetInLoadAsynchron( true );
+ m_bViewCreated = true;
+ m_pDoc->SetInLoadAsynchron( true );
#ifdef DBG_UTIL
m_nContinue--;
@@ -596,20 +596,20 @@ void SwHTMLParser::Continue( int nToken )
return;
}
- bSetModEnabled = false;
- if( pDoc->GetDocShell() &&
- (bSetModEnabled = pDoc->GetDocShell()->IsEnableSetModified()) )
+ m_bSetModEnabled = false;
+ if( m_pDoc->GetDocShell() &&
+ (m_bSetModEnabled = m_pDoc->GetDocShell()->IsEnableSetModified()) )
{
- pDoc->GetDocShell()->EnableSetModified( false );
+ m_pDoc->GetDocShell()->EnableSetModified( false );
}
// waehrend des einlesens kein OLE-Modified rufen
- Link<bool,void> aOLELink( pDoc->GetOle2Link() );
- pDoc->SetOle2Link( Link<bool,void>() );
+ Link<bool,void> aOLELink( m_pDoc->GetOle2Link() );
+ m_pDoc->SetOle2Link( Link<bool,void>() );
- bool bModified = pDoc->getIDocumentState().IsModified();
- bool const bWasUndo = pDoc->GetIDocumentUndoRedo().DoesUndo();
- pDoc->GetIDocumentUndoRedo().DoUndo(false);
+ bool bModified = m_pDoc->getIDocumentState().IsModified();
+ bool const bWasUndo = m_pDoc->GetIDocumentUndoRedo().DoesUndo();
+ m_pDoc->GetIDocumentUndoRedo().DoUndo(false);
// Wenn der Import abgebrochen wird, kein Continue mehr rufen.
// Falls ein Pending-Stack existiert aber durch einen Aufruf
@@ -617,39 +617,39 @@ void SwHTMLParser::Continue( int nToken )
// beendet wird.
if( SVPAR_ERROR == eState )
{
- OSL_ENSURE( !pPendStack || pPendStack->nToken,
+ OSL_ENSURE( !m_pPendStack || m_pPendStack->nToken,
"SwHTMLParser::Continue: Pending-Stack ohne Token" );
- if( pPendStack && pPendStack->nToken )
- NextToken( pPendStack->nToken );
- OSL_ENSURE( !pPendStack,
+ if( m_pPendStack && m_pPendStack->nToken )
+ NextToken( m_pPendStack->nToken );
+ OSL_ENSURE( !m_pPendStack,
"SwHTMLParser::Continue: Es gibt wieder einen Pend-Stack" );
}
else
{
- HTMLParser::Continue( pPendStack ? pPendStack->nToken : nToken );
+ HTMLParser::Continue( m_pPendStack ? m_pPendStack->nToken : nToken );
}
// Laufbalken wieder abschalten
- EndProgress( pDoc->GetDocShell() );
+ EndProgress( m_pDoc->GetDocShell() );
bool bLFStripped = false;
if( SVPAR_PENDING != GetStatus() )
{
// noch die letzten Attribute setzen
{
- if( !aScriptSource.isEmpty() )
+ if( !m_aScriptSource.isEmpty() )
{
SwScriptFieldType *pType =
- static_cast<SwScriptFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_SCRIPTFLD ));
+ static_cast<SwScriptFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_SCRIPTFLD ));
- SwScriptField aField( pType, aScriptType, aScriptSource,
+ SwScriptField aField( pType, m_aScriptType, m_aScriptSource,
false );
InsertAttr( SwFormatField( aField ) );
}
- if( pAppletImpl )
+ if( m_pAppletImpl )
{
- if( pAppletImpl->GetApplet().is() )
+ if( m_pAppletImpl->GetApplet().is() )
EndApplet();
else
EndObject();
@@ -663,9 +663,9 @@ void SwHTMLParser::Continue( int nToken )
while( GetNumInfo().GetNumRule() )
EndNumBulList();
- OSL_ENSURE( !nContextStMin, "Es gibt geschuetzte Kontexte" );
- nContextStMin = 0;
- while( aContexts.size() )
+ OSL_ENSURE( !m_nContextStMin, "Es gibt geschuetzte Kontexte" );
+ m_nContextStMin = 0;
+ while( m_aContexts.size() )
{
_HTMLAttrContext *pCntxt = PopContext();
if( pCntxt )
@@ -675,47 +675,47 @@ void SwHTMLParser::Continue( int nToken )
}
}
- if( !aParaAttrs.empty() )
- aParaAttrs.clear();
+ if( !m_aParaAttrs.empty() )
+ m_aParaAttrs.clear();
SetAttr( false );
// Noch die erst verzoegert gesetzten Styles setzen
- pCSS1Parser->SetDelayedStyles();
+ m_pCSS1Parser->SetDelayedStyles();
}
// den Start wieder korrigieren
- if( !IsNewDoc() && pSttNdIdx->GetIndex() )
+ if( !IsNewDoc() && m_pSttNdIdx->GetIndex() )
{
- SwTextNode* pTextNode = pSttNdIdx->GetNode().GetTextNode();
- SwNodeIndex aNxtIdx( *pSttNdIdx );
+ SwTextNode* pTextNode = m_pSttNdIdx->GetNode().GetTextNode();
+ SwNodeIndex aNxtIdx( *m_pSttNdIdx );
if( pTextNode && pTextNode->CanJoinNext( &aNxtIdx ))
{
const sal_Int32 nStt = pTextNode->GetText().getLength();
// wenn der Cursor noch in dem Node steht, dann setze in an das Ende
- if( pPam->GetPoint()->nNode == aNxtIdx )
+ if( m_pPam->GetPoint()->nNode == aNxtIdx )
{
- pPam->GetPoint()->nNode = *pSttNdIdx;
- pPam->GetPoint()->nContent.Assign( pTextNode, nStt );
+ m_pPam->GetPoint()->nNode = *m_pSttNdIdx;
+ m_pPam->GetPoint()->nContent.Assign( pTextNode, nStt );
}
#if OSL_DEBUG_LEVEL > 0
// !!! sollte nicht moeglich sein, oder ??
-OSL_ENSURE( pSttNdIdx->GetIndex()+1 != pPam->GetBound().nNode.GetIndex(),
+OSL_ENSURE( m_pSttNdIdx->GetIndex()+1 != m_pPam->GetBound().nNode.GetIndex(),
"Pam.Bound1 steht noch im Node" );
-OSL_ENSURE( pSttNdIdx->GetIndex()+1 != pPam->GetBound( false ).nNode.GetIndex(),
+OSL_ENSURE( m_pSttNdIdx->GetIndex()+1 != m_pPam->GetBound( false ).nNode.GetIndex(),
"Pam.Bound2 steht noch im Node" );
-if( pSttNdIdx->GetIndex()+1 == pPam->GetBound().nNode.GetIndex() )
+if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound().nNode.GetIndex() )
{
- const sal_Int32 nCntPos = pPam->GetBound().nContent.GetIndex();
- pPam->GetBound().nContent.Assign( pTextNode,
+ const sal_Int32 nCntPos = m_pPam->GetBound().nContent.GetIndex();
+ m_pPam->GetBound().nContent.Assign( pTextNode,
pTextNode->GetText().getLength() + nCntPos );
}
-if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
+if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound( false ).nNode.GetIndex() )
{
- const sal_Int32 nCntPos = pPam->GetBound( false ).nContent.GetIndex();
- pPam->GetBound( false ).nContent.Assign( pTextNode,
+ const sal_Int32 nCntPos = m_pPam->GetBound( false ).nContent.GetIndex();
+ m_pPam->GetBound( false ).nContent.Assign( pTextNode,
pTextNode->GetText().getLength() + nCntPos );
}
#endif
@@ -732,7 +732,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
if( SVPAR_ACCEPTED == eState )
{
- if( nMissingImgMaps )
+ if( m_nMissingImgMaps )
{
// es fehlen noch ein paar Image-Map zuordungen.
// vielleicht sind die Image-Maps ja jetzt da?
@@ -740,7 +740,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
}
// jetzt noch den letzten ueberfluessigen Absatz loeschen
- SwPosition* pPos = pPam->GetPoint();
+ SwPosition* pPos = m_pPam->GetPoint();
if( !pPos->nContent.GetIndex() && !bLFStripped )
{
SwTextNode* pAktNd;
@@ -751,13 +751,13 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
if( IsNewDoc() )
{
- const SwNode *pPrev = pDoc->GetNodes()[nNodeIdx -1];
- if( !pPam->GetPoint()->nContent.GetIndex() &&
+ const SwNode *pPrev = m_pDoc->GetNodes()[nNodeIdx -1];
+ if( !m_pPam->GetPoint()->nContent.GetIndex() &&
( pPrev->IsContentNode() ||
(pPrev->IsEndNode() &&
pPrev->StartOfSectionNode()->IsSectionNode()) ) )
{
- SwContentNode* pCNd = pPam->GetContentNode();
+ SwContentNode* pCNd = m_pPam->GetContentNode();
if( pCNd && pCNd->StartOfSectionIndex()+2 <
pCNd->EndOfSectionIndex() && !bHasFlysOrMarks )
{
@@ -773,27 +773,27 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
pCrsrSh->SetMark();
pCrsrSh->ClearMark();
}
- pPam->GetBound().nContent.Assign( 0, 0 );
- pPam->GetBound(false).nContent.Assign( 0, 0 );
- pDoc->GetNodes().Delete( pPam->GetPoint()->nNode );
+ m_pPam->GetBound().nContent.Assign( 0, 0 );
+ m_pPam->GetBound(false).nContent.Assign( 0, 0 );
+ m_pDoc->GetNodes().Delete( m_pPam->GetPoint()->nNode );
}
}
}
- else if( 0 != ( pAktNd = pDoc->GetNodes()[ nNodeIdx ]->GetTextNode()) && !bHasFlysOrMarks )
+ else if( 0 != ( pAktNd = m_pDoc->GetNodes()[ nNodeIdx ]->GetTextNode()) && !bHasFlysOrMarks )
{
if( pAktNd->CanJoinNext( &pPos->nNode ))
{
SwTextNode* pNextNd = pPos->nNode.GetNode().GetTextNode();
pPos->nContent.Assign( pNextNd, 0 );
- pPam->SetMark(); pPam->DeleteMark();
+ m_pPam->SetMark(); m_pPam->DeleteMark();
pNextNd->JoinPrev();
}
else if (pAktNd->GetText().isEmpty())
{
pPos->nContent.Assign( 0, 0 );
- pPam->SetMark(); pPam->DeleteMark();
- pDoc->GetNodes().Delete( pPos->nNode );
- pPam->Move( fnMoveBackward );
+ m_pPam->SetMark(); m_pPam->DeleteMark();
+ m_pDoc->GetNodes().Delete( pPos->nNode );
+ m_pPam->Move( fnMoveBackward );
}
}
}
@@ -802,11 +802,11 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
else if( !IsNewDoc() )
{
if( pPos->nContent.GetIndex() ) // dann gabs am Ende kein <P>,
- pPam->Move( fnMoveForward, fnGoNode ); // als zum naechsten Node
+ m_pPam->Move( fnMoveForward, fnGoNode ); // als zum naechsten Node
SwTextNode* pTextNode = pPos->nNode.GetNode().GetTextNode();
SwNodeIndex aPrvIdx( pPos->nNode );
if( pTextNode && pTextNode->CanJoinPrev( &aPrvIdx ) &&
- *pSttNdIdx <= aPrvIdx )
+ *m_pSttNdIdx <= aPrvIdx )
{
// eigentlich muss hier ein JoinNext erfolgen, aber alle Cursor
// usw. sind im pTextNode angemeldet, so dass der bestehen
@@ -822,10 +822,10 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
if( pPrev->HasSwAttrSet() )
pTextNode->SetAttr( *pPrev->GetpSwAttrSet() );
- if( &pPam->GetBound().nNode.GetNode() == pPrev )
- pPam->GetBound().nContent.Assign( pTextNode, 0 );
- if( &pPam->GetBound(false).nNode.GetNode() == pPrev )
- pPam->GetBound(false).nContent.Assign( pTextNode, 0 );
+ if( &m_pPam->GetBound().nNode.GetNode() == pPrev )
+ m_pPam->GetBound().nContent.Assign( pTextNode, 0 );
+ if( &m_pPam->GetBound(false).nNode.GetNode() == pPrev )
+ m_pPam->GetBound(false).nContent.Assign( pTextNode, 0 );
pTextNode->JoinPrev();
}
@@ -834,7 +834,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
// adjust AutoLoad in DocumentProperties
if( IsNewDoc() )
{
- SwDocShell *pDocShell(pDoc->GetDocShell());
+ SwDocShell *pDocShell(m_pDoc->GetDocShell());
OSL_ENSURE(pDocShell, "no SwDocShell");
if (pDocShell) {
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
@@ -845,28 +845,28 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
if ( xDocProps.is() && (xDocProps->getAutoloadSecs() > 0) &&
(xDocProps->getAutoloadURL().isEmpty()) )
{
- xDocProps->setAutoloadURL(aPathToFile);
+ xDocProps->setAutoloadURL(m_aPathToFile);
}
}
}
- if( bUpdateDocStat )
+ if( m_bUpdateDocStat )
{
- pDoc->getIDocumentStatistics().UpdateDocStat( false, true );
+ m_pDoc->getIDocumentStatistics().UpdateDocStat( false, true );
}
}
if( SVPAR_PENDING != GetStatus() )
- delete pSttNdIdx, pSttNdIdx = 0;
+ delete m_pSttNdIdx, m_pSttNdIdx = 0;
// sollte der Parser der Letzte sein, der das Doc haelt, dann braucht
// man hier auch nichts mehr tun, Doc wird gleich zerstoert!
- if( 1 < pDoc->getReferenceCount() )
+ if( 1 < m_pDoc->getReferenceCount() )
{
if( bWasUndo )
{
- pDoc->GetIDocumentUndoRedo().DelAllUndoObj();
- pDoc->GetIDocumentUndoRedo().DoUndo(true);
+ m_pDoc->GetIDocumentUndoRedo().DelAllUndoObj();
+ m_pDoc->GetIDocumentUndoRedo().DoUndo(true);
}
else if( !pInitVSh )
{
@@ -877,17 +877,17 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
SwViewShell *pTmpVSh = CheckActionViewShell();
if( pTmpVSh )
{
- pDoc->GetIDocumentUndoRedo().DoUndo(true);
+ m_pDoc->GetIDocumentUndoRedo().DoUndo(true);
}
}
- pDoc->SetOle2Link( aOLELink );
+ m_pDoc->SetOle2Link( aOLELink );
if( !bModified )
- pDoc->getIDocumentState().ResetModified();
- if( bSetModEnabled && pDoc->GetDocShell() )
+ m_pDoc->getIDocumentState().ResetModified();
+ if( m_bSetModEnabled && m_pDoc->GetDocShell() )
{
- pDoc->GetDocShell()->EnableSetModified();
- bSetModEnabled = false; // this is unnecessary here
+ m_pDoc->GetDocShell()->EnableSetModified();
+ m_bSetModEnabled = false; // this is unnecessary here
}
}
@@ -919,8 +919,8 @@ void SwHTMLParser::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
void SwHTMLParser::DocumentDetected()
{
- OSL_ENSURE( !bDocInitalized, "DocumentDetected mehrfach aufgerufen" );
- bDocInitalized = true;
+ OSL_ENSURE( !m_bDocInitalized, "DocumentDetected mehrfach aufgerufen" );
+ m_bDocInitalized = true;
if( IsNewDoc() )
{
if( IsInHeader() )
@@ -928,7 +928,7 @@ void SwHTMLParser::DocumentDetected()
CallEndAction( true );
- pDoc->GetIDocumentUndoRedo().DoUndo(false);
+ m_pDoc->GetIDocumentUndoRedo().DoUndo(false);
// Durch das DocumentDetected wurde im allgemeinen eine
// SwViewShell angelegt. Es kann aber auch sein, dass sie
// erst spaeter angelegt wird, naemlich dann, wenn die UI
@@ -940,20 +940,20 @@ void SwHTMLParser::DocumentDetected()
// is called for every token that is recognised in CallParser
void SwHTMLParser::NextToken( int nToken )
{
- if( ( pDoc->GetDocShell() && pDoc->GetDocShell()->IsAbortingImport() )
- || 1 == pDoc->getReferenceCount() )
+ if( ( m_pDoc->GetDocShell() && m_pDoc->GetDocShell()->IsAbortingImport() )
+ || 1 == m_pDoc->getReferenceCount() )
{
// Was the import cancelled by SFX? If a pending stack
// exists, clean it.
eState = SVPAR_ERROR;
- OSL_ENSURE( !pPendStack || pPendStack->nToken,
+ OSL_ENSURE( !m_pPendStack || m_pPendStack->nToken,
"SwHTMLParser::NextToken: Pending-Stack without token" );
- if( 1 == pDoc->getReferenceCount() || !pPendStack )
+ if( 1 == m_pDoc->getReferenceCount() || !m_pPendStack )
return ;
}
#if OSL_DEBUG_LEVEL > 0
- if( pPendStack )
+ if( m_pPendStack )
{
switch( nToken )
{
@@ -969,7 +969,7 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_SELECT_OFF:
break;
default:
- OSL_ENSURE( !pPendStack, "Unbekanntes Token fuer Pending-Stack" );
+ OSL_ENSURE( !m_pPendStack, "Unbekanntes Token fuer Pending-Stack" );
break;
}
}
@@ -978,56 +978,56 @@ void SwHTMLParser::NextToken( int nToken )
// The following special cases have to be treated before the
// filter detection, because Netscape doesn't reference the content
// of the title for filter detection either.
- if( !pPendStack )
+ if( !m_pPendStack )
{
- if( bInTitle )
+ if( m_bInTitle )
{
switch( nToken )
{
case HTML_TITLE_OFF:
- if( IsNewDoc() && !sTitle.isEmpty() )
+ if( IsNewDoc() && !m_sTitle.isEmpty() )
{
- if( pDoc->GetDocShell() ) {
+ if( m_pDoc->GetDocShell() ) {
uno::Reference<document::XDocumentPropertiesSupplier>
- xDPS(pDoc->GetDocShell()->GetModel(),
+ xDPS(m_pDoc->GetDocShell()->GetModel(),
uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentProperties> xDocProps(
xDPS->getDocumentProperties());
OSL_ENSURE(xDocProps.is(), "no DocumentProperties");
if (xDocProps.is()) {
- xDocProps->setTitle(sTitle);
+ xDocProps->setTitle(m_sTitle);
}
- pDoc->GetDocShell()->SetTitle( sTitle );
+ m_pDoc->GetDocShell()->SetTitle( m_sTitle );
}
}
- bInTitle = false;
- sTitle.clear();
+ m_bInTitle = false;
+ m_sTitle.clear();
break;
case HTML_NONBREAKSPACE:
- sTitle += " ";
+ m_sTitle += " ";
break;
case HTML_SOFTHYPH:
- sTitle += "-";
+ m_sTitle += "-";
break;
case HTML_TEXTTOKEN:
- sTitle += aToken;
+ m_sTitle += aToken;
break;
default:
- sTitle += "<";
+ m_sTitle += "<";
if( (HTML_TOKEN_ONOFF & nToken) && (1 & nToken) )
- sTitle += "/";
- sTitle += sSaveToken;
+ m_sTitle += "/";
+ m_sTitle += sSaveToken;
if( !aToken.isEmpty() )
{
- sTitle += " ";
- sTitle += aToken;
+ m_sTitle += " ";
+ m_sTitle += aToken;
}
- sTitle += ">";
+ m_sTitle += ">";
break;
}
@@ -1038,39 +1038,39 @@ void SwHTMLParser::NextToken( int nToken )
// Find out what type of document it is if we don't know already.
// For Controls this has to be finished before the control is inserted
// because for inserting a View is needed.
- if( !bDocInitalized )
+ if( !m_bDocInitalized )
DocumentDetected();
bool bGetIDOption = false, bInsertUnknown = false;
- bool bUpperSpaceSave = bUpperSpace;
- bUpperSpace = false;
+ bool bUpperSpaceSave = m_bUpperSpace;
+ m_bUpperSpace = false;
// The following special cases may or have to be treated after the
// filter detection
- if( !pPendStack )
+ if( !m_pPendStack )
{
- if( bInFloatingFrame )
+ if( m_bInFloatingFrame )
{
// <SCRIPT> is ignored here (from us), because it is ignored in
// Applets as well
if( HTML_IFRAME_OFF == nToken )
{
- bCallNextToken = false;
+ m_bCallNextToken = false;
EndFloatingFrame();
}
return;
}
- else if( bInNoEmbed )
+ else if( m_bInNoEmbed )
{
switch( nToken )
{
case HTML_NOEMBED_OFF:
- aContents = convertLineEnd(aContents, GetSystemLineEnd());
- InsertComment( aContents, OOO_STRING_SVTOOLS_HTML_noembed );
- aContents.clear();
- bCallNextToken = false;
- bInNoEmbed = false;
+ m_aContents = convertLineEnd(m_aContents, GetSystemLineEnd());
+ InsertComment( m_aContents, OOO_STRING_SVTOOLS_HTML_noembed );
+ m_aContents.clear();
+ m_bCallNextToken = false;
+ m_bInNoEmbed = false;
break;
case HTML_RAWDATA:
@@ -1084,7 +1084,7 @@ void SwHTMLParser::NextToken( int nToken )
return;
}
- else if( pAppletImpl )
+ else if( m_pAppletImpl )
{
// in an applet only <PARAM> tags and the </APPLET> tag
// are of interest for us (for the moment)
@@ -1093,11 +1093,11 @@ void SwHTMLParser::NextToken( int nToken )
switch( nToken )
{
case HTML_APPLET_OFF:
- bCallNextToken = false;
+ m_bCallNextToken = false;
EndApplet();
break;
case HTML_OBJECT_OFF:
- bCallNextToken = false;
+ m_bCallNextToken = false;
EndObject();
break;
@@ -1108,7 +1108,7 @@ void SwHTMLParser::NextToken( int nToken )
return;
}
- else if( bTextArea )
+ else if( m_bTextArea )
{
// in a TextArea everything up to </TEXTAREA> is inserted as text.
// <SCRIPT> is ignored here (from Netscape)!
@@ -1116,7 +1116,7 @@ void SwHTMLParser::NextToken( int nToken )
switch( nToken )
{
case HTML_TEXTAREA_OFF:
- bCallNextToken = false;
+ m_bCallNextToken = false;
EndTextArea();
break;
@@ -1127,13 +1127,13 @@ void SwHTMLParser::NextToken( int nToken )
return;
}
- else if( bSelect )
+ else if( m_bSelect )
{
// HAS to be treated after bNoScript!
switch( nToken )
{
case HTML_SELECT_OFF:
- bCallNextToken = false;
+ m_bCallNextToken = false;
EndSelect();
return;
@@ -1159,7 +1159,7 @@ void SwHTMLParser::NextToken( int nToken )
return;
}
}
- else if( pMarquee )
+ else if( m_pMarquee )
{
// in a TextArea everything up to </TEXTAREA> is inserted as text.
// The <SCRIPT> tags are ignored from MS-IE, we ignore the whole
@@ -1167,7 +1167,7 @@ void SwHTMLParser::NextToken( int nToken )
switch( nToken )
{
case HTML_MARQUEE_OFF:
- bCallNextToken = false;
+ m_bCallNextToken = false;
EndMarquee();
break;
@@ -1178,12 +1178,12 @@ void SwHTMLParser::NextToken( int nToken )
return;
}
- else if( bInField )
+ else if( m_bInField )
{
switch( nToken )
{
case HTML_SDFIELD_OFF:
- bCallNextToken = false;
+ m_bCallNextToken = false;
EndField();
break;
@@ -1194,13 +1194,13 @@ void SwHTMLParser::NextToken( int nToken )
return;
}
- else if( bInFootEndNoteAnchor || bInFootEndNoteSymbol )
+ else if( m_bInFootEndNoteAnchor || m_bInFootEndNoteSymbol )
{
switch( nToken )
{
case HTML_ANCHOR_OFF:
EndAnchor();
- bCallNextToken = false;
+ m_bCallNextToken = false;
break;
case HTML_TEXTTOKEN:
@@ -1209,21 +1209,21 @@ void SwHTMLParser::NextToken( int nToken )
}
return;
}
- else if( !aUnknownToken.isEmpty() )
+ else if( !m_aUnknownToken.isEmpty() )
{
// Paste content of unknown tags.
// (but surely if we are not in the header section) fdo#36080 fdo#34666
if (!aToken.isEmpty() && !IsInHeader() )
{
- if( !bDocInitalized )
+ if( !m_bDocInitalized )
DocumentDetected();
- pDoc->getIDocumentContentOperations().InsertString( *pPam, aToken );
+ m_pDoc->getIDocumentContentOperations().InsertString( *m_pPam, aToken );
// if there are temporary paragraph attributes and the
// paragraph isn't empty then the paragraph attributes
// are final.
- if( !aParaAttrs.empty() )
- aParaAttrs.clear();
+ if( !m_aParaAttrs.empty() )
+ m_aParaAttrs.clear();
SetAttr();
}
@@ -1233,19 +1233,19 @@ void SwHTMLParser::NextToken( int nToken )
switch( nToken )
{
case HTML_UNKNOWNCONTROL_OFF:
- if( aUnknownToken != sSaveToken )
+ if( m_aUnknownToken != sSaveToken )
return;
//fall-through
case HTML_FRAMESET_ON:
case HTML_HEAD_OFF:
case HTML_BODY_ON:
case HTML_IMAGE: // Don't know why Netscape acts this way.
- aUnknownToken.clear();
+ m_aUnknownToken.clear();
break;
case HTML_TEXTTOKEN:
return;
default:
- aUnknownToken.clear();
+ m_aUnknownToken.clear();
break;
}
}
@@ -1254,10 +1254,10 @@ void SwHTMLParser::NextToken( int nToken )
switch( nToken )
{
case HTML_BODY_ON:
- if( !aStyleSource.isEmpty() )
+ if( !m_aStyleSource.isEmpty() )
{
- pCSS1Parser->ParseStyleSheet( aStyleSource );
- aStyleSource.clear();
+ m_pCSS1Parser->ParseStyleSheet( m_aStyleSource );
+ m_aStyleSource.clear();
}
if( IsNewDoc() )
{
@@ -1265,14 +1265,14 @@ void SwHTMLParser::NextToken( int nToken )
// If there is a template for the first or the right page,
// it is set here.
const SwPageDesc *pPageDesc = 0;
- if( pCSS1Parser->IsSetFirstPageDesc() )
- pPageDesc = pCSS1Parser->GetFirstPageDesc();
- else if( pCSS1Parser->IsSetRightPageDesc() )
- pPageDesc = pCSS1Parser->GetRightPageDesc();
+ if( m_pCSS1Parser->IsSetFirstPageDesc() )
+ pPageDesc = m_pCSS1Parser->GetFirstPageDesc();
+ else if( m_pCSS1Parser->IsSetRightPageDesc() )
+ pPageDesc = m_pCSS1Parser->GetRightPageDesc();
if( pPageDesc )
{
- pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, SwFormatPageDesc( pPageDesc ) );
+ m_pDoc->getIDocumentContentOperations().InsertPoolItem( *m_pPam, SwFormatPageDesc( pPageDesc ) );
}
}
break;
@@ -1290,12 +1290,12 @@ void SwHTMLParser::NextToken( int nToken )
switch( rOption.GetToken() )
{
case HTML_O_HREF:
- sBaseURL = rOption.GetString();
+ m_sBaseURL = rOption.GetString();
break;
case HTML_O_TARGET:
if( IsNewDoc() )
{
- SwDocShell *pDocShell(pDoc->GetDocShell());
+ SwDocShell *pDocShell(m_pDoc->GetDocShell());
OSL_ENSURE(pDocShell, "no SwDocShell");
if (pDocShell) {
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
@@ -1320,11 +1320,11 @@ void SwHTMLParser::NextToken( int nToken )
SvKeyValueIterator *pHTTPHeader = 0;
if( IsNewDoc() )
{
- SwDocShell *pDocSh = pDoc->GetDocShell();
+ SwDocShell *pDocSh = m_pDoc->GetDocShell();
if( pDocSh )
pHTTPHeader = pDocSh->GetHeaderAttributes();
}
- SwDocShell *pDocShell(pDoc->GetDocShell());
+ SwDocShell *pDocShell(m_pDoc->GetDocShell());
OSL_ENSURE(pDocShell, "no SwDocShell");
if (pDocShell)
{
@@ -1342,7 +1342,7 @@ void SwHTMLParser::NextToken( int nToken )
break;
case HTML_TITLE_ON:
- bInTitle = true;
+ m_bInTitle = true;
break;
case HTML_SCRIPT_ON:
@@ -1367,7 +1367,7 @@ void SwHTMLParser::NextToken( int nToken )
break;
case HTML_RAWDATA:
- if( !bIgnoreRawData )
+ if( !m_bIgnoreRawData )
{
if( IsReadScript() )
{
@@ -1375,9 +1375,9 @@ void SwHTMLParser::NextToken( int nToken )
}
else if( IsReadStyle() )
{
- if( !aStyleSource.isEmpty() )
- aStyleSource += "\n";
- aStyleSource += aToken;
+ if( !m_aStyleSource.isEmpty() )
+ m_aStyleSource += "\n";
+ m_aStyleSource += aToken;
}
}
break;
@@ -1385,20 +1385,20 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_OBJECT_ON:
#if HAVE_FEATURE_JAVA
NewObject();
- bCallNextToken = pAppletImpl!=0 && pTable!=0;
+ m_bCallNextToken = m_pAppletImpl!=0 && m_pTable!=0;
#endif
break;
case HTML_APPLET_ON:
#if HAVE_FEATURE_JAVA
InsertApplet();
- bCallNextToken = pAppletImpl!=0 && pTable!=0;
+ m_bCallNextToken = m_pAppletImpl!=0 && m_pTable!=0;
#endif
break;
case HTML_IFRAME_ON:
InsertFloatingFrame();
- bCallNextToken = bInFloatingFrame && pTable!=0;
+ m_bCallNextToken = m_bInFloatingFrame && m_pTable!=0;
break;
case HTML_LINEBREAK:
@@ -1415,7 +1415,7 @@ void SwHTMLParser::NextToken( int nToken )
// CR in PRE/LISTING/XMP
{
if( HTML_NEWPARA==nToken ||
- pPam->GetPoint()->nContent.GetIndex() )
+ m_pPam->GetPoint()->nContent.GetIndex() )
{
AppendTextNode(); // there is no LF at this place
// therefore it will cause no problems
@@ -1423,25 +1423,25 @@ void SwHTMLParser::NextToken( int nToken )
}
// progress bar
if( !GetMedium() || !GetMedium()->IsRemote() )
- ::SetProgressState( rInput.Tell(), pDoc->GetDocShell() );
+ ::SetProgressState( rInput.Tell(), m_pDoc->GetDocShell() );
}
break;
case HTML_NONBREAKSPACE:
- pDoc->getIDocumentContentOperations().InsertString( *pPam, OUString(CHAR_HARDBLANK) );
+ m_pDoc->getIDocumentContentOperations().InsertString( *m_pPam, OUString(CHAR_HARDBLANK) );
break;
case HTML_SOFTHYPH:
- pDoc->getIDocumentContentOperations().InsertString( *pPam, OUString(CHAR_SOFTHYPHEN) );
+ m_pDoc->getIDocumentContentOperations().InsertString( *m_pPam, OUString(CHAR_SOFTHYPHEN) );
break;
case HTML_LINEFEEDCHAR:
- if( pPam->GetPoint()->nContent.GetIndex() )
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode();
- if( !pTable && !pDoc->IsInHeaderFooter( pPam->GetPoint()->nNode ) )
+ if( !m_pTable && !m_pDoc->IsInHeaderFooter( m_pPam->GetPoint()->nNode ) )
{
- NewAttr( &aAttrTab.pBreak, SvxFormatBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK) );
- EndAttr( aAttrTab.pBreak, 0, false );
+ NewAttr( &m_aAttrTab.pBreak, SvxFormatBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK) );
+ EndAttr( m_aAttrTab.pBreak, 0, false );
}
break;
@@ -1449,11 +1449,11 @@ void SwHTMLParser::NextToken( int nToken )
// insert string without spanning attributes at the end.
if( !aToken.isEmpty() && ' '==aToken[0] && !IsReadPRE() )
{
- sal_Int32 nPos = pPam->GetPoint()->nContent.GetIndex();
+ sal_Int32 nPos = m_pPam->GetPoint()->nContent.GetIndex();
if( nPos )
{
const OUString& rText =
- pPam->GetPoint()->nNode.GetNode().GetTextNode()->GetText();
+ m_pPam->GetPoint()->nNode.GetNode().GetTextNode()->GetText();
sal_Unicode cLast = rText[--nPos];
if( ' ' == cLast || '\x0a' == cLast)
aToken = aToken.copy(1);
@@ -1463,22 +1463,22 @@ void SwHTMLParser::NextToken( int nToken )
if( aToken.isEmpty() )
{
- bUpperSpace = bUpperSpaceSave;
+ m_bUpperSpace = bUpperSpaceSave;
break;
}
}
if( !aToken.isEmpty() )
{
- if( !bDocInitalized )
+ if( !m_bDocInitalized )
DocumentDetected();
- pDoc->getIDocumentContentOperations().InsertString( *pPam, aToken );
+ m_pDoc->getIDocumentContentOperations().InsertString( *m_pPam, aToken );
// if there are temporary paragraph attributes and the
// paragraph isn't empty then the paragraph attributes
// are final.
- if( !aParaAttrs.empty() )
- aParaAttrs.clear();
+ if( !m_aParaAttrs.empty() )
+ m_aParaAttrs.clear();
SetAttr();
}
@@ -1492,7 +1492,7 @@ void SwHTMLParser::NextToken( int nToken )
InsertImage();
// if only the parser references the doc, we can break and set
// an error code
- if( 1 == pDoc->getReferenceCount() )
+ if( 1 == m_pDoc->getReferenceCount() )
{
eState = SVPAR_ERROR;
}
@@ -1507,26 +1507,26 @@ void SwHTMLParser::NextToken( int nToken )
break;
case HTML_NOEMBED_ON:
- bInNoEmbed = true;
- bCallNextToken = pTable!=0;
+ m_bInNoEmbed = true;
+ m_bCallNextToken = m_pTable!=0;
ReadRawData( OOO_STRING_SVTOOLS_HTML_noembed );
break;
case HTML_DEFLIST_ON:
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
EndPara();
NewDefList();
break;
case HTML_DEFLIST_OFF:
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
EndPara();
- EndDefListItem( 0, false, 1==nDefListDeep );
+ EndDefListItem( 0, false, 1==m_nDefListDeep );
EndDefList();
break;
case HTML_DD_ON:
case HTML_DT_ON:
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
EndPara();
EndDefListItem( 0, false );// close <DD>/<DT> and set no template
NewDefListItem( nToken );
@@ -1543,10 +1543,10 @@ void SwHTMLParser::NextToken( int nToken )
// divisions
case HTML_DIVISION_ON:
case HTML_CENTER_ON:
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
{
if( IsReadPRE() )
- nOpenParaToken = 0;
+ m_nOpenParaToken = 0;
else
EndPara();
}
@@ -1555,10 +1555,10 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_DIVISION_OFF:
case HTML_CENTER_OFF:
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
{
if( IsReadPRE() )
- nOpenParaToken = 0;
+ m_nOpenParaToken = 0;
else
EndPara();
}
@@ -1566,20 +1566,20 @@ void SwHTMLParser::NextToken( int nToken )
break;
case HTML_MULTICOL_ON:
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
EndPara();
NewMultiCol();
break;
case HTML_MULTICOL_OFF:
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
EndPara();
EndTag( HTML_MULTICOL_ON );
break;
case HTML_MARQUEE_ON:
NewMarquee();
- bCallNextToken = pMarquee!=0 && pTable!=0;
+ m_bCallNextToken = m_pMarquee!=0 && m_pTable!=0;
break;
case HTML_FORM_ON:
@@ -1591,7 +1591,7 @@ void SwHTMLParser::NextToken( int nToken )
// templates
case HTML_PARABREAK_ON:
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
EndPara( true );
NewPara();
break;
@@ -1601,27 +1601,27 @@ void SwHTMLParser::NextToken( int nToken )
break;
case HTML_ADDRESS_ON:
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
EndPara();
NewTextFormatColl( HTML_ADDRESS_ON, RES_POOLCOLL_SENDADRESS );
break;
case HTML_ADDRESS_OFF:
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
EndPara();
EndTextFormatColl( HTML_ADDRESS_OFF );
break;
case HTML_BLOCKQUOTE_ON:
case HTML_BLOCKQUOTE30_ON:
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
EndPara();
NewTextFormatColl( HTML_BLOCKQUOTE_ON, RES_POOLCOLL_HTML_BLOCKQUOTE );
break;
case HTML_BLOCKQUOTE_OFF:
case HTML_BLOCKQUOTE30_OFF:
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
EndPara();
EndTextFormatColl( HTML_BLOCKQUOTE_ON );
break;
@@ -1629,13 +1629,13 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_PREFORMTXT_ON:
case HTML_LISTING_ON:
case HTML_XMP_ON:
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
EndPara();
NewTextFormatColl( nToken, RES_POOLCOLL_HTML_PRE );
break;
case HTML_PREFORMTXT_OFF:
- bNoParSpace = true; // the last PRE-paragraph gets a spacing
+ m_bNoParSpace = true; // the last PRE-paragraph gets a spacing
EndTextFormatColl( HTML_PREFORMTXT_OFF );
break;
@@ -1650,10 +1650,10 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_HEAD4_ON:
case HTML_HEAD5_ON:
case HTML_HEAD6_ON:
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
{
if( IsReadPRE() )
- nOpenParaToken = 0;
+ m_nOpenParaToken = 0;
else
EndPara();
}
@@ -1670,29 +1670,29 @@ void SwHTMLParser::NextToken( int nToken )
break;
case HTML_TABLE_ON:
- if( pPendStack )
+ if( m_pPendStack )
BuildTable( SVX_ADJUST_END );
else
{
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
EndPara();
- OSL_ENSURE( !pTable, "table in table not allowed here" );
- if( !pTable && (IsNewDoc() || !pPam->GetNode().FindTableNode()) &&
- (pPam->GetPoint()->nNode.GetIndex() >
- pDoc->GetNodes().GetEndOfExtras().GetIndex() ||
- !pPam->GetNode().FindFootnoteStartNode() ) )
+ OSL_ENSURE( !m_pTable, "table in table not allowed here" );
+ if( !m_pTable && (IsNewDoc() || !m_pPam->GetNode().FindTableNode()) &&
+ (m_pPam->GetPoint()->nNode.GetIndex() >
+ m_pDoc->GetNodes().GetEndOfExtras().GetIndex() ||
+ !m_pPam->GetNode().FindFootnoteStartNode() ) )
{
- if ( nParaCnt < 5 )
+ if ( m_nParaCnt < 5 )
Show(); // show what we have up to here
- SvxAdjust eAdjust = aAttrTab.pAdjust
- ? static_cast<const SvxAdjustItem&>(aAttrTab.pAdjust->GetItem()).
+ SvxAdjust eAdjust = m_aAttrTab.pAdjust
+ ? static_cast<const SvxAdjustItem&>(m_aAttrTab.pAdjust->GetItem()).
GetAdjust()
: SVX_ADJUST_END;
BuildTable( eAdjust );
}
else
- bInsertUnknown = bKeepUnknown;
+ bInsertUnknown = m_bKeepUnknown;
}
break;
@@ -1701,7 +1701,7 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_MENULIST_ON:
case HTML_ORDERLIST_ON:
case HTML_UNORDERLIST_ON:
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
EndPara();
NewNumBulList( nToken );
break;
@@ -1710,7 +1710,7 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_MENULIST_OFF:
case HTML_ORDERLIST_OFF:
case HTML_UNORDERLIST_OFF:
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
EndPara();
EndNumBulListItem( 0, true, GetNumInfo().GetDepth()==1 );
EndNumBulList( nToken );
@@ -1718,9 +1718,9 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_LI_ON:
case HTML_LISTHEADER_ON:
- if( nOpenParaToken &&
- (pPam->GetPoint()->nContent.GetIndex()
- || HTML_PARABREAK_ON==nOpenParaToken) )
+ if( m_nOpenParaToken &&
+ (m_pPam->GetPoint()->nContent.GetIndex()
+ || HTML_PARABREAK_ON==m_nOpenParaToken) )
{
// only finish paragraph for <P><LI>, not for <DD><LI>
EndPara();
@@ -1742,9 +1742,9 @@ void SwHTMLParser::NextToken( int nToken )
SvxPostureItem aPostureCJK( ITALIC_NORMAL, RES_CHRATR_CJK_POSTURE );
SvxPostureItem aPostureCTL( ITALIC_NORMAL, RES_CHRATR_CTL_POSTURE );
NewStdAttr( HTML_ITALIC_ON,
- &aAttrTab.pItalic, aPosture,
- &aAttrTab.pItalicCJK, &aPostureCJK,
- &aAttrTab.pItalicCTL, &aPostureCTL );
+ &m_aAttrTab.pItalic, aPosture,
+ &m_aAttrTab.pItalicCJK, &aPostureCJK,
+ &m_aAttrTab.pItalicCTL, &aPostureCTL );
}
break;
@@ -1754,44 +1754,44 @@ void SwHTMLParser::NextToken( int nToken )
SvxWeightItem aWeightCJK( WEIGHT_BOLD, RES_CHRATR_CJK_WEIGHT );
SvxWeightItem aWeightCTL( WEIGHT_BOLD, RES_CHRATR_CTL_WEIGHT );
NewStdAttr( HTML_BOLD_ON,
- &aAttrTab.pBold, aWeight,
- &aAttrTab.pBoldCJK, &aWeightCJK,
- &aAttrTab.pBoldCTL, &aWeightCTL );
+ &m_aAttrTab.pBold, aWeight,
+ &m_aAttrTab.pBoldCJK, &aWeightCJK,
+ &m_aAttrTab.pBoldCTL, &aWeightCTL );
}
break;
case HTML_STRIKE_ON:
case HTML_STRIKETHROUGH_ON:
{
- NewStdAttr( HTML_STRIKE_ON, &aAttrTab.pStrike,
+ NewStdAttr( HTML_STRIKE_ON, &m_aAttrTab.pStrike,
SvxCrossedOutItem(STRIKEOUT_SINGLE, RES_CHRATR_CROSSEDOUT) );
}
break;
case HTML_UNDERLINE_ON:
{
- NewStdAttr( HTML_UNDERLINE_ON, &aAttrTab.pUnderline,
+ NewStdAttr( HTML_UNDERLINE_ON, &m_aAttrTab.pUnderline,
SvxUnderlineItem(UNDERLINE_SINGLE, RES_CHRATR_UNDERLINE) );
}
break;
case HTML_SUPERSCRIPT_ON:
{
- NewStdAttr( HTML_SUPERSCRIPT_ON, &aAttrTab.pEscapement,
+ NewStdAttr( HTML_SUPERSCRIPT_ON, &m_aAttrTab.pEscapement,
SvxEscapementItem(HTML_ESC_SUPER,HTML_ESC_PROP, RES_CHRATR_ESCAPEMENT) );
}
break;
case HTML_SUBSCRIPT_ON:
{
- NewStdAttr( HTML_SUBSCRIPT_ON, &aAttrTab.pEscapement,
+ NewStdAttr( HTML_SUBSCRIPT_ON, &m_aAttrTab.pEscapement,
SvxEscapementItem(HTML_ESC_SUB,HTML_ESC_PROP, RES_CHRATR_ESCAPEMENT) );
}
break;
case HTML_BLINK_ON:
{
- NewStdAttr( HTML_BLINK_ON, &aAttrTab.pBlink,
+ NewStdAttr( HTML_BLINK_ON, &m_aAttrTab.pBlink,
SvxBlinkItem( true, RES_CHRATR_BLINK ) );
}
break;
@@ -1855,7 +1855,7 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_SDFIELD_ON:
NewField();
- bCallNextToken = bInField && pTable!=0;
+ m_bCallNextToken = m_bInField && m_pTable!=0;
break;
case HTML_EMPHASIS_OFF:
@@ -1880,10 +1880,10 @@ void SwHTMLParser::NextToken( int nToken )
break;
case HTML_HEAD_OFF:
- if( !aStyleSource.isEmpty() )
+ if( !m_aStyleSource.isEmpty() )
{
- pCSS1Parser->ParseStyleSheet( aStyleSource );
- aStyleSource.clear();
+ m_pCSS1Parser->ParseStyleSheet( m_aStyleSource );
+ m_aStyleSource.clear();
}
break;
@@ -1902,14 +1902,14 @@ void SwHTMLParser::NextToken( int nToken )
if( HTML_O_DIR == rOption.GetToken() )
{
const OUString& rDir = rOption.GetString();
- SfxItemSet aItemSet( pDoc->GetAttrPool(),
- pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(),
+ m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
OUString aDummy;
ParseStyleOptions( aDummy, aDummy, aDummy, aItemSet,
aPropInfo, 0, &rDir );
- pCSS1Parser->SetPageDescAttrs( 0, &aItemSet );
+ m_pCSS1Parser->SetPageDescAttrs( 0, &aItemSet );
break;
}
}
@@ -1922,12 +1922,12 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_TEXTAREA_ON:
NewTextArea();
- bCallNextToken = bTextArea && pTable!=0;
+ m_bCallNextToken = m_bTextArea && m_pTable!=0;
break;
case HTML_SELECT_ON:
NewSelect();
- bCallNextToken = bSelect && pTable!=0;
+ m_bCallNextToken = m_bSelect && m_pTable!=0;
break;
case HTML_ANCHOR_ON:
@@ -1939,7 +1939,7 @@ void SwHTMLParser::NextToken( int nToken )
break;
case HTML_COMMENT:
- if( ( aToken.getLength() > 5 ) && ( ! bIgnoreHTMLComments ) )
+ if( ( aToken.getLength() > 5 ) && ( ! m_bIgnoreHTMLComments ) )
{
// insert as Post-It
// If there are no space characters right behind
@@ -1964,40 +1964,40 @@ void SwHTMLParser::NextToken( int nToken )
// Areas are processed later. Nevertheless the
// ImageMap is inserted into the IMap-Array, because it might be used
// already.
- pImageMap = new ImageMap;
- if( ParseMapOptions( pImageMap) )
+ m_pImageMap = new ImageMap;
+ if( ParseMapOptions( m_pImageMap) )
{
if (!m_pImageMaps)
m_pImageMaps = new ImageMaps;
- m_pImageMaps->push_back(std::unique_ptr<ImageMap>(pImageMap));
+ m_pImageMaps->push_back(std::unique_ptr<ImageMap>(m_pImageMap));
}
else
{
- delete pImageMap;
- pImageMap = 0;
+ delete m_pImageMap;
+ m_pImageMap = 0;
}
break;
case HTML_MAP_OFF:
// there is no ImageMap anymore (don't delete IMap, because it's
// already contained in the array!)
- pImageMap = 0;
+ m_pImageMap = 0;
break;
case HTML_AREA:
- if( pImageMap )
- ParseAreaOptions( pImageMap, sBaseURL, SFX_EVENT_MOUSEOVER_OBJECT,
+ if( m_pImageMap )
+ ParseAreaOptions( m_pImageMap, m_sBaseURL, SFX_EVENT_MOUSEOVER_OBJECT,
SFX_EVENT_MOUSEOUT_OBJECT );
break;
case HTML_FRAMESET_ON:
- bInsertUnknown = bKeepUnknown;
+ bInsertUnknown = m_bKeepUnknown;
break;
case HTML_NOFRAMES_ON:
if( IsInHeader() )
FinishHeader( true );
- bInsertUnknown = bKeepUnknown;
+ bInsertUnknown = m_bKeepUnknown;
break;
case HTML_UNKNOWNCONTROL_ON:
@@ -2005,14 +2005,14 @@ void SwHTMLParser::NextToken( int nToken )
// does not start with a '!'.
// (but judging from the code, also if does not start with a '%')
// (and also if we're not somewhere we consider PRE)
- if( IsInHeader() && !IsReadPRE() && aUnknownToken.isEmpty() &&
+ if( IsInHeader() && !IsReadPRE() && m_aUnknownToken.isEmpty() &&
!sSaveToken.isEmpty() && '!' != sSaveToken[0] &&
'%' != sSaveToken[0] )
- aUnknownToken = sSaveToken;
+ m_aUnknownToken = sSaveToken;
// no break
default:
- bInsertUnknown = bKeepUnknown;
+ bInsertUnknown = m_bKeepUnknown;
break;
}
@@ -2036,8 +2036,8 @@ void SwHTMLParser::NextToken( int nToken )
// if there are temporary paragraph attributes and the
// paragraph isn't empty then the paragraph attributes are final.
- if( !aParaAttrs.empty() && pPam->GetPoint()->nContent.GetIndex() )
- aParaAttrs.clear();
+ if( !m_aParaAttrs.empty() && m_pPam->GetPoint()->nContent.GetIndex() )
+ m_aParaAttrs.clear();
}
static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr,
@@ -2092,13 +2092,13 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum )
eMode = AM_SPACE;
// die harten Attribute an diesem Absatz werden nie mehr ungueltig
- if( !aParaAttrs.empty() )
- aParaAttrs.clear();
+ if( !m_aParaAttrs.empty() )
+ m_aParaAttrs.clear();
if( AM_SPACE==eMode || AM_NOSPACE==eMode )
{
SwTextNode *pTextNode =
- pPam->GetPoint()->nNode.GetNode().GetTextNode();
+ m_pPam->GetPoint()->nNode.GetNode().GetTextNode();
const SvxULSpaceItem& rULSpace =
static_cast<const SvxULSpaceItem&>(pTextNode->SwContentNode::GetAttr( RES_UL_SPACE ));
@@ -2127,19 +2127,19 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum )
}
}
}
- bNoParSpace = AM_NOSPACE==eMode || AM_SOFTNOSPACE==eMode;
+ m_bNoParSpace = AM_NOSPACE==eMode || AM_SOFTNOSPACE==eMode;
- SwPosition aOldPos( *pPam->GetPoint() );
+ SwPosition aOldPos( *m_pPam->GetPoint() );
- bool bRet = pDoc->getIDocumentContentOperations().AppendTextNode( *pPam->GetPoint() );
+ bool bRet = m_pDoc->getIDocumentContentOperations().AppendTextNode( *m_pPam->GetPoint() );
// Zeichen-Attribute aufspalten und ggf keine setzen, die ueber den
// ganzen Absatz gesetzt sind
const SwNodeIndex& rEndIdx = aOldPos.nNode;
const sal_Int32 nEndCnt = aOldPos.nContent.GetIndex();
- const SwPosition& rPos = *pPam->GetPoint();
+ const SwPosition& rPos = *m_pPam->GetPoint();
- _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&aAttrTab);
+ _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&m_aAttrTab);
for (auto nCnt = sizeof(_HTMLAttrTable) / sizeof(_HTMLAttr*); nCnt--; ++pHTMLAttributes)
{
_HTMLAttr *pAttr = *pHTMLAttributes;
@@ -2190,9 +2190,9 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum )
if( !pNext || bWholePara )
{
if (pSetAttr->bInsAtStart)
- aSetAttrTab.push_front( pSetAttr );
+ m_aSetAttrTab.push_front( pSetAttr );
else
- aSetAttrTab.push_back( pSetAttr );
+ m_aSetAttrTab.push_back( pSetAttr );
}
else
pNext->InsertPrev( pSetAttr );
@@ -2221,9 +2221,9 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum )
if( !pNext || bWholePara )
{
if (pSetAttr->bInsAtStart)
- aSetAttrTab.push_front( pSetAttr );
+ m_aSetAttrTab.push_front( pSetAttr );
else
- aSetAttrTab.push_back( pSetAttr );
+ m_aSetAttrTab.push_back( pSetAttr );
}
else
pNext->InsertPrev( pSetAttr );
@@ -2237,9 +2237,9 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum )
if( !pNext || bWholePara )
{
if (pPrev->bInsAtStart)
- aSetAttrTab.push_front( pPrev );
+ m_aSetAttrTab.push_front( pPrev );
else
- aSetAttrTab.push_back( pPrev );
+ m_aSetAttrTab.push_back( pPrev );
}
else
pNext->InsertPrev( pPrev );
@@ -2262,7 +2262,7 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum )
SetNodeNum( nLvl, false );
}
else
- pPam->GetNode().GetTextNode()->ResetAttr( RES_PARATR_NUMRULE );
+ m_pPam->GetNode().GetTextNode()->ResetAttr( RES_PARATR_NUMRULE );
}
// Attrubute im Absatz davor sollte man jetzt setzen (wegen JavaScript)
@@ -2383,7 +2383,7 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum )
}
}
- if( !pTable && !--nParaCnt )
+ if( !m_pTable && !--m_nParaCnt )
Show();
return bRet;
@@ -2392,14 +2392,14 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum )
void SwHTMLParser::AddParSpace()
{
//If it already has ParSpace, return
- if( !bNoParSpace )
+ if( !m_bNoParSpace )
return;
- bNoParSpace = false;
+ m_bNoParSpace = false;
- sal_uLong nNdIdx = pPam->GetPoint()->nNode.GetIndex() - 1;
+ sal_uLong nNdIdx = m_pPam->GetPoint()->nNode.GetIndex() - 1;
- SwTextNode *pTextNode = pDoc->GetNodes()[nNdIdx]->GetTextNode();
+ SwTextNode *pTextNode = m_pDoc->GetNodes()[nNdIdx]->GetTextNode();
if( !pTextNode )
return;
@@ -2480,8 +2480,8 @@ void SwHTMLParser::Show()
Application::Reschedule();
- if( ( pDoc->GetDocShell() && pDoc->GetDocShell()->IsAbortingImport() )
- || 1 == pDoc->getReferenceCount() )
+ if( ( m_pDoc->GetDocShell() && m_pDoc->GetDocShell()->IsAbortingImport() )
+ || 1 == m_pDoc->getReferenceCount() )
{
// wurde der Import vom SFX abgebrochen?
eState = SVPAR_ERROR;
@@ -2495,7 +2495,7 @@ void SwHTMLParser::Show()
// eine groessere Schrittweite
if( pVSh )
{
- nParaCnt = (pPam->GetPoint()->nNode.GetNode().IsInVisibleArea(pVSh))
+ m_nParaCnt = (m_pPam->GetPoint()->nNode.GetNode().IsInVisibleArea(pVSh))
? 5 : 50;
}
}
@@ -2512,15 +2512,15 @@ void SwHTMLParser::ShowStatline()
// Laufbalkenanzeige
if( !GetMedium() || !GetMedium()->IsRemote() )
{
- ::SetProgressState( rInput.Tell(), pDoc->GetDocShell() );
+ ::SetProgressState( rInput.Tell(), m_pDoc->GetDocShell() );
CheckActionViewShell();
}
else
{
Application::Reschedule();
- if( ( pDoc->GetDocShell() && pDoc->GetDocShell()->IsAbortingImport() )
- || 1 == pDoc->getReferenceCount() )
+ if( ( m_pDoc->GetDocShell() && m_pDoc->GetDocShell()->IsAbortingImport() )
+ || 1 == m_pDoc->getReferenceCount() )
// wurde der Import vom SFX abgebrochen?
eState = SVPAR_ERROR;
@@ -2535,128 +2535,128 @@ void SwHTMLParser::ShowStatline()
SwViewShell *SwHTMLParser::CallStartAction( SwViewShell *pVSh, bool bChkPtr )
{
- OSL_ENSURE( !pActionViewShell, "CallStartAction: SwViewShell schon gesetzt" );
+ OSL_ENSURE( !m_pActionViewShell, "CallStartAction: SwViewShell schon gesetzt" );
if( !pVSh || bChkPtr )
{
#if OSL_DEBUG_LEVEL > 0
SwViewShell *pOldVSh = pVSh;
#endif
- pVSh = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
+ pVSh = m_pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
#if OSL_DEBUG_LEVEL > 0
OSL_ENSURE( !pVSh || !pOldVSh || pOldVSh == pVSh, "CallStartAction: Wer hat die SwViewShell ausgetauscht?" );
if( pOldVSh && !pVSh )
pVSh = 0;
#endif
}
- pActionViewShell = pVSh;
+ m_pActionViewShell = pVSh;
- if( pActionViewShell )
+ if( m_pActionViewShell )
{
- if( dynamic_cast< const SwEditShell *>( pActionViewShell ) != nullptr )
- static_cast<SwEditShell*>(pActionViewShell)->StartAction();
+ if( dynamic_cast< const SwEditShell *>( m_pActionViewShell ) != nullptr )
+ static_cast<SwEditShell*>(m_pActionViewShell)->StartAction();
else
- pActionViewShell->StartAction();
+ m_pActionViewShell->StartAction();
}
- return pActionViewShell;
+ return m_pActionViewShell;
}
SwViewShell *SwHTMLParser::CallEndAction( bool bChkAction, bool bChkPtr )
{
if( bChkPtr )
{
- SwViewShell *pVSh = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
- OSL_ENSURE( !pVSh || pActionViewShell == pVSh,
+ SwViewShell *pVSh = m_pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
+ OSL_ENSURE( !pVSh || m_pActionViewShell == pVSh,
"CallEndAction: Wer hat die SwViewShell ausgetauscht?" );
#if OSL_DEBUG_LEVEL > 0
- if( pActionViewShell && !pVSh )
+ if( m_pActionViewShell && !pVSh )
pVSh = 0;
#endif
- if( pVSh != pActionViewShell )
- pActionViewShell = 0;
+ if( pVSh != m_pActionViewShell )
+ m_pActionViewShell = 0;
}
- if( !pActionViewShell || (bChkAction && !pActionViewShell->ActionPend()) )
- return pActionViewShell;
+ if( !m_pActionViewShell || (bChkAction && !m_pActionViewShell->ActionPend()) )
+ return m_pActionViewShell;
- if( bSetCrsr )
+ if( m_bSetCrsr )
{
// set the cursor to the doc begin in all CrsrEditShells
- for(SwViewShell& rSh : pActionViewShell->GetRingContainer())
+ for(SwViewShell& rSh : m_pActionViewShell->GetRingContainer())
{
if( dynamic_cast<const SwCrsrShell *>(&rSh) != nullptr )
static_cast<SwCrsrShell*>(&rSh)->SttEndDoc(true);
}
- bSetCrsr = false;
+ m_bSetCrsr = false;
}
- if( dynamic_cast< const SwEditShell *>( pActionViewShell ) != nullptr )
+ if( dynamic_cast< const SwEditShell *>( m_pActionViewShell ) != nullptr )
{
//Schon gescrollt?, dann dafuer sorgen, dass die View sich nicht bewegt!
- const bool bOldLock = pActionViewShell->IsViewLocked();
- pActionViewShell->LockView( true );
- const bool bOldEndActionByVirDev = pActionViewShell->IsEndActionByVirDev();
- pActionViewShell->SetEndActionByVirDev( true );
- static_cast<SwEditShell*>(pActionViewShell)->EndAction();
- pActionViewShell->SetEndActionByVirDev( bOldEndActionByVirDev );
- pActionViewShell->LockView( bOldLock );
+ const bool bOldLock = m_pActionViewShell->IsViewLocked();
+ m_pActionViewShell->LockView( true );
+ const bool bOldEndActionByVirDev = m_pActionViewShell->IsEndActionByVirDev();
+ m_pActionViewShell->SetEndActionByVirDev( true );
+ static_cast<SwEditShell*>(m_pActionViewShell)->EndAction();
+ m_pActionViewShell->SetEndActionByVirDev( bOldEndActionByVirDev );
+ m_pActionViewShell->LockView( bOldLock );
// bChkJumpMark ist nur gesetzt, wenn das Object auch gefunden wurde
- if( bChkJumpMark )
+ if( m_bChkJumpMark )
{
const Point aVisSttPos( DOCUMENTBORDER, DOCUMENTBORDER );
- if( GetMedium() && aVisSttPos == pActionViewShell->VisArea().Pos() )
- ::JumpToSwMark( pActionViewShell,
+ if( GetMedium() && aVisSttPos == m_pActionViewShell->VisArea().Pos() )
+ ::JumpToSwMark( m_pActionViewShell,
GetMedium()->GetURLObject().GetMark() );
- bChkJumpMark = false;
+ m_bChkJumpMark = false;
}
}
else
- pActionViewShell->EndAction();
+ m_pActionViewShell->EndAction();
// sollte der Parser der Letzte sein, der das Doc haelt, dann kann
// man hier abbrechen und einen Fehler setzen.
- if( 1 == pDoc->getReferenceCount() )
+ if( 1 == m_pDoc->getReferenceCount() )
{
eState = SVPAR_ERROR;
}
- SwViewShell *pVSh = pActionViewShell;
- pActionViewShell = 0;
+ SwViewShell *pVSh = m_pActionViewShell;
+ m_pActionViewShell = 0;
return pVSh;
}
SwViewShell *SwHTMLParser::CheckActionViewShell()
{
- SwViewShell *pVSh = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
- OSL_ENSURE( !pVSh || pActionViewShell == pVSh,
+ SwViewShell *pVSh = m_pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
+ OSL_ENSURE( !pVSh || m_pActionViewShell == pVSh,
"CheckActionViewShell: Wer hat die SwViewShell ausgetauscht?" );
#if OSL_DEBUG_LEVEL > 0
- if( pActionViewShell && !pVSh )
+ if( m_pActionViewShell && !pVSh )
pVSh = 0;
#endif
- if( pVSh != pActionViewShell )
- pActionViewShell = 0;
+ if( pVSh != m_pActionViewShell )
+ m_pActionViewShell = 0;
- return pActionViewShell;
+ return m_pActionViewShell;
}
void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
_HTMLAttrs *pPostIts )
{
- SwPaM* pAttrPam = new SwPaM( *pPam->GetPoint() );
- const SwNodeIndex& rEndIdx = pPam->GetPoint()->nNode;
- const sal_Int32 nEndCnt = pPam->GetPoint()->nContent.GetIndex();
+ SwPaM* pAttrPam = new SwPaM( *m_pPam->GetPoint() );
+ const SwNodeIndex& rEndIdx = m_pPam->GetPoint()->nNode;
+ const sal_Int32 nEndCnt = m_pPam->GetPoint()->nContent.GetIndex();
_HTMLAttr* pAttr;
SwContentNode* pCNd;
_HTMLAttrs aFields;
- for( auto n = aSetAttrTab.size(); n; )
+ for( auto n = m_aSetAttrTab.size(); n; )
{
- pAttr = aSetAttrTab[ --n ];
+ pAttr = m_aSetAttrTab[ --n ];
sal_uInt16 nWhich = pAttr->pItem->Which();
sal_uLong nEndParaIdx = pAttr->GetEndParaIdx();
@@ -2686,7 +2686,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
// Attribute im Content-Bereich duerfen nicht gesetzt
// werden, wenn wir in einem Sonderbereich stehen, aber
// umgekekehrt schon.
- sal_uLong nEndOfIcons = pDoc->GetNodes().GetEndOfExtras().GetIndex();
+ sal_uLong nEndOfIcons = m_pDoc->GetNodes().GetEndOfExtras().GetIndex();
bSetAttr = nEndParaIdx < rEndIdx.GetIndex() ||
rEndIdx.GetIndex() > nEndOfIcons ||
nEndParaIdx <= nEndOfIcons;
@@ -2696,15 +2696,15 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
{
// Das Attribute darf nicht in der liste der vorlaeufigen
// Absatz-Attribute stehen, weil es sonst geloescht wurde.
- while( !aParaAttrs.empty() )
+ while( !m_aParaAttrs.empty() )
{
- OSL_ENSURE( pAttr != aParaAttrs.back(),
+ OSL_ENSURE( pAttr != m_aParaAttrs.back(),
"SetAttr: Attribut duerfte noch nicht gesetzt werden" );
- aParaAttrs.pop_back();
+ m_aParaAttrs.pop_back();
}
// dann also setzen
- aSetAttrTab.erase( aSetAttrTab.begin() + n );
+ m_aSetAttrTab.erase( m_aSetAttrTab.begin() + n );
while( pAttr )
{
@@ -2732,7 +2732,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
pAttr = pPrev;
continue;
}
- pCNd = pDoc->GetNodes().GoNext( &(pAttr->nSttPara) );
+ pCNd = m_pDoc->GetNodes().GoNext( &(pAttr->nSttPara) );
if( pCNd )
pAttr->nSttContent = 0;
else
@@ -2817,7 +2817,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
case RES_FLTR_BOOKMARK: // insert bookmark
{
const OUString sName( static_cast<SfxStringItem*>(pAttr->pItem)->GetValue() );
- IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
+ IDocumentMarkAccess* const pMarkAccess = m_pDoc->getIDocumentMarkAccess();
IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->findMark( sName );
if( ppBkmk != pMarkAccess->getAllMarksEnd() &&
ppBkmk->get()->GetMarkStart() == *pAttrPam->GetPoint() )
@@ -2829,10 +2829,10 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
IDocumentMarkAccess::MarkType::BOOKMARK );
// jump to bookmark
- if( JUMPTO_MARK == eJumpTo && pNewMark->GetName() == sJmpMark )
+ if( JUMPTO_MARK == m_eJumpTo && pNewMark->GetName() == m_sJmpMark )
{
- bChkJumpMark = true;
- eJumpTo = JUMPTO_NONE;
+ m_bChkJumpMark = true;
+ m_eJumpTo = JUMPTO_NONE;
}
}
break;
@@ -2875,14 +2875,14 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
// ggfs. ein Bookmark anspringen
if( RES_TXTATR_INETFMT == nWhich &&
- JUMPTO_MARK == eJumpTo &&
- sJmpMark == static_cast<SwFormatINetFormat*>(pAttr->pItem)->GetName() )
+ JUMPTO_MARK == m_eJumpTo &&
+ m_sJmpMark == static_cast<SwFormatINetFormat*>(pAttr->pItem)->GetName() )
{
- bChkJumpMark = true;
- eJumpTo = JUMPTO_NONE;
+ m_bChkJumpMark = true;
+ m_eJumpTo = JUMPTO_NONE;
}
- pDoc->getIDocumentContentOperations().InsertPoolItem( *pAttrPam, *pAttr->pItem, SetAttrMode::DONTREPLACE );
+ m_pDoc->getIDocumentContentOperations().InsertPoolItem( *pAttrPam, *pAttr->pItem, SetAttrMode::DONTREPLACE );
}
pAttrPam->DeleteMark();
@@ -2892,9 +2892,9 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
}
}
- for( auto n = aMoveFlyFrms.size(); n; )
+ for( auto n = m_aMoveFlyFrms.size(); n; )
{
- SwFrameFormat *pFrameFormat = aMoveFlyFrms[ --n ];
+ SwFrameFormat *pFrameFormat = m_aMoveFlyFrms[ --n ];
const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
OSL_ENSURE( FLY_AT_PARA == rAnchor.GetAnchorId(),
@@ -2906,11 +2906,11 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
{
bMoveFly = nFlyParaIdx < rEndIdx.GetIndex() ||
( nFlyParaIdx == rEndIdx.GetIndex() &&
- aMoveFlyCnts[n] < nEndCnt );
+ m_aMoveFlyCnts[n] < nEndCnt );
}
else
{
- sal_uLong nEndOfIcons = pDoc->GetNodes().GetEndOfExtras().GetIndex();
+ sal_uLong nEndOfIcons = m_pDoc->GetNodes().GetEndOfExtras().GetIndex();
bMoveFly = nFlyParaIdx < rEndIdx.GetIndex() ||
rEndIdx.GetIndex() > nEndOfIcons ||
nFlyParaIdx <= nEndOfIcons;
@@ -2920,7 +2920,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
pFrameFormat->DelFrms();
*pAttrPam->GetPoint() = *pFlyPos;
pAttrPam->GetPoint()->nContent.Assign( pAttrPam->GetContentNode(),
- aMoveFlyCnts[n] );
+ m_aMoveFlyCnts[n] );
SwFormatAnchor aAnchor( rAnchor );
aAnchor.SetType( FLY_AT_CHAR );
aAnchor.SetAnchor( pAttrPam->GetPoint() );
@@ -2942,8 +2942,8 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
}
pFrameFormat->MakeFrms();
- aMoveFlyFrms.erase( aMoveFlyFrms.begin() + n );
- aMoveFlyCnts.erase( aMoveFlyCnts.begin() + n );
+ m_aMoveFlyFrms.erase( m_aMoveFlyFrms.begin() + n );
+ m_aMoveFlyCnts.erase( m_aMoveFlyCnts.begin() + n );
}
}
while( !aFields.empty() )
@@ -2964,7 +2964,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
pAttrPam->Move( fnMoveBackward );
}
- pDoc->getIDocumentContentOperations().InsertPoolItem( *pAttrPam, *pAttr->pItem );
+ m_pDoc->getIDocumentContentOperations().InsertPoolItem( *pAttrPam, *pAttr->pItem );
aFields.pop_front();
delete pAttr;
@@ -2982,13 +2982,13 @@ void SwHTMLParser::NewAttr( _HTMLAttr **ppAttr, const SfxPoolItem& rItem )
// hochgezaehlt.
if( *ppAttr )
{
- _HTMLAttr *pAttr = new _HTMLAttr( *pPam->GetPoint(), rItem,
+ _HTMLAttr *pAttr = new _HTMLAttr( *m_pPam->GetPoint(), rItem,
ppAttr );
pAttr->InsertNext( *ppAttr );
(*ppAttr) = pAttr;
}
else
- (*ppAttr) = new _HTMLAttr( *pPam->GetPoint(), rItem, ppAttr );
+ (*ppAttr) = new _HTMLAttr( *m_pPam->GetPoint(), rItem, ppAttr );
}
bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
@@ -3003,8 +3003,8 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
OSL_ENSURE( ppHead, "keinen Attributs-Listenkopf gefunden!" );
// die aktuelle Position als Ende-Position merken
- const SwNodeIndex* pEndIdx = &pPam->GetPoint()->nNode;
- sal_Int32 nEndCnt = pPam->GetPoint()->nContent.GetIndex();
+ const SwNodeIndex* pEndIdx = &m_pPam->GetPoint()->nNode;
+ sal_Int32 nEndCnt = m_pPam->GetPoint()->nContent.GetIndex();
// WIrd das zueltzt gestartete oder ein frueher gestartetes Attribut
// beendet?
@@ -3029,8 +3029,8 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
*pEndIdx != pAttr->GetSttPara() )
{
// dann eine Contentnt Position zurueck!
- bMoveBack = pPam->Move( fnMoveBackward );
- nEndCnt = pPam->GetPoint()->nContent.GetIndex();
+ bMoveBack = m_pPam->Move( fnMoveBackward );
+ nEndCnt = m_pPam->GetPoint()->nContent.GetIndex();
}
// nun das Attrubut beenden
@@ -3079,9 +3079,9 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
else
{
if (pSetAttr->bInsAtStart)
- aSetAttrTab.push_front( pSetAttr );
+ m_aSetAttrTab.push_front( pSetAttr );
else
- aSetAttrTab.push_back( pSetAttr );
+ m_aSetAttrTab.push_back( pSetAttr );
}
}
pAttr->nSttContent = nScriptEnd;
@@ -3110,9 +3110,9 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
else
{
if (pAttr->bInsAtStart)
- aSetAttrTab.push_front( pAttr );
+ m_aSetAttrTab.push_front( pAttr );
else
- aSetAttrTab.push_back( pAttr );
+ m_aSetAttrTab.push_back( pAttr );
}
}
else
@@ -3142,9 +3142,9 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
else
{
if (pPrev->bInsAtStart)
- aSetAttrTab.push_front( pPrev );
+ m_aSetAttrTab.push_front( pPrev );
else
- aSetAttrTab.push_back( pPrev );
+ m_aSetAttrTab.push_back( pPrev );
}
}
@@ -3158,7 +3158,7 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
*ppHead = pNext;
if( bMoveBack )
- pPam->Move( fnMoveForward );
+ m_pPam->Move( fnMoveForward );
return bRet;
}
@@ -3167,10 +3167,10 @@ void SwHTMLParser::DeleteAttr( _HTMLAttr* pAttr )
{
// preliminary paragraph attributes are not allowed here, they could
// be set here and then the pointers become invalid!
- OSL_ENSURE(aParaAttrs.empty(),
+ OSL_ENSURE(m_aParaAttrs.empty(),
"Danger: there are non-final paragraph attributes");
- if( !aParaAttrs.empty() )
- aParaAttrs.clear();
+ if( !m_aParaAttrs.empty() )
+ m_aParaAttrs.clear();
// Der Listenkopf ist im Attribut gespeichert
_HTMLAttr **ppHead = pAttr->ppHead;
@@ -3207,9 +3207,9 @@ void SwHTMLParser::DeleteAttr( _HTMLAttr* pAttr )
else
{
if (pPrev->bInsAtStart)
- aSetAttrTab.push_front( pPrev );
+ m_aSetAttrTab.push_front( pPrev );
else
- aSetAttrTab.push_back( pPrev );
+ m_aSetAttrTab.push_back( pPrev );
}
}
@@ -3225,12 +3225,12 @@ void SwHTMLParser::SaveAttrTab( _HTMLAttrTable& rNewAttrTab )
{
// preliminary paragraph attributes are not allowed here, they could
// be set here and then the pointers become invalid!
- OSL_ENSURE(aParaAttrs.empty(),
+ OSL_ENSURE(m_aParaAttrs.empty(),
"Danger: there are non-final paragraph attributes");
- if( !aParaAttrs.empty() )
- aParaAttrs.clear();
+ if( !m_aParaAttrs.empty() )
+ m_aParaAttrs.clear();
- _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&aAttrTab);
+ _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&m_aAttrTab);
_HTMLAttr** pSaveAttributes = reinterpret_cast<_HTMLAttr**>(&rNewAttrTab);
for (auto nCnt = sizeof(_HTMLAttrTable) / sizeof(_HTMLAttr*); nCnt--; ++pHTMLAttributes, ++pSaveAttributes)
@@ -3253,30 +3253,30 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab,
{
// preliminary paragraph attributes are not allowed here, they could
// be set here and then the pointers become invalid!
- OSL_ENSURE(aParaAttrs.empty(),
+ OSL_ENSURE(m_aParaAttrs.empty(),
"Danger: there are non-final paragraph attributes");
- if( !aParaAttrs.empty() )
- aParaAttrs.clear();
+ if( !m_aParaAttrs.empty() )
+ m_aParaAttrs.clear();
- const SwNodeIndex& nSttIdx = pPam->GetPoint()->nNode;
+ const SwNodeIndex& nSttIdx = m_pPam->GetPoint()->nNode;
SwNodeIndex nEndIdx( nSttIdx );
// alle noch offenen Attribute beenden und hinter der Tabelle
// neu aufspannen
- _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&aAttrTab);
+ _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&m_aAttrTab);
_HTMLAttr** pSaveAttributes = reinterpret_cast<_HTMLAttr**>(&rNewAttrTab);
bool bSetAttr = true;
- const sal_Int32 nSttCnt = pPam->GetPoint()->nContent.GetIndex();
+ const sal_Int32 nSttCnt = m_pPam->GetPoint()->nContent.GetIndex();
sal_Int32 nEndCnt = nSttCnt;
if( bMoveEndBack )
{
sal_uLong nOldEnd = nEndIdx.GetIndex();
sal_uLong nTmpIdx;
- if( ( nTmpIdx = pDoc->GetNodes().GetEndOfExtras().GetIndex()) >= nOldEnd ||
- ( nTmpIdx = pDoc->GetNodes().GetEndOfAutotext().GetIndex()) >= nOldEnd )
+ if( ( nTmpIdx = m_pDoc->GetNodes().GetEndOfExtras().GetIndex()) >= nOldEnd ||
+ ( nTmpIdx = m_pDoc->GetNodes().GetEndOfAutotext().GetIndex()) >= nOldEnd )
{
- nTmpIdx = pDoc->GetNodes().GetEndOfInserts().GetIndex();
+ nTmpIdx = m_pDoc->GetNodes().GetEndOfInserts().GetIndex();
}
SwContentNode* pCNd = SwNodes::GoPrevious(&nEndIdx);
@@ -3312,9 +3312,9 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab,
else
{
if (pSetAttr->bInsAtStart)
- aSetAttrTab.push_front( pSetAttr );
+ m_aSetAttrTab.push_front( pSetAttr );
else
- aSetAttrTab.push_back( pSetAttr );
+ m_aSetAttrTab.push_back( pSetAttr );
}
}
else if( pPrev )
@@ -3327,9 +3327,9 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab,
else
{
if (pPrev->bInsAtStart)
- aSetAttrTab.push_front( pPrev );
+ m_aSetAttrTab.push_front( pPrev );
else
- aSetAttrTab.push_back( pPrev );
+ m_aSetAttrTab.push_back( pPrev );
}
}
@@ -3359,19 +3359,19 @@ void SwHTMLParser::RestoreAttrTab( _HTMLAttrTable& rNewAttrTab,
{
// preliminary paragraph attributes are not allowed here, they could
// be set here and then the pointers become invalid!
- OSL_ENSURE(aParaAttrs.empty(),
+ OSL_ENSURE(m_aParaAttrs.empty(),
"Danger: there are non-final paragraph attributes");
- if( !aParaAttrs.empty() )
- aParaAttrs.clear();
+ if( !m_aParaAttrs.empty() )
+ m_aParaAttrs.clear();
- _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&aAttrTab);
+ _HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&m_aAttrTab);
_HTMLAttr** pSaveAttributes = reinterpret_cast<_HTMLAttr**>(&rNewAttrTab);
for (auto nCnt = sizeof(_HTMLAttrTable) / sizeof(_HTMLAttr*); nCnt--; ++pHTMLAttributes, ++pSaveAttributes)
{
OSL_ENSURE(!*pHTMLAttributes, "Die Attribut-Tabelle ist nicht leer!");
- const SwPosition *pPos = pPam->GetPoint();
+ const SwPosition *pPos = m_pPam->GetPoint();
const SwNodeIndex& rSttPara = pPos->nNode;
const sal_Int32 nSttCnt = pPos->nContent.GetIndex();
@@ -3400,14 +3400,14 @@ void SwHTMLParser::RestoreAttrTab( _HTMLAttrTable& rNewAttrTab,
void SwHTMLParser::InsertAttr( const SfxPoolItem& rItem, bool bLikePara,
bool bInsAtStart )
{
- _HTMLAttr* pTmp = new _HTMLAttr( *pPam->GetPoint(),
+ _HTMLAttr* pTmp = new _HTMLAttr( *m_pPam->GetPoint(),
rItem );
if( bLikePara )
pTmp->SetLikePara();
if (bInsAtStart)
- aSetAttrTab.push_front( pTmp );
+ m_aSetAttrTab.push_front( pTmp );
else
- aSetAttrTab.push_back( pTmp );
+ m_aSetAttrTab.push_back( pTmp );
}
void SwHTMLParser::InsertAttrs( _HTMLAttrs& rAttrs )
@@ -3456,7 +3456,7 @@ void SwHTMLParser::NewStdAttr( int nToken )
// Styles parsen
if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) )
{
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) )
@@ -3509,7 +3509,7 @@ void SwHTMLParser::NewStdAttr( int nToken,
// Styles parsen
if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) )
{
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
aItemSet.Put( rItem );
@@ -3598,18 +3598,18 @@ void SwHTMLParser::NewBasefontAttr()
// Styles parsen
if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) )
{
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
//CJK has different defaults
- SvxFontHeightItem aFontHeight( aFontHeights[nSize-1], 100, RES_CHRATR_FONTSIZE );
+ SvxFontHeightItem aFontHeight( m_aFontHeights[nSize-1], 100, RES_CHRATR_FONTSIZE );
aItemSet.Put( aFontHeight );
- SvxFontHeightItem aFontHeightCJK( aFontHeights[nSize-1], 100, RES_CHRATR_CJK_FONTSIZE );
+ SvxFontHeightItem aFontHeightCJK( m_aFontHeights[nSize-1], 100, RES_CHRATR_CJK_FONTSIZE );
aItemSet.Put( aFontHeightCJK );
//Complex type can contain so many types of letters,
//that it's not really worthy to bother, IMO.
//Still, I have set a default.
- SvxFontHeightItem aFontHeightCTL( aFontHeights[nSize-1], 100, RES_CHRATR_CTL_FONTSIZE );
+ SvxFontHeightItem aFontHeightCTL( m_aFontHeights[nSize-1], 100, RES_CHRATR_CTL_FONTSIZE );
aItemSet.Put( aFontHeightCTL );
if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) )
@@ -3619,19 +3619,19 @@ void SwHTMLParser::NewBasefontAttr()
}
else
{
- SvxFontHeightItem aFontHeight( aFontHeights[nSize-1], 100, RES_CHRATR_FONTSIZE );
- InsertAttr( &aAttrTab.pFontHeight, aFontHeight, pCntxt );
- SvxFontHeightItem aFontHeightCJK( aFontHeights[nSize-1], 100, RES_CHRATR_CJK_FONTSIZE );
- InsertAttr( &aAttrTab.pFontHeightCJK, aFontHeightCJK, pCntxt );
- SvxFontHeightItem aFontHeightCTL( aFontHeights[nSize-1], 100, RES_CHRATR_CTL_FONTSIZE );
- InsertAttr( &aAttrTab.pFontHeightCTL, aFontHeightCTL, pCntxt );
+ SvxFontHeightItem aFontHeight( m_aFontHeights[nSize-1], 100, RES_CHRATR_FONTSIZE );
+ InsertAttr( &m_aAttrTab.pFontHeight, aFontHeight, pCntxt );
+ SvxFontHeightItem aFontHeightCJK( m_aFontHeights[nSize-1], 100, RES_CHRATR_CJK_FONTSIZE );
+ InsertAttr( &m_aAttrTab.pFontHeightCJK, aFontHeightCJK, pCntxt );
+ SvxFontHeightItem aFontHeightCTL( m_aFontHeights[nSize-1], 100, RES_CHRATR_CTL_FONTSIZE );
+ InsertAttr( &m_aAttrTab.pFontHeightCTL, aFontHeightCTL, pCntxt );
}
// den Kontext merken
PushContext( pCntxt );
// die Font-Size merken
- aBaseFontStack.push_back( nSize );
+ m_aBaseFontStack.push_back( nSize );
}
void SwHTMLParser::EndBasefontAttr()
@@ -3639,19 +3639,19 @@ void SwHTMLParser::EndBasefontAttr()
EndTag( HTML_BASEFONT_ON );
// Stack-Unterlauf in Tabellen vermeiden
- if( aBaseFontStack.size() > nBaseFontStMin )
- aBaseFontStack.erase( aBaseFontStack.begin() + aBaseFontStack.size() - 1 );
+ if( m_aBaseFontStack.size() > m_nBaseFontStMin )
+ m_aBaseFontStack.erase( m_aBaseFontStack.begin() + m_aBaseFontStack.size() - 1 );
}
void SwHTMLParser::NewFontAttr( int nToken )
{
sal_uInt16 nBaseSize =
- ( aBaseFontStack.size() > nBaseFontStMin
- ? (aBaseFontStack[aBaseFontStack.size()-1] & FONTSIZE_MASK)
+ ( m_aBaseFontStack.size() > m_nBaseFontStMin
+ ? (m_aBaseFontStack[m_aBaseFontStack.size()-1] & FONTSIZE_MASK)
: 3 );
sal_uInt16 nFontSize =
- ( aFontStack.size() > nFontStMin
- ? (aFontStack[aFontStack.size()-1] & FONTSIZE_MASK)
+ ( m_aFontStack.size() > m_nFontStMin
+ ? (m_aFontStack[m_aFontStack.size()-1] & FONTSIZE_MASK)
: nBaseSize );
OUString aFace, aId, aStyle, aClass, aLang, aDir;
@@ -3682,7 +3682,7 @@ void SwHTMLParser::NewFontAttr( int nToken )
nSSize = 7;
nSize = (sal_uInt16)nSSize;
- nFontHeight = aFontHeights[nSize-1];
+ nFontHeight = m_aFontHeights[nSize-1];
}
break;
case HTML_O_COLOR:
@@ -3726,7 +3726,7 @@ void SwHTMLParser::NewFontAttr( int nToken )
{
// wenn die Schriftgroesse in der Ueberschrift noch
// nicht veraendert ist, die aus der Vorlage nehmen
- if( nFontStHeadStart==aFontStack.size() )
+ if( m_nFontStHeadStart==m_aFontStack.size() )
nFontSize = static_cast< sal_uInt16 >(6 - (nPoolId - RES_POOLCOLL_HEADLINE1));
}
else
@@ -3741,10 +3741,10 @@ void SwHTMLParser::NewFontAttr( int nToken )
// den Vorlagen geholt.
if( nPoolId && nSize>=1 && nSize <=6 )
nFontHeight =
- pCSS1Parser->GetTextCollFromPool(
+ m_pCSS1Parser->GetTextCollFromPool(
RES_POOLCOLL_HEADLINE1+6-nSize )->GetSize().GetHeight();
else
- nFontHeight = aFontHeights[nSize-1];
+ nFontHeight = m_aFontHeights[nSize-1];
}
OSL_ENSURE( !nSize == !nFontHeight, "HTML-Font-Size != Font-Height" );
@@ -3754,10 +3754,10 @@ void SwHTMLParser::NewFontAttr( int nToken )
FontPitch ePitch = PITCH_DONTKNOW; // falls nicht gefunden
rtl_TextEncoding eEnc = osl_getThreadTextEncoding();
- if( !aFace.isEmpty() && !pCSS1Parser->IsIgnoreFontFamily() )
+ if( !aFace.isEmpty() && !m_pCSS1Parser->IsIgnoreFontFamily() )
{
const FontList *pFList = 0;
- SwDocShell *pDocSh = pDoc->GetDocShell();
+ SwDocShell *pDocSh = m_pDoc->GetDocShell();
if( pDocSh )
{
const SvxFontListItem *pFListItem =
@@ -3801,7 +3801,7 @@ void SwHTMLParser::NewFontAttr( int nToken )
// Styles parsen
if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) )
{
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( nFontHeight )
@@ -3835,29 +3835,29 @@ void SwHTMLParser::NewFontAttr( int nToken )
if( nFontHeight )
{
SvxFontHeightItem aFontHeight( nFontHeight, 100, RES_CHRATR_FONTSIZE );
- InsertAttr( &aAttrTab.pFontHeight, aFontHeight, pCntxt );
+ InsertAttr( &m_aAttrTab.pFontHeight, aFontHeight, pCntxt );
SvxFontHeightItem aFontHeightCJK( nFontHeight, 100, RES_CHRATR_CJK_FONTSIZE );
- InsertAttr( &aAttrTab.pFontHeight, aFontHeightCJK, pCntxt );
+ InsertAttr( &m_aAttrTab.pFontHeight, aFontHeightCJK, pCntxt );
SvxFontHeightItem aFontHeightCTL( nFontHeight, 100, RES_CHRATR_CTL_FONTSIZE );
- InsertAttr( &aAttrTab.pFontHeight, aFontHeightCTL, pCntxt );
+ InsertAttr( &m_aAttrTab.pFontHeight, aFontHeightCTL, pCntxt );
}
if( bColor )
- InsertAttr( &aAttrTab.pFontColor, SvxColorItem(aColor, RES_CHRATR_COLOR), pCntxt );
+ InsertAttr( &m_aAttrTab.pFontColor, SvxColorItem(aColor, RES_CHRATR_COLOR), pCntxt );
if( !aFontName.isEmpty() )
{
SvxFontItem aFont( eFamily, aFontName, aStyleName, ePitch, eEnc, RES_CHRATR_FONT );
- InsertAttr( &aAttrTab.pFont, aFont, pCntxt );
+ InsertAttr( &m_aAttrTab.pFont, aFont, pCntxt );
SvxFontItem aFontCJK( eFamily, aFontName, aStyleName, ePitch, eEnc, RES_CHRATR_CJK_FONT );
- InsertAttr( &aAttrTab.pFont, aFontCJK, pCntxt );
+ InsertAttr( &m_aAttrTab.pFont, aFontCJK, pCntxt );
SvxFontItem aFontCTL( eFamily, aFontName, aStyleName, ePitch, eEnc, RES_CHRATR_CTL_FONT );
- InsertAttr( &aAttrTab.pFont, aFontCTL, pCntxt );
+ InsertAttr( &m_aAttrTab.pFont, aFontCTL, pCntxt );
}
}
// den Kontext merken
PushContext( pCntxt );
- aFontStack.push_back( nSize );
+ m_aFontStack.push_back( nSize );
}
void SwHTMLParser::EndFontAttr( int nToken )
@@ -3865,18 +3865,18 @@ void SwHTMLParser::EndFontAttr( int nToken )
EndTag( nToken );
// Stack-Unterlauf in Tabellen vermeiden
- if( aFontStack.size() > nFontStMin )
- aFontStack.erase( aFontStack.begin() + aFontStack.size() - 1 );
+ if( m_aFontStack.size() > m_nFontStMin )
+ m_aFontStack.erase( m_aFontStack.begin() + m_aFontStack.size() - 1 );
}
void SwHTMLParser::NewPara()
{
- if( pPam->GetPoint()->nContent.GetIndex() )
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( AM_SPACE );
else
AddParSpace();
- eParaAdjust = SVX_ADJUST_END;
+ m_eParaAdjust = SVX_ADJUST_END;
OUString aId, aStyle, aClass, aLang, aDir;
const HTMLOptions& rHTMLOptions = GetOptions();
@@ -3889,7 +3889,7 @@ void SwHTMLParser::NewPara()
aId = rOption.GetString();
break;
case HTML_O_ALIGN:
- eParaAdjust = (SvxAdjust)rOption.GetEnum( aHTMLPAlignTable, static_cast< sal_uInt16 >(eParaAdjust) );
+ m_eParaAdjust = (SvxAdjust)rOption.GetEnum( aHTMLPAlignTable, static_cast< sal_uInt16 >(m_eParaAdjust) );
break;
case HTML_O_STYLE:
aStyle = rOption.GetString();
@@ -3916,20 +3916,20 @@ void SwHTMLParser::NewPara()
// keine der CSS1-Properties der Klasse hart formatiert werden muss!!!)
if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
{
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( ParseStyleOptions( aStyle, aId, aEmptyOUStr, aItemSet, aPropInfo, &aLang, &aDir ) )
{
- OSL_ENSURE( aClass.isEmpty() || !pCSS1Parser->GetClass( aClass ),
+ OSL_ENSURE( aClass.isEmpty() || !m_pCSS1Parser->GetClass( aClass ),
"Class wird nicht beruecksichtigt" );
DoPositioning( aItemSet, aPropInfo, pCntxt );
InsertAttrs( aItemSet, aPropInfo, pCntxt );
}
}
- if( SVX_ADJUST_END != eParaAdjust )
- InsertAttr( &aAttrTab.pAdjust, SvxAdjustItem(eParaAdjust, RES_PARATR_ADJUST), pCntxt );
+ if( SVX_ADJUST_END != m_eParaAdjust )
+ InsertAttr( &m_aAttrTab.pAdjust, SvxAdjustItem(m_eParaAdjust, RES_PARATR_ADJUST), pCntxt );
// und auf den Stack packen
PushContext( pCntxt );
@@ -3940,16 +3940,16 @@ void SwHTMLParser::NewPara()
// Laufbalkenanzeige
ShowStatline();
- OSL_ENSURE( !nOpenParaToken, "Jetzt geht ein offenes Absatz-Element verloren" );
- nOpenParaToken = HTML_PARABREAK_ON;
+ OSL_ENSURE( !m_nOpenParaToken, "Jetzt geht ein offenes Absatz-Element verloren" );
+ m_nOpenParaToken = HTML_PARABREAK_ON;
}
void SwHTMLParser::EndPara( bool bReal )
{
- if( HTML_LI_ON==nOpenParaToken && pTable )
+ if( HTML_LI_ON==m_nOpenParaToken && m_pTable )
{
#if OSL_DEBUG_LEVEL > 0
- const SwNumRule *pNumRule = pPam->GetNode().GetTextNode()->GetNumRule();
+ const SwNumRule *pNumRule = m_pPam->GetNode().GetTextNode()->GetNumRule();
OSL_ENSURE( pNumRule, "Wo ist die Numrule geblieben" );
#endif
}
@@ -3957,7 +3957,7 @@ void SwHTMLParser::EndPara( bool bReal )
// leere Absaetze werden von Netscape uebersprungen, von uns jetzt auch
if( bReal )
{
- if( pPam->GetPoint()->nContent.GetIndex() )
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( AM_SPACE );
else
AddParSpace();
@@ -3965,16 +3965,16 @@ void SwHTMLParser::EndPara( bool bReal )
// wenn ein DD oder DT offen war, handelt es sich um eine
// implizite Def-Liste, die jetzt beendet werden muss
- if( (nOpenParaToken==HTML_DT_ON || nOpenParaToken==HTML_DD_ON) &&
- nDefListDeep)
+ if( (m_nOpenParaToken==HTML_DT_ON || m_nOpenParaToken==HTML_DD_ON) &&
+ m_nDefListDeep)
{
- nDefListDeep--;
+ m_nDefListDeep--;
}
// den Kontext vom Stack holen. Er kann auch von einer implizit
// geoeffneten Definitionsliste kommen
_HTMLAttrContext *pCntxt =
- PopContext( static_cast< sal_uInt16 >(nOpenParaToken ? (nOpenParaToken & ~1)
+ PopContext( static_cast< sal_uInt16 >(m_nOpenParaToken ? (m_nOpenParaToken & ~1)
: HTML_PARABREAK_ON) );
// Attribute beenden
@@ -3989,12 +3989,12 @@ void SwHTMLParser::EndPara( bool bReal )
if( bReal )
SetTextCollAttrs();
- nOpenParaToken = 0;
+ m_nOpenParaToken = 0;
}
void SwHTMLParser::NewHeading( int nToken )
{
- eParaAdjust = SVX_ADJUST_END;
+ m_eParaAdjust = SVX_ADJUST_END;
OUString aId, aStyle, aClass, aLang, aDir;
@@ -4008,7 +4008,7 @@ void SwHTMLParser::NewHeading( int nToken )
aId = rOption.GetString();
break;
case HTML_O_ALIGN:
- eParaAdjust = (SvxAdjust)rOption.GetEnum( aHTMLPAlignTable, static_cast< sal_uInt16 >(eParaAdjust) );
+ m_eParaAdjust = (SvxAdjust)rOption.GetEnum( aHTMLPAlignTable, static_cast< sal_uInt16 >(m_eParaAdjust) );
break;
case HTML_O_STYLE:
aStyle = rOption.GetString();
@@ -4026,7 +4026,7 @@ void SwHTMLParser::NewHeading( int nToken )
}
// einen neuen Absatz aufmachen
- if( pPam->GetPoint()->nContent.GetIndex() )
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( AM_SPACE );
else
AddParSpace();
@@ -4050,20 +4050,20 @@ void SwHTMLParser::NewHeading( int nToken )
// Styles parsen (zu Class siehe auch NewPara)
if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
{
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( ParseStyleOptions( aStyle, aId, aEmptyOUStr, aItemSet, aPropInfo, &aLang, &aDir ) )
{
- OSL_ENSURE( aClass.isEmpty() || !pCSS1Parser->GetClass( aClass ),
+ OSL_ENSURE( aClass.isEmpty() || !m_pCSS1Parser->GetClass( aClass ),
"Class wird nicht beruecksichtigt" );
DoPositioning( aItemSet, aPropInfo, pCntxt );
InsertAttrs( aItemSet, aPropInfo, pCntxt );
}
}
- if( SVX_ADJUST_END != eParaAdjust )
- InsertAttr( &aAttrTab.pAdjust, SvxAdjustItem(eParaAdjust, RES_PARATR_ADJUST), pCntxt );
+ if( SVX_ADJUST_END != m_eParaAdjust )
+ InsertAttr( &m_aAttrTab.pAdjust, SvxAdjustItem(m_eParaAdjust, RES_PARATR_ADJUST), pCntxt );
// udn auf den Stack packen
PushContext( pCntxt );
@@ -4071,7 +4071,7 @@ void SwHTMLParser::NewHeading( int nToken )
// und die Vorlage oder deren Attribute setzen
SetTextCollAttrs( pCntxt );
- nFontStHeadStart = aFontStack.size();
+ m_nFontStHeadStart = m_aFontStack.size();
// Laufbalkenanzeige
ShowStatline();
@@ -4080,17 +4080,17 @@ void SwHTMLParser::NewHeading( int nToken )
void SwHTMLParser::EndHeading()
{
// einen neuen Absatz aufmachen
- if( pPam->GetPoint()->nContent.GetIndex() )
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( AM_SPACE );
else
AddParSpace();
// Kontext zu dem Token suchen und vom Stack holen
_HTMLAttrContext *pCntxt = 0;
- auto nPos = aContexts.size();
- while( !pCntxt && nPos>nContextStMin )
+ auto nPos = m_aContexts.size();
+ while( !pCntxt && nPos>m_nContextStMin )
{
- switch( aContexts[--nPos]->GetToken() )
+ switch( m_aContexts[--nPos]->GetToken() )
{
case HTML_HEAD1_ON:
case HTML_HEAD2_ON:
@@ -4098,8 +4098,8 @@ void SwHTMLParser::EndHeading()
case HTML_HEAD4_ON:
case HTML_HEAD5_ON:
case HTML_HEAD6_ON:
- pCntxt = aContexts[nPos];
- aContexts.erase( aContexts.begin() + nPos );
+ pCntxt = m_aContexts[nPos];
+ m_aContexts.erase( m_aContexts.begin() + nPos );
break;
}
}
@@ -4115,7 +4115,7 @@ void SwHTMLParser::EndHeading()
// die bisherige Vorlage neu setzen
SetTextCollAttrs();
- nFontStHeadStart = nFontStMin;
+ m_nFontStHeadStart = m_nFontStMin;
}
void SwHTMLParser::NewTextFormatColl( int nToken, sal_uInt16 nColl )
@@ -4173,7 +4173,7 @@ void SwHTMLParser::NewTextFormatColl( int nToken, sal_uInt16 nColl )
OSL_ENSURE( false, "unbekannte Vorlage" );
break;
}
- if( pPam->GetPoint()->nContent.GetIndex() )
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( eMode );
else if( AM_SPACE==eMode )
AddParSpace();
@@ -4184,12 +4184,12 @@ void SwHTMLParser::NewTextFormatColl( int nToken, sal_uInt16 nColl )
// Styles parsen (zu Class siehe auch NewPara)
if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
{
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( ParseStyleOptions( aStyle, aId, aEmptyOUStr, aItemSet, aPropInfo, &aLang, &aDir ) )
{
- OSL_ENSURE( aClass.isEmpty() || !pCSS1Parser->GetClass( aClass ),
+ OSL_ENSURE( aClass.isEmpty() || !m_pCSS1Parser->GetClass( aClass ),
"Class wird nicht beruecksichtigt" );
DoPositioning( aItemSet, aPropInfo, pCntxt );
InsertAttrs( aItemSet, aPropInfo, pCntxt );
@@ -4226,7 +4226,7 @@ void SwHTMLParser::EndTextFormatColl( int nToken )
OSL_ENSURE( false, "unbekannte Vorlage" );
break;
}
- if( pPam->GetPoint()->nContent.GetIndex() )
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( eMode );
else if( AM_SPACE==eMode )
AddParSpace();
@@ -4275,20 +4275,20 @@ void SwHTMLParser::NewDefList()
}
// einen neuen Absatz aufmachen
- bool bSpace = (GetNumInfo().GetDepth() + nDefListDeep) == 0;
- if( pPam->GetPoint()->nContent.GetIndex() )
+ bool bSpace = (GetNumInfo().GetDepth() + m_nDefListDeep) == 0;
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( bSpace ? AM_SPACE : AM_SOFTNOSPACE );
else if( bSpace )
AddParSpace();
// ein Level mehr
- nDefListDeep++;
+ m_nDefListDeep++;
bool bInDD = false, bNotInDD = false;
- auto nPos = aContexts.size();
- while( !bInDD && !bNotInDD && nPos>nContextStMin )
+ auto nPos = m_aContexts.size();
+ while( !bInDD && !bNotInDD && nPos>m_nContextStMin )
{
- sal_uInt16 nCntxtToken = aContexts[--nPos]->GetToken();
+ sal_uInt16 nCntxtToken = m_aContexts[--nPos]->GetToken();
switch( nCntxtToken )
{
case HTML_DEFLIST_ON:
@@ -4316,12 +4316,12 @@ void SwHTMLParser::NewDefList()
// eines DT auf dem aktuellen Level, und die entspricht der eines
// DD auf dem Level davor. Fue einen Level >=2 muss also ein DD-Abstand
// hinzugefuegt werden
- if( !bInDD && nDefListDeep > 1 )
+ if( !bInDD && m_nDefListDeep > 1 )
{
// und den der DT-Vorlage des aktuellen Levels
SvxLRSpaceItem rLRSpace =
- pCSS1Parser->GetTextFormatColl( RES_POOLCOLL_HTML_DD, aEmptyOUStr )
+ m_pCSS1Parser->GetTextFormatColl( RES_POOLCOLL_HTML_DD, aEmptyOUStr )
->GetLRSpace();
nLeft = nLeft + static_cast< sal_uInt16 >(rLRSpace.GetTextLeft());
}
@@ -4331,7 +4331,7 @@ void SwHTMLParser::NewDefList()
// Styles parsen
if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) )
{
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) )
@@ -4344,21 +4344,21 @@ void SwHTMLParser::NewDefList()
PushContext( pCntxt );
// die Attribute der neuen Vorlage setzen
- if( nDefListDeep > 1 )
+ if( m_nDefListDeep > 1 )
SetTextCollAttrs( pCntxt );
}
void SwHTMLParser::EndDefList()
{
- bool bSpace = (GetNumInfo().GetDepth() + nDefListDeep) == 1;
- if( pPam->GetPoint()->nContent.GetIndex() )
+ bool bSpace = (GetNumInfo().GetDepth() + m_nDefListDeep) == 1;
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( bSpace ? AM_SPACE : AM_SOFTNOSPACE );
else if( bSpace )
AddParSpace();
// ein Level weniger
- if( nDefListDeep > 0 )
- nDefListDeep--;
+ if( m_nDefListDeep > 0 )
+ m_nDefListDeep--;
// den aktuellen Kontext vom Stack holen
_HTMLAttrContext *pCntxt = PopContext( HTML_DEFLIST_ON );
@@ -4379,10 +4379,10 @@ void SwHTMLParser::NewDefListItem( int nToken )
{
// festellen, ob das DD/DT in einer DL vorkommt
bool bInDefList = false, bNotInDefList = false;
- auto nPos = aContexts.size();
- while( !bInDefList && !bNotInDefList && nPos>nContextStMin )
+ auto nPos = m_aContexts.size();
+ while( !bInDefList && !bNotInDefList && nPos>m_nContextStMin )
{
- sal_uInt16 nCntxtToken = aContexts[--nPos]->GetToken();
+ sal_uInt16 nCntxtToken = m_aContexts[--nPos]->GetToken();
switch( nCntxtToken )
{
case HTML_DEFLIST_ON:
@@ -4400,10 +4400,10 @@ void SwHTMLParser::NewDefListItem( int nToken )
// wenn nicht, implizit eine neue DL aufmachen
if( !bInDefList )
{
- nDefListDeep++;
- OSL_ENSURE( !nOpenParaToken,
+ m_nDefListDeep++;
+ OSL_ENSURE( !m_nOpenParaToken,
"Jetzt geht ein offenes Absatz-Element verloren" );
- nOpenParaToken = static_cast< sal_uInt16 >(nToken);
+ m_nOpenParaToken = static_cast< sal_uInt16 >(nToken);
}
NewTextFormatColl( nToken, static_cast< sal_uInt16 >(nToken==HTML_DD_ON ? RES_POOLCOLL_HTML_DD
@@ -4414,24 +4414,24 @@ void SwHTMLParser::EndDefListItem( int nToken, bool bSetColl,
bool /*bLastPara*/ )
{
// einen neuen Absatz aufmachen
- if( !nToken && pPam->GetPoint()->nContent.GetIndex() )
+ if( !nToken && m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( AM_SOFTNOSPACE );
// Kontext zu dem Token suchen und vom Stack holen
nToken &= ~1;
_HTMLAttrContext *pCntxt = 0;
- auto nPos = aContexts.size();
- while( !pCntxt && nPos>nContextStMin )
+ auto nPos = m_aContexts.size();
+ while( !pCntxt && nPos>m_nContextStMin )
{
- sal_uInt16 nCntxtToken = aContexts[--nPos]->GetToken();
+ sal_uInt16 nCntxtToken = m_aContexts[--nPos]->GetToken();
switch( nCntxtToken )
{
case HTML_DD_ON:
case HTML_DT_ON:
if( !nToken || nToken == nCntxtToken )
{
- pCntxt = aContexts[nPos];
- aContexts.erase( aContexts.begin() + nPos );
+ pCntxt = m_aContexts[nPos];
+ m_aContexts.erase( m_aContexts.begin() + nPos );
}
break;
case HTML_DEFLIST_ON:
@@ -4441,7 +4441,7 @@ void SwHTMLParser::EndDefListItem( int nToken, bool bSetColl,
case HTML_ORDERLIST_ON:
case HTML_UNORDERLIST_ON:
// und auch nicht ausserhalb einer anderen Liste
- nPos = nContextStMin;
+ nPos = m_nContextStMin;
break;
}
}
@@ -4467,9 +4467,9 @@ bool SwHTMLParser::HasCurrentParaFlys( bool bNoSurroundOnly,
// bSurroundOnly: Der Absatz enthaelt mindestens einen Rahmen
// mit Umlauf aber keinen ohne Umlauf
// sonst: Der Absatz enthaelt irgendeinen Rahmen
- SwNodeIndex& rNodeIdx = pPam->GetPoint()->nNode;
+ SwNodeIndex& rNodeIdx = m_pPam->GetPoint()->nNode;
- const SwFrameFormats& rFrameFormatTable = *pDoc->GetSpzFrameFormats();
+ const SwFrameFormats& rFrameFormatTable = *m_pDoc->GetSpzFrameFormats();
bool bFound = false;
for ( size_t i=0; i<rFrameFormatTable.size(); i++ )
@@ -4533,7 +4533,7 @@ bool SwHTMLParser::HasCurrentParaFlys( bool bNoSurroundOnly,
const SwFormatColl *SwHTMLParser::GetCurrFormatColl() const
{
- const SwContentNode* pCNd = pPam->GetContentNode();
+ const SwContentNode* pCNd = m_pPam->GetContentNode();
return &pCNd->GetAnyFormatColl();
}
@@ -4550,9 +4550,9 @@ void SwHTMLParser::SetTextCollAttrs( _HTMLAttrContext *pContext )
sal_uInt16 nLeftMargin = 0, nRightMargin = 0; // die Einzuege und
short nFirstLineIndent = 0; // Abstaende
- for( auto i = nContextStAttrMin; i < aContexts.size(); ++i )
+ for( auto i = m_nContextStAttrMin; i < m_aContexts.size(); ++i )
{
- const _HTMLAttrContext *pCntxt = aContexts[i];
+ const _HTMLAttrContext *pCntxt = m_aContexts[i];
sal_uInt16 nColl = pCntxt->GetTextFormatColl();
if( nColl )
@@ -4583,7 +4583,7 @@ void SwHTMLParser::SetTextCollAttrs( _HTMLAttrContext *pContext )
}
SwTextFormatColl *pNewColl =
- pCSS1Parser->GetTextFormatColl( nColl, pCntxt->GetClass() );
+ m_pCSS1Parser->GetTextFormatColl( nColl, pCntxt->GetClass() );
if( bSetThis )
{
@@ -4658,7 +4658,7 @@ void SwHTMLParser::SetTextCollAttrs( _HTMLAttrContext *pContext )
nTopColl = nDfltColl;
const SwTextFormatColl *pTopColl =
- pCSS1Parser->GetTextFormatColl( nTopColl, rTopClass );
+ m_pCSS1Parser->GetTextFormatColl( nTopColl, rTopClass );
const SfxItemSet& rItemSet = pTopColl->GetAttrSet();
const SfxPoolItem *pItem;
if( SfxItemState::SET == rItemSet.GetItemState(RES_LR_SPACE,true, &pItem) )
@@ -4674,7 +4674,7 @@ void SwHTMLParser::SetTextCollAttrs( _HTMLAttrContext *pContext )
// vorhergehenden Level
if( RES_POOLCOLL_HTML_DD == nTopColl )
{
- const SvxLRSpaceItem& rDTLRSpace = pCSS1Parser
+ const SvxLRSpaceItem& rDTLRSpace = m_pCSS1Parser
->GetTextFormatColl( RES_POOLCOLL_HTML_DT, aEmptyOUStr )
->GetLRSpace();
nLeft -= rDTLRSpace.GetTextLeft();
@@ -4704,7 +4704,7 @@ void SwHTMLParser::SetTextCollAttrs( _HTMLAttrContext *pContext )
// wenn gar keine Vorlage im Kontext gesetzt ist, Textkoerper nehmen
if( !pCollToSet )
{
- pCollToSet = pCSS1Parser->GetTextCollFromPool( nDfltColl );
+ pCollToSet = m_pCSS1Parser->GetTextCollFromPool( nDfltColl );
const SvxLRSpaceItem& rLRItem = pCollToSet->GetLRSpace();
if( !nLeftMargin )
nLeftMargin = static_cast< sal_uInt16 >(rLRItem.GetTextLeft());
@@ -4715,16 +4715,16 @@ void SwHTMLParser::SetTextCollAttrs( _HTMLAttrContext *pContext )
}
// bisherige harte Attributierung des Absatzes entfernen
- if( !aParaAttrs.empty() )
+ if( !m_aParaAttrs.empty() )
{
- for( auto pParaAttr : aParaAttrs )
+ for( auto pParaAttr : m_aParaAttrs )
pParaAttr->Invalidate();
- aParaAttrs.clear();
+ m_aParaAttrs.clear();
}
// Die Vorlage setzen
- pDoc->SetTextFormatColl( *pPam, pCollToSet );
+ m_pDoc->SetTextFormatColl( *m_pPam, pCollToSet );
// ggf. noch den Absatz-Einzug korrigieren
const SvxLRSpaceItem& rLRItem = pCollToSet->GetLRSpace();
@@ -4744,10 +4744,10 @@ void SwHTMLParser::SetTextCollAttrs( _HTMLAttrContext *pContext )
pItemSet->Put( aLRItem );
else
{
- NewAttr( &aAttrTab.pLRSpace, aLRItem );
- aAttrTab.pLRSpace->SetLikePara();
- aParaAttrs.push_back( aAttrTab.pLRSpace );
- EndAttr( aAttrTab.pLRSpace, 0, false );
+ NewAttr( &m_aAttrTab.pLRSpace, aLRItem );
+ m_aAttrTab.pLRSpace->SetLikePara();
+ m_aParaAttrs.push_back( m_aAttrTab.pLRSpace );
+ EndAttr( m_aAttrTab.pLRSpace, 0, false );
}
}
@@ -4792,18 +4792,18 @@ void SwHTMLParser::NewCharFormat( int nToken )
_HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken) );
// die Vorlage setzen und im Kontext merken
- SwCharFormat* pCFormat = pCSS1Parser->GetChrFormat( static_cast< sal_uInt16 >(nToken), aClass );
+ SwCharFormat* pCFormat = m_pCSS1Parser->GetChrFormat( static_cast< sal_uInt16 >(nToken), aClass );
OSL_ENSURE( pCFormat, "keine Zeichenvorlage zu Token gefunden" );
// Styles parsen (zu Class siehe auch NewPara)
if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
{
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( ParseStyleOptions( aStyle, aId, aEmptyOUStr, aItemSet, aPropInfo, &aLang, &aDir ) )
{
- OSL_ENSURE( aClass.isEmpty() || !pCSS1Parser->GetClass( aClass ),
+ OSL_ENSURE( aClass.isEmpty() || !m_pCSS1Parser->GetClass( aClass ),
"Class wird nicht beruecksichtigt" );
DoPositioning( aItemSet, aPropInfo, pCntxt );
InsertAttrs( aItemSet, aPropInfo, pCntxt, true );
@@ -4814,7 +4814,7 @@ void SwHTMLParser::NewCharFormat( int nToken )
// koennen nie durch Styles eingefuegt werden. Das Attribut ist deshalb
// auch gar nicht im CSS1-Which-Range enthalten
if( pCFormat )
- InsertAttr( &aAttrTab.pCharFormats, SwFormatCharFormat( pCFormat ), pCntxt );
+ InsertAttr( &m_aAttrTab.pCharFormats, SwFormatCharFormat( pCFormat ), pCntxt );
// den Kontext merken
PushContext( pCntxt );
@@ -4876,7 +4876,7 @@ void SwHTMLParser::InsertSpacer()
// einen leeren Textrahmen anlegen
// den Itemset holen
- SfxItemSet aFrmSet( pDoc->GetAttrPool(),
+ SfxItemSet aFrmSet( m_pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs( aFrmSet );
@@ -4887,8 +4887,8 @@ void SwHTMLParser::InsertSpacer()
// und noch die Groesse des Rahmens
Size aDfltSz( MINFLY, MINFLY );
Size aSpace( 0, 0 );
- SfxItemSet aDummyItemSet( pDoc->GetAttrPool(),
- pCSS1Parser->GetWhichMap() );
+ SfxItemSet aDummyItemSet( m_pDoc->GetAttrPool(),
+ m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aDummyPropInfo;
SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight,
@@ -4903,8 +4903,8 @@ void SwHTMLParser::InsertSpacer()
// der Rahmen anlegen
RndStdIds eAnchorId =
static_cast<const SwFormatAnchor &>(aFrmSet.Get(RES_ANCHOR)).GetAnchorId();
- SwFrameFormat *pFlyFormat = pDoc->MakeFlySection( eAnchorId,
- pPam->GetPoint(), &aFrmSet );
+ SwFrameFormat *pFlyFormat = m_pDoc->MakeFlySection( eAnchorId,
+ m_pPam->GetPoint(), &aFrmSet );
// Ggf Frames anlegen und auto-geb. Rahmen registrieren
RegisterFlyFrm( pFlyFormat );
}
@@ -4921,14 +4921,14 @@ void SwHTMLParser::InsertSpacer()
// einen Absatz-Abstand setzen
SwTextNode *pTextNode = 0;
- if( !pPam->GetPoint()->nContent.GetIndex() )
+ if( !m_pPam->GetPoint()->nContent.GetIndex() )
{
// den unteren Absatz-Abstand des vorherigen Nodes aendern,
// wenn moeglich
SetAttr(); // noch offene Absatz-Attribute setzen
- pTextNode = pDoc->GetNodes()[pPam->GetPoint()->nNode.GetIndex()-1]
+ pTextNode = m_pDoc->GetNodes()[m_pPam->GetPoint()->nNode.GetIndex()-1]
->GetTextNode();
// Wenn der Abstz davor kein Textenode ist, dann wird jetzt
@@ -4947,8 +4947,8 @@ void SwHTMLParser::InsertSpacer()
}
else
{
- NewAttr( &aAttrTab.pULSpace, SvxULSpaceItem( 0, (sal_uInt16)nSize, RES_UL_SPACE ) );
- EndAttr( aAttrTab.pULSpace, 0, false );
+ NewAttr( &m_aAttrTab.pULSpace, SvxULSpaceItem( 0, (sal_uInt16)nSize, RES_UL_SPACE ) );
+ EndAttr( m_aAttrTab.pULSpace, 0, false );
AppendTextNode(); // nicht am Abstand drehen!
}
@@ -4967,7 +4967,7 @@ void SwHTMLParser::InsertSpacer()
MapMode(MAP_TWIP) ).Width();
}
- if( !pPam->GetPoint()->nContent.GetIndex() )
+ if( !m_pPam->GetPoint()->nContent.GetIndex() )
{
sal_uInt16 nLeft=0, nRight=0;
short nIndent = 0;
@@ -4980,15 +4980,15 @@ void SwHTMLParser::InsertSpacer()
aLRItem.SetRight( nRight );
aLRItem.SetTextFirstLineOfst( nIndent );
- NewAttr( &aAttrTab.pLRSpace, aLRItem );
- EndAttr( aAttrTab.pLRSpace, 0, false );
+ NewAttr( &m_aAttrTab.pLRSpace, aLRItem );
+ EndAttr( m_aAttrTab.pLRSpace, 0, false );
}
else
{
- NewAttr( &aAttrTab.pKerning, SvxKerningItem( (short)nSize, RES_CHRATR_KERNING ) );
+ NewAttr( &m_aAttrTab.pKerning, SvxKerningItem( (short)nSize, RES_CHRATR_KERNING ) );
OUString aTmp( ' ' );
- pDoc->getIDocumentContentOperations().InsertString( *pPam, aTmp );
- EndAttr( aAttrTab.pKerning );
+ m_pDoc->getIDocumentContentOperations().InsertString( *m_pPam, aTmp );
+ EndAttr( m_aAttrTab.pKerning );
}
}
}
@@ -5008,27 +5008,27 @@ sal_uInt16 SwHTMLParser::ToTwips( sal_uInt16 nPixel )
SwTwips SwHTMLParser::GetCurrentBrowseWidth()
{
- const SwTwips nWidth = SwHTMLTableLayout::GetBrowseWidth( *pDoc );
+ const SwTwips nWidth = SwHTMLTableLayout::GetBrowseWidth( *m_pDoc );
if( nWidth )
return nWidth;
- if( !aHTMLPageSize.Width() )
+ if( !m_aHTMLPageSize.Width() )
{
- const SwFrameFormat& rPgFormat = pCSS1Parser->GetMasterPageDesc()->GetMaster();
+ const SwFrameFormat& rPgFormat = m_pCSS1Parser->GetMasterPageDesc()->GetMaster();
const SwFormatFrmSize& rSz = rPgFormat.GetFrmSize();
const SvxLRSpaceItem& rLR = rPgFormat.GetLRSpace();
const SvxULSpaceItem& rUL = rPgFormat.GetULSpace();
const SwFormatCol& rCol = rPgFormat.GetCol();
- aHTMLPageSize.Width() = rSz.GetWidth() - rLR.GetLeft() - rLR.GetRight();
- aHTMLPageSize.Height() = rSz.GetHeight() - rUL.GetUpper() - rUL.GetLower();
+ m_aHTMLPageSize.Width() = rSz.GetWidth() - rLR.GetLeft() - rLR.GetRight();
+ m_aHTMLPageSize.Height() = rSz.GetHeight() - rUL.GetUpper() - rUL.GetLower();
if( 1 < rCol.GetNumCols() )
- aHTMLPageSize.Width() /= rCol.GetNumCols();
+ m_aHTMLPageSize.Width() /= rCol.GetNumCols();
}
- return aHTMLPageSize.Width();
+ return m_aHTMLPageSize.Width();
}
void SwHTMLParser::InsertIDOption()
@@ -5107,11 +5107,11 @@ void SwHTMLParser::InsertLineBreak()
// CLEAR wird nur fuer den aktuellen Absaetz unterstuetzt
if( bClearLeft || bClearRight )
{
- SwNodeIndex& rNodeIdx = pPam->GetPoint()->nNode;
+ SwNodeIndex& rNodeIdx = m_pPam->GetPoint()->nNode;
SwTextNode* pTextNd = rNodeIdx.GetNode().GetTextNode();
if( pTextNd )
{
- const SwFrameFormats& rFrameFormatTable = *pDoc->GetSpzFrameFormats();
+ const SwFrameFormats& rFrameFormatTable = *m_pDoc->GetSpzFrameFormats();
for( size_t i=0; i<rFrameFormatTable.size(); i++ )
{
@@ -5129,7 +5129,7 @@ void SwHTMLParser::InsertLineBreak()
: pFormat->GetHoriOrient().GetHoriOrient();
SwSurround eSurround = SURROUND_PARALLEL;
- if( pPam->GetPoint()->nContent.GetIndex() )
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
{
if( bClearLeft && text::HoriOrientation::LEFT==eHori )
eSurround = SURROUND_RIGHT;
@@ -5160,12 +5160,12 @@ void SwHTMLParser::InsertLineBreak()
bool bBreakItem = false;
if( HasStyleOptions( aStyle, aId, aClass ) )
{
- SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
+ SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo ) )
{
- if( pCSS1Parser->SetFormatBreak( aItemSet, aPropInfo ) )
+ if( m_pCSS1Parser->SetFormatBreak( aItemSet, aPropInfo ) )
{
aBreakItem = static_cast<const SvxFormatBreakItem &>(aItemSet.Get( RES_BREAK ));
bBreakItem = true;
@@ -5177,8 +5177,8 @@ void SwHTMLParser::InsertLineBreak()
if( bBreakItem && SVX_BREAK_PAGE_AFTER==aBreakItem.GetBreak() )
{
- NewAttr( &aAttrTab.pBreak, aBreakItem );
- EndAttr( aAttrTab.pBreak, 0, false );
+ NewAttr( &m_aAttrTab.pBreak, aBreakItem );
+ EndAttr( m_aAttrTab.pBreak, 0, false );
}
if( !bCleared && !bBreakItem )
@@ -5186,9 +5186,9 @@ void SwHTMLParser::InsertLineBreak()
// wenn kein CLEAR ausgefuehrt werden sollte oder konnte, wird
// ein Zeilenumbruch eingef?gt
OUString sTmp( (sal_Unicode)0x0a ); // make the Mac happy :-)
- pDoc->getIDocumentContentOperations().InsertString( *pPam, sTmp );
+ m_pDoc->getIDocumentContentOperations().InsertString( *m_pPam, sTmp );
}
- else if( pPam->GetPoint()->nContent.GetIndex() )
+ else if( m_pPam->GetPoint()->nContent.GetIndex() )
{
// wenn ein clear in einem nicht-leeren Absatz ausgefuehrt wurde,
// muss anschliessen ein neuer Absatz aufgemacht werden
@@ -5199,8 +5199,8 @@ void SwHTMLParser::InsertLineBreak()
}
if( bBreakItem && SVX_BREAK_PAGE_BEFORE==aBreakItem.GetBreak() )
{
- NewAttr( &aAttrTab.pBreak, aBreakItem );
- EndAttr( aAttrTab.pBreak, 0, false );
+ NewAttr( &m_aAttrTab.pBreak, aBreakItem );
+ EndAttr( m_aAttrTab.pBreak, 0, false );
}
}
@@ -5255,12 +5255,12 @@ void SwHTMLParser::InsertHorzRule()
}
}
- if( pPam->GetPoint()->nContent.GetIndex() )
+ if( m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( AM_NOSPACE );
- if( nOpenParaToken )
+ if( m_nOpenParaToken )
EndPara();
AppendTextNode();
- pPam->Move( fnMoveBackward );
+ m_pPam->Move( fnMoveBackward );
// ... und in einem Kontext merken
_HTMLAttrContext *pCntxt =
@@ -5272,8 +5272,8 @@ void SwHTMLParser::InsertHorzRule()
SetTextCollAttrs( pCntxt );
// die harten Attribute an diesem Absatz werden nie mehr ungueltig
- if( !aParaAttrs.empty() )
- aParaAttrs.clear();
+ if( !m_aParaAttrs.empty() )
+ m_aParaAttrs.clear();
if( nSize>0 || bColor || bNoShade )
{
@@ -5305,8 +5305,8 @@ void SwHTMLParser::InsertHorzRule()
SvxBoxItem aBoxItem(RES_BOX);
aBoxItem.SetLine( &aBorderLine, SvxBoxItemLine::BOTTOM );
- _HTMLAttr* pTmp = new _HTMLAttr( *pPam->GetPoint(), aBoxItem );
- aSetAttrTab.push_back( pTmp );
+ _HTMLAttr* pTmp = new _HTMLAttr( *m_pPam->GetPoint(), aBoxItem );
+ m_aSetAttrTab.push_back( pTmp );
}
if( nWidth )
{
@@ -5315,7 +5315,7 @@ void SwHTMLParser::InsertHorzRule()
// Sinn. Um zu Vermeiden, dass die Linie bei der Breitenberechnung
// beruecksichtigt wird, bekommt sie aber trotzdem entsprechendes
// LRSpace-Item verpasst.
- if( !pTable )
+ if( !m_pTable )
{
// Laenge und Ausrichtung der Linie ueber Absatz-Einzuege "tuerken"
long nBrowseWidth = GetCurrentBrowseWidth();
@@ -5346,8 +5346,8 @@ void SwHTMLParser::InsertHorzRule()
break;
}
- _HTMLAttr* pTmp = new _HTMLAttr( *pPam->GetPoint(), aLRItem );
- aSetAttrTab.push_back( pTmp );
+ _HTMLAttr* pTmp = new _HTMLAttr( *m_pPam->GetPoint(), aLRItem );
+ m_aSetAttrTab.push_back( pTmp );
}
}
}
@@ -5361,7 +5361,7 @@ void SwHTMLParser::InsertHorzRule()
OSL_ENSURE( pPoppedContext==pCntxt, "wo kommt denn da ein HR-Kontext her?" );
delete pPoppedContext;
- pPam->Move( fnMoveForward );
+ m_pPam->Move( fnMoveForward );
// und im Absatz danach die dort aktuelle Vorlage setzen
SetTextCollAttrs();
@@ -5434,7 +5434,7 @@ void SwHTMLParser::ParseMoreMetaOptions()
sText.append("\">");
SwPostItField aPostItField(
- static_cast<SwPostItFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_POSTITFLD )),
+ static_cast<SwPostItFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_POSTITFLD )),
aEmptyOUStr, sText.makeStringAndClear(), aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM ) );
SwFormatField aFormatField( aPostItField );
InsertAttr( aFormatField );
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index f58831248e63..4f18d04b6c38 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -357,127 +357,127 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
friend class _CellSaveStruct;
friend class _CaptionSaveStruct;
- OUString aPathToFile;
- OUString sBaseURL;
- OUString sSaveBaseURL;
- OUString aBasicLib;
- OUString aBasicModule;
- OUString aScriptSource; // Inhalt des aktuellen Script-Blocks
- OUString aScriptType; // Type des gelesenen Scripts (StarBasic/VB/JAVA)
- OUString aScriptURL; // URL eines Scripts
- OUString aStyleSource; // Inhalt des aktuellen Style-Sheets
- OUString aContents; // Text des akteullen Marquee, Feldes etc.
- OUString sTitle;
- OUString aUnknownToken; // ein gestartetes unbekanntes Token
- OUString aBulletGrfs[MAXLEVEL];
- OUString sJmpMark;
-
- std::vector<sal_uInt16> aBaseFontStack; // Stack fuer <BASEFONT>
+ OUString m_aPathToFile;
+ OUString m_sBaseURL;
+ OUString m_sSaveBaseURL;
+ OUString m_aBasicLib;
+ OUString m_aBasicModule;
+ OUString m_aScriptSource; // Inhalt des aktuellen Script-Blocks
+ OUString m_aScriptType; // Type des gelesenen Scripts (StarBasic/VB/JAVA)
+ OUString m_aScriptURL; // URL eines Scripts
+ OUString m_aStyleSource; // Inhalt des aktuellen Style-Sheets
+ OUString m_aContents; // Text des akteullen Marquee, Feldes etc.
+ OUString m_sTitle;
+ OUString m_aUnknownToken; // ein gestartetes unbekanntes Token
+ OUString m_aBulletGrfs[MAXLEVEL];
+ OUString m_sJmpMark;
+
+ std::vector<sal_uInt16> m_aBaseFontStack; // Stack fuer <BASEFONT>
// Bit 0-2: Fontgroesse (1-7)
- std::vector<sal_uInt16> aFontStack; // Stack fuer <FONT>, <BIG>, <SMALL>
+ std::vector<sal_uInt16> m_aFontStack; // Stack fuer <FONT>, <BIG>, <SMALL>
// Bit 0-2: Fontgroesse (1-7)
// Bit 15: Fontfarbe wurde gesetzt
- _HTMLAttrs aSetAttrTab;// "geschlossene", noch nicht gesetzte Attr.
- _HTMLAttrs aParaAttrs; // vorlauefige Absatz-Attribute
- _HTMLAttrTable aAttrTab; // "offene" Attribute
- _HTMLAttrContexts aContexts;// der aktuelle Attribut/Token-Kontext
- std::vector<SwFrameFormat *> aMoveFlyFrms;// Fly-Frames, the anchor is moved
- std::deque<sal_Int32> aMoveFlyCnts;// and the Content-Positions
+ _HTMLAttrs m_aSetAttrTab;// "geschlossene", noch nicht gesetzte Attr.
+ _HTMLAttrs m_aParaAttrs; // vorlauefige Absatz-Attribute
+ _HTMLAttrTable m_aAttrTab; // "offene" Attribute
+ _HTMLAttrContexts m_aContexts;// der aktuelle Attribut/Token-Kontext
+ std::vector<SwFrameFormat *> m_aMoveFlyFrms;// Fly-Frames, the anchor is moved
+ std::deque<sal_Int32> m_aMoveFlyCnts;// and the Content-Positions
- SwApplet_Impl *pAppletImpl; // das aktuelle Applet
+ SwApplet_Impl *m_pAppletImpl; // das aktuelle Applet
- SwCSS1Parser *pCSS1Parser; // der Style-Sheet-Parser
- SwHTMLNumRuleInfo *pNumRuleInfo;
- SwPendingStack *pPendStack;
+ SwCSS1Parser *m_pCSS1Parser; // der Style-Sheet-Parser
+ SwHTMLNumRuleInfo *m_pNumRuleInfo;
+ SwPendingStack *m_pPendStack;
- SwDoc *pDoc;
- SwPaM *pPam; // SwPosition duerfte doch reichen, oder ??
- SwViewShell *pActionViewShell; // SwViewShell, an der das StartAction
+ SwDoc *m_pDoc;
+ SwPaM *m_pPam; // SwPosition duerfte doch reichen, oder ??
+ SwViewShell *m_pActionViewShell; // SwViewShell, an der das StartAction
// gerufen wurde.
- SwNodeIndex *pSttNdIdx;
+ SwNodeIndex *m_pSttNdIdx;
- HTMLTable *pTable; // die aktuelle "auesserste" Tabelle
- SwHTMLForm_Impl *pFormImpl;// die aktuelle Form
- SdrObject *pMarquee; // aktuelles Marquee
- SwField *pField; // aktuelles Feld
- ImageMap *pImageMap; // aktuelle Image-Map
+ HTMLTable *m_pTable; // die aktuelle "auesserste" Tabelle
+ SwHTMLForm_Impl *m_pFormImpl;// die aktuelle Form
+ SdrObject *m_pMarquee; // aktuelles Marquee
+ SwField *m_pField; // aktuelles Feld
+ ImageMap *m_pImageMap; // aktuelle Image-Map
ImageMaps *m_pImageMaps; ///< all Image-Maps that have been read
- SwHTMLFootEndNote_Impl *pFootEndNoteImpl;
-
- Size aHTMLPageSize; // die Seitengroesse der HTML-Vorlage
-
- sal_uInt32 aFontHeights[7]; // die Font-Hoehen 1-7
- sal_uInt32 nScriptStartLineNr; // Zeilennummer eines Script-Blocks
- ImplSVEvent * nEventId;
-
- sal_uInt16 nBaseFontStMin;
- sal_uInt16 nFontStMin;
- sal_uInt16 nDefListDeep;
- sal_uInt16 nFontStHeadStart; // Elemente im Font-Stack bei <Hn>
- sal_uInt16 nSBModuleCnt; // Zaehler fuer Basic-Module
- sal_uInt16 nMissingImgMaps; // Wie viele Image-Maps fehlen noch?
- size_t nParaCnt;
- size_t nContextStMin; // Untergrenze fuer PopContext
- size_t nContextStAttrMin; // Untergrenze fuer Attributierung
- sal_uInt16 nSelectEntryCnt; // Anzahl der Eintraege der akt. Listbox
- sal_uInt16 nOpenParaToken; // ein geoeffnetes Absatz-Element
+ SwHTMLFootEndNote_Impl *m_pFootEndNoteImpl;
+
+ Size m_aHTMLPageSize; // die Seitengroesse der HTML-Vorlage
+
+ sal_uInt32 m_aFontHeights[7]; // die Font-Hoehen 1-7
+ sal_uInt32 m_nScriptStartLineNr; // Zeilennummer eines Script-Blocks
+ ImplSVEvent * m_nEventId;
+
+ sal_uInt16 m_nBaseFontStMin;
+ sal_uInt16 m_nFontStMin;
+ sal_uInt16 m_nDefListDeep;
+ sal_uInt16 m_nFontStHeadStart; // Elemente im Font-Stack bei <Hn>
+ sal_uInt16 m_nSBModuleCnt; // Zaehler fuer Basic-Module
+ sal_uInt16 m_nMissingImgMaps; // Wie viele Image-Maps fehlen noch?
+ size_t m_nParaCnt;
+ size_t m_nContextStMin; // Untergrenze fuer PopContext
+ size_t m_nContextStAttrMin; // Untergrenze fuer Attributierung
+ sal_uInt16 m_nSelectEntryCnt; // Anzahl der Eintraege der akt. Listbox
+ sal_uInt16 m_nOpenParaToken; // ein geoeffnetes Absatz-Element
enum JumpToMarks { JUMPTO_NONE, JUMPTO_MARK, JUMPTO_TABLE, JUMPTO_FRAME,
- JUMPTO_REGION, JUMPTO_GRAPHIC } eJumpTo;
+ JUMPTO_REGION, JUMPTO_GRAPHIC } m_eJumpTo;
#ifdef DBG_UTIL
sal_uInt16 m_nContinue; // depth of Continue calls
#endif
- SvxAdjust eParaAdjust; // Ausrichtung des aktuellen Absatz
- HTMLScriptLanguage eScriptLang; // die aktuelle Script-Language
+ SvxAdjust m_eParaAdjust; // Ausrichtung des aktuellen Absatz
+ HTMLScriptLanguage m_eScriptLang; // die aktuelle Script-Language
- bool bOldIsHTMLMode : 1; // War's mal ein HTML-Dokument?
+ bool m_bOldIsHTMLMode : 1; // War's mal ein HTML-Dokument?
- bool bDocInitalized : 1; // Dokument bzw. Shell wurden initialisiert
+ bool m_bDocInitalized : 1; // Dokument bzw. Shell wurden initialisiert
// Flag um doppeltes init durch Rekursion
// zu verhindern.
- bool bViewCreated : 1; // die View wurde schon erzeugt (asynchron)
- bool bSetCrsr : 1; // Crsr wieder auf den Anfang setzen
- bool bSetModEnabled : 1;
+ bool m_bViewCreated : 1; // die View wurde schon erzeugt (asynchron)
+ bool m_bSetCrsr : 1; // Crsr wieder auf den Anfang setzen
+ bool m_bSetModEnabled : 1;
- bool bInFloatingFrame : 1; // Wir sind in einen Floating Frame
- bool bInField : 1;
- bool bKeepUnknown : 1; // unbekannte/nicht unterstuetze Tokens beh.
+ bool m_bInFloatingFrame : 1; // Wir sind in einen Floating Frame
+ bool m_bInField : 1;
+ bool m_bKeepUnknown : 1; // unbekannte/nicht unterstuetze Tokens beh.
// 8
- bool bCallNextToken : 1; // In Tabellen: NextToken in jedem Fall rufen
- bool bIgnoreRawData : 1; // Inhalt eines Scripts/Styles ignorieren.
- bool bLBEntrySelected : 1; // Ist der aktuelle Listbox-Eintrag selekt.
- bool bTAIgnoreNewPara : 1; // naechstes LF in TextArea ignorieren?
- bool bFixMarqueeWidth : 1; // Groesse einer Laufschrift anpassen?
- bool bFixMarqueeHeight : 1;
-
- bool bUpperSpace : 1; // obererer Absatz-Abstand wird benoetigt
- bool bNoParSpace : 1;
+ bool m_bCallNextToken : 1; // In Tabellen: NextToken in jedem Fall rufen
+ bool m_bIgnoreRawData : 1; // Inhalt eines Scripts/Styles ignorieren.
+ bool m_bLBEntrySelected : 1; // Ist der aktuelle Listbox-Eintrag selekt.
+ bool m_bTAIgnoreNewPara : 1; // naechstes LF in TextArea ignorieren?
+ bool m_bFixMarqueeWidth : 1; // Groesse einer Laufschrift anpassen?
+ bool m_bFixMarqueeHeight : 1;
+
+ bool m_bUpperSpace : 1; // obererer Absatz-Abstand wird benoetigt
+ bool m_bNoParSpace : 1;
// 16
- bool bAnyStarBasic : 1; // gibt es ueberhaupt ein StarBasic-Modul
- bool bInNoEmbed : 1; // Wir sind in einem NOEMBED-Bereich
+ bool m_bAnyStarBasic : 1; // gibt es ueberhaupt ein StarBasic-Modul
+ bool m_bInNoEmbed : 1; // Wir sind in einem NOEMBED-Bereich
- bool bInTitle : 1; // Wir sind im Titel
+ bool m_bInTitle : 1; // Wir sind im Titel
- bool bChkJumpMark : 1; // springe ggfs. zu einem vorgegebenem Mark
- bool bUpdateDocStat : 1;
- bool bFixSelectWidth : 1; // Breite eines Selects neu setzen?
- bool bFixSelectHeight : 1; // Breite eines Selects neu setzen?
- bool bTextArea : 1;
+ bool m_bChkJumpMark : 1; // springe ggfs. zu einem vorgegebenem Mark
+ bool m_bUpdateDocStat : 1;
+ bool m_bFixSelectWidth : 1; // Breite eines Selects neu setzen?
+ bool m_bFixSelectHeight : 1; // Breite eines Selects neu setzen?
+ bool m_bTextArea : 1;
// 24
- bool bSelect : 1;
- bool bInFootEndNoteAnchor : 1;
- bool bInFootEndNoteSymbol : 1;
- bool bIgnoreHTMLComments : 1;
- bool bRemoveHidden : 1; // the filter implementation might set the hidden flag
+ bool m_bSelect : 1;
+ bool m_bInFootEndNoteAnchor : 1;
+ bool m_bInFootEndNoteSymbol : 1;
+ bool m_bIgnoreHTMLComments : 1;
+ bool m_bRemoveHidden : 1; // the filter implementation might set the hidden flag
/// the names corresponding to the DOCINFO field subtypes INFO[1-4]
OUString m_InfoNames[4];
- SfxViewFrame* pTempViewFrame;
+ SfxViewFrame* m_pTempViewFrame;
void DeleteFormImpl();
@@ -495,7 +495,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
inline void SetAttr( bool bChkEnd = true, bool bBeforeTable = false,
_HTMLAttrs *pPostIts = 0 )
{
- if( !aSetAttrTab.empty() || !aMoveFlyFrms.empty() )
+ if( !m_aSetAttrTab.empty() || !m_aMoveFlyFrms.empty() )
_SetAttr( bChkEnd, bBeforeTable, pPostIts );
}
@@ -545,7 +545,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
SwTwips GetCurrentBrowseWidth();
- SwHTMLNumRuleInfo& GetNumInfo() { return *pNumRuleInfo; }
+ SwHTMLNumRuleInfo& GetNumInfo() { return *m_pNumRuleInfo; }
// add parameter <bCountedInList>
void SetNodeNum( sal_uInt8 nLevel, bool bCountedInList );
@@ -717,7 +717,7 @@ private:
void InsertParam(); // htmlplug.cxx
void InsertFloatingFrame();
- void EndFloatingFrame() { bInFloatingFrame = false; }
+ void EndFloatingFrame() { m_bInFloatingFrame = false; }
// <BODY>-Tag auswerten: Hintergrund-Grafiken und -Farben setzen (htmlgrin.cxx)
void InsertBodyOptions();
@@ -978,7 +978,7 @@ inline bool SwHTMLParser::HasStyleOptions( const OUString &rStyle,
inline void SwHTMLParser::PushContext( _HTMLAttrContext *pCntxt )
{
- aContexts.push_back( pCntxt );
+ m_aContexts.push_back( pCntxt );
}
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 16:31:12 +0000