[Libreoffice-commits] .: 2 commits - setup_native/source

[Tor Lillqvist]

 setup_native/source/win32/customactions/rebase/rebase.cxx                      |    4 ++--
 setup_native/source/win32/customactions/shellextensions/registerextensions.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c9973db9b861210327153df266c8680079fff2cc
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon May 30 15:46:32 2011 +0300

    Add removed variable which now is used back

diff --git a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
index 8d44ec0..e903a04 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!";
commit 623777b3edfba0c3b57b0c0943241a60adadbff3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon May 30 15:45:57 2011 +0300

    Use boost::unordered_map instead of the non-std hash_map so that it compiles without stlport

diff --git a/setup_native/source/win32/customactions/rebase/rebase.cxx b/setup_native/source/win32/customactions/rebase/rebase.cxx
index c9fcb61..2d22e31 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, ... )