From 3f54ee1e5a87f22252efc303a97fe045bd242371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Thu, 18 Aug 2005 07:12:17 +0000 Subject: [PATCH] INTEGRATION: CWS macosx10 (1.8.20); FILE MERGED 2005/07/05 06:56:41 tra 1.8.20.1: #i25416#no need for hack #define osl_getThreadTextEncoding RTL_TEXTENCODING_UTF8 anymore on Mac OS X --- sal/osl/unx/file.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index e04fd9981a14..83efbcb25971 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -2,9 +2,9 @@ * * $RCSfile: file.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: kz $ $Date: 2005-05-31 17:07:41 $ + * last change: $Author: rt $ $Date: 2005-08-18 08:12:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -168,9 +168,6 @@ static const sal_Char* MOUNTTAB="/etc/mtab"; #include #define HAVE_STATFS_H - -#define osl_getThreadTextEncoding() RTL_TEXTENCODING_UTF8 - // add MACOSX Time Value #define TimeValue CFTimeValue