[ooo-build-commit] Branch 'ooo/OOO310' - comphelper/source

[Jan Holesovsky]

 comphelper/source/misc/mediadescriptor.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit abb60ffc369b3c23764f50d019fbe66f171eb9ad
Author: Oliver Bolte <obo at openoffice.org>
Date:   Wed Aug 5 12:39:09 2009 +0000

    CWS-TOOLING: integrate CWS gciteratorfix
    2009-08-04 10:23:19 +0200 od  r274608 : add missing patch flags for libaries swui, msword and xo
    2009-08-03 16:42:48 +0200 mav  r274586 : #i101899# workaround the wrong error code on MAC
    2009-08-03 13:24:44 +0200 tl  r274575 : #i103936# fix for grammar checking loop
    2009-08-03 12:37:37 +0200 tl  r274573 : #i103936# fix for grammar checking loop
    2009-08-03 12:10:01 +0200 tl  r274572 : #i103936# fix for grammar checking loop
    2009-08-03 09:06:49 +0200 tl  r274565 : #i103936# fix for grammar checking loop
    2009-08-03 09:04:50 +0200 tl  r274564 : #i103936# fix for grammar checking loop
    2009-07-31 17:52:45 +0200 tl  r274545 : #i103936# fix for grammar checking loop

diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index c6ee692..edf3c19 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -726,8 +726,13 @@ class StillReadWriteInteraction : public ::ucbhelper::InterceptedInteraction
                     css::ucb::InteractiveIOException exIO;
                     xRequest->getRequest() >>= exIO;
                     bAbort = (
-                                (exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED     ) ||
-                                (exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
+                                (exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED     )
+                             || (exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
+#ifdef MACOSX
+                             // this is a workaround for MAC, on this platform if the file is locked
+                             // the returned error code looks to be wrong
+                             || (exIO.Code == css::ucb::IOErrorCode_GENERAL )
+#endif
                             );
                 }
                 break;