LinguServiceManager: initial settings for dispatchers finished

9 files changed, 73 insertions, 32 deletions

diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx
index f16f30c08cbf..5b6d7a087c64 100644
--- a/linguistic/source/defs.hxx
+++ b/linguistic/source/defs.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: defs.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-11-17 12:37:30 $
+ *  last change: $Author: tl $ $Date: 2001-01-25 10:55:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,12 +88,16 @@ struct SvcFlags
 class LinguDispatcher
 {
 public:
+    enum DspType    { DSP_SPELL, DSP_HYPH, DSP_THES };
+
     virtual void
         SetServiceList( const ::com::sun::star::lang::Locale &rLocale,
                 const ::com::sun::star::uno::Sequence<
                     rtl::OUString > &rSvcImplNames ) = 0;
     virtual ::com::sun::star::uno::Sequence< rtl::OUString >
-        GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) = 0;
+        GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const = 0;
+    virtual DspType
+        GetDspType() const = 0;
 };
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index 1f70a79d309e..846fde34a95f 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hyphdsp.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: tl $ $Date: 2000-12-22 12:46:12 $
+ *  last change: $Author: tl $ $Date: 2001-01-25 10:56:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -630,7 +630,7 @@ void HyphenatorDispatcher::SetServiceList( const Locale &rLocale,
 
 
 Sequence< OUString >
-    HyphenatorDispatcher::GetServiceList( const Locale &rLocale )
+    HyphenatorDispatcher::GetServiceList( const Locale &rLocale ) const
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -638,7 +638,8 @@ Sequence< OUString >
 
     // search for entry with that language and use data from that
     INT16 nLanguage = LocaleToLanguage( rLocale );
-    LangSvcEntry_Hyph *pEntry = aSvcList.Seek( nLanguage );
+    HyphenatorDispatcher    *pThis = (HyphenatorDispatcher *) this;
+    const LangSvcEntry_Hyph *pEntry = pThis->aSvcList.Seek( nLanguage );
     if (pEntry)
         aRes.getArray()[0] = pEntry->aSvcImplName;
     else
@@ -648,5 +649,12 @@ Sequence< OUString >
 }
 
 
+HyphenatorDispatcher::DspType
+    HyphenatorDispatcher::GetDspType() const
+{
+    return DSP_HYPH;
+}
+
+
 ///////////////////////////////////////////////////////////////////////////
 
diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index 737890aaeca1..1d0505e0a251 100644
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hyphdsp.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-11-17 12:37:35 $
+ *  last change: $Author: tl $ $Date: 2001-01-25 10:56:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -205,7 +205,9 @@ public:
                 const ::com::sun::star::uno::Sequence<
                     rtl::OUString > &rSvcImplNames );
     virtual ::com::sun::star::uno::Sequence< rtl::OUString >
-        GetServiceList( const ::com::sun::star::lang::Locale &rLocale );
+        GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const;
+    virtual DspType
+        GetDspType() const;
 };
 
 
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 92a7b4210391..d281205bd3a9 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: lngopt.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: tl $ $Date: 2001-01-24 10:16:08 $
+ *  last change: $Author: tl $ $Date: 2001-01-25 10:55:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -155,6 +155,12 @@ public:
         {
             return ConfigItem::SetSetProperties( rNode, rValues );
         }
+
+    com::sun::star::uno::Sequence< rtl::OUString >
+        GetNodeNames( const rtl::OUString& rNode )
+        {
+            return ConfigItem::GetNodeNames( rNode );
+        }
 };
 
 
@@ -213,7 +219,8 @@ struct LinguOptionsData
     BOOL    SaveConfig();
 
     DECL_LINK( TimeOut, Timer* );
-/*      virtual void        Notify( const com::sun::star::uno::Sequence<
+/*
+     virtual void       Notify( const com::sun::star::uno::Sequence<
                                     rtl::OUString >& rPropertyNames );
     virtual void        Commit();
 */
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 0372025b5e33..87abb66f420c 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: lngsvcmgr.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: tl $ $Date: 2000-11-30 14:39:16 $
+ *  last change: $Author: tl $ $Date: 2001-01-25 10:54:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -138,9 +138,9 @@ class LngSvcMgr :
 
     LngSvcMgrListenerHelper *                           pListenerHelper;
 
