[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - shell/source

Tor Lillqvist tml at collabora.com
Thu Oct 24 10:16:54 PDT 2013


 shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6dfe65a4f588e7698d84516abe339cd7b520329e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Oct 4 19:36:57 2013 +0200

    fdo#67534: try to avoid file locking in Explorer shell extensions
    
    Change-Id: I287395f6c25b1bfb9b9482166ae6f34d9af8f455

diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index 3b77d28..f1fb321 100644
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -106,7 +106,8 @@ long BufferStream::sseek (long offset, int origin)
 FileStream::FileStream(const char *filename) :
     file(0)
 {
-    file = fopen(filename, "rb");
+    // fdo#67534: avoid locking to not interfere with soffice opening the file
+    file = _fsopen(filename, "rb", _SH_DENYNO);
 }
 
 FileStream::~FileStream()


More information about the Libreoffice-commits mailing list