Kaydet (Commit) d1ea2722 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

range names need to be checked upper case, fdo#64031

Change-Id: I540821fd7058bf0da27d955c9d966a10dd21ec94
üst f77388c6
...@@ -41,7 +41,7 @@ private: ...@@ -41,7 +41,7 @@ private:
bool bAddUndo; bool bAddUndo;
bool bInCreate; bool bInCreate;
bool bDoInsert; // is set to FALSE for first update bool bDoInsert; // is set to FALSE for first update
bool FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const String& rAreaName ); bool FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const OUString& rAreaName );
public: public:
TYPEINFO(); TYPEINFO();
......
...@@ -190,13 +190,14 @@ bool ScAreaLink::IsEqual( const String& rFile, const String& rFilter, const Stri ...@@ -190,13 +190,14 @@ bool ScAreaLink::IsEqual( const String& rFile, const String& rFilter, const Stri
} }
// find a range with name >rAreaName< in >pSrcDoc<, return it in >rRange< // find a range with name >rAreaName< in >pSrcDoc<, return it in >rRange<
bool ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const String& rAreaName ) bool ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const OUString& rAreaName )
{ {
bool bFound = false; bool bFound = false;
OUString aUpperName = ScGlobal::pCharClass->uppercase(rAreaName);
ScRangeName* pNames = pSrcDoc->GetRangeName(); ScRangeName* pNames = pSrcDoc->GetRangeName();
if (pNames) // benannte Bereiche if (pNames) // benannte Bereiche
{ {
const ScRangeData* p = pNames->findByUpperName(rAreaName); const ScRangeData* p = pNames->findByUpperName(aUpperName);
if (p && p->IsValidReference(rRange)) if (p && p->IsValidReference(rRange))
bFound = true; bFound = true;
} }
...@@ -205,7 +206,7 @@ bool ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const Strin ...@@ -205,7 +206,7 @@ bool ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const Strin
ScDBCollection* pDBColl = pSrcDoc->GetDBCollection(); ScDBCollection* pDBColl = pSrcDoc->GetDBCollection();
if (pDBColl) if (pDBColl)
{ {
const ScDBData* pDB = pDBColl->getNamedDBs().findByUpperName(ScGlobal::pCharClass->uppercase(rAreaName)); const ScDBData* pDB = pDBColl->getNamedDBs().findByUpperName(aUpperName);
if (pDB) if (pDB)
{ {
SCTAB nTab; SCTAB nTab;
......
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