Kaydet (Commit) adced867 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

-fsanitize=function

...similar to 22935ed0 "-fsanitize=function"

Change-Id: I9000389d648ef918d9639a9d8ca99d82f3684445
üst 2a1fe443
...@@ -35,7 +35,7 @@ using namespace com::sun::star::lang; ...@@ -35,7 +35,7 @@ using namespace com::sun::star::lang;
using namespace com::sun::star; using namespace com::sun::star;
typedef sal_Unicode** (SAL_CALL * MyFunc_Type)( sal_Int16&); typedef sal_Unicode** (SAL_CALL * MyFunc_Type)( sal_Int16&);
typedef sal_Unicode*** (SAL_CALL * MyFunc_Type2)( sal_Int16&, sal_Int16& ); typedef sal_Unicode const *** (SAL_CALL * MyFunc_Type2)( sal_Int16&, sal_Int16& );
typedef sal_Unicode const **** (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 *& ); typedef sal_Unicode const * const * (SAL_CALL * MyFunc_FormatCode)( sal_Int16&, sal_Unicode const *&, sal_Unicode const *& );
...@@ -1268,7 +1268,7 @@ LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale ) thro ...@@ -1268,7 +1268,7 @@ LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale ) thro
// invoke function // invoke function
sal_Int16 nStyles; sal_Int16 nStyles;
sal_Int16 nAttributes; sal_Int16 nAttributes;
sal_Unicode*** p0 = func( nStyles, nAttributes ); sal_Unicode const *** p0 = func( nStyles, nAttributes );
// allocate memory for nAttributes attributes for each of the nStyles styles. // allocate memory for nAttributes attributes for each of the nStyles styles.
Sequence< Sequence<beans::PropertyValue> > pv( nStyles ); Sequence< Sequence<beans::PropertyValue> > pv( nStyles );
...@@ -1276,11 +1276,11 @@ LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale ) thro ...@@ -1276,11 +1276,11 @@ LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale ) thro
pv[i] = Sequence<beans::PropertyValue>( nAttributes ); pv[i] = Sequence<beans::PropertyValue>( nAttributes );
} }
sal_Unicode*** pStyle = p0; sal_Unicode const *** pStyle = p0;
for( i=0; i<nStyles; i++ ) { for( i=0; i<nStyles; i++ ) {
sal_Unicode** pAttribute = pStyle[i]; sal_Unicode const ** pAttribute = pStyle[i];
for( int j=0; j<nAttributes; j++ ) { // prefix, numberingtype, ... for( int j=0; j<nAttributes; j++ ) { // prefix, numberingtype, ...
sal_Unicode* pString = pAttribute[j]; sal_Unicode const * pString = pAttribute[j];
beans::PropertyValue& rVal = pv[i][j]; beans::PropertyValue& rVal = pv[i][j];
OUString sVal; OUString sVal;
if( pString ) { if( pString ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment