summaryrefslogtreecommitdiff
path: root/lingucomponent
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-09-23 20:55:37 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-09-24 12:15:13 +0100
commitdd691312a3a0e0e18ade5c64a3c4f5115c3fde0f (patch)
tree489780181fd40255c2534614664c59b9f6a7716c /lingucomponent
parent3be5deadcb46e09d84d99b2b108b65b06ff356e9 (diff)
we shouldn't need explicit lt_rtl_OUString, etc things anymore
Change-Id: Ibeec3fcc353e07e61fb2c838b318e0a04081ce2c
Diffstat (limited to 'lingucomponent')
-rw-r--r--lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx4
-rw-r--r--lingucomponent/source/lingutil/lingutil.hxx8
-rw-r--r--lingucomponent/source/spellcheck/spell/sspellimp.cxx4
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesimp.cxx4
4 files changed, 6 insertions, 14 deletions
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
index 29c8c256f9da..d4bc22e99ab6 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
@@ -149,7 +149,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
{
// get supported locales from the dictionaries-to-use...
sal_Int32 k = 0;
- std::set< OUString, lt_rtl_OUString > aLocaleNamesSet;
+ std::set<OUString> aLocaleNamesSet;
std::list< SvtLinguConfigDictionaryEntry >::const_iterator aDictIt;
for (aDictIt = aDics.begin(); aDictIt != aDics.end(); ++aDictIt)
{
@@ -162,7 +162,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
}
// ... and add them to the resulting sequence
aSuppLocales.realloc( aLocaleNamesSet.size() );
- std::set< OUString, lt_rtl_OUString >::const_iterator aItB;
+ std::set<OUString>::const_iterator aItB;
k = 0;
for (aItB = aLocaleNamesSet.begin(); aItB != aLocaleNamesSet.end(); ++aItB)
{
diff --git a/lingucomponent/source/lingutil/lingutil.hxx b/lingucomponent/source/lingutil/lingutil.hxx
index 299762d7072c..d3bf8217fb8f 100644
--- a/lingucomponent/source/lingutil/lingutil.hxx
+++ b/lingucomponent/source/lingutil/lingutil.hxx
@@ -33,14 +33,6 @@
struct SvtLinguConfigDictionaryEntry;
-struct lt_rtl_OUString
-{
- bool operator() (const OUString &r1, const OUString &r2) const
- {
- return r1 < r2;
- }
-};
-
#if defined(_WIN32)
// to be use to get a path name with long path prefix
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 1d291f1a7afb..db690ae83d11 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -147,7 +147,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
uno::Reference< ucb::XSimpleFileAccess > xAccess(xServiceFactory->createInstance("com.sun.star.ucb.SimpleFileAccess"), uno::UNO_QUERY);
// get supported locales from the dictionaries-to-use...
sal_Int32 k = 0;
- std::set< OUString, lt_rtl_OUString > aLocaleNamesSet;
+ std::set<OUString> aLocaleNamesSet;
std::list< SvtLinguConfigDictionaryEntry >::const_iterator aDictIt;
for (aDictIt = aDics.begin(); aDictIt != aDics.end(); ++aDictIt)
{
@@ -176,7 +176,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
}
// ... and add them to the resulting sequence
aSuppLocales.realloc( aLocaleNamesSet.size() );
- std::set< OUString, lt_rtl_OUString >::const_iterator aItB;
+ std::set<OUString>::const_iterator aItB;
k = 0;
for (aItB = aLocaleNamesSet.begin(); aItB != aLocaleNamesSet.end(); ++aItB)
{
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 08296b417aa5..f8a66da0d962 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -164,7 +164,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
{
// get supported locales from the dictionaries-to-use...
sal_Int32 k = 0;
- std::set< OUString, lt_rtl_OUString > aLocaleNamesSet;
+ std::set<OUString> aLocaleNamesSet;
std::list< SvtLinguConfigDictionaryEntry >::const_iterator aDictIt;
for (aDictIt = aDics.begin(); aDictIt != aDics.end(); ++aDictIt)
{
@@ -177,7 +177,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
}
// ... and add them to the resulting sequence
aSuppLocales.realloc( aLocaleNamesSet.size() );
- std::set< OUString, lt_rtl_OUString >::const_iterator aItB;
+ std::set<OUString>::const_iterator aItB;
k = 0;
for (aItB = aLocaleNamesSet.begin(); aItB != aLocaleNamesSet.end(); ++aItB)
{