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

[Michael Stahl]

 svx/source/core/extedit.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 16547edcaf1d7e260bb5e1d9d48b35f58514647c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Apr 14 23:40:06 2015 +0200

    tdf#89750: svx: fix ExternalToolEdit on Windows
    
    While adding check that the temp file move succeeds, overlooked that the
    file handle is actually leaked, which means the move will fail on WNT
    because the file is already open.
    
    (regression from ef490df2119523e1761f99b5fdbb387c2c71608d)
    
    Change-Id: I779ccde79871930fef3bad7e17b633fb62e36a46
    (cherry picked from commit 582cdc273ec0e91d27be8a7893994acadf4d7d18)
    Reviewed-on: https://gerrit.libreoffice.org/15315
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index 1511fdf..67bd9f0 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -113,9 +113,8 @@ void ExternalToolEdit::Edit(GraphicObject const*const pGraphicObject)
     OUString aTempFileBase;
     OUString aTempFileName;
 
-    oslFileHandle pHandle;
     osl::FileBase::RC rc =
-        osl::FileBase::createTempFile(0, &pHandle, &aTempFileBase);
+        osl::FileBase::createTempFile(nullptr, nullptr, &aTempFileBase);
     if (osl::FileBase::E_None != rc)
     {
         SAL_WARN("svx", "ExternalToolEdit::Edit: cannot create temp file");