diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-01-23 15:40:46 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-01-23 15:50:28 +0100 |
| commit | 9964b4087924777d2bd585a5d6ce5c088ef65b65 (patch) | |
| tree | 2de4c6af498fdc9fe90433f9c1c1269f8b5e11c2 /i18npool | |
| parent | 4c752c44f8a0857c4f2dbd61aff6b2d10cf3b5e5 (diff) | |
fix 64-bit build after OUStringBuffer change
Change-Id: I6c5295110292ae48ff0cb3472e4dbea287645d2a
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/breakiterator/xdictionary.cxx | 4 | ||||
| -rw-r--r-- | i18npool/source/localedata/localedata.cxx | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx index 965b9b071775..5f14995c4cd2 100644 --- a/i18npool/source/breakiterator/xdictionary.cxx +++ b/i18npool/source/breakiterator/xdictionary.cxx @@ -161,10 +161,10 @@ void xdictionary::initDictionaryData(const sal_Char *pLang) aEntry.maLang = OString( pLang, strlen( pLang ) ); #ifdef SAL_DLLPREFIX - OUStringBuffer aBuf( strlen( pLang ) + 7 + 6 ); // mostly "lib*.so" (with * == dict_zh) + OUStringBuffer aBuf( sal::static_int_cast<int>(strlen(pLang) + 7 + 6) ); // mostly "lib*.so" (with * == dict_zh) aBuf.appendAscii( SAL_DLLPREFIX ); #else - OUStringBuffer aBuf( strlen( pLang ) + 7 + 4 ); // mostly "*.dll" (with * == dict_zh) + OUStringBuffer aBuf( sal::static_int_cast<int>(strlen(pLang) + 7 + 4) ); // mostly "*.dll" (with * == dict_zh) #endif aBuf.appendAscii( "dict_" ).appendAscii( pLang ).appendAscii( SAL_DLLEXTENSION ); aEntry.mhModule = osl_loadModuleRelative( &thisModule, aBuf.makeStringAndClear().pData, SAL_LOADMODULE_DEFAULT ); diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index a9ce49073526..dc2991d7b8b0 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -476,7 +476,8 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName( (bFallback && aFallback.equalsAscii(aLibTable[i].pLocale))) { #ifndef DISABLE_DYNLOADING - OUStringBuffer aBuf(strlen(aLibTable[i].pLocale) + 1 + strlen(pFunction)); + OUStringBuffer aBuf(sal::static_int_cast<int>( + strlen(aLibTable[i].pLocale) + 1 + strlen(pFunction))); { ::osl::MutexGuard aGuard( maMutex ); for (size_t l = 0; l < maLookupTable.size(); l++) |