-    SvcInfoArray *                                      pSpellSvcs;
-    SvcInfoArray *                                      pHyphSvcs;
-    SvcInfoArray *                                      pThesSvcs;
+    SvcInfoArray *                                      pAvailSpellSvcs;
+    SvcInfoArray *                                      pAvailHyphSvcs;
+    SvcInfoArray *                                      pAvailThesSvcs;
 
     Timer aSaveTimer;
 
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index 37c3716a057d..8764b43ec2b2 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: spelldsp.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: tl $ $Date: 2000-12-22 12:46:23 $
+ *  last change: $Author: tl $ $Date: 2001-01-25 10:56:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -726,7 +726,7 @@ void SpellCheckerDispatcher::SetServiceList( const Locale &rLocale,
 
 
 Sequence< OUString >
-    SpellCheckerDispatcher::GetServiceList( const Locale &rLocale )
+    SpellCheckerDispatcher::GetServiceList( const Locale &rLocale ) const
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -734,7 +734,8 @@ Sequence< OUString >
 
     // search for entry with that language and use data from that
     INT16 nLanguage = LocaleToLanguage( rLocale );
-    SeqLangSvcEntry_Spell *pEntry = aSvcList.Seek( nLanguage );
+    SpellCheckerDispatcher      *pThis = (SpellCheckerDispatcher *) this;
+    const SeqLangSvcEntry_Spell *pEntry = pThis->aSvcList.Seek( nLanguage );
     if (pEntry)
         aRes = pEntry->aSvcImplNames;
 
@@ -742,5 +743,12 @@ Sequence< OUString >
 }
 
 
+SpellCheckerDispatcher::DspType
+    SpellCheckerDispatcher::GetDspType() const
+{
+    return DSP_SPELL;
+}
+
+
 ///////////////////////////////////////////////////////////////////////////
 
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index d8e99f2b3f71..8516661069d3 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: spelldsp.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-11-17 12:37:42 $
+ *  last change: $Author: tl $ $Date: 2001-01-25 10:56:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -243,7 +243,9 @@ public:
                 const ::com::sun::star::uno::Sequence<
                     rtl::OUString > &rSvcImplNames );
     virtual ::com::sun::star::uno::Sequence< rtl::OUString >
-        GetServiceList( const ::com::sun::star::lang::Locale &rLocale );
+        GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const;
+    virtual DspType
+        GetDspType() const;
 };
 
 
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index cdcdbc21e709..584ddcde619e 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: thesdsp.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: tl $ $Date: 2000-12-22 12:46:33 $
+ *  last change: $Author: tl $ $Date: 2001-01-25 10:57:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -277,7 +277,7 @@ void ThesaurusDispatcher::SetServiceList( const Locale &rLocale,
 
 
 Sequence< OUString >
-    ThesaurusDispatcher::GetServiceList( const Locale &rLocale )
+    ThesaurusDispatcher::GetServiceList( const Locale &rLocale ) const
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -285,7 +285,8 @@ Sequence< OUString >
 
     // search for entry with that language and use data from that
     INT16 nLanguage = LocaleToLanguage( rLocale );
-    SeqLangSvcEntry_Thes *pEntry = aSvcList.Seek( nLanguage );
+    ThesaurusDispatcher         *pThis = (ThesaurusDispatcher *) this;
+    const SeqLangSvcEntry_Thes  *pEntry = pThis->aSvcList.Seek( nLanguage );
     if (pEntry)
         aRes = pEntry->aSvcImplNames;
 
@@ -293,5 +294,12 @@ Sequence< OUString >
 }
 
 
+ThesaurusDispatcher::DspType
+    ThesaurusDispatcher::GetDspType() const
+{
+    return DSP_THES;
+}
+
+
 ///////////////////////////////////////////////////////////////////////////
 
diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx
index 1e878e4f5c04..4998bb8be9a6 100644
--- a/linguistic/source/thesdsp.hxx
+++ b/linguistic/source/thesdsp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: thesdsp.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-11-17 12:37:43 $
+ *  last change: $Author: tl $ $Date: 2001-01-25 10:57:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -190,7 +190,9 @@ public:
                 const ::com::sun::star::uno::Sequence<
                     rtl::OUString > &rSvcImplNames );
     virtual ::com::sun::star::uno::Sequence< rtl::OUString >
-        GetServiceList( const ::com::sun::star::lang::Locale &rLocale );
+        GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const;
+    virtual DspType
+        GetDspType() const;
 };