1 files changed, 23 insertions, 103 deletions
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index cf3e3d009802..f6144b7f117d 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -87,9 +87,8 @@ public:
     BOOL            SetValue( ::com::sun::star::uno::Any &rOld,
                             const ::com::sun::star::uno::Any &rVal, INT32 nWID );
     void            GetValue( ::com::sun::star::uno::Any &rVal, INT32 nWID ) const;
-    ::rtl::OUString GetName( INT32 nWID ) const;
 
-    BOOL    IsSpellInAllLanguages() const   { return pData->bIsSpellInAllLanguages; }
+    static ::rtl::OUString    GetName( INT32 nWID );
 
     const ::com::sun::star::uno::Sequence< rtl::OUString >
             GetActiveDics() const   { return pData->aActiveDics; }
@@ -134,7 +133,7 @@ class LinguProps :
     OPropertyListenerContainerHelper            aPropListeners;
 
     SfxItemPropertyMap                         *pMap;
-    LinguOptions                                aOpt;
+    SvtLinguConfig                              aConfig;
 
     BOOL                                        bDisposing;
 
@@ -148,114 +147,35 @@ public:
     LinguProps();
 
     // XPropertySet
-    virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-            throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL
-        setPropertyValue( const ::rtl::OUString& aPropertyName,
-                const ::com::sun::star::uno::Any& aValue )
-            throw(::com::sun::star::beans::UnknownPropertyException,
-                  ::com::sun::star::beans::PropertyVetoException,
-                  ::com::sun::star::lang::IllegalArgumentException,
-                  ::com::sun::star::lang::WrappedTargetException,
-                  ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL
-        getPropertyValue( const ::rtl::OUString& PropertyName )
-            throw(::com::sun::star::beans::UnknownPropertyException,
-                  ::com::sun::star::lang::WrappedTargetException,
-                  ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL
-        addPropertyChangeListener( const ::rtl::OUString& aPropertyName,
-                const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::beans::XPropertyChangeListener >& rxListener )
-            throw(::com::sun::star::beans::UnknownPropertyException,
-                  ::com::sun::star::lang::WrappedTargetException,
-                  ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL
-        removePropertyChangeListener( const ::rtl::OUString& aPropertyName,
-                const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::beans::XPropertyChangeListener >& rxListener )
-            throw(::com::sun::star::beans::UnknownPropertyException,
-                  ::com::sun::star::lang::WrappedTargetException,
-                  ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL
-        addVetoableChangeListener( const ::rtl::OUString& PropertyName,
-                const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::beans::XVetoableChangeListener >& rxListener )
-            throw(::com::sun::star::beans::UnknownPropertyException,
-                  ::com::sun::star::lang::WrappedTargetException,
-                  ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL
-        removeVetoableChangeListener( const ::rtl::OUString& PropertyName,
-                const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::beans::XVetoableChangeListener >& rxListener )
-            throw(::com::sun::star::beans::UnknownPropertyException,
-                  ::com::sun::star::lang::WrappedTargetException,
-                  ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XFastPropertySet
-    virtual void SAL_CALL
-        setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue )
-            throw(::com::sun::star::beans::UnknownPropertyException,
-                  ::com::sun::star::beans::PropertyVetoException,
-                  ::com::sun::star::lang::IllegalArgumentException,
-                  ::com::sun::star::lang::WrappedTargetException,
-                  ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL
-        getFastPropertyValue( sal_Int32 nHandle )
-            throw(::com::sun::star::beans::UnknownPropertyException,
-                  ::com::sun::star::lang::WrappedTargetException,
-                  ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XPropertyAccess
-    virtual ::com::sun::star::uno::Sequence<
-            ::com::sun::star::beans::PropertyValue > SAL_CALL
-        getPropertyValues()
-            throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL
-        setPropertyValues( const ::com::sun::star::uno::Sequence<
-                ::com::sun::star::beans::PropertyValue >& aProps )
-            throw(::com::sun::star::beans::UnknownPropertyException,
-                  ::com::sun::star::beans::PropertyVetoException,
-                  ::com::sun::star::lang::IllegalArgumentException,
-                  ::com::sun::star::lang::WrappedTargetException,
-                  ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XComponent
-    virtual void SAL_CALL
-        dispose()
-            throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL
-        addEventListener( const ::com::sun::star::uno::Reference<
-                ::com::sun::star::lang::XEventListener >& rxListener )
-            throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL
-        removeEventListener( const ::com::sun::star::uno::Reference<
-                ::com::sun::star::lang::XEventListener >& rxListener )
-            throw(::com::sun::star::uno::RuntimeException);
-
-
-    ////////////////////////////////////////////////////////////
-    // Service specific part
-    //
+    virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL
-        getImplementationName()
-            throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL
-        supportsService( const ::rtl::OUString& ServiceName )
-            throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw(::com::sun::star::uno::RuntimeException);
-
-
-    static inline ::rtl::OUString
-        getImplementationName_Static() throw();
-    static com::sun::star::uno::Sequence< ::rtl::OUString >
-        getSupportedServiceNames_Static() throw();
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+
+
+    static inline ::rtl::OUString getImplementationName_Static() throw();
+    static com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw();
 };
 
 inline ::rtl::OUString LinguProps::getImplementationName_Static() throw()