diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-05 14:35:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-05 14:35:39 +0000 |
| commit | b1bb3821f47cc5031798e62e2fecad3bb5dfd6ba (patch) | |
| tree | 21df2a387cbc1e7456e4662d8aa0a696676d540c | |
| parent | 273960e01f814656e12c960599fc49b5a4c4416e (diff) | |
Related: rhbz#799630 survive unknown/broken nIdctHint values
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 7f7354fa6710..f417f3d20328 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -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 nLclIdctHint = 0; + sal_uInt16 nForceFromFontId = 0; if (nLclIdctHint != 0xFF) { - sal_uInt16 nForceFromFontId = 0; switch (nLclIdctHint) { case 0: @@ -2861,7 +2861,10 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS default: break; } + } + if (nForceFromFontId != 0) + { //Now we know that word would use the nForceFromFontId font for this range //Try and determine what script writer would assign this range to |