diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-19 11:46:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-20 07:02:24 +0000 |
| commit | 40b26d1910aeccde0bb244cac26213a983ea8e2a (patch) | |
| tree | bf1e044da30b4376d2dd65483d63facfe1457cbe /i18nutil | |
| parent | 415d43473e7c760d47e4422dabda29147f44aa02 (diff) | |
com::sun::star->css in i18nutil
Change-Id: I3148a1a08302fa9b21b0e5459f04ecee6ec30a18
Reviewed-on: https://gerrit.libreoffice.org/19455
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'i18nutil')
| -rw-r--r-- | i18nutil/source/utility/paper.cxx | 5 | ||||
| -rw-r--r-- | i18nutil/source/utility/unicode.cxx | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx index 846da75d9121..27543326d5d3 100644 --- a/i18nutil/source/utility/paper.cxx +++ b/i18nutil/source/utility/paper.cxx @@ -335,7 +335,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper() aLocaleStr = OUString::intern(RTL_CONSTASCII_USTRINGPARAM("en-US")); // convert locale string to locale struct - ::com::sun::star::lang::Locale aSysLocale; + css::lang::Locale aSysLocale; sal_Int32 nDashPos = aLocaleStr.indexOf( '-' ); if( nDashPos < 0 ) nDashPos = aLocaleStr.getLength(); 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://en.wikipedia.org/wiki/Paper_size //http://msdn.microsoft.com/en-us/library/cc195164.aspx -PaperInfo PaperInfo::getDefaultPaperForLocale( - const ::com::sun::star::lang::Locale & rLocale) +PaperInfo PaperInfo::getDefaultPaperForLocale( const css::lang::Locale & rLocale ) { Paper eType = PAPER_A4; diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx index 6a639fa718cb..5180e1ec0674 100644 --- a/i18nutil/source/utility/unicode.cxx +++ b/i18nutil/source/utility/unicode.cxx @@ -1023,7 +1023,7 @@ bool ToggleUnicodeCodepoint::AllowMoreInput(sal_Unicode uChar) switch ( unicode::getUnicodeType(uChar) ) { - case ::com::sun::star::i18n::UnicodeType::SURROGATE: + case css::i18n::UnicodeType::SURROGATE: if( bPreventNonHex ) { mbAllowMoreChars = false; @@ -1045,8 +1045,8 @@ bool ToggleUnicodeCodepoint::AllowMoreInput(sal_Unicode uChar) mbAllowMoreChars = false; break; - case ::com::sun::star::i18n::UnicodeType::NON_SPACING_MARK: - case ::com::sun::star::i18n::UnicodeType::COMBINING_SPACING_MARK: + case css::i18n::UnicodeType::NON_SPACING_MARK: + case css::i18n::UnicodeType::COMBINING_SPACING_MARK: if( bPreventNonHex ) { mbAllowMoreChars = false; |