summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-03-12 20:58:29 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-03-12 20:58:29 -0600
commite35c56815d43a06c53488e3efa35f062a6a2d60c (patch)
treea5eea2ab1d1f2a4713dc4f32b044e51e6005ea08 /reportdesign
parent1f9060d1e01be5f4f830ee772950d0a98b362064 (diff)
fix mis-merge: no vso3 and use boost for hash
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx1
-rw-r--r--reportdesign/source/core/sdr/UndoEnv.cxx2
2 files changed, 1 insertions, 2 deletions
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 5a13e4e01405..3b14a9e34644 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 79728e30b46a..b21a3c91278d 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
{