[Libreoffice-commits] core.git: 2 commits - editeng/source

[Eike Rathke]

 editeng/source/misc/hangulhanja.cxx |    2 +-
 editeng/source/misc/unolingu.cxx    |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit eb6659dc5d1ddf6ea2a0396f158bccdc4b7d5b3c
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Feb 5 18:06:51 2015 +0100

    yet yet yet yet another Windows build 'Locale' ambiguous symbol
    
    Change-Id: I8ceaa2544cef8119cb394a2f4aebea066d04609e

diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 28a885c..de31456 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -75,7 +75,7 @@ class ThesDummy_Impl :
     public cppu::WeakImplHelper1< XThesaurus >
 {
     uno::Reference< XThesaurus >     xThes;      // the real one...
-    Sequence< Locale >         *pLocaleSeq;
+    Sequence< lang::Locale >         *pLocaleSeq;
 
     void GetCfgLocales();
 
@@ -121,8 +121,8 @@ void ThesDummy_Impl::GetCfgLocales()
         Sequence < OUString > aNodeNames( aCfg.GetNodeNames( aNode ) );
         const OUString *pNodeNames = aNodeNames.getConstArray();
         sal_Int32 nLen = aNodeNames.getLength();
-        pLocaleSeq = new Sequence< Locale >( nLen );
-        Locale *pLocale = pLocaleSeq->getArray();
+        pLocaleSeq = new Sequence< lang::Locale >( nLen );
+        lang::Locale *pLocale = pLocaleSeq->getArray();
         for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             pLocale[i] = LanguageTag::convertToLocaleWithFallback( pNodeNames[i] );
@@ -171,8 +171,8 @@ sal_Bool SAL_CALL
         GetCfgLocales();
     bool bFound = false;
     sal_Int32 nLen = pLocaleSeq->getLength();
-    const Locale *pLocale = pLocaleSeq->getConstArray();
-    const Locale *pEnd = pLocale + nLen;
+    const lang::Locale *pLocale = pLocaleSeq->getConstArray();
+    const lang::Locale *pEnd = pLocale + nLen;
     for ( ;  pLocale < pEnd  &&  !bFound;  ++pLocale)
     {
         bFound = pLocale->Language == rLocale.Language  &&
commit 7cff4cc2e8f75f1aa308463562cf7fff2ef99a33
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Feb 5 18:03:06 2015 +0100

    and now a Windows build 'BreakIterator' ambiguous symbol
    
    Change-Id: If5f3eb41b74b02ee44902216eada64d49bc5e9e8

diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index a041de8..acdb6dd 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -592,7 +592,7 @@ namespace editeng
             try
             {
                 // get the break iterator service
-                Reference< XBreakIterator > xBreakIter = BreakIterator::create( m_xContext );
+                Reference< XBreakIterator > xBreakIter = i18n::BreakIterator::create( m_xContext );
                 sal_Int32 nNextAsianScript = xBreakIter->beginOfScript( m_sCurrentPortion, m_nCurrentStartIndex, com::sun::star::i18n::ScriptType::ASIAN );
                 if ( -1 == nNextAsianScript )
                     nNextAsianScript = xBreakIter->nextScript( m_sCurrentPortion, m_nCurrentStartIndex, com::sun::star::i18n::ScriptType::ASIAN );