[Libreoffice-commits] .: patches/dev300

[Jan Holesovsky]

 patches/dev300/apply                             |    3 ---
 patches/dev300/unotools-tempfile-nonlocking.diff |   20 --------------------
 2 files changed, 23 deletions(-)

New commits:
commit 2c9b19ec06cd167b55a01b5fe00977dfb2d0d5fb
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Oct 15 11:01:58 2010 +0200

    unotools-tempfile-nonlocking.diff moved to LO.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index aacacd1..264a0d0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2240,9 +2240,6 @@ system-lpsolve-rpath.diff, rengelha
 # add missing patch to upstreamed ppt gradient fix
 ppt-customshape-shading-fix.diff, i#102797, thorsten
 
-# fix saving tempfiles when locking is not supported
-unotools-tempfile-nonlocking.diff, n#560877, i#107511, jholesov
-
 # make dlopen-ed libs to use the global namespace for symbol
 # resolution
 dlopen-global-symbols.diff, thorsten
diff --git a/patches/dev300/unotools-tempfile-nonlocking.diff b/patches/dev300/unotools-tempfile-nonlocking.diff
deleted file mode 100644
index d30df9d..0000000
--- a/patches/dev300/unotools-tempfile-nonlocking.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- unotools/source/ucbhelper/tempfile.cxx |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git unotools/source/ucbhelper/tempfile.cxx unotools/source/ucbhelper/tempfile.cxx
-index 530892a..b8ae1e7 100644
---- unotools/source/ucbhelper/tempfile.cxx
-+++ unotools/source/ucbhelper/tempfile.cxx
-@@ -306,7 +306,7 @@ void lcl_createName(TempFile_Impl& _rImpl,const String& rLeadingChars,sal_Bool _
- #ifdef UNX
- umask(old_mode);
- #endif
--            if ( err == FileBase::E_None )
-+            if ( err == FileBase::E_None || err == FileBase::E_NOLCK )
-             {
-                 _rImpl.aName = aTmp;
-                 aFile.close();
--- 
-1.7.0.1
-