summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-11-05 08:56:03 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-11-05 08:56:03 +0100
commitb46496c4154ff3784ecd59ed6e15b6ee07a66f22 (patch)
tree931b02a574a90599fefbc8d98930264ac41760a7
parente8fa13a8652e3901d335193c78ca7b228a7d7346 (diff)
sw: prefix members of SwHTMLWriter
Change-Id: I571b3cc8c6120ccddc79659e8e58b536c79f2430
Diffstat
-rw-r--r--sw/source/filter/html/css1atr.cxx186
-rw-r--r--sw/source/filter/html/htmlatr.cxx424
-rw-r--r--sw/source/filter/html/htmlbas.cxx8
-rw-r--r--sw/source/filter/html/htmldrawwriter.cxx4
-rw-r--r--sw/source/filter/html/htmlfldw.cxx38
-rw-r--r--sw/source/filter/html/htmlflywriter.cxx174
-rw-r--r--sw/source/filter/html/htmlforw.cxx98
-rw-r--r--sw/source/filter/html/htmlftn.cxx90
-rw-r--r--sw/source/filter/html/htmlnumwriter.cxx34
-rw-r--r--sw/source/filter/html/htmlplug.cxx28
-rw-r--r--sw/source/filter/html/htmltabw.cxx68
-rw-r--r--sw/source/filter/html/wrthtml.cxx516
-rw-r--r--sw/source/filter/html/wrthtml.hxx180
13 files changed, 924 insertions, 924 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 70c899a6cde3..a8e9502e78d7 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -195,18 +195,18 @@ public:
SwCSS1OutMode( SwHTMLWriter& rHWrt, sal_uInt16 nMode, bool bStartFirst=true,
const OUString *pSelector=0 ) :
rWrt( rHWrt ),
- nOldMode( rHWrt.nCSS1OutMode )
+ nOldMode( rHWrt.m_nCSS1OutMode )
{
- rWrt.nCSS1OutMode = nMode;
+ rWrt.m_nCSS1OutMode = nMode;
if( bStartFirst )
- rWrt.bFirstCSS1Property = true;
+ rWrt.m_bFirstCSS1Property = true;
if( pSelector )
- rWrt.aCSS1Selector = *pSelector;
+ rWrt.m_aCSS1Selector = *pSelector;
}
~SwCSS1OutMode()
{
- rWrt.nCSS1OutMode = nOldMode;
+ rWrt.m_nCSS1OutMode = nOldMode;
}
};
@@ -216,9 +216,9 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
{
OStringBuffer sOut;
- if( bFirstCSS1Rule && (nCSS1OutMode & CSS1_OUTMODE_RULE_ON)!=0 )
+ if( m_bFirstCSS1Rule && (m_nCSS1OutMode & CSS1_OUTMODE_RULE_ON)!=0 )
{
- bFirstCSS1Rule = false;
+ m_bFirstCSS1Rule = false;
OutNewLine();
sOut.append("<" + OString(OOO_STRING_SVTOOLS_HTML_style) + " " +
OString(OOO_STRING_SVTOOLS_HTML_O_type) + "=\"text/css\">");
@@ -252,7 +252,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
// z-index: 1
// }
- if (bCfgPrintLayout) {
+ if (m_bCfgPrintLayout) {
sOut.append(
"p." + OString(sCSS2_P_CLASS_leaders) + "{max-width:" + OString::number(DOT_LEADERS_MAX_WIDTH) +
"cm;padding:0;overflow-x:hidden;line-height:120%}"
@@ -269,13 +269,13 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
IncIndentLevel();
}
- if( bFirstCSS1Property )
+ if( m_bFirstCSS1Property )
{
- switch( nCSS1OutMode & CSS1_OUTMODE_ANY_ON )
+ switch( m_nCSS1OutMode & CSS1_OUTMODE_ANY_ON )
{
case CSS1_OUTMODE_SPAN_TAG_ON:
case CSS1_OUTMODE_SPAN_TAG1_ON:
- if( bTagOn )
+ if( m_bTagOn )
{
sOut.append("<" + OString(OOO_STRING_SVTOOLS_HTML_span) +
" " + OString(OOO_STRING_SVTOOLS_HTML_O_style) + "=\"");
@@ -290,7 +290,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
case CSS1_OUTMODE_RULE_ON:
{
OutNewLine();
- sOut.append(OUStringToOString(aCSS1Selector, eDestEnc) + " { ");
+ sOut.append(OUStringToOString(m_aCSS1Selector, m_eDestEnc) + " { ");
}
break;
@@ -298,7 +298,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
sOut.append(" " + OString(OOO_STRING_SVTOOLS_HTML_O_style) + "=\"");
break;
}
- bFirstCSS1Property = false;
+ m_bFirstCSS1Property = false;
}
else
{
@@ -306,15 +306,15 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
}
sOut.append(OString(pProp) + ": ");
- if( nCSS1OutMode & CSS1_OUTMODE_ENCODE )
+ if( m_nCSS1OutMode & CSS1_OUTMODE_ENCODE )
{
// for STYLE-Option encode string
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
if( pVal )
HTMLOutFuncs::Out_String( Strm(), OUString::createFromAscii(pVal),
- eDestEnc, &aNonConvertableCharacters );
+ m_eDestEnc, &m_aNonConvertableCharacters );
else if( pSVal )
- HTMLOutFuncs::Out_String( Strm(), *pSVal, eDestEnc, &aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), *pSVal, m_eDestEnc, &m_aNonConvertableCharacters );
}
else
{
@@ -322,7 +322,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
if( pVal )
sOut.append(pVal);
else if( pSVal )
- sOut.append(OUStringToOString(*pSVal, eDestEnc));
+ sOut.append(OUStringToOString(*pSVal, m_eDestEnc));
}
if (!sOut.isEmpty())
@@ -462,7 +462,7 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal,
void SwHTMLWriter::OutCSS1_UnitProperty( const sal_Char *pProp, long nVal )
{
OStringBuffer sOut;
- AddUnitPropertyValue(sOut, nVal, eCSS1Unit);
+ AddUnitPropertyValue(sOut, nVal, m_eCSS1Unit);
OutCSS1_PropertyAscii(pProp, sOut.makeStringAndClear());
}
@@ -511,12 +511,12 @@ void SwHTMLWriter::OutCSS1_SfxItemSet( const SfxItemSet& rItemSet,
OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( *this, rItemSet, bDeep );
}
- if( !bFirstCSS1Property )
+ if( !m_bFirstCSS1Property )
{
// if a Property was exported as part of a Style-Option,
// the Option still needs to be finished
OStringBuffer sOut;
- switch( nCSS1OutMode & CSS1_OUTMODE_ANY_OFF )
+ switch( m_nCSS1OutMode & CSS1_OUTMODE_ANY_OFF )
{
case CSS1_OUTMODE_SPAN_TAG_OFF:
sOut.append(sCSS1_span_tag_end);
@@ -537,14 +537,14 @@ void SwHTMLWriter::OutCSS1_SfxItemSet( const SfxItemSet& rItemSet,
void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
{
- bFirstCSS1Rule = true;
+ m_bFirstCSS1Rule = true;
// Feature: PrintExt
if( IsHTMLMode(HTMLMODE_PRINT_EXT) )
{
const SwPageDesc *pFirstPageDesc = 0;
sal_uInt16 nFirstRefPoolId = RES_POOLPAGE_HTML;
- bCSS1IgnoreFirstPageDesc = true;
+ m_bCSS1IgnoreFirstPageDesc = true;
// First we try to guess how the document is constructed.
// Allowed are only the templates: HTML, 1st page, left page, and right page.
@@ -568,7 +568,7 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
{
// The document is one-sided; no matter what page, we do not create a 2-sided doc.
// The attribute is exported relative to the HTML page template.
- OutCSS1_SwPageDesc( *this, *pPageDesc, pStylePoolAccess, pTemplate,
+ OutCSS1_SwPageDesc( *this, *pPageDesc, pStylePoolAccess, m_pTemplate,
RES_POOLPAGE_HTML, true, false );
nFirstRefPoolId = pFollow->GetPoolFormatId();
}
@@ -578,17 +578,17 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
RES_POOLPAGE_LEFT == pFollow->GetPoolFormatId()) )
{
// the document is double-sided
- OutCSS1_SwPageDesc( *this, *pPageDesc, pStylePoolAccess, pTemplate,
+ OutCSS1_SwPageDesc( *this, *pPageDesc, pStylePoolAccess, m_pTemplate,
RES_POOLPAGE_HTML, true );
- OutCSS1_SwPageDesc( *this, *pFollow, pStylePoolAccess, pTemplate,
+ OutCSS1_SwPageDesc( *this, *pFollow, pStylePoolAccess, m_pTemplate,
RES_POOLPAGE_HTML, true );
nFirstRefPoolId = RES_POOLPAGE_RIGHT;
- bCSS1IgnoreFirstPageDesc = false;
+ m_bCSS1IgnoreFirstPageDesc = false;
}
// other cases we miss
if( pFirstPageDesc )
- OutCSS1_SwPageDesc( *this, *pFirstPageDesc, pStylePoolAccess, pTemplate,
+ OutCSS1_SwPageDesc( *this, *pFirstPageDesc, pStylePoolAccess, m_pTemplate,
nFirstRefPoolId, false );
}
@@ -606,7 +606,7 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
sal_uInt16 nPoolId = pColl->GetPoolFormatId();
if( !bUsed || nPoolId == RES_POOLCOLL_TEXT ||
pDoc->IsUsed( *pColl ) )
- OutCSS1_SwFormat( *this, *pColl, &pDoc->getIDocumentStylePoolAccess(), pTemplate );
+ OutCSS1_SwFormat( *this, *pColl, &pDoc->getIDocumentStylePoolAccess(), m_pTemplate );
}
// the Default-TextStyle is not also exported !!
@@ -618,7 +618,7 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
if( !bUsed || nPoolId == RES_POOLCHR_INET_NORMAL ||
nPoolId == RES_POOLCHR_INET_VISIT ||
pDoc->IsUsed( *pCFormat ) )
- OutCSS1_SwFormat( *this, *pCFormat, &pDoc->getIDocumentStylePoolAccess(), pTemplate );
+ OutCSS1_SwFormat( *this, *pCFormat, &pDoc->getIDocumentStylePoolAccess(), m_pTemplate );
}
bool bHasEndNotes {false};
@@ -642,7 +642,7 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
OutCSS1_SwFootnoteInfo( *this, pDoc->GetFootnoteInfo(), pDoc, bHasFootNotes, false );
OutCSS1_SwFootnoteInfo( *this, pDoc->GetEndNoteInfo(), pDoc, bHasEndNotes, true );
- if( !bFirstCSS1Rule )
+ if( !m_bFirstCSS1Rule )
{
DecIndentLevel();
@@ -651,11 +651,11 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
}
else
{
- bFirstCSS1Rule = false;
+ m_bFirstCSS1Rule = false;
}
- nDfltTopMargin = 0;
- nDfltBottomMargin = 0;
+ m_nDfltTopMargin = 0;
+ m_nDfltBottomMargin = 0;
}
// if pPseudo is set, Styles-Sheets will be exported;
@@ -1395,7 +1395,7 @@ static bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, const OUString& rSelector,
// must be there, because these two chr formats don't support
// script dependencies by now.
SwCSS1OutMode aMode( rHTMLWrt,
- rHTMLWrt.nCSS1Script|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE,
+ rHTMLWrt.m_nCSS1Script|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE,
true, &rSelector );
rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, false );
}
@@ -1499,7 +1499,7 @@ static void OutCSS1DropCapRule(
// must be there, because these two chr formats don't support
// script dependencies by now.
SwCSS1OutMode aMode( rHTMLWrt,
- rHTMLWrt.nCSS1Script|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
+ rHTMLWrt.m_nCSS1Script|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
true, &rSelector );
OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop );
}
@@ -1588,29 +1588,29 @@ static Writer& OutCSS1_SwFormat( Writer& rWrt, const SwFormat& rFormat,
if( !bCharFormat )
{
const SvxULSpaceItem& rULItem = pRefFormat->GetULSpace();
- rHTMLWrt.nDfltTopMargin = rULItem.GetUpper();
- rHTMLWrt.nDfltBottomMargin = rULItem.GetLower();
+ rHTMLWrt.m_nDfltTopMargin = rULItem.GetUpper();
+ rHTMLWrt.m_nDfltBottomMargin = rULItem.GetLower();
}
}
else if( CSS1_FMT_ISTAG==nDeep && !bCharFormat )
{
// set Default-distance above and below (for the
// case that there is no reference template)
- rHTMLWrt.nDfltTopMargin = 0;
- rHTMLWrt.nDfltBottomMargin = HTML_PARSPACE;
+ rHTMLWrt.m_nDfltTopMargin = 0;
+ rHTMLWrt.m_nDfltBottomMargin = HTML_PARSPACE;
if( USER_FMT & nPoolFormatId )
{
// user templates
const OUString aNm(rFormat.GetName());
if (aNm == "DD 1" || aNm == "DT 1")
- rHTMLWrt.nDfltBottomMargin = 0;
+ rHTMLWrt.m_nDfltBottomMargin = 0;
else if (aNm == OOO_STRING_SVTOOLS_HTML_listing)
- rHTMLWrt.nDfltBottomMargin = 0;
+ rHTMLWrt.m_nDfltBottomMargin = 0;
else if (aNm == OOO_STRING_SVTOOLS_HTML_preformtxt)
- rHTMLWrt.nDfltBottomMargin = 0;
+ rHTMLWrt.m_nDfltBottomMargin = 0;
else if (aNm == OOO_STRING_SVTOOLS_HTML_xmp)
- rHTMLWrt.nDfltBottomMargin = 0;
+ rHTMLWrt.m_nDfltBottomMargin = 0;
}
else
{
@@ -1623,13 +1623,13 @@ static Writer& OutCSS1_SwFormat( Writer& rWrt, const SwFormat& rFormat,
case RES_POOLCOLL_HEADLINE4:
case RES_POOLCOLL_HEADLINE5:
case RES_POOLCOLL_HEADLINE6:
- rHTMLWrt.nDfltTopMargin = HTML_HEADSPACE;
+ rHTMLWrt.m_nDfltTopMargin = HTML_HEADSPACE;
break;
case RES_POOLCOLL_SENDADRESS:
case RES_POOLCOLL_HTML_DT:
case RES_POOLCOLL_HTML_DD:
case RES_POOLCOLL_HTML_PRE:
- rHTMLWrt.nDfltBottomMargin = 0;
+ rHTMLWrt.m_nDfltBottomMargin = 0;
break;
}
}
@@ -1652,18 +1652,18 @@ static Writer& OutCSS1_SwFormat( Writer& rWrt, const SwFormat& rFormat,
bCheckForPseudo ) )
{
if( bCharFormat )
- rHTMLWrt.aScriptTextStyles.insert( rFormat.GetName() );
+ rHTMLWrt.m_aScriptTextStyles.insert( rFormat.GetName() );
else
{
if( nPoolFormatId==RES_POOLCOLL_TEXT )
- rHTMLWrt.aScriptParaStyles.insert( pDoc->GetTextCollFromPool( RES_POOLCOLL_STANDARD, false )->GetName() );
- rHTMLWrt.aScriptParaStyles.insert( rFormat.GetName() );
+ rHTMLWrt.m_aScriptParaStyles.insert( pDoc->GetTextCollFromPool( RES_POOLCOLL_STANDARD, false )->GetName() );
+ rHTMLWrt.m_aScriptParaStyles.insert( rFormat.GetName() );
}
bHasScriptDependencies = true;
}
- if( nPoolFormatId==RES_POOLCOLL_TEXT && !rHTMLWrt.bFirstCSS1Property )
- rHTMLWrt.bPoolCollTextModified = true;
+ if( nPoolFormatId==RES_POOLCOLL_TEXT && !rHTMLWrt.m_bFirstCSS1Property )
+ rHTMLWrt.m_bPoolCollTextModified = true;
// export Drop-Caps
const SfxPoolItem *pItem;
@@ -1768,15 +1768,15 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
// If for a Pseudo-Selector no Property had been set, we still
// have to export something, so that the corresponding template is
// created on the next import.
- if( rHTMLWrt.bFirstCSS1Property && bPseudo )
+ if( rHTMLWrt.m_bFirstCSS1Property && bPseudo )
{
rHTMLWrt.OutNewLine();
- OString sTmp(OUStringToOString(aSelector, rHTMLWrt.eDestEnc));
+ OString sTmp(OUStringToOString(aSelector, rHTMLWrt.m_eDestEnc));
rWrt.Strm().WriteCharPtr( sTmp.getStr() ).WriteCharPtr( " {" );
- rHTMLWrt.bFirstCSS1Property = false;
+ rHTMLWrt.m_bFirstCSS1Property = false;
}
- if( !rHTMLWrt.bFirstCSS1Property )
+ if( !rHTMLWrt.m_bFirstCSS1Property )
rWrt.Strm().WriteCharPtr( sCSS1_rule_end );
return rWrt;
@@ -1812,9 +1812,9 @@ static Writer& OutCSS1_SwFootnoteInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
// exported, so that Netscape displays the document correctly.
// Otherwise it is sufficient, to export the differences to the
// footnote and endnote template.
- if( !bHasNotes && rHTMLWrt.pTemplate )
+ if( !bHasNotes && rHTMLWrt.m_pTemplate )
{
- SwFormat *pRefFormat = rHTMLWrt.pTemplate->getIDocumentStylePoolAccess().GetCharFormatFromPool(
+ SwFormat *pRefFormat = rHTMLWrt.m_pTemplate->getIDocumentStylePoolAccess().GetCharFormatFromPool(
static_cast< sal_uInt16 >(bEndNote ? RES_POOLCHR_ENDNOTE : RES_POOLCHR_FOOTNOTE) );
if( pRefFormat )
SwHTMLWriter::SubtractItemSet( aItemSet, pRefFormat->GetAttrSet(),
@@ -1826,7 +1826,7 @@ static Writer& OutCSS1_SwFootnoteInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
( bEndNote ? OUString(OOO_STRING_SVTOOLS_HTML_sdendnote_sym)
: OUString(OOO_STRING_SVTOOLS_HTML_sdfootnote_sym));
if( OutCSS1Rule( rHTMLWrt, aSelector, aItemSet, true, false ))
- rHTMLWrt.aScriptTextStyles.insert( pSymCharFormat->GetName() );
+ rHTMLWrt.m_aScriptTextStyles.insert( pSymCharFormat->GetName() );
}
}
@@ -1857,7 +1857,7 @@ Writer& OutCSS1_BodyTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet )
OutCSS1_SvxBox( rWrt, *pItem );
}
- if( !rHTMLWrt.bFirstCSS1Property )
+ if( !rHTMLWrt.m_bFirstCSS1Property )
{
// if a Property was exported as part of a Style-Option,
// the Option still needs to be finished
@@ -1871,7 +1871,7 @@ Writer& OutCSS1_ParaTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- SwCSS1OutMode aMode( rHTMLWrt, rHTMLWrt.nCSS1Script|CSS1_OUTMODE_STYLE_OPT |
+ SwCSS1OutMode aMode( rHTMLWrt, rHTMLWrt.m_nCSS1Script|CSS1_OUTMODE_STYLE_OPT |
CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_PARA );
rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, false );
@@ -1887,7 +1887,7 @@ Writer& OutCSS1_HintSpanTag( Writer& rWrt, const SfxPoolItem& rHt )
Out( aCSS1AttrFnTab, rHt, rWrt );
- if( !rHTMLWrt.bFirstCSS1Property && rHTMLWrt.bTagOn )
+ if( !rHTMLWrt.m_bFirstCSS1Property && rHTMLWrt.m_bTagOn )
rWrt.Strm().WriteCharPtr( sCSS1_span_tag_end );
return rWrt;
@@ -1903,7 +1903,7 @@ Writer& OutCSS1_HintStyleOpt( Writer& rWrt, const SfxPoolItem& rHt )
Out( aCSS1AttrFnTab, rHt, rWrt );
- if( !rHTMLWrt.bFirstCSS1Property )
+ if( !rHTMLWrt.m_bFirstCSS1Property )
rWrt.Strm().WriteChar( '\"' );
return rWrt;
@@ -1919,7 +1919,7 @@ Writer& OutCSS1_TableBGStyleOpt( Writer& rWrt, const SfxPoolItem& rHt )
CSS1_OUTMODE_TABLEBOX );
OutCSS1_SvxBrush( rWrt, rHt, CSS1_BACKGROUND_TABLE );
- if( !rHTMLWrt.bFirstCSS1Property )
+ if( !rHTMLWrt.m_bFirstCSS1Property )
rWrt.Strm().WriteChar( '\"' );
return rWrt;
@@ -1953,7 +1953,7 @@ Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const SwNumRule& rNumRule,
nFirstLineOffset != nDfltFirstLineOffset )
rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_text_indent, nFirstLineOffset );
- if( !rHTMLWrt.bFirstCSS1Property )
+ if( !rHTMLWrt.m_bFirstCSS1Property )
rWrt.Strm().WriteChar( '\"' );
return rWrt;
@@ -2151,7 +2151,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat
if( pItemSet )
OutCSS1_SfxItemSet( *pItemSet, false );
- if( !bFirstCSS1Property )
+ if( !m_bFirstCSS1Property )
Strm().WriteChar( '\"' );
}
@@ -2172,7 +2172,7 @@ void SwHTMLWriter::OutCSS1_TableFrameFormatOptions( const SwFrameFormat& rFrameF
if( SfxItemState::SET==rItemSet.GetItemState( RES_LAYOUT_SPLIT, false, &pItem ) )
OutCSS1_SwFormatLayoutSplit( *this, *pItem );
- if( !bFirstCSS1Property )
+ if( !m_bFirstCSS1Property )
Strm().WriteChar( '\"' );
}
@@ -2181,7 +2181,7 @@ void SwHTMLWriter::OutCSS1_TableCellBorderHack(SwFrameFormat const& rFrameFormat
SwCSS1OutMode const aMode( *this,
CSS1_OUTMODE_STYLE_OPT_ON|CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_TABLEBOX );
OutCSS1_SvxBox(*this, rFrameFormat.GetBox());
- if (!bFirstCSS1Property)
+ if (!m_bFirstCSS1Property)
{
this->Strm().WriteChar( cCSS1_style_opt_end );
}
@@ -2204,7 +2204,7 @@ void SwHTMLWriter::OutCSS1_SectionFormatOptions( const SwFrameFormat& rFrameForm
OutCSS1_PropertyAscii(sCSS1_P_column_count, sColumnCount);
}
- if( !bFirstCSS1Property )
+ if( !m_bFirstCSS1Property )
Strm().WriteChar( '\"' );
}
@@ -2288,9 +2288,9 @@ void SwHTMLWriter::OutCSS1_FrameFormatBackground( const SwFrameFormat& rFrameFor
// At last there is the background of the page, and as the final rescue
// the value of the Config.
- OSL_ENSURE( pCurrPageDesc, "no page template found" );
+ OSL_ENSURE( m_pCurrPageDesc, "no page template found" );
if( !OutCSS1_FrameFormatBrush( *this,
- pCurrPageDesc->GetMaster().makeBackgroundBrushItem() ) )
+ m_pCurrPageDesc->GetMaster().makeBackgroundBrushItem() ) )
{
Color aColor( COL_WHITE );
@@ -2472,7 +2472,7 @@ static Writer& OutCSS1_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
// Colors do not need to be exported for Style-Option.
if( rHTMLWrt.IsCSS1Source( CSS1_OUTMODE_PARA ) &&
- !rHTMLWrt.bCfgPreferStyles )
+ !rHTMLWrt.m_bCfgPreferStyles )
return rWrt;
OSL_ENSURE( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
"write color as Hint?" );
@@ -2520,7 +2520,7 @@ static Writer& OutCSS1_SvxFont( Writer& rWrt, const SfxPoolItem& rHt )
OUString sOut;
// MS IE3b1 has problems with single quotes
- sal_uInt16 nMode = rHTMLWrt.nCSS1OutMode & CSS1_OUTMODE_ANY_ON;
+ sal_uInt16 nMode = rHTMLWrt.m_nCSS1OutMode & CSS1_OUTMODE_ANY_ON;
sal_Unicode cQuote = nMode == CSS1_OUTMODE_RULE_ON ? '\"' : '\'';
SwHTMLWriter::PrepareFontList( static_cast<const SvxFontItem&>(rHt), sOut, cQuote,
true );
@@ -2751,7 +2751,7 @@ static Writer& OutCSS1_SvxLineSpacing( Writer& rWrt, const SfxPoolItem& rHt )
// Netscape4 has big problems with cell heights if the line spacing is
// changed within a table and the width of the table is not calculated
// automatically (== if there is a WIDTH-Option)
- if( rHTMLWrt.bOutTable && rHTMLWrt.bCfgNetscape4 )
+ if( rHTMLWrt.m_bOutTable && rHTMLWrt.m_bCfgNetscape4 )
return rWrt;
const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(rHt);
@@ -2789,7 +2789,7 @@ static Writer& OutCSS1_SvxLineSpacing( Writer& rWrt, const SfxPoolItem& rHt )
if( nHeight )
rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_line_height, (long)nHeight );
else if( nPrcHeight &&
- !(nPrcHeight < 115 && rHTMLWrt.bParaDotLeaders )) // avoid HTML scrollbars and missing descenders
+ !(nPrcHeight < 115 && rHTMLWrt.m_bParaDotLeaders )) // avoid HTML scrollbars and missing descenders
{
OString sHeight(OString::number(nPrcHeight) + "%");
rHTMLWrt.OutCSS1_PropertyAscii(sCSS1_P_line_height, sHeight);
@@ -2804,7 +2804,7 @@ static Writer& OutCSS1_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt )
// Export Alignment in Style-Option only if the Tag does not allow ALIGN=xxx
if( rHTMLWrt.IsCSS1Source( CSS1_OUTMODE_PARA ) &&
- !rHTMLWrt.bNoAlign)
+ !rHTMLWrt.m_bNoAlign)
return rWrt;
const sal_Char* pStr = 0;
@@ -2889,7 +2889,7 @@ static void OutCSS1_SwFormatDropAttrs( SwHTMLWriter& rHWrt,
rHWrt.OutCSS1_SfxItemSet( *pCharFormatItemSet );
else if( pDCCharFormat )
rHWrt.OutCSS1_SfxItemSet( pDCCharFormat->GetAttrSet() );
- else if( (rHWrt.nCSS1OutMode & CSS1_OUTMODE_ANY_OFF) == CSS1_OUTMODE_RULE_OFF )
+ else if( (rHWrt.m_nCSS1OutMode & CSS1_OUTMODE_ANY_OFF) == CSS1_OUTMODE_RULE_OFF )
rHWrt.Strm().WriteCharPtr( sCSS1_rule_end );
}
@@ -2902,10 +2902,10 @@ static Writer& OutCSS1_SwFormatDrop( Writer& rWrt, const SfxPoolItem& rHt )
if( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT) )
return rWrt;
- if( rHTMLWrt.bTagOn )
+ if( rHTMLWrt.m_bTagOn )
{
SwCSS1OutMode aMode( rHTMLWrt,
- rHTMLWrt.nCSS1Script|CSS1_OUTMODE_SPAN_TAG1_ON|CSS1_OUTMODE_ENCODE|
+ rHTMLWrt.m_nCSS1Script|CSS1_OUTMODE_SPAN_TAG1_ON|CSS1_OUTMODE_ENCODE|
CSS1_OUTMODE_DROPCAP );
OutCSS1_SwFormatDropAttrs( rHTMLWrt, static_cast<const SwFormatDrop&>(rHt) );
@@ -3000,18 +3000,18 @@ static Writer& OutCSS1_SvxLRSpace( Writer& rWrt, const SfxPoolItem& rHt )
// match that of the current template
// A left margin can exist because of a list nearby
- long nLeftMargin = (long)rLRItem.GetTextLeft() - rHTMLWrt.nLeftMargin;
- if( rHTMLWrt.nDfltLeftMargin != nLeftMargin )
+ long nLeftMargin = (long)rLRItem.GetTextLeft() - rHTMLWrt.m_nLeftMargin;
+ if( rHTMLWrt.m_nDfltLeftMargin != nLeftMargin )
{
rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_margin_left, nLeftMargin );
// max-width = max-width - margin-left for TOC paragraphs with dot leaders
- if( rHTMLWrt.bParaDotLeaders )
+ if( rHTMLWrt.m_bParaDotLeaders )
rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_max_width, (long)(DOT_LEADERS_MAX_WIDTH/2.54*72*20) - nLeftMargin );
}
- if( rHTMLWrt.nDfltRightMargin != rLRItem.GetRight() )
+ if( rHTMLWrt.m_nDfltRightMargin != rLRItem.GetRight() )
{
rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_margin_right,
(long)rLRItem.GetRight() );
@@ -3019,8 +3019,8 @@ static Writer& OutCSS1_SvxLRSpace( Writer& rWrt, const SfxPoolItem& rHt )
// The LineIndent of the first line might contain the room for numbering
long nFirstLineIndent = (long)rLRItem.GetTextFirstLineOfst() -
- rHTMLWrt.nFirstLineIndent;
- if( rHTMLWrt.nDfltFirstLineIndent != nFirstLineIndent )
+ rHTMLWrt.m_nFirstLineIndent;
+ if( rHTMLWrt.m_nDfltFirstLineIndent != nFirstLineIndent )
{
rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_text_indent,
nFirstLineIndent );
@@ -3035,13 +3035,13 @@ static Writer& OutCSS1_SvxULSpace( Writer& rWrt, const SfxPoolItem& rHt )
const SvxULSpaceItem& rULItem = static_cast<const SvxULSpaceItem&>(rHt);
- if( rHTMLWrt.nDfltTopMargin != rULItem.GetUpper() )
+ if( rHTMLWrt.m_nDfltTopMargin != rULItem.GetUpper() )
{
rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_margin_top,
(long)rULItem.GetUpper() );
}
- if( rHTMLWrt.nDfltBottomMargin != rULItem.GetLower() )
+ if( rHTMLWrt.m_nDfltBottomMargin != rULItem.GetLower() )
{
rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_margin_bottom,
(long)rULItem.GetLower() );
@@ -3060,10 +3060,10 @@ static Writer& OutCSS1_SvxULSpace_SvxLRSpace( Writer& rWrt,
pLRItem->GetLeft() == pLRItem->GetRight() &&
pLRItem->GetLeft() == pULItem->GetUpper() &&
pLRItem->GetLeft() == pULItem->GetLower() &&
- pLRItem->GetLeft() != rHTMLWrt.nDfltLeftMargin &&
- pLRItem->GetRight() != rHTMLWrt.nDfltRightMargin &&
- pULItem->GetUpper() != rHTMLWrt.nDfltTopMargin &&
- pULItem->GetLower() != rHTMLWrt.nDfltBottomMargin )
+ pLRItem->GetLeft() != rHTMLWrt.m_nDfltLeftMargin &&
+ pLRItem->GetRight() != rHTMLWrt.m_nDfltRightMargin &&
+ pULItem->GetUpper() != rHTMLWrt.m_nDfltTopMargin &&
+ pULItem->GetLower() != rHTMLWrt.m_nDfltBottomMargin )
{
rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_margin, (long)pLRItem->GetLeft() );
}
@@ -3176,8 +3176,8 @@ static Writer& OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( Writer& rWrt,
const SwFormatPageDesc *pPDescItem = 0;
if( ( !rHTMLWrt.IsCSS1Source( CSS1_OUTMODE_PARA ) ||
- !rHTMLWrt.bCSS1IgnoreFirstPageDesc ||
- rHTMLWrt.pStartNdIdx->GetIndex() !=
+ !rHTMLWrt.m_bCSS1IgnoreFirstPageDesc ||
+ rHTMLWrt.m_pStartNdIdx->GetIndex() !=
rHTMLWrt.pCurPam->GetPoint()->nNode.GetIndex() ) &&
SfxItemState::SET==rItemSet.GetItemState( RES_PAGEDESC, bDeep, &pItem ))
pPDescItem = static_cast<const SwFormatPageDesc*>(pItem);
@@ -3236,7 +3236,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
{
if( !XOutBitmap::GraphicToBase64(*pGrf, aGraphicInBase64) )
{
- rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
+ rHTMLWrt.m_nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
}
}
@@ -3441,7 +3441,7 @@ Writer& OutCSS1_SvxBox( Writer& rWrt, const SfxPoolItem& rHt )
if( rHt.Which() == RES_CHRATR_BOX )
{
- if( rHTMLWrt.bTagOn )
+ if( rHTMLWrt.m_bTagOn )
{
// Inline-block to make the line height changing correspond to the character border
rHTMLWrt.OutCSS1_PropertyAscii(sCSS1_P_display, "inline-block");
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 94430495dda1..5aa30dda24d2 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -120,7 +120,7 @@ sal_uInt16 SwHTMLWriter::GetDefListLvl( const OUString& rNm, sal_uInt16 nPoolId
void SwHTMLWriter::OutAndSetDefList( sal_uInt16 nNewLvl )
{
// eventuell muss erst mal eine Liste aufgemacht werden
- if( nDefListLvl < nNewLvl )
+ if( m_nDefListLvl < nNewLvl )
{
// output </pre> for the previous(!) pararagraph, if required.
// Preferable, the <pre> is exported by OutHTML_SwFormatOff for the
@@ -131,38 +131,38 @@ void SwHTMLWriter::OutAndSetDefList( sal_uInt16 nNewLvl )
ChangeParaToken( 0 );
// entsprechend dem Level-Unterschied schreiben!
- for( sal_uInt16 i=nDefListLvl; i<nNewLvl; i++ )
+ for( sal_uInt16 i=m_nDefListLvl; i<nNewLvl; i++ )
{
- if( bLFPossible )
+ if( m_bLFPossible )
OutNewLine();
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_deflist );
IncIndentLevel();
- bLFPossible = true;
+ m_bLFPossible = true;
}
}
- else if( nDefListLvl > nNewLvl )
+ else if( m_nDefListLvl > nNewLvl )
{
- for( sal_uInt16 i=nNewLvl ; i < nDefListLvl; i++ )
+ for( sal_uInt16 i=nNewLvl ; i < m_nDefListLvl; i++ )
{
DecIndentLevel();
- if( bLFPossible )
+ if( m_bLFPossible )
OutNewLine();
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_deflist, false );
- bLFPossible = true;
+ m_bLFPossible = true;
}
}
- nDefListLvl = nNewLvl;
+ m_nDefListLvl = nNewLvl;
}
void SwHTMLWriter::ChangeParaToken( sal_uInt16 nNew )
{
- if( nNew != nLastParaToken && HTML_PREFORMTXT_ON == nLastParaToken )
+ if( nNew != m_nLastParaToken && HTML_PREFORMTXT_ON == m_nLastParaToken )
{
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_preformtxt, false );
- bLFPossible = true;
+ m_bLFPossible = true;
}
- nLastParaToken = nNew;
+ m_nLastParaToken = nNew;
}
sal_uInt16 SwHTMLWriter::GetCSS1ScriptForScriptType( sal_uInt16 nScriptType )
@@ -473,7 +473,7 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
rInfo.bParaPossible = false; // ein <P> darf zusaetzlich ausgegeben werden
bool bNoEndTag = false; // kein End-Tag ausgeben
- rHWrt.bNoAlign = false; // kein ALIGN=... moeglich
+ rHWrt.m_bNoAlign = false; // kein ALIGN=... moeglich
bool bNoStyle = false; // kein STYLE=... moeglich
sal_uInt8 nBulletGrfLvl = 255; // Die auszugebende Bullet-Grafik
@@ -517,7 +517,7 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
{
nNumStart = static_cast< sal_uInt16 >(pTextNd->GetActualListStartValue());
}
- OSL_ENSURE( rHWrt.nLastParaToken == 0,
+ OSL_ENSURE( rHWrt.m_nLastParaToken == 0,
"<PRE> wurde nicht vor <LI> beendet." );
}
}
@@ -532,12 +532,12 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
}
else
{
- pFormatInfo = new SwHTMLFormatInfo( &rFormat, rWrt.pDoc, rHWrt.pTemplate,
- rHWrt.bCfgOutStyles, rHWrt.eLang,
- rHWrt.nCSS1Script,
+ pFormatInfo = new SwHTMLFormatInfo( &rFormat, rWrt.pDoc, rHWrt.m_pTemplate,
+ rHWrt.m_bCfgOutStyles, rHWrt.m_eLang,
+ rHWrt.m_nCSS1Script,
false );
rHWrt.m_TextCollInfos.insert(std::unique_ptr<SwHTMLFormatInfo>(pFormatInfo));
- if( rHWrt.aScriptParaStyles.count( rFormat.GetName() ) )
+ if( rHWrt.m_aScriptParaStyles.count( rFormat.GetName() ) )
pFormatInfo->bScriptDependent = true;
}
@@ -553,12 +553,12 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_address)
{
rInfo.bParaPossible = true;
- rHWrt.bNoAlign = true;
+ rHWrt.m_bNoAlign = true;
}
else if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_blockquote)
{
rInfo.bParaPossible = true;
- rHWrt.bNoAlign = true;
+ rHWrt.m_bNoAlign = true;
}
else if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_parabreak)
{
@@ -566,14 +566,14 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
}
else if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_preformtxt)
{
- if (HTML_PREFORMTXT_ON == rHWrt.nLastParaToken)
+ if (HTML_PREFORMTXT_ON == rHWrt.m_nLastParaToken)
{
bOutNewLine = true;
}
else
{
nToken = HTML_PREFORMTXT_ON;
- rHWrt.bNoAlign = true;
+ rHWrt.m_bNoAlign = true;
bNoEndTag = true;
}
}
@@ -581,7 +581,7 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
{
bDT = rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dt;
rInfo.bParaPossible = !bDT;
- rHWrt.bNoAlign = true;
+ rHWrt.m_bNoAlign = true;
bForceDL = true;
}
}
@@ -615,18 +615,18 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
pNodeItemSet ? static_cast<const SvxULSpaceItem &>(pNodeItemSet->Get(RES_UL_SPACE))
: rFormat.GetULSpace();
- if( (rHWrt.bOutHeader &&
+ if( (rHWrt.m_bOutHeader &&
rWrt.pCurPam->GetPoint()->nNode.GetIndex() ==
rWrt.pCurPam->GetMark()->nNode.GetIndex()) ||
- rHWrt.bOutFooter )
+ rHWrt.m_bOutFooter )
{
- if( rHWrt.bCfgOutStyles )
+ if( rHWrt.m_bCfgOutStyles )
{
SvxULSpaceItem aULSpaceItem( rULSpace );
- if( rHWrt.bOutHeader )
- aULSpaceItem.SetLower( rHWrt.nHeaderFooterSpace );
+ if( rHWrt.m_bOutHeader )
+ aULSpaceItem.SetLower( rHWrt.m_nHeaderFooterSpace );
else
- aULSpaceItem.SetUpper( rHWrt.nHeaderFooterSpace );
+ aULSpaceItem.SetUpper( rHWrt.m_nHeaderFooterSpace );
if (!rInfo.pItemSet.get())
{
@@ -634,8 +634,8 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
}
rInfo.pItemSet->Put( aULSpaceItem );
}
- rHWrt.bOutHeader = false;
- rHWrt.bOutFooter = false;
+ rHWrt.m_bOutHeader = false;
+ rHWrt.m_bOutFooter = false;
}
if( bOutNewLine )
@@ -661,7 +661,7 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
// Unteren Absatz-Abstand beachten ? (nie im letzen Absatz von
// Tabellen)
- bool bUseParSpace = !rHWrt.bOutTable ||
+ bool bUseParSpace = !rHWrt.m_bOutTable ||
(rWrt.pCurPam->GetPoint()->nNode.GetIndex() !=
rWrt.pCurPam->GetMark()->nNode.GetIndex());
// Wenn Styles exportiert werden, wird aus eingerueckten Absaetzen
@@ -669,7 +669,7 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
const SvxLRSpaceItem& rLRSpace =
pNodeItemSet ? static_cast<const SvxLRSpaceItem &>(pNodeItemSet->Get(RES_LR_SPACE))
: rFormat.GetLRSpace();
- if( (!rHWrt.bCfgOutStyles || bForceDL) && !rInfo.bInNumBulList )
+ if( (!rHWrt.m_bCfgOutStyles || bForceDL) && !rInfo.bInNumBulList )
{
sal_Int32 nLeftMargin;
if( bForceDL )
@@ -679,10 +679,10 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
? rLRSpace.GetTextLeft() - pFormatInfo->nLeftMargin
: 0;
- if( nLeftMargin > 0 && rHWrt.nDefListMargin > 0 )
+ if( nLeftMargin > 0 && rHWrt.m_nDefListMargin > 0 )
{
- nNewDefListLvl = static_cast< sal_uInt16 >((nLeftMargin + (rHWrt.nDefListMargin/2)) /
- rHWrt.nDefListMargin);
+ nNewDefListLvl = static_cast< sal_uInt16 >((nLeftMargin + (rHWrt.m_nDefListMargin/2)) /
+ rHWrt.m_nDefListMargin);
if( nNewDefListLvl == 0 && bForceDL && !bDT )
nNewDefListLvl = 1;
}
@@ -704,9 +704,9 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
// darueber nehmen
nNewDefListLvl++;
}
- else if( !nNewDefListLvl && !rHWrt.bCfgOutStyles && bPara &&
+ else if( !nNewDefListLvl && !rHWrt.m_bCfgOutStyles && bPara &&
rULSpace.GetLower()==0 &&
- ((bUseParSpace && bIsNextTextNode) || rHWrt.nDefListLvl==1) &&
+ ((bUseParSpace && bIsNextTextNode) || rHWrt.m_nDefListLvl==1) &&
(!pAdjItem || SVX_ADJUST_LEFT==
static_cast<const SvxAdjustItem *>(pAdjItem)->GetAdjust()) )
{
@@ -714,22 +714,22 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
nNewDefListLvl = 1;
bDT = true;
rInfo.bParaPossible = false;
- rHWrt.bNoAlign = true;
+ rHWrt.m_bNoAlign = true;
}
}
- if( nNewDefListLvl != rHWrt.nDefListLvl )
+ if( nNewDefListLvl != rHWrt.m_nDefListLvl )
rHWrt.OutAndSetDefList( nNewDefListLvl );
// ggf. eine Aufzaehlung- oder Numerierungsliste beginnen
if( rInfo.bInNumBulList )
{
- OSL_ENSURE( !rHWrt.nDefListLvl, "DL in OL geht nicht!" );
+ OSL_ENSURE( !rHWrt.m_nDefListLvl, "DL in OL geht nicht!" );
OutHTML_NumBulListStart( rHWrt, aNumInfo );
if( bNumbered )
{
- if( !rHWrt.aBulletGrfs[nBulletGrfLvl].isEmpty() )
+ if( !rHWrt.m_aBulletGrfs[nBulletGrfLvl].isEmpty() )
bNumbered = false;
else
nBulletGrfLvl = 255;
@@ -738,52 +738,52 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
// Die Defaults aus der Vorlage merken, denn sie muessen nicht
// exportiert werden
- rHWrt.nDfltLeftMargin = pFormatInfo->nLeftMargin;
- rHWrt.nDfltRightMargin = pFormatInfo->nRightMargin;
- rHWrt.nDfltFirstLineIndent = pFormatInfo->nFirstLineIndent;
+ rHWrt.m_nDfltLeftMargin = pFormatInfo->nLeftMargin;
+ rHWrt.m_nDfltRightMargin = pFormatInfo->nRightMargin;
+ rHWrt.m_nDfltFirstLineIndent = pFormatInfo->nFirstLineIndent;
if( rInfo.bInNumBulList )
{
if( !rHWrt.IsHTMLMode( HTMLMODE_LSPACE_IN_NUMBUL ) )
- rHWrt.nDfltLeftMargin = rLRSpace.GetTextLeft();
+ rHWrt.m_nDfltLeftMargin = rLRSpace.GetTextLeft();
// In Numerierungs-Listen keinen Ertzeilen-Einzug ausgeben.
- rHWrt.nFirstLineIndent = rLRSpace.GetTextFirstLineOfst();
+ rHWrt.m_nFirstLineIndent = rLRSpace.GetTextFirstLineOfst();
}
- if( rInfo.bInNumBulList && bNumbered && bPara && !rHWrt.bCfgOutStyles )
+ if( rInfo.bInNumBulList && bNumbered && bPara && !rHWrt.m_bCfgOutStyles )
{
// ein einzelnes LI hat keinen Abstand
- rHWrt.nDfltTopMargin = 0;
- rHWrt.nDfltBottomMargin = 0;
+ rHWrt.m_nDfltTopMargin = 0;
+ rHWrt.m_nDfltBottomMargin = 0;
}
- else if( rHWrt.nDefListLvl && bPara )
+ else if( rHWrt.m_nDefListLvl && bPara )
{
// ein einzelnes DD hat auch keinen Abstand
- rHWrt.nDfltTopMargin = 0;
- rHWrt.nDfltBottomMargin = 0;
+ rHWrt.m_nDfltTopMargin = 0;
+ rHWrt.m_nDfltBottomMargin = 0;
}
else
{
- rHWrt.nDfltTopMargin = pFormatInfo->nTopMargin;
+ rHWrt.m_nDfltTopMargin = pFormatInfo->nTopMargin;
// Wenn im letzten Absatz einer Tabelle der
// untere Absatz-Abstand veraendert wird, vertut sich
// Netscape total. Deshalb exportieren wir hier erstmal
// nichts, indem wir den Abstand aus dem Absatz als Default
// setzen.
- if( rHWrt.bCfgNetscape4 && !bUseParSpace )
- rHWrt.nDfltBottomMargin = rULSpace.GetLower();
+ if( rHWrt.m_bCfgNetscape4 && !bUseParSpace )
+ rHWrt.m_nDfltBottomMargin = rULSpace.GetLower();
else
- rHWrt.nDfltBottomMargin = pFormatInfo->nBottomMargin;
+ rHWrt.m_nDfltBottomMargin = pFormatInfo->nBottomMargin;
}
- if( rHWrt.nDefListLvl )
+ if( rHWrt.m_nDefListLvl )
{
- rHWrt.nLeftMargin =
- (rHWrt.nDefListLvl-1) * rHWrt.nDefListMargin;
+ rHWrt.m_nLeftMargin =
+ (rHWrt.m_nDefListLvl-1) * rHWrt.m_nDefListMargin;
}
- if( rHWrt.bLFPossible )
+ if( rHWrt.m_bLFPossible )
rHWrt.OutNewLine(); // Absatz-Tag in neue Zeile
rInfo.bOutPara = false;
@@ -802,7 +802,7 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
html.endAttribute();
}
- if( rHWrt.nDefListLvl > 0 && !bForceDL )
+ if( rHWrt.m_nDefListLvl > 0 && !bForceDL )
{
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), bDT ? OOO_STRING_SVTOOLS_HTML_dt : OOO_STRING_SVTOOLS_HTML_dd );
}
@@ -817,15 +817,15 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
OString sOut = "<" + OString(OOO_STRING_SVTOOLS_HTML_division);
rWrt.Strm().WriteOString( sOut );
- rHWrt.bTextAttr = false;
- rHWrt.bOutOpts = true;
+ rHWrt.m_bTextAttr = false;
+ rHWrt.m_bOutOpts = true;
OutHTML_SvxAdjust( rWrt, *pAdjItem );
rWrt.Strm().WriteChar( '>' );
pAdjItem = 0;
- rHWrt.bNoAlign = false;
+ rHWrt.m_bNoAlign = false;
rInfo.bOutDiv = true;
rHWrt.IncIndentLevel();
- rHWrt.bLFPossible = true;
+ rHWrt.m_bLFPossible = true;
rHWrt.OutNewLine();
}
@@ -834,21 +834,21 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
// - keine Styles geschrieben werden, und
// - ein untere Abstand oder eine Absatz-Ausrichtung existiert
OString aToken = rInfo.aToken;
- if( !rHWrt.bCfgOutStyles && rInfo.bParaPossible && !bPara &&
+ if( !rHWrt.m_bCfgOutStyles && rInfo.bParaPossible && !bPara &&
(bHasParSpace || pAdjItem) )
{
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rInfo.aToken.getStr() );
aToken = OOO_STRING_SVTOOLS_HTML_parabreak;
bPara = true;
- rHWrt.bNoAlign = false;
+ rHWrt.m_bNoAlign = false;
bNoStyle = false;
}
LanguageType eLang;
if (rInfo.pItemSet)
- eLang = static_cast<const SvxLanguageItem&>(rInfo.pItemSet->Get(SwHTMLWriter::GetLangWhichIdFromScript(rHWrt.nCSS1Script))).GetLanguage();
+ eLang = static_cast<const SvxLanguageItem&>(rInfo.pItemSet->Get(SwHTMLWriter::GetLangWhichIdFromScript(rHWrt.m_nCSS1Script))).GetLanguage();
else
- eLang = rHWrt.eLang;
+ eLang = rHWrt.m_eLang;
if( rInfo.pItemSet )
{
@@ -882,28 +882,28 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
// - ein Benutzer-Format exportiert wird, oder
// - Absatz-Attribute existieren
if( !bPara ||
- (!rInfo.bInNumBulList && !rHWrt.nDefListLvl) ||
+ (!rInfo.bInNumBulList && !rHWrt.m_nDefListLvl) ||
(rInfo.bInNumBulList && !bNumbered) ||
- (!rHWrt.bCfgOutStyles &&
+ (!rHWrt.m_bCfgOutStyles &&
(bHasParSpace || pAdjItem ||
- (eLang != LANGUAGE_DONTKNOW && eLang != rHWrt.eLang))) ||
- nDir != rHWrt.nDirection ||
- rHWrt.bCfgOutStyles )
+ (eLang != LANGUAGE_DONTKNOW && eLang != rHWrt.m_eLang))) ||
+ nDir != rHWrt.m_nDirection ||
+ rHWrt.m_bCfgOutStyles )
{
// jetzt werden Optionen ausgegeben
- rHWrt.bTextAttr = false;
- rHWrt.bOutOpts = true;
+ rHWrt.m_bTextAttr = false;
+ rHWrt.m_bOutOpts = true;
OString sOut = "<" + aToken;
- if( eLang != LANGUAGE_DONTKNOW && eLang != rHWrt.eLang )
+ if( eLang != LANGUAGE_DONTKNOW && eLang != rHWrt.m_eLang )
{
rWrt.Strm().WriteOString( sOut );
sOut = "";
rHWrt.OutLanguage( eLang );
}
- if( nDir != rHWrt.nDirection )
+ if( nDir != rHWrt.m_nDirection )
{
if( !sOut.isEmpty() )
{
@@ -913,7 +913,7 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
rHWrt.OutDirection( nDir );
}
- if( rHWrt.bCfgOutStyles &&
+ if( rHWrt.m_bCfgOutStyles &&
(!pFormatInfo->aClass.isEmpty() || pFormatInfo->bScriptDependent) )
{
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_class) + "=\"";
@@ -924,7 +924,7 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
{
if( !aClass.isEmpty() )
aClass += "-";
- switch( rHWrt.nCSS1Script )
+ switch( rHWrt.m_nCSS1Script )
{
case CSS1_OUTMODE_WESTERN:
aClass += "western";
@@ -938,26 +938,26 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
}
}
HTMLOutFuncs::Out_String( rWrt.Strm(), aClass,
- rHWrt.eDestEnc, &rHWrt.aNonConvertableCharacters );
+ rHWrt.m_eDestEnc, &rHWrt.m_aNonConvertableCharacters );
sOut += "\"";
}
rWrt.Strm().WriteOString( sOut );
sOut = "";
// ggf. Ausrichtung ausgeben.
- if( !rHWrt.bNoAlign && pAdjItem )
+ if( !rHWrt.m_bNoAlign && pAdjItem )
OutHTML_SvxAdjust( rWrt, *pAdjItem );
- rHWrt.bParaDotLeaders = bPara && rHWrt.bCfgPrintLayout && rHWrt.indexOfDotLeaders(
+ rHWrt.m_bParaDotLeaders = bPara && rHWrt.m_bCfgPrintLayout && rHWrt.indexOfDotLeaders(
pTextNd->GetAnyFormatColl().GetPoolFormatId(), pTextNd->GetText()) > -1;
// und nun ggf. noch die STYLE-Option
- if( rHWrt.bCfgOutStyles && rInfo.pItemSet && !bNoStyle)
+ if( rHWrt.m_bCfgOutStyles && rInfo.pItemSet && !bNoStyle)
{
OutCSS1_ParaTagStyleOpt( rWrt, *rInfo.pItemSet );
}
- if (rHWrt.bParaDotLeaders) {
+ if (rHWrt.m_bParaDotLeaders) {
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_class) + "=\"" +
OString(sCSS2_P_CLASS_leaders) + "\"><" +
OString(OOO_STRING_SVTOOLS_HTML_O_span);
@@ -970,7 +970,7 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
// Soll ein </P> geschrieben wenrden
rInfo.bOutPara =
bPara &&
- ( rHWrt.bCfgOutStyles || bHasParSpace );
+ ( rHWrt.m_bCfgOutStyles || bHasParSpace );
// wenn kein End-Tag geschrieben werden soll, es loeschen
if( bNoEndTag )
@@ -988,13 +988,13 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
rHWrt.GetNumInfo() = aNumInfo;
// die Defaults zuruecksetzen
- rHWrt.nDfltLeftMargin = 0;
- rHWrt.nDfltRightMargin = 0;
- rHWrt.nDfltFirstLineIndent = 0;
- rHWrt.nDfltTopMargin = 0;
- rHWrt.nDfltBottomMargin = 0;
- rHWrt.nLeftMargin = 0;
- rHWrt.nFirstLineIndent = 0;
+ rHWrt.m_nDfltLeftMargin = 0;
+ rHWrt.m_nDfltRightMargin = 0;
+ rHWrt.m_nDfltFirstLineIndent = 0;
+ rHWrt.m_nDfltTopMargin = 0;
+ rHWrt.m_nDfltBottomMargin = 0;
+ rHWrt.m_nLeftMargin = 0;
+ rHWrt.m_nFirstLineIndent = 0;
}
void OutHTML_SwFormatOff( Writer& rWrt, const SwHTMLTextCollOutputInfo& rInfo )
@@ -1025,7 +1025,7 @@ void OutHTML_SwFormatOff( Writer& rWrt, const SwHTMLTextCollOutputInfo& rInfo )
if( rInfo.ShouldOutputToken() )
{
- if( rHWrt.bLFPossible )
+ if( rHWrt.m_bLFPossible )
rHWrt.OutNewLine( true );
// fuer BLOCKQUOTE, ADDRESS und DD wird ggf noch ein
@@ -1036,7 +1036,7 @@ void OutHTML_SwFormatOff( Writer& rWrt, const SwHTMLTextCollOutputInfo& rInfo )
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_parabreak, false );
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rInfo.aToken.getStr(), false );
- rHWrt.bLFPossible =
+ rHWrt.m_bLFPossible =
rInfo.aToken != OOO_STRING_SVTOOLS_HTML_dt &&
rInfo.aToken != OOO_STRING_SVTOOLS_HTML_dd &&
rInfo.aToken != OOO_STRING_SVTOOLS_HTML_li;
@@ -1044,10 +1044,10 @@ void OutHTML_SwFormatOff( Writer& rWrt, const SwHTMLTextCollOutputInfo& rInfo )
if( rInfo.bOutDiv )
{
rHWrt.DecIndentLevel();
- if( rHWrt.bLFPossible )
+ if( rHWrt.m_bLFPossible )
rHWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
- rHWrt.bLFPossible = true;
+ rHWrt.m_bLFPossible = true;
}
// ggf. eine Aufzaehlung- oder Numerierungsliste beenden
@@ -1921,7 +1921,7 @@ sal_uInt16 HTMLEndPosLst::GetScriptAtPos( sal_Int32 nPos, sal_uInt16 nWeak )
void HTMLEndPosLst::OutStartAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos,
HTMLOutContext *pContext )
{
- rHWrt.bTagOn = true;
+ rHWrt.m_bTagOn = true;
// Character border attribute must be the first which is written out
// because of border merge.
@@ -1957,13 +1957,13 @@ void HTMLEndPosLst::OutStartAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos,
else if( nStart == nPos )
{
// das Attribut ausgeben
- sal_uInt16 nCSS1Script = rHWrt.nCSS1Script;
+ sal_uInt16 nCSS1Script = rHWrt.m_nCSS1Script;
sal_uInt16 nWhich = pPos->GetItem()->Which();
if( RES_TXTATR_CHARFMT == nWhich ||
RES_TXTATR_INETFMT == nWhich ||
RES_PARATR_DROP == nWhich )
{
- rHWrt.nCSS1Script = GetScriptAtPos( nPos, nCSS1Script );
+ rHWrt.m_nCSS1Script = GetScriptAtPos( nPos, nCSS1Script );
}
if( pContext )
{
@@ -1971,7 +1971,7 @@ void HTMLEndPosLst::OutStartAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos,
pContext = 0; // one time ony
}
Out( aHTMLAttrFnTab, *pPos->GetItem(), rHWrt );
- rHWrt.nCSS1Script = nCSS1Script;
+ rHWrt.m_nCSS1Script = nCSS1Script;
}
}
}
@@ -1979,7 +1979,7 @@ void HTMLEndPosLst::OutStartAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos,
void HTMLEndPosLst::OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos,
HTMLOutContext *pContext )
{
- rHWrt.bTagOn = false;
+ rHWrt.m_bTagOn = false;
// die Attribute in der End-Liste sind aufsteigend sortiert
HTMLStartEndPositions::size_type i {0};
@@ -2066,10 +2066,10 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
// Alle an dem Node verankerten Rahmen ausgeben
rHTMLWrt.OutFlyFrm( rNode.GetIndex(), 0, HTML_POS_ANY );
- if( rHTMLWrt.bLFPossible )
+ if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine(); // Absatz-Tag in eine neue Zeile
- rHTMLWrt.bLFPossible = true;
+ rHTMLWrt.m_bLFPossible = true;
HtmlWriter aHtml(rWrt.Strm());
aHtml.start(OOO_STRING_SVTOOLS_HTML_horzrule);
@@ -2174,11 +2174,11 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
{
// ... und er steht vor einer Tabelle ohne einem Bereich
rHTMLWrt.OutBookmarks();
- rHTMLWrt.bLFPossible = !rHTMLWrt.nLastParaToken;
+ rHTMLWrt.m_bLFPossible = !rHTMLWrt.m_nLastParaToken;
// Alle an dem Node verankerten Rahmen ausgeben
rHTMLWrt.OutFlyFrm( rNode.GetIndex(), 0, HTML_POS_ANY );
- rHTMLWrt.bLFPossible = false;
+ rHTMLWrt.m_bLFPossible = false;
return rWrt;
}
@@ -2187,9 +2187,9 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
// PagePreaks uns PagDescs abfangen
bool bPageBreakBehind = false;
- if( rHTMLWrt.bCfgFormFeed &&
- !(rHTMLWrt.bOutTable || rHTMLWrt.bOutFlyFrame) &&
- rHTMLWrt.pStartNdIdx->GetIndex() != rHTMLWrt.pCurPam->GetPoint()->nNode.GetIndex() )
+ if( rHTMLWrt.m_bCfgFormFeed &&
+ !(rHTMLWrt.m_bOutTable || rHTMLWrt.m_bOutFlyFrame) &&
+ rHTMLWrt.m_pStartNdIdx->GetIndex() != rHTMLWrt.pCurPam->GetPoint()->nNode.GetIndex() )
{
bool bPageBreakBefore = false;
const SfxPoolItem* pItem;
@@ -2245,32 +2245,32 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
}
// gibt es harte Attribute, die als Optionen geschrieben werden muessen?
- rHTMLWrt.bTagOn = true;
+ rHTMLWrt.m_bTagOn = true;
// jetzt das Tag des Absatzes ausgeben
const SwFormat& rFormat = pNd->GetAnyFormatColl();
SwHTMLTextCollOutputInfo aFormatInfo;
- bool bOldLFPossible = rHTMLWrt.bLFPossible;
+ bool bOldLFPossible = rHTMLWrt.m_bLFPossible;
OutHTML_SwFormat( rWrt, rFormat, pNd->GetpSwAttrSet(), aFormatInfo );
// Wenn vor dem Absatz-Tag keine neue Zeile aufgemacht wurde, dann
// tun wir das jetzt
- rHTMLWrt.bLFPossible = !rHTMLWrt.nLastParaToken;
- if( !bOldLFPossible && rHTMLWrt.bLFPossible )
+ rHTMLWrt.m_bLFPossible = !rHTMLWrt.m_nLastParaToken;
+ if( !bOldLFPossible && rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine();
// dann die Bookmarks (inkl. End-Tag)
- rHTMLWrt.bOutOpts = false;
+ rHTMLWrt.m_bOutOpts = false;
rHTMLWrt.OutBookmarks();
// jetzt ist noch mal eine gute Gelegenheit fuer ein LF, sofern es noch
// erlaubt ist
- if( rHTMLWrt.bLFPossible &&
- rHTMLWrt.GetLineLen() >= rHTMLWrt.nWhishLineLen )
+ if( rHTMLWrt.m_bLFPossible &&
+ rHTMLWrt.GetLineLen() >= rHTMLWrt.m_nWhishLineLen )
{
rHTMLWrt.OutNewLine();
}
- rHTMLWrt.bLFPossible = false;
+ rHTMLWrt.m_bLFPossible = false;
// Text, der aus einer Outline-Numerierung kommt ermitteln
sal_Int32 nOffset = 0;
@@ -2287,9 +2287,9 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
aFullText = aOutlineText;
}
OUString aFootEndNoteSym;
- if( rHTMLWrt.pFormatFootnote )
+ if( rHTMLWrt.m_pFormatFootnote )
{
- aFootEndNoteSym = rHTMLWrt.GetFootEndNoteSym( *rHTMLWrt.pFormatFootnote );
+ aFootEndNoteSym = rHTMLWrt.GetFootEndNoteSym( *rHTMLWrt.m_pFormatFootnote );
nOffset = nOffset + aFootEndNoteSym.getLength();
aFullText += aFootEndNoteSym;
}
@@ -2302,17 +2302,17 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
// gibt es harte Attribute, die als Tags geschrieben werden muessen?
aFullText += rStr;
- HTMLEndPosLst aEndPosLst( rWrt.pDoc, rHTMLWrt.pTemplate,
- rHTMLWrt.pDfltColor, rHTMLWrt.bCfgOutStyles,
+ HTMLEndPosLst aEndPosLst( rWrt.pDoc, rHTMLWrt.m_pTemplate,
+ rHTMLWrt.m_pDfltColor, rHTMLWrt.m_bCfgOutStyles,
rHTMLWrt.GetHTMLMode(), aFullText,
- rHTMLWrt.aScriptTextStyles );
+ rHTMLWrt.m_aScriptTextStyles );
if( aFormatInfo.pItemSet )
{
aEndPosLst.Insert( *aFormatInfo.pItemSet, 0, nEnd + nOffset,
rHTMLWrt.m_CharFormatInfos, false, true );
}
- if( !aOutlineText.isEmpty() || rHTMLWrt.pFormatFootnote )
+ if( !aOutlineText.isEmpty() || rHTMLWrt.m_pFormatFootnote )
{
// Absatz-Attribute ausgeben, damit der Text die Attribute des
// Absatzes bekommt.
@@ -2324,19 +2324,19 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
if( !aOutlineText.isEmpty() )
HTMLOutFuncs::Out_String( rWrt.Strm(), aOutlineText,
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters);
+ rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters);
- if( rHTMLWrt.pFormatFootnote )
+ if( rHTMLWrt.m_pFormatFootnote )
{
- rHTMLWrt.OutFootEndNoteSym( *rHTMLWrt.pFormatFootnote, aFootEndNoteSym,
- aEndPosLst.GetScriptAtPos( aOutlineText.getLength(), rHTMLWrt.nCSS1Script ) );
- rHTMLWrt.pFormatFootnote = 0;
+ rHTMLWrt.OutFootEndNoteSym( *rHTMLWrt.m_pFormatFootnote, aFootEndNoteSym,
+ aEndPosLst.GetScriptAtPos( aOutlineText.getLength(), rHTMLWrt.m_nCSS1Script ) );
+ rHTMLWrt.m_pFormatFootnote = 0;
}
}
// erstmal den Start berichtigen. D.h. wird nur ein Teil vom Satz
// ausgegeben, so muessen auch da die Attribute stimmen!!
- rHTMLWrt.bTextAttr = true;
+ rHTMLWrt.m_bTextAttr = true;
size_t nAttrPos = 0;
sal_Int32 nStrPos = rHTMLWrt.pCurPam->GetPoint()->nContent.GetIndex();
@@ -2389,12 +2389,12 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
aEndPosLst.OutStartAttrs( rHTMLWrt, nStrPos + nOffset );
}
- bool bWriteBreak = (HTML_PREFORMTXT_ON != rHTMLWrt.nLastParaToken);
+ bool bWriteBreak = (HTML_PREFORMTXT_ON != rHTMLWrt.m_nLastParaToken);
if( bWriteBreak && pNd->GetNumRule() )
bWriteBreak = false;
{
- HTMLOutContext aContext( rHTMLWrt.eDestEnc );
+ HTMLOutContext aContext( rHTMLWrt.m_eDestEnc );
sal_Int32 nPreSplitPos = 0;
for( ; nStrPos < nEnd; nStrPos++ )
@@ -2430,9 +2430,9 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
{
// Hints ohne-Ende werden als letztes ausgebeben
OSL_ENSURE( !pTextHt, "Wieso gibt es da schon ein Attribut ohne Ende?" );
- if( rHTMLWrt.nTextAttrsToIgnore>0 )
+ if( rHTMLWrt.m_nTextAttrsToIgnore>0 )
{
- rHTMLWrt.nTextAttrsToIgnore--;
+ rHTMLWrt.m_nTextAttrsToIgnore--;
}
else
{
@@ -2468,15 +2468,15 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
if( pTextHt )
{
- rHTMLWrt.bLFPossible = !rHTMLWrt.nLastParaToken && nStrPos > 0 &&
+ rHTMLWrt.m_bLFPossible = !rHTMLWrt.m_nLastParaToken && nStrPos > 0 &&
rStr[nStrPos-1] == ' ';
- sal_uInt16 nCSS1Script = rHTMLWrt.nCSS1Script;
- rHTMLWrt.nCSS1Script = aEndPosLst.GetScriptAtPos(
+ sal_uInt16 nCSS1Script = rHTMLWrt.m_nCSS1Script;
+ rHTMLWrt.m_nCSS1Script = aEndPosLst.GetScriptAtPos(
nStrPos + nOffset, nCSS1Script );
HTMLOutFuncs::FlushToAscii( rWrt.Strm(), aContext );
Out( aHTMLAttrFnTab, pTextHt->GetAttr(), rHTMLWrt );
- rHTMLWrt.nCSS1Script = nCSS1Script;
- rHTMLWrt.bLFPossible = false;
+ rHTMLWrt.m_nCSS1Script = nCSS1Script;
+ rHTMLWrt.m_bLFPossible = false;
}
if( bOutChar )
@@ -2497,10 +2497,10 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
// try to split a line after about 255 characters
// at a space character unless in a PRE-context
- if( ' '==c && !rHTMLWrt.nLastParaToken )
+ if( ' '==c && !rHTMLWrt.m_nLastParaToken )
{
sal_Int32 nLineLen;
- if( rHTMLWrt.nLastParaToken )
+ if( rHTMLWrt.m_nLastParaToken )
nLineLen = nStrPos - nPreSplitPos;
else
nLineLen = rHTMLWrt.GetLineLen();
@@ -2510,13 +2510,13 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
nWordLen = nEnd;
nWordLen -= nStrPos;
- if( nLineLen >= rHTMLWrt.nWhishLineLen ||
- (nLineLen+nWordLen) >= rHTMLWrt.nWhishLineLen )
+ if( nLineLen >= rHTMLWrt.m_nWhishLineLen ||
+ (nLineLen+nWordLen) >= rHTMLWrt.m_nWhishLineLen )
{
HTMLOutFuncs::FlushToAscii( rWrt.Strm(), aContext );
rHTMLWrt.OutNewLine();
bOutChar = false;
- if( rHTMLWrt.nLastParaToken )
+ if( rHTMLWrt.m_nLastParaToken )
nPreSplitPos = nStrPos+1;
}
}
@@ -2546,13 +2546,13 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
rHTMLWrt.OutPointFieldmarks(aMarkPos);
}
else
- HTMLOutFuncs::Out_Char( rWrt.Strm(), (sal_Unicode)c, aContext, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_Char( rWrt.Strm(), (sal_Unicode)c, aContext, &rHTMLWrt.m_aNonConvertableCharacters );
// if a paragraph's last character is a hard line break
// then we need to add an extra <br>
// because browsers like Mozilla wouldn't add a line for the next paragraph
bWriteBreak = (0x0a == c) &&
- (HTML_PREFORMTXT_ON != rHTMLWrt.nLastParaToken);
+ (HTML_PREFORMTXT_ON != rHTMLWrt.m_nLastParaToken);
}
}
}
@@ -2567,11 +2567,11 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
nEnd, HTML_POS_INSIDE );
OSL_ENSURE( !bFlysLeft, "Es wurden nicht alle Rahmen gespeichert!" );
- rHTMLWrt.bTextAttr = false;
+ rHTMLWrt.m_bTextAttr = false;
if( bWriteBreak )
{
- bool bEndOfCell = rHTMLWrt.bOutTable &&
+ bool bEndOfCell = rHTMLWrt.m_bOutTable &&
rWrt.pCurPam->GetPoint()->nNode.GetIndex() ==
rWrt.pCurPam->GetMark()->nNode.GetIndex();
@@ -2594,16 +2594,16 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
{
aHtml.single(OOO_STRING_SVTOOLS_HTML_linebreak);
}
- rHTMLWrt.bLFPossible = true;
+ rHTMLWrt.m_bLFPossible = true;
}
}
- if( rHTMLWrt.bClearLeft || rHTMLWrt.bClearRight )
+ if( rHTMLWrt.m_bClearLeft || rHTMLWrt.m_bClearRight )
{
const sal_Char* pString;
- if( rHTMLWrt.bClearLeft )
+ if( rHTMLWrt.m_bClearLeft )
{
- if( rHTMLWrt.bClearRight )
+ if( rHTMLWrt.m_bClearRight )
pString = OOO_STRING_SVTOOLS_HTML_AL_all;
else
pString = OOO_STRING_SVTOOLS_HTML_AL_left;
@@ -2618,17 +2618,17 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
aHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_clear, pString);
aHtml.end();
- rHTMLWrt.bClearLeft = false;
- rHTMLWrt.bClearRight = false;
+ rHTMLWrt.m_bClearLeft = false;
+ rHTMLWrt.m_bClearRight = false;
- rHTMLWrt.bLFPossible = true;
+ rHTMLWrt.m_bLFPossible = true;
}
// wenn ein LF nicht schon erlaubt ist wird es erlaubt, wenn der
// Absatz mit einem ' ' endet
- if( !rHTMLWrt.bLFPossible && !rHTMLWrt.nLastParaToken &&
+ if( !rHTMLWrt.m_bLFPossible && !rHTMLWrt.m_nLastParaToken &&
nEnd > 0 && ' ' == rStr[nEnd-1] )
- rHTMLWrt.bLFPossible = true;
+ rHTMLWrt.m_bLFPossible = true;
// dot leaders: print the skipped page number in a different span element
if (nIndexTab > -1) {
@@ -2636,7 +2636,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
rWrt.Strm().WriteOString( "</span><span>" + sOut + "</span>" );
}
- rHTMLWrt.bTagOn = false;
+ rHTMLWrt.m_bTagOn = false;
OutHTML_SwFormatOff( rWrt, aFormatInfo );
// eventuell eine Form schliessen
@@ -2666,7 +2666,7 @@ static Writer& OutHTML_CSS1Attr( Writer& rWrt, const SfxPoolItem& rHt )
// wenn gerade Hints geschrieben werden versuchen wir den Hint als
// CSS1-Attribut zu schreiben
- if( static_cast<SwHTMLWriter&>(rWrt).bCfgOutStyles && static_cast<SwHTMLWriter&>(rWrt).bTextAttr )
+ if( static_cast<SwHTMLWriter&>(rWrt).m_bCfgOutStyles && static_cast<SwHTMLWriter&>(rWrt).m_bTextAttr )
OutCSS1_HintSpanTag( rWrt, rHt );
return rWrt;
@@ -2677,17 +2677,17 @@ static Writer& OutHTML_CSS1Attr( Writer& rWrt, const SfxPoolItem& rHt )
static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- if( rHTMLWrt.bOutOpts )
+ if( rHTMLWrt.m_bOutOpts )
return rWrt;
- if( !rHTMLWrt.bTextAttr && rHTMLWrt.bCfgOutStyles && rHTMLWrt.bCfgPreferStyles )
+ if( !rHTMLWrt.m_bTextAttr && rHTMLWrt.m_bCfgOutStyles && rHTMLWrt.m_bCfgPreferStyles )
{
// Font-Farbe nicht als Tag schreiben, wenn Styles normalen Tags
// vorgezogen werden
return rWrt;
}
- if( rHTMLWrt.bTagOn )
+ if( rHTMLWrt.m_bTagOn )
{
Color aColor( static_cast<const SvxColorItem&>(rHt).GetValue() );
if( COL_AUTO == aColor.GetColor() )
@@ -2696,7 +2696,7 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
OString sOut = "<" + OString(OOO_STRING_SVTOOLS_HTML_font) + " " +
OString(OOO_STRING_SVTOOLS_HTML_O_color) + "=";
rWrt.Strm().WriteOString( sOut );
- HTMLOutFuncs::Out_Color( rWrt.Strm(), aColor, rHTMLWrt.eDestEnc ).WriteChar( '>' );
+ HTMLOutFuncs::Out_Color( rWrt.Strm(), aColor, rHTMLWrt.m_eDestEnc ).WriteChar( '>' );
}
else
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_font, false );
@@ -2707,15 +2707,15 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
static Writer& OutHTML_SwPosture( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- if( rHTMLWrt.bOutOpts )
+ if( rHTMLWrt.m_bOutOpts )
return rWrt;
const FontItalic nPosture = static_cast<const SvxPostureItem&>(rHt).GetPosture();
if( ITALIC_NORMAL == nPosture )
{
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_italic, rHTMLWrt.bTagOn );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_italic, rHTMLWrt.m_bTagOn );
}
- else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
+ else if( rHTMLWrt.m_bCfgOutStyles && rHTMLWrt.m_bTextAttr )
{
// vielleicht als CSS1-Attribut ?
OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2727,10 +2727,10 @@ static Writer& OutHTML_SwPosture( Writer& rWrt, const SfxPoolItem& rHt )
static Writer& OutHTML_SvxFont( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- if( rHTMLWrt.bOutOpts )
+ if( rHTMLWrt.m_bOutOpts )
return rWrt;
- if( rHTMLWrt.bTagOn )
+ if( rHTMLWrt.m_bTagOn )
{
OUString aNames;
SwHTMLWriter::PrepareFontList( static_cast<const SvxFontItem&>(rHt), aNames, 0,
@@ -2738,7 +2738,7 @@ static Writer& OutHTML_SvxFont( Writer& rWrt, const SfxPoolItem& rHt )
OString sOut = "<" + OString(OOO_STRING_SVTOOLS_HTML_font) + " " +
OString(OOO_STRING_SVTOOLS_HTML_O_face) + "=\"";
rWrt.Strm().WriteOString( sOut );
- HTMLOutFuncs::Out_String( rWrt.Strm(), aNames, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters )
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aNames, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters )
.WriteCharPtr( "\">" );
}
else
@@ -2750,10 +2750,10 @@ static Writer& OutHTML_SvxFont( Writer& rWrt, const SfxPoolItem& rHt )
static Writer& OutHTML_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- if( rHTMLWrt.bOutOpts )
+ if( rHTMLWrt.m_bOutOpts )
return rWrt;
- if( rHTMLWrt.bTagOn )
+ if( rHTMLWrt.m_bTagOn )
{
OString sOut = "<" + OString(OOO_STRING_SVTOOLS_HTML_font);
@@ -2763,7 +2763,7 @@ static Writer& OutHTML_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt )
OString::number(static_cast<sal_Int32>(nSize)) + "\"";
rWrt.Strm().WriteOString( sOut );
- if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
+ if( rHTMLWrt.m_bCfgOutStyles && rHTMLWrt.m_bTextAttr )
{
// always export font size as CSS option, too
OutCSS1_HintStyleOpt( rWrt, rHt );
@@ -2781,14 +2781,14 @@ static Writer& OutHTML_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt )
static Writer& OutHTML_SvxLanguage( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- if( rHTMLWrt.bOutOpts )
+ if( rHTMLWrt.m_bOutOpts )
return rWrt;
LanguageType eLang = static_cast<const SvxLanguageItem &>(rHt).GetLanguage();
if( LANGUAGE_DONTKNOW == eLang )
return rWrt;
- if( rHTMLWrt.bTagOn )
+ if( rHTMLWrt.m_bTagOn )
{
OString sOut = "<" + OString(OOO_STRING_SVTOOLS_HTML_span);
rWrt.Strm().WriteOString( sOut );
@@ -2805,15 +2805,15 @@ static Writer& OutHTML_SvxLanguage( Writer& rWrt, const SfxPoolItem& rHt )
static Writer& OutHTML_SwWeight( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- if( rHTMLWrt.bOutOpts )
+ if( rHTMLWrt.m_bOutOpts )
return rWrt;
const FontWeight nBold = static_cast<const SvxWeightItem&>(rHt).GetWeight();
if( WEIGHT_BOLD == nBold )
{
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_bold, rHTMLWrt.bTagOn );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_bold, rHTMLWrt.m_bTagOn );
}
- else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
+ else if( rHTMLWrt.m_bCfgOutStyles && rHTMLWrt.m_bTextAttr )
{
// vielleicht als CSS1-Attribut ?
OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2825,16 +2825,16 @@ static Writer& OutHTML_SwWeight( Writer& rWrt, const SfxPoolItem& rHt )
static Writer& OutHTML_SwCrossedOut( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- if( rHTMLWrt.bOutOpts )
+ if( rHTMLWrt.m_bOutOpts )
return rWrt;
// Wegen Netscape schrieben wir hier STRIKE und nicht S raus!
const FontStrikeout nStrike = static_cast<const SvxCrossedOutItem&>(rHt).GetStrikeout();
if( STRIKEOUT_NONE != nStrike )
{
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_strike, rHTMLWrt.bTagOn );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_strike, rHTMLWrt.m_bTagOn );
}
- else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
+ else if( rHTMLWrt.m_bCfgOutStyles && rHTMLWrt.m_bTextAttr )
{
// vielleicht als CSS1-Attribut ?
OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2846,7 +2846,7 @@ static Writer& OutHTML_SwCrossedOut( Writer& rWrt, const SfxPoolItem& rHt )
static Writer& OutHTML_SvxEscapement( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- if( rHTMLWrt.bOutOpts )
+ if( rHTMLWrt.m_bOutOpts )
return rWrt;
const SvxEscapement eEscape =
@@ -2862,9 +2862,9 @@ static Writer& OutHTML_SvxEscapement( Writer& rWrt, const SfxPoolItem& rHt )
if( pStr )
{
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, rHTMLWrt.bTagOn );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, rHTMLWrt.m_bTagOn );
}
- else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
+ else if( rHTMLWrt.m_bCfgOutStyles && rHTMLWrt.m_bTextAttr )
{
// vielleicht als CSS1-Attribut ?
OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2876,15 +2876,15 @@ static Writer& OutHTML_SvxEscapement( Writer& rWrt, const SfxPoolItem& rHt )
static Writer& OutHTML_SwUnderline( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- if( rHTMLWrt.bOutOpts )
+ if( rHTMLWrt.m_bOutOpts )
return rWrt;
const FontUnderline eUnder = static_cast<const SvxUnderlineItem&>(rHt).GetLineStyle();
if( UNDERLINE_NONE != eUnder )
{
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_underline, rHTMLWrt.bTagOn );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_underline, rHTMLWrt.m_bTagOn );
}
- else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
+ else if( rHTMLWrt.m_bCfgOutStyles && rHTMLWrt.m_bTextAttr )
{
// vielleicht als CSS1-Attribut ?
OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2903,7 +2903,7 @@ static Writer& OutHTML_SwFlyCnt( Writer& rWrt, const SfxPoolItem& rHt )
SwHTMLFrmType eType =
(SwHTMLFrmType)rHTMLWrt.GuessFrmType( rFormat, pSdrObj );
- sal_uInt8 nMode = aHTMLOutFrmAsCharTable[eType][rHTMLWrt.nExportMode];
+ sal_uInt8 nMode = aHTMLOutFrmAsCharTable[eType][rHTMLWrt.m_nExportMode];
rHTMLWrt.OutFrameFormat( nMode, rFormat, pSdrObj );
return rWrt;
}
@@ -2913,14 +2913,14 @@ static Writer& OutHTML_SwFlyCnt( Writer& rWrt, const SfxPoolItem& rHt )
static Writer& OutHTML_SwBlink( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- if( rHTMLWrt.bOutOpts )
+ if( rHTMLWrt.m_bOutOpts )
return rWrt;
if( static_cast<const SvxBlinkItem&>(rHt).GetValue() )
{
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_blink, rHTMLWrt.bTagOn );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_blink, rHTMLWrt.m_bTagOn );
}
- else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
+ else if( rHTMLWrt.m_bCfgOutStyles && rHTMLWrt.m_bTextAttr )
{
// vielleicht als CSS1-Attribut ?
OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2977,7 +2977,7 @@ Writer& OutHTML_INetFormat( Writer& rWrt, const SwFormatINetFormat& rINetFormat,
{
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_class) + "=\"";
const sal_Char* pStr = 0;
- switch( rHTMLWrt.nCSS1Script )
+ switch( rHTMLWrt.m_nCSS1Script )
{
case CSS1_OUTMODE_WESTERN:
pStr = "western";
@@ -3019,7 +3019,7 @@ Writer& OutHTML_INetFormat( Writer& rWrt, const SwFormatINetFormat& rINetFormat,
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\"";
rWrt.Strm().WriteOString( sOut );
HTMLOutFuncs::Out_String( rWrt.Strm(), rINetFormat.GetName(),
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut = "\"";
}
@@ -3028,7 +3028,7 @@ Writer& OutHTML_INetFormat( Writer& rWrt, const SwFormatINetFormat& rINetFormat,
{
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_target) + "=\"";
rWrt.Strm().WriteOString( sOut );
- HTMLOutFuncs::Out_String( rWrt.Strm(), rTarget, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rTarget, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut = "\"";
}
@@ -3040,8 +3040,8 @@ Writer& OutHTML_INetFormat( Writer& rWrt, const SwFormatINetFormat& rINetFormat,
if( bEvents )
HTMLOutFuncs::Out_Events( rWrt.Strm(), *pMacTable, aAnchorEventTable,
- rHTMLWrt.bCfgStarBasic, rHTMLWrt.eDestEnc,
- &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_bCfgStarBasic, rHTMLWrt.m_eDestEnc,
+ &rHTMLWrt.m_aNonConvertableCharacters );
rWrt.Strm().WriteCharPtr( ">" );
return rWrt;
@@ -3051,18 +3051,18 @@ static Writer& OutHTML_SwFormatINetFormat( Writer& rWrt, const SfxPoolItem& rHt
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- if( rHTMLWrt.bOutOpts )
+ if( rHTMLWrt.m_bOutOpts )
return rWrt;
const SwFormatINetFormat& rINetFormat = static_cast<const SwFormatINetFormat&>(rHt);
- if( rHTMLWrt.bTagOn )
+ if( rHTMLWrt.m_bTagOn )
{
// ggf. ein noch offenes Attribut voruebergehend beenden
- if( rHTMLWrt.aINetFormats.size() )
+ if( rHTMLWrt.m_aINetFormats.size() )
{
SwFormatINetFormat *pINetFormat =
- rHTMLWrt.aINetFormats.back();
+ rHTMLWrt.m_aINetFormats.back();
OutHTML_INetFormat( rWrt, *pINetFormat, false );
}
@@ -3071,27 +3071,27 @@ static Writer& OutHTML_SwFormatINetFormat( Writer& rWrt, const SfxPoolItem& rHt
// und merken
SwFormatINetFormat *pINetFormat = new SwFormatINetFormat( rINetFormat );
- rHTMLWrt.aINetFormats.push_back( pINetFormat );
+ rHTMLWrt.m_aINetFormats.push_back( pINetFormat );
}
else
{
// das
OutHTML_INetFormat( rWrt, rINetFormat, false );
- OSL_ENSURE( rHTMLWrt.aINetFormats.size(), "da fehlt doch ein URL-Attribut" );
- if( rHTMLWrt.aINetFormats.size() )
+ OSL_ENSURE( rHTMLWrt.m_aINetFormats.size(), "da fehlt doch ein URL-Attribut" );
+ if( rHTMLWrt.m_aINetFormats.size() )
{
// das eigene Attribut vom Stack holen
- SwFormatINetFormat *pINetFormat = rHTMLWrt.aINetFormats.back();
- rHTMLWrt.aINetFormats.pop_back();
+ SwFormatINetFormat *pINetFormat = rHTMLWrt.m_aINetFormats.back();
+ rHTMLWrt.m_aINetFormats.pop_back();
delete pINetFormat;
}
- if( !rHTMLWrt.aINetFormats.empty() )
+ if( !rHTMLWrt.m_aINetFormats.empty() )
{
// es ist noch ein Attribut auf dem Stack, das wieder geoeffnet
// werden muss
- SwFormatINetFormat *pINetFormat = rHTMLWrt.aINetFormats.back();
+ SwFormatINetFormat *pINetFormat = rHTMLWrt.m_aINetFormats.back();
OutHTML_INetFormat( rWrt, *pINetFormat, true );
}
}
@@ -3102,7 +3102,7 @@ static Writer& OutHTML_SwFormatINetFormat( Writer& rWrt, const SfxPoolItem& rHt
static Writer& OutHTML_SwTextCharFormat( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- if( rHTMLWrt.bOutOpts )
+ if( rHTMLWrt.m_bOutOpts )
return rWrt;
const SwFormatCharFormat& rChrFormat = static_cast<const SwFormatCharFormat&>(rHt);
@@ -3121,7 +3121,7 @@ static Writer& OutHTML_SwTextCharFormat( Writer& rWrt, const SfxPoolItem& rHt )
const SwHTMLFormatInfo *pFormatInfo = it->get();
OSL_ENSURE( pFormatInfo, "Wieso gint es keine Infos ueber die Zeichenvorlage?" );
- if( rHTMLWrt.bTagOn )
+ if( rHTMLWrt.m_bTagOn )
{
OString sOut = "<";
if( !pFormatInfo->aToken.isEmpty() )
@@ -3129,7 +3129,7 @@ static Writer& OutHTML_SwTextCharFormat( Writer& rWrt, const SfxPoolItem& rHt )
else
sOut += OString(OOO_STRING_SVTOOLS_HTML_span);
- if( rHTMLWrt.bCfgOutStyles &&
+ if( rHTMLWrt.m_bCfgOutStyles &&
(!pFormatInfo->aClass.isEmpty() || pFormatInfo->bScriptDependent) )
{
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_class) + "=\"";
@@ -3139,7 +3139,7 @@ static Writer& OutHTML_SwTextCharFormat( Writer& rWrt, const SfxPoolItem& rHt )
{
if( !aClass.isEmpty() )
aClass += "-";
- switch( rHTMLWrt.nCSS1Script )
+ switch( rHTMLWrt.m_nCSS1Script )
{
case CSS1_OUTMODE_WESTERN:
aClass += "western";
@@ -3153,7 +3153,7 @@ static Writer& OutHTML_SwTextCharFormat( Writer& rWrt, const SfxPoolItem& rHt )
}
}
HTMLOutFuncs::Out_String( rWrt.Strm(), aClass,
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut = "\"";
}
sOut += ">";
@@ -3173,7 +3173,7 @@ static Writer& OutHTML_SwTextCharFormat( Writer& rWrt, const SfxPoolItem& rHt )
static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- if( !rHTMLWrt.bOutOpts || !rHTMLWrt.bTagOn )
+ if( !rHTMLWrt.m_bOutOpts || !rHTMLWrt.m_bTagOn )
return rWrt;
const SvxAdjustItem& rAdjust = static_cast<const SvxAdjustItem&>(rHt);
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index d6b8de214630..251fa71eefaa 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -257,7 +257,7 @@ void SwHTMLParser::InsertBasicDocEvent( const OUString& aEvent, const OUString&
void SwHTMLWriter::OutBasic()
{
#if HAVE_FEATURE_SCRIPTING
- if( !bCfgStarBasic )
+ if( !m_bCfgStarBasic )
return;
BasicManager *pBasicMan = pDoc->GetDocShell()->GetBasicManager();
@@ -295,7 +295,7 @@ void SwHTMLWriter::OutBasic()
.append("=\"text/x-");
Strm().WriteCharPtr( sOut.getStr() );
// Entities aren't welcome here
- Strm().WriteCharPtr( OUStringToOString(sLang, eDestEnc).getStr() )
+ Strm().WriteCharPtr( OUStringToOString(sLang, m_eDestEnc).getStr() )
.WriteCharPtr( "\">" );
}
@@ -304,7 +304,7 @@ void SwHTMLWriter::OutBasic()
HTMLOutFuncs::OutScript( Strm(), GetBaseURL(), rModule.GetSource(),
sLang, eType, aEmptyOUStr,
&rLibName, &rModName,
- eDestEnc, &aNonConvertableCharacters );
+ m_eDestEnc, &m_aNonConvertableCharacters );
}
}
#endif
@@ -337,7 +337,7 @@ void SwHTMLWriter::OutBasicBodyEvents()
if( !aDocTable.empty() )
HTMLOutFuncs::Out_Events( Strm(), aDocTable, aBodyEventTable,
- bCfgStarBasic, eDestEnc, &aNonConvertableCharacters );
+ m_bCfgStarBasic, m_eDestEnc, &m_aNonConvertableCharacters );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx
index 35e3b3324393..0a84e1dc3ffd 100644
--- a/sw/source/filter/html/htmldrawwriter.cxx
+++ b/sw/source/filter/html/htmldrawwriter.cxx
@@ -276,7 +276,7 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt,
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_bgcolor).append("=");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_Color( rWrt.Strm(), rFillColor, rHTMLWrt.eDestEnc );
+ HTMLOutFuncs::Out_Color( rWrt.Strm(), rFillColor, rHTMLWrt.m_eDestEnc );
}
if (!sOut.isEmpty())
@@ -299,7 +299,7 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt,
OUString aText( aOutliner.GetText( aOutliner.GetParagraph(0),
aOutliner.GetParagraphCount() ) );
HTMLOutFuncs::Out_String( rWrt.Strm(), aText,
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_marquee, false );
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index ebfb23a9638f..d1847c56d26a 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -277,7 +277,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name).
append("=\"");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), aName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut.append('\"');
}
if( !aValue.isEmpty() )
@@ -285,7 +285,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_value).
append("=\"");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), aValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aValue, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut.append('\"');
}
if( bNumFormat )
@@ -293,8 +293,8 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
OSL_ENSURE( nFormat, "Zahlenformat ist 0" );
sOut.append(HTMLOutFuncs::CreateTableDataOptionsValNum(
bNumValue, dNumValue, nFormat,
- *rHTMLWrt.pDoc->GetNumberFormatter(), rHTMLWrt.eDestEnc,
- &rHTMLWrt.aNonConvertableCharacters));
+ *rHTMLWrt.pDoc->GetNumberFormatter(), rHTMLWrt.m_eDestEnc,
+ &rHTMLWrt.m_aNonConvertableCharacters));
}
if( bFixed )
{
@@ -315,7 +315,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
sal_uInt16 nScript =
SwHTMLWriter::GetCSS1ScriptForScriptType( nScriptType );
- if( (nPos < sExpand.getLength() && nPos >= 0) || nScript != rHTMLWrt.nCSS1Script )
+ if( (nPos < sExpand.getLength() && nPos >= 0) || nScript != rHTMLWrt.m_nCSS1Script )
{
bNeedsCJKProcessing = true;
}
@@ -344,7 +344,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT };
sal_uInt16 *pRefWhichIds = 0;
- switch( rHTMLWrt.nCSS1Script )
+ switch( rHTMLWrt.m_nCSS1Script )
{
case CSS1_OUTMODE_WESTERN:
pRefWhichIds = aWesternWhichIds;
@@ -367,7 +367,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
sExpand, nPos, nScriptType );
sal_Int32 nChunkLen = nEndPos - nPos;
if( nScript != CSS1_OUTMODE_ANY_SCRIPT &&
- /* #108791# */ nScript != rHTMLWrt.nCSS1Script )
+ /* #108791# */ nScript != rHTMLWrt.m_nCSS1Script )
{
sal_uInt16 *pWhichIds = 0;
switch( nScript )
@@ -377,7 +377,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
case CSS1_OUTMODE_CTL: pWhichIds = aCTLWhichIds; break;
}
- rHTMLWrt.bTagOn = true;
+ rHTMLWrt.m_bTagOn = true;
const SfxPoolItem *aItems[5];
int nItems = 0;
@@ -402,9 +402,9 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
}
HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.copy( nPos, nChunkLen ),
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
- rHTMLWrt.bTagOn = false;
+ rHTMLWrt.m_bTagOn = false;
while( nItems )
Out( aHTMLAttrFnTab, *aItems[--nItems], rHTMLWrt );
@@ -412,7 +412,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
else
{
HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.copy( nPos, nChunkLen ),
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
}
nPos = nEndPos;
}
@@ -421,7 +421,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
else
{
HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand,
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
}
// Off-Tag ausgeben
@@ -451,7 +451,7 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt )
// TODO: HTML-Tags are written without entitities, that for, characters
// not contained in the destination encoding are lost!
OString sTmp(OUStringToOString(rText,
- static_cast<SwHTMLWriter&>(rWrt).eDestEnc));
+ static_cast<SwHTMLWriter&>(rWrt).m_eDestEnc));
rWrt.Strm().WriteCharPtr( sTmp.getStr() ).WriteChar( '>' );
}
else if( RES_POSTITFLD == pFieldTyp->Which() )
@@ -472,7 +472,7 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt )
// TODO: HTML-Tags are written without entitities, that for,
// characters not contained in the destination encoding are lost!
OString sTmp(OUStringToOString(sComment,
- static_cast<SwHTMLWriter&>(rWrt).eDestEnc));
+ static_cast<SwHTMLWriter&>(rWrt).m_eDestEnc));
rWrt.Strm().WriteCharPtr( sTmp.getStr() );
bWritten = true;
}
@@ -488,7 +488,7 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt )
// characters not contained in the destination encoding are
// lost!
OString sTmp(OUStringToOString(sComment,
- static_cast<SwHTMLWriter&>(rWrt).eDestEnc));
+ static_cast<SwHTMLWriter&>(rWrt).m_eDestEnc));
rWrt.Strm().WriteCharPtr( sTmp.getStr() );
bWritten = true;
}
@@ -502,14 +502,14 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt )
// TODO: ???
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_comment)
.append(' ').append(OUStringToOString(sComment,
- static_cast<SwHTMLWriter&>(rWrt).eDestEnc)).append(" -->");
+ static_cast<SwHTMLWriter&>(rWrt).m_eDestEnc)).append(" -->");
rWrt.Strm().WriteCharPtr( sOut.getStr() );
}
}
else if( RES_SCRIPTFLD == pFieldTyp->Which() )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- if( rHTMLWrt.bLFPossible )
+ if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine( true );
bool bURL = static_cast<const SwScriptField *>(pField)->IsCodeURL();
@@ -523,9 +523,9 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt )
// sonst ist es der Script-Inhalt selbst. Da nur noh JavaScript
// in Feldern landet, muss es sich um JavaSrript handeln ...:)
HTMLOutFuncs::OutScript( rWrt.Strm(), rWrt.GetBaseURL(), aContents, rType, JAVASCRIPT,
- aURL, 0, 0, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ aURL, 0, 0, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
- if( rHTMLWrt.bLFPossible )
+ if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine( true );
}
else
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index e21b49263379..084bd97f6752 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -246,9 +246,9 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrameFormat& rFrameFormat,
// leerer Rahmen? Nur wenn kein Rahmen am
// Text- oder Start-Node verankert ist.
bEmpty = true;
- if( pHTMLPosFlyFrms )
+ if( m_pHTMLPosFlyFrms )
{
- for( auto pHTMLPosFlyFrm : *pHTMLPosFlyFrms )
+ for( auto pHTMLPosFlyFrm : *m_pHTMLPosFlyFrms )
{
sal_uLong nIdx = pHTMLPosFlyFrm->GetNdIndex().GetIndex();
bEmpty = (nIdx != nStt) && (nIdx != nStt-1);
@@ -310,7 +310,7 @@ void SwHTMLWriter::CollectFlyFrms()
{
case FLY_AT_PAGE:
case FLY_AT_FLY:
- nMode = aHTMLOutFrmPageFlyTable[eType][nExportMode];
+ nMode = aHTMLOutFrmPageFlyTable[eType][m_nExportMode];
break;
case FLY_AT_PARA:
@@ -325,30 +325,30 @@ void SwHTMLWriter::CollectFlyFrms()
static_cast<const SvxLRSpaceItem&>(pACNd->GetAttr(RES_LR_SPACE));
if( rLRItem.GetTextLeft() || rLRItem.GetRight() )
{
- nMode = aHTMLOutFrmParaFrameTable[eType][nExportMode];
+ nMode = aHTMLOutFrmParaFrameTable[eType][m_nExportMode];
break;
}
}
- nMode = aHTMLOutFrmParaPrtAreaTable[eType][nExportMode];
+ nMode = aHTMLOutFrmParaPrtAreaTable[eType][m_nExportMode];
break;
case FLY_AT_CHAR:
if( text::RelOrientation::FRAME == eHoriRel || text::RelOrientation::PRINT_AREA == eHoriRel )
- nMode = aHTMLOutFrmParaPrtAreaTable[eType][nExportMode];
+ nMode = aHTMLOutFrmParaPrtAreaTable[eType][m_nExportMode];
else
- nMode = aHTMLOutFrmParaOtherTable[eType][nExportMode];
+ nMode = aHTMLOutFrmParaOtherTable[eType][m_nExportMode];
break;
default:
- nMode = aHTMLOutFrmParaPrtAreaTable[eType][nExportMode];
+ nMode = aHTMLOutFrmParaPrtAreaTable[eType][m_nExportMode];
break;
}
- if( !pHTMLPosFlyFrms )
- pHTMLPosFlyFrms = new SwHTMLPosFlyFrms;
+ if( !m_pHTMLPosFlyFrms )
+ m_pHTMLPosFlyFrms = new SwHTMLPosFlyFrms;
SwHTMLPosFlyFrm *pNew = new SwHTMLPosFlyFrm(**aIter, pSdrObj, nMode);
- pHTMLPosFlyFrms->insert( pNew );
+ m_pHTMLPosFlyFrms->insert( pNew );
}
}
@@ -361,20 +361,20 @@ bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uInt8
// manchmal wieder von vorne anfangen, nachdem ein Fly ausgegeben
// wurde.
bool bRestart = true;
- while( pHTMLPosFlyFrms && bRestart )
+ while( m_pHTMLPosFlyFrms && bRestart )
{
bFlysLeft = bRestart = false;
// suche nach dem Anfang der FlyFrames
size_t i {0};
- for( ; i < pHTMLPosFlyFrms->size() &&
- (*pHTMLPosFlyFrms)[i]->GetNdIndex().GetIndex() < nNdIdx; i++ )
+ for( ; i < m_pHTMLPosFlyFrms->size() &&
+ (*m_pHTMLPosFlyFrms)[i]->GetNdIndex().GetIndex() < nNdIdx; i++ )
;
- for( ; !bRestart && i < pHTMLPosFlyFrms->size() &&
- (*pHTMLPosFlyFrms)[i]->GetNdIndex().GetIndex() == nNdIdx; i++ )
+ for( ; !bRestart && i < m_pHTMLPosFlyFrms->size() &&
+ (*m_pHTMLPosFlyFrms)[i]->GetNdIndex().GetIndex() == nNdIdx; i++ )
{
- SwHTMLPosFlyFrm *pPosFly = (*pHTMLPosFlyFrms)[i];
+ SwHTMLPosFlyFrm *pPosFly = (*m_pHTMLPosFlyFrms)[i];
if( ( HTML_POS_ANY == nPos ||
pPosFly->GetOutPos() == nPos ) &&
pPosFly->GetContentIndex() == nContentIdx )
@@ -382,12 +382,12 @@ bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uInt8
// Erst entfernen ist wichtig, weil in tieferen
// Rekursionen evtl. weitere Eintraege oder das
// ganze Array geloscht werden koennte.
- pHTMLPosFlyFrms->erase(i);
+ m_pHTMLPosFlyFrms->erase(i);
i--;
- if( pHTMLPosFlyFrms->empty() )
+ if( m_pHTMLPosFlyFrms->empty() )
{
- delete pHTMLPosFlyFrms;
- pHTMLPosFlyFrms = 0;
+ delete m_pHTMLPosFlyFrms;
+ m_pHTMLPosFlyFrms = 0;
bRestart = true; // nicht wirklich, nur raus
// aus der Schleife
}
@@ -430,7 +430,7 @@ void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameF
if( HTML_CNTNR_NONE != nCntnrMode )
{
- if( bLFPossible && HTML_CNTNR_DIV == nCntnrMode )
+ if( m_bLFPossible && HTML_CNTNR_DIV == nCntnrMode )
OutNewLine();
OStringBuffer sOut;
@@ -457,7 +457,7 @@ void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameF
if( HTML_CNTNR_DIV == nCntnrMode )
{
IncIndentLevel();
- bLFPossible = true;
+ m_bLFPossible = true;
}
}
@@ -509,10 +509,10 @@ void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameF
if( HTML_CNTNR_DIV == nCntnrMode )
{
DecIndentLevel();
- if( bLFPossible )
+ if( m_bLFPossible )
OutNewLine();
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
- bLFPossible = true;
+ m_bLFPossible = true;
}
else if( HTML_CNTNR_SPAN == nCntnrMode )
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_span, false );
@@ -537,7 +537,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
sOut.append(' ').append(pStr).
append("=\"");
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( Strm(), rFrameFormat.GetName(), eDestEnc, &aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), rFrameFormat.GetName(), m_eDestEnc, &m_aNonConvertableCharacters );
sOut.append('\"');
}
@@ -555,7 +555,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_alt).
append("=\"");
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( Strm(), rAlternateText, eDestEnc, &aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), rAlternateText, m_eDestEnc, &m_aNonConvertableCharacters );
sOut.append('\"');
}
@@ -611,7 +611,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
aTwipSpc.Width() =
( static_cast<const SvxLRSpaceItem*>(pItem)->GetLeft() +
static_cast<const SvxLRSpaceItem*>(pItem)->GetRight() ) / 2;
- nDfltLeftMargin = nDfltRightMargin = aTwipSpc.Width();
+ m_nDfltLeftMargin = m_nDfltRightMargin = aTwipSpc.Width();
}
if( (nFrmOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) &&
SfxItemState::SET == rItemSet.GetItemState( RES_UL_SPACE, true, &pItem ))
@@ -619,7 +619,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
aTwipSpc.Height() =
( static_cast<const SvxULSpaceItem*>(pItem)->GetUpper() +
static_cast<const SvxULSpaceItem*>(pItem)->GetLower() ) / 2;
- nDfltTopMargin = nDfltBottomMargin = (sal_uInt16)aTwipSpc.Height();
+ m_nDfltTopMargin = m_nDfltBottomMargin = (sal_uInt16)aTwipSpc.Height();
}
if( (nFrmOpts & HTML_FRMOPT_SPACE) &&
@@ -761,7 +761,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
case SURROUND_LEFT:
case SURROUND_PARALLEL:
if( bAnchorOnly )
- bClearRight = true;
+ m_bClearRight = true;
break;
default:
;
@@ -782,7 +782,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
case SURROUND_RIGHT:
case SURROUND_PARALLEL:
if( bAnchorOnly )
- bClearLeft = true;
+ m_bClearLeft = true;
break;
default:
;
@@ -879,7 +879,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma
aTwipSpc.Width() =
( static_cast<const SvxLRSpaceItem*>(pItem)->GetLeft() +
static_cast<const SvxLRSpaceItem*>(pItem)->GetRight() ) / 2;
- nDfltLeftMargin = nDfltRightMargin = aTwipSpc.Width();
+ m_nDfltLeftMargin = m_nDfltRightMargin = aTwipSpc.Width();
}
if( (nFrameOptions & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) &&
SfxItemState::SET == rItemSet.GetItemState( RES_UL_SPACE, true, &pItem ))
@@ -887,7 +887,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma
aTwipSpc.Height() =
( static_cast<const SvxULSpaceItem*>(pItem)->GetUpper() +
static_cast<const SvxULSpaceItem*>(pItem)->GetLower() ) / 2;
- nDfltTopMargin = nDfltBottomMargin = (sal_uInt16)aTwipSpc.Height();
+ m_nDfltTopMargin = m_nDfltBottomMargin = (sal_uInt16)aTwipSpc.Height();
}
if( (nFrameOptions & HTML_FRMOPT_SPACE) &&
@@ -1024,7 +1024,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma
case SURROUND_LEFT:
case SURROUND_PARALLEL:
if( bAnchorOnly )
- bClearRight = true;
+ m_bClearRight = true;
break;
default:
;
@@ -1045,7 +1045,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma
case SURROUND_RIGHT:
case SURROUND_PARALLEL:
if( bAnchorOnly )
- bClearLeft = true;
+ m_bClearLeft = true;
break;
default:
break;
@@ -1098,17 +1098,17 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con
aNameBase = OOO_STRING_SVTOOLS_HTML_map;
if (aIMapName.isEmpty())
- aIMapName = aNameBase + OUString::number(rHTMLWrt.nImgMapCnt);
+ aIMapName = aNameBase + OUString::number(rHTMLWrt.m_nImgMapCnt);
bool bFound;
do
{
bFound = false;
- for (size_t i = 0; i < rHTMLWrt.aImgMapNames.size(); ++i)
+ for (size_t i = 0; i < rHTMLWrt.m_aImgMapNames.size(); ++i)
{
// TODO: Unicode: Comparison is case insensitive for ASCII
// characters only now!
- if (aIMapName.equalsIgnoreAsciiCase(rHTMLWrt.aImgMapNames[i]))
+ if (aIMapName.equalsIgnoreAsciiCase(rHTMLWrt.m_aImgMapNames[i]))
{
bFound = true;
break;
@@ -1116,8 +1116,8 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con
}
if (bFound)
{
- rHTMLWrt.nImgMapCnt++;
- aIMapName = aNameBase + OUString::number( rHTMLWrt.nImgMapCnt );
+ rHTMLWrt.m_nImgMapCnt++;
+ aIMapName = aNameBase + OUString::number( rHTMLWrt.m_nImgMapCnt );
}
} while (bFound);
@@ -1161,12 +1161,12 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con
}
}
- rHTMLWrt.aImgMapNames.push_back(aIMapName);
+ rHTMLWrt.m_aImgMapNames.push_back(aIMapName);
OString aIndMap, aIndArea;
const sal_Char *pIndArea = 0, *pIndMap = 0;
- if (rHTMLWrt.bLFPossible)
+ if (rHTMLWrt.m_bLFPossible)
{
rHTMLWrt.OutNewLine( true );
aIndMap = rHTMLWrt.GetIndentString();
@@ -1181,19 +1181,19 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con
aScaledIMap.Scale(aScaleX, aScaleY);
HTMLOutFuncs::Out_ImageMap( rHTMLWrt.Strm(), rHTMLWrt.GetBaseURL(), aScaledIMap, aIMapName,
aIMapEventTable,
- rHTMLWrt.bCfgStarBasic,
+ rHTMLWrt.m_bCfgStarBasic,
SAL_NEWLINE_STRING, pIndArea, pIndMap,
- rHTMLWrt.eDestEnc,
- &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc,
+ &rHTMLWrt.m_aNonConvertableCharacters );
}
else
{
HTMLOutFuncs::Out_ImageMap( rHTMLWrt.Strm(), rHTMLWrt.GetBaseURL(), *pIMap, aIMapName,
aIMapEventTable,
- rHTMLWrt.bCfgStarBasic,
+ rHTMLWrt.m_bCfgStarBasic,
SAL_NEWLINE_STRING, pIndArea, pIndMap,
- rHTMLWrt.eDestEnc,
- &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc,
+ &rHTMLWrt.m_aNonConvertableCharacters );
}
}
return aIMapName;
@@ -1213,9 +1213,9 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat,
return rHTMLWrt;
// ggf. ein noch offenes Attribut voruebergehend beenden
- if( !rHTMLWrt.aINetFormats.empty() )
+ if( !rHTMLWrt.m_aINetFormats.empty() )
{
- SwFormatINetFormat* pINetFormat = rHTMLWrt.aINetFormats.back();
+ SwFormatINetFormat* pINetFormat = rHTMLWrt.m_aINetFormats.back();
OutHTML_INetFormat( rWrt, *pINetFormat, false );
}
@@ -1226,7 +1226,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat,
OUString aIMapName = lclWriteOutImap(rHTMLWrt, rItemSet, rFrameFormat, rRealSize, pAltImgMap, pURLItem);
// put img into new line
- if( rHTMLWrt.bLFPossible )
+ if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine( true );
HtmlWriter aHtml(rWrt.Strm());
@@ -1284,7 +1284,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat,
const SvxMacroTableDtor& rMacTable = pMacItem->GetMacroTable();
if (!rMacTable.empty())
{
- HtmlWriterHelper::applyEvents(aHtml, rMacTable, aAnchorEventTable, rHTMLWrt.bCfgStarBasic);
+ HtmlWriterHelper::applyEvents(aHtml, rMacTable, aAnchorEventTable, rHTMLWrt.m_bCfgStarBasic);
}
}
}
@@ -1360,7 +1360,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat,
OUString aGraphicInBase64;
if ( !XOutBitmap::GraphicToBase64(rGraphic, aGraphicInBase64) )
{
- rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
+ rHTMLWrt.m_nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
}
OStringBuffer sBuffer;
@@ -1375,7 +1375,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat,
const SvxMacroTableDtor& rMacTable = static_cast<const SvxMacroItem *>(pItem)->GetMacroTable();
if (!rMacTable.empty())
{
- HtmlWriterHelper::applyEvents(aHtml, rMacTable, aImageEventTable, rHTMLWrt.bCfgStarBasic);
+ HtmlWriterHelper::applyEvents(aHtml, rMacTable, aImageEventTable, rHTMLWrt.m_bCfgStarBasic);
}
}
@@ -1401,11 +1401,11 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat,
aHtml.flushStack();
- if( !rHTMLWrt.aINetFormats.empty() )
+ if( !rHTMLWrt.m_aINetFormats.empty() )
{
// es ist noch ein Attribut auf dem Stack, das wieder geoeffnet
// werden muss
- SwFormatINetFormat *pINetFormat = rHTMLWrt.aINetFormats.back();
+ SwFormatINetFormat *pINetFormat = rHTMLWrt.m_aINetFormats.back();
OutHTML_INetFormat( rWrt, *pINetFormat, true );
}
@@ -1426,7 +1426,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
{
if( !XOutBitmap::GraphicToBase64(*pGrf, aGraphicInBase64) )
{
- rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
+ rHTMLWrt.m_nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
}
}
}
@@ -1440,7 +1440,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
append("list-style-image: ").append("url(").
append(OOO_STRING_SVTOOLS_HTML_O_data).append(":");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut.append(");").append('\"');
if (pTag)
@@ -1490,7 +1490,7 @@ static Writer& OutHTML_FrameFormatTableNode( Writer& rWrt, const SwFrameFormat&
HTMLSaveData aSaveData( rHTMLWrt, pTableNd->GetIndex()+1,
pTableNd->EndOfSectionIndex(),
true, &rFrameFormat );
- rHTMLWrt.bOutFlyFrame = true;
+ rHTMLWrt.m_bOutFlyFrame = true;
OutHTML_SwTableNode( rHTMLWrt, *pTableNd, &rFrameFormat, &aCaption,
bTopCaption );
}
@@ -1510,7 +1510,7 @@ static Writer & OutHTML_FrameFormatAsMulticol( Writer& rWrt,
rHTMLWrt.OutAndSetDefList( 0 );
// als Multicol ausgeben
- if( rHTMLWrt.bLFPossible )
+ if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine();
OStringBuffer sOut;
@@ -1553,7 +1553,7 @@ static Writer & OutHTML_FrameFormatAsMulticol( Writer& rWrt,
rWrt.Strm().WriteChar( '>' );
- rHTMLWrt.bLFPossible = true;
+ rHTMLWrt.m_bLFPossible = true;
rHTMLWrt.IncIndentLevel(); // den Inhalt von Multicol einruecken;
const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
@@ -1567,15 +1567,15 @@ static Writer & OutHTML_FrameFormatAsMulticol( Writer& rWrt,
HTMLSaveData aSaveData( rHTMLWrt, nStt+1,
pSttNd->EndOfSectionIndex(),
true, &rFrameFormat );
- rHTMLWrt.bOutFlyFrame = true;
+ rHTMLWrt.m_bOutFlyFrame = true;
rHTMLWrt.Out_SwDoc( rWrt.pCurPam );
}
rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken;
- if( rHTMLWrt.bLFPossible )
+ if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_multicol, false );
- rHTMLWrt.bLFPossible = true;
+ rHTMLWrt.m_bLFPossible = true;
return rWrt;
}
@@ -1585,7 +1585,7 @@ static Writer& OutHTML_FrameFormatAsSpacer( Writer& rWrt, const SwFrameFormat& r
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
// wenn meoglich vor der Grafik einen Zeilen-Umbruch ausgeben
- if( rHTMLWrt.bLFPossible )
+ if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine( true );
OStringBuffer sOut;
@@ -1622,7 +1622,7 @@ static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt,
pStr = OOO_STRING_SVTOOLS_HTML_span;
// als DIV ausgeben
- if( rHTMLWrt.bLFPossible )
+ if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine();
OStringBuffer sOut;
@@ -1637,7 +1637,7 @@ static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt,
rWrt.Strm().WriteChar( '>' );
rHTMLWrt.IncIndentLevel(); // den Inhalt einruecken
- rHTMLWrt.bLFPossible = true;
+ rHTMLWrt.m_bLFPossible = true;
const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex();
@@ -1654,12 +1654,12 @@ static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt,
HTMLSaveData aSaveData( rHTMLWrt, nStt+1,
pSttNd->EndOfSectionIndex(),
true, &rFrameFormat );
- rHTMLWrt.bOutFlyFrame = true;
+ rHTMLWrt.m_bOutFlyFrame = true;
rHTMLWrt.Out_SwDoc( rWrt.pCurPam );
}
rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken;
- if( rHTMLWrt.bLFPossible )
+ if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, false );
@@ -1724,21 +1724,21 @@ static Writer& OutHTML_FrameFormatAsMarquee( Writer& rWrt, const SwFrameFormat&
SfxItemSet aItemSet( *rFormatItemSet.GetPool(), RES_CHRATR_BEGIN,
RES_CHRATR_END );
SwHTMLWriter::GetEEAttrsFromDrwObj( aItemSet, &rSdrObj, true );
- bool bCfgOutStylesOld = rHTMLWrt.bCfgOutStyles;
- rHTMLWrt.bCfgOutStyles = false;
- rHTMLWrt.bTextAttr = true;
- rHTMLWrt.bTagOn = true;
+ bool bCfgOutStylesOld = rHTMLWrt.m_bCfgOutStyles;
+ rHTMLWrt.m_bCfgOutStyles = false;
+ rHTMLWrt.m_bTextAttr = true;
+ rHTMLWrt.m_bTagOn = true;
Out_SfxItemSet( aHTMLAttrFnTab, rWrt, aItemSet, false );
- rHTMLWrt.bTextAttr = false;
+ rHTMLWrt.m_bTextAttr = false;
OutHTML_DrawFrameFormatAsMarquee( rHTMLWrt,
static_cast<const SwDrawFrameFormat &>(rFrameFormat),
rSdrObj );
- rHTMLWrt.bTextAttr = true;
- rHTMLWrt.bTagOn = false;
+ rHTMLWrt.m_bTextAttr = true;
+ rHTMLWrt.m_bTagOn = false;
Out_SfxItemSet( aHTMLAttrFnTab, rWrt, aItemSet, false );
- rHTMLWrt.bTextAttr = false;
- rHTMLWrt.bCfgOutStyles = bCfgOutStylesOld;
+ rHTMLWrt.m_bTextAttr = false;
+ rHTMLWrt.m_bCfgOutStyles = bCfgOutStylesOld;
return rWrt;
}
@@ -1763,7 +1763,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrameFormat& rFrameFormat,
// ggf. abgezogen.
const SvxULSpaceItem& rULSpace = rFrameFormat.GetULSpace();
sal_uInt16 nSize = bHeader ? rULSpace.GetLower() : rULSpace.GetUpper();
- rHTMLWrt.nHeaderFooterSpace = nSize;
+ rHTMLWrt.m_nHeaderFooterSpace = nSize;
OString aSpacer;
if( rHTMLWrt.IsHTMLMode(HTMLMODE_VERT_SPACER) &&
@@ -1800,9 +1800,9 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrameFormat& rFrameFormat,
pSttNd->EndOfSectionIndex() );
if( bHeader )
- rHTMLWrt.bOutHeader = true;
+ rHTMLWrt.m_bOutHeader = true;
else
- rHTMLWrt.bOutFooter = true;
+ rHTMLWrt.m_bOutFooter = true;
rHTMLWrt.Out_SwDoc( rWrt.pCurPam );
}
@@ -1817,7 +1817,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrameFormat& rFrameFormat,
rHTMLWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
- rHTMLWrt.nHeaderFooterSpace = 0;
+ rHTMLWrt.m_nHeaderFooterSpace = 0;
return rWrt;
}
@@ -1875,7 +1875,7 @@ void SwHTMLWriter::AddLinkTarget( const OUString& rURL )
{
aURL = aURL.replaceAt( nPos - 1, 3, OUString(cMarkSeparator) );
}
- aImplicitMarks.insert( aURL );
+ m_aImplicitMarks.insert( aURL );
}
else if( sCmp == "outline" )
{
@@ -1888,16 +1888,16 @@ void SwHTMLWriter::AddLinkTarget( const OUString& rURL )
sal_uInt32 nIdx = aPos.nNode.GetIndex();
sal_uInt32 nIns=0;
- while( nIns < aOutlineMarkPoss.size() &&
- aOutlineMarkPoss[nIns] < nIdx )
+ while( nIns < m_aOutlineMarkPoss.size() &&
+ m_aOutlineMarkPoss[nIns] < nIdx )
nIns++;
- aOutlineMarkPoss.insert( aOutlineMarkPoss.begin()+nIns, nIdx );
+ m_aOutlineMarkPoss.insert( m_aOutlineMarkPoss.begin()+nIns, nIdx );
if( bEncoded )
{
aURL = aURL.replaceAt( nPos - 1, 3, OUString(cMarkSeparator) );
}
- aOutlineMarks.insert( aOutlineMarks.begin()+nIns, aURL );
+ m_aOutlineMarks.insert( m_aOutlineMarks.begin()+nIns, aURL );
}
}
else if( sCmp == "text" )
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index e4ff1a58eab6..f0c7c96573d8 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -218,22 +218,22 @@ bool SwHTMLWriter::HasControls() const
size_t i = 0;
// Skip all controls in front of the current paragraph
- while ( i < aHTMLControls.size() && aHTMLControls[i]->nNdIdx < nStartIdx )
+ while ( i < m_aHTMLControls.size() && m_aHTMLControls[i]->nNdIdx < nStartIdx )
++i;
- return i < aHTMLControls.size() && aHTMLControls[i]->nNdIdx == nStartIdx;
+ return i < m_aHTMLControls.size() && m_aHTMLControls[i]->nNdIdx == nStartIdx;
}
void SwHTMLWriter::OutForm( bool bTag_On, const SwStartNode *pStartNd )
{
- if( bPreserveForm ) // wir sind in einer Tabelle oder einem Bereich
+ if( m_bPreserveForm ) // wir sind in einer Tabelle oder einem Bereich
return; // ueber dem eine Form aufgespannt wurde
if( !bTag_On )
{
// die Form beenden wenn alle Controls ausgegeben wurden
if( mxFormComps.is() &&
- mxFormComps->getCount() == nFormCntrlCnt )
+ mxFormComps->getCount() == m_nFormCntrlCnt )
{
OutForm( false, mxFormComps );
mxFormComps.clear();
@@ -247,16 +247,16 @@ void SwHTMLWriter::OutForm( bool bTag_On, const SwStartNode *pStartNd )
// Ueberspringen von Controls vor dem interesanten Bereich
size_t i = 0;
- while ( i < aHTMLControls.size() && aHTMLControls[i]->nNdIdx < nStartIdx )
+ while ( i < m_aHTMLControls.size() && m_aHTMLControls[i]->nNdIdx < nStartIdx )
++i;
if( !pStartNd )
{
// Check fuer einen einzelnen Node: da ist nur interessant, ob
// es zu dem Node ein Control gibt und zu welcher Form es gehoert
- if( i < aHTMLControls.size() &&
- aHTMLControls[i]->nNdIdx == nStartIdx )
- xNewFormComps = aHTMLControls[i]->xFormComps;
+ if( i < m_aHTMLControls.size() &&
+ m_aHTMLControls[i]->nNdIdx == nStartIdx )
+ xNewFormComps = m_aHTMLControls[i]->xFormComps;
}
else
{
@@ -269,16 +269,16 @@ void SwHTMLWriter::OutForm( bool bTag_On, const SwStartNode *pStartNd )
const SwStartNode *pCurrentStNd = 0; // und der Start-Node eines Ctrls
sal_Int32 nCurrentCtrls = 0; // und die in ihr gefundenen Controls
sal_uInt32 nEndIdx = pStartNd->EndOfSectionIndex();
- for( ; i < aHTMLControls.size() &&
- aHTMLControls[i]->nNdIdx <= nEndIdx; i++ )
+ for( ; i < m_aHTMLControls.size() &&
+ m_aHTMLControls[i]->nNdIdx <= nEndIdx; i++ )
{
const SwStartNode *pCntrlStNd =
- pDoc->GetNodes()[aHTMLControls[i]->nNdIdx]->StartOfSectionNode();
+ pDoc->GetNodes()[m_aHTMLControls[i]->nNdIdx]->StartOfSectionNode();
if( xCurrentFormComps.is() )
{
// Wir befinden uns bereits in einer Form ...
- if( xCurrentFormComps==aHTMLControls[i]->xFormComps )
+ if( xCurrentFormComps==m_aHTMLControls[i]->xFormComps )
{
// ... und das Control befindet sich auch darin ...
if( pCurrentStNd!=pCntrlStNd )
@@ -289,25 +289,25 @@ void SwHTMLWriter::OutForm( bool bTag_On, const SwStartNode *pStartNd )
xNewFormComps = xCurrentFormComps;
break;
}
- nCurrentCtrls = nCurrentCtrls + aHTMLControls[i]->nCount;
+ nCurrentCtrls = nCurrentCtrls + m_aHTMLControls[i]->nCount;
}
else
{
// ... aber das Control liegt in einer anderen Zelle:
// Da tun wir so, als ob wir eine neue Form aufmachen
// und suchen weiter.
- xCurrentFormComps = aHTMLControls[i]->xFormComps;
+ xCurrentFormComps = m_aHTMLControls[i]->xFormComps;
pCurrentStNd = pCntrlStNd;
- nCurrentCtrls = aHTMLControls[i]->nCount;
+ nCurrentCtrls = m_aHTMLControls[i]->nCount;
}
}
else
{
// Wir befinden uns noch in keiner Form:
// Da tun wir mal so, als ob wie wir die Form aufmachen.
- xCurrentFormComps = aHTMLControls[i]->xFormComps;
+ xCurrentFormComps = m_aHTMLControls[i]->xFormComps;
pCurrentStNd = pCntrlStNd;
- nCurrentCtrls = aHTMLControls[i]->nCount;
+ nCurrentCtrls = m_aHTMLControls[i]->nCount;
}
}
if( !xNewFormComps.is() && xCurrentFormComps.is() &&
@@ -441,21 +441,21 @@ void SwHTMLWriter::OutHiddenForm( const uno::Reference< form::XForm > & rForm )
void SwHTMLWriter::OutForm( bool bOn,
const uno::Reference< container::XIndexContainer > & rFormComps )
{
- nFormCntrlCnt = 0;
+ m_nFormCntrlCnt = 0;
if( !bOn )
{
DecIndentLevel(); // Inhalt der Form einruecken
- if( bLFPossible )
+ if( m_bLFPossible )
OutNewLine();
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_form, false );
- bLFPossible = true;
+ m_bLFPossible = true;
return;
}
// die neue Form wird geoeffnet
- if( bLFPossible )
+ if( m_bLFPossible )
OutNewLine();
OString sOut = "<" + OString(OOO_STRING_SVTOOLS_HTML_form);
@@ -468,7 +468,7 @@ void SwHTMLWriter::OutForm( bool bOn,
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\"";
Strm().WriteOString( sOut );
HTMLOutFuncs::Out_String( Strm(), *static_cast<OUString const *>(aTmp.getValue()),
- eDestEnc, &aNonConvertableCharacters );
+ m_eDestEnc, &m_aNonConvertableCharacters );
sOut = "\"";
}
@@ -480,7 +480,7 @@ void SwHTMLWriter::OutForm( bool bOn,
Strm().WriteOString( sOut );
OUString aURL( *static_cast<OUString const *>(aTmp.getValue()) );
aURL = URIHelper::simpleNormalizedMakeRelative( GetBaseURL(), aURL);
- HTMLOutFuncs::Out_String( Strm(), aURL, eDestEnc, &aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), aURL, m_eDestEnc, &m_aNonConvertableCharacters );
sOut = "\"";
}
@@ -527,17 +527,17 @@ void SwHTMLWriter::OutForm( bool bOn,
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_target) + "=\"";
Strm().WriteOString( sOut );
HTMLOutFuncs::Out_String( Strm(), *static_cast<OUString const *>(aTmp.getValue()),
- eDestEnc, &aNonConvertableCharacters );
+ m_eDestEnc, &m_aNonConvertableCharacters );
sOut = "\"";
}
Strm().WriteOString( sOut );
uno::Reference< form::XFormComponent > xFormComp( rFormComps, uno::UNO_QUERY );
- lcl_html_outEvents( Strm(), xFormComp, bCfgStarBasic, eDestEnc, &aNonConvertableCharacters );
+ lcl_html_outEvents( Strm(), xFormComp, m_bCfgStarBasic, m_eDestEnc, &m_aNonConvertableCharacters );
Strm().WriteChar( '>' );
IncIndentLevel(); // Inhalt der Form einruecken
- bLFPossible = true;
+ m_bLFPossible = true;
}
void SwHTMLWriter::OutHiddenControls(
@@ -588,7 +588,7 @@ void SwHTMLWriter::OutHiddenControls(
if( form::FormComponentType::HIDDENCONTROL ==
*static_cast<sal_Int16 const *>(aTmp.getValue()) )
{
- if( bLFPossible )
+ if( m_bLFPossible )
OutNewLine( true );
OString sOut = "<" + OString(OOO_STRING_SVTOOLS_HTML_input) + " " +
OString(OOO_STRING_SVTOOLS_HTML_O_type) + "=\"" +
@@ -601,7 +601,7 @@ void SwHTMLWriter::OutHiddenControls(
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\"";
Strm().WriteOString( sOut );
HTMLOutFuncs::Out_String( Strm(), *static_cast<OUString const *>(aTmp.getValue()),
- eDestEnc, &aNonConvertableCharacters );
+ m_eDestEnc, &m_aNonConvertableCharacters );
sOut = "\"";
}
aTmp = xPropSet->getPropertyValue( "HiddenValue" );
@@ -611,13 +611,13 @@ void SwHTMLWriter::OutHiddenControls(
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_value) + "=\"";
Strm().WriteOString( sOut );
HTMLOutFuncs::Out_String( Strm(), *static_cast<OUString const *>(aTmp.getValue()),
- eDestEnc, &aNonConvertableCharacters );
+ m_eDestEnc, &m_aNonConvertableCharacters );
sOut = "\"";
}
sOut += ">";
Strm().WriteOString( sOut );
- nFormCntrlCnt++;
+ m_nFormCntrlCnt++;
}
else if( lcl_html_isHTMLControl( *static_cast<sal_Int16 const *>(aTmp.getValue()) ) )
{
@@ -702,7 +702,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
xPropSet->getPropertySetInfo();
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- rHTMLWrt.nFormCntrlCnt++;
+ rHTMLWrt.m_nFormCntrlCnt++;
enum Tag { TAG_INPUT, TAG_SELECT, TAG_TEXTAREA, TAG_NONE };
static char const * const TagNames[] = {
@@ -784,7 +784,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
break;
case form::FormComponentType::LISTBOX:
- if( rHTMLWrt.bLFPossible )
+ if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine( true );
eTag = TAG_SELECT;
aTmp = xPropSet->getPropertyValue( "Dropdown" );
@@ -826,7 +826,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
if( bMultiLine )
{
- if( rHTMLWrt.bLFPossible )
+ if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine( true );
eTag = TAG_TEXTAREA;
@@ -938,7 +938,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\"";
rWrt.Strm().WriteOString( sOut );
HTMLOutFuncs::Out_String( rWrt.Strm(), *static_cast<OUString const *>(aTmp.getValue()),
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut = "\"";
}
@@ -953,7 +953,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
{
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_value) + "=\"";
rWrt.Strm().WriteOString( sOut );
- HTMLOutFuncs::Out_String( rWrt.Strm(), sValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), sValue, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut = "\"";
}
@@ -970,7 +970,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
HTMLOutFuncs::Out_String( rWrt.Strm(),
URIHelper::simpleNormalizedMakeRelative( rWrt.GetBaseURL(), *static_cast<OUString const *>(aTmp.getValue())),
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut = "\"";
}
@@ -1031,7 +1031,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
if( nFrmOpts != 0 )
aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrmOpts );
- if( rHTMLWrt.bCfgOutStyles )
+ if( rHTMLWrt.m_bCfgOutStyles )
{
bool bEdit = TAG_TEXTAREA == eTag || TYPE_FILE == eType ||
TYPE_TEXT == eType;
@@ -1142,8 +1142,8 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
}
uno::Reference< form::XFormComponent > xFormComp( xControlModel, uno::UNO_QUERY );
- lcl_html_outEvents( rWrt.Strm(), xFormComp, rHTMLWrt.bCfgStarBasic,
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ lcl_html_outEvents( rWrt.Strm(), xFormComp, rHTMLWrt.m_bCfgStarBasic,
+ rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
rWrt.Strm().WriteChar( '>' );
@@ -1205,7 +1205,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_value) + "=\"";
rWrt.Strm().WriteOString( sOut );
HTMLOutFuncs::Out_String( rWrt.Strm(), sVal,
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut = "\"";
}
if( bSelected )
@@ -1215,7 +1215,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
rWrt.Strm().WriteOString( sOut );
HTMLOutFuncs::Out_String( rWrt.Strm(), pStrings[i],
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
}
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_option, false );
@@ -1245,7 +1245,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
rWrt.Strm().WriteCharPtr( SAL_NEWLINE_STRING );
OUString aLine = sVal.getToken( 0, 0x0A, nPos );
HTMLOutFuncs::Out_String( rWrt.Strm(), aLine,
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
}
}
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_textarea, false );
@@ -1258,7 +1258,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
{
sValue = *static_cast<OUString const *>(aTmp.getValue());
HTMLOutFuncs::Out_String( rWrt.Strm(), sValue,
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteChar( ' ' );
+ rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ).WriteChar( ' ' );
}
}
@@ -1266,7 +1266,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
rWrt.Strm().WriteCharPtr( aEndTags.getStr() );
// Controls sind nicht absatz-gebunden, deshalb kein LF mehr ausgeben!
- rHTMLWrt.bLFPossible = false;
+ rHTMLWrt.m_bLFPossible = false;
if( rHTMLWrt.mxFormComps.is() )
rHTMLWrt.OutHiddenControls( rHTMLWrt.mxFormComps, xPropSet );
@@ -1313,12 +1313,12 @@ void SwHTMLWriter::GetControls()
// Ueber dieses Array laesst sich dann feststellen, wo form::Forms geoeffnet
// und geschlossen werden muessen.
- if( pHTMLPosFlyFrms )
+ if( m_pHTMLPosFlyFrms )
{
// die absatz-gebundenen Controls einsammeln
- for( size_t i=0; i<pHTMLPosFlyFrms->size(); i++ )
+ for( size_t i=0; i<m_pHTMLPosFlyFrms->size(); i++ )
{
- const SwHTMLPosFlyFrm* pPosFlyFrm = (*pHTMLPosFlyFrms)[ i ];
+ const SwHTMLPosFlyFrm* pPosFlyFrm = (*m_pHTMLPosFlyFrms)[ i ];
if( HTML_OUT_CONTROL != pPosFlyFrm->GetOutFn() )
continue;
@@ -1327,7 +1327,7 @@ void SwHTMLWriter::GetControls()
if( !pSdrObj )
continue;
- AddControl( aHTMLControls, dynamic_cast<const SdrUnoObj&>(*pSdrObj),
+ AddControl( m_aHTMLControls, dynamic_cast<const SdrUnoObj&>(*pSdrObj),
pPosFlyFrm->GetNdIndex().GetIndex() );
}
}
@@ -1350,7 +1350,7 @@ void SwHTMLWriter::GetControls()
if( !pSdrObj )
continue;
- AddControl( aHTMLControls, dynamic_cast<const SdrUnoObj&>(*pSdrObj), pPos->nNode.GetIndex() );
+ AddControl( m_aHTMLControls, dynamic_cast<const SdrUnoObj&>(*pSdrObj), pPos->nNode.GetIndex() );
}
}
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 9ffbd19ad983..f9662ac2b3cd 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -274,35 +274,35 @@ Writer& OutHTML_SwFormatFootnote( Writer& rWrt, const SfxPoolItem& rHt )
size_t nPos;
if( rFormatFootnote.IsEndNote() )
{
- nPos = rHTMLWrt.pFootEndNotes ? rHTMLWrt.pFootEndNotes->size() : 0;
- OSL_ENSURE( nPos == static_cast<size_t>(rHTMLWrt.nFootNote + rHTMLWrt.nEndNote),
+ nPos = rHTMLWrt.m_pFootEndNotes ? rHTMLWrt.m_pFootEndNotes->size() : 0;
+ OSL_ENSURE( nPos == static_cast<size_t>(rHTMLWrt.m_nFootNote + rHTMLWrt.m_nEndNote),
"OutHTML_SwFormatFootnote: wrong position" );
sClass = OOO_STRING_SVTOOLS_HTML_sdendnote_anc;
- sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote + OUString::number( (sal_Int32)(++rHTMLWrt.nEndNote) );
+ sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote + OUString::number( (sal_Int32)(++rHTMLWrt.m_nEndNote) );
}
else
{
- nPos = rHTMLWrt.nFootNote;
+ nPos = rHTMLWrt.m_nFootNote;
sClass = OOO_STRING_SVTOOLS_HTML_sdfootnote_anc;
- sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote + OUString::number( (sal_Int32)(++rHTMLWrt.nFootNote));
+ sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote + OUString::number( (sal_Int32)(++rHTMLWrt.m_nFootNote));
}
- if( !rHTMLWrt.pFootEndNotes )
- rHTMLWrt.pFootEndNotes = new SwHTMLTextFootnotes;
- rHTMLWrt.pFootEndNotes->insert( rHTMLWrt.pFootEndNotes->begin() + nPos, pTextFootnote );
+ if( !rHTMLWrt.m_pFootEndNotes )
+ rHTMLWrt.m_pFootEndNotes = new SwHTMLTextFootnotes;
+ rHTMLWrt.m_pFootEndNotes->insert( rHTMLWrt.m_pFootEndNotes->begin() + nPos, pTextFootnote );
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\"");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), sClass, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), sClass, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor).append("\" ")
.append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\"#");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol).append('\"');
if( !rFormatFootnote.GetNumStr().isEmpty() )
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdfixed);
@@ -311,7 +311,7 @@ Writer& OutHTML_SwFormatFootnote( Writer& rWrt, const SfxPoolItem& rHt )
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript );
HTMLOutFuncs::Out_String( rWrt.Strm(), rFormatFootnote.GetViewNumStr(*rWrt.pDoc),
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript, false );
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_anchor, false );
@@ -320,44 +320,44 @@ Writer& OutHTML_SwFormatFootnote( Writer& rWrt, const SfxPoolItem& rHt )
void SwHTMLWriter::OutFootEndNotes()
{
- OSL_ENSURE( pFootEndNotes,
+ OSL_ENSURE( m_pFootEndNotes,
"SwHTMLWriter::OutFootEndNotes(): unnoetiger Aufruf" );
- if( !pFootEndNotes )
+ if( !m_pFootEndNotes )
return;
#if OSL_DEBUG_LEVEL > 0
- sal_uInt16 nFootnote = nFootNote, nEn = nEndNote;
+ sal_uInt16 nFootnote = m_nFootNote, nEn = m_nEndNote;
#endif
- nFootNote = 0, nEndNote = 0;
+ m_nFootNote = 0, m_nEndNote = 0;
- for( auto *pTextFootnote : *pFootEndNotes )
+ for( auto *pTextFootnote : *m_pFootEndNotes )
{
- pFormatFootnote = &pTextFootnote->GetFootnote();
+ m_pFormatFootnote = &pTextFootnote->GetFootnote();
OUString sFootnoteName, sClass;
- if( pFormatFootnote->IsEndNote() )
+ if( m_pFormatFootnote->IsEndNote() )
{
sClass = OOO_STRING_SVTOOLS_HTML_sdendnote;
sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote;
- sFootnoteName += OUString::number((sal_Int32)(++nEndNote));
+ sFootnoteName += OUString::number((sal_Int32)(++m_nEndNote));
}
else
{
sClass = OOO_STRING_SVTOOLS_HTML_sdfootnote;
sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote;
- sFootnoteName += OUString::number((sal_Int32)(++nFootNote));
+ sFootnoteName += OUString::number((sal_Int32)(++m_nFootNote));
}
- if( bLFPossible )
+ if( m_bLFPossible )
OutNewLine();
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division)
.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_id).append("=\"");
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( Strm(), sFootnoteName, eDestEnc, &aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), sFootnoteName, m_eDestEnc, &m_aNonConvertableCharacters );
Strm().WriteCharPtr( "\">" );
- bLFPossible = true;
+ m_bLFPossible = true;
IncIndentLevel(); // Inhalt von <DIV> einruecken
OSL_ENSURE( pTextFootnote, "SwHTMLWriter::OutFootEndNotes: SwTextFootnote fehlt" );
@@ -372,34 +372,34 @@ void SwHTMLWriter::OutFootEndNotes()
}
DecIndentLevel(); // Inhalt von <DIV> einruecken
- if( bLFPossible )
+ if( m_bLFPossible )
OutNewLine();
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
- bLFPossible = true;
+ m_bLFPossible = true;
- OSL_ENSURE( !pFormatFootnote,
+ OSL_ENSURE( !m_pFormatFootnote,
"SwHTMLWriter::OutFootEndNotes: Footnote wurde nicht ausgegeben" );
- if( pFormatFootnote )
+ if( m_pFormatFootnote )
{
- if( pFormatFootnote->IsEndNote() )
- nEndNote++;
+ if( m_pFormatFootnote->IsEndNote() )
+ m_nEndNote++;
else
- nFootNote++;
+ m_nFootNote++;
- pFormatFootnote = 0;
+ m_pFormatFootnote = 0;
}
}
#if OSL_DEBUG_LEVEL > 0
- OSL_ENSURE( nFootnote == nFootNote,
+ OSL_ENSURE( nFootnote == m_nFootNote,
"SwHTMLWriter::OutFootEndNotes: Anzahl Fussnoten stimmt nicht" );
- OSL_ENSURE( nEn == nEndNote,
+ OSL_ENSURE( nEn == m_nEndNote,
"SwHTMLWriter::OutFootEndNotes: Anzahl Endnoten stimmt nicht" );
#endif
- delete pFootEndNotes;
- pFootEndNotes = 0;
- nFootNote = nEndNote = 0;
+ delete m_pFootEndNotes;
+ m_pFootEndNotes = 0;
+ m_nFootNote = m_nEndNote = 0;
}
OUString SwHTMLWriter::GetFootEndNoteSym( const SwFormatFootnote& rFormatFootnote )
@@ -430,19 +430,19 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFormatFootnote& rFormatFootnote,
{
sClass = OOO_STRING_SVTOOLS_HTML_sdendnote_sym;
sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote;
- sFootnoteName += OUString::number((sal_Int32)nEndNote);
+ sFootnoteName += OUString::number((sal_Int32)m_nEndNote);
pInfo = &pDoc->GetEndNoteInfo();
}
else
{
sClass = OOO_STRING_SVTOOLS_HTML_sdfootnote_sym;
sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote;
- sFootnoteName += OUString::number((sal_Int32)nFootNote);
+ sFootnoteName += OUString::number((sal_Int32)m_nFootNote);
pInfo = &pDoc->GetFootnoteInfo();
}
const SwCharFormat *pSymCharFormat = pInfo->GetCharFormat( *pDoc );
- if( pSymCharFormat && 0 != aScriptTextStyles.count( pSymCharFormat->GetName() ) )
+ if( pSymCharFormat && 0 != m_aScriptTextStyles.count( pSymCharFormat->GetName() ) )
{
switch( nScript )
{
@@ -462,18 +462,18 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFormatFootnote& rFormatFootnote,
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\"");
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( Strm(), sClass, eDestEnc, &aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), sClass, m_eDestEnc, &m_aNonConvertableCharacters );
sOut.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( Strm(), sFootnoteName, eDestEnc, &aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), sFootnoteName, m_eDestEnc, &m_aNonConvertableCharacters );
sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol).append("\" ")
.append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\"#");
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( Strm(), sFootnoteName, eDestEnc, &aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), sFootnoteName, m_eDestEnc, &m_aNonConvertableCharacters );
sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor).append("\">");
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( Strm(), rNum, eDestEnc, &aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), rNum, m_eDestEnc, &m_aNonConvertableCharacters );
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_anchor, false );
}
@@ -533,7 +533,7 @@ static void lcl_html_outFootEndNoteInfo( Writer& rWrt, OUString *pParts,
.append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"").append(pName)
.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_content).append("=\"");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), aContent, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aContent, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
rWrt.Strm().WriteCharPtr( "\">" );
}
diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx
index 127d08c22fc2..93bc45ddf2ea 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -45,7 +45,7 @@ using namespace css;
void SwHTMLWriter::FillNextNumInfo()
{
- pNextNumRuleInfo = 0;
+ m_pNextNumRuleInfo = 0;
sal_uLong nPos = pCurPam->GetPoint()->nNode.GetIndex() + 1;
@@ -56,7 +56,7 @@ void SwHTMLWriter::FillNextNumInfo()
if( pNd->IsTextNode() )
{
// Der naechste wird als naechstes ausgegeben.
- pNextNumRuleInfo = new SwHTMLNumRuleInfo( *pNd->GetTextNode() );
+ m_pNextNumRuleInfo = new SwHTMLNumRuleInfo( *pNd->GetTextNode() );
// Vor einer Tabelle behalten wir erst einmal die alte Ebene bei,
// wenn die gleiche Numerierung hinter der Tabelle
@@ -64,10 +64,10 @@ void SwHTMLWriter::FillNextNumInfo()
// wird. Die Tabelle wird ann beim Import so weit eingeruckt,
// wie es der Num-Ebene entspricht.
if( bTable &&
- pNextNumRuleInfo->GetNumRule()==GetNumInfo().GetNumRule() &&
- !pNextNumRuleInfo->IsRestart() )
+ m_pNextNumRuleInfo->GetNumRule()==GetNumInfo().GetNumRule() &&
+ !m_pNextNumRuleInfo->IsRestart() )
{
- pNextNumRuleInfo->SetDepth( GetNumInfo().GetDepth() );
+ m_pNextNumRuleInfo->SetDepth( GetNumInfo().GetDepth() );
}
}
else if( pNd->IsTableNode() )
@@ -81,16 +81,16 @@ void SwHTMLWriter::FillNextNumInfo()
{
// In allen anderen Faellen ist die Numerierung erstmal
// zu Ende.
- pNextNumRuleInfo = new SwHTMLNumRuleInfo;
+ m_pNextNumRuleInfo = new SwHTMLNumRuleInfo;
}
}
- while( !pNextNumRuleInfo );
+ while( !m_pNextNumRuleInfo );
}
void SwHTMLWriter::ClearNextNumInfo()
{
- delete pNextNumRuleInfo;
- pNextNumRuleInfo = 0;
+ delete m_pNextNumRuleInfo;
+ m_pNextNumRuleInfo = 0;
}
Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
@@ -108,7 +108,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
if( !bSameRule && rInfo.GetDepth() )
{
OUString aName( rInfo.GetNumRule()->GetName() );
- if( 0 != rWrt.aNumRuleNames.count( aName ) )
+ if( 0 != rWrt.m_aNumRuleNames.count( aName ) )
{
// The rule has been applied before
sal_Int16 eType = rInfo.GetNumRule()
@@ -166,11 +166,11 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
}
else
{
- rWrt.aNumRuleNames.insert( aName );
+ rWrt.m_aNumRuleNames.insert( aName );
}
}
- OSL_ENSURE( rWrt.nLastParaToken == 0,
+ OSL_ENSURE( rWrt.m_nLastParaToken == 0,
"<PRE> wurde nicht vor <OL> beendet." );
sal_uInt16 nPrevDepth =
(bSameRule && !rInfo.IsRestart()) ? rPrevInfo.GetDepth() : 0;
@@ -179,7 +179,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
{
rWrt.OutNewLine(); // <OL>/<UL> in eine neue Zeile
- rWrt.aBulletGrfs[i].clear();
+ rWrt.m_aBulletGrfs[i].clear();
OStringBuffer sOut;
sOut.append('<');
const SwNumFormat& rNumFormat = rInfo.GetNumRule()->Get( i );
@@ -273,7 +273,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
if (!sOut.isEmpty())
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- if( rWrt.bCfgOutStyles )
+ if( rWrt.m_bCfgOutStyles )
OutCSS1_NumBulListStyleOpt( rWrt, *rInfo.GetNumRule(), (sal_uInt8)i );
rWrt.Strm().WriteChar( '>' );
@@ -295,7 +295,7 @@ Writer& OutHTML_NumBulListEnd( SwHTMLWriter& rWrt,
return rWrt;
}
- OSL_ENSURE( rWrt.nLastParaToken == 0,
+ OSL_ENSURE( rWrt.m_nLastParaToken == 0,
"<PRE> wurde nicht vor </OL> beendet." );
sal_uInt16 nNextDepth =
(bSameRule && !rNextInfo.IsRestart()) ? rNextInfo.GetDepth() : 0;
@@ -305,7 +305,7 @@ Writer& OutHTML_NumBulListEnd( SwHTMLWriter& rWrt,
for( sal_uInt16 i=rInfo.GetDepth(); i>nNextDepth; i-- )
{
rWrt.DecIndentLevel(); // Inhalt von <OL> einruecken
- if( rWrt.bLFPossible )
+ if( rWrt.m_bLFPossible )
rWrt.OutNewLine(); // </OL>/</UL> in eine neue Zeile
// es wird also eine Liste angefangen oder beendet:
@@ -316,7 +316,7 @@ Writer& OutHTML_NumBulListEnd( SwHTMLWriter& rWrt,
else
pStr = OOO_STRING_SVTOOLS_HTML_orderlist;
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, false );
- rWrt.bLFPossible = true;
+ rWrt.m_bLFPossible = true;
}
return rWrt;
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index f189dd3f95e0..0ab66acaedf2 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -1016,7 +1016,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor
sal_uLong nFrmOpts;
// wenn meoglich vor dem "Objekt" einen Zeilen-Umbruch ausgeben
- if( rHTMLWrt.bLFPossible )
+ if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine( true );
if( !rFrameFormat.GetName().isEmpty() )
@@ -1045,7 +1045,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_src)
.append("=\"");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), aURL, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aURL, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut.append('\"');
}
@@ -1056,7 +1056,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_type)
.append("=\"");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), aType, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aType, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut.append('\"');
}
@@ -1091,7 +1091,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_codebase)
.append("=\"");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), sCodeBase, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), sCodeBase, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut.append('\"');
}
}
@@ -1103,7 +1103,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_code)
.append("=\"");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), aClass, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aClass, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut.append('\"');
// NAME
@@ -1115,7 +1115,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
.append("=\"");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), aAppletName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aAppletName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut.append('\"');
}
@@ -1137,8 +1137,8 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor
SfxFrameHTMLWriter::Out_FrameDescriptor( rWrt.Strm(), rWrt.GetBaseURL(),
xSet,
- rHTMLWrt.eDestEnc,
- &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc,
+ &rHTMLWrt.m_aNonConvertableCharacters );
nFrmOpts = bInCntnr ? HTML_FRMOPTS_IFRAME_CNTNR
: HTML_FRMOPTS_IFRAME;
@@ -1175,9 +1175,9 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor
{
const OUString& rValue = rCommand.GetArgument();
rWrt.Strm().WriteChar( ' ' );
- HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
rWrt.Strm().WriteCharPtr( "=\"" );
- HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteChar( '\"' );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ).WriteChar( '\"' );
}
else if( SwHtmlOptType::PARAM == nType )
{
@@ -1201,11 +1201,11 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor
.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
.append("=\"");
rWrt.Strm().WriteCharPtr( sBuf.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sBuf.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_value)
.append("=\"");
rWrt.Strm().WriteCharPtr( sBuf.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteCharPtr( "\">" );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ).WriteCharPtr( "\">" );
}
rHTMLWrt.DecIndentLevel(); // Inhalt von Applet einruecken
@@ -1232,9 +1232,9 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor
{
const OUString& rValue = rCommand.GetArgument();
rWrt.Strm().WriteChar( ' ' );
- HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
rWrt.Strm().WriteCharPtr( "=\"" );
- HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteChar( '\"' );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ).WriteChar( '\"' );
}
}
rHTMLWrt.Strm().WriteChar( '>' );
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index afdd8bbdc23d..2dd195f152d7 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -412,8 +412,8 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- rWrt.bTextAttr = false;
- rWrt.bOutOpts = true;
+ rWrt.m_bTextAttr = false;
+ rWrt.m_bOutOpts = true;
const SvxBrushItem *pBrushItem = 0;
if( SfxItemState::SET==rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) )
{
@@ -427,7 +427,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
// Hintergrund ausgeben
rWrt.OutBackground( pBrushItem, false );
- if( rWrt.bCfgOutStyles )
+ if( rWrt.m_bCfgOutStyles )
OutCSS1_TableBGStyleOpt( rWrt, *pBrushItem );
}
@@ -452,12 +452,12 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
if( bNumFormat || bValue )
{
sOut.append(HTMLOutFuncs::CreateTableDataOptionsValNum(bValue, nValue,
- nNumFormat, *rWrt.pDoc->GetNumberFormatter(), rWrt.eDestEnc,
- &rWrt.aNonConvertableCharacters));
+ nNumFormat, *rWrt.pDoc->GetNumberFormatter(), rWrt.m_eDestEnc,
+ &rWrt.m_aNonConvertableCharacters));
}
sOut.append('>');
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- rWrt.bLFPossible = true;
+ rWrt.m_bLFPossible = true;
rWrt.IncIndentLevel(); // den Inhalt von <TD>...</TD> einruecken
@@ -494,12 +494,12 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
rWrt.DecIndentLevel(); // den Inhalt von <TD>...</TD> einruecken
- if( rWrt.bLFPossible )
+ if( rWrt.m_bLFPossible )
rWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), bHead ? OOO_STRING_SVTOOLS_HTML_tableheader
: OOO_STRING_SVTOOLS_HTML_tabledata,
false );
- rWrt.bLFPossible = true;
+ rWrt.m_bLFPossible = true;
}
// Eine Line als Zeilen ausgeben
@@ -534,9 +534,9 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
{
rWrt.OutBackground( pBrushItem, false );
- rWrt.bTextAttr = false;
- rWrt.bOutOpts = true;
- if( rWrt.bCfgOutStyles )
+ rWrt.m_bTextAttr = false;
+ rWrt.m_bOutOpts = true;
+ if( rWrt.m_bCfgOutStyles )
OutCSS1_TableBGStyleOpt( rWrt, *pBrushItem );
}
@@ -621,18 +621,18 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
// vorhergende Aufzaehlung etc. beenden
rWrt.ChangeParaToken( 0 );
- if( rWrt.bLFPossible )
+ if( rWrt.m_bLFPossible )
rWrt.OutNewLine(); // <TABLE> in neue Zeile
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_table);
- const sal_uInt16 nOldDirection = rWrt.nDirection;
+ const sal_uInt16 nOldDirection = rWrt.m_nDirection;
if( pFrameFormat )
- rWrt.nDirection = rWrt.GetHTMLDirection( pFrameFormat->GetAttrSet() );
- if( rWrt.bOutFlyFrame || nOldDirection != rWrt.nDirection )
+ rWrt.m_nDirection = rWrt.GetHTMLDirection( pFrameFormat->GetAttrSet() );
+ if( rWrt.m_bOutFlyFrame || nOldDirection != rWrt.m_nDirection )
{
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- rWrt.OutDirection( rWrt.nDirection );
+ rWrt.OutDirection( rWrt.m_nDirection );
}
// ALIGN= ausgeben
@@ -714,7 +714,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
{
rWrt.OutBackground( pFrameFormat->GetAttrSet(), false );
- if( rWrt.bCfgOutStyles && pFrameFormat )
+ if( rWrt.m_bCfgOutStyles && pFrameFormat )
rWrt.OutCSS1_TableFrameFormatOptions( *pFrameFormat );
}
@@ -732,7 +732,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
.append(bTopCaption ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom)
.append("\"");
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOutStr.getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), *pCaption, rWrt.eDestEnc, &rWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), *pCaption, rWrt.m_eDestEnc, &rWrt.m_aNonConvertableCharacters );
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_caption, false );
}
@@ -877,7 +877,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
rWrt.OutNewLine(); // </TABLE> in neue Zeile
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_table, false );
- rWrt.nDirection = nOldDirection;
+ rWrt.m_nDirection = nOldDirection;
}
Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
@@ -888,7 +888,7 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
SwTable& rTable = rNode.GetTable();
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- rHTMLWrt.bOutTable = true;
+ rHTMLWrt.m_bOutTable = true;
// die horizontale Ausrichtung des Rahmens hat (falls vorhanden)
// Prioritaet. NONE bedeutet, dass keine horizontale
@@ -919,11 +919,11 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
// ggf. eine FORM oeffnen
bool bPreserveForm = false;
- if( !rHTMLWrt.bPreserveForm )
+ if( !rHTMLWrt.m_bPreserveForm )
{
rHTMLWrt.OutForm( true, &rNode );
bPreserveForm = rHTMLWrt.mxFormComps.is();
- rHTMLWrt.bPreserveForm = bPreserveForm;
+ rHTMLWrt.m_bPreserveForm = bPreserveForm;
}
SwFrameFormat *pFormat = rTable.GetFrameFormat();
@@ -1005,7 +1005,7 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
rHTMLWrt.GetNextNumInfo(),
"NumInfo fuer naechsten Absatz fehlt!" );
const SvxLRSpaceItem& aLRItem = pFormat->GetLRSpace();
- if( aLRItem.GetLeft() > 0 && rHTMLWrt.nDefListMargin > 0 &&
+ if( aLRItem.GetLeft() > 0 && rHTMLWrt.m_nDefListMargin > 0 &&
( !rHTMLWrt.GetNumInfo().GetNumRule() ||
( rHTMLWrt.GetNextNumInfo() &&
(rHTMLWrt.GetNextNumInfo()->IsRestart() ||
@@ -1018,17 +1018,17 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
// die Einrueckung ueber eine DL regeln. Sonst behalten wir
// die Einrueckung der Numerierung bei.
nNewDefListLvl = static_cast< sal_uInt16 >(
- (aLRItem.GetLeft() + (rHTMLWrt.nDefListMargin/2)) /
- rHTMLWrt.nDefListMargin );
+ (aLRItem.GetLeft() + (rHTMLWrt.m_nDefListMargin/2)) /
+ rHTMLWrt.m_nDefListMargin );
}
}
- if( !pFlyFrameFormat && nNewDefListLvl != rHTMLWrt.nDefListLvl )
+ if( !pFlyFrameFormat && nNewDefListLvl != rHTMLWrt.m_nDefListLvl )
rHTMLWrt.OutAndSetDefList( nNewDefListLvl );
if( nNewDefListLvl )
{
- if( rHTMLWrt.bLFPossible )
+ if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_dd );
}
@@ -1085,7 +1085,7 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
if( text::HoriOrientation::NONE!=eDivHoriOri )
{
- if( rHTMLWrt.bLFPossible )
+ if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine(); // <CENTER> in neuer Zeile
if( text::HoriOrientation::CENTER==eDivHoriOri )
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_center );
@@ -1097,12 +1097,12 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.getStr() );
}
rHTMLWrt.IncIndentLevel(); // Inhalt von <CENTER> einruecken
- rHTMLWrt.bLFPossible = true;
+ rHTMLWrt.m_bLFPossible = true;
}
// Wenn die Tabelle in keinem Rahmen ist kann man immer ein LF ausgeben.
if( text::HoriOrientation::NONE==eTabHoriOri )
- rHTMLWrt.bLFPossible = true;
+ rHTMLWrt.m_bLFPossible = true;
const SwHTMLTableLayout *pLayout = rTable.GetHTMLTableLayout();
@@ -1132,7 +1132,7 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
// Wenn die Tabelle in keinem Rahmen war kann man immer ein LF ausgeben.
if( text::HoriOrientation::NONE==eTabHoriOri )
- rHTMLWrt.bLFPossible = true;
+ rHTMLWrt.m_bLFPossible = true;
if( text::HoriOrientation::NONE!=eDivHoriOri )
{
@@ -1141,7 +1141,7 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
text::HoriOrientation::CENTER==eDivHoriOri ? OOO_STRING_SVTOOLS_HTML_center
: OOO_STRING_SVTOOLS_HTML_division, false );
- rHTMLWrt.bLFPossible = true;
+ rHTMLWrt.m_bLFPossible = true;
}
// Pam hinter die Tabelle verschieben
@@ -1149,11 +1149,11 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
if( bPreserveForm )
{
- rHTMLWrt.bPreserveForm = false;
+ rHTMLWrt.m_bPreserveForm = false;
rHTMLWrt.OutForm( false );
}
- rHTMLWrt.bOutTable = false;
+ rHTMLWrt.m_bOutTable = false;
if( rHTMLWrt.GetNextNumInfo() &&
!rHTMLWrt.GetNextNumInfo()->IsRestart() &&
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index ee9c2ef1a873..2f9fd0936cc9 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -91,79 +91,79 @@ static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] =
"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL )
- : pHTMLPosFlyFrms(NULL)
- , pNumRuleInfo(new SwHTMLNumRuleInfo)
- , pNextNumRuleInfo(NULL)
- , nHTMLMode(0)
- , eCSS1Unit(FUNIT_NONE)
- , pFootEndNotes(NULL)
+ : m_pHTMLPosFlyFrms(NULL)
+ , m_pNumRuleInfo(new SwHTMLNumRuleInfo)
+ , m_pNextNumRuleInfo(NULL)
+ , m_nHTMLMode(0)
+ , m_eCSS1Unit(FUNIT_NONE)
+ , m_pFootEndNotes(NULL)
, mxFormComps()
- , pTemplate(NULL)
- , pDfltColor(NULL)
- , pStartNdIdx(NULL)
- , pCurrPageDesc(NULL)
- , pFormatFootnote(NULL)
- , nWarn(0)
- , nLastLFPos(0)
- , nLastParaToken(0)
- , nBkmkTabPos(-1)
- , nImgMapCnt(1)
- , nFormCntrlCnt(0)
- , nEndNote(0)
- , nFootNote(0)
- , nLeftMargin(0)
- , nDfltLeftMargin(0)
- , nDfltRightMargin(0)
- , nFirstLineIndent(0)
- , nDfltFirstLineIndent(0)
- , nDfltTopMargin(0)
- , nDfltBottomMargin(0)
- , nIndentLvl(0)
- , nWhishLineLen(0)
- , nDefListLvl(0)
- , nDefListMargin(0)
- , nHeaderFooterSpace(0)
- , nTextAttrsToIgnore(0)
- , nExportMode(0)
- , nCSS1OutMode(0)
- , nCSS1Script(CSS1_OUTMODE_WESTERN)
- , nDirection(FRMDIR_HORI_LEFT_TOP)
- , eDestEnc(RTL_TEXTENCODING_MS_1252)
- , eLang(LANGUAGE_DONTKNOW)
- , bCfgOutStyles( false )
- , bCfgPreferStyles( false )
- , bCfgFormFeed( false )
- , bCfgStarBasic( false )
- , bCfgCpyLinkedGrfs( false )
- , bFirstLine(true)
- , bTagOn( false )
- , bTextAttr( false )
- , bOutOpts( false )
- , bOutTable( false )
- , bOutHeader( false )
- , bOutFooter( false )
- , bOutFlyFrame( false )
- , bFirstCSS1Rule( false )
- , bFirstCSS1Property( false )
- , bPoolCollTextModified( false )
- , bCSS1IgnoreFirstPageDesc( false )
- , bNoAlign( false )
- , bClearLeft( false )
- , bClearRight( false )
- , bLFPossible( false )
- , bPreserveForm( false )
- , bCfgNetscape4( false )
+ , m_pTemplate(NULL)
+ , m_pDfltColor(NULL)
+ , m_pStartNdIdx(NULL)
+ , m_pCurrPageDesc(NULL)
+ , m_pFormatFootnote(NULL)
+ , m_nWarn(0)
+ , m_nLastLFPos(0)
+ , m_nLastParaToken(0)
+ , m_nBkmkTabPos(-1)
+ , m_nImgMapCnt(1)
+ , m_nFormCntrlCnt(0)
+ , m_nEndNote(0)
+ , m_nFootNote(0)
+ , m_nLeftMargin(0)
+ , m_nDfltLeftMargin(0)
+ , m_nDfltRightMargin(0)
+ , m_nFirstLineIndent(0)
+ , m_nDfltFirstLineIndent(0)
+ , m_nDfltTopMargin(0)
+ , m_nDfltBottomMargin(0)
+ , m_nIndentLvl(0)
+ , m_nWhishLineLen(0)
+ , m_nDefListLvl(0)
+ , m_nDefListMargin(0)
+ , m_nHeaderFooterSpace(0)
+ , m_nTextAttrsToIgnore(0)
+ , m_nExportMode(0)
+ , m_nCSS1OutMode(0)
+ , m_nCSS1Script(CSS1_OUTMODE_WESTERN)
+ , m_nDirection(FRMDIR_HORI_LEFT_TOP)
+ , m_eDestEnc(RTL_TEXTENCODING_MS_1252)
+ , m_eLang(LANGUAGE_DONTKNOW)
+ , m_bCfgOutStyles( false )
+ , m_bCfgPreferStyles( false )
+ , m_bCfgFormFeed( false )
+ , m_bCfgStarBasic( false )
+ , m_bCfgCpyLinkedGrfs( false )
+ , m_bFirstLine(true)
+ , m_bTagOn( false )
+ , m_bTextAttr( false )
+ , m_bOutOpts( false )
+ , m_bOutTable( false )
+ , m_bOutHeader( false )
+ , m_bOutFooter( false )
+ , m_bOutFlyFrame( false )
+ , m_bFirstCSS1Rule( false )
+ , m_bFirstCSS1Property( false )
+ , m_bPoolCollTextModified( false )
+ , m_bCSS1IgnoreFirstPageDesc( false )
+ , m_bNoAlign( false )
+ , m_bClearLeft( false )
+ , m_bClearRight( false )
+ , m_bLFPossible( false )
+ , m_bPreserveForm( false )
+ , m_bCfgNetscape4( false )
, mbSkipImages(false)
, mbSkipHeaderFooter(false)
- , bCfgPrintLayout( false )
- , bParaDotLeaders( false )
+ , m_bCfgPrintLayout( false )
+ , m_bParaDotLeaders( false )
{
SetBaseURL(rBaseURL);
}
SwHTMLWriter::~SwHTMLWriter()
{
- delete pNumRuleInfo;
+ delete m_pNumRuleInfo;
}
void SwHTMLWriter::SetupFilterOptions(SfxMedium& rMedium)
@@ -193,141 +193,141 @@ sal_uLong SwHTMLWriter::WriteStream()
SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get();
// font heights 1-7
- 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;
// ueberhaupt Styles ausgeben
// (dann auch obere und untere Absatz-Abstaende)
- nExportMode = rHtmlOptions.GetExportMode();
- nHTMLMode = GetHtmlMode(0);
+ m_nExportMode = rHtmlOptions.GetExportMode();
+ m_nHTMLMode = GetHtmlMode(0);
- if( HTML_CFG_WRITER == nExportMode || HTML_CFG_NS40 == nExportMode )
- nHTMLMode |= HTMLMODE_BLOCK_SPACER;
+ if( HTML_CFG_WRITER == m_nExportMode || HTML_CFG_NS40 == m_nExportMode )
+ m_nHTMLMode |= HTMLMODE_BLOCK_SPACER;
- if( HTML_CFG_WRITER == nExportMode || HTML_CFG_MSIE == nExportMode )
- nHTMLMode |= (HTMLMODE_FLOAT_FRAME | HTMLMODE_LSPACE_IN_NUMBUL);
+ if( HTML_CFG_WRITER == m_nExportMode || HTML_CFG_MSIE == m_nExportMode )
+ m_nHTMLMode |= (HTMLMODE_FLOAT_FRAME | HTMLMODE_LSPACE_IN_NUMBUL);
- if( HTML_CFG_MSIE == nExportMode )
- nHTMLMode |= HTMLMODE_NBSP_IN_TABLES;
+ if( HTML_CFG_MSIE == m_nExportMode )
+ m_nHTMLMode |= HTMLMODE_NBSP_IN_TABLES;
- if( HTML_CFG_WRITER == nExportMode || HTML_CFG_NS40 == nExportMode || HTML_CFG_MSIE == nExportMode )
- nHTMLMode |= HTMLMODE_ABS_POS_FLY | HTMLMODE_ABS_POS_DRAW;
+ if( HTML_CFG_WRITER == m_nExportMode || HTML_CFG_NS40 == m_nExportMode || HTML_CFG_MSIE == m_nExportMode )
+ m_nHTMLMode |= HTMLMODE_ABS_POS_FLY | HTMLMODE_ABS_POS_DRAW;
- if( HTML_CFG_WRITER == nExportMode )
- nHTMLMode |= HTMLMODE_FLY_MARGINS;
+ if( HTML_CFG_WRITER == m_nExportMode )
+ m_nHTMLMode |= HTMLMODE_FLY_MARGINS;
- if( HTML_CFG_NS40 == nExportMode )
- nHTMLMode |= HTMLMODE_BORDER_NONE;
+ if( HTML_CFG_NS40 == m_nExportMode )
+ m_nHTMLMode |= HTMLMODE_BORDER_NONE;
- nHTMLMode |= HTMLMODE_FONT_GENERIC;
+ m_nHTMLMode |= HTMLMODE_FONT_GENERIC;
- if( HTML_CFG_NS40==nExportMode )
- nHTMLMode |= HTMLMODE_NO_CONTROL_CENTERING;
+ if( HTML_CFG_NS40==m_nExportMode )
+ m_nHTMLMode |= HTMLMODE_NO_CONTROL_CENTERING;
- bCfgOutStyles = IsHTMLMode(HTMLMODE_SOME_STYLES | HTMLMODE_FULL_STYLES);
- bCfgNetscape4 = (HTML_CFG_NS40 == nExportMode);
+ m_bCfgOutStyles = IsHTMLMode(HTMLMODE_SOME_STYLES | HTMLMODE_FULL_STYLES);
+ m_bCfgNetscape4 = (HTML_CFG_NS40 == m_nExportMode);
if( IsHTMLMode(HTMLMODE_SOME_STYLES | HTMLMODE_FULL_STYLES) )
- nHTMLMode |= HTMLMODE_PRINT_EXT;
+ m_nHTMLMode |= HTMLMODE_PRINT_EXT;
const sal_Char *pHelpHack = getenv( "HelpEx" );
if( pHelpHack )
{
OString aTmp(pHelpHack);
if (aTmp.equalsIgnoreAsciiCase("Hilfe"))
- nHTMLMode |= HTMLMODE_NO_BR_AT_PAREND;
+ m_nHTMLMode |= HTMLMODE_NO_BR_AT_PAREND;
}
- eCSS1Unit = (FieldUnit)SW_MOD()->GetMetric( pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) );
+ m_eCSS1Unit = (FieldUnit)SW_MOD()->GetMetric( pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) );
bool bWriteUTF8 = bWriteClipboardDoc;
- eDestEnc = bWriteUTF8 ? RTL_TEXTENCODING_UTF8 : rHtmlOptions.GetTextEncoding();
- const sal_Char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( eDestEnc );
- eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet );
+ m_eDestEnc = bWriteUTF8 ? RTL_TEXTENCODING_UTF8 : rHtmlOptions.GetTextEncoding();
+ const sal_Char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( m_eDestEnc );
+ m_eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet );
// Nur noch fuer den MS-IE ziehen wir den Export von Styles vor.
- bCfgPreferStyles = HTML_CFG_MSIE == nExportMode;
+ m_bCfgPreferStyles = HTML_CFG_MSIE == m_nExportMode;
- bCfgStarBasic = rHtmlOptions.IsStarBasic();
+ m_bCfgStarBasic = rHtmlOptions.IsStarBasic();
- bCfgFormFeed = !IsHTMLMode(HTMLMODE_PRINT_EXT);
- bCfgCpyLinkedGrfs = rHtmlOptions.IsSaveGraphicsLocal();
+ m_bCfgFormFeed = !IsHTMLMode(HTMLMODE_PRINT_EXT);
+ m_bCfgCpyLinkedGrfs = rHtmlOptions.IsSaveGraphicsLocal();
- bCfgPrintLayout = rHtmlOptions.IsPrintLayoutExtension();
+ m_bCfgPrintLayout = rHtmlOptions.IsPrintLayoutExtension();
// die HTML-Vorlage holen
bool bOldHTMLMode = false;
SwTextFormatColls::size_type nOldTextFormatCollCnt = 0;
SwCharFormats::size_type nOldCharFormatCnt = 0;
- OSL_ENSURE( !pTemplate, "Wo kommt denn die HTML-Vorlage hier her?" );
- pTemplate = static_cast<HTMLReader*>(ReadHTML)->GetTemplateDoc();
- if( pTemplate )
+ OSL_ENSURE( !m_pTemplate, "Wo kommt denn die HTML-Vorlage hier her?" );
+ m_pTemplate = static_cast<HTMLReader*>(ReadHTML)->GetTemplateDoc();
+ if( m_pTemplate )
{
- pTemplate->acquire();
- bOldHTMLMode = pTemplate->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE);
- pTemplate->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, true);
+ m_pTemplate->acquire();
+ bOldHTMLMode = m_pTemplate->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE);
+ m_pTemplate->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, true);
- nOldTextFormatCollCnt = pTemplate->GetTextFormatColls()->size();
- nOldCharFormatCnt = pTemplate->GetCharFormats()->size();
+ nOldTextFormatCollCnt = m_pTemplate->GetTextFormatColls()->size();
+ nOldCharFormatCnt = m_pTemplate->GetCharFormats()->size();
}
if( bShowProgress )
::StartProgress( STR_STATSTR_W4WWRITE, 0, pDoc->GetNodes().Count(),
pDoc->GetDocShell());
- pDfltColor = 0;
- pFootEndNotes = 0;
- pFormatFootnote = 0;
- bOutTable = bOutHeader = bOutFooter = bOutFlyFrame = false;
+ m_pDfltColor = 0;
+ m_pFootEndNotes = 0;
+ m_pFormatFootnote = 0;
+ m_bOutTable = m_bOutHeader = m_bOutFooter = m_bOutFlyFrame = false;
mxFormComps.clear();
- nFormCntrlCnt = 0;
- bPreserveForm = false;
- bClearLeft = bClearRight = false;
- bLFPossible = false;
-
- nLeftMargin = nDfltLeftMargin = nDfltRightMargin = 0;
- nDfltTopMargin = nDfltBottomMargin = 0;
- nFirstLineIndent = nDfltFirstLineIndent = 0;
- bPoolCollTextModified = false;
- bFirstCSS1Property = bFirstCSS1Rule = false;
- bCSS1IgnoreFirstPageDesc = false;
- nIndentLvl = 0;
- nWhishLineLen = 70;
- nLastLFPos = 0;
- nDefListLvl = 0;
- nDefListMargin = ((pTemplate && !bCfgOutStyles) ? pTemplate : pDoc)
+ m_nFormCntrlCnt = 0;
+ m_bPreserveForm = false;
+ m_bClearLeft = m_bClearRight = false;
+ m_bLFPossible = false;
+
+ m_nLeftMargin = m_nDfltLeftMargin = m_nDfltRightMargin = 0;
+ m_nDfltTopMargin = m_nDfltBottomMargin = 0;
+ m_nFirstLineIndent = m_nDfltFirstLineIndent = 0;
+ m_bPoolCollTextModified = false;
+ m_bFirstCSS1Property = m_bFirstCSS1Rule = false;
+ m_bCSS1IgnoreFirstPageDesc = false;
+ m_nIndentLvl = 0;
+ m_nWhishLineLen = 70;
+ m_nLastLFPos = 0;
+ m_nDefListLvl = 0;
+ m_nDefListMargin = ((m_pTemplate && !m_bCfgOutStyles) ? m_pTemplate : pDoc)
->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_HTML_DD, false )
->GetLRSpace().GetTextLeft();
- nHeaderFooterSpace = 0;
- nTextAttrsToIgnore = 0;
- nCSS1OutMode = 0;
+ m_nHeaderFooterSpace = 0;
+ m_nTextAttrsToIgnore = 0;
+ m_nCSS1OutMode = 0;
SvtScriptType nScript = SvtLanguageOptions::GetScriptTypeOfLanguage( GetAppLanguage() );
switch( nScript )
{
case SvtScriptType::ASIAN:
- nCSS1Script = CSS1_OUTMODE_CJK;
+ m_nCSS1Script = CSS1_OUTMODE_CJK;
break;
case SvtScriptType::COMPLEX:
- nCSS1Script = CSS1_OUTMODE_CTL;
+ m_nCSS1Script = CSS1_OUTMODE_CTL;
break;
default:
- nCSS1Script = CSS1_OUTMODE_WESTERN;
+ m_nCSS1Script = CSS1_OUTMODE_WESTERN;
break;
}
- eLang = static_cast<const SvxLanguageItem&>(pDoc
- ->GetDefault(GetLangWhichIdFromScript(nCSS1Script))).GetLanguage();
+ m_eLang = static_cast<const SvxLanguageItem&>(pDoc
+ ->GetDefault(GetLangWhichIdFromScript(m_nCSS1Script))).GetLanguage();
- nFootNote = nEndNote = 0;
+ m_nFootNote = m_nEndNote = 0;
- nWarn = 0;
+ m_nWarn = 0;
GetNumInfo().Clear();
- pNextNumRuleInfo = 0;
+ m_pNextNumRuleInfo = 0;
OString aStartTags;
@@ -344,7 +344,7 @@ sal_uLong SwHTMLWriter::WriteStream()
}
// erster Node (der einen Seitenumbruch enthalten darf)
- pStartNdIdx = new SwNodeIndex( pCurPam->GetPoint()->nNode );
+ m_pStartNdIdx = new SwNodeIndex( pCurPam->GetPoint()->nNode );
SwSectionNode * pSNd = pCurPam->GetNode().FindSectionNode();
while( pSNd )
@@ -361,8 +361,8 @@ sal_uLong SwHTMLWriter::WriteStream()
// nur das Tag fuer die Section merken
OString aName = HTMLOutFuncs::ConvertStringToHTML(
- pSNd->GetSection().GetSectionName(), eDestEnc,
- &aNonConvertableCharacters );
+ pSNd->GetSection().GetSectionName(), m_eDestEnc,
+ &m_aNonConvertableCharacters );
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division)
@@ -378,16 +378,16 @@ sal_uLong SwHTMLWriter::WriteStream()
// Tabelle fuer die freifliegenden Rahmen erzeugen, aber nur wenn
// das gesamte Dokument geschrieben wird
- pHTMLPosFlyFrms = 0;
+ m_pHTMLPosFlyFrms = 0;
CollectFlyFrms();
- nLastParaToken = 0;
+ m_nLastParaToken = 0;
GetControls();
CollectLinkTargets();
sal_uInt16 nHeaderAttrs = 0;
- pCurrPageDesc = MakeHeader( nHeaderAttrs );
+ m_pCurrPageDesc = MakeHeader( nHeaderAttrs );
- bLFPossible = true;
+ m_bLFPossible = true;
// Formulare, die nur HiddenControls enthalten ausgeben.
OutHiddenForms();
@@ -396,7 +396,7 @@ sal_uLong SwHTMLWriter::WriteStream()
Strm().WriteCharPtr( aStartTags.getStr() );
const SfxPoolItem *pItem;
- const SfxItemSet& rPageItemSet = pCurrPageDesc->GetMaster().GetAttrSet();
+ const SfxItemSet& rPageItemSet = m_pCurrPageDesc->GetMaster().GetAttrSet();
if( !bWriteClipboardDoc && pDoc->GetDocShell() &&
(!pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) &&
!pDoc->getIDocumentSettingAccess().get(DocumentSettingId::BROWSE_MODE)) &&
@@ -408,14 +408,14 @@ sal_uLong SwHTMLWriter::WriteStream()
OutHTML_HeaderFooter( *this, *pHeaderFormat, true );
}
- nTextAttrsToIgnore = nHeaderAttrs;
+ m_nTextAttrsToIgnore = nHeaderAttrs;
Out_SwDoc( pOrigPam );
- nTextAttrsToIgnore = 0;
+ m_nTextAttrsToIgnore = 0;
if( mxFormComps.is() )
OutForm( false, mxFormComps );
- if( pFootEndNotes )
+ if( m_pFootEndNotes )
OutFootEndNotes();
if( !bWriteClipboardDoc && pDoc->GetDocShell() &&
@@ -428,7 +428,7 @@ sal_uLong SwHTMLWriter::WriteStream()
OutHTML_HeaderFooter( *this, *pFooterFormat, false );
}
- if( bLFPossible )
+ if( m_bLFPossible )
OutNewLine();
if (!mbSkipHeaderFooter)
{
@@ -438,15 +438,15 @@ sal_uLong SwHTMLWriter::WriteStream()
}
// loesche die Tabelle mit den freifliegenden Rahmen
- OSL_ENSURE( !pHTMLPosFlyFrms, "Wurden nicht alle Rahmen ausgegeben" );
- if( pHTMLPosFlyFrms )
+ OSL_ENSURE( !m_pHTMLPosFlyFrms, "Wurden nicht alle Rahmen ausgegeben" );
+ if( m_pHTMLPosFlyFrms )
{
- pHTMLPosFlyFrms->DeleteAndDestroyAll();
- delete pHTMLPosFlyFrms;
- pHTMLPosFlyFrms = 0;
+ m_pHTMLPosFlyFrms->DeleteAndDestroyAll();
+ delete m_pHTMLPosFlyFrms;
+ m_pHTMLPosFlyFrms = 0;
}
- aHTMLControls.DeleteAndDestroyAll();
+ m_aHTMLControls.DeleteAndDestroyAll();
if (!m_CharFormatInfos.empty())
m_CharFormatInfos.clear();
@@ -454,69 +454,69 @@ sal_uLong SwHTMLWriter::WriteStream()
if (!m_TextCollInfos.empty())
m_TextCollInfos.clear();
- if(!aImgMapNames.empty())
- aImgMapNames.clear();
+ if(!m_aImgMapNames.empty())
+ m_aImgMapNames.clear();
- aImplicitMarks.clear();
+ m_aImplicitMarks.clear();
- aOutlineMarks.clear();
+ m_aOutlineMarks.clear();
- aOutlineMarkPoss.clear();
+ m_aOutlineMarkPoss.clear();
- aNumRuleNames.clear();
+ m_aNumRuleNames.clear();
- aScriptParaStyles.clear();
- aScriptTextStyles.clear();
+ m_aScriptParaStyles.clear();
+ m_aScriptTextStyles.clear();
- delete pDfltColor;
- pDfltColor = 0;
+ delete m_pDfltColor;
+ m_pDfltColor = 0;
- delete pStartNdIdx;
- pStartNdIdx = 0;
+ delete m_pStartNdIdx;
+ m_pStartNdIdx = 0;
mxFormComps.clear();
- OSL_ENSURE( !pFootEndNotes,
+ OSL_ENSURE( !m_pFootEndNotes,
"SwHTMLWriter::Write: Footnotes nicht durch OutFootEndNotes geloescht" );
- pCurrPageDesc = 0;
+ m_pCurrPageDesc = 0;
ClearNextNumInfo();
for( int i=0; i<MAXLEVEL; ++i )
- aBulletGrfs[i].clear();
+ m_aBulletGrfs[i].clear();
- aNonConvertableCharacters.clear();
+ m_aNonConvertableCharacters.clear();
if( bShowProgress )
::EndProgress( pDoc->GetDocShell() );
- if( pTemplate )
+ if( m_pTemplate )
{
// Waehrend des Exports angelegte Zeichen- und Abastzvorlagen
// loeschen
- auto nTextFormatCollCnt = pTemplate->GetTextFormatColls()->size();
+ auto nTextFormatCollCnt = m_pTemplate->GetTextFormatColls()->size();
while( nTextFormatCollCnt > nOldTextFormatCollCnt )
- pTemplate->DelTextFormatColl( --nTextFormatCollCnt );
- OSL_ENSURE( pTemplate->GetTextFormatColls()->size() == nOldTextFormatCollCnt,
+ m_pTemplate->DelTextFormatColl( --nTextFormatCollCnt );
+ OSL_ENSURE( m_pTemplate->GetTextFormatColls()->size() == nOldTextFormatCollCnt,
"falsche Anzahl TextFormatColls geloescht" );
- auto nCharFormatCnt = pTemplate->GetCharFormats()->size();
+ auto nCharFormatCnt = m_pTemplate->GetCharFormats()->size();
while( nCharFormatCnt > nOldCharFormatCnt )
- pTemplate->DelCharFormat( --nCharFormatCnt );
- OSL_ENSURE( pTemplate->GetCharFormats()->size() == nOldCharFormatCnt,
+ m_pTemplate->DelCharFormat( --nCharFormatCnt );
+ OSL_ENSURE( m_pTemplate->GetCharFormats()->size() == nOldCharFormatCnt,
"falsche Anzahl CharFormats geloescht" );
// HTML-Modus wieder restaurieren
- pTemplate->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, bOldHTMLMode);
+ m_pTemplate->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, bOldHTMLMode);
- if( 0 == pTemplate->release() )
- delete pTemplate;
+ if( 0 == m_pTemplate->release() )
+ delete m_pTemplate;
- pTemplate = 0;
+ m_pTemplate = 0;
}
- return nWarn;
+ return m_nWarn;
}
static const SwFormatCol *lcl_html_GetFormatCol( const SwSection& rSection,
@@ -570,7 +570,7 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
{
OSL_ENSURE( pCol || !bContinued, "Continuation of DIV" );
- if( rHTMLWrt.bLFPossible )
+ if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine();
OStringBuffer sOut;
@@ -581,7 +581,7 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
{
sOut.append(" " + OString(OOO_STRING_SVTOOLS_HTML_O_id) + "=\"");
rHTMLWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), rName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), rName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
sOut.append('\"');
}
@@ -604,13 +604,13 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
bool bURLContainsDelim = (-1 != aEncURL.indexOf( cDelim ) );
HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aEncURL,
- rHTMLWrt.eDestEnc,
- &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc,
+ &rHTMLWrt.m_aNonConvertableCharacters );
const sal_Char* pDelim = "&#255;";
if( !aFilter.isEmpty() || !aSection.isEmpty() || bURLContainsDelim )
rHTMLWrt.Strm().WriteCharPtr( pDelim );
if( !aFilter.isEmpty() )
- HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aFilter, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aFilter, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
if( !aSection.isEmpty() || bURLContainsDelim )
rHTMLWrt.Strm().WriteCharPtr( pDelim );
if( !aSection.isEmpty() )
@@ -628,7 +628,7 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
nPos = aSection.indexOf( cDelim, nPos+3 );
}
HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aSection,
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
}
sOut.append('\"');
}
@@ -648,12 +648,12 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
}
rHTMLWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- if( rHTMLWrt.IsHTMLMode( rHTMLWrt.bCfgOutStyles ? HTMLMODE_ON : 0 ) )
+ if( rHTMLWrt.IsHTMLMode( rHTMLWrt.m_bCfgOutStyles ? HTMLMODE_ON : 0 ) )
rHTMLWrt.OutCSS1_SectionFormatOptions( rFormat, pCol );
rHTMLWrt.Strm().WriteChar( '>' );
- rHTMLWrt.bLFPossible = true;
+ rHTMLWrt.m_bLFPossible = true;
if( !rName.isEmpty() && !bContinued )
rHTMLWrt.OutImplicitMark( rName, "region" );
@@ -663,10 +663,10 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
static void lcl_html_OutSectionEndTag( SwHTMLWriter& rHTMLWrt )
{
rHTMLWrt.DecIndentLevel();
- if( rHTMLWrt.bLFPossible )
+ if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rHTMLWrt.Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
- rHTMLWrt.bLFPossible = true;
+ rHTMLWrt.m_bLFPossible = true;
}
static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd )
@@ -763,12 +763,12 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
bool bSaveWriteAll = bWriteAll; // sichern
// suche die naechste text::Bookmark-Position aus der text::Bookmark-Tabelle
- nBkmkTabPos = bWriteAll ? FindPos_Bkmk( *pCurPam->GetPoint() ) : -1;
+ m_nBkmkTabPos = bWriteAll ? FindPos_Bkmk( *pCurPam->GetPoint() ) : -1;
// gebe alle Bereiche des Pams in das HTML-File aus.
do {
bWriteAll = bSaveWriteAll;
- bFirstLine = true;
+ m_bFirstLine = true;
// suche den ersten am Pam-auszugebenen FlyFrame
// fehlt noch:
@@ -785,7 +785,7 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
{
SwTextNode* pTextNd = rNd.GetTextNode();
- if( !bFirstLine )
+ if( !m_bFirstLine )
pCurPam->GetPoint()->nContent.Assign( pTextNd, 0 );
OutHTML_SwTextNode( *this, *pTextNd );
@@ -793,12 +793,12 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
else if( rNd.IsTableNode() )
{
OutHTML_SwTableNode( *this, *rNd.GetTableNode(), 0 );
- nBkmkTabPos = bWriteAll ? FindPos_Bkmk( *pCurPam->GetPoint() ) : -1;
+ m_nBkmkTabPos = bWriteAll ? FindPos_Bkmk( *pCurPam->GetPoint() ) : -1;
}
else if( rNd.IsSectionNode() )
{
OutHTML_Section( *this, *rNd.GetSectionNode() );
- nBkmkTabPos = bWriteAll ? FindPos_Bkmk( *pCurPam->GetPoint() ) : -1;
+ m_nBkmkTabPos = bWriteAll ? FindPos_Bkmk( *pCurPam->GetPoint() ) : -1;
}
else if( &rNd == &pDoc->GetNodes().GetEndOfContent() )
break;
@@ -816,8 +816,8 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
*/
bWriteAll = bSaveWriteAll ||
nPos != pCurPam->GetMark()->nNode.GetIndex();
- bFirstLine = false;
- bOutFooter = false; // Nach einem Node keine Fusszeile mehr
+ m_bFirstLine = false;
+ m_bOutFooter = false; // Nach einem Node keine Fusszeile mehr
}
ChangeParaToken( 0 ); // MIB 8.7.97: Machen wir jetzt hier und nicht
@@ -835,9 +835,9 @@ static void OutBodyColor( const sal_Char* pTag, const SwFormat *pFormat,
{
const SwFormat *pRefFormat = 0;
- if( rHWrt.pTemplate )
+ if( rHWrt.m_pTemplate )
pRefFormat = SwHTMLWriter::GetTemplateFormat( pFormat->GetPoolFormatId(),
- &rHWrt.pTemplate->getIDocumentStylePoolAccess() );
+ &rHWrt.m_pTemplate->getIDocumentStylePoolAccess() );
const SvxColorItem *pColorItem = 0;
@@ -889,9 +889,9 @@ static void OutBodyColor( const sal_Char* pTag, const SwFormat *pFormat,
Color aColor( pColorItem->GetValue() );
if( COL_AUTO == aColor.GetColor() )
aColor.SetColor( COL_BLACK );
- HTMLOutFuncs::Out_Color( rHWrt.Strm(), aColor, rHWrt.eDestEnc );
+ HTMLOutFuncs::Out_Color( rHWrt.Strm(), aColor, rHWrt.m_eDestEnc );
if( RES_POOLCOLL_STANDARD==pFormat->GetPoolFormatId() )
- rHWrt.pDfltColor = new Color( aColor );
+ rHWrt.m_pDfltColor = new Color( aColor );
}
}
@@ -971,8 +971,8 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
// xDocProps may be null here (when copying)
SfxFrameHTMLWriter::Out_DocInfo( Strm(), GetBaseURL(), xDocProps,
- sIndent.getStr(), eDestEnc,
- &aNonConvertableCharacters );
+ sIndent.getStr(), m_eDestEnc,
+ &m_aNonConvertableCharacters );
// Kommentare und Meta-Tags des ersten Absatzes
rHeaderAttrs = OutHeaderAttrs();
@@ -1011,7 +1011,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
if (!mbSkipHeaderFooter)
{
// und nun ... das Style-Sheet!!!
- if( bCfgOutStyles )
+ if( m_bCfgOutStyles )
{
OutStyleSheet( *pPageDesc );
}
@@ -1030,7 +1030,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
// language
- OutLanguage( eLang );
+ OutLanguage( m_eLang );
// Textfarbe ausgeben, wenn sie an der Standard-Vorlage gesetzt ist
// und sich geaendert hat.
@@ -1053,10 +1053,10 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
getSvxBrushItemFromSourceSet(rItemSet, RES_BACKGROUND));
OutBackground(&aBrushItem, true);
- nDirection = GetHTMLDirection( rItemSet );
- OutDirection( nDirection );
+ m_nDirection = GetHTMLDirection( rItemSet );
+ OutDirection( m_nDirection );
- if( bCfgOutStyles )
+ if( m_bCfgOutStyles )
OutCSS1_BodyTagStyleOpt( *this, rItemSet );
// Events anhaengen
@@ -1074,7 +1074,7 @@ void SwHTMLWriter::OutAnchor( const OUString& rName )
OStringBuffer sOut;
sOut.append("<" + OString(OOO_STRING_SVTOOLS_HTML_anchor) + " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\"");
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( Strm(), rName, eDestEnc, &aNonConvertableCharacters ).WriteCharPtr( "\">" );
+ HTMLOutFuncs::Out_String( Strm(), rName, m_eDestEnc, &m_aNonConvertableCharacters ).WriteCharPtr( "\">" );
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_anchor, false );
}
@@ -1083,12 +1083,12 @@ void SwHTMLWriter::OutBookmarks()
// hole das aktuelle Bookmark
const ::sw::mark::IMark* pBookmark = NULL;
IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
- if(nBkmkTabPos != -1)
- pBookmark = (pMarkAccess->getAllMarksBegin() + nBkmkTabPos)->get();
+ if(m_nBkmkTabPos != -1)
+ pBookmark = (pMarkAccess->getAllMarksBegin() + m_nBkmkTabPos)->get();
// Ausgabe aller Bookmarks in diesem Absatz. Die Content-Position
// wird vorerst nicht beruecksichtigt!
sal_uInt32 nNode = pCurPam->GetPoint()->nNode.GetIndex();
- while( nBkmkTabPos != -1
+ while( m_nBkmkTabPos != -1
&& pBookmark->GetMarkPos().nNode.GetIndex() == nNode )
{
// Der Bereich derBookmark wird erstam ignoriert, da er von uns
@@ -1100,23 +1100,23 @@ void SwHTMLWriter::OutBookmarks()
OutAnchor( pBookmark->GetName() );
}
- if( ++nBkmkTabPos >= pMarkAccess->getAllMarksCount() )
- nBkmkTabPos = -1;
+ if( ++m_nBkmkTabPos >= pMarkAccess->getAllMarksCount() )
+ m_nBkmkTabPos = -1;
else
- pBookmark = (pMarkAccess->getAllMarksBegin() + nBkmkTabPos)->get();
+ pBookmark = (pMarkAccess->getAllMarksBegin() + m_nBkmkTabPos)->get();
}
sal_uInt32 nPos;
- for( nPos = 0; nPos < aOutlineMarkPoss.size() &&
- aOutlineMarkPoss[nPos] < nNode; nPos++ )
+ for( nPos = 0; nPos < m_aOutlineMarkPoss.size() &&
+ m_aOutlineMarkPoss[nPos] < nNode; nPos++ )
;
- while( nPos < aOutlineMarkPoss.size() && aOutlineMarkPoss[nPos] == nNode )
+ while( nPos < m_aOutlineMarkPoss.size() && m_aOutlineMarkPoss[nPos] == nNode )
{
- OUString sMark( aOutlineMarks[nPos] );
+ OUString sMark( m_aOutlineMarks[nPos] );
OutAnchor( sMark.replace('?', '_') ); // '?' causes problems in IE/Netscape 5
- aOutlineMarkPoss.erase( aOutlineMarkPoss.begin()+nPos );
- aOutlineMarks.erase( aOutlineMarks.begin() + nPos );
+ m_aOutlineMarkPoss.erase( m_aOutlineMarkPoss.begin()+nPos );
+ m_aOutlineMarks.erase( m_aOutlineMarks.begin() + nPos );
}
}
@@ -1168,10 +1168,10 @@ void SwHTMLWriter::OutPointFieldmarks( const SwPosition& rPos )
void SwHTMLWriter::OutImplicitMark( const OUString& rMark,
const sal_Char *pMarkType )
{
- if( !rMark.isEmpty() && !aImplicitMarks.empty() )
+ if( !rMark.isEmpty() && !m_aImplicitMarks.empty() )
{
OUString sMark(rMark + OUStringLiteral1<cMarkSeparator>() + OUString::createFromAscii(pMarkType));
- if( 0 != aImplicitMarks.erase( sMark ) )
+ if( 0 != m_aImplicitMarks.erase( sMark ) )
{
OutAnchor(sMark.replace('?', '_')); // '?' causes problems in IE/Netscape 5
}
@@ -1209,7 +1209,7 @@ OUString SwHTMLWriter::convertHyperlinkHRefValue(const OUString& rURL)
void SwHTMLWriter::OutHyperlinkHRefValue( const OUString& rURL )
{
OUString sURL = convertHyperlinkHRefValue(rURL);
- HTMLOutFuncs::Out_String( Strm(), sURL, eDestEnc, &aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), sURL, m_eDestEnc, &m_aNonConvertableCharacters );
}
void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, bool bGraphic )
@@ -1222,7 +1222,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, bool bGraphic
OStringBuffer sOut;
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_bgcolor).append('=');
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_Color( Strm(), rBackColor, eDestEnc);
+ HTMLOutFuncs::Out_Color( Strm(), rBackColor, m_eDestEnc);
}
if( !bGraphic )
@@ -1234,11 +1234,11 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, bool bGraphic
{
if( !XOutBitmap::GraphicToBase64(*pGrf, aGraphicInBase64) )
{
- nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
+ m_nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
}
Strm().WriteCharPtr( " " OOO_STRING_SVTOOLS_HTML_O_background "=\"" );
Strm().WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_data ":" );
- HTMLOutFuncs::Out_String( Strm(), aGraphicInBase64, eDestEnc, &aNonConvertableCharacters ).WriteChar( '\"' );
+ HTMLOutFuncs::Out_String( Strm(), aGraphicInBase64, m_eDestEnc, &m_aNonConvertableCharacters ).WriteChar( '\"' );
}
}
@@ -1279,7 +1279,7 @@ void SwHTMLWriter::OutLanguage( LanguageType nLang )
.append("=\"");
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( Strm(), LanguageTag::convertToBcp47(nLang),
- eDestEnc, &aNonConvertableCharacters ).WriteChar( '"' );
+ m_eDestEnc, &m_aNonConvertableCharacters ).WriteChar( '"' );
}
}
@@ -1301,7 +1301,7 @@ sal_uInt16 SwHTMLWriter::GetHTMLDirection( sal_uInt16 nDir ) const
nDir = FRMDIR_HORI_RIGHT_TOP;
break;
case FRMDIR_ENVIRONMENT:
- nDir = nDirection;
+ nDir = m_nDirection;
}
return nDir;
@@ -1341,7 +1341,7 @@ OString SwHTMLWriter::GetIndentString(sal_uInt16 nIncLvl)
OString sRet;
// etwas umstaendlich, aber wir haben nur einen Indent-String!
- sal_uInt16 nLevel = nIndentLvl + nIncLvl;
+ sal_uInt16 nLevel = m_nIndentLvl + nIncLvl;
if( nLevel && nLevel <= MAX_INDENT_LEVEL)
{
@@ -1355,17 +1355,17 @@ OString SwHTMLWriter::GetIndentString(sal_uInt16 nIncLvl)
void SwHTMLWriter::OutNewLine( bool bCheck )
{
- if( !bCheck || (Strm().Tell()-nLastLFPos) > nIndentLvl )
+ if( !bCheck || (Strm().Tell()-m_nLastLFPos) > m_nIndentLvl )
{
Strm().WriteCharPtr( SAL_NEWLINE_STRING );
- nLastLFPos = Strm().Tell();
+ m_nLastLFPos = Strm().Tell();
}
- if( nIndentLvl && nIndentLvl <= MAX_INDENT_LEVEL)
+ if( m_nIndentLvl && m_nIndentLvl <= MAX_INDENT_LEVEL)
{
- sIndentTabs[nIndentLvl] = 0;
+ sIndentTabs[m_nIndentLvl] = 0;
Strm().WriteCharPtr( sIndentTabs );
- sIndentTabs[nIndentLvl] = '\t';
+ sIndentTabs[m_nIndentLvl] = '\t';
}
}
@@ -1374,7 +1374,7 @@ sal_uInt16 SwHTMLWriter::GetHTMLFontSize( sal_uInt32 nHeight ) const
sal_uInt16 nSize = 1;
for( sal_uInt16 i=6; i>0; i-- )
{
- if( nHeight > (aFontHeights[i] + aFontHeights[i-1])/2 )
+ if( nHeight > (m_aFontHeights[i] + m_aFontHeights[i-1])/2 )
{
nSize = i+1;
break;
@@ -1388,7 +1388,7 @@ sal_uInt16 SwHTMLWriter::GetHTMLFontSize( sal_uInt32 nHeight ) const
// dot leaders at the position of the last tabulator in PrintLayout (CSS2) mode
sal_Int32 SwHTMLWriter::indexOfDotLeaders( sal_uInt16 nPoolId, const OUString& rStr )
{
- if (bCfgPrintLayout && ((nPoolId >= RES_POOLCOLL_TOX_CNTNT1 && nPoolId <= RES_POOLCOLL_TOX_CNTNT5) ||
+ if (m_bCfgPrintLayout && ((nPoolId >= RES_POOLCOLL_TOX_CNTNT1 && nPoolId <= RES_POOLCOLL_TOX_CNTNT5) ||
(nPoolId >= RES_POOLCOLL_TOX_IDX1 && nPoolId <= RES_POOLCOLL_TOX_IDX3) ||
(nPoolId >= RES_POOLCOLL_TOX_USER1 && nPoolId <= RES_POOLCOLL_TOX_CNTNT10) ||
nPoolId == RES_POOLCOLL_TOX_ILLUS1 || nPoolId == RES_POOLCOLL_TOX_TABLES1 ||
@@ -1412,11 +1412,11 @@ HTMLSaveData::HTMLSaveData(SwHTMLWriter& rWriter, sal_uLong nStt,
, pOldEnd(rWrt.GetEndPaM())
, pOldNumRuleInfo(0)
, pOldNextNumRuleInfo(0)
- , nOldDefListLvl(rWrt.nDefListLvl)
- , nOldDirection(rWrt.nDirection)
- , bOldOutHeader(rWrt.bOutHeader)
- , bOldOutFooter(rWrt.bOutFooter)
- , bOldOutFlyFrame(rWrt.bOutFlyFrame)
+ , nOldDefListLvl(rWrt.m_nDefListLvl)
+ , nOldDirection(rWrt.m_nDirection)
+ , bOldOutHeader(rWrt.m_bOutHeader)
+ , bOldOutFooter(rWrt.m_bOutFooter)
+ , bOldOutFlyFrame(rWrt.m_bOutFlyFrame)
, pOldFlyFormat(NULL)
{
bOldWriteAll = rWrt.bWriteAll;
@@ -1434,8 +1434,8 @@ HTMLSaveData::HTMLSaveData(SwHTMLWriter& rWriter, sal_uLong nStt,
rWrt.SetEndPaM( rWrt.pCurPam );
rWrt.pCurPam->Exchange( );
rWrt.bWriteAll = true;
- rWrt.nDefListLvl = 0;
- rWrt.bOutHeader = rWrt.bOutFooter = false;
+ rWrt.m_nDefListLvl = 0;
+ rWrt.m_bOutHeader = rWrt.m_bOutFooter = false;
// Ggf. die aktuelle Numerierungs-Info merken, damit sie wieder
// neu aufgenommen werden kann. Nur dann belibt auch die Numerierungs-
@@ -1455,7 +1455,7 @@ HTMLSaveData::HTMLSaveData(SwHTMLWriter& rWriter, sal_uLong nStt,
rWrt.GetNumInfo().Clear();
if( pFrameFormat )
- rWrt.nDirection = rWrt.GetHTMLDirection( pFrameFormat->GetAttrSet() );
+ rWrt.m_nDirection = rWrt.GetHTMLDirection( pFrameFormat->GetAttrSet() );
}
HTMLSaveData::~HTMLSaveData()
@@ -1465,13 +1465,13 @@ HTMLSaveData::~HTMLSaveData()
rWrt.pCurPam = pOldPam;
rWrt.SetEndPaM( pOldEnd );
rWrt.bWriteAll = bOldWriteAll;
- rWrt.nBkmkTabPos = bOldWriteAll ? rWrt.FindPos_Bkmk( *pOldPam->GetPoint() ) : -1;
- rWrt.nLastParaToken = 0;
- rWrt.nDefListLvl = nOldDefListLvl;
- rWrt.nDirection = nOldDirection;
- rWrt.bOutHeader = bOldOutHeader;
- rWrt.bOutFooter = bOldOutFooter;
- rWrt.bOutFlyFrame = bOldOutFlyFrame;
+ rWrt.m_nBkmkTabPos = bOldWriteAll ? rWrt.FindPos_Bkmk( *pOldPam->GetPoint() ) : -1;
+ rWrt.m_nLastParaToken = 0;
+ rWrt.m_nDefListLvl = nOldDefListLvl;
+ rWrt.m_nDirection = nOldDirection;
+ rWrt.m_bOutHeader = bOldOutHeader;
+ rWrt.m_bOutFooter = bOldOutFooter;
+ rWrt.m_bOutFlyFrame = bOldOutFlyFrame;
// Ggf. die Numerierung von vor der Section fortsetzen. Die Numerierung
// des naecshten Absatz wird in jedem Fall ungueltig.
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 10e28dff555c..f8dc35c01000 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -262,12 +262,12 @@ class IDocumentStylePoolAccess;
class SwHTMLWriter : public Writer
{
- SwHTMLPosFlyFrms *pHTMLPosFlyFrms;
- SwHTMLNumRuleInfo *pNumRuleInfo;// aktuelle Numerierung
- SwHTMLNumRuleInfo *pNextNumRuleInfo;
- sal_uInt32 nHTMLMode; // Beschreibung der Export-Konfiguration
+ SwHTMLPosFlyFrms *m_pHTMLPosFlyFrms;
+ SwHTMLNumRuleInfo *m_pNumRuleInfo;// aktuelle Numerierung
+ SwHTMLNumRuleInfo *m_pNextNumRuleInfo;
+ sal_uInt32 m_nHTMLMode; // Beschreibung der Export-Konfiguration
- FieldUnit eCSS1Unit;
+ FieldUnit m_eCSS1Unit;
sal_uInt16 OutHeaderAttrs();
const SwPageDesc *MakeHeader( sal_uInt16& rHeaderAtrs );
@@ -281,76 +281,76 @@ protected:
void SetupFilterOptions(SfxMedium& rMedium) override;
public:
- std::vector<OUString> aImgMapNames; // geschriebene Image Maps
- std::set<OUString> aImplicitMarks;// implizite Stprungmarken
- std::set<OUString> aNumRuleNames;// Names of exported num rules
- std::set<OUString> aScriptParaStyles;// script dependent para styles
- std::set<OUString> aScriptTextStyles;// script dependent text styles
- std::vector<OUString> aOutlineMarks;
- std::vector<sal_uInt32> aOutlineMarkPoss;
- HTMLControls aHTMLControls; // die zu schreibenden Forms
+ std::vector<OUString> m_aImgMapNames; // geschriebene Image Maps
+ std::set<OUString> m_aImplicitMarks;// implizite Stprungmarken
+ std::set<OUString> m_aNumRuleNames;// Names of exported num rules
+ std::set<OUString> m_aScriptParaStyles;// script dependent para styles
+ std::set<OUString> m_aScriptTextStyles;// script dependent text styles
+ std::vector<OUString> m_aOutlineMarks;
+ std::vector<sal_uInt32> m_aOutlineMarkPoss;
+ HTMLControls m_aHTMLControls; // die zu schreibenden Forms
SwHTMLFormatInfos m_CharFormatInfos;
SwHTMLFormatInfos m_TextCollInfos;
- std::vector<SwFormatINetFormat*> aINetFormats; // die "offenen" INet-Attribute
- SwHTMLTextFootnotes *pFootEndNotes;
+ std::vector<SwFormatINetFormat*> m_aINetFormats; // die "offenen" INet-Attribute
+ SwHTMLTextFootnotes *m_pFootEndNotes;
- OUString aCSS1Selector; // der Selektor eines Styles
- OUString aNonConvertableCharacters;
- OUString aBulletGrfs[MAXLEVEL]; // die Grafiken fuer Listen
+ OUString m_aCSS1Selector; // der Selektor eines Styles
+ OUString m_aNonConvertableCharacters;
+ OUString m_aBulletGrfs[MAXLEVEL]; // die Grafiken fuer Listen
css::uno::Reference<css::container::XIndexContainer> mxFormComps; // die aktuelle Form
- SwDoc *pTemplate; // die HTML-Vorlage
- Color *pDfltColor; // default Farbe
- SwNodeIndex *pStartNdIdx; // Index des ersten Absatz
- const SwPageDesc *pCurrPageDesc;// Die aktuelle Seiten-Vorlage
- const SwFormatFootnote *pFormatFootnote;
-
- sal_uInt32 aFontHeights[7]; // die Font-Hoehen 1-7
-
- sal_uInt32 nWarn; // Result-Code fuer Warnungen
- sal_uInt32 nLastLFPos; // letzte Position eines LF
-
- sal_uInt16 nLastParaToken; // fuers Absaetze zusammenhalten
- sal_Int32 nBkmkTabPos; // akt. Position in der Bookmark-Tabelle
- sal_uInt16 nImgMapCnt; // zum eindeutig
- sal_uInt16 nFormCntrlCnt;
- sal_uInt16 nEndNote;
- sal_uInt16 nFootNote;
- sal_Int32 nLeftMargin; // linker Einzug (z.B. aus Listen)
- sal_Int32 nDfltLeftMargin; // die defaults, der nicht geschrieben
- sal_Int32 nDfltRightMargin; // werden muessen (aus der Vorlage)
- short nFirstLineIndent; // Erstzeilen-Einzug (aus Listen)
- short nDfltFirstLineIndent; // nicht zu schreibender default
- sal_uInt16 nDfltTopMargin; // die defaults, der nicht geschrieben
- sal_uInt16 nDfltBottomMargin; // werden muessen (aus der Vorlage)
- sal_uInt16 nIndentLvl; // wie weit ist eingerueckt?
- sal_Int32 nWhishLineLen; // wie lang darf eine Zeile werden?
- sal_uInt16 nDefListLvl; // welcher DL-Level existiert gerade
- sal_Int32 nDefListMargin; // Wie weit wird in DL eingerueckt
- sal_uInt16 nHeaderFooterSpace;
- sal_uInt16 nTextAttrsToIgnore;
- sal_uInt16 nExportMode;
- sal_uInt16 nCSS1OutMode;
- sal_uInt16 nCSS1Script; // contains default script (that's the one
+ SwDoc *m_pTemplate; // die HTML-Vorlage
+ Color *m_pDfltColor; // default Farbe
+ SwNodeIndex *m_pStartNdIdx; // Index des ersten Absatz
+ const SwPageDesc *m_pCurrPageDesc;// Die aktuelle Seiten-Vorlage
+ const SwFormatFootnote *m_pFormatFootnote;
+
+ sal_uInt32 m_aFontHeights[7]; // die Font-Hoehen 1-7
+
+ sal_uInt32 m_nWarn; // Result-Code fuer Warnungen
+ sal_uInt32 m_nLastLFPos; // letzte Position eines LF
+
+ sal_uInt16 m_nLastParaToken; // fuers Absaetze zusammenhalten
+ sal_Int32 m_nBkmkTabPos; // akt. Position in der Bookmark-Tabelle
+ sal_uInt16 m_nImgMapCnt; // zum eindeutig
+ sal_uInt16 m_nFormCntrlCnt;
+ sal_uInt16 m_nEndNote;
+ sal_uInt16 m_nFootNote;
+ sal_Int32 m_nLeftMargin; // linker Einzug (z.B. aus Listen)
+ sal_Int32 m_nDfltLeftMargin; // die defaults, der nicht geschrieben
+ sal_Int32 m_nDfltRightMargin; // werden muessen (aus der Vorlage)
+ short m_nFirstLineIndent; // Erstzeilen-Einzug (aus Listen)
+ short m_nDfltFirstLineIndent; // nicht zu schreibender default
+ sal_uInt16 m_nDfltTopMargin; // die defaults, der nicht geschrieben
+ sal_uInt16 m_nDfltBottomMargin; // werden muessen (aus der Vorlage)
+ sal_uInt16 m_nIndentLvl; // wie weit ist eingerueckt?
+ sal_Int32 m_nWhishLineLen; // wie lang darf eine Zeile werden?
+ sal_uInt16 m_nDefListLvl; // welcher DL-Level existiert gerade
+ sal_Int32 m_nDefListMargin; // Wie weit wird in DL eingerueckt
+ sal_uInt16 m_nHeaderFooterSpace;
+ sal_uInt16 m_nTextAttrsToIgnore;
+ sal_uInt16 m_nExportMode;
+ sal_uInt16 m_nCSS1OutMode;
+ sal_uInt16 m_nCSS1Script; // contains default script (that's the one
// that is not contained in class names)
- sal_uInt16 nDirection; // the current direction
+ sal_uInt16 m_nDirection; // the current direction
- rtl_TextEncoding eDestEnc;
- LanguageType eLang;
+ rtl_TextEncoding m_eDestEnc;
+ LanguageType m_eLang;
// Beschreibung der Export-Konfiguration
// 0
- bool bCfgOutStyles : 1; // Styles exportieren
- bool bCfgPreferStyles : 1; // Styles herkoemmlichen Tags vorziehen
- bool bCfgFormFeed : 1; // Form-Feeds exportieren
- bool bCfgStarBasic : 1; // StarBasic exportieren
- bool bCfgCpyLinkedGrfs : 1;
+ bool m_bCfgOutStyles : 1; // Styles exportieren
+ bool m_bCfgPreferStyles : 1; // Styles herkoemmlichen Tags vorziehen
+ bool m_bCfgFormFeed : 1; // Form-Feeds exportieren
+ bool m_bCfgStarBasic : 1; // StarBasic exportieren
+ bool m_bCfgCpyLinkedGrfs : 1;
// Beschreibung dessen, was exportiert wird
- bool bFirstLine : 1; // wird die 1. Zeile ausgegeben ?
- bool bTagOn : 1; // Tag an oder aus/Attr-Start oder -Ende
+ bool m_bFirstLine : 1; // wird die 1. Zeile ausgegeben ?
+ bool m_bTagOn : 1; // Tag an oder aus/Attr-Start oder -Ende
// Die folgenden beiden Flags geben an, wir Attribute exportiert werden:
// bTextAttr bOutOpts
@@ -360,44 +360,44 @@ public:
// 0 1 (Absatz-)Attribute: Das Attribut wird als Option
// eines bereits geschrieben Tags exportiert. Es
// gibt kein End-Tag.
- bool bTextAttr : 1;
+ bool m_bTextAttr : 1;
// 8
- bool bOutOpts : 1;
+ bool m_bOutOpts : 1;
- bool bOutTable : 1; // wird der Tabelleninhalt geschrieben?
- bool bOutHeader : 1;
- bool bOutFooter : 1;
- bool bOutFlyFrame : 1;
+ bool m_bOutTable : 1; // wird der Tabelleninhalt geschrieben?
+ bool m_bOutHeader : 1;
+ bool m_bOutFooter : 1;
+ bool m_bOutFlyFrame : 1;
// Flags fuer Style-Export
- bool bFirstCSS1Rule : 1; // wurde schon eine Property ausgegeben
- bool bFirstCSS1Property : 1; // wurde schon eine Property ausgegeben
- bool bPoolCollTextModified : 1; // die Textkoerper-Vorlage wurde
+ bool m_bFirstCSS1Rule : 1; // wurde schon eine Property ausgegeben
+ bool m_bFirstCSS1Property : 1; // wurde schon eine Property ausgegeben
+ bool m_bPoolCollTextModified : 1; // die Textkoerper-Vorlage wurde
// modifiziert.
// 16
- bool bCSS1IgnoreFirstPageDesc : 1;
+ bool m_bCSS1IgnoreFirstPageDesc : 1;
// was muss/kann/darf nicht ausgegeben werden?
- bool bNoAlign : 1; // HTML-Tag erlaubt kein ALIGN=...
- bool bClearLeft : 1; // <BR CLEAR=LEFT> am Absatz-Ende ausg.
- bool bClearRight : 1; // <BR CLEAR=RIGHT> am Absatz-Ende ausg.
- bool bLFPossible : 1; // ein Zeilenumbruch darf eingef. werden
+ bool m_bNoAlign : 1; // HTML-Tag erlaubt kein ALIGN=...
+ bool m_bClearLeft : 1; // <BR CLEAR=LEFT> am Absatz-Ende ausg.
+ bool m_bClearRight : 1; // <BR CLEAR=RIGHT> am Absatz-Ende ausg.
+ bool m_bLFPossible : 1; // ein Zeilenumbruch darf eingef. werden
// sonstiges
- bool bPreserveForm : 1; // die aktuelle Form beibehalten
+ bool m_bPreserveForm : 1; // die aktuelle Form beibehalten
- bool bCfgNetscape4 : 1; // Netscape4 Hacks
+ bool m_bCfgNetscape4 : 1; // Netscape4 Hacks
bool mbSkipImages : 1;
/// If HTML header and footer should be written as well, or just the content itself.
bool mbSkipHeaderFooter : 1;
#define sCSS2_P_CLASS_leaders "leaders"
- bool bCfgPrintLayout : 1; // PrintLayout option for TOC dot leaders
- bool bParaDotLeaders : 1; // for TOC dot leaders
+ bool m_bCfgPrintLayout : 1; // PrintLayout option for TOC dot leaders
+ bool m_bParaDotLeaders : 1; // for TOC dot leaders
// 25
explicit SwHTMLWriter( const OUString& rBaseURL );
@@ -486,17 +486,17 @@ public:
void IncIndentLevel()
{
- nIndentLvl++;
+ m_nIndentLvl++;
}
void DecIndentLevel()
{
- if ( nIndentLvl ) nIndentLvl--;
+ if ( m_nIndentLvl ) m_nIndentLvl--;
}
OString GetIndentString(sal_uInt16 nIncLvl = 0);
sal_Int32 GetLineLen()
{
- return (sal_Int32)(Strm().Tell()-nLastLFPos);
+ return (sal_Int32)(Strm().Tell()-m_nLastLFPos);
}
void OutNewLine( bool bCheck=false );
@@ -515,14 +515,14 @@ public:
sal_uInt16 GetHTMLFontSize( sal_uInt32 nFontHeight ) const;
// Die aktuelle Numerierungs-Information holen.
- SwHTMLNumRuleInfo& GetNumInfo() { return *pNumRuleInfo; }
+ SwHTMLNumRuleInfo& GetNumInfo() { return *m_pNumRuleInfo; }
// Die Numerierungs-Information des naechsten Absatz holen. Sie
// muss noch nicht vorhanden sein!
- SwHTMLNumRuleInfo *GetNextNumInfo() { return pNextNumRuleInfo; }
+ SwHTMLNumRuleInfo *GetNextNumInfo() { return m_pNextNumRuleInfo; }
// Die Numerierungs-Information des naechsten Absatz setzen.
- void SetNextNumInfo( SwHTMLNumRuleInfo *pNxt ) { pNextNumRuleInfo=pNxt; }
+ void SetNextNumInfo( SwHTMLNumRuleInfo *pNxt ) { m_pNextNumRuleInfo=pNxt; }
// Die Numerierungs-Information des naeschten Absatz fuellen.
void FillNextNumInfo();
@@ -555,11 +555,11 @@ public:
sal_uInt32 GetHTMLMode() const
{
- return nHTMLMode;
+ return m_nHTMLMode;
}
bool IsHTMLMode( sal_uInt32 nMode ) const
{
- return (nHTMLMode & nMode) != 0;
+ return (m_nHTMLMode & nMode) != 0;
}
inline bool IsCSS1Source( sal_uInt16 n ) const;
@@ -571,19 +571,19 @@ public:
static sal_uInt16 GetCSS1ScriptForScriptType( sal_uInt16 nScriptType );
static sal_uInt16 GetLangWhichIdFromScript( sal_uInt16 nScript );
- FieldUnit GetCSS1Unit() const { return eCSS1Unit; }
+ FieldUnit GetCSS1Unit() const { return m_eCSS1Unit; }
sal_Int32 indexOfDotLeaders( sal_uInt16 nPoolId, const OUString& rText );
};
inline bool SwHTMLWriter::IsCSS1Source( sal_uInt16 n ) const
{
- return n == (nCSS1OutMode & CSS1_OUTMODE_SOURCE);
+ return n == (m_nCSS1OutMode & CSS1_OUTMODE_SOURCE);
}
inline bool SwHTMLWriter::IsCSS1Script( sal_uInt16 n ) const
{
- sal_uInt16 nScript = (nCSS1OutMode & CSS1_OUTMODE_SCRIPT);
+ sal_uInt16 nScript = (m_nCSS1OutMode & CSS1_OUTMODE_SCRIPT);
return CSS1_OUTMODE_ANY_SCRIPT == nScript || n == nScript;
}
generated by cgit (git 2.34.1) at 2025-01-13 09:54:55 +0000