#80600# ConfigItem UNIX conform

2 files changed, 21 insertions, 11 deletions

diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 038f13ff68ba..e683fe239088 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: lngopt.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: tl $ $Date: 2000-11-28 03:12:32 $
+ *  last change: $Author: os $ $Date: 2000-11-28 12:21:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -210,7 +210,7 @@ LinguOptionsData::LinguOptionsData()
 }
 
 
-Sequence< OUString > GetPropertyNames( INT16 nCfgItem )
+Sequence< OUString > LinguOptConfig::GetPropertyNames( INT16 nCfgItem )
 {
     static const char * aPropNames1[] =
     {
@@ -285,10 +285,10 @@ BOOL LinguOptionsData::LoadConfig()
 
     for( INT16 nCfgItem = 0; nCfgItem < 4; ++nCfgItem )
     {
-        Sequence< OUString > aNames = GetPropertyNames( nCfgItem );
+        LinguOptConfig aCfg( String::CreateFromAscii( aRootNames[ nCfgItem ]));
+        Sequence< OUString > aNames = aCfg.GetPropertyNames( nCfgItem );
         INT32 nProps = aNames.getLength();
 
-        LinguOptConfig aCfg( String::CreateFromAscii( aRootNames[ nCfgItem ]));
 
         const Sequence< Any > aValues = aCfg.GetProperties( aNames );
 
@@ -355,7 +355,8 @@ BOOL LinguOptionsData::SaveConfig()
 
     for( INT16 nCfgItem = 0; nCfgItem < 4; ++nCfgItem )
     {
-        const Sequence< OUString > aNames = GetPropertyNames( nCfgItem );
+        LinguOptConfig aCfg( String::CreateFromAscii( aRootNames[ nCfgItem ]));
+        const Sequence< OUString > aNames = aCfg.GetPropertyNames( nCfgItem );
         INT32 nProps = aNames.getLength();
         Sequence< Any > aValues( aNames.getLength() );
         Any *pValue = aValues.getArray();
@@ -406,7 +407,6 @@ BOOL LinguOptionsData::SaveConfig()
             break;
         }
 
-        LinguOptConfig aCfg( String::CreateFromAscii( aRootNames[ nCfgItem ]));
         bRet |= aCfg.PutProperties( aNames, aValues );
     }
 
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 4852667402ff..6926d19ef0c0 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: lngopt.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: tl $ $Date: 2000-11-28 03:12:44 $
+ *  last change: $Author: os $ $Date: 2000-11-28 12:21:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -132,8 +132,18 @@ public:
     LinguOptConfig( const String& rPath ) :
         ConfigItem( rPath )
     {}
-    ConfigItem::GetProperties;
-    ConfigItem::PutProperties;
+    ::com::sun::star::uno::Sequence< rtl::OUString > GetPropertyNames( INT16 nCfgItem );
+
+    com::sun::star::uno::Sequence< com::sun::star::uno::Any >
+        GetProperties(const ::com::sun::star::uno::Sequence< rtl::OUString >& rNames )
+            {return ConfigItem::GetProperties(rNames);}
+
+    sal_Bool PutProperties(
+        const ::com::sun::star::uno::Sequence< rtl::OUString >& rNames,
+        const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rValues)
+        {
+            return ConfigItem::PutProperties( rNames, rValues);
+        }
 };