linguistic => linguistic2; revision comments removed

2 files changed, 30 insertions, 722 deletions

diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/ui/lingu/hyp.cxx
index da779423de7a..534e560ed90d 100644
--- a/sw/source/ui/lingu/hyp.cxx
+++ b/sw/source/ui/lingu/hyp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hyp.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:44 $
+ *  last change: $Author: tl $ $Date: 2000-10-27 12:20:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,7 +108,7 @@ using namespace ::rtl;
  --------------------------------------------------------------------*/
 
 SwHyphWrapper::SwHyphWrapper( SwView* pVw,
-            uno::Reference< linguistic::XHyphenator >  &rxHyph,
+            uno::Reference< linguistic2::XHyphenator >  &rxHyph,
             sal_Bool bStart, sal_Bool bOther, sal_Bool bSelect ) :
     SvxSpellWrapper( &pVw->GetEditWin(), rxHyph, bStart, bOther ),
     xHyph( rxHyph ),
@@ -218,288 +218,4 @@ SwHyphWrapper::~SwHyphWrapper()
     if( nPageCount )
         ::EndProgress( pView->GetDocShell() );
 }
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.95  2000/09/18 16:05:54  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.94  2000/07/04 15:20:20  tl
-    XHyphenator1 => XHyphenator
-
-    Revision 1.93  2000/04/18 15:35:07  os
-    UNICODE
-
-    Revision 1.92  2000/03/23 07:42:45  os
-    UNO III
-
-    Revision 1.91  2000/03/08 17:23:12  os
-    GetAppWindow() - misuse as parent window eliminated
-
-    Revision 1.90  2000/02/24 12:14:03  tl
-    #71915# SvxSpellWrapper::SpellEnd called in SpellEnd now
-
-    Revision 1.89  2000/02/16 20:58:34  tl
-    #72219# Locale Umstellung
-
-    Revision 1.88  2000/02/11 14:55:51  hr
-    #70473# changes for unicode ( patched by automated patchtool )
-
-    Revision 1.87  1999/11/24 18:28:37  tl
-    check for Service availability
-
-    Revision 1.86  1999/11/19 16:40:23  os
-    modules renamed
-
-    Revision 1.85  1999/11/10 11:01:24  tl
-     XInterface SpellContinue() -> sal_Bool SpellContinue()
-    Ongoing ONE_LINGU implementation
-
-    Revision 1.84  1999/10/25 19:13:24  tl
-    ongoing ONE_LINGU implementation
-
-    Revision 1.83  1999/08/31 08:37:30  TL
-    #if[n]def ONE_LINGU inserted (for transition of lingu to StarOne)
-
-
-      Rev 1.82   31 Aug 1999 10:37:30   TL
-   #if[n]def ONE_LINGU inserted (for transition of lingu to StarOne)
-
-      Rev 1.81   08 Jul 1999 16:16:14   MA
-   Use internal object to toggle wait cursor
-
-      Rev 1.80   08 Jul 1999 10:31:44   MA
-   limit wait cursor to document window
-
-      Rev 1.79   12 Aug 1998 18:16:00   HR
-   #54781#: GCC braucht Temporary
-
-      Rev 1.78   03 Dec 1997 17:10:10   AMA
-   Fix: Paintprobleme durch Actionklammerung bei automatischer Trennung
-
-      Rev 1.77   28 Nov 1997 15:30:32   MA
-   includes
-
-      Rev 1.76   28 Nov 1997 13:35:34   AMA
-   Fix #45841#: Auch Fehlermeldungen duerfen verschoben werden.
-
-      Rev 1.75   03 Nov 1997 13:21:46   MA
-   precomp entfernt
-
-      Rev 1.74   24 Oct 1997 10:30:54   AMA
-   Fix #44994#: InfoBox nach Abschluss der Silbentrennung anzeigen
-
-      Rev 1.73   05 Sep 1997 11:46:26   MH
-   chg: header
-
-      Rev 1.72   14 Feb 1997 15:19:30   AMA
-   Fix #36204#: Falsche Parentbeziehung des Dialogs.
-
-      Rev 1.71   08 Jan 1997 12:55:14   AMA
-   New: Rueckwaerts kann unterbunden werden, wird genutzt von der Silbentrennung
-
-      Rev 1.70   04 Dec 1996 23:04:40   MH
-   chg: header
-
-      Rev 1.69   09 Oct 1996 18:00:26   MA
-   Progress
-
-      Rev 1.68   28 Aug 1996 12:52:34   OS
-   includes
-
-      Rev 1.67   14 Mar 1996 11:37:24   AMA
-   New: Progress-Anzeige bei Rechtschr. und Silbentrennung
-
-      Rev 1.66   24 Nov 1995 16:57:40   OM
-   PCH->PRECOMPILED
-
-      Rev 1.65   31 Oct 1995 18:39:42   OM
-   GetFrameWindow entfernt
-
-      Rev 1.64   09 Aug 1995 17:14:04   AMA
-   SEG_GLOBALS wieder da
-
-      Rev 1.63   06 Aug 1995 14:36:54   AMA
-   Benutzt den SvxSpellWrapper als HyphWrapper
-
-      Rev 1.62   25 Feb 1995 13:33:08   MS
-   IBM-Linguistik
-
-      Rev 1.61   18 Nov 1994 16:10:40   MA
-   min -> Min, max -> Max
-
-      Rev 1.60   09 Nov 1994 07:59:42   MS
-   Includes geaendert
-
-      Rev 1.59   08 Nov 1994 16:47:46   MS
-   pSpell ist global
-
-      Rev 1.58   25 Oct 1994 18:21:54   ER
-   add: PCH
-
-      Rev 1.57   07 Oct 1994 14:30:30   MS
-   Anpassung Sfx
-
-      Rev 1.56   04 Aug 1994 09:59:56   SWG
-   swg32: SED awt::Size to SSize, LSize to awt::Size etc.
-
-      Rev 1.55   02 Aug 1994 16:00:18   MS
-   Umstellung Linguistik
-
-      Rev 1.54   22 Jul 1994 09:49:36   MS
-   Bug 8784 richtuge Anzeige des zu trennenden Wortes
-
-      Rev 1.53   21 Jun 1994 13:26:44   MS
-   Bug 8526 Abrrechen des Trennvorganges und Defbutton auf dem MAC
-
-      Rev 1.52   07 Apr 1994 16:58:08   MS
-   neues Pragma
-
-      Rev 1.51   07 Apr 1994 16:26:36   MS
-   neu LangError
-
-      Rev 1.50   26 Feb 1994 01:58:24   ER
-   virt. dtor mit export
-
-      Rev 1.49   26 Feb 1994 01:10:18   ER
-   virtuellen dtor wegen export ueberladen
-
-      Rev 1.48   25 Feb 1994 20:44:40   ER
-   virtuellen dtor wegen export ueberladen
-
-      Rev 1.47   23 Feb 1994 10:58:24   ER
-   SEXPORT
-
-      Rev 1.46   22 Feb 1994 14:40:04   ER
-   EXPORT --> SEXPORT
-
-      Rev 1.45   21 Feb 1994 21:35:46   ER
-   LINK EXPORT
-
-      Rev 1.44   17 Feb 1994 08:47:02   MI
-   SEG_FUNCDEFS ausgefuellt
-
-      Rev 1.43   16 Feb 1994 20:07:34   MI
-   SEG_FUNCDEFS ausgefuellt
-
-      Rev 1.42   16 Feb 1994 16:50:56   MI
-   Pragmas zurechtgerueckt
-
-      Rev 1.41   01 Feb 1994 18:18:58   MI
-   TCOV() entfernt, SW_... nach SEG_... umbenannt
-
-      Rev 1.40   01 Feb 1994 13:44:18   MS
-   Umstellung Linguistik v2.0
-
-      Rev 1.39   21 Jan 1994 09:53:10   MS
-   Ablauf interaktive Trennung geaendert
-
-      Rev 1.38   20 Jan 1994 18:41:18   MS
-   Ablauf geaendert
-
-      Rev 1.37   13 Jan 1994 08:44:48   MI
-   Segmentierung per #define ermoeglicht
-
-      Rev 1.36   09 Jan 1994 21:12:54   MI
-   Provisorische Segmentierung
-
-      Rev 1.35   06 Dec 1993 13:09:58   MS
-   Anpassung der Selektion
-
-      Rev 1.34   06 Dec 1993 10:31:56   MS
-   Trennstellen selektieren
-
-      Rev 1.33   27 Sep 1993 01:23:40   MI
-   Segmentierung
-
-      Rev 1.32   20 Sep 1993 14:58:52   MS
-   Umstellung Lingu
-
-      Rev 1.31   26 Aug 1993 09:46:08   MS
-   Nach Weiter am Dokumentanfang Controlls initialisieren
-
-      Rev 1.30   08 Aug 1993 11:56:24   MS
-   fuer MSC
-
-      Rev 1.29   08 Aug 1993 09:31:42   MS
-   Ablauf interaktive Silbentrennung geaendert
-
-      Rev 1.28   06 Aug 1993 08:13:38   ER
-   String Array-Indexe mit sal_uInt16 statt short
-
-      Rev 1.28   06 Aug 1993 08:11:36   ER
-   String Array-Indexe mit sal_uInt16 statt short
-
-      Rev 1.27   05 Aug 1993 10:32:30   MS
-   Drunken Hyphenator beseitigt
-
-      Rev 1.26   18 Jun 1993 09:21:28   BP
-   bug: InitControls(), Initialisierung von nHyphPos
-
-      Rev 1.25   28 May 1993 11:51:42   VB
-   Umstellung Precompiled Headers
-
-      Rev 1.24   14 May 1993 11:31:36   MS
-   Traveling innerhalb des zu trennenden Wortes korrigiert
-
-      Rev 1.23   27 Apr 1993 08:39:08   OK
-   NEU: #pragma hdrstop
-
-      Rev 1.22   20 Apr 1993 13:13:38   MS
-   Entflechtung Linguistik
-
-      Rev 1.21   23 Mar 1993 18:18:20   MS
-
-      Rev 1.20   23 Mar 1993 18:10:30   MS
-   richtigen Trennindex bestimmen
-
-      Rev 1.19   22 Mar 1993 10:08:26   OK
-   Anpassung fuer NT
-
-      Rev 1.18   16 Mar 1993 08:32:42   MS
-   Fix fuer kk entfernt
-
-      Rev 1.17   12 Mar 1993 14:49:06   MS
-   Uebergeben des SoftHyph geaendert
-
-      Rev 1.16   12 Mar 1993 14:02:34   MS
-   Navigation geaendert
-
-      Rev 1.15   11 Mar 1993 14:00:04   MS
-   keine alternativwoerter fuer Formatierung
-
-      Rev 1.14   11 Mar 1993 13:54:54   MS
-   Ablauf geaendert
-
-      Rev 1.13   09 Mar 1993 10:48:24   MS
-   Trennung mit Start und Continue - Mimik
-
-      Rev 1.12   10 Feb 1993 19:59:46   TB
-   Umstellung SV21
-
-      Rev 1.11   22 Jan 1993 14:30:32   MS
-   String im Header geaendert
-
-      Rev 1.10   05 Jan 1993 10:01:56   MS
-   neu mit Sprachanzeige
-
-      Rev 1.9   22 Dec 1992 20:19:00   VB
-   Aenderung der FN_-Ids
-
-      Rev 1.8   22 Dec 1992 10:12:26   OK
-   Anpassung an M70
-
-      Rev 1.7   21 Dec 1992 16:19:34   MS
-   Enable Disable Buttons
-
-      Rev 1.6   18 Dec 1992 11:54:24   MS
-   mit SL_SOFT_HYPHEN
-
-      Rev 1.5   11 Dec 1992 13:42:48   MS
-   IgnoreButton
-
-      Rev 1.4   17 Nov 1992 16:55:44   MS
-   Trennhilfe-Dialog geaendert
-
-------------------------------------------------------------------------*/
 
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 0070a5efc302..3efb42e2b65a 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: olmenu.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2000-10-20 14:18:04 $
+ *  last change: $Author: tl $ $Date: 2000-10-27 12:21:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,8 +98,8 @@
 #ifndef _UNO_LINGU_HXX
 #include <svx/unolingu.hxx>
 #endif
