From b1bb3821f47cc5031798e62e2fecad3bb5dfd6ba Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 5 Mar 2012 14:35:39 +0000
Subject: Related: rhbz#799630 survive unknown/broken nIdctHint values

---
 sw/source/filter/ww8/ww8par.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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
 
-- 
cgit v1.2.3