diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-07-08 21:45:05 +0200 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-08-05 14:30:22 -0400 |
| commit | c1ae4351ca8bd83161876c70f3cc1dcdfd40d66a (patch) | |
| tree | caa01842b70c9f9ff0950be6978a6237b4248ce1 | |
| parent | 7d6e550aff6e036ed9ea392796a56d3680ff9d2e (diff) | |
we don't need this function
actually the code was a bit wrong and was internally using the upper
case search without converting the name to uppercase
Change-Id: I3d7252cfc5022458be860613881bbeb9771a16cb
| -rw-r--r-- | sc/inc/dbdata.hxx | 1 | ||||
| -rw-r--r-- | sc/source/core/tool/dbdata.cxx | 5 | ||||
| -rw-r--r-- | sc/source/filter/oox/workbookhelper.cxx | 6 |
3 files changed, 3 insertions, 9 deletions
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index 3522fdf95470..89ed6440b238 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -237,7 +237,6 @@ public: const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); ScDBData* GetDBNearCursor(SCCOL nCol, SCROW nRow, SCTAB nTab ); - ScDBData* GetDBByName( const OUString& rName ); void DeleteOnTab( SCTAB nTab ); void UpdateReference(UpdateRefMode eUpdateRefMode, diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index e2bcbb621698..d7cff5db5314 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -923,11 +923,6 @@ ScDBData* ScDBCollection::GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCO return NULL; } -ScDBData* ScDBCollection::GetDBByName( const OUString& rName ) -{ - return maNamedDBs.findByUpperName( rName ); -} - void ScDBCollection::DeleteOnTab( SCTAB nTab ) { FindByTable func(nTab); diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index cd2461aa390d..7c094f63bb62 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -467,9 +467,9 @@ Reference< XDatabaseRange > WorkbookGlobals::createDatabaseRangeObject( OUString void WorkbookGlobals::addDatabaseFormatting( const OUString& rName, const ScDBDataFormatting& rDBDataFormatting ) { - //Is such smartness allowed? Or should catch objects and then call for each method call? - ScDBData* pDBRange = getScDocument().GetDBCollection()->GetDBByName( rName ); - if( pDBRange != NULL ) + ScDBData* pDBRange = getScDocument().GetDBCollection()->getNamedDBs().findByUpperName( + ScGlobal::pCharClass->uppercase(rName) ); + if( pDBRange ) pDBRange->SetTableFormatting( rDBDataFormatting ); } |