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

Stephan Bergmann sbergman at redhat.com
Tue Jul 7 05:26:08 PDT 2015


 i18npool/source/localedata/localedata.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 22935ed0a47bfc143303a8084cefd35eae94e6a9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jul 7 14:25:14 2015 +0200

    -fsanitize=function
    
    ...calling getOutlineNumberingLevels_en_US
    (workdir/CustomTarget/i18npool/localedata/localedata_en_US.cxx)
    
    Change-Id: Icf22a29ffa7c6309a5e10f9d9d7bd60f8e8a51b1

diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index a62fe94..19b302a 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -36,7 +36,7 @@ using namespace com::sun::star;
 
 typedef sal_Unicode**   (SAL_CALL * MyFunc_Type)( sal_Int16&);
 typedef sal_Unicode***  (SAL_CALL * MyFunc_Type2)( sal_Int16&, sal_Int16& );
-typedef sal_Unicode**** (SAL_CALL * MyFunc_Type3)( sal_Int16&, sal_Int16&, sal_Int16& );
+typedef sal_Unicode const **** (SAL_CALL * MyFunc_Type3)( sal_Int16&, sal_Int16&, sal_Int16& );
 typedef sal_Unicode const * const * (SAL_CALL * MyFunc_FormatCode)( sal_Int16&, sal_Unicode const *&, sal_Unicode const *& );
 
 #ifndef DISABLE_DYNLOADING
@@ -1381,22 +1381,22 @@ LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) throw(R
         sal_Int16 nStyles;
         sal_Int16 nLevels;
         sal_Int16 nAttributes;
-        sal_Unicode**** p0 = func( nStyles, nLevels, nAttributes );
+        sal_Unicode const **** p0 = func( nStyles, nLevels, nAttributes );
 
         Sequence< Reference<container::XIndexAccess> > aRet( nStyles );
 
         OUString aEmptyStr;
 
-        sal_Unicode**** pStyle = p0;
+        sal_Unicode const **** pStyle = p0;
         for( i=0;  i<nStyles;  i++ )
         {
             int j;
 
             OutlineNumberingLevel_Impl* level = new OutlineNumberingLevel_Impl[ nLevels+1 ];
-            sal_Unicode*** pLevel = pStyle[i];
+            sal_Unicode const *** pLevel = pStyle[i];
             for( j = 0;  j < nLevels;  j++ )
             {
-                sal_Unicode** pAttribute = pLevel[j];
+                sal_Unicode const ** pAttribute = pLevel[j];
                 for( int k=0; k<nAttributes; k++ )
                 {
                     OUString tmp( pAttribute[k] );


More information about the Libreoffice-commits mailing list