Skip to content

C
core
Kaydet (Commit) b46496c4 authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

sw: prefix members of SwHTMLWriter 

Change-Id: I571b3cc8c6120ccddc79659e8e58b536c79f2430
üst e8fa13a8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 90 deletions
sw/source/filter/html/htmlbas.cxx
Dosyayı görüntüle @ b46496c4
......@@ -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: */
sw/source/filter/html/htmldrawwriter.cxx
Dosyayı görüntüle @ b46496c4
......@@ -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 );
......
sw/source/filter/html/htmlfldw.cxx
Dosyayı görüntüle @ b46496c4
......@@ -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
......
sw/source/filter/html/htmlnumwriter.cxx
Dosyayı görüntüle @ b46496c4
......@@ -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;
......
sw/source/filter/html/htmlplug.cxx
Dosyayı görüntüle @ b46496c4
......@@ -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( '>' );
......
sw/source/filter/html/htmltabw.cxx
Dosyayı görüntüle @ b46496c4
......@@ -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() &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment