Resolves: #i125122# WW8 import: Handle nested TOX fields

- only the content of nested TOX fields is imported, no TOX field itself

(cherry picked from commit 1df1e98e7b6556892f546cc559e31f9fd9e00a78)
(cherry picked from commit b2d0492ea85a2f96378326361421749619269b15)

Conflicts:
	sw/source/filter/ww8/ww8par.hxx
	sw/source/filter/ww8/ww8par5.cxx
	sw/source/filter/ww8/ww8par6.cxx

Change-Id: I29cf81df72bf548414bef06b54a691eae6a5edcd

1 files changed, 3 insertions, 3 deletions

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 884af8595a57..1ee747b12797 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3728,11 +3728,11 @@ void SwWW8ImplReader::Read_CColl( sal_uInt16, const sal_uInt8* pData, short nLen
         || vColl[nId].bColl )              // oder Para-Style ?
         return;                             // dann ignorieren
 
-    // if current on loading a TOC field, and current trying to apply a hyperlink character style,
-    // just ignore. For the hyperlinks inside TOC in MS Word is not same with a common hyperlink
+    // if current on loading a TOX field, and current trying to apply a hyperlink character style,
+    // just ignore. For the hyperlinks inside TOX in MS Word is not same with a common hyperlink
     // Character styles: without underline and blue font color. And such type style will be applied in others
     // processes.
-    if (mbLoadingTOCCache && vColl[nId].GetWWStyleId() == ww::stiHyperlink)
+    if (mbLoadingTOXCache && vColl[nId].GetWWStyleId() == ww::stiHyperlink)
     {
         return;
     }