summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-06-25 14:43:18 +0200
committerEike Rathke <erack@redhat.com>2015-06-25 14:49:26 +0200
commit58b0c0cf0c1429ec2f7f5ef8fc9ebc4840ace92d (patch)
treef915472f52fc89212453f9044ca99e33b2f85630 /sc
parent3928a1514c9202a52d698570022c197ecc8703eb (diff)
TableRef: move getTables().applyTableColumns() to the correct position
... in import sequence. Change-Id: Ib5601af281f0378d283ecd61fa71c41e6c1be254
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/oox/workbookfragment.cxx1
-rw-r--r--sc/source/filter/oox/worksheethelper.cxx1
2 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 342be2b47d90..4b37d0f20c79 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -461,6 +461,7 @@ void WorkbookFragment::finalizeImport()
// create all database ranges and defined names, in that order
getTables().finalizeImport();
+ getTables().applyTableColumns();
getDefinedNames().finalizeImport();
// open the VBA project storage
OUString aVbaFragmentPath = getFragmentPathFromFirstType( CREATE_MSOFFICE_RELATION_TYPE( "vbaProject" ) );
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 9875f0e09465..d74f344b1f02 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -943,7 +943,6 @@ void WorksheetGlobals::finalizeWorksheetImport()
// assumes getTables().finalizeImport ( which creates the DatabaseRanges )
// has been called already
getTables().applyAutoFilters();
- getTables().applyTableColumns();
getCondFormats().finalizeImport();
lclUpdateProgressBar( mxFinalProgress, 0.25 );