summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-05-19 04:53:07 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-05-19 05:33:48 +0200
commit2ae89f59fdad8ac5a98ce02ea31cbe55a5048c43 (patch)
tree077172d63d9a9e58e65e6a7260135a3b1965e1d2 /sc/source
parent158b50763962f66515062300e265839828463efa (diff)
don't use default style as parent for OOXML cond format style, tdf#91335
Change-Id: I1388bb5ab71f6f6d174872023f085240f3bff916
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/core/data/stlsheet.cxx5
-rw-r--r--sc/source/filter/oox/stylesbuffer.cxx7
2 files changed, 10 insertions, 2 deletions
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index 5d278ff1b8f4..be060c284ad6 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -121,6 +121,11 @@ bool ScStyleSheet::SetParent( const OUString& rParentName )
return bResult;
}
+void ScStyleSheet::ResetParent()
+{
+ GetItemSet().SetParent(NULL);
+}
+
SfxItemSet& ScStyleSheet::GetItemSet()
{
if ( !pSet )
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index 5e73b6856359..598ea497e311 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -3117,9 +3117,12 @@ OUString StylesBuffer::createDxfStyle( sal_Int32 nDxfId ) const
// Create a cell style. This may overwrite an existing style if
// one with the same name exists.
+ ScStyleSheet& rStyleSheet = ScfTools::MakeCellStyleSheet(
+ *getScDocument().GetStyleSheetPool(), rStyleName, true);
+
+ rStyleSheet.ResetParent();
SfxItemSet& rStyleItemSet =
- ScfTools::MakeCellStyleSheet(
- *getScDocument().GetStyleSheetPool(), rStyleName, true).GetItemSet();
+ rStyleSheet.GetItemSet();
pDxf->fillToItemSet(rStyleItemSet);
}