[Libreoffice-commits] .: Branch 'integration/dev300_m101' - reportdesign/source

[Norbert Thiebaud]

 reportdesign/source/core/api/ReportDefinition.cxx |    1 -
 reportdesign/source/core/sdr/UndoEnv.cxx          |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit f1d22ca5fc03cb20bf6ebed7e7d8844b36bf2968
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Mar 12 20:58:29 2011 -0600

    fix mis-merge: no vso3 and use boost for hash

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 9962634..6adbf6f 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -123,7 +123,6 @@
 #include <unotools/streamwrap.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
-#include <vos/mutex.hxx>
 
 #include <boost/bind.hpp>
 #include <boost/mem_fn.hpp>
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index 51917c3..d315330 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -88,7 +88,7 @@ struct PropertyInfo
     }
 };
 
-typedef ::std::hash_map< ::rtl::OUString, PropertyInfo, ::rtl::OUStringHash >    PropertiesInfo;
+typedef ::boost::unordered_map< ::rtl::OUString, PropertyInfo, ::rtl::OUStringHash >    PropertiesInfo;
 
 struct ObjectInfo
 {