[Libreoffice-commits] .: Branch 'libreoffice-3-6' - i18npool/source

Thu Sep 6 06:32:43 PDT 2012

i18npool/source/ordinalsuffix/ordinalsuffix.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 966c1bd122d8258dd8b1abfe638de7b1ce0d3c98
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Wed Sep 5 10:00:37 2012 +0100

    fdo#38242: Make autocorrect of 1st to 1 + superscripted st work again
    
    It surely doesn't matter if the result of normalization is unchanged
    
    (cherry picked from commit defe079d455ccc958fd0128e8a8cf0e4aeb5cd9c)
    
    Change-Id: I87dfd0dadee33897f5df4b0dc532166a8bd9d7e5
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 95e1341..aff018f 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -89,7 +89,7 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN
                 icu::UnicodeString normalized;
                 nCode = U_ZERO_ERROR;
                 icu::Normalizer::normalize( icuRet, UNORM_NFKC, 0, normalized, nCode );
-                if ( U_SUCCESS( nCode ) && ( normalized != icuRet ) )
+                if ( U_SUCCESS( nCode ) )
                 {
                     // Convert the normalized UnicodeString to OUString
                     OUString sValue( reinterpret_cast<const sal_Unicode *>( normalized.getBuffer( ) ), normalized.length() );
