diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-05 18:34:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-05 18:36:22 +0100 |
| commit | 895e6e7bb7abddb135f6fe3cfef1505261d4cbc6 (patch) | |
| tree | 07e906292f1e9ecc47b49603a920ddc28c41d91c /include | |
| parent | 0c55303581156d01992d9d958ac5f7aafc4a3ebb (diff) | |
Get rid of comphelper::UStringLess
...default std::less<OUString> is just fine.
Change-Id: Ib9d3c10f2817d757f3c19eb3d4607095883af91a
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/stl_types.hxx | 9 | ||||
| -rw-r--r-- | include/xmloff/txtimp.hxx | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx index 9d129c2ab21c..228da5b443a6 100644 --- a/include/comphelper/stl_types.hxx +++ b/include/comphelper/stl_types.hxx @@ -44,12 +44,6 @@ namespace comphelper //======================================================================== // comparison functors -//------------------------------------------------------------------------ -struct UStringLess : public ::std::binary_function< OUString, OUString, bool> -{ - bool operator() (const OUString& x, const OUString& y) const { return x < y ? true : false;} // construct prevents a MSVC6 warning -}; -//------------------------------------------------------------------------ struct UStringMixLess : public ::std::binary_function< OUString, OUString, bool> { bool m_bCaseSensitive; @@ -257,7 +251,8 @@ OutputIter intersperse( DECLARE_STL_ITERATORS(classname) \ #define DECLARE_STL_USTRINGACCESS_MAP(valuetype, classname) \ - DECLARE_STL_MAP(OUString, valuetype, ::comphelper::UStringLess, classname) \ + typedef std::map< OUString, valuetype > classname; \ + DECLARE_STL_ITERATORS(classname) #endif // INCLUDED_COMPHELPER_STL_TYPES_HXX diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index 99e10bc07d4b..75049eff9318 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -30,7 +30,6 @@ #include <boost/scoped_ptr.hpp> #include <xmloff/xmltkmap.hxx> -#include <comphelper/stl_types.hxx> #include <xmloff/uniref.hxx> class XMLTextListsHelper; @@ -662,7 +661,7 @@ public: virtual void endAppletOrPlugin( const com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> &rPropSet, - ::std::map < const OUString, OUString, ::comphelper::UStringLess > &rParamMap ); + ::std::map < const OUString, OUString > &rParamMap ); // applet helper methods // implemented in sw/filter/xml/txtparai.hxx |