diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:40:48 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:40:48 +0000 |
| commit | 71d9704860ff64d6942948f5c8e1696cc2a4a1b1 (patch) | |
| tree | 61f3a30c7891c984a379860de4299275a72a7622 /i18npool/inc/localedata.hxx | |
| parent | 1408d6cfcf2e99235c8df7d083e9208d6c9a115a (diff) | |
INTEGRATION: CWS warnings01 (1.12.14); FILE MERGED
2006/05/24 00:26:06 sb 1.12.14.4: RESYNC: (1.14-1.15); FILE MERGED
2006/04/07 21:03:50 sb 1.12.14.3: RESYNC: (1.13-1.14); FILE MERGED
2006/01/25 22:02:44 sb 1.12.14.2: RESYNC: (1.12-1.13); FILE MERGED
2005/11/10 10:14:58 pl 1.12.14.1: #i53898# removed warnings
Diffstat (limited to 'i18npool/inc/localedata.hxx')
| -rw-r--r-- | i18npool/inc/localedata.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index b89cb3531a66..8445af072097 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -4,9 +4,9 @@ * * $RCSfile: localedata.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: hr $ $Date: 2006-04-20 13:28:47 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:40:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -152,8 +152,8 @@ private : std::vector<lookupTableItem*> lookupTable; lookupTableItem *cachedItem; - void* SAL_CALL getFunctionSymbol( const com::sun::star::lang::Locale& rLocale, const sal_Char* pFunction ) throw( com::sun::star::uno::RuntimeException ); - void* SAL_CALL getFunctionSymbolByName( const rtl::OUString& localeName, const sal_Char* pFunction ); + oslGenericFunction SAL_CALL getFunctionSymbol( const com::sun::star::lang::Locale& rLocale, const sal_Char* pFunction ) throw( com::sun::star::uno::RuntimeException ); + oslGenericFunction SAL_CALL getFunctionSymbolByName( const rtl::OUString& localeName, const sal_Char* pFunction ); sal_Unicode ** SAL_CALL getIndexArray(const com::sun::star::lang::Locale& rLocale, sal_Int16& indexCount); sal_Unicode ** SAL_CALL getIndexArrayForAlgorithm(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rAlgorithm); com::sun::star::i18n::Calendar ref_cal; |