summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-01-27 02:34:00 +0100
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-02-01 17:07:14 +0000
commite39fe8bc29af60e849534b6cb1882dbcec363052 (patch)
treebe525e8b16e81773f212da1f08762a5f2863e15a
parentca92558fca923cce205bd8e67f906d1d7e03121e (diff)
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@gmail.com> Tested-by: Kohei Yoshida <kohei.yoshida@gmail.com>
-rw-r--r--sc/source/filter/xml/xmlcondformat.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx
index ae0c2d791d4a..443361aac881 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);
}