summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2013-03-04 16:56:53 +0100
committerPetr Mladek <pmladek@suse.cz>2013-03-04 16:56:53 +0100
commit08e4a33966786b29550406fbd20ec8bb4f04d5b4 (patch)
tree1b184355689670680ac48eeefb4144babc76bea9 /basic
parentbafef6a9e36380c7c75169e600632914fe099453 (diff)
parent5b932053079c0ed73ea23fd802d5f2f7c291ec25 (diff)
Merge tag 'libreoffice-3.6.5.2' into suse-3.6
Tag libreoffice-3.6.5.2 Conflicts: editeng/source/editeng/impedit3.cxx instsetoo_native/util/openoffice.lst oovbaapi/UnoApi_oovbaapi.mk sc/source/filter/oox/workbookhelper.cxx sc/source/ui/app/scmod.cxx sc/source/ui/cctrl/checklistmenu.cxx solenv/inc/minor.mk writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx writerfilter/source/dmapper/PropertyMap.cxx Change-Id: I7ea70b82b3b874cbe78354d5dd97307e63842e72
Diffstat (limited to 'basic')
-rw-r--r--basic/source/runtime/methods.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index d54c5063fe8f..fbf688363892 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3294,7 +3294,11 @@ RTLFUNC(Shell)
NULL, 0,
&pApp ) == osl_Process_E_None;
- osl_freeProcessHandle( pApp );
+ // 53521 only free process handle on success
+ if (bSucc)
+ {
+ osl_freeProcessHandle( pApp );
+ }
for(int j = 0; i < nParamCount; i++)
{