27c22bac54
Thanks Eike
Eike said "This should not use collation (which should only be used
in sorting context) but ignore case transliteration instead."
I had just copied ancient code from
commit 952c2b02c7
Author: Eike Rathke on Date: Wed Mar 14 14:57:39 2001 +0000
use CollatorWrapper instead of International
Apparently that code should also be changed
in a follow-up commit.
Interestingly, a \x000 - \x008 etc must be isEqual(""),
so an attempt to ScGlobal::getCharClass().lowercase
all variables at the beginning and use regular OUString
comparisons didn't work.
Also, a "" startsWith and endsWith each string.
In Excel, a "" is also contained in every string,
but not (yet) in Calc.
Change-Id: I44a07c482d2d67a76a939ba2d593a003398d52c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140633
Tested-by: Justin Luth <jluth@mail.com>
Reviewed-by: Justin Luth <jluth@mail.com>
Reviewed-by: Eike Rathke <erack@redhat.com>
97 lines
2.9 KiB
C++
97 lines
2.9 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <sal/log.hxx>
|
|
#include <unotools/collatorwrapper.hxx>
|
|
#include <com/sun/star/i18n/Collator.hpp>
|
|
|
|
using namespace ::com::sun::star;
|
|
|
|
CollatorWrapper::CollatorWrapper ( const uno::Reference< uno::XComponentContext > &rxContext )
|
|
{
|
|
mxInternationalCollator = i18n::Collator::create( rxContext );
|
|
}
|
|
|
|
sal_Int32
|
|
CollatorWrapper::compareString (const OUString& s1, const OUString& s2) const
|
|
{
|
|
try
|
|
{
|
|
if (mxInternationalCollator.is())
|
|
return mxInternationalCollator->compareString (s1, s2);
|
|
}
|
|
catch (const uno::RuntimeException&)
|
|
{
|
|
SAL_WARN( "unotools.i18n","CollatorWrapper: compareString failed");
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
uno::Sequence< OUString >
|
|
CollatorWrapper::listCollatorAlgorithms (const lang::Locale& rLocale) const
|
|
{
|
|
try
|
|
{
|
|
if (mxInternationalCollator.is())
|
|
return mxInternationalCollator->listCollatorAlgorithms (rLocale);
|
|
}
|
|
catch (const uno::RuntimeException&)
|
|
{
|
|
SAL_WARN( "unotools.i18n","CollatorWrapper: listCollatorAlgorithms failed");
|
|
}
|
|
|
|
return uno::Sequence< OUString > ();
|
|
}
|
|
|
|
sal_Int32
|
|
CollatorWrapper::loadDefaultCollator (const lang::Locale& rLocale, sal_Int32 nOptions)
|
|
{
|
|
try
|
|
{
|
|
if (mxInternationalCollator.is())
|
|
return mxInternationalCollator->loadDefaultCollator (rLocale, nOptions);
|
|
}
|
|
catch (const uno::RuntimeException&)
|
|
{
|
|
SAL_WARN( "unotools.i18n","CollatorWrapper: loadDefaultCollator failed");
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
CollatorWrapper::loadCollatorAlgorithm (const OUString& rAlgorithm,
|
|
const lang::Locale& rLocale, sal_Int32 nOptions)
|
|
{
|
|
try
|
|
{
|
|
if (mxInternationalCollator.is())
|
|
mxInternationalCollator->loadCollatorAlgorithm (
|
|
rAlgorithm, rLocale, nOptions);
|
|
}
|
|
catch (const uno::RuntimeException&)
|
|
{
|
|
SAL_WARN( "unotools.i18n","CollatorWrapper: loadCollatorAlgorithm failed");
|
|
}
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|