diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:46:29 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:46:29 +0200 |
| commit | 36472f4f40ea3da60c4dddc8fe885a3a67262e51 (patch) | |
| tree | f4d49ed05b4b441caae15c42a235266569ece293 /setup_native/source | |
| parent | 94a0ea6b9eeaef219114091da479063227243ebd (diff) | |
| parent | f4def585fa3b6ea29e2ee9d179b151956644cfa9 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/components
Diffstat (limited to 'setup_native/source')
| -rw-r--r-- | setup_native/source/win32/customactions/rebase/rebase.cxx | 4 | ||||
| -rw-r--r-- | setup_native/source/win32/customactions/shellextensions/registerextensions.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/setup_native/source/win32/customactions/rebase/rebase.cxx b/setup_native/source/win32/customactions/rebase/rebase.cxx index 601af93dd20a..ad3686c52b3d 100644 --- a/setup_native/source/win32/customactions/rebase/rebase.cxx +++ b/setup_native/source/win32/customactions/rebase/rebase.cxx @@ -20,11 +20,11 @@ #include <malloc.h> #include <time.h> #include <string> -#include <hash_map> +#include <boost/unordered_map.hpp> const DWORD PE_Signature = 0x00004550; typedef std::pair< std::string, bool > StringPair; -typedef std::hash_map< std::string, bool > ExcludeLibsMap; +typedef boost::unordered_map< std::string, bool > ExcludeLibsMap; #ifdef DEBUG static void OutputDebugStringFormat( LPCSTR pFormat, ... ) diff --git a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx index 8139bb664e9e..28ea3998e76f 100644 --- a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx +++ b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx @@ -215,7 +215,7 @@ extern "C" UINT __stdcall RegisterExtensions(MSIHANDLE handle) std::_tstring sCommand = sUnoPkgFile + " sync"; DWORD exitCode = 0; - ExecuteCommand( sCommand.c_str(), & exitCode); + bool fSuccess = ExecuteCommand( sCommand.c_str(), & exitCode); if ( ! fSuccess ) { mystr = "ERROR: An error occured during registration of extensions!"; |