diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 13:00:12 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 13:00:12 +0000 |
| commit | 4d8b3883f49c6af65f43073adb90ca943a62477d (patch) | |
| tree | 54296eb6c64973aaab0d4c0510e6f13141ee3ef8 /goodies | |
| parent | 94d75d137f4666e0c9908aa757ea9cf92ebe3b3e (diff) | |
INTEGRATION: CWS cmcfixes44 (1.19.10); FILE MERGED
2008/04/24 07:25:38 cmc 1.19.10.1: #i88676# osl_freeProcessHandle is missing after a successful call to osl_executeProcess
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/filter.vcl/ieps/ieps.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/goodies/source/filter.vcl/ieps/ieps.cxx b/goodies/source/filter.vcl/ieps/ieps.cxx index f71446b535b1..7eee1606d511 100644 --- a/goodies/source/filter.vcl/ieps/ieps.cxx +++ b/goodies/source/filter.vcl/ieps/ieps.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ieps.cxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.20 $ * * This file is part of OpenOffice.org. * @@ -186,7 +186,8 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r oslFileHandle pOut = NULL; oslFileHandle pErr = NULL; oslProcessError eErr = osl_executeProcess_WithRedirectedIO(fileName.pData, - args, sizeof(args)/sizeof(rtl_uString *), osl_Process_SEARCHPATH, + args, sizeof(args)/sizeof(rtl_uString *), + osl_Process_SEARCHPATH | osl_Process_HIDDEN, osl_getCurrentSecurity(), 0, 0, 0, &aProcess, &pIn, &pOut, &pErr); if (eErr!=osl_Process_E_None) return false; @@ -214,6 +215,8 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r if (GraphicConverter::Import(aFile, rGraphic, CVT_EMF) == ERRCODE_NONE) bRet = true; } + osl_joinProcess(aProcess); + osl_freeProcessHandle(aProcess); return bRet; } @@ -225,7 +228,7 @@ static bool RenderAsPNGThroughHelper(const sal_uInt8* pBuf, sal_uInt32 nBytesRea oslFileHandle pOut = NULL; oslFileHandle pErr = NULL; oslProcessError eErr = osl_executeProcess_WithRedirectedIO(rProgName.pData, - pArgs, nArgs, osl_Process_SEARCHPATH, + pArgs, nArgs, osl_Process_SEARCHPATH | osl_Process_HIDDEN, osl_getCurrentSecurity(), 0, 0, 0, &aProcess, &pIn, &pOut, &pErr); if (eErr!=osl_Process_E_None) return false; @@ -257,6 +260,8 @@ static bool RenderAsPNGThroughHelper(const sal_uInt8* pBuf, sal_uInt32 nBytesRea } if (pOut) osl_closeFile(pOut); if (pErr) osl_closeFile(pErr); + osl_joinProcess(aProcess); + osl_freeProcessHandle(aProcess); return bRet; } |