From 7299bdf02746d23de98d3237e47eba365a9657a5 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 15 Aug 2017 19:58:04 +0200 Subject: external data: apply the transformation still in the fetch thread Change-Id: I0509a569f47fcf838ea5c102e6fd0c6e765a0152 Reviewed-on: https://gerrit.libreoffice.org/41208 Tested-by: Jenkins Reviewed-by: Markus Mohrhard --- sc/source/ui/dataprovider/dataprovider.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'sc/source/ui/dataprovider/dataprovider.cxx') diff --git a/sc/source/ui/dataprovider/dataprovider.cxx b/sc/source/ui/dataprovider/dataprovider.cxx index 4efc255be20d..67f4394726e2 100644 --- a/sc/source/ui/dataprovider/dataprovider.cxx +++ b/sc/source/ui/dataprovider/dataprovider.cxx @@ -177,10 +177,6 @@ DataProvider::~DataProvider() void ScDBDataManager::WriteToDoc(ScDocument& rDoc) { // first apply all data transformations - for (auto& itr : maDataTransformations) - { - itr->Transform(rDoc); - } bool bShrunk = false; SCCOL nStartCol = 0; @@ -222,11 +218,16 @@ void ScDBDataManager::SetDatabase(const OUString& rDBName) maDBName = rDBName; } -void ScDBDataManager::AddDataTransformation(std::unique_ptr mpDataTransformation) +void ScDBDataManager::AddDataTransformation(std::shared_ptr mpDataTransformation) { maDataTransformations.push_back(std::move(mpDataTransformation)); } +const std::vector>& ScDBDataManager::getDataTransformation() const +{ + return maDataTransformations; +} + ScDBData* ScDBDataManager::getDBData() { ScDBData* pDBData = mpDoc->GetDBCollection()->getNamedDBs().findByUpperName(ScGlobal::pCharClass->uppercase(maDBName)); -- cgit