Skip to content

C
core
Kaydet (Commit) 5dee438c authored tarafından Jan Holesovsky's avatar Jan Holesovsky
Dosyalara gözat
Seçenekler

html: Another problem caused by lowercasing the tags. 

Let's convert the switches to full comprison; it's future-proof, and the
performance difference here is not critical.

Change-Id: I1541acdc89312806f4bf05226efb3a42e81f8019
üst 31ea60c8
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 83 deletions
sw/source/filter/html/css1atr.cxx
Dosyayı görüntüle @ 5dee438c
...@@ -670,56 +670,41 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken, ...@@ -670,56 +670,41 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
if( USER_FMT & nPoolId ) if( USER_FMT & nPoolId )
{ {
// Benutzer-Vorlagen // Benutzer-Vorlagen
const OUString aNm = pPFmt->GetName(); const OUString aNm(pPFmt->GetName());
switch( aNm[0] )
{ if (!bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_blockquote)
// nicht mehr unterstuetzt:
// OOO_STRING_SVTOOLS_HTML_author
// OOO_STRING_SVTOOLS_HTML_acronym
// OOO_STRING_SVTOOLS_HTML_abbreviation
// OOO_STRING_SVTOOLS_HTML_deletedtext
// OOO_STRING_SVTOOLS_HTML_insertedtext
// OOO_STRING_SVTOOLS_HTML_language
// OOO_STRING_SVTOOLS_HTML_person
case 'B': if( !bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_blockquote )
{ {
rRefPoolId = RES_POOLCOLL_HTML_BLOCKQUOTE; rRefPoolId = RES_POOLCOLL_HTML_BLOCKQUOTE;
rToken = OString(OOO_STRING_SVTOOLS_HTML_blockquote); rToken = OString(OOO_STRING_SVTOOLS_HTML_blockquote);
} }
break; else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_citiation)
case 'C': if( bChrFmt )
{
if( aNm == OOO_STRING_SVTOOLS_HTML_citiation )
{ {
rRefPoolId = RES_POOLCHR_HTML_CITIATION; rRefPoolId = RES_POOLCHR_HTML_CITIATION;
rToken = OString(OOO_STRING_SVTOOLS_HTML_citiation); rToken = OString(OOO_STRING_SVTOOLS_HTML_citiation);
} }
else if( aNm == OOO_STRING_SVTOOLS_HTML_code ) else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_code)
{ {
rRefPoolId = RES_POOLCHR_HTML_CODE; rRefPoolId = RES_POOLCHR_HTML_CODE;
rToken = OString(OOO_STRING_SVTOOLS_HTML_code); rToken = OString(OOO_STRING_SVTOOLS_HTML_code);
} }
} else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_definstance)
break;
case 'D': if( bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_definstance )
{ {
rRefPoolId = RES_POOLCHR_HTML_DEFINSTANCE; rRefPoolId = RES_POOLCHR_HTML_DEFINSTANCE;
rToken = OString(OOO_STRING_SVTOOLS_HTML_definstance); rToken = OString(OOO_STRING_SVTOOLS_HTML_definstance);
} }
else if( !bChrFmt ) else if (!bChrFmt && (aNm == OOO_STRING_SVTOOLS_HTML_dd || OOO_STRING_SVTOOLS_HTML_dt))
{ {
sal_uInt16 nDefListLvl = GetDefListLvl( aNm, nPoolId ); sal_uInt16 nDefListLvl = GetDefListLvl(aNm, nPoolId);
// Die Vorlagen DD 1/DT 1 werden ausgegeben, // Die Vorlagen DD 1/DT 1 werden ausgegeben,
// aber keine von ihnen abgeleiteten Vorlagen, // aber keine von ihnen abgeleiteten Vorlagen,
// auch nicht DD 2/DT 2 etc. // auch nicht DD 2/DT 2 etc.
if( nDefListLvl ) if (nDefListLvl)
{ {
if( pPseudo && if (pPseudo && (nDeep || (nDefListLvl & 0x0fff) > 1))
(nDeep || (nDefListLvl & 0x0fff) > 1) )
{ {
bStop = true; bStop = true;
} }
else if( nDefListLvl & HTML_DLCOLL_DD ) else if (nDefListLvl & HTML_DLCOLL_DD)
{ {
rRefPoolId = RES_POOLCOLL_HTML_DD; rRefPoolId = RES_POOLCOLL_HTML_DD;
rToken = OString(OOO_STRING_SVTOOLS_HTML_dd); rToken = OString(OOO_STRING_SVTOOLS_HTML_dd);
...@@ -731,24 +716,22 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken, ...@@ -731,24 +716,22 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
} }
} }
} }
break; else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_emphasis)
case 'E': if( bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_emphasis )
{ {
rRefPoolId = RES_POOLCHR_HTML_EMPHASIS; rRefPoolId = RES_POOLCHR_HTML_EMPHASIS;
rToken = OString(OOO_STRING_SVTOOLS_HTML_emphasis); rToken = OString(OOO_STRING_SVTOOLS_HTML_emphasis);
} }
break; else if (!bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_horzrule)
case 'H': if( !bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_horzrule ) {
// HR nicht ausgeben! // HR nicht ausgeben!
bStop = (nDeep==0); bStop = (nDeep==0);
break; }
case 'K': if( bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_keyboard ) else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_keyboard)
{ {
rRefPoolId = RES_POOLCHR_HTML_KEYBOARD; rRefPoolId = RES_POOLCHR_HTML_KEYBOARD;
rToken = OString(OOO_STRING_SVTOOLS_HTML_keyboard); rToken = OString(OOO_STRING_SVTOOLS_HTML_keyboard);
} }
break; else if (!bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_listing)
case 'L': if( !bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_listing )
{ {
// Listing als PRE exportieren bzw. von // Listing als PRE exportieren bzw. von
// PRE abgeleitete Vorlage exportieren // PRE abgeleitete Vorlage exportieren
...@@ -756,40 +739,32 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken, ...@@ -756,40 +739,32 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
rRefPoolId = RES_POOLCOLL_HTML_PRE; rRefPoolId = RES_POOLCOLL_HTML_PRE;
nDeep = CSS1_FMT_CMPREF; nDeep = CSS1_FMT_CMPREF;
} }
break; else if (!bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_preformtxt)
case 'P': if( !bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_preformtxt )
{ {
rRefPoolId = RES_POOLCOLL_HTML_PRE; rRefPoolId = RES_POOLCOLL_HTML_PRE;
rToken = OString(OOO_STRING_SVTOOLS_HTML_preformtxt); rToken = OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
} }
break; else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_sample)
case 'S': if( bChrFmt )
{
if( aNm == OOO_STRING_SVTOOLS_HTML_sample )
{ {
rRefPoolId = RES_POOLCHR_HTML_SAMPLE; rRefPoolId = RES_POOLCHR_HTML_SAMPLE;
rToken = OString(OOO_STRING_SVTOOLS_HTML_sample); rToken = OString(OOO_STRING_SVTOOLS_HTML_sample);
} }
else if( aNm == OOO_STRING_SVTOOLS_HTML_strong ) else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_strong)
{ {
rRefPoolId = RES_POOLCHR_HTML_STRONG; rRefPoolId = RES_POOLCHR_HTML_STRONG;
rToken = OString(OOO_STRING_SVTOOLS_HTML_strong); rToken = OString(OOO_STRING_SVTOOLS_HTML_strong);
} }
} else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_teletype)
break;
case 'T': if( bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_teletype )
{ {
rRefPoolId = RES_POOLCHR_HTML_TELETYPE; rRefPoolId = RES_POOLCHR_HTML_TELETYPE;
rToken = OString(OOO_STRING_SVTOOLS_HTML_teletype); rToken = OString(OOO_STRING_SVTOOLS_HTML_teletype);
} }
break; else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_variable)
case 'V': if( bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_variable )
{ {
rRefPoolId = RES_POOLCHR_HTML_VARIABLE; rRefPoolId = RES_POOLCHR_HTML_VARIABLE;
rToken = OString(OOO_STRING_SVTOOLS_HTML_variable); rToken = OString(OOO_STRING_SVTOOLS_HTML_variable);
} }
break; else if (!bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_xmp)
case 'X': if( !bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_xmp )
{ {
// XMP als PRE exportieren (aber nicht die // XMP als PRE exportieren (aber nicht die
// Vorlage als Style) // Vorlage als Style)
...@@ -797,8 +772,6 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken, ...@@ -797,8 +772,6 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
rRefPoolId = RES_POOLCOLL_HTML_PRE; rRefPoolId = RES_POOLCOLL_HTML_PRE;
nDeep = CSS1_FMT_CMPREF; nDeep = CSS1_FMT_CMPREF;
} }
break;
}
// Wenn eine PoolId gesetzt ist, entspricht der Name der // Wenn eine PoolId gesetzt ist, entspricht der Name der
// Vorlage dem szugehoerigen Token // Vorlage dem szugehoerigen Token
...@@ -1625,22 +1598,16 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt, ...@@ -1625,22 +1598,16 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
if( USER_FMT & nPoolFmtId ) if( USER_FMT & nPoolFmtId )
{ {
// Benutzer-Vorlagen // Benutzer-Vorlagen
const OUString aNm = rFmt.GetName(); const OUString aNm(rFmt.GetName());
switch( aNm[0] )
{ if (aNm == "DD 1" || aNm == "DT 1")
case 'D': if( aNm == "DD 1" || aNm == "DT 1" )
rHTMLWrt.nDfltBottomMargin = 0; rHTMLWrt.nDfltBottomMargin = 0;
break; else if (aNm == OOO_STRING_SVTOOLS_HTML_listing)
case 'L': if(aNm == OOO_STRING_SVTOOLS_HTML_listing )
rHTMLWrt.nDfltBottomMargin = 0; rHTMLWrt.nDfltBottomMargin = 0;
break; else if (aNm == OOO_STRING_SVTOOLS_HTML_preformtxt)
case 'P': if( aNm == OOO_STRING_SVTOOLS_HTML_preformtxt )
rHTMLWrt.nDfltBottomMargin = 0; rHTMLWrt.nDfltBottomMargin = 0;
break; else if (aNm == OOO_STRING_SVTOOLS_HTML_xmp)
case 'X': if( aNm == OOO_STRING_SVTOOLS_HTML_xmp )
rHTMLWrt.nDfltBottomMargin = 0; rHTMLWrt.nDfltBottomMargin = 0;
break;
}
} }
else else
{ {
......
sw/source/filter/html/htmlatr.cxx
Dosyayı görüntüle @ 5dee438c
...@@ -540,30 +540,23 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, ...@@ -540,30 +540,23 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// solchen abgeleitet // solchen abgeleitet
rInfo.aToken = pFmtInfo->aToken; rInfo.aToken = pFmtInfo->aToken;
// der erste Buchstabe reicht meistens if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_address)
switch( rInfo.aToken[0] )
{ {
case 'A': OSL_ENSURE( rInfo.aToken == OOO_STRING_SVTOOLS_HTML_address,
"Doch kein ADDRESS?" );
rInfo.bParaPossible = sal_True; rInfo.bParaPossible = sal_True;
rHWrt.bNoAlign = sal_True; rHWrt.bNoAlign = sal_True;
break; }
else if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_blockquote)
case 'B': OSL_ENSURE( rInfo.aToken == OOO_STRING_SVTOOLS_HTML_blockquote, {
"Doch kein BLOCKQUOTE?" );
rInfo.bParaPossible = sal_True; rInfo.bParaPossible = sal_True;
rHWrt.bNoAlign = sal_True; rHWrt.bNoAlign = sal_True;
break; }
else if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_parabreak)
case 'P': if( rInfo.aToken.getLength() == 1 )
{ {
bPara = sal_True; bPara = sal_True;
} }
else else if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_preformtxt)
{ {
OSL_ENSURE( rInfo.aToken == OOO_STRING_SVTOOLS_HTML_preformtxt, if (HTML_PREFORMTXT_ON == rHWrt.nLastParaToken)
"Doch kein PRE?" );
if( HTML_PREFORMTXT_ON == rHWrt.nLastParaToken )
{ {
bOutNewLine = sal_True; bOutNewLine = sal_True;
} }
...@@ -574,16 +567,12 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, ...@@ -574,16 +567,12 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
bNoEndTag = sal_True; bNoEndTag = sal_True;
} }
} }
break; else if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dt || rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dd)
{
case 'D': OSL_ENSURE( rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dt ||
rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dd,
"Doch kein DD/DT?" );
bDT = rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dt; bDT = rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dt;
rInfo.bParaPossible = !bDT; rInfo.bParaPossible = !bDT;
rHWrt.bNoAlign = sal_True; rHWrt.bNoAlign = sal_True;
bForceDL = sal_True; bForceDL = sal_True;
break;
} }
} }
else else
......
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