diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-06 05:41:42 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-11 08:01:25 +0200 |
| commit | c41ee0d526c6d105d53cace1c81e43a9cc519c2d (patch) | |
| tree | 7b0e4b2c41ed5dfdd9108664cbae7096ed1fbb5d /sc/source/filter/xml/xmlstyli.cxx | |
| parent | fix export of cond formats to ods (diff) | |
| download | core-c41ee0d526c6d105d53cace1c81e43a9cc519c2d.tar.gz core-c41ee0d526c6d105d53cace1c81e43a9cc519c2d.zip | |
fix cond format import from ods
Change-Id: I974c46fad862edd320b54d4c7e72807dd715dfb1
Diffstat (limited to 'sc/source/filter/xml/xmlstyli.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmlstyli.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 45e82c5028db..460f642c93a8 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -521,7 +521,7 @@ void XMLTableStyleContext::FillPropertySet( sal_Int32 nNumFmt = GetNumberFormat(); if (nNumFmt >= 0) AddProperty(CTF_SC_NUMBERFORMAT, uno::makeAny(nNumFmt)); - if (!bConditionalFormatCreated && (aMaps.size() > 0)) + if (!GetScImport().HasNewCondFormatData() && !bConditionalFormatCreated && (!aMaps.empty())) { aConditionalFormat = rPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CONDXML))); std::vector<ScXMLMapContent>::iterator aItr(aMaps.begin()); |