diff options
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/addincol.hxx | 7 | ||||
| -rw-r--r-- | sc/source/core/tool/addincol.cxx | 16 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/funcuno.cxx | 7 |
4 files changed, 17 insertions, 19 deletions
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx index 23062ea22941..09a27c0d5883 100644 --- a/sc/inc/addincol.hxx +++ b/sc/inc/addincol.hxx @@ -2,9 +2,9 @@ * * $RCSfile: addincol.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: er $ $Date: 2002-11-19 22:05:18 $ + * last change: $Author: er $ $Date: 2002-11-21 16:15:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -146,7 +146,8 @@ public: ScUnoAddInCollection(); ~ScUnoAddInCollection(); - String FindFunction( const String& rName, BOOL bLocalFirst ); // user entered name + /// User enetered name. rUpperName MUST already be upper case! + String FindFunction( const String& rUpperName, BOOL bLocalFirst ); const ScUnoAddInFuncData* GetFuncData( const String& rName ); // exact name void LocalizeString( String& rName ); // modify rName - input: exact name diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 537b9abb13b4..f8e359119d7b 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -2,9 +2,9 @@ * * $RCSfile: addincol.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: er $ $Date: 2002-11-19 22:07:09 $ + * last change: $Author: er $ $Date: 2002-11-21 16:15:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -782,7 +782,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& } } -String ScUnoAddInCollection::FindFunction( const String& rName, BOOL bLocalFirst ) +String ScUnoAddInCollection::FindFunction( const String& rUpperName, BOOL bLocalFirst ) { if (!bInitialized) Initialize(); @@ -790,20 +790,18 @@ String ScUnoAddInCollection::FindFunction( const String& rName, BOOL bLocalFirst if (nFuncCount == 0) return EMPTY_STRING; - String aUpperCmp( ScGlobal::pCharClass->upper( rName ) ); - if ( bLocalFirst ) { // first scan all local names (used for entering formulas) - ScAddInHashMap::const_iterator iLook( pLocalHashMap->find( aUpperCmp ) ); + ScAddInHashMap::const_iterator iLook( pLocalHashMap->find( rUpperName ) ); if ( iLook != pLocalHashMap->end() ) return iLook->second->GetOriginalName(); #if 0 // after that, scan international names (really?) - iLook = pNameHashMap->find( aUpperCmp ); + iLook = pNameHashMap->find( rUpperName ); if ( iLook != pNameHashMap->end() ) return iLook->second->GetOriginalName(); #endif @@ -813,13 +811,13 @@ String ScUnoAddInCollection::FindFunction( const String& rName, BOOL bLocalFirst // first scan international names (used when calling a function) //! before that, check for exact match??? - ScAddInHashMap::const_iterator iLook( pNameHashMap->find( aUpperCmp ) ); + ScAddInHashMap::const_iterator iLook( pNameHashMap->find( rUpperName ) ); if ( iLook != pNameHashMap->end() ) return iLook->second->GetOriginalName(); // after that, scan all local names (to allow replacing old AddIns with Uno) - iLook = pLocalHashMap->find( aUpperCmp ); + iLook = pLocalHashMap->find( rUpperName ); if ( iLook != pLocalHashMap->end() ) return iLook->second->GetOriginalName(); } diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index be65b1a65818..36458ef41026 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: interpr4.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: mh $ $Date: 2001-10-23 15:13:33 $ + * last change: $Author: er $ $Date: 2002-11-21 16:15:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1598,7 +1598,7 @@ void ScInterpreter::ScExternal() USHORT nIndex; BYTE nParamCount = GetByte(); String aUnoName; - String aFuncName( pCur->GetExternal() ); + String aFuncName( ScGlobal::pCharClass->upper( pCur->GetExternal() ) ); if (ScGlobal::GetFuncCollection()->SearchFunc(aFuncName, nIndex)) { FuncData* pFuncData = (FuncData*)ScGlobal::GetFuncCollection()->At(nIndex); diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index aac06fee094b..67d53a083baa 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: funcuno.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: er $ $Date: 2002-11-19 22:08:22 $ + * last change: $Author: er $ $Date: 2002-11-21 16:17:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -352,8 +352,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFunctionAccess ) BOOL lcl_AddFunctionToken( ScTokenArray& rArray, const rtl::OUString& rName ) { // function names are always case-insensitive - String aUpper( rName ); - ScGlobal::pCharClass->toUpper( aUpper ); + String aUpper( ScGlobal::pCharClass->upper( rName ) ); // same options as in ScCompiler::IsOpCode: // 1. built-in function name |