#83564# alternative spelling and soft-hyphens fixed

2 files changed, 26 insertions, 8 deletions

diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index 75093868f70e..69a61ae61373 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hyphdsp.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: tl $ $Date: 2001-07-03 12:26:08 $
+ *  last change: $Author: tl $ $Date: 2001-07-04 13:27:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -403,6 +403,13 @@ Reference< XHyphenatedWord > SAL_CALL
     if (bWordModified  &&  xRes.is())
         xRes = RebuildHyphensAndControlChars( rWord, xRes );
 
+    if (xRes.is()  &&  xRes->getWord() != rWord)
+    {
+        xRes = new HyphenatedWord( rWord, nLanguage, xRes->getHyphenationPos(),
+                                   xRes->getHyphenatedWord(),
+                                   xRes->getHyphenPos() );
+    }
+
     return xRes;
 }
 
@@ -513,6 +520,13 @@ Reference< XHyphenatedWord > SAL_CALL
     if (bWordModified  &&  xRes.is())
         xRes = RebuildHyphensAndControlChars( rWord, xRes );
 
+    if (xRes.is()  &&  xRes->getWord() != rWord)
+    {
+        xRes = new HyphenatedWord( rWord, nLanguage, xRes->getHyphenationPos(),
+                                   xRes->getHyphenatedWord(),
+                                   xRes->getHyphenPos() );
+    }
+
     return xRes;
 }
 
@@ -618,6 +632,13 @@ Reference< XPossibleHyphens > SAL_CALL
         }   // if (xEntry.is())
     }
 
+    if (xRes.is()  &&  xRes->getWord() != rWord)
+    {
+        xRes = new PossibleHyphens( rWord, nLanguage,
+                                    xRes->getPossibleHyphens(),
+                                    xRes->getHyphenationPositions() );
+    }
+
     return xRes;
 }
 
diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx
index cce98a764d9d..f59a865e9574 100644
--- a/linguistic/source/hyphdta.cxx
+++ b/linguistic/source/hyphdta.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hyphdta.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: tl $ $Date: 2000-12-22 12:45:48 $
+ *  last change: $Author: tl $ $Date: 2001-07-04 13:27:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -107,10 +107,7 @@ HyphenatedWord::HyphenatedWord(const OUString &rWord, INT16 nLang, INT16 nHPos,
     nHyphenationPos (nHPos),
     nHyphPos        (nPos)
 {
-    OUString aTmp( rHyphWord );
-    RemoveHyphens( aTmp );
-    RemoveControlChars( aTmp );
-    bIsAltSpelling = rWord != aTmp;
+    bIsAltSpelling = rWord != rHyphWord;
 }