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

[Stephan Bergmann]

 sc/source/filter/excel/xestream.cxx |    9 +++++++--
 sd/source/filter/eppt/pptx-text.cxx |    2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 5bdaf82cce321d4a86914f1ee4e8abfea384b218
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 17 10:40:53 2015 +0100

    Don't assume sal_Unicode is unsigned short
    
    Change-Id: I508520556cd5755d81740b00c7815eebdef6576e

diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 8eae702..c5f53c9a 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -249,7 +249,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, bool bGe
     sal_Int16 nScriptType = SvtLanguageOptions::FromSvtScriptTypeToI18N( SvtLanguageOptions::GetScriptTypeOfLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ) );
     if ( mpText && mnTextSize && xPPTBreakIter.is() )
     {
-        OUString sT( mpText, mnTextSize );
+        OUString sT( reinterpret_cast<sal_Unicode *>(mpText), mnTextSize );
         nScriptType = xPPTBreakIter->getScriptType( sT, 0 );
     }
     if ( nScriptType != css::i18n::ScriptType::COMPLEX )
commit 7ab065c124e8110b14b6c91f210cea3c5f0d0c83
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 17 10:40:39 2015 +0100

    Don't assume sal_Unicode is unsigned short
    
    Change-Id: I6125c2abe1dbfd0a5ecf020b8363fc277d195157

diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 26f8bbb..07564e3 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -730,7 +730,9 @@ OString XclXmlUtils::ToOString( const ScfUInt16Vec& rBuffer )
         return OString();
 
     const sal_uInt16* pBuffer = &rBuffer [0];
-    return OString( pBuffer, rBuffer.size(), RTL_TEXTENCODING_UTF8 );
+    return OString(
+        reinterpret_cast<sal_Unicode const *>(pBuffer), rBuffer.size(),
+        RTL_TEXTENCODING_UTF8);
 }
 
 OString XclXmlUtils::ToOString( const ScRange& rRange )
@@ -802,7 +804,10 @@ OUString XclXmlUtils::ToOUString( const ScfUInt16Vec& rBuf, sal_Int32 nStart, sa
     if( nLength == -1 || ( nLength > ((sal_Int32)rBuf.size() - nStart) ) )
         nLength = (rBuf.size() - nStart);
 
-    return (nLength > 0) ? OUString( &rBuf[nStart], nLength ) : OUString();
+    return nLength > 0
+        ? OUString(
+            reinterpret_cast<sal_Unicode const *>(&rBuf[nStart]), nLength)
+        : OUString();
 }
 
 OUString XclXmlUtils::ToOUString(