summaryrefslogtreecommitdiff
path: root/sc/source/filter/excel/xistyle.cxx
diff options
context:
space:
mode:
authorKohei Yoshida <kyoshida@novell.com>2011-04-15 12:43:37 -0400
committerKohei Yoshida <kyoshida@novell.com>2011-04-15 12:46:01 -0400
commit925551e7c6cd6174866708ce362d474280878d96 (patch)
tree522d99dcb048986b2e7e47e06e95860346a87a68 /sc/source/filter/excel/xistyle.cxx
parentaec67afa21ac09991af4ceef97b30bc122b2a69d (diff)
fdo#35142: Avoid importing unnamed styles from XLS.
This actually causes undefined behavior since every cell is supposed to be associated with some style. One thing affected by this is ODS export (as described in the bug).
Diffstat (limited to 'sc/source/filter/excel/xistyle.cxx')
-rw-r--r--sc/source/filter/excel/xistyle.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index d4eb332b2fb0..11381e54bb4e 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1321,8 +1321,8 @@ void XclImpXF::ApplyPatternToAttrList(
pPat = static_cast<const ScPatternAttr*>(&aCache.ApplyTo(*pPat, true));
}
-
- if (pPat)
+ // Make sure we skip unnamed styles.
+ if (pPat && pPat->GetStyleName())
{
// Check for a gap between the last entry and this one.
bool bHasGap = false;