[Libreoffice-commits] core.git: sc/source
Eike Rathke
erack at redhat.com
Wed May 25 21:18:40 UTC 2016
sc/source/ui/docshell/externalrefmgr.cxx | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
New commits:
commit 386b284241a16d96eaf792e2385c41f57ce3d870
Author: Eike Rathke <erack at redhat.com>
Date: Wed May 25 23:16:48 2016 +0200
remove now moot comment, tdf#86282 follow-up
Change-Id: I7e720de93a5f47ca6a81addbb75c113dc2fe53f0
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 3db616cc..f703b67 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -987,17 +987,6 @@ void ScExternalRefCache::initializeDoc(sal_uInt16 nFileId, const vector<OUString
pDoc->maSingleTableNameAlias = rBaseName;
else if (ScGlobal::GetpTransliteration()->isEqual( pDoc->maTableNames[0].maRealName, rBaseName))
pDoc->maSingleTableNameAlias = aSheetName;
-
- /* TODO: future versions could swap the table name with the base name,
- * so the base name gets stored instead of Sheet1, which can be
- * localized and then will not match in another localized UI once the
- * link was updated/refreshed. This never worked before
- * a4f09f8c2ef3ae82b86d1b4f0c6c90d1a61614fa accidentally "fixed" it for
- * fdo#73552 only for CSV files but broke older existing documents.
- * Either that, or always store 'Sheet1' or something?
- * However, do that only for imported files that do not store sheet
- * names, e.g. CSV, HTML, ..., but not for spreadsheet documents. */
-
}
pDoc->mbInitFromSource = true;
@@ -1011,10 +1000,9 @@ ScExternalRefCache::TableNameIndexMap::const_iterator ScExternalRefCache::DocIte
if (itrTabName != maTableNameIndex.end())
return itrTabName;
- // For some time for external references to .csv files the base name was
+ // Since some time for external references to CSV files the base name is
// used as sheet name instead of Sheet1, check if we can resolve that.
- // Also helps users that got accustomed to give the base name instead of
- // Sheet1.
+ // Also helps users that got accustomed to one or the other way.
if (maSingleTableNameAlias.isEmpty() || maTableNameIndex.size() != 1)
return itrTabName;
More information about the Libreoffice-commits
mailing list