From e5111574fd904b38a3980ca4ea3d21cfcb22dea6 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 20 Nov 2012 15:36:42 +0000 Subject: Revert "sb140: sb140: #i116981# clean up memory upon exit" This reverts commit 2d5dd9a9604aeb5fd4e347d7a46acc11da9985a5. Conflicts: sal/inc/rtl/bootstrap.h sal/rtl/source/bootstrap.cxx --- sal/inc/rtl/bootstrap.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sal/inc/rtl/bootstrap.h') diff --git a/sal/inc/rtl/bootstrap.h b/sal/inc/rtl/bootstrap.h index 6e3fc4aee708..98c3de55ef9e 100644 --- a/sal/inc/rtl/bootstrap.h +++ b/sal/inc/rtl/bootstrap.h @@ -124,8 +124,7 @@ extern "C" { If it is never called, the filename is based on the name of the executable, with the suffix ".ini" on Windows or "rc" on Unix. - @param pFileUri URL of the ini file; must not be null, must not be the empty - string + @param pNameUri URL of the inifile with path but WITHOUT suffix (.ini or rc) */ SAL_DLLPUBLIC void SAL_CALL rtl_bootstrap_setIniFileName( rtl_uString *pFileUri ) SAL_THROW_EXTERN_C(); -- cgit