core.git: sc/source

[Noel Grandin (via logerrit)]

 sc/source/filter/excel/xistyle.cxx |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

New commits:
commit c5f3e78f34a31077df6f9f8e3e9093454cdca25f
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Feb 10 13:20:24 2025 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Feb 10 18:33:31 2025 +0100

    tdf#165080 Background color cells are reset to white
    
    regression from
        commit 2d208c4e42595bb85fd0ef726a89e10dd32b48b1
        Author: Noel Grandin <noel.gran...@collabora.co.uk>
        Date:   Tue Jun 25 09:03:49 2024 +0200
        tdf#161210 speed xls load
    
    Change-Id: Ided4df0ce448cf811e7f43bcf601641e2b7c29c2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181350
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Tested-by: Jenkins

diff --git a/sc/source/filter/excel/xistyle.cxx 
b/sc/source/filter/excel/xistyle.cxx
index dddf509b0944..0c859e6be53f 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1993,17 +1993,6 @@ void XclImpXFRangeBuffer::Finalize()
     ScDocument& rDoc = rDocImport.getDoc();
     SCTAB nScTab = GetCurrScTab();
 
-    // apply row styles
-    for( SCROW nScRow = 0; nScRow < static_cast<SCROW>(maRows.size()); 
++nScRow )
-    {
-        if (!maRows[nScRow])
-            continue;
-        sal_uInt16 nXFIndex = *maRows[nScRow];
-        for( SCCOL nScCol = 0; nScCol < static_cast<SCCOL>(maColumns.size()); 
++nScCol )
-            if (maColumns[nScCol])
-                SetXF( ScAddress( nScCol, nScRow, 0 ), nXFIndex, xlXFModeRow );
-    }
-
     // apply patterns
     XclImpXFBuffer& rXFBuffer = GetXFBuffer();
     ScDocumentImport::Attrs aPendingAttrParam;
@@ -2062,6 +2051,16 @@ void XclImpXFRangeBuffer::Finalize()
     if( pendingColStart != -1 )
         rDocImport.setAttrEntries(nScTab, pendingColStart, pendingColEnd, 
std::move(aPendingAttrParam));
 
+    // apply row styles
+    for( SCROW nScRow = 0; nScRow < static_cast<SCROW>(maRows.size()); 
++nScRow )
+    {
+        if (!maRows[nScRow])
+            continue;
+        sal_uInt16 nXFIndex = *maRows[nScRow];
+        for( nScCol = 0; nScCol < static_cast<SCCOL>(maColumns.size()); 
++nScCol )
+            SetXF( ScAddress( nScCol, nScRow, 0 ), nXFIndex, xlXFModeRow );
+    }
+
     // insert hyperlink cells
     for( const auto& [rXclRange, rUrl] : maHyperlinks )
         XclImpHyperlink::InsertUrl( GetRoot(), rXclRange, rUrl );