[Libreoffice-commits] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                             |    3 ++
 patches/dev300/file-load-no-extra-acl-check.diff |   25 +++++++++++++++++++++++
 2 files changed, 28 insertions(+)

New commits:
commit dca9dcaed8bc9c24a7016e4e7df4b9ec0621dc5c
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Nov 23 14:25:28 2010 -0500

    No extra ACL check when loading documents.
    
    Performing extra ACL check when loading document caused the
    Document in Use dialog NOT to appear when the document is
    accessed by a 2nd user and the document is located in a
    samba share.  This extra ACL check was originally placed as
    a temporary fix for i#102464, but it doesn't appear to be
    needed any more. (n#653747)
    
    * patches/dev300/apply:
    * patches/dev300/file-load-no-extra-acl-check.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a08ecec..304d6ec 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -4150,6 +4150,9 @@ calc-xls-import-cell-border.diff, n#636691, kohei
 # Copy manual row breaks on cloning the sheet
 calc-copy-manual-row-breaks.diff n#620015, bubli
 
+# Revert fix placed for i#102464 as it interferes with files in samba shares.
+file-load-no-extra-acl-check.diff, n#653747, kohei
+
 [ Netbook ]
 netbook-window-decoration-update.diff, n#621116, rodo
 
diff --git a/patches/dev300/file-load-no-extra-acl-check.diff b/patches/dev300/file-load-no-extra-acl-check.diff
new file mode 100644
index 0000000..17cad5e
--- /dev/null
+++ b/patches/dev300/file-load-no-extra-acl-check.diff
@@ -0,0 +1,25 @@
+diff --git sfx2/source/doc/docfile.cxx sfx2/source/doc/docfile.cxx
+index 55ac8bb..f960140 100644
+--- sfx2/source/doc/docfile.cxx
++++ sfx2/source/doc/docfile.cxx
+@@ -1177,6 +1177,12 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
+             catch( uno::Exception )
+             {}
+ 
++#if 0
++            // TODO: This extra ACL check was added as a fix to i#102464, but
++            // this appears to be unnecessary.  In fact, having this block
++            // surpresses the "Document in Use" dialog when someone tries to
++            // open a document already opened by someone, and the document is
++            // located in a samba share.
+             if ( !bContentReadonly )
+             {
+                 // the file is not readonly, check the ACL
+@@ -1185,6 +1191,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
+                 if ( ::utl::LocalFileHelper::ConvertURLToPhysicalName( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), aPhysPath ) )
+                     bContentReadonly = IsReadonlyAccordingACL( aPhysPath.GetBuffer() );
+             }
++#endif
+         }
+ 
+         // do further checks only if the file not readonly in fs