diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-02-18 21:12:20 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-02-18 21:33:05 +0100 |
commit | a8e35884d26c31cd449a9c615e612360b6c9ec50 (patch) | |
tree | da4e4ddee1c05b6eb998b92a7462787c7410b07c /xmloff/inc | |
parent | a8a38888b5659d4ae655d2aa26b10d248baf6732 (diff) |
xmloff: use ::comphelper::UStringLess instead of less_functor
Diffstat (limited to 'xmloff/inc')
-rw-r--r-- | xmloff/inc/functional.hxx | 30 | ||||
-rw-r--r-- | xmloff/inc/xmloff/txtimp.hxx | 3 |
2 files changed, 0 insertions, 33 deletions
diff --git a/xmloff/inc/functional.hxx b/xmloff/inc/functional.hxx deleted file mode 100644 index 6d27da04f742..000000000000 --- a/xmloff/inc/functional.hxx +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#ifndef _XMLOFF_FUNCTIONAL_HXX -#define _XMLOFF_FUNCTIONAL_HXX - -#include <rtl/ustring.hxx> - -/* THIS HEADER IS DEPRECATED. USE comphelper/stl_types.hxx INSTEAD!!! */ - -/** @#file - * - * re-implement STL functors as needed - * - * The standard comparison operators from the STL cause warnings with - * several compilers about our sal_Bool (=unsigned char) being - * converted to bool (C++ bool). We wish to avoid that. - */ - -struct less_functor -{ - bool operator()(const ::rtl::OUString& x, - const ::rtl::OUString& y) const - { - return 0 != (x<y); - } -}; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx index 93a8ba27f267..f364402440ba 100644 --- a/xmloff/inc/xmloff/txtimp.hxx +++ b/xmloff/inc/xmloff/txtimp.hxx @@ -39,9 +39,6 @@ #include <boost/shared_ptr.hpp> #include <xmloff/xmltkmap.hxx> - -// xmloff/functional.hxx is obsolete and should be replaced by its comphelper -// counterpart #include <comphelper/stl_types.hxx> #include <xmloff/uniref.hxx> |