sw/source/filter/html/htmlbas.cxx | 88 -
sw/source/filter/html/htmlcss1.cxx | 156 +--
sw/source/filter/html/htmlctxt.cxx | 102 +-
sw/source/filter/html/htmldrawreader.cxx | 70 -
sw/source/filter/html/htmlfld.cxx | 82 -
sw/source/filter/html/htmlform.cxx | 232 ++---
sw/source/filter/html/htmlftn.cxx | 78 -
sw/source/filter/html/htmlgrin.cxx | 208 ++--
sw/source/filter/html/htmlnumreader.cxx | 66 -
sw/source/filter/html/htmlplug.cxx | 102 +-
sw/source/filter/html/htmlsect.cxx | 112 +-
sw/source/filter/html/htmltab.cxx | 536 +++++------
sw/source/filter/html/swhtml.cxx | 1386 +++++++++++++++----------------
sw/source/filter/html/swhtml.hxx | 186 ++--
14 files changed, 1702 insertions(+), 1702 deletions(-)
New commits:
commit 87f0fa6b57bab798c5c6c2acfa619a8ea9f1b2aa
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Nov 5 10:13:37 2015 +0100
sw: prefix members of SwHTMLParser
Change-Id: I3d4b39a79c49f847c6814215593d86e8d992b38a
diff --git a/sw/source/filter/html/htmlbas.cxx
b/sw/source/filter/html/htmlbas.cxx
index 251fa71..303d8e1 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 ee3faef..0b996e6 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 665384d..e333bb7 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 b5cc039..4f47da9 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 9e3a9d9..f6fcb5d 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 1941ff4..f9c5ded 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 f9662ac..06a6aa8 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 6fc01a9..8bc0b7c 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();
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
