mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

com::sun::star->css in i18nutil

Browse Source 
Change-Id: I3148a1a08302fa9b21b0e5459f04ecee6ec30a18
Reviewed-on: https://gerrit.libreoffice.org/19455
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin
2015-10-19 11:46:05 +02:00
committed by Noel Grandin
parent 415d43473e
commit 40b26d1910
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
i18nutil/source/utility/paper.cxx
View File

@@ -335,7 +335,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
aLocaleStr = OUString::intern(RTL_CONSTASCII_USTRINGPARAM("en-US")); aLocaleStr = OUString::intern(RTL_CONSTASCII_USTRINGPARAM("en-US"));
// convert locale string to locale struct // convert locale string to locale struct
::com::sun::star::lang::Locale aSysLocale; css::lang::Locale aSysLocale;
sal_Int32 nDashPos = aLocaleStr.indexOf( '-' ); sal_Int32 nDashPos = aLocaleStr.indexOf( '-' );
if( nDashPos < 0 ) nDashPos = aLocaleStr.getLength(); if( nDashPos < 0 ) nDashPos = aLocaleStr.getLength();
aSysLocale.Language = aLocaleStr.copy( 0, nDashPos ); aSysLocale.Language = aLocaleStr.copy( 0, nDashPos );
@@ -405,8 +405,7 @@ Paper PaperInfo::fromPSName(const OString &rName)
//http://sourceware.org/git/?p=glibc.git;a=tree;f=localedata/locales //http://sourceware.org/git/?p=glibc.git;a=tree;f=localedata/locales
//http://en.wikipedia.org/wiki/Paper_size //http://en.wikipedia.org/wiki/Paper_size
//http://msdn.microsoft.com/en-us/library/cc195164.aspx //http://msdn.microsoft.com/en-us/library/cc195164.aspx
PaperInfo PaperInfo::getDefaultPaperForLocale( PaperInfo PaperInfo::getDefaultPaperForLocale( const css::lang::Locale & rLocale )
const ::com::sun::star::lang::Locale & rLocale)
{ {
Paper eType = PAPER_A4; Paper eType = PAPER_A4;

6
i18nutil/source/utility/unicode.cxx
View File

@@ -1023,7 +1023,7 @@ bool ToggleUnicodeCodepoint::AllowMoreInput(sal_Unicode uChar)
switch ( unicode::getUnicodeType(uChar) ) switch ( unicode::getUnicodeType(uChar) )
{ {
case ::com::sun::star::i18n::UnicodeType::SURROGATE: case css::i18n::UnicodeType::SURROGATE:
if( bPreventNonHex ) if( bPreventNonHex )
{ {
mbAllowMoreChars = false; mbAllowMoreChars = false;
@@ -1045,8 +1045,8 @@ bool ToggleUnicodeCodepoint::AllowMoreInput(sal_Unicode uChar)
mbAllowMoreChars = false; mbAllowMoreChars = false;
break; break;
case ::com::sun::star::i18n::UnicodeType::NON_SPACING_MARK: case css::i18n::UnicodeType::NON_SPACING_MARK:
case ::com::sun::star::i18n::UnicodeType::COMBINING_SPACING_MARK: case css::i18n::UnicodeType::COMBINING_SPACING_MARK:
if( bPreventNonHex ) if( bPreventNonHex )
{ {
mbAllowMoreChars = false; mbAllowMoreChars = false;