#83878# Replaced '__store_getProcessTextEncoding' by 'osl_getThreadTextEncoding'.

3 files changed, 28 insertions, 75 deletions

diff --git a/store/workben/t_base.cxx b/store/workben/t_base.cxx
index 078bf1aea..c2ebc9272 100644
--- a/store/workben/t_base.cxx
+++ b/store/workben/t_base.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: t_base.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:18:32 $
+ *  last change: $Author: mhu $ $Date: 2001-02-26 14:21:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -54,17 +54,21 @@
  *
  *  All Rights Reserved.
  *
- *  Contributor(s): _______________________________________
+ *  Contributor(s): Matthias Huetsch <matthias.huetsch@sun.com>
  *
  *
  ************************************************************************/
 
-#define _T_BASE_CXX "$Revision: 1.1.1.1 $"
+#define _T_BASE_CXX "$Revision: 1.2 $"
 
 #ifndef _SAL_TYPES_H_
 #include <sal/types.h>
 #endif
 
+#ifndef _OSL_THREAD_H_
+#include <osl/thread.h>
+#endif
+
 #ifndef _RTL_MEMORY_H_
 #include <rtl/memory.h>
 #endif
@@ -173,6 +177,7 @@ static storeError __store_namei (
     const NAMESPACE_RTL(OString) &rName,
     OStorePageKey     &rKey)
 {
+    return store_E_Unknown;
 }
 
 static storeError __store_namei (
@@ -288,26 +293,6 @@ static void __store_testUnicode (const sal_Char *pszFilename)
 
 /*========================================================================
  *
- * __store_getProcessTextEncoding.
- *
- *======================================================================*/
-inline rtl_TextEncoding __store_getProcessTextEncoding (void)
-{
-    rtl_TextEncoding eEncoding;
-#if defined(SAL_OS2)
-    eEncoding = RTL_TEXTENCODING_IBM850;
-#elif defined(SAL_UNX)
-    eEncoding = RTL_TEXTENCODING_ISO8859_1;
-#elif defined(SAL_W32)
-    eEncoding = RTL_TEXTENCODING_MS_1252;
-#else
-    eEncoding = RTL_TEXTENCODING_ASCII_US;
-#endif
-    return eEncoding;
-}
-
-/*========================================================================
- *
  * main.
  *
  *======================================================================*/
@@ -326,7 +311,7 @@ int SAL_CALL main (int argc, char **argv)
 
     NAMESPACE_RTL(OUString) aFilename (
         argv[1], rtl_str_getLength(argv[1]),
-        __store_getProcessTextEncoding());
+        osl_getThreadTextEncoding());
 
     storeError eErrCode = xLockBytes->create (
         aFilename.pData, store_AccessReadCreate);
diff --git a/store/workben/t_file.cxx b/store/workben/t_file.cxx
index eddebc8db..a1c9cba1d 100644
--- a/store/workben/t_file.cxx
+++ b/store/workben/t_file.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: t_file.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:18:32 $
+ *  last change: $Author: mhu $ $Date: 2001-02-26 14:21:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -54,17 +54,21 @@
  *
  *  All Rights Reserved.
  *
- *  Contributor(s): _______________________________________
+ *  Contributor(s): Matthias Huetsch <matthias.huetsch@sun.com>
  *
  *
  ************************************************************************/
 
-#define _T_FILE_CXX "$Revision: 1.1.1.1 $"
+#define _T_FILE_CXX "$Revision: 1.2 $"
 
 #ifndef _SAL_TYPES_H_
 #include <sal/types.h>
 #endif
 
+#ifndef _OSL_THREAD_H_
+#include <osl/thread.h>
+#endif
+
 #ifndef _RTL_USTRING_HXX_
 #include <rtl/ustring.hxx>
 #endif
@@ -86,26 +90,6 @@ using namespace store;
 
 /*========================================================================
  *
- * __store_getProcessTextEncoding.
- *
- *======================================================================*/
-inline rtl_TextEncoding __store_getProcessTextEncoding (void)
-{
-    rtl_TextEncoding eEncoding;
-#if defined(SAL_OS2)
-    eEncoding = RTL_TEXTENCODING_IBM850;
-#elif defined(SAL_UNX)
-    eEncoding = RTL_TEXTENCODING_ISO8859_1;
-#elif defined(SAL_W32)
-    eEncoding = RTL_TEXTENCODING_MS_1252;
-#else
-    eEncoding = RTL_TEXTENCODING_ASCII_US;
-#endif
-    return eEncoding;
-}
-
-/*========================================================================
- *
  * main.
  *
  *======================================================================*/
@@ -120,7 +104,7 @@ int SAL_CALL main (int argc, char **argv)
 
     NAMESPACE_RTL(OUString) aFilename (
         argv[1], rtl_str_getLength(argv[1]),
-        __store_getProcessTextEncoding());
+        osl_getThreadTextEncoding());
 
     storeError eErrCode = xLockBytes->create (
         aFilename.pData, store_AccessReadWrite);
diff --git a/store/workben/t_store.cxx b/store/workben/t_store.cxx
index d017e92dd..25dee3f7e 100644
--- a/store/workben/t_store.cxx
+++ b/store/workben/t_store.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: t_store.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:18:32 $
+ *  last change: $Author: mhu $ $Date: 2001-02-26 14:21:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -54,19 +54,23 @@
  *
  *  All Rights Reserved.
  *
- *  Contributor(s): _______________________________________
+ *  Contributor(s): Matthias Huetsch <matthias.huetsch@sun.com>
  *
  *
  ************************************************************************/
 
-#define _T_STORE_CXX "$Revision: 1.1.1.1 $"
+#define _T_STORE_CXX "$Revision: 1.2 $"
 
 #ifndef _SAL_TYPES_H_
 #include <sal/types.h>
 #endif
+
 #ifndef _OSL_TIME_H_
 #include <osl/time.h>
 #endif
+#ifndef _OSL_THREAD_H_
+#include <osl/thread.h>
+#endif
 
 #ifndef _RTL_CHAR_H_
 #include <rtl/char.h>
@@ -263,26 +267,6 @@ sal_Bool DirectoryTraveller::visit (const iter& it)
 
 /*========================================================================
  *
- * __store_getProcessTextEncoding.
- *
- *======================================================================*/
-inline rtl_TextEncoding __store_getProcessTextEncoding (void)
-{
-    rtl_TextEncoding eEncoding;
-#if defined(SAL_OS2)
-    eEncoding = RTL_TEXTENCODING_IBM850;
-#elif defined(SAL_UNX)
-    eEncoding = RTL_TEXTENCODING_ISO8859_1;
-#elif defined(SAL_W32)
-    eEncoding = RTL_TEXTENCODING_MS_1252;
-#else
-    eEncoding = RTL_TEXTENCODING_ASCII_US;
-#endif
-    return eEncoding;
-}
-
-/*========================================================================
- *
  * main.
  *
  *======================================================================*/
@@ -348,7 +332,7 @@ int SAL_CALL main (int argc, char **argv)
             {
                 OUString aName (
                     argv[i], rtl_str_getLength(argv[i]),
-                    __store_getProcessTextEncoding());
+                    osl_getThreadTextEncoding());
                 if ((nOptions & OPTION_CREAT) && (nOptions & OPTION_TRUNC))
                     eErrCode = aFile.create (aName, store_AccessCreate);
                 else if (nOptions & OPTION_CREAT)