undoing r273933 which was accidently commited on master m51ooo/DEV300_m51

6 files changed, 9 insertions, 282 deletions

diff --git a/i18npool/inc/transliteration_sentencecase.hxx b/i18npool/inc/transliteration_sentencecase.hxx
deleted file mode 100644
index 68727b28b2..0000000000
--- a/i18npool/inc/transliteration_sentencecase.hxx
+++ /dev/null
@@ -1,69 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: transliteration_Numeric.hxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _I18NPPOL_TRANSLITERATION_SENTENCECASE_HXX_
-#define _I18NPPOL_TRANSLITERATION_SENTENCECASE_HXX_
-
-#include <transliteration_commonclass.hxx>
-
-namespace com { namespace sun { namespace star { namespace i18n {
-
-class Transliteration_sentencecase : public transliteration_commonclass {
-public:
-        Transliteration_sentencecase( );
-
-        ::rtl::OUString SAL_CALL
-        transliterate( const ::rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset )
-        throw(::com::sun::star::uno::RuntimeException);
-
-        sal_Unicode SAL_CALL
-        transliterateChar2Char( sal_Unicode inChar)
-        throw(com::sun::star::i18n::MultipleCharsOutputException,
-                com::sun::star::uno::RuntimeException);
-
-        // Methods which are shared.
-        sal_Int16 SAL_CALL getType(  ) throw(::com::sun::star::uno::RuntimeException);
-    
-        ::rtl::OUString SAL_CALL
-        folding( const ::rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset )
-        throw(::com::sun::star::uno::RuntimeException);
-
-        sal_Bool SAL_CALL
-        equals( const ::rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const ::rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
-        throw(::com::sun::star::uno::RuntimeException);
-
-        ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL 
-        transliterateRange( const ::rtl::OUString& str1, const ::rtl::OUString& str2 )
-        throw(::com::sun::star::uno::RuntimeException);
-};
-
-} } } }
-
-#endif // _I18NPPOL_TRANSLITERATION_SENTENCECASE_HXX_
-
diff --git a/i18npool/source/localedata/data/en_US.xml b/i18npool/source/localedata/data/en_US.xml
index 57cc189e6c..2a99dcd0fb 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -477,7 +477,6 @@
   <LC_TRANSLITERATION>
     <Transliteration unoid="LOWERCASE_UPPERCASE"/>
     <Transliteration unoid="UPPERCASE_LOWERCASE"/>
-    <Transliteration unoid="SENTENCE_CASE"/>
     <Transliteration unoid="IGNORE_CASE"/>
   </LC_TRANSLITERATION>
   <LC_MISC>
diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx
index 878fe7f82b..2c78c5da41 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -50,7 +50,6 @@
 #include <transliteration_caseignore.hxx>
 #include <transliteration_Ignore.hxx>
 #include <transliteration_OneToOne.hxx>
-#include <transliteration_sentencecase.hxx>
 #include <textToPronounce_zh.hxx>
 #include <numtotext_cjk.hxx>
 #include <numtochar.hxx>
@@ -174,7 +173,6 @@ IMPL_CREATEINSTANCE_MSF( TextConversion_zh )
 
 IMPL_CREATEINSTANCE( Transliteration_u2l )
 IMPL_CREATEINSTANCE( Transliteration_l2u )
-IMPL_CREATEINSTANCE( Transliteration_sentencecase )
 IMPL_CREATEINSTANCE( Transliteration_caseignore )
 IMPL_CREATEINSTANCE( hiraganaToKatakana )
 IMPL_CREATEINSTANCE( katakanaToHiragana )
@@ -425,9 +423,6 @@ static const struct InstancesArray {
         TRLT_IMPLNAME_PREFIX  "LOWERCASE_UPPERCASE",
         &Transliteration_l2u_CreateInstance },
     {   TRLT_SERVICELNAME_L10N,
-        TRLT_IMPLNAME_PREFIX  "SENTENCE_CASE",
-        &Transliteration_sentencecase_CreateInstance },
-    {   TRLT_SERVICELNAME_L10N,
         TRLT_IMPLNAME_PREFIX  "IGNORE_CASE",
         &Transliteration_caseignore_CreateInstance },
     {   TRLT_SERVICELNAME_L10N,
diff --git a/i18npool/source/transliteration/makefile.mk b/i18npool/source/transliteration/makefile.mk
index 83317183be..daf3068d4d 100644
--- a/i18npool/source/transliteration/makefile.mk
+++ b/i18npool/source/transliteration/makefile.mk
@@ -78,8 +78,7 @@ SLOFILES=   \
                         $(SLO)$/numtochar.obj \
                         $(SLO)$/numtotext_cjk.obj \
                         $(SLO)$/chartonum.obj \
-                        $(SLO)$/texttonum.obj \
-                        $(SLO)$/transliteration_sentencecase.obj
+                        $(SLO)$/texttonum.obj
 
 # --- Targets ------------------------------------------------------
 
diff --git a/i18npool/source/transliteration/transliteration_sentencecase.cxx b/i18npool/source/transliteration/transliteration_sentencecase.cxx
deleted file mode 100644
index 22911404d5..0000000000
--- a/i18npool/source/transliteration/transliteration_sentencecase.cxx
+++ /dev/null
@@ -1,190 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: halfwidthToFullwidth.cxx,v $
- * $Revision: 1.12 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_i18npool.hxx"
-
-// prevent internal compiler error with MSVC6SP3
-#include <utility>
-
-#include <i18nutil/widthfolding.hxx>
-#include <i18nutil/casefolding.hxx>
-#define TRANSLITERATION_sentencecase
-#include <transliteration_sentencecase.hxx>
-#include <rtl/ustring.hxx>
-#include <i18nutil/x_rtl_ustring.h>
-#include <i18nutil/unicode.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/strbuf.hxx>
-
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace rtl;
-
-namespace com { namespace sun { namespace star { namespace i18n {
-
-
-Transliteration_sentencecase::Transliteration_sentencecase()
-{
-    transliterationName = "sentenceCase";
-    implementationName = "com.sun.star.i18n.Transliteration.SENTENCE_CASE";
-}
-
-OUString SAL_CALL 
-Transliteration_sentencecase::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
-  throw(RuntimeException)
-{
-    // inspired from Transliteration_body::transliterate
-    sal_Int32 nOffCount = 0, i;
-    bool bPoint = true;
-    if (useOffset) 
-    {
-        for( i = 0; i < nCount; ++i ) {
-            sal_Unicode c = inStr.getStr()[ i + startPos ];
-            if( sal_Unicode('.') == c || sal_Unicode('!') == c || sal_Unicode('?') == c ) {
-                bPoint = true;
-                nOffCount++;
-            }
-            else if( unicode::isAlpha( c ) || unicode::isDigit( c ) )
-            {
-                const Mapping* map = 0;
-                if( bPoint && unicode::isLower( c ))
-                {
-                    map = &casefolding::getValue(&c, 0, 1, aLocale, MappingTypeLowerToUpper);
-                }
-                bPoint = false;
-
-                if(map == 0)
-                {
-                    nOffCount++;
-                } 
-                else
-                {
-                    nOffCount += map->nmap;
-                }
-            }
-            else
-            {
-                nOffCount++;
-            }
-        }
-    }
-
-    bPoint = true;
-    rtl::OUStringBuffer result;
-
-    if (useOffset)
-    {
-        result.ensureCapacity(nOffCount);
-        if ( nOffCount != offset.getLength() )
-            offset.realloc( nOffCount );
-    }
-
-
-    sal_Int32 j = 0;
-    sal_Int32 * pArr = offset.getArray();
-    for(  i = 0; i < nCount; ++i ) {
-        sal_Unicode c = inStr.getStr()[ i + startPos ];
-        if( sal_Unicode('.') == c || sal_Unicode('!') == c || sal_Unicode('?') == c ) {
-            bPoint = true;
-            result.append(c);
-            pArr[j++] = i + startPos;
-        }
-        else if( unicode::isAlpha( c ) || unicode::isDigit( c ) )
-        {
-            const Mapping* map = 0;
-            if( bPoint && unicode::isLower( c ))
-            {
-                map = &casefolding::getValue(&c, 0, 1, aLocale, MappingTypeLowerToUpper);
-            }
-            bPoint = false;
-
-            if(map == 0)
-            {
-                result.append( c );
-                pArr[j++] = i + startPos;
-            } 
-            else
-            {
-                for (sal_Int32 k = 0; k < map->nmap; k++)
-                {
-                    result.append( map->map[k] );
-                    pArr[j++] = i + startPos;
-                }
-            }
-        }
-        else
-        {
-            result.append( c );
-            pArr[j++] = i + startPos;
-        }
-    }
-    return result.makeStringAndClear();
-}
-
-sal_Unicode SAL_CALL 
-Transliteration_sentencecase::transliterateChar2Char( sal_Unicode inChar)
-  throw(RuntimeException, MultipleCharsOutputException)
-{
-    return inChar;	
-}
-
-sal_Int16 SAL_CALL Transliteration_sentencecase::getType() throw(RuntimeException)
-{
-    return TransliterationType::IGNORE;
-}
-
-OUString SAL_CALL
-Transliteration_sentencecase::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, 
-    Sequence< sal_Int32 >& offset) throw(RuntimeException)
-{
-    return this->transliterate(inStr, startPos, nCount, offset);
-}
-
-sal_Bool SAL_CALL Transliteration_sentencecase::equals(
-    const OUString& /*str1*/, sal_Int32 /*pos1*/, sal_Int32 /*nCount1*/, sal_Int32& /*nMatch1*/,
-    const OUString& /*str2*/, sal_Int32 /*pos2*/, sal_Int32 /*nCount2*/, sal_Int32& /*nMatch2*/)
-    throw(RuntimeException)
-{
-    throw RuntimeException();
-}
-
-Sequence< OUString > SAL_CALL 
-Transliteration_sentencecase::transliterateRange( const OUString& str1, const OUString& str2 ) 
-    throw( RuntimeException)
-{
-    Sequence< OUString > ostr(2);
-    ostr[0] = str1;
-    ostr[1] = str2;
-    return ostr;
-}
-
-} } } }
-
diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx
index 635aa39262..693cfefeca 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.cxx
@@ -34,10 +34,11 @@
 #include <unotools/transliterationwrapper.hxx>
 #include <tools/debug.hxx>
 #include <i18npool/mslangid.hxx>
+#ifndef _COMPHELPER_COMPONENTFACTORY_HXX_
 #include <comphelper/componentfactory.hxx>
+#endif
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
 
 #define TRANSLIT_LIBRARYNAME "i18n"
 #define TRANSLIT_SERVICENAME "com.sun.star.i18n.Transliteration"
@@ -167,22 +168,14 @@ void TransliterationWrapper::loadModuleIfNeeded( sal_uInt16 nLang )
     sal_Bool bLoad = bFirstCall;
     bFirstCall = sal_False;
 
-    if( static_cast< sal_Int32 >(nType) == TransliterationModulesExtra::SENTENCE_CASE )
-    {
-        if( bLoad )
-            loadModuleByImplName(String::CreateFromAscii("SENTENCE_CASE"), nLang);
-    }
-    else
+    if( nLanguage != nLang )
     {
-        if( nLanguage != nLang )
-        {
-            setLanguageLocaleImpl( nLang );
-            if( !bLoad )
-                bLoad = needLanguageForTheMode();
-        }
-        if( bLoad ) 
-            loadModuleImpl();
+        setLanguageLocaleImpl( nLang );
+        if( !bLoad )
+            bLoad = needLanguageForTheMode();
     }
+    if( bLoad )
+        loadModuleImpl();
 }