[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source

[Luboš Luňák (via logerrit)]

 sc/source/ui/unoobj/chart2uno.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 0d631aad92e874a95d9cd31ab50c63085fcabced
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Thu Apr 2 11:14:59 2020 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Fri Apr 3 17:10:20 2020 +0200

    use mdds position hint (tdf#131716)
    
    Otherwise this is the usual case of possible quadratic mdds slowness.
    
    Change-Id: I5b33df65e127702c011517d79b9cd41a7e820ca0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91553
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit 55220e7bc6576a7575c675ba425e757a3aefa243)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91517
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 0f404ba5d780..8916ee2cf09d 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -42,6 +42,7 @@
 #include <tokenarray.hxx>
 #include <scmatrix.hxx>
 #include <brdcst.hxx>
+#include <mtvelements.hxx>
 
 #include <formula/opcode.hxx>
 #include <svl/sharedstring.hxx>
@@ -2453,6 +2454,8 @@ void ScChart2DataSequence::BuildDataCache()
             {
                 for (SCCOL nCol = aRange.aStart.Col(); nCol <= aRange.aEnd.Col(); ++nCol)
                 {
+                    sc::ColumnBlockPosition hint;
+                    m_pDocument->InitColumnBlockPosition( hint, nTab, nCol );
                     for (SCROW nRow = aRange.aStart.Row(); nRow <= aRange.aEnd.Row(); ++nRow)
                     {
                         bool bColHidden = m_pDocument->ColHidden(nCol, nTab, nullptr, &nLastCol);
@@ -2472,7 +2475,7 @@ void ScChart2DataSequence::BuildDataCache()
                         ScAddress aAdr(nCol, nRow, nTab);
                         aItem.maString = m_pDocument->GetString(aAdr);
 
-                        ScRefCellValue aCell(*m_pDocument, aAdr);
+                        ScRefCellValue aCell(*m_pDocument, aAdr, hint);
                         switch (aCell.meType)
                         {
                             case CELLTYPE_VALUE: