diff options
| -rw-r--r-- | connectivity/source/drivers/evoab2/EApi.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx index 608b1f9f5452..8e0d0dbd9433 100644 --- a/connectivity/source/drivers/evoab2/EApi.cxx +++ b/connectivity/source/drivers/evoab2/EApi.cxx @@ -95,10 +95,10 @@ static ApiMap aNewApiMap[] = }; #undef SYM_MAP -static bool -tryLink( oslModule &aModule, const char *pName, ApiMap *pMap, guint nEntries ) +template<size_t N> static bool +tryLink( oslModule &aModule, const char *pName, const ApiMap (&pMap)[N]) { - for (guint i = 0; i < nEntries; ++i) + for (guint i = 0; i < N; ++i) { SymbolFunc aMethod = (SymbolFunc)osl_getFunctionSymbol (aModule, OUString::createFromAscii ( pMap[ i ].sym_name ).pData); @@ -124,14 +124,14 @@ bool EApiInit() SAL_LOADMODULE_DEFAULT ); if( aModule) { - if (tryLink( aModule, eBookLibNames[ j ], aCommonApiMap, G_N_ELEMENTS(aCommonApiMap))) + if (tryLink( aModule, eBookLibNames[ j ], aCommonApiMap)) { if (eds_check_version(3, 6, 0) == NULL) { - if (tryLink( aModule, eBookLibNames[ j ], aNewApiMap, G_N_ELEMENTS(aNewApiMap))) + if (tryLink( aModule, eBookLibNames[ j ], aNewApiMap)) return true; } - else if (tryLink( aModule, eBookLibNames[ j ], aOldApiMap, G_N_ELEMENTS(aOldApiMap))) + else if (tryLink( aModule, eBookLibNames[ j ], aOldApiMap)) { return true; } |