[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source

Michael Stahl mstahl at redhat.com
Mon Jun 27 20:21:45 UTC 2016


 sw/source/uibase/dbui/dbmgr.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit f1dc76532638a5093b878919a3c7dd3aa5d22f09
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Jun 27 17:28:05 2016 +0200

    tdf#100495 sw: Exchange Database shouldn't delete the created odb file
    
    (regression from f01f31201f9b26b3071ab25f9a5a3a0311ff7423)
    
    Change-Id: Ie5b83a82711229bda045b7ef7a9167cfd873f616
    (cherry picked from commit 5a042dad2779eefc76269e14b888bd84df590aac)
    Reviewed-on: https://gerrit.libreoffice.org/26723
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index bfe28a3..abcf707 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2698,7 +2698,6 @@ OUString SwDBManager::LoadAndRegisterDataSource(const DBConnURITypes type, const
                 // Cannot embed, as embedded data source would need the URL of the parent document.
                 OUString sHomePath(SvtPathOptions().GetWorkPath());
                 utl::TempFile aTempFile(sNewName, true, &sOutputExt, pDestDir ? pDestDir : &sHomePath);
-                aTempFile.EnableKillingFile();
                 OUString sTmpName = aTempFile.GetURL();
                 xStore->storeAsURL(sTmpName, uno::Sequence<beans::PropertyValue>());
             }


More information about the Libreoffice-commits mailing list