summaryrefslogtreecommitdiff
path: root/sc/source/filter/excel/xipivot.cxx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2009-01-19 16:17:46 +0000
committerVladimir Glazounov <vg@openoffice.org>2009-01-19 16:17:46 +0000
commit024f0de540bd6874af3457773afc8de7aa1dde50 (patch)
treef095fb1d027973a8099050a2786d88a850b5df65 /sc/source/filter/excel/xipivot.cxx
parent601ed6045b46669d83e5c9d34038b79d4e95b684 (diff)
CWS-TOOLING: integrate CWS kohei02
2009-01-13 16:54:47 +0100 kohei r266237 : added dpshttab.obj to the list of EXCEPTIONFILES, to remove warning on Solaris. 2009-01-07 03:18:32 +0100 kohei r265942 : Repeat values only on column, row, and page fields even for drill-down data. Don't repeat values on data fields. 2009-01-06 22:23:48 +0100 kohei r265941 : Don't repeat if empty on data fields. The "Identify category" option is not supposed to affect data fields. 2009-01-05 17:42:52 +0100 kohei r265884 : CWS-TOOLING: rebase CWS kohei02 to trunk@265758 (milestone: DEV300:m38) 2008-12-12 06:10:18 +0100 kohei r265385 : instantiate string data only when it's visible. 2008-12-12 05:48:20 +0100 kohei r265384 : when displaying the page field list box, only show visible page field members. 2008-12-11 22:41:11 +0100 kohei r265375 : #i96689# added a list of German translations for CELL. 2008-12-11 22:24:41 +0100 kohei r265373 : restored the old keyword file before it got stripped off. 2008-12-11 22:17:05 +0100 kohei r265371 : #i96591# Honor the hidden members data in page fields. 2008-12-11 21:51:36 +0100 kohei r265370 : #i96326# fixed pivot cache import that previously failed to import when the field count is zero. But when the postponed flag is on, the count may be sometimes zero even when the field contains data. 2008-12-11 21:44:44 +0100 kohei r265369 : #i96171# fix for broken 'Identify Categories' option for grouped fields.
Diffstat (limited to 'sc/source/filter/excel/xipivot.cxx')
-rw-r--r--sc/source/filter/excel/xipivot.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index f0796b99de57..acd371f43f7d 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -286,9 +286,8 @@ void XclImpPCField::ReadSxfield( XclImpStream& rStrm )
// for now, ignore data type of calculated fields
DBG_ASSERT( bCalced || bType || bTypeNone, "XclImpPCField::ReadSxfield - unknown item data type" );
- if( nVisC > 0 )
+ if( nVisC > 0 || bPostp )
{
- DBG_ASSERT( !bItems || !bPostp, "XclImpPCField::ReadSxfield - postponed field with inline items" );
if( bItems && !bPostp )
{
if( !bCalced )