diff options
53 files changed, 476 insertions, 446 deletions
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx index de555525487e..84dd3b1a2182 100644 --- a/i18npool/inc/breakiteratorImpl.hxx +++ b/i18npool/inc/breakiteratorImpl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: breakiteratorImpl.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: er $ $Date: 2002-03-26 17:57:44 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -184,82 +184,4 @@ private : } // com - /******************************************************************** - - Source Code Control System - Updates - - $Log: not supported by cvs2svn $ - Revision 1.1 2002/03/26 13:36:40 bustamam - #97583# add Include files - - Revision 1.22 2001/11/12 19:34:11 er - #94609# del: numberformatcode.hxx - - Revision 1.21 2001/10/19 21:16:43 bustamam.harun - #84725# Add XServiceInfo implementation - - Revision 1.20 2001/09/24 14:59:50 jp - script of character 0x1 and 0x2 are WEAK - this are our fields - - Revision 1.19 2001/04/12 23:53:54 bustamam.harun - Fix compile problem on Solaris: change String to rtl::OUString - - Revision 1.18 2001/03/28 09:24:12 tl - #84966 aEmptyPropValSeq member removed - - Revision 1.17 2000/12/05 15:22:58 jp - Bug #81298#: CTOR with MultiServiceFactory - - Revision 1.16 2000/11/18 22:57:37 bustamam.harun - change to ::i18n - - Revision 1.15 2000/10/29 17:01:45 er - i18n API moved from com.sun.star.lang to com.sun.star.i18n - - Revision 1.14 2000/10/25 14:02:21 tl - linguistic => linguistic2 : member of type PropertyValues as argument for hyphenate added - - Revision 1.13 2000/10/22 19:07:03 er - SRC610 MUST: ::comphelper::getProcessServiceFactory - - Revision 1.12 2000/08/18 00:37:30 gmu - new files for cjk breakiterators - - Revision 1.11 2000/08/11 12:41:46 jp - Bug #77428#: change int to sal_Int32, change size of some static array - - Revision 1.10 2000/08/10 15:18:58 jp - remove the not used methods queryInterface/acquire/release - because it's handled by the base class correct! - - Revision 1.9 2000/07/03 10:13:11 gmu - added getScriptClass() - - Revision 1.8 2000/06/30 10:38:06 jp - change the OWeak base class to the WeakImpHelper class - - Revision 1.7 2000/06/23 11:36:47 gmu - changed API to reflect changes in IDL file - - Revision 1.6 2000/06/20 16:02:56 hr - #includes with lowercase letters - - Revision 1.5 2000/06/14 13:32:28 sse - Merged Begin and End word breaking - - Revision 1.4 2000/06/14 08:25:06 sse - Updated hyphenator interface - - Revision 1.3 2000/06/13 08:13:00 sse - new breakiterator API - - Revision 1.2 2000/06/09 10:10:59 sse - Initial version of unicode breakiterator - - Revision 1.1 2000/06/07 12:22:43 mt - BreakIterator - - - *********************************************************************/ - - #endif // _I18N_BREAKITERATOR_HXX_ diff --git a/i18npool/inc/bullet.h b/i18npool/inc/bullet.h index 2267a10f6fa7..53fc56728252 100644 --- a/i18npool/inc/bullet.h +++ b/i18npool/inc/bullet.h @@ -300,7 +300,7 @@ static sal_Unicode table_HangulSyllable_ko[] = { 0xCC28, // HANGUL SYLLABLE CA 0xCE74, // HANGUL SYLLABLE KA 0xD0C0, // HANGUL SYLLABLE TA - 0xD39C, // HANGUL SYLLABLE PA + 0xD30C, // HANGUL SYLLABLE PA 0xD558 // HANGUL SYLLABLE HA }; @@ -348,4 +348,20 @@ static sal_Unicode table_DiZi_zh[] = { 0x5b50,0x4e11,0x5bc5,0x536f,0x8fb0,0x5df3,0x5348,0x672a,0x7533,0x9149,0x620c,0x4ea5 }; +static sal_Unicode table_Alphabet_ar[] = { + 0x0623, 0x0628, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, + 0x062F, 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, + 0x0636, 0x0637, 0x0638, 0x0639, 0x063A, 0x0641, 0x0642, + 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649 +}; + +static sal_Unicode table_Alphabet_th[] = { + 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07, + 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F, + 0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17, + 0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F, + 0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27, + 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E +}; + } } } } diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx index e211f0d2ae17..1b4508270022 100644 --- a/i18npool/inc/characterclassificationImpl.hxx +++ b/i18npool/inc/characterclassificationImpl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: characterclassificationImpl.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: er $ $Date: 2002-03-26 17:57:44 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,45 +149,4 @@ private: } } } } -/************************************************************************** - - Source Code Control System - Updates - - $Log: not supported by cvs2svn $ - Revision 1.1 2002/03/26 13:36:40 bustamam - #97583# add Include files - - Revision 1.4 2001/10/19 21:16:45 bustamam.harun - #84725# Add XServiceInfo implementation - - Revision 1.3 2001/05/18 17:57:33 er - #79771# optimize: disentangled: cclass_unicode not derived from CharacterClassificationImpl; reuse instance if locale didn't change; rtl::OUString instead of String - - Revision 1.2 2001/04/12 23:53:54 bustamam.harun - Fix compile problem on Solaris: change String to rtl::OUString - - Revision 1.1 2001/03/27 21:18:55 bustamam.harun - Add locale sensitive character classification - - Revision 1.6 2001/01/29 17:05:55 er - CharacterClassification with service manager - - Revision 1.5 2000/10/29 17:01:45 er - i18n API moved from com.sun.star.lang to com.sun.star.i18n - - Revision 1.4 2000/08/11 14:51:29 er - removed queryInterface/aquire/release, using WeakImplHelper instead - - Revision 1.3 2000/07/06 15:49:21 gmu - changed parsing functions - - Revision 1.2 2000/07/06 15:21:04 er - define USE_I18N_DEFAULT_IMPLEMENTATION and Locale dependent source - - Revision 1.1 2000/07/06 08:51:54 er - new: CharacterClassification with parser - - -**************************************************************************/ - #endif diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx index edca6a45aff0..380fd1a06a58 100644 --- a/i18npool/inc/collatorImpl.hxx +++ b/i18npool/inc/collatorImpl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: collatorImpl.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: er $ $Date: 2002-03-26 17:57:44 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,7 +71,7 @@ #include <cppuhelper/implbase2.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#if !defined( WIN32 ) && !defined( MACOSX ) +#if !defined( WIN32 ) && !defined( MACOSX ) && !defined( FREEBSD) #include <alloca.h> #endif #include <tools/list.hxx> diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx index 28bbefcc1876..a35b1d9da4cf 100644 --- a/i18npool/inc/defaultnumberingprovider.hxx +++ b/i18npool/inc/defaultnumberingprovider.hxx @@ -2,9 +2,9 @@ * * $RCSfile: defaultnumberingprovider.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: khong $ $Date: 2002-09-24 23:10:22 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,6 +79,7 @@ #ifndef _COM_SUN_STAR_I18N_XTRANSLITERATION_HPP_ #include <com/sun/star/i18n/XTransliteration.hpp> #endif +#include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <transliterationImpl.hxx> @@ -138,9 +139,12 @@ public: throw( com::sun::star::uno::RuntimeException ); private: com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > xSMgr; + com::sun::star::uno::Reference < com::sun::star::container::XHierarchicalNameAccess > xHierarchicalNameAccess; TransliterationImpl* translit; rtl::OUString SAL_CALL makeNumberingIdentifier( sal_Int16 index ) throw(com::sun::star::uno::RuntimeException); + sal_Bool SAL_CALL isScriptFlagEnabled(const rtl::OUString& aName ) + throw(com::sun::star::uno::RuntimeException); }; } } } } diff --git a/i18npool/prj/build.lst b/i18npool/prj/build.lst index 2a96725e508d..4c0edee0814e 100644 --- a/i18npool/prj/build.lst +++ b/i18npool/prj/build.lst @@ -1,4 +1,4 @@ -inp i18npool : bridges sax stoc comphelper tools icu NULL +inp i18npool : bridges sax stoc comphelper tools icu svtools NULL inp i18npool usr1 - all inp_mkout NULL inp i18npool\source\unotypes nmake - all inp_utypes NULL inp i18npool\source\registerservices nmake - all inp_rserv inp_utypes NULL diff --git a/i18npool/prj/d.lst b/i18npool/prj/d.lst index d092f1dc8a82..ccaef7f9ad55 100644 --- a/i18npool/prj/d.lst +++ b/i18npool/prj/d.lst @@ -1,5 +1,5 @@ -mkdir: %_DEST%\xml -..\xml\*.xml %_DEST%\xml\*.xml +mkdir: %_DEST%\xml%_EXT% +..\xml\*.xml %_DEST%\xml%_EXT%\*.xml mkdir: %_DEST%\inc%_EXT%\i18npool diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index cffa8ac5b50b..4c75040062fa 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: breakiteratorImpl.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: khong $ $Date: 2002-11-20 20:14:05 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,6 +106,35 @@ sal_Int32 SAL_CALL BreakIteratorImpl::previousCharacters( const OUString& Text, return LBI->previousCharacters( Text, nStartPos, rLocale, nCharacterIteratorMode, nCount, nDone); } +static sal_Int32 skipSpace(const OUString& Text, sal_Int32 nPos, sal_Int32 len, sal_Int16 rWordType, sal_Bool bDirection) +{ + switch (rWordType) { + case WordType::ANYWORD_IGNOREWHITESPACES: + if (bDirection) + while (nPos < len && unicode::isWhiteSpace(Text[nPos])) nPos++; + else + while (nPos > 0 && unicode::isWhiteSpace(Text[nPos])) nPos--; + break; + case WordType::DICTIONARY_WORD: + if (bDirection) + while (nPos < len && (unicode::isWhiteSpace(Text[nPos]) || + ! (Text[nPos] == 0x002E || unicode::isAlphaDigit(Text[nPos])))) nPos++; + else + while (nPos > 0 && (unicode::isWhiteSpace(Text[nPos]) || + ! (Text[nPos] == 0x002E || unicode::isAlphaDigit(Text[nPos])))) nPos--; + break; + case WordType::WORD_COUNT: + if (bDirection) + while (nPos < len && (unicode::isWhiteSpace(Text[nPos]) || + ! unicode::isAlphaDigit(Text[nPos]))) nPos++; + else + while (nPos > 0 && (unicode::isWhiteSpace(Text[nPos]) || + ! unicode::isAlphaDigit(Text[nPos]))) nPos--; + break; + } + return nPos; +} + Boundary SAL_CALL BreakIteratorImpl::nextWord( const OUString& Text, sal_Int32 nStartPos, const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException) { @@ -114,8 +143,18 @@ Boundary SAL_CALL BreakIteratorImpl::nextWord( const OUString& Text, sal_Int32 n result.endPos = result.startPos = 0; else if (nStartPos >= len) result.endPos = result.startPos = len; - else - result = LBI->nextWord(Text, nStartPos, rLocale, rWordType); + else { + result = LBI->nextWord(Text, nStartPos, rLocale, rWordType); + + nStartPos = skipSpace(Text, result.startPos, len, rWordType, sal_True); + + if ( nStartPos != result.startPos) { + if( nStartPos >= len ) + result.startPos = result.endPos = len; + else + result = LBI->getWordBoundary(Text, nStartPos, rLocale, rWordType, sal_True); + } + } return result; } @@ -135,27 +174,17 @@ Boundary SAL_CALL BreakIteratorImpl::previousWord( const OUString& Text, sal_Int return result; } - if(rWordType == WordType::ANYWORD_IGNOREWHITESPACES || rWordType == WordType::DICTIONARY_WORD) { - - sal_Int32 oPos = nStartPos; + sal_Int32 nPos = skipSpace(Text, nStartPos-1, len, rWordType, sal_False) + 1; - while(nStartPos > 1 && unicode::isWhiteSpace(Text[nStartPos - 1])) nStartPos--; - - if( !nStartPos ) { - result.startPos = result.endPos = nStartPos; - return result; - } - - // if some spaces are skiped, and the script type is Asian with no CJK rLocale, we have to return - // (nStartPos, -1) for caller to send correct rLocale for loading correct dictionary. - if (oPos != nStartPos && !isCJK(rLocale) && getScriptClass(Text[nStartPos-1]) == ScriptType::ASIAN) { - result.startPos = nStartPos; + // if some spaces are skiped, and the script type is Asian with no CJK rLocale, we have to return + // (nStartPos, -1) for caller to send correct rLocale for loading correct dictionary. + if (nPos != nStartPos && !isCJK(rLocale) && getScriptClass(Text[nPos-1]) == ScriptType::ASIAN) { + result.startPos = nPos; result.endPos = -1; return result; - } } - return LBI->previousWord(Text, nStartPos, rLocale, rWordType); + return LBI->previousWord(Text, nPos, rLocale, rWordType); } @@ -167,17 +196,25 @@ Boundary SAL_CALL BreakIteratorImpl::getWordBoundary( const OUString& Text, sal_ result.endPos = result.startPos = 0; else if (nPos > len) result.endPos = result.startPos = len; - else + else { + nPos = skipSpace(Text, nPos, len, rWordType, bDirection); result = LBI->getWordBoundary(Text, nPos, rLocale, rWordType, bDirection); + } return result; } sal_Bool SAL_CALL BreakIteratorImpl::isBeginWord( const OUString& Text, sal_Int32 nPos, const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException) { - if (unicode::isWhiteSpace(Text[nPos])) return false; + sal_Int32 len = Text.getLength(); + + if (nPos < 0 || nPos >= len) return sal_False; + + sal_Int32 tmp = skipSpace(Text, nPos, len, rWordType, sal_True); - result = getWordBoundary(Text, nPos, rLocale, rWordType, true); + if (tmp != nPos) return sal_False; + + result = getWordBoundary(Text, nPos, rLocale, rWordType, sal_True); return result.startPos == nPos; } @@ -185,18 +222,17 @@ sal_Bool SAL_CALL BreakIteratorImpl::isBeginWord( const OUString& Text, sal_Int3 sal_Bool SAL_CALL BreakIteratorImpl::isEndWord( const OUString& Text, sal_Int32 nPos, const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException) { - sal_Int32 len = Text.getLength(); + sal_Int32 len = Text.getLength(); + + if (nPos <= 0 || nPos > len) return sal_False; - if (nPos < 0 || nPos > len || - rWordType == WordType::ANYWORD_IGNOREWHITESPACES && unicode::isWhiteSpace(Text[nPos])) - return false; + sal_Int32 tmp = skipSpace(Text, nPos-1, len, rWordType, sal_False) + 1; - result = getWordBoundary(Text, nPos, rLocale, rWordType, false); + if (tmp != nPos) return sal_False; - if (result.endPos == len && rWordType == WordType::ANYWORD_IGNOREWHITESPACES) - return false; + result = getWordBoundary(Text, nPos, rLocale, rWordType, sal_False); - return (result.endPos == nPos && !unicode::isWhiteSpace(Text[result.startPos])); + return result.endPos == nPos; } sal_Int32 SAL_CALL BreakIteratorImpl::beginOfSentence( const OUString& Text, sal_Int32 nStartPos, diff --git a/i18npool/source/breakiterator/data/makefile.mk b/i18npool/source/breakiterator/data/makefile.mk index b3359ffacd42..acbe796a9264 100644 --- a/i18npool/source/breakiterator/data/makefile.mk +++ b/i18npool/source/breakiterator/data/makefile.mk @@ -2,9 +2,9 @@ #* #* $RCSfile: makefile.mk,v $ #* -#* $Revision: 1.2 $ +#* $Revision: 1.3 $ #* -#* last change: $Author: khong $ $Date: 2002-05-02 21:43:34 $ +#* last change: $Author: hr $ $Date: 2003-03-26 10:54:34 $ #* #* The Contents of this file are made available subject to the terms of #* either of the following licenses @@ -48,8 +48,10 @@ LIBTARGET=NO # Fix heap limit problem on MSC .IF "$(OS)" == "WNT" +.IF "$(COMEX)" != "8" CDEFS+=-Zm300 .ENDIF +.ENDIF # --- Files -------------------------------------------------------- # Japanese dictionary diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index 736665f83064..017b9e613303 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -2,9 +2,9 @@ * * $RCSfile: calendar_gregorian.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: er $ $Date: 2002-12-06 18:51:16 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -566,8 +566,8 @@ Calendar_gregorian::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 break; case CalendarDisplayCode::SHORT_YEAR: // take last 2 digits - value %= 100; - // fall through + sprintf(aStr, "%02d", value % 100); //10021 - checked^M + break; case CalendarDisplayCode::LONG_DAY: sprintf(aStr, "%02d", value); // #100211# - checked break; diff --git a/i18npool/source/calendar/calendar_hijri.cxx b/i18npool/source/calendar/calendar_hijri.cxx index 60dea9841e6a..4f3d0dd15c1e 100644 --- a/i18npool/source/calendar/calendar_hijri.cxx +++ b/i18npool/source/calendar/calendar_hijri.cxx @@ -2,9 +2,9 @@ * * $RCSfile: calendar_hijri.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2002-09-18 13:53:27 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,7 @@ * ************************************************************************/ +#include <stdlib.h> #include <math.h> #include "calendar_hijri.hxx" diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx index 339818532ebb..03a34251f6e6 100644 --- a/i18npool/source/characterclassification/cclass_unicode.cxx +++ b/i18npool/source/characterclassification/cclass_unicode.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cclass_unicode.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: er $ $Date: 2002-11-19 22:23:51 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -219,46 +219,3 @@ Sequence< OUString > SAL_CALL cclass_Unicode::getSupportedServiceNames() throw( } } } } -/************************************************************************** - - Source Code Control System - Updates - - $Log: not supported by cvs2svn $ - Revision 1.2 2002/03/26 16:59:03 er - #97583# it's dual licensed, LGPL and SISSL - - Revision 1.1 2002/03/26 06:31:13 bustamam - #97583# Add Character Classification - - Revision 1.4 2001/10/19 21:24:42 bustamam.harun - #84725# add XServiceInfo implementation - - Revision 1.3 2001/05/18 17:58:15 er - #79771# optimize: disentangled: cclass_Unicode not derived from CharacterClassificationImpl; reuse instance if locale didn't change; OUString instead of String - - Revision 1.2 2001/04/12 23:55:36 bustamam.harun - Fix compile problem on Solaris: change String to OUString - - Revision 1.1 2001/03/27 21:10:36 bustamam.harun - Rename characterclassification to cclass_Unicode - - Revision 1.8 2001/01/29 17:06:50 er - cclass_Unicode with service manager - - Revision 1.7 2000/10/29 17:02:41 er - i18n API moved from com.sun.star.lang to com.sun.star.i18n - - Revision 1.6 2000/08/11 14:52:52 er - removed queryInterface/aquire/release, using WeakImplHelper instead - - Revision 1.5 2000/07/19 10:59:59 er - toUpper, toLower, toTitle: nCount characters are converted; other: optimizations - - Revision 1.4 2000/07/06 15:46:57 gmu - implemented parsing functions - - Revision 1.1 2000/07/06 08:52:43 er - new: cclass_Unicode with parser - - -**************************************************************************/ diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx index cf1cf1f2be03..da8ffc1e5683 100644 --- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx +++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cclass_unicode_parser.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: khong $ $Date: 2002-11-05 23:35:42 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,8 +68,8 @@ #ifndef _ISOLANG_HXX #include <tools/isolang.hxx> #endif -#ifndef _TOOLS_SOLMATH_HXX -#include <tools/solmath.hxx> +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif #ifndef _COM_SUN_STAR_I18N_KPARSETOKENS_HPP_ @@ -530,7 +530,7 @@ void cclass_Unicode::initParserTable( const Locale& rLocale, sal_Int32 startChar LocaleDataItem aItem = xLocaleData->getLocaleItem( aParserLocale ); //!TODO: theoretically separators may be a string, adjustment would have to be -//! done here and in parsing and in SolarMath::StringToDouble +//! done here and in parsing and in ::rtl::math::stringToDouble() cGroupSep = aItem.thousandSeparator.getStr()[0]; cDecimalSep = aItem.decimalSeparator.getStr()[0]; } @@ -786,7 +786,6 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32 const sal_Unicode* pSrc = pSym; OUString aSymbol; sal_Unicode c = *pSrc; - sal_Int32 nPosition = 0; sal_Unicode cLast = 0; int nDecSeps = 0; BOOL bQuote = FALSE; @@ -796,7 +795,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32 while ( (c != 0) && (eState != ssStop) ) { - UPT_FLAG_TYPE nMask = getFlags( pStart, nPosition ); + UPT_FLAG_TYPE nMask = getFlags( pStart, pSrc - pStart ); if ( nMask & TOKEN_EXCLUDED ) eState = ssBounce; if ( bMightBeWord ) @@ -806,9 +805,8 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32 else bMightBeWord = ((nMask & TOKEN_WORD) != 0); } - sal_Int32 nParseTokensType = getParseTokensType( pStart, nPosition ); + sal_Int32 nParseTokensType = getParseTokensType( pStart, pSrc - pStart ); pSrc++; - nPosition++; switch (eState) { case ssGetChar : @@ -902,7 +900,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32 } else if ( c == 'E' || c == 'e' ) { - UPT_FLAG_TYPE nNext = getFlags( pStart, nPosition ); + UPT_FLAG_TYPE nNext = getFlags( pStart, pSrc - pStart ); if ( nNext & TOKEN_VALUE_EXP ) ; // keep it going else if ( bMightBeWord && ((nNext & TOKEN_WORD) || !*pSrc) ) @@ -917,7 +915,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32 { if ( (cLast == 'E') || (cLast == 'e') ) { - UPT_FLAG_TYPE nNext = getFlags( pStart, nPosition ); + UPT_FLAG_TYPE nNext = getFlags( pStart, pSrc - pStart ); if ( nNext & TOKEN_VALUE_EXP_VALUE ) ; // keep it going else if ( bMightBeWord && ((nNext & TOKEN_WORD) || !*pSrc) ) @@ -991,7 +989,6 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32 { // "" => literal " escaped aSymbol += OUString( pSym, pSrc - pSym ); pSrc++; - nPosition++; } else { @@ -1018,7 +1015,6 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32 pSrc = pSym; aSymbol = OUString(); c = *pSrc; - nPosition = 0; cLast = 0; nDecSeps = 0; bQuote = FALSE; @@ -1047,7 +1043,6 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32 if ( eState == ssStopBack ) { // put back pSrc--; - nPosition--; bMightBeWord = bMightBeWordLast; eState = ssStop; } @@ -1070,9 +1065,8 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32 r.EndPos = nPos + (pSrc - pStart); if ( r.TokenType & KParseType::ASC_NUMBER ) { - int nErrno; - r.Value = SolarMath::StringToDouble( pStart + r.LeadingWhiteSpace, - cGroupSep, cDecimalSep, nErrno ); + r.Value = rtl_math_uStringToDouble( pStart + r.LeadingWhiteSpace, + pStart + r.EndPos, cDecimalSep, cGroupSep, NULL, NULL ); if ( bMightBeWord ) r.TokenType |= KParseType::IDENTNAME; } @@ -1106,9 +1100,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32 // transliterate to ASCII aTmp = xNatNumSup->getNativeNumberString( aTmp, aParserLocale, NativeNumberMode::NATNUM0 ); - int nErrno; - r.Value = SolarMath::StringToDouble( aTmp.getStr(), cGroupSep, - cDecimalSep, nErrno ); + r.Value = ::rtl::math::stringToDouble( aTmp, cDecimalSep, cGroupSep, NULL, NULL ); if ( bMightBeWord ) r.TokenType |= KParseType::IDENTNAME; } diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx index c2050bb0e103..0ee713a6a669 100644 --- a/i18npool/source/collator/chaptercollator.cxx +++ b/i18npool/source/collator/chaptercollator.cxx @@ -2,9 +2,9 @@ * * $RCSfile: chaptercollator.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:20 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,7 +62,7 @@ #include <assert.h> // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #include <chaptercollator.hxx> #include <com/sun/star/i18n/KCharacterType.hpp> diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index 729861068596..b13dd173662c 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -2,9 +2,9 @@ * * $RCSfile: defaultnumberingprovider.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: khong $ $Date: 2002-09-24 23:11:23 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -186,28 +186,28 @@ void failedToConvert( int i, int last ) } static -void lcl_formatChars( char A, int n, OUString& s ) +void lcl_formatChars( sal_Unicode table[], int tableSize, int n, OUString& s ) { // string representation of n is appended to s. // if A=='A' then 0=>A, 1=>B, ..., 25=>Z, 26=>AA, 27=>AB, ... // if A=='a' then 0=>a, 1=>b, ..., 25=>z, 26=>aa, 27=>ab, ... - if( n>=26 ) lcl_formatChars( A, (n-26)/26, s ); + if( n>=tableSize ) lcl_formatChars( table, tableSize, (n-tableSize)/tableSize, s ); - s += OUString::valueOf( (sal_Unicode) (( n%26 ) + A) ); + s += OUString::valueOf( table[ n % tableSize ] ); } static -void lcl_formatChars1( char A, int n, OUString& s ) +void lcl_formatChars1( sal_Unicode table[], int tableSize, int n, OUString& s ) { // string representation of n is appended to s. // if A=='A' then 0=>A, 1=>B, ..., 25=>Z, 26=>AA, 27=>BB, ... // if A=='a' then 0=>a, 1=>b, ..., 25=>z, 26=>aa, 27=>bb, ... - int repeat_count = n / 26 + 1; + int repeat_count = n / tableSize + 1; for( int i=0; i<repeat_count; i++ ) - s += OUString::valueOf( (sal_Unicode) (( n%26 ) + A) ); + s += OUString::valueOf( table[ n%tableSize ] ); } static @@ -296,15 +296,22 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal // append prefix if( !should_ignore(prefix) ) result += prefix; + static sal_Unicode upperLetter[26] = { 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, + 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, + 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A }; + static sal_Unicode lowerLetter[26] = { 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, + 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, + 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A }; + // append formatted number using namespace style::NumberingType; switch( numType ) { case CHARS_UPPER_LETTER: - lcl_formatChars( 'A', number-1, result ); // 1=>A, 2=>B, ..., 26=>Z, 27=>AA, 28=>AB, ... + lcl_formatChars( upperLetter, 26, number-1, result ); // 1=>A, 2=>B, ..., 26=>Z, 27=>AA, 28=>AB, ... break; case CHARS_LOWER_LETTER: - lcl_formatChars( 'a', number-1, result ); + lcl_formatChars( lowerLetter, 26, number-1, result ); break; case ROMAN_UPPER: result += toRoman( number ); @@ -328,10 +335,10 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal throw IllegalArgumentException(); break; case CHARS_UPPER_LETTER_N: - lcl_formatChars1( 'A', number-1, result ); // 1=>A, 2=>B, ..., 26=>Z, 27=>AA, 28=>BB, ... + lcl_formatChars1( upperLetter, 26, number-1, result ); // 1=>A, 2=>B, ..., 26=>Z, 27=>AA, 28=>BB, ... break; case CHARS_LOWER_LETTER_N: - lcl_formatChars1( 'a', number-1, result ); // 1=>A, 2=>B, ..., 26=>Z, 27=>AA, 28=>BB, ... + lcl_formatChars1( lowerLetter, 26, number-1, result ); // 1=>A, 2=>B, ..., 26=>Z, 27=>AA, 28=>BB, ... break; case TRANSLITERATION: try { @@ -413,18 +420,28 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal case HANGUL_JAMO_KO: table = table_HangulJamo_ko; tableSize = sizeof(table_HangulJamo_ko) / sizeof(sal_Unicode); + recycleSymbol = sal_True; break; case HANGUL_SYLLABLE_KO: table = table_HangulSyllable_ko; tableSize = sizeof(table_HangulSyllable_ko) / sizeof(sal_Unicode); + recycleSymbol = sal_True; break; case HANGUL_CIRCLED_JAMO_KO: table = table_HangulCircledJamo_ko; tableSize = sizeof(table_HangulCircledJamo_ko) / sizeof(sal_Unicode); + recycleSymbol = sal_True; break; case HANGUL_CIRCLED_SYLLABLE_KO: table = table_HangulCircledSyllable_ko; tableSize = sizeof(table_HangulCircledSyllable_ko) / sizeof(sal_Unicode); + recycleSymbol = sal_True; + break; + case CHARS_ARABIC: + lcl_formatChars(table_Alphabet_ar, sizeof(table_Alphabet_ar) / sizeof(sal_Unicode), number - 1, result); + break; + case CHARS_THAI: + lcl_formatChars(table_Alphabet_th, sizeof(table_Alphabet_th) / sizeof(sal_Unicode), number - 1, result); break; default: @@ -451,43 +468,51 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal /* -----------------------------21.02.01 15:57-------------------------------- ---------------------------------------------------------------------------*/ + +#define LANG_ALL (1 << 0) +#define LANG_CJK (1 << 1) +#define LANG_CTL (1 << 2) + struct Supported_NumberingType { sal_Int16 nType; const sal_Char* cSymbol; + sal_Int16 langOption; }; static const Supported_NumberingType aSupportedTypes[] = { - {style::NumberingType::CHARS_UPPER_LETTER, "A"}, - {style::NumberingType::CHARS_LOWER_LETTER, "a"}, - {style::NumberingType::ROMAN_UPPER, "I"}, - {style::NumberingType::ROMAN_LOWER, "i"}, - {style::NumberingType::ARABIC, "1"}, - {style::NumberingType::NUMBER_NONE, "''"}, - {style::NumberingType::CHAR_SPECIAL, "Bullet"}, - {style::NumberingType::PAGE_DESCRIPTOR, "Page"}, - {style::NumberingType::BITMAP, "Bitmap"}, - {style::NumberingType::CHARS_UPPER_LETTER_N, "AAA"}, - {style::NumberingType::CHARS_LOWER_LETTER_N, "aaa"}, - {style::NumberingType::NATIVE_NUMBERING, "Native Numbering"}, - {style::NumberingType::FULLWIDTH_ARABIC, NULL}, - {style::NumberingType::CIRCLE_NUMBER, NULL}, - {style::NumberingType::NUMBER_LOWER_ZH, NULL}, - {style::NumberingType::NUMBER_UPPER_ZH, NULL}, - {style::NumberingType::NUMBER_UPPER_ZH_TW, NULL}, - {style::NumberingType::TIAN_GAN_ZH, NULL}, - {style::NumberingType::DI_ZI_ZH, NULL}, - {style::NumberingType::NUMBER_TRADITIONAL_JA, NULL}, - {style::NumberingType::AIU_FULLWIDTH_JA, NULL}, - {style::NumberingType::AIU_HALFWIDTH_JA, NULL}, - {style::NumberingType::IROHA_FULLWIDTH_JA, NULL}, - {style::NumberingType::IROHA_HALFWIDTH_JA, NULL}, - {style::NumberingType::NUMBER_UPPER_KO, NULL}, - {style::NumberingType::NUMBER_HANGUL_KO, NULL}, - {style::NumberingType::HANGUL_JAMO_KO, NULL}, - {style::NumberingType::HANGUL_SYLLABLE_KO, NULL}, - {style::NumberingType::HANGUL_CIRCLED_JAMO_KO, NULL}, - {style::NumberingType::HANGUL_CIRCLED_SYLLABLE_KO, NULL}, + {style::NumberingType::CHARS_UPPER_LETTER, "A", LANG_ALL}, + {style::NumberingType::CHARS_LOWER_LETTER, "a", LANG_ALL}, + {style::NumberingType::ROMAN_UPPER, "I", LANG_ALL}, + {style::NumberingType::ROMAN_LOWER, "i", LANG_ALL}, + {style::NumberingType::ARABIC, "1", LANG_ALL}, + {style::NumberingType::NUMBER_NONE, "''", LANG_ALL}, + {style::NumberingType::CHAR_SPECIAL, "Bullet", LANG_ALL}, + {style::NumberingType::PAGE_DESCRIPTOR, "Page", LANG_ALL}, + {style::NumberingType::BITMAP, "Bitmap", LANG_ALL}, + {style::NumberingType::CHARS_UPPER_LETTER_N, "AAA", LANG_ALL}, + {style::NumberingType::CHARS_LOWER_LETTER_N, "aaa", LANG_ALL}, + {style::NumberingType::NATIVE_NUMBERING, "Native Numbering", LANG_CJK|LANG_CTL}, + {style::NumberingType::FULLWIDTH_ARABIC, NULL, LANG_CJK}, + {style::NumberingType::CIRCLE_NUMBER, NULL, LANG_CJK}, + {style::NumberingType::NUMBER_LOWER_ZH, NULL, LANG_CJK}, + {style::NumberingType::NUMBER_UPPER_ZH, NULL, LANG_CJK}, + {style::NumberingType::NUMBER_UPPER_ZH_TW, NULL, LANG_CJK}, + {style::NumberingType::TIAN_GAN_ZH, NULL, LANG_CJK}, + {style::NumberingType::DI_ZI_ZH, NULL, LANG_CJK}, + {style::NumberingType::NUMBER_TRADITIONAL_JA, NULL, LANG_CJK}, + {style::NumberingType::AIU_FULLWIDTH_JA, NULL, LANG_CJK}, + {style::NumberingType::AIU_HALFWIDTH_JA, NULL, LANG_CJK}, + {style::NumberingType::IROHA_FULLWIDTH_JA, NULL, LANG_CJK}, + {style::NumberingType::IROHA_HALFWIDTH_JA, NULL, LANG_CJK}, + {style::NumberingType::NUMBER_UPPER_KO, NULL, LANG_CJK}, + {style::NumberingType::NUMBER_HANGUL_KO, NULL, LANG_CJK}, + {style::NumberingType::HANGUL_JAMO_KO, NULL, LANG_CJK}, + {style::NumberingType::HANGUL_SYLLABLE_KO, NULL, LANG_CJK}, + {style::NumberingType::HANGUL_CIRCLED_JAMO_KO, NULL, LANG_CJK}, + {style::NumberingType::HANGUL_CIRCLED_SYLLABLE_KO, NULL, LANG_CJK}, + {style::NumberingType::CHARS_ARABIC, NULL, LANG_CTL}, + {style::NumberingType::CHARS_THAI, NULL, LANG_CTL}, }; static const sal_Int32 nSupported_NumberingTypes = sizeof(aSupportedTypes) / sizeof(Supported_NumberingType); /* -----------------------------21.02.01 15:57-------------------------------- @@ -516,13 +541,58 @@ OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index) } } +sal_Bool SAL_CALL +DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) throw(RuntimeException) +{ + if (! xHierarchicalNameAccess.is()) { + Reference< XInterface > xInterface; + + xInterface = xSMgr->createInstance(OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")); + Reference< XMultiServiceFactory > xConfigProvider = + Reference< XMultiServiceFactory >(xInterface, UNO_QUERY ); + + if (! xConfigProvider.is()) + throw RuntimeException(); + + Sequence< Any > aArgs(1); + beans::PropertyValue aPath; + aPath.Name = OUString::createFromAscii("nodepath"); + aPath.Value <<= OUString::createFromAscii("/org.openoffice.Office.Common/I18N"), + aArgs[0] <<= aPath; + + xInterface = xConfigProvider->createInstanceWithArguments( + OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), aArgs); + + xHierarchicalNameAccess.set(xInterface, UNO_QUERY); + + if (! xHierarchicalNameAccess.is()) + throw RuntimeException(); + } + + Any aEnabled = xHierarchicalNameAccess->getByHierarchicalName(aName); + + sal_Bool enabled = sal_False; + + aEnabled >>= enabled; + + return enabled; +} + Sequence< sal_Int16 > DefaultNumberingProvider::getSupportedNumberingTypes( ) throw(RuntimeException) { Sequence< sal_Int16 > aRet(nSupported_NumberingTypes ); sal_Int16* pArray = aRet.getArray(); - for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++) + + sal_Bool cjkEnabled = isScriptFlagEnabled(OUString::createFromAscii("CJK/CJKFont")); + sal_Bool ctlEnabled = isScriptFlagEnabled(OUString::createFromAscii("CTL/CTLFont")); + + for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++) { + if ( (aSupportedTypes[i].langOption & LANG_ALL) || + (aSupportedTypes[i].langOption & LANG_CJK) && cjkEnabled || + (aSupportedTypes[i].langOption & LANG_CTL) && ctlEnabled) pArray[i] = aSupportedTypes[i].nType; + } return aRet; } /* -----------------------------21.02.01 15:57-------------------------------- diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx index dfee8434bc8e..d6e02b697d88 100644 --- a/i18npool/source/indexentry/indexentrysupplier.cxx +++ b/i18npool/source/indexentry/indexentrysupplier.cxx @@ -2,9 +2,9 @@ * * $RCSfile: indexentrysupplier.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: khong $ $Date: 2002-09-06 01:19:30 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -269,9 +269,13 @@ OUString SAL_CALL IndexEntrySupplier::getIndexCharacter( const OUString& rIndexE getIndexCharacter( rIndexEntry, rLocale, rSortAlgorithm ); } +#if (_MSC_VER < 1300) sal_Bool SAL_CALL operator == (const Locale& l1, const Locale& l2) { return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant; } +#else +extern sal_Bool SAL_CALL operator == (const Locale& l1, const Locale& l2); +#endif sal_Bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( RuntimeException ) { diff --git a/i18npool/source/localedata/data/ar_EG.xml b/i18npool/source/localedata/data/ar_EG.xml index 480c7e48f9ad..76fc5038d8bc 100644 --- a/i18npool/source/localedata/data/ar_EG.xml +++ b/i18npool/source/localedata/data/ar_EG.xml @@ -448,6 +448,72 @@ <quarter4Abbreviation>الربع الرابع</quarter4Abbreviation> </ReservedWords> </LC_MISC> -<LC_NumberingLevel ref="en_US"/> -<LC_OutLineNumberingLevel ref="en_US"/> +<LC_NumberingLevel> +<NumberingLevel Prefix=" " NumType="4" Suffix=")" /> +<NumberingLevel Prefix=" " NumType="31" Suffix="." /> +<NumberingLevel Prefix="(" NumType="4" Suffix=")" /> +<NumberingLevel Prefix=" " NumType="2" Suffix="." /> +<NumberingLevel Prefix=" " NumType="0" Suffix=")" /> +<NumberingLevel Prefix=" " NumType="1" Suffix=")" /> +<NumberingLevel Prefix="(" NumType="1" Suffix=")" /> +<NumberingLevel Prefix=" " NumType="3" Suffix="." /> +</LC_NumberingLevel> +<LC_OutLineNumberingLevel> +<OutlineStyle> +<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> +</OutlineStyle> +<OutlineStyle> +<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> +</OutlineStyle> +<OutlineStyle> +<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix="(" NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix="." BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> +</OutlineStyle> +<OutlineStyle> +<OutLineNumberingLevel Prefix=" " NumType="31" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="31" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> +</OutlineStyle> +<OutlineStyle> +<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> +</OutlineStyle> +<OutlineStyle> +<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="1" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> +</OutlineStyle> +<OutlineStyle> +<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="2" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="3" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="4" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> +</OutlineStyle> +<OutlineStyle> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="27A2" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="E006" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=")" BulletChar="E004" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> +</OutlineStyle> +</LC_OutLineNumberingLevel> </Locale> diff --git a/i18npool/source/localedata/data/ar_LB.xml b/i18npool/source/localedata/data/ar_LB.xml index 24a768cea8f4..f9e0345b2b47 100644 --- a/i18npool/source/localedata/data/ar_LB.xml +++ b/i18npool/source/localedata/data/ar_LB.xml @@ -179,6 +179,6 @@ </LC_CURRENCY> <LC_TRANSLITERATION ref="en_US"/> <LC_MISC ref="ar_EG"/> -<LC_NumberingLevel ref="en_US"/> -<LC_OutLineNumberingLevel ref="en_US"/> +<LC_NumberingLevel ref="ar_EG"/> +<LC_OutLineNumberingLevel ref="ar_EG"/> </Locale> diff --git a/i18npool/source/localedata/data/ar_SA.xml b/i18npool/source/localedata/data/ar_SA.xml index 292dcbf8a58f..71a2994110e0 100644 --- a/i18npool/source/localedata/data/ar_SA.xml +++ b/i18npool/source/localedata/data/ar_SA.xml @@ -204,6 +204,6 @@ </LC_CURRENCY> <LC_TRANSLITERATION ref="en_US"/> <LC_MISC ref="ar_EG"/> -<LC_NumberingLevel ref="en_US"/> -<LC_OutLineNumberingLevel ref="en_US"/> +<LC_NumberingLevel ref="ar_EG"/> +<LC_OutLineNumberingLevel ref="ar_EG"/> </Locale> diff --git a/i18npool/source/localedata/data/ar_TN.xml b/i18npool/source/localedata/data/ar_TN.xml index 342ed620d487..18a1fb2dc340 100644 --- a/i18npool/source/localedata/data/ar_TN.xml +++ b/i18npool/source/localedata/data/ar_TN.xml @@ -21,62 +21,62 @@ <MonthsOfYear> <Month> <MonthID>jan</MonthID> -<DefaultAbbrvName>ينا</DefaultAbbrvName> -<DefaultFullName>يناير</DefaultFullName> +<DefaultAbbrvName>جـانفي</DefaultAbbrvName> +<DefaultFullName>جـانفي</DefaultFullName> </Month> <Month> <MonthID>feb</MonthID> -<DefaultAbbrvName>فبر</DefaultAbbrvName> -<DefaultFullName>فبراير</DefaultFullName> +<DefaultAbbrvName>فيفري</DefaultAbbrvName> +<DefaultFullName>فيفري</DefaultFullName> </Month> <Month> <MonthID>mar</MonthID> -<DefaultAbbrvName>مار</DefaultAbbrvName> -<DefaultFullName>مارس</DefaultFullName> +<DefaultAbbrvName>مـارس</DefaultAbbrvName> +<DefaultFullName>مـارس</DefaultFullName> </Month> <Month> <MonthID>apr</MonthID> -<DefaultAbbrvName>أبر</DefaultAbbrvName> -<DefaultFullName>أبريل</DefaultFullName> +<DefaultAbbrvName>أفريل</DefaultAbbrvName> +<DefaultFullName>أفريل</DefaultFullName> </Month> <Month> <MonthID>may</MonthID> -<DefaultAbbrvName>ماي</DefaultAbbrvName> -<DefaultFullName>مايو</DefaultFullName> +<DefaultAbbrvName>مــاي</DefaultAbbrvName> +<DefaultFullName>مــاي</DefaultFullName> </Month> <Month> <MonthID>jun</MonthID> -<DefaultAbbrvName>يون</DefaultAbbrvName> -<DefaultFullName>يونيو</DefaultFullName> +<DefaultAbbrvName>جوان</DefaultAbbrvName> +<DefaultFullName>جوان</DefaultFullName> </Month> <Month> <MonthID>jul</MonthID> -<DefaultAbbrvName>يول</DefaultAbbrvName> -<DefaultFullName>يوليو</DefaultFullName> +<DefaultAbbrvName>جويلية</DefaultAbbrvName> +<DefaultFullName>جويلية</DefaultFullName> </Month> <Month> <MonthID>aug</MonthID> -<DefaultAbbrvName>أغس</DefaultAbbrvName> -<DefaultFullName>أغسطس</DefaultFullName> +<DefaultAbbrvName>أوت</DefaultAbbrvName> +<DefaultFullName>أوت</DefaultFullName> </Month> <Month> <MonthID>sep</MonthID> -<DefaultAbbrvName>سبت</DefaultAbbrvName> +<DefaultAbbrvName>سبتمبر</DefaultAbbrvName> <DefaultFullName>سبتمبر</DefaultFullName> </Month> <Month> <MonthID>oct</MonthID> -<DefaultAbbrvName>أكت</DefaultAbbrvName> +<DefaultAbbrvName>أكتوبر</DefaultAbbrvName> <DefaultFullName>أكتوبر</DefaultFullName> </Month> <Month> <MonthID>nov</MonthID> -<DefaultAbbrvName>نوف</DefaultAbbrvName> +<DefaultAbbrvName>نوفمبر</DefaultAbbrvName> <DefaultFullName>نوفمبر</DefaultFullName> </Month> <Month> <MonthID>dec</MonthID> -<DefaultAbbrvName>ديس</DefaultAbbrvName> +<DefaultAbbrvName>ديسمبر</DefaultAbbrvName> <DefaultFullName>ديسمبر</DefaultFullName> </Month> </MonthsOfYear> @@ -168,6 +168,6 @@ </LC_CURRENCY> <LC_TRANSLITERATION ref="en_US"/> <LC_MISC ref="ar_EG"/> -<LC_NumberingLevel ref="en_US"/> -<LC_OutLineNumberingLevel ref="en_US"/> +<LC_NumberingLevel ref="ar_EG"/> +<LC_OutLineNumberingLevel ref="ar_EG"/> </Locale> diff --git a/i18npool/source/localedata/data/en_US.xml b/i18npool/source/localedata/data/en_US.xml index 04770162a958..90af7fd67ff9 100644 --- a/i18npool/source/localedata/data/en_US.xml +++ b/i18npool/source/localedata/data/en_US.xml @@ -148,7 +148,7 @@ <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46"> -<FormatCode>MM/DD/YY HH:MM</FormatCode> +<FormatCode>MM/DD/YY HH:MM AM/PM</FormatCode> <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> diff --git a/i18npool/source/localedata/data/ko_KR.xml b/i18npool/source/localedata/data/ko_KR.xml index 64cdd164e882..234e587af66e 100644 --- a/i18npool/source/localedata/data/ko_KR.xml +++ b/i18npool/source/localedata/data/ko_KR.xml @@ -25,10 +25,10 @@ <LongDateYearSeparator>년</LongDateYearSeparator> </Separators> <Markers> -<QuotationStart>'</QuotationStart> -<QuotationEnd>'</QuotationEnd> -<DoubleQuotationStart>"</DoubleQuotationStart> -<DoubleQuotationEnd>"</DoubleQuotationEnd> +<QuotationStart>‘</QuotationStart> +<QuotationEnd>’</QuotationEnd> +<DoubleQuotationStart>“</DoubleQuotationStart> +<DoubleQuotationEnd>”</DoubleQuotationEnd> </Markers> <TimeAM>오전</TimeAM> <TimePM>오후</TimePM> @@ -252,13 +252,13 @@ <FormatCode>H:M:S</FormatCode> </FormatElement> <FormatElement msgid="TimeFormatskey12" default="false" type="medium" usage="TIME" formatindex="69"> -<FormatCode>AM/PM H"時" M"分" S"秒"</FormatCode> +<FormatCode>[~hanja]AM/PM H"時" M"分" S"秒"</FormatCode> </FormatElement> <FormatElement msgid="TimeFormatskey13" default="false" type="medium" usage="TIME" formatindex="70"> <FormatCode>AM/PM H:M:S</FormatCode> </FormatElement> <FormatElement msgid="TimeFormatskey14" default="false" type="medium" usage="TIME" formatindex="71"> -<FormatCode>AM/PM H"時" M"分"</FormatCode> +<FormatCode>[~hanja]AM/PM H"時" M"分"</FormatCode> </FormatElement> <FormatElement msgid="TimeFormatskey15" default="false" type="medium" usage="TIME" formatindex="72"> <FormatCode>AM/PM H:M</FormatCode> @@ -595,10 +595,10 @@ <OutlineStyle> <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix=" " NumType="28" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix=" " NumType="30" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2043" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="28" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="28" Suffix=")" BulletChar="0022" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix="(" NumType="4" Suffix=")" BulletChar="0022" BulletFontName="" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> </OutlineStyle> <OutlineStyle> @@ -611,10 +611,10 @@ <OutlineStyle> <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix="(" NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="14" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="" BulletFontName="" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> </OutlineStyle> <OutlineStyle> @@ -622,24 +622,25 @@ <OutLineNumberingLevel Prefix=" " NumType="30" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> <OutLineNumberingLevel Prefix=" " NumType="29" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix="(" NumType="4" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> +</OutlineStyle> + +<OutlineStyle> +<OutLineNumberingLevel Prefix=" " NumType="28" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="27" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="28" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix="(" NumType="27" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix="(" NumType="28" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> </OutlineStyle> <OutlineStyle> <OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="1" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> </OutlineStyle> -<OutlineStyle> -<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix=" " NumType="1" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> -</OutlineStyle> <OutlineStyle> <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> @@ -650,11 +651,11 @@ </OutlineStyle> <OutlineStyle> -<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="27A2" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="E006" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=")" BulletChar="E004" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> -<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="27A2" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="E006" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="E004" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="21E8" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> +<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="261E" BulletFontName="" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> </OutlineStyle> </LC_OutLineNumberingLevel> diff --git a/i18npool/source/localedata/data/makefile.mk b/i18npool/source/localedata/data/makefile.mk index f7b584bdc6d6..c2dad98fcecd 100644 --- a/i18npool/source/localedata/data/makefile.mk +++ b/i18npool/source/localedata/data/makefile.mk @@ -2,9 +2,9 @@ #* #* $RCSfile: makefile.mk,v $ #* -#* $Revision: 1.16 $ +#* $Revision: 1.17 $ #* -#* last change: $Author: er $ $Date: 2002-11-17 21:23:13 $ +#* last change: $Author: hr $ $Date: 2003-03-26 10:54:43 $ #* #* The Contents of this file are made available subject to the terms of #* either of the following licenses @@ -141,6 +141,7 @@ MY_MISC_CXXFILES = \ $(MISC)$/localedata_fr_FR.cxx \ $(MISC)$/localedata_fr_LU.cxx \ $(MISC)$/localedata_fr_MC.cxx \ + $(MISC)$/localedata_gu_IN.cxx \ $(MISC)$/localedata_he_IL.cxx \ $(MISC)$/localedata_hi_IN.cxx \ $(MISC)$/localedata_hu_HU.cxx \ @@ -151,11 +152,13 @@ MY_MISC_CXXFILES = \ $(MISC)$/localedata_ja_JP.cxx \ $(MISC)$/localedata_kn_IN.cxx \ $(MISC)$/localedata_ko_KR.cxx \ + $(MISC)$/localedata_mr_IN.cxx \ $(MISC)$/localedata_nb_NO.cxx \ $(MISC)$/localedata_nl_BE.cxx \ $(MISC)$/localedata_nl_NL.cxx \ $(MISC)$/localedata_nn_NO.cxx \ $(MISC)$/localedata_no_NO.cxx \ + $(MISC)$/localedata_pa_IN.cxx \ $(MISC)$/localedata_pl_PL.cxx \ $(MISC)$/localedata_pt_BR.cxx \ $(MISC)$/localedata_pt_PT.cxx \ @@ -165,9 +168,6 @@ MY_MISC_CXXFILES = \ $(MISC)$/localedata_sv_SE.cxx \ $(MISC)$/localedata_ta_IN.cxx \ $(MISC)$/localedata_te_IN.cxx \ - $(MISC)$/localedata_gu_IN.cxx \ - $(MISC)$/localedata_mr_IN.cxx \ - $(MISC)$/localedata_pa_IN.cxx \ $(MISC)$/localedata_th_TH.cxx \ $(MISC)$/localedata_tr_TR.cxx \ $(MISC)$/localedata_zh_CN.cxx \ @@ -243,39 +243,39 @@ DEF3NAME= $(SHL3TARGET) DEFLIB3NAME= $(SHL3TARGET) SHL3STDLIBS= $(LINK_LOCALEDATA_EN_LIB) $(LINK_LOCALEDATA_ES_LIB) SHL3OBJS= \ - $(SLO)$/localedata_de_DE.obj \ - $(SLO)$/localedata_fr_FR.obj \ - $(SLO)$/localedata_it_IT.obj \ - $(SLO)$/localedata_sv_SE.obj \ $(SLO)$/localedata_ca_ES.obj \ $(SLO)$/localedata_cs_CZ.obj \ $(SLO)$/localedata_da_DK.obj \ $(SLO)$/localedata_de_AT.obj \ $(SLO)$/localedata_de_CH.obj \ + $(SLO)$/localedata_de_DE.obj \ + $(SLO)$/localedata_de_LI.obj \ $(SLO)$/localedata_de_LU.obj \ $(SLO)$/localedata_el_GR.obj \ + $(SLO)$/localedata_et_EE.obj \ $(SLO)$/localedata_fi_FI.obj \ $(SLO)$/localedata_fr_BE.obj \ $(SLO)$/localedata_fr_CA.obj \ $(SLO)$/localedata_fr_CH.obj \ + $(SLO)$/localedata_fr_FR.obj \ $(SLO)$/localedata_fr_LU.obj \ $(SLO)$/localedata_fr_MC.obj \ $(SLO)$/localedata_is_IS.obj \ $(SLO)$/localedata_it_CH.obj \ + $(SLO)$/localedata_it_IT.obj \ + $(SLO)$/localedata_nb_NO.obj \ $(SLO)$/localedata_nl_BE.obj \ $(SLO)$/localedata_nl_NL.obj \ - $(SLO)$/localedata_no_NO.obj \ $(SLO)$/localedata_nn_NO.obj \ + $(SLO)$/localedata_no_NO.obj \ $(SLO)$/localedata_pl_PL.obj \ $(SLO)$/localedata_pt_BR.obj \ $(SLO)$/localedata_pt_PT.obj \ $(SLO)$/localedata_ru_RU.obj \ $(SLO)$/localedata_sl_SI.obj \ $(SLO)$/localedata_sv_FI.obj \ - $(SLO)$/localedata_tr_TR.obj \ - $(SLO)$/localedata_nb_NO.obj \ - $(SLO)$/localedata_de_LI.obj \ - $(SLO)$/localedata_et_EE.obj + $(SLO)$/localedata_sv_SE.obj \ + $(SLO)$/localedata_tr_TR.obj LIB3TARGET= $(SLB)$/$(SHL3TARGET).lib LIB3OBJFILES=$(SHL3OBJS) @@ -294,18 +294,18 @@ SHL4OBJS= \ $(SLO)$/localedata_ar_LB.obj \ $(SLO)$/localedata_ar_SA.obj \ $(SLO)$/localedata_ar_TN.obj \ + $(SLO)$/localedata_gu_IN.obj \ $(SLO)$/localedata_he_IL.obj \ $(SLO)$/localedata_hi_IN.obj \ $(SLO)$/localedata_hu_HU.obj \ $(SLO)$/localedata_id_ID.obj \ $(SLO)$/localedata_ja_JP.obj \ - $(SLO)$/localedata_ko_KR.obj \ $(SLO)$/localedata_kn_IN.obj \ - $(SLO)$/localedata_ta_IN.obj \ - $(SLO)$/localedata_te_IN.obj \ - $(SLO)$/localedata_gu_IN.obj \ + $(SLO)$/localedata_ko_KR.obj \ $(SLO)$/localedata_mr_IN.obj \ $(SLO)$/localedata_pa_IN.obj \ + $(SLO)$/localedata_ta_IN.obj \ + $(SLO)$/localedata_te_IN.obj \ $(SLO)$/localedata_th_TH.obj \ $(SLO)$/localedata_zh_CN.obj \ $(SLO)$/localedata_zh_HK.obj \ diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 0c19cf3a076a..7ca238a90a1e 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -2,9 +2,9 @@ * * $RCSfile: localedata.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: er $ $Date: 2002-10-10 13:20:50 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx index 7866f1c79251..99593886b9b7 100644 --- a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx +++ b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fullwidthToHalfwidth.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:20 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #include <oneToOneMapping.hxx> #define TRANSLITERATION_fullwidthToHalfwidth diff --git a/i18npool/source/transliteration/halfwidthToFullwidth.cxx b/i18npool/source/transliteration/halfwidthToFullwidth.cxx index 29790648b66e..2d2f30fc09ac 100644 --- a/i18npool/source/transliteration/halfwidthToFullwidth.cxx +++ b/i18npool/source/transliteration/halfwidthToFullwidth.cxx @@ -2,9 +2,9 @@ * * $RCSfile: halfwidthToFullwidth.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:21 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #define TRANSLITERATION_halfwidthToFullwidth #include <transliteration_OneToOne.hxx> diff --git a/i18npool/source/transliteration/hiraganaToKatakana.cxx b/i18npool/source/transliteration/hiraganaToKatakana.cxx index 7a6c77cb2dda..e2d44fe5e424 100644 --- a/i18npool/source/transliteration/hiraganaToKatakana.cxx +++ b/i18npool/source/transliteration/hiraganaToKatakana.cxx @@ -2,9 +2,9 @@ * * $RCSfile: hiraganaToKatakana.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:21 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #define TRANSLITERATION_hiraganaToKatakana #include <transliteration_OneToOne.hxx> diff --git a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx index 5a9037ba7e72..d56a40874199 100644 --- a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreBaFa_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:21 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #define TRANSLITERATION_BaFa_ja_JP #include <transliteration_Ignore.hxx> diff --git a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx index a284009c4dd0..4b099d7b7dcb 100644 --- a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreHyuByu_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:21 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #define TRANSLITERATION_HyuByu_ja_JP #include <transliteration_Ignore.hxx> diff --git a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx index a2c7a144d320..e99b9d826970 100644 --- a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreIandEfollowedByYa_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:22 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #include <oneToOneMapping.hxx> #define TRANSLITERATION_IandEfollowedByYa_ja_JP diff --git a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx index 02ff95476ff7..19d78605149f 100644 --- a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreIterationMark_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:22 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #include <oneToOneMapping.hxx> #define TRANSLITERATION_IterationMark_ja_JP diff --git a/i18npool/source/transliteration/ignoreKana.cxx b/i18npool/source/transliteration/ignoreKana.cxx index fd9f0875d072..47e530366b1a 100644 --- a/i18npool/source/transliteration/ignoreKana.cxx +++ b/i18npool/source/transliteration/ignoreKana.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreKana.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:22 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #define TRANSLITERATION_Kana #include <transliteration_Ignore.hxx> diff --git a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx index 51b26e8652cd..06d8d2ea98ca 100644 --- a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreKiKuFollowedBySa_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:22 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #define TRANSLITERATION_KiKuFollowedBySa_ja_JP #include <transliteration_Ignore.hxx> diff --git a/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx b/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx index 23c5404de5d6..5ab506a06ae3 100644 --- a/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreMiddleDot_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:22 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #define TRANSLITERATION_MiddleDot_ja_JP #include <transliteration_Ignore.hxx> diff --git a/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx b/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx index 7c294c488cd8..df3264341ee2 100644 --- a/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreMinusSign_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:22 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #include <transliteration_OneToOne.hxx> #define TRANSLITERATION_MinusSign_ja_JP diff --git a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx index 519ec1404a90..818673e59b59 100644 --- a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreProlongedSoundMark_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:23 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #define TRANSLITERATION_ProlongedSoundMark_ja_JP #include <transliteration_Ignore.hxx> diff --git a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx index 443f0221a65c..10a829238081 100644 --- a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreSeZe_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:23 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #define TRANSLITERATION_SeZe_ja_JP #include <transliteration_Ignore.hxx> diff --git a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx index 494582457ac0..b93007c85c6d 100644 --- a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreSeparator_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:23 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #include <oneToOneMapping.hxx> #define TRANSLITERATION_Separator_ja_JP diff --git a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx index ab0f4ab937ed..b0e2dea4adb3 100644 --- a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreSize_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:23 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #define TRANSLITERATION_Size_ja_JP #include <transliteration_Ignore.hxx> diff --git a/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx b/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx index f8f24f1fea7e..6c339853839c 100644 --- a/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreSpace_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:23 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #include <oneToOneMapping.hxx> #define TRANSLITERATION_Space_ja_JP diff --git a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx index ec519ddbe29d..6949b46bdc9f 100644 --- a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreTiJi_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:23 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #define TRANSLITERATION_TiJi_ja_JP #include <transliteration_Ignore.hxx> diff --git a/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx b/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx index 76510d4d1e60..e0d92e57b7ab 100644 --- a/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreTraditionalKana_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:24 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #define TRANSLITERATION_TraditionalKana_ja_JP #include <transliteration_Ignore.hxx> diff --git a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx index c6c534e73fa5..c7479a5208f1 100644 --- a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreTraditionalKanji_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:24 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #include <oneToOneMapping.hxx> #define TRANSLITERATION_TraditionalKanji_ja_JP diff --git a/i18npool/source/transliteration/ignoreWidth.cxx b/i18npool/source/transliteration/ignoreWidth.cxx index 623de6bc31a1..9726ac3e390f 100644 --- a/i18npool/source/transliteration/ignoreWidth.cxx +++ b/i18npool/source/transliteration/ignoreWidth.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreWidth.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:24 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #define TRANSLITERATION_Width #include <transliteration_Ignore.hxx> diff --git a/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx b/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx index bdcba4389bc4..7e1c3ef9fada 100644 --- a/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ignoreZiZu_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:24 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #define TRANSLITERATION_ZiZu_ja_JP #include <transliteration_Ignore.hxx> diff --git a/i18npool/source/transliteration/katakanaToHiragana.cxx b/i18npool/source/transliteration/katakanaToHiragana.cxx index 0890d5f7a3a9..17bee44996f0 100644 --- a/i18npool/source/transliteration/katakanaToHiragana.cxx +++ b/i18npool/source/transliteration/katakanaToHiragana.cxx @@ -2,9 +2,9 @@ * * $RCSfile: katakanaToHiragana.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:24 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #define TRANSLITERATION_katakanaToHiragana #include <transliteration_OneToOne.hxx> diff --git a/i18npool/source/transliteration/largeToSmall_ja_JP.cxx b/i18npool/source/transliteration/largeToSmall_ja_JP.cxx index 8856a4af15f0..ea39253cdcde 100644 --- a/i18npool/source/transliteration/largeToSmall_ja_JP.cxx +++ b/i18npool/source/transliteration/largeToSmall_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: largeToSmall_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:25 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #include <oneToOneMapping.hxx> #define TRANSLITERATION_largeToSmall_ja_JP diff --git a/i18npool/source/transliteration/numtochar.cxx b/i18npool/source/transliteration/numtochar.cxx index 0a07a475dc83..d422db81dd22 100644 --- a/i18npool/source/transliteration/numtochar.cxx +++ b/i18npool/source/transliteration/numtochar.cxx @@ -2,9 +2,9 @@ * * $RCSfile: numtochar.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:25 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #define TRANSLITERATION_ALL #include <numtochar.hxx> diff --git a/i18npool/source/transliteration/smallToLarge_ja_JP.cxx b/i18npool/source/transliteration/smallToLarge_ja_JP.cxx index eca054f8bbd2..91a5799c7662 100644 --- a/i18npool/source/transliteration/smallToLarge_ja_JP.cxx +++ b/i18npool/source/transliteration/smallToLarge_ja_JP.cxx @@ -2,9 +2,9 @@ * * $RCSfile: smallToLarge_ja_JP.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:25 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #include <oneToOneMapping.hxx> #define TRANSLITERATION_smallToLarge_ja_JP diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx index 4e7219a788d2..20753a0c03d1 100644 --- a/i18npool/source/transliteration/textToPronounce_zh.cxx +++ b/i18npool/source/transliteration/textToPronounce_zh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textToPronounce_zh.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:25 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #include <rtl/string.hxx> #include <rtl/ustrbuf.hxx> diff --git a/i18npool/source/transliteration/transliteration_OneToOne.cxx b/i18npool/source/transliteration/transliteration_OneToOne.cxx index d5e2d8c3ae9a..728aad7a83a0 100644 --- a/i18npool/source/transliteration/transliteration_OneToOne.cxx +++ b/i18npool/source/transliteration/transliteration_OneToOne.cxx @@ -2,9 +2,9 @@ * * $RCSfile: transliteration_OneToOne.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:26 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #include <transliteration_OneToOne.hxx> diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx index f906512bd556..404678157f08 100644 --- a/i18npool/source/transliteration/transliteration_caseignore.cxx +++ b/i18npool/source/transliteration/transliteration_caseignore.cxx @@ -2,9 +2,9 @@ * * $RCSfile: transliteration_caseignore.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2002-08-27 12:11:26 $ + * last change: $Author: hr $ $Date: 2003-03-26 10:54:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ // prevent internal compiler error with MSVC6SP3 -#include <utility> +#include <stl/utility> #include "oneToOneMapping.hxx" #include "transliteration_caseignore.hxx" diff --git a/i18npool/util/makefile.mk b/i18npool/util/makefile.mk index 3bdf1880842f..d44bff4b20b1 100644 --- a/i18npool/util/makefile.mk +++ b/i18npool/util/makefile.mk @@ -2,9 +2,9 @@ #* #* $RCSfile: makefile.mk,v $ #* -#* $Revision: 1.11 $ +#* $Revision: 1.12 $ #* -#* last change: $Author: er $ $Date: 2002-07-19 10:40:09 $ +#* last change: $Author: hr $ $Date: 2003-03-26 10:54:59 $ #* #* The Contents of this file are made available subject to the terms of #* either of the following licenses |