diff options
| author | Eike Rathke <erack@openoffice.org> | 2011-02-08 19:44:39 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@openoffice.org> | 2011-02-08 19:44:39 +0100 |
| commit | 59de99050dfb478e3cfb0f355808ce676bc03888 (patch) | |
| tree | 414753aad99997b2b2c3426764426cc7bd88cf06 /i18npool/source | |
| parent | 801b88c05053180d5ddc5d84c3f538cecd3164b2 (diff) | |
| parent | 99ff7a9fb521895d6ba18ca4ca92d7eb0c3524fd (diff) | |
locales34: merge m99
Diffstat (limited to 'i18npool/source')
| -rw-r--r-- | i18npool/source/breakiterator/breakiteratorImpl.cxx | 4 | ||||
| -rw-r--r-- | i18npool/source/paper/paper.cxx | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index d22203d100c7..19b175d4bd83 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -448,6 +448,10 @@ typedef struct { sal_Int16 script; } UBlock2Script; +// for a list of the UBLOCK_... values see: +// http://icu-project.org/apiref/icu4c/uchar_8h.html +// where enum UBlockCode is defined. +// See also http://www.unicode.org/charts/ for general reference static UBlock2Script scriptList[] = { {UBLOCK_NO_BLOCK, UBLOCK_NO_BLOCK, ScriptType::WEAK}, {UBLOCK_BASIC_LATIN, UBLOCK_ARMENIAN, ScriptType::LATIN}, diff --git a/i18npool/source/paper/paper.cxx b/i18npool/source/paper/paper.cxx index e94efa6e06c5..0d9235747fd6 100644 --- a/i18npool/source/paper/paper.cxx +++ b/i18npool/source/paper/paper.cxx @@ -27,6 +27,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_i18npool.hxx" + +#include <osl/diagnose.h> #include <sal/config.h> #include <rtl/ustring.hxx> #include <rtl/string.hxx> @@ -129,7 +131,6 @@ static PageDesc aDinTab[] = { MM2MM100( 227 ), MM2MM100( 356 ), "SuperA", NULL }, { MM2MM100( 305 ), MM2MM100( 487 ), "SuperB", NULL }, { IN2MM100( 8.5 ), IN2MM100( 12.69 ), "LetterPlus", NULL }, - { IN2MM100( 8.5 ), IN2MM100( 12.69 ), "LetterPlus", NULL }, { MM2MM100( 210 ), MM2MM100( 330 ), "A4Plus", NULL }, { MM2MM100( 200 ), MM2MM100( 148 ), "DoublePostcard", NULL }, { MM2MM100( 105 ), MM2MM100( 148 ), "A6", NULL }, @@ -385,6 +386,9 @@ PaperInfo PaperInfo::getSystemDefaultPaper() PaperInfo::PaperInfo(Paper eType) : m_eType(eType) { + OSL_ENSURE( sizeof(aDinTab) / sizeof(aDinTab[0]) == NUM_PAPER_ENTRIES, + "mismatch between array entries and enum values" ); + m_nPaperWidth = aDinTab[m_eType].m_nWidth; m_nPaperHeight = aDinTab[m_eType].m_nHeight; } |