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

[Aron Budea]

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

New commits:
commit 56e0895730fa289d72333d7b432122292e37b4c4
Author: Aron Budea <aron.bu...@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.bu...@collabora.com>
    Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
    (cherry picked from commit 26b51c9550ef300e7685fc41eb9cde4dbbc11265)
    Reviewed-on: https://gerrit.libreoffice.org/50016
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Eike Rathke <er...@redhat.com>

diff --git a/sc/source/filter/oox/condformatbuffer.cxx 
b/sc/source/filter/oox/condformatbuffer.cxx
index 274f062b999d..e08ed061c8d3 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()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits