[Libreoffice-commits] core.git: sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/doc/objstor.cxx |   14 --------------
 1 file changed, 14 deletions(-)

New commits:
commit 144da6d5079bcd435e6637cb5cf95305f3ec1306
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Oct 12 03:41:36 2018 +0300
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Fri Oct 12 03:56:51 2018 +0300

    We don't need to handle iOS specially in DisconnectStorage_Impl() after all
    
    Now that we make sure UserInstallation/user directory exists, a
    "backup" directory will be created there, and the edited document's
    backup file placed in it, and not beside the original document
    location (which wouldn't work on iOS).
    
    Change-Id: Ibc0a6e7f0b596cc3d02774878cd8c3d53fda0c3e

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 8181e1336a8a..554fb0100cf3 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1743,19 +1743,6 @@ bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMedium& r
     uno::Reference< embed::XStorage > xStorage = rSrcMedium.GetStorage();
 
     bool bResult = false;
-#ifdef IOS
-    // On iOS, we typically can't create a backup file in the same folder as where the document is
-    // because that is outside the sandbox, like "/private/var/mobile/Library/Mobile
-    // Documents/com~apple~CloudDocs" for documents opened from the iCloud Drive. So bypass this
-    // whole backup dance for now.
-
-    // FIXME: Also, should investigate whether iOS has some native high-level API that can be used
-    // for automatic keeping of some suitable number of backup copies from various pooints in time,
-    // or something. Although, even if it has, marrying that to the horrible mess here in sfx2, and
-    // in ucb, sal, etc won't be fun.
-    (void) rTargetMedium;
-    bResult = true;
-#else
     if ( xStorage == pImpl->m_xDocStorage )
     {
         try
@@ -1794,7 +1781,6 @@ bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMedium& r
         catch ( uno::Exception& )
         {}
     }
-#endif // !IOS
     return bResult;
 }