summaryrefslogtreecommitdiffstats
path: root/sc
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-10-18 18:11:18 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-10-19 10:37:23 +0200
commiteb141a2cfa44b7414998d34a244edd8ccf5f5ce0 (patch)
treecf81a9e9a1b9d6368f35f2c5d434941c9b52ef3b /sc
parentadd one more component file for subsequent filters test (diff)
downloadcore-eb141a2cfa44b7414998d34a244edd8ccf5f5ce0.tar.gz
core-eb141a2cfa44b7414998d34a244edd8ccf5f5ce0.zip
ithe cond format data is no longer stored as SfxUInt32Item
Change-Id: I41c19f213de73052bcfd18eada35ed14dfd9a172
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/documen4.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 3295106f40d1..69c68b08e705 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -700,7 +700,12 @@ const SfxItemSet* ScDocument::GetCondResult( SCCOL nCol, SCROW nRow, SCTAB nTab
ScConditionalFormat* ScDocument::GetCondFormat(
SCCOL nCol, SCROW nRow, SCTAB nTab ) const
{
- sal_uLong nIndex = ((const SfxUInt32Item*)GetAttr(nCol,nRow,nTab,ATTR_CONDITIONAL))->GetValue();
+ sal_uInt32 nIndex = 0;
+ const std::vector<sal_uInt32>& rCondFormats = static_cast<const ScCondFormatItem*>(GetAttr(nCol, nRow, nTab, ATTR_CONDITIONAL))->GetCondFormatData();
+
+ if(!rCondFormats.empty())
+ nIndex = rCondFormats[0];
+
if (nIndex)
{
ScConditionalFormatList* pCondFormList = GetCondFormList(nTab);