[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sfx2/source

[Caolán McNamara]

 sfx2/source/doc/docfile.cxx |   29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

New commits:
commit 4efffd86ee2d87e9d5a276d0525108fed0828d62
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 21 16:05:04 2013 +0100

    Resolves: fdo#65501 ensure configured backup dir exists before using it
    
    the ucb stuff is the most god awful painful api ever
    
    Change-Id: I491d2cb9b7d5d37723b32f0a26a22a09c16bc02e
    (cherry picked from commit ecdd9d1a47587aa7557c1b151010c78efa90fef2)
    Reviewed-on: https://gerrit.libreoffice.org/4433
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 746ba20..25b7f27 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2126,6 +2126,25 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont
         aTransactTemp.EnableKillingFile( true );
 }
 
+bool ensureFolder(
+    uno::Reference< uno::XComponentContext > xCtx,
+    uno::Reference< ucb::XCommandEnvironment > xEnv,
+    const OUString& rFolder, ucbhelper::Content & result)
+{
+    INetURLObject aURL( rFolder );
+    OUString aTitle = aURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
+    aURL.removeSegment();
+    ::ucbhelper::Content aParent;
+
+    if ( ::ucbhelper::Content::create( aURL.GetMainURL( INetURLObject::NO_DECODE ),
+                              xEnv, xCtx, aParent ) )
+    {
+        return ::utl::UCBContentHelper::MakeFolder(aParent, aTitle, result);
+    }
+
+    return false;
+}
+
 //------------------------------------------------------------------
 void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalContent )
 {
@@ -2139,9 +2158,13 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont
     sal_Int32 nPrefixLen = aFileName.lastIndexOf( '.' );
     String aPrefix = ( nPrefixLen == -1 ) ? aFileName : aFileName.copy( 0, nPrefixLen );
     String aExtension = ( nPrefixLen == -1 ) ? String() : String(aFileName.copy( nPrefixLen ));
-       String aBakDir = SvtPathOptions().GetBackupPath();
+    String aBakDir = SvtPathOptions().GetBackupPath();
 
-    DoInternalBackup_Impl( aOriginalContent, aPrefix, aExtension, aBakDir );
+    // create content for the parent folder ( = backup folder )
+    ::ucbhelper::Content  aContent;
+    Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
+    if( ensureFolder(comphelper::getProcessComponentContext(), xEnv, aBakDir, aContent) )
+        DoInternalBackup_Impl( aOriginalContent, aPrefix, aExtension, aBakDir );
 
     if ( pImp->m_aBackupURL.isEmpty() )
     {
@@ -2180,7 +2203,7 @@ void SfxMedium::DoBackup_Impl()
         // create content for the parent folder ( = backup folder )
         ::ucbhelper::Content  aContent;
         Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
-        if( ::ucbhelper::Content::create( aBakDir, xEnv, comphelper::getProcessComponentContext(), aContent ) )
+        if( ensureFolder(comphelper::getProcessComponentContext(), xEnv, aBakDir, aContent) )
         {
             // save as ".bak" file
             INetURLObject aDest( aBakDir );