[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - sc/source

[Aron Budea]

 sc/source/filter/oox/condformatbuffer.cxx |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit a3c63b3daba1da2328e2d7e11344650df9ca8ecf
Author: Aron Budea <aron.budea at collabora.com>
Date:   Sun Feb 18 23:04:09 2018 +0100

    for listeners the range needs to be set before the formula, tdf#115530
    
    Reviewed-on: https://gerrit.libreoffice.org/49957
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit 26b51c9550ef300e7685fc41eb9cde4dbbc11265)
    Reviewed-on: https://gerrit.libreoffice.org/50016
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 56e0895730fa289d72333d7b432122292e37b4c4)
    
    Change-Id: I001795fd456375c4babab2c2e505bedff03e991f
    (cherry picked from commit ad907b7b00efd889aed89cc0545472af829b6e65)

diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index aa8fbbaa4d96..335eda125e65 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -1060,10 +1060,6 @@ void CondFormat::finalizeImport()
     // probably some error in the xml if we are not ready
     if ( !mbReadyForFinalize )
         return;
-    ScDocument& rDoc = getScDocument();
-    maRules.forEachMem( &CondFormatRule::finalizeImport );
-    SCTAB nTab = maModel.maRanges.getBaseAddress().Tab();
-    sal_Int32 nIndex = getScDocument().AddCondFormat(mpFormat, nTab);
 
     ScRangeList aList;
     for( ::std::vector< CellRangeAddress >::const_iterator itr = maModel.maRanges.begin(); itr != maModel.maRanges.end(); ++itr)
@@ -1072,8 +1068,14 @@ void CondFormat::finalizeImport()
         ScUnoConversion::FillScRange(aRange, *itr);
         aList.Append(aRange);
     }
-    rDoc.AddCondFormatData( aList, nTab, nIndex );
     mpFormat->SetRange(aList);
+
+    ScDocument& rDoc = getScDocument();
+    maRules.forEachMem( &CondFormatRule::finalizeImport );
+    SCTAB nTab = maModel.maRanges.getBaseAddress().Tab();
+    sal_Int32 nIndex = getScDocument().AddCondFormat(mpFormat, nTab);
+
+    rDoc.AddCondFormatData( aList, nTab, nIndex );
 }
 
 CondFormatRuleRef CondFormat::createRule()