Kaydet (Commit) 5dee438c authored tarafından Jan Holesovsky's avatar Jan Holesovsky

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
...@@ -540,50 +540,39 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, ...@@ -540,50 +540,39 @@ 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, rInfo.bParaPossible = sal_True;
"Doch kein ADDRESS?" ); rHWrt.bNoAlign = sal_True;
rInfo.bParaPossible = sal_True; }
rHWrt.bNoAlign = sal_True; else if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_blockquote)
break; {
rInfo.bParaPossible = sal_True;
case 'B': OSL_ENSURE( rInfo.aToken == OOO_STRING_SVTOOLS_HTML_blockquote, rHWrt.bNoAlign = sal_True;
"Doch kein BLOCKQUOTE?" ); }
rInfo.bParaPossible = sal_True; else if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_parabreak)
rHWrt.bNoAlign = sal_True; {
break; bPara = sal_True;
}
case 'P': if( rInfo.aToken.getLength() == 1 ) else if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_preformtxt)
{ {
bPara = sal_True; if (HTML_PREFORMTXT_ON == rHWrt.nLastParaToken)
} {
else bOutNewLine = sal_True;
{ }
OSL_ENSURE( rInfo.aToken == OOO_STRING_SVTOOLS_HTML_preformtxt, else
"Doch kein PRE?" ); {
if( HTML_PREFORMTXT_ON == rHWrt.nLastParaToken ) nToken = HTML_PREFORMTXT_ON;
{ rHWrt.bNoAlign = sal_True;
bOutNewLine = sal_True; bNoEndTag = sal_True;
} }
else }
{ else if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dt || rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dd)
nToken = HTML_PREFORMTXT_ON; {
rHWrt.bNoAlign = sal_True; bDT = rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dt;
bNoEndTag = sal_True; rInfo.bParaPossible = !bDT;
} rHWrt.bNoAlign = sal_True;
} bForceDL = sal_True;
break;
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;
rInfo.bParaPossible = !bDT;
rHWrt.bNoAlign = 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