-#ifndef _COM_SUN_STAR_LINGUISTIC_XOTHERLINGU2_HPP_
-#include <com/sun/star/linguistic/XOtherLingu2.hpp>
+#ifndef _COM_SUN_STAR_LINGUISTIC2_XOTHERLINGU_HPP_
+#include <com/sun/star/linguistic2/XOtherLingu.hpp>
 #endif
 #ifndef _COM_SUN_STAR_FRAME_XSTORABLE_HPP_
 #include <com/sun/star/frame/XStorable.hpp>
@@ -153,6 +153,9 @@
 #endif
 
 using namespace ::com::sun::star;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::linguistic2;
 using namespace ::rtl;
 
 #define C2U(cChar) OUString::createFromAscii(cChar)
@@ -161,7 +164,7 @@ using namespace ::rtl;
 
 ---------------------------------------------------------------------------*/
 
-util::Language lcl_CheckLanguage( const OUString &rWord, uno::Reference< linguistic::XSpellChecker1 >  xSpell )
+util::Language lcl_CheckLanguage( const OUString &rWord, Reference< XSpellChecker1 >  xSpell )
 {
     // andere Sprachen automatisch pr"ufen
     // auch wenn beliebiger Schwachsinn rauskommt
@@ -170,8 +173,8 @@ util::Language lcl_CheckLanguage( const OUString &rWord, uno::Reference< linguis
 
      util::Language nLang = LANGUAGE_NONE;
 
-    uno::Reference< linguistic::XSpellAlternatives >    xAlt;
-    uno::Sequence< util::Language > aLangs;
+    Reference< XSpellAlternatives >     xAlt;
+    Sequence< util::Language >  aLangs;
     if (xSpell.is())
         aLangs = xSpell->getLanguages();
     const util::Language *pLang = aLangs.getConstArray();
@@ -181,7 +184,7 @@ util::Language lcl_CheckLanguage( const OUString &rWord, uno::Reference< linguis
     {
         if (pLang[i] != LANGUAGE_NONE)
         {
-            if (xSpell->isValid( rWord, pLang[i] ))
+            if (xSpell->isValid( rWord, pLang[i], Sequence< PropertyValue >() ))
             {
                 nLang = pLang[i];
                 break;
@@ -192,156 +195,14 @@ util::Language lcl_CheckLanguage( const OUString &rWord, uno::Reference< linguis
 }
 
 
-/*SwSpellPopup::SwSpellPopup( SwWrtShell* pWrtSh, const uno::Reference< linguistic::XSpellAlternatives >  &xAlt ) :
+SwSpellPopup::SwSpellPopup( SwWrtShell* pWrtSh, const Reference< XSpellAlternatives >  &xAlt ) :
     PopupMenu(SW_RES(MN_SPELL_POPUP)),
     pSh ( pWrtSh ),
     xSpellAlt   (xAlt)
 {
     DBG_ASSERT(xSpellAlt.is(), "no spelling alternatives available");
 
-    uno::Sequence< UString >    aStrings;
-    if (xSpellAlt.is())
-        aStrings = xSpellAlt->getAlternatives();
-    const UString *pString = aStrings.getConstArray();
-    sal_Int16 nStringCount = aStrings.getLength();
-
-    PopupMenu *pMenu = GetPopupMenu(MN_AUTOCORR);
-    sal_Bool bEnable = sal_False;
-    if( nStringCount )
-    {
-        InsertSeparator(0);
-        bEnable = sal_True;
-        for( sal_uInt16 i = 0, nPos = 1, nId = MN_AUTOCORR_START + 1;
-            i < nStringCount; ++i, ++nPos, ++nId )
-        {
-            const String aEntry = U2S( pString[ i ] );
-            InsertItem( nPos, aEntry, 0, i );
-            SetHelpId( nPos, HID_LINGU_REPLACE);
-            pMenu->InsertItem( nId, aEntry );
-            pMenu->SetHelpId( nId, HID_LINGU_AUTOCORR);
-        }
-    }
-    EnableItem( MN_AUTOCORR, bEnable );
-
-    nCorrLang = LANGUAGE_NONE;
-    if (xSpellAlt.is())
-        nCorrLang = lcl_CheckLanguage( xSpellAlt->getWord(), ::GetSpellChecker() );
-    if( nCorrLang != LANGUAGE_NONE )
-    {
-        InsertSeparator();
-        String aTmp( ::GetLanguageString( nCorrLang ) );
-        InsertItem( MN_LANGUAGE_WORD, String( SW_RES( STR_WORD ) ) + aTmp );
-        SetHelpId( MN_LANGUAGE_WORD, HID_LINGU_WORD_LANGUAGE );
-        InsertItem( MN_LANGUAGE_PARA, String( SW_RES( STR_PARAGRAPH ) ) + aTmp );
-        SetHelpId( MN_LANGUAGE_PARA, HID_LINGU_PARA_LANGUAGE );
-    }
-
-    pMenu = GetPopupMenu(MN_INSERT);
-    //DBG_ASSERT(0, "Fremdlinguistik fehlt noch");
-<<<<<<< olmenu.cxx
-#ifdef NOT_YET
-    if( pSpell->HasOtherLingu() && pSpell->HasOtherSpell() )
-    {
-        bEnable = sal_True;
-        pMenu->InsertItem( MN_INSERT_START,
-            pSpell->GetOtherLinguName( pSpell->GetOtherIdx() ) );
-        pMenu->SetHelpId( MN_INSERT_START, HID_LINGU_ADD_WORD);
-    }
-    else
-#endif
-    {
-        bEnable = sal_False;
-
-        uno::Reference< linguistic::XDictionaryList >   xDicList( SvxGetDictionaryList() );
-=======
-
-
-    bEnable = FALSE;    // enable MN_INSERT?
-
-    INT16 nOtherIndex       = -1;
-    BOOL  bHasOtherFunc     = FALSE;
-    BOOL  bIsStandardSpell  = TRUE;
-    XPropertySetRef xProp( SvxGetLinguPropertySet() );
-    if (xProp.is())
-    {
-        nOtherIndex = xProp->getPropertyValue(
-                            S2U(UPN_OTHER_LINGU_INDEX) ).getINT16();
-        bIsStandardSpell = xProp->getPropertyValue(
-                            S2U(UPN_IS_STANDARD_SPELL_CHECKER) ).getBOOL();
-    }
-
-    if (nOtherIndex >= 0)
-    {
-        XMultiServiceFactoryRef xMgr( NAMESPACE_USR( getProcessServiceManager)() );
-        xOther = XOtherLinguRef( xMgr->createInstance(
-                        S2U("com.sun.star.linguistic.OtherLingu") ), USR_QUERY );
-        if (xOther.is())
-        {
-            bHasOtherFunc = xOther->hasSpellChecker( nOtherIndex );
-            if (  bHasOtherFunc)
-            {
-                bEnable = TRUE;
-                pMenu->InsertItem( MN_INSERT_START,
-                    U2S( xOther->getIdentifier( nOtherIndex ) ) );
-                pMenu->SetHelpId( MN_INSERT_START, HID_LINGU_ADD_WORD);
-            }
-        }
-    }
-
-    if (nOtherIndex < 0  ||  bIsStandardSpell)
-    {
-        XDictionaryListRef  xDicList( SvxGetDictionaryList() );
->>>>>>> 1.55
-        if (xDicList.is())
-        {
-            // add active, positive dictionary to dic-list (if not already done).
-            // This is to ensure that there is at least on dictionary to which
-            // words could be added.
-            uno::Reference< linguistic::XDictionary1 >  xDic( SvxGetOrCreatePosDic( xDicList ) );
-            if (xDic.is())
-                xDic->setActive( sal_True );
-
-            aDics = xDicList->getDictionaries();
-            const uno::Reference< linguistic::XDictionary >  *pDic = aDics.getConstArray();
-            sal_Int32 nDicCount = aDics.getLength();
-
-            sal_Int16 nLanguage = LANGUAGE_NONE;
-            if (xSpellAlt.is())
-                nLanguage = SvxLocaleToLanguage( xSpellAlt->getLocale() );
-
-            for( sal_Int32 i = 0; i < nDicCount; i++ )
-            {
-                uno::Reference< linguistic::XDictionary1 >  xDic( pDic[i], uno::UNO_QUERY );
-                if (!xDic.is())
-                    continue;
-
-                LanguageType nActLanguage = xDic->getLanguage();
-                if( xDic->isActive()
-                    &&  xDic->getDictionaryType() != linguistic::DictionaryType_NEGATIVE
-                    && (nLanguage == nActLanguage || LANGUAGE_NONE == nActLanguage )
-                    && SvxGetIgnoreAllList() != xDic )
-                {
-                    // the extra 1 is because of the (possible) external
-                    // linguistic entry above
-                    pMenu->InsertItem( MN_INSERT_START + i + 1, U2S( xDic->getName() ) );
-                    bEnable = sal_True;
-                }
-            }
-        }
-    }
-    EnableItem( MN_INSERT, bEnable );
-
-    RemoveDisabledEntries( sal_True, sal_True );
-}
-*/
-SwSpellPopup::SwSpellPopup( SwWrtShell* pWrtSh, const uno::Reference< linguistic::XSpellAlternatives >  &xAlt ) :
-    PopupMenu(SW_RES(MN_SPELL_POPUP)),
-    pSh ( pWrtSh ),
-    xSpellAlt   (xAlt)
-{
-    DBG_ASSERT(xSpellAlt.is(), "no spelling alternatives available");
-
-    uno::Sequence< OUString >   aStrings;
+    Sequence< OUString >    aStrings;
     if (xSpellAlt.is())
         aStrings = xSpellAlt->getAlternatives();
     const OUString *pString = aStrings.getConstArray();
@@ -379,14 +240,13 @@ SwSpellPopup::SwSpellPopup( SwWrtShell* pWrtSh, const uno::Reference< linguistic
     }
 
     pMenu = GetPopupMenu(MN_INSERT);
-    //DBG_ASSERT(0, "Fremdlinguistik fehlt noch");
 
     bEnable = FALSE;    // enable MN_INSERT?
 
     sal_Int16 nOtherIndex       = -1;
     sal_Bool  bHasOtherFunc     = FALSE;
     sal_Bool  bIsStandardSpell  = TRUE;
-    uno::Reference< beans::XPropertySet > xProp( SvxGetLinguPropertySet() );
+    Reference< beans::XPropertySet > xProp( SvxGetLinguPropertySet() );
     if (xProp.is())
     {
         nOtherIndex = *(sal_Int16*)xProp->getPropertyValue(C2U(UPN_OTHER_LINGU_INDEX) ).getValue();
@@ -397,10 +257,10 @@ SwSpellPopup::SwSpellPopup( SwWrtShell* pWrtSh, const uno::Reference< linguistic
     if (nOtherIndex >= 0)
     {
 
-        uno::Reference< lang::XMultiServiceFactory >
+        Reference< lang::XMultiServiceFactory >
                                     xMgr = comphelper::getProcessServiceFactory();
-        xOther = uno::Reference< linguistic::XOtherLingu >( xMgr->createInstance(
-                            C2U("com.sun.star.linguistic.OtherLingu") ), uno::UNO_QUERY );
+        xOther = Reference< XOtherLingu >( xMgr->createInstance(
+                            C2U("com.sun.star.linguistic2.OtherLingu") ), UNO_QUERY );
         if (xOther.is())
         {
             bHasOtherFunc = xOther->hasSpellChecker( nOtherIndex );
@@ -416,18 +276,18 @@ SwSpellPopup::SwSpellPopup( SwWrtShell* pWrtSh, const uno::Reference< linguistic
 
     if (nOtherIndex < 0  ||  bIsStandardSpell)
     {
-        uno::Reference< linguistic::XDictionaryList >   xDicList( SvxGetDictionaryList() );
+        Reference< XDictionaryList >    xDicList( SvxGetDictionaryList() );
         if (xDicList.is())
         {
             // add active, positive dictionary to dic-list (if not already done).
             // This is to ensure that there is at least on dictionary to which
             // words could be added.
-            uno::Reference< linguistic::XDictionary1 >  xDic( SvxGetOrCreatePosDic( xDicList ) );
+            Reference< XDictionary1 >  xDic( SvxGetOrCreatePosDic( xDicList ) );
             if (xDic.is())
                 xDic->setActive( sal_True );
 
             aDics = xDicList->getDictionaries();
-            const uno::Reference< linguistic::XDictionary >  *pDic = aDics.getConstArray();
+            const Reference< XDictionary >  *pDic = aDics.getConstArray();
             sal_Int32 nDicCount = aDics.getLength();
 
             sal_Int16 nLanguage = LANGUAGE_NONE;
@@ -436,14 +296,14 @@ SwSpellPopup::SwSpellPopup( SwWrtShell* pWrtSh, const uno::Reference< linguistic
 
             for( sal_Int32 i = 0; i < nDicCount; i++ )
             {
-                uno::Reference< linguistic::XDictionary1 >  xDic( pDic[i], uno::UNO_QUERY );
+                Reference< XDictionary1 >  xDic( pDic[i], UNO_QUERY );
                 if (!xDic.is() || SvxGetIgnoreAllList() == xDic)
                     continue;
 
-                uno::Reference< frame::XStorable > xStor( xDic, uno::UNO_QUERY );
+                Reference< frame::XStorable > xStor( xDic, UNO_QUERY );
                 LanguageType nActLanguage = xDic->getLanguage();
                 if( xDic->isActive()
-                    &&  xDic->getDictionaryType() != linguistic::DictionaryType_NEGATIVE
+                    &&  xDic->getDictionaryType() != DictionaryType_NEGATIVE
                     && (nLanguage == nActLanguage || LANGUAGE_NONE == nActLanguage )
                     && (!xStor.is() || !xStor->isReadonly()) )
                 {
@@ -551,15 +411,12 @@ sal_uInt16  SwSpellPopup::Execute( Window* pWin, const Point& rWordPos )
                         pSh->GetView().GetViewFrame()->GetDispatcher()->
                             Execute( FN_SPELLING_DLG, SFX_CALLMODE_ASYNCHRON );
                     }
-                    // should be superfluos by adding the ignore list to
-                    // the dictionary list.
-                    // SW_MOD()->CheckSpellChanges( sal_False, );
                 }
                 break;
                 case MN_IGNORE :
                 {
                     sal_Int16 nAddRes = SvxAddEntryToDic(
-                            uno::Reference< linguistic::XDictionary > ( SvxGetIgnoreAllList(), uno::UNO_QUERY ),
+                            Reference< XDictionary > ( SvxGetIgnoreAllList(), UNO_QUERY ),
                             xSpellAlt->getWord(), sal_False,
                             aEmptyStr, LANGUAGE_NONE );
                 }
@@ -595,10 +452,9 @@ sal_uInt16  SwSpellPopup::Execute( Window* pWin, const Point& rWordPos )
                         OUString aWord( xSpellAlt->getWord() );
                         if (MN_INSERT_START == nRet)
                         {
-                            uno::Reference< linguistic::XOtherLingu2 > xOther2( xOther, uno::UNO_QUERY );
-                            if (xOther2.is())
+                            if (xOther.is())
                             {
-                                xOther2->addWord( 0, aWord,
+                                xOther->addWord( 0, aWord,
                                     SvxLocaleToLanguage( xSpellAlt->getLocale() ) );
 
                                 // first parameter is TRUE since this menue
@@ -612,14 +468,11 @@ sal_uInt16  SwSpellPopup::Execute( Window* pWin, const Point& rWordPos )
                             INT32 nDicIdx = nRet - MN_INSERT_START - 1;
                             DBG_ASSERT( nDicIdx < aDics.getLength(),
                                         "dictionary index out of range" );
-                            uno::Reference< linguistic::XDictionary > xDic =
+                            Reference< XDictionary > xDic =
                                 aDics.getConstArray()[nDicIdx];
                             INT16 nAddRes = SvxAddEntryToDic( xDic,
                                 aWord, FALSE, aEmptyStr, LANGUAGE_NONE );
 
-                            /*if (DIC_ERR_NONE == nAddRes)
-                                SW_MOD()->CheckSpellChanges( FALSE, TRUE, FALSE );
-                            else*/
                             if (DIC_ERR_NONE != nAddRes
                                  && !xDic->getEntry( aWord ).is())
                             {
@@ -628,9 +481,6 @@ sal_uInt16  SwSpellPopup::Execute( Window* pWin, const Point& rWordPos )
                                     nAddRes );
                             }
                         }
-
-                        //should work with dictionaryListener mechanism
-                        //SW_MOD()->CheckSpellChanges( FALSE, FALSE, FALSE );
                     }
             }
     }
@@ -638,261 +488,3 @@ sal_uInt16  SwSpellPopup::Execute( Window* pWin, const Point& rWordPos )
     return nRet;
 }
 
-
-
-
-/*************************************************************************
-
-      $Log: not supported by cvs2svn $
-      Revision 1.1.1.1  2000/09/18 17:14:44  hr
-      initial import
-
-      Revision 1.64  2000/09/18 16:05:54  willem.vandorp
-      OpenOffice header added.
-
-      Revision 1.63  2000/09/07 15:59:25  os
-      change: SFX_DISPATCHER/SFX_BINDINGS removed
-
-      Revision 1.62  2000/05/24 11:54:40  khz
-      Change for Unicode
-
-      Revision 1.61  2000/05/16 17:27:46  jp
-      Changes for Unicode
-
-      Revision 1.60  2000/05/16 09:15:13  os
-      project usr removed
-
-      Revision 1.59  2000/05/09 14:46:08  os
-      UNICODE
-
-      Revision 1.58  2000/04/18 15:35:07  os
-      UNICODE
-
-      Revision 1.57  2000/04/12 11:01:24  tl
-      #74727# bugfix von src569 nachgezogen
-
-      Revision 1.56  2000/03/23 07:32:27  os
-      UNO III
-
-      Revision 1.55  2000/03/16 10:51:17  tl
-      #73839# use language of word to check for dictionories to be displayed in SwSpellPopup
-
-      Revision 1.54  2000/03/15 14:49:19  tl
-      #70734# AddWord for external linguistic added
-
-      Revision 1.53  2000/03/07 10:40:19  tl
-      #72833# SvxPrepareAutoCorrect used
-
-      Revision 1.52  2000/02/25 10:44:07  tl
-      #62869# new error message when adding word to dictionary failed
-
-      Revision 1.51  2000/02/22 16:38:05  tl
-      #73380# standard.dic created, acivated and added to list
-
-      Revision 1.50  2000/02/21 15:57:17  tl
-      #72081# strip '.' from word before adding to dictionaries
-
-      Revision 1.49  2000/02/16 20:58:50  tl
-      #72219# Locale Umstellung
-
-      Revision 1.48  2000/02/04 12:22:19  tl
-      #72446# IgnoreAllList removed from list of selectable dictionaries
-
-      Revision 1.47  2000/02/01 11:53:12  tl
-      #71634# insert '.' to replacement if original word has it
-
-      Revision 1.46  2000/01/11 10:28:08  tl
-      #70735# use isActive/setActive from linguistic::XDictionary now
-
-      Revision 1.45  1999/12/22 19:56:14  jp
-      Bug #71270#: SwSpellPopup - insert separator
-
-      Revision 1.44  1999/12/16 13:52:07  tl
-      #70973# PopupMenu ok even without spelling alternatives
-
-      Revision 1.43  1999/11/24 18:30:28  tl
-      check for Service availability
-
-      Revision 1.42  1999/11/19 16:40:23  os
-      modules renamed
-
-      Revision 1.41  1999/11/10 11:03:36  tl
-      Ongoing ONE_LINGU implementation
-
-      Revision 1.40  1999/10/18 13:15:34  os
-      external lingu: no special handling in WIN
-
-      Revision 1.39  1999/09/21 10:22:26  rt
-      #65293# sysdep.hxx -> svwin.h
-
-      Revision 1.38  1999/09/21 10:16:23  os
-      Sysdepen::GethWnd -> return 0
-
-      Revision 1.37  1999/09/20 11:08:21  hr
-      #65293#: removed <vcl/sysdep.hxx>
-
-      Revision 1.36  1999/08/31 08:37:26  TL
-      #if[n]def ONE_LINGU inserted (for transition of lingu to StarOne)
-
-
-      Rev 1.35   31 Aug 1999 10:37:26   TL
-   #if[n]def ONE_LINGU inserted (for transition of lingu to StarOne)
-
-      Rev 1.34   22 Feb 1999 13:37:56   MA
-   #62126# gesperrte Eintraege entfernen lassen
-
-      Rev 1.33   24 Nov 1998 10:05:10   OS
-   #59590# mehrsprachige Autokorrektur
-
-      Rev 1.32   29 Oct 1998 16:29:54   AMA
-   Fix #58621#: Falsch geschriebene Woerter _nicht_ in AusnahmeWB uebernehmen
-
-      Rev 1.31   28 Jul 1998 15:34:50   AMA
-   Fix #54147#: Nicht zuviel loeschen, Ueberschreibmodus kurzzeitig ausschalten
-
-      Rev 1.30   09 Jun 1998 15:28:44   AMA
-   Fix #50994#: Bei der Absatzselektion nicht uebers Ziel hinausschiessen
-
-      Rev 1.29   07 May 1998 15:05:04   AMA
-   New: SpellPopup bietet Sprachumstellung am Wort oder Absatz an
-
-      Rev 1.28   29 Apr 1998 09:30:04   MA
-   ucb::Command, Contextmenu auch fuer Tastatur
-
-      Rev 1.27   21 Nov 1997 13:00:26   MA
-   includes
-
-      Rev 1.26   18 Sep 1997 14:00:10   OS
-   Pointer::GetPosPixel fuer VCL ersetzt
-
-      Rev 1.25   29 Aug 1997 16:35:50   MH
-   chg: Syntax
-
-      Rev 1.24   29 Aug 1997 15:59:24   OS
-   PopupMenu::Execute mit Window* fuer VCL
-
-      Rev 1.23   29 Aug 1997 14:02:46   OS
-   DLL-Umbau
-
-      Rev 1.22   07 Aug 1997 14:34:00   HJS
-   includes
-
-      Rev 1.21   14 Jul 1997 08:07:58   OS
-   HelpIDs fuer SpellPopup #41627#
-
-      Rev 1.20   30 Jun 1997 10:29:06   MH
-   cat fuer OS2
-
-      Rev 1.19   26 Jun 1997 13:31:40   AMA
-   New: AddWord mit Window-Handle + Automatisches Aufnehmen unbekannter Woerter
-
-      Rev 1.18   05 Jun 1997 17:28:52   AMA
-   New: Fremdlinguistik nimmt auch Woerter auf
-
-      Rev 1.17   04 Feb 1997 13:13:00   AMA
-   New: Online-Spelling-Vorschlag in die Autokorrektur aufnehmen
-
-      Rev 1.16   11 Nov 1996 10:58:52   MA
-   ResMgr
-
-      Rev 1.15   06 Nov 1996 19:57:04   MH
-   SwSplCfg -> OfaSplCfg
-
-      Rev 1.14   24 Oct 1996 13:36:28   JP
-   String Umstellung: [] -> GetChar()
-
-      Rev 1.13   23 Oct 1996 13:49:28   JP
-   SVMEM -> SVSTDARR Umstellung
-
-      Rev 1.12   15 Oct 1996 14:14:46   JP
-   AutoCorrCfg in die OfficeApplication verschoben
-
-      Rev 1.11   28 Aug 1996 12:52:34   OS
-   includes
-
-      Rev 1.10   21 Jun 1996 10:33:32   AMA
-   New #28010#: Temporaere Autokorrektur
-
-      Rev 1.9   20 May 1996 09:58:38   AMA
-   Fix: SvStringsDtor statt SvStrings
-
-      Rev 1.8   26 Apr 1996 15:47:10   AMA
-   Fix #27394#: Geprueftes Wort jetzt als erstes der Alternativen
-
-      Rev 1.7   26 Apr 1996 10:18:10   AMA
-   Fix #27394#: Geprueftes Wort jetzt als erstes Element der Alternativ-Liste.
-
-      Rev 1.6   23 Apr 1996 10:33:28   AMA
-   Fix #27260#: Online-Spelling-PopUp und Punkte, Anfuehrungszeichen etc.
-
-      Rev 1.5   05 Mar 1996 11:13:30   AMA
-   Fix: GetCorrect() selektiert; Fix: Punkte bei Abkrzg. und Satzende beachten
-
-      Rev 1.4   29 Feb 1996 10:31:30   AMA
-   Opt: SpellItAgainSam startet Idlen ggf. auch ohne Spell-Invalidierung
-
-      Rev 1.3   27 Feb 1996 17:04:56   AMA
-   New: CheckSpellChanges()
-
-      Rev 1.2   26 Feb 1996 07:50:56   OS
-   Aufnehmen-enable berichtigt
-
-      Rev 1.1   23 Feb 1996 08:33:42   OS
-   Woerterbuecher nach Sprache anbieten, Woerter aufnehmen
-
-      Rev 1.0   22 Feb 1996 15:55:28   OS
-   Initial revision.
-
-*************************************************************************/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-