summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-09-22 05:28:44 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-09-23 13:45:15 +0200
commit8deaaa66976569ebc5ba872cbcc09f8ccb45a2c4 (patch)
tree342cb7cc47002894d6395dc3a6fb09cc6b3142cb /sc
parent5858276fae87c51a7edc78c4502326eb3c067e2b (diff)
correctly export number formats in conditional format export to xlsx
Change-Id: I2a4a65bd5e622d900c77704dfe198ffab0be6c42
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/excel/xestyle.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 37faabbf6893..da41b050b276 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -2938,7 +2938,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot )
XclExpFont* pFont = NULL;
// check if non default font is set and only export then
- if (rSet.GetItemState(rSet.GetPool()->GetWhich( SID_ATTR_CHAR_FONT ))>SFX_ITEM_DEFAULT )
+ if (rSet.GetItemState(rSet.GetPool()->GetWhich( SID_ATTR_CHAR_FONT )) == SFX_ITEM_SET )
{
Font aFont = XclExpFontHelper::GetFontFromItemSet( GetRoot(), rSet, com::sun::star::i18n::ScriptType::WEAK );
pFont = new XclExpFont( GetRoot(), XclFontData( aFont ), EXC_COLOR_CELLTEXT );
@@ -2946,7 +2946,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot )
XclExpNumFmt* pNumFormat = NULL;
const SfxPoolItem *pPoolItem = NULL;
- if( rSet.GetItemState( SID_ATTR_NUMBERFORMAT_VALUE, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( rSet.GetItemState( ATTR_VALUE_FORMAT, sal_True, &pPoolItem ) == SFX_ITEM_SET )
{
sal_uLong nScNumFmt = static_cast< sal_uInt32 >( static_cast< const SfxInt32Item* >(pPoolItem)->GetValue());
sal_uInt16 nXclNumFmt = static_cast< sal_uInt16 >( EXC_FORMAT_OFFSET8 + nIndex );