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

Michael Stahl mstahl at redhat.com
Tue Apr 14 14:55:25 PDT 2015


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

New commits:
commit 582cdc273ec0e91d27be8a7893994acadf4d7d18
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

diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index d0f9909..bb15fca 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");


More information about the Libreoffice-commits mailing list