Skip to content

C
core
Kaydet (Commit) b1bb3821 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

Related: rhbz#799630 survive unknown/broken nIdctHint values

üst 273960e0
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
sw/source/filter/ww8/ww8par.cxx
Dosyayı görüntüle @ b1bb3821
...@@ -2844,9 +2844,9 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS ...@@ -2844,9 +2844,9 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS
else if (nScript == MSASCII) //Force weak chars in ascii range to use LATIN font else if (nScript == MSASCII) //Force weak chars in ascii range to use LATIN font
nLclIdctHint = 0; nLclIdctHint = 0;
sal_uInt16 nForceFromFontId = 0;
if (nLclIdctHint != 0xFF) if (nLclIdctHint != 0xFF)
{ {
sal_uInt16 nForceFromFontId = 0;
switch (nLclIdctHint) switch (nLclIdctHint)
{ {
case 0: case 0:
...@@ -2861,7 +2861,10 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS ...@@ -2861,7 +2861,10 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS
default: default:
break; break;
} }
}
if (nForceFromFontId != 0)
{
//Now we know that word would use the nForceFromFontId font for this range //Now we know that word would use the nForceFromFontId font for this range
//Try and determine what script writer would assign this range to //Try and determine what script writer would assign this range to
......
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