strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#114245 : Let both ScDocument::CopyToDocument()...

Browse source 
methods use delayed-grouping introduced in commit

169a1b5421
avoid possible expensive repetitive formula group changes (tdf#102364)

The drag-drop move takes around 6-7 seconds now.

Change-Id: I0916719ffca2072b7cf86b4f99518316cfdd99fa
Reviewed-on: https://gerrit.libreoffice.org/72338
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Dennis Francis 2019-05-13 18:20:01 +05:30
parent 3e664b8f19
commit f28b5586a7
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sc/source/core/data/document.cxx
View file

@ -2063,25 +2063,10 @@ void ScDocument::CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
InsertDeleteFlags nFlags, bool bOnlyMarked, ScDocument& rDestDoc,
const ScMarkData* pMarks, bool bColRowFlags )
{
PutInOrder( nCol1, nCol2 );
PutInOrder( nRow1, nRow2 );
PutInOrder( nTab1, nTab2 );
if (rDestDoc.aDocName.isEmpty())
rDestDoc.aDocName = aDocName;
if (ValidTab(nTab1) && ValidTab(nTab2))
{
sc::CopyToDocContext aCxt(rDestDoc);
bool bOldAutoCalc = rDestDoc.GetAutoCalc();
rDestDoc.SetAutoCalc( false ); // avoid multiple calculations
SCTAB nMinSizeBothTabs = static_cast<SCTAB>(std::min(maTabs.size(), rDestDoc.maTabs.size()));
for (SCTAB i = nTab1; i <= nTab2 && i < nMinSizeBothTabs; i++)
{
if (maTabs[i] && rDestDoc.maTabs[i])
maTabs[i]->CopyToTable(aCxt, nCol1, nRow1, nCol2, nRow2, nFlags,
bOnlyMarked, rDestDoc.maTabs[i].get(), pMarks,
false, bColRowFlags, /*bGlobalNamesToLocal*/false, /*bCopyCaptions*/true );
}
rDestDoc.SetAutoCalc(bOldAutoCalc);
ScRange aThisRange(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
CopyToDocument(aThisRange, nFlags, bOnlyMarked, rDestDoc, pMarks, bColRowFlags);
}
}