From b76cb86eaa0aec1d02c5ff29c5a43e1e7a675b27 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Wed, 9 Sep 2009 09:38:41 +0000
Subject: CWS-TOOLING: integrate CWS mhu20 2009-09-01 15:18:43 +0200 mhu 
 r275662 : #i32526# Fixed missing includes, and a wrong cast 2009-08-28
 13:30:05 +0200 mhu  r275530 : #i32526# Fixed missing includes and remaining
 merge conflicts. 2009-08-28 13:28:45 +0200 mhu  r275529 : #i32526#
 osl_readLine() now implemented in sal/osl/<platform>/file.cxx 2009-08-26
 19:47:53 +0200 mhu  r275445 : CWS-TOOLING: rebase CWS mhu20 to trunk@275331
 (milestone: DEV300:m56) 2009-08-25 15:47:00 +0200 mhu  r275365 : #i32526#
 Also maintain phys. file offset. 2009-08-25 15:24:56 +0200 mhu  r275364 :
 #i32526# Added buffered file I/O; refactored file.cxx into multiple files.
 2009-08-24 10:38:15 +0200 mhu  r275294 : #i32526# Correct OpenFlags for
 osl_openFile(). 2009-05-25 11:07:34 +0200 mhu  r272225 : #i32526# Added
 support for non-seekable file handles (pipe et al.). 2009-05-25 11:01:50
 +0200 mhu  r272223 : #i32526# Add osl_readLine() test, cleanup obsolete
 tests. 2009-05-25 10:56:14 +0200 mhu  r272221 : #i32526# Add missing include
 2009-05-25 10:48:51 +0200 mhu  r272220 : #i32526# Accept OpenJDK (IcedTea6)
 1.6.0_0 version string 2009-05-15 19:18:20 +0200 mhu  r271965 : #i32526#
 Initial osl/unx buffered file I/O implementation. 2009-05-15 17:41:57 +0200
 mhu  r271959 : CWS-TOOLING: rebase CWS mhu20 to trunk@271830 (milestone:
 DEV300:m48) 2009-03-26 17:28:53 +0100 mhu  r270091 : CWS-TOOLING: rebase CWS
 mhu20 to trunk@270033 (milestone: DEV300:m45)

---
 store/source/lockbyte.cxx |  2 +-
 store/workben/makefile.mk | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'store')

diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index a38aa768908d..a03628bfb740 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -297,7 +297,7 @@ struct FileHandle
         if (result == osl_File_E_EXIST)
         {
             // Already existing (O_CREAT | O_EXCL).
-            result = osl_openFile (aFileUrl.pData, &m_handle, osl_File_OpenFlag_Write);
+            result = osl_openFile (aFileUrl.pData, &m_handle, osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
             if ((result == osl_File_E_None) && (eAccessMode == store_AccessCreate))
             {
                 // Truncate existing file.
diff --git a/store/workben/makefile.mk b/store/workben/makefile.mk
index 334585710522..4b58d26409a0 100644
--- a/store/workben/makefile.mk
+++ b/store/workben/makefile.mk
@@ -93,11 +93,12 @@ APP3STDLIBS=	$(STOREDBGLIB)
 APP3STDLIBS+=	$(SALLIB)
 APP3DEPN=	$(STOREDBGLIB)
 
- APP4TARGET=		t_store
- APP4OBJS=		$(OBJ)$/t_store.obj
- APP4STDLIBS=	$(STORELIB)
- APP4STDLIBS+=	$(SALLIB)
- APP4DEPN=	$(SLB)$/store.lib
+APP4TARGET=		t_store
+APP4OBJS=		$(OBJ)$/t_store.obj
+APP4STDLIBS=	$(STORELIB)
+APP4STDLIBS+=	$(SALLIB)
+APP4DEPN=	$(SLB)$/store.lib
+APP4RPATH=	UREBIN
 
  APP5TARGET=		t_leak
  APP5OBJS=		$(OBJ)$/t_leak.obj
-- 
cgit