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

[Aron Budea]

 sc/source/filter/oox/condformatbuffer.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2e06dfb831a93b8207cc4e0f43221ef5eeb1853b
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
    
    Change-Id: I001795fd456375c4babab2c2e505bedff03e991f
    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/50015
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index 3a46a3b28fa6..55a57a4c710b 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -1055,12 +1055,12 @@ void CondFormat::finalizeImport()
     if ( !mbReadyForFinalize )
         return;
     ScDocument& rDoc = getScDocument();
+    mpFormat->SetRange(maModel.maRanges);
     maRules.forEachMem( &CondFormatRule::finalizeImport );
     SCTAB nTab = maModel.maRanges.GetTopLeftCorner().Tab();
     sal_Int32 nIndex = getScDocument().AddCondFormat(mpFormat, nTab);
 
     rDoc.AddCondFormatData( maModel.maRanges, nTab, nIndex );
-    mpFormat->SetRange(maModel.maRanges);
 }
 
 CondFormatRuleRef CondFormat::createRule()