[Libreoffice-commits] core.git: 3 commits - sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Wed Nov 4 23:56:50 PST 2015
sw/source/filter/html/css1atr.cxx | 186 +++----
sw/source/filter/html/htmlatr.cxx | 424 ++++++++---------
sw/source/filter/html/htmlbas.cxx | 8
sw/source/filter/html/htmldrawwriter.cxx | 4
sw/source/filter/html/htmlfldw.cxx | 38 -
sw/source/filter/html/htmlflywriter.cxx | 174 +++----
sw/source/filter/html/htmlforw.cxx | 98 ++--
sw/source/filter/html/htmlftn.cxx | 90 +--
sw/source/filter/html/htmlnumwriter.cxx | 34 -
sw/source/filter/html/htmlplug.cxx | 28 -
sw/source/filter/html/htmltabw.cxx | 68 +-
sw/source/filter/html/wrthtml.cxx | 516 ++++++++++-----------
sw/source/filter/html/wrthtml.hxx | 180 +++----
sw/source/ui/envelp/label1.cxx | 236 ++++-----
sw/source/ui/envelp/labelexp.cxx | 64 +-
sw/source/ui/envelp/labfmt.cxx | 156 +++---
sw/source/ui/envelp/labprt.cxx | 20
sw/source/uibase/app/applab.cxx | 62 +-
sw/source/uibase/dbui/mmconfigitem.cxx | 752 +++++++++++++++----------------
sw/source/uibase/envelp/labimg.cxx | 524 ++++++++++-----------
sw/source/uibase/inc/labimg.hxx | 118 ++--
21 files changed, 1890 insertions(+), 1890 deletions(-)
New commits:
commit b46496c4154ff3784ecd59ed6e15b6ee07a66f22
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Nov 5 08:56:03 2015 +0100
sw: prefix members of SwHTMLWriter
Change-Id: I571b3cc8c6120ccddc79659e8e58b536c79f2430
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 70c899a..a8e9502 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 9443049..5aa30dd 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 d6b8de2..251fa71 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 35e3b33..0a84e1d 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 ebfb23a..d1847c5 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 e21b492..084bd97 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("=\"");
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list