[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source

[Markus Mohrhard]

 sc/source/filter/xml/xmlcondformat.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit e39fe8bc29af60e849534b6cb1882dbcec363052
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Jan 27 02:34:00 2013 +0100

    we need to parse the cell address after import, fdo#59843
    
    Otherwise we may have problems with sheet names from sheets that are not
    yet imported.
    
    Change-Id: I99a6507567b7d1018b790a90019cd563fa7323a0
    Reviewed-on: https://gerrit.libreoffice.org/1944
    Reviewed-by: Kohei Yoshida <kohei.yoshida at gmail.com>
    Tested-by: Kohei Yoshida <kohei.yoshida at gmail.com>

diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx
index ae0c2d7..443361a 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -567,12 +567,10 @@ ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
     rtl::OUString aExpr2;
     ScConditionMode eMode;
     GetConditionData(sExpression, eMode, aExpr1, aExpr2);
-    ScAddress aPos;
-    sal_Int32 nIndex = 0;
-    ScRangeStringConverter::GetAddressFromString(aPos, sAddress, GetScImport().GetDocument(), formula::FormulaGrammar::CONV_ODF, nIndex);
 
-    ScCondFormatEntry* pFormatEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, GetScImport().GetDocument(), aPos, sStyle,
+    ScCondFormatEntry* pFormatEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, GetScImport().GetDocument(), ScAddress(), sStyle,
                                                         rtl::OUString(), rtl::OUString(), formula::FormulaGrammar::GRAM_ODFF, formula::FormulaGrammar::GRAM_ODFF);
+    pFormatEntry->SetSrcString(sAddress);
 
     pFormat->AddEntry(pFormatEntry);
 }