[Libreoffice-commits] core.git: i18nutil/source

[Noel Grandin]

 i18nutil/source/utility/paper.cxx   |    5 ++---
 i18nutil/source/utility/unicode.cxx |    6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 40b26d1910aeccde0bb244cac26213a983ea8e2a
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Oct 19 11:46:05 2015 +0200

    com::sun::star->css in i18nutil
    
    Change-Id: I3148a1a08302fa9b21b0e5459f04ecee6ec30a18
    Reviewed-on: https://gerrit.libreoffice.org/19455
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx
index 846da75..2754332 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 6a639fa..5180e1e 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;