diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 20:58:29 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 20:58:29 -0600 |
| commit | f1d22ca5fc03cb20bf6ebed7e7d8844b36bf2968 (patch) | |
| tree | bcecf998f16e39c932828bced3568bae5eccaa37 | |
| parent | d8021d7d67ced311667c65eae6ae9891841dc5cf (diff) | |
fix mis-merge: no vso3 and use boost for hashintegration/dev300_m101
| -rw-r--r-- | reportdesign/source/core/api/ReportDefinition.cxx | 1 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/UndoEnv.cxx | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 996263447..6adbf6f73 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 51917c3d1..d31533077 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 { |