diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:39:49 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:39:49 +0000 |
| commit | 4ecde85354eba62cd038143f5688182d40e4ae6a (patch) | |
| tree | 4abce81c190932a98d4670191b7661ca59c245a3 /tools | |
| parent | 8a4d3858d92a2205032eea2359d4405c5f669b1e (diff) | |
INTEGRATION: CWS os2port03 (1.10.54); FILE MERGED
2008/07/16 13:45:49 obr 1.10.54.2: RESYNC: (1.10-1.12); FILE MERGED
2008/01/29 16:33:12 ydario 1.10.54.1: More os2 fixes from 2.0 tree.
Issue number:i85203
Submitted by:ydario
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/fsys/tdir.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx index 303afbb18426..dc487c561919 100644 --- a/tools/source/fsys/tdir.cxx +++ b/tools/source/fsys/tdir.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tdir.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -360,7 +360,7 @@ void Dir::Reset() #endif // gibt es das zu oeffnende Verzeichnis ueberhaupt? -#ifndef UNX //explanation: see DirReader_Impl::Read() in unx.cxx +#if !defined(UNX) && !defined(OS2) //explanation: see DirReader_Impl::Read() in unx.cxx if( !pReader->pDosDir ) { nError = FSYS_ERR_NOTADIRECTORY; |