summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-06-07 05:28:04 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-06-07 05:32:28 +0200
commitd445d7a60daa40b7d304fa24df9b06144b038c21 (patch)
tree23a842f7b673f08407c0219bdec0c68aa0797f76
parent1af2f810624c0e772880d5fafd27cdefa6c88d2c (diff)
don't hide cell content behind pivot table buttons, fdo#60877
Change-Id: I1508aafcc7046c576a4d6de87900dc66f32b2f97
-rw-r--r--sc/source/ui/view/output2.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index ae74320ea335..565f7ec67084 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1335,7 +1335,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
// (for automatic line break: only if not formatting for printer, as in ScColumn::GetNeededSize)
if ( eType==OUTTYPE_WINDOW &&
- ( static_cast<const ScMergeFlagAttr&>(rPattern.GetItem(ATTR_MERGE_FLAG)).GetValue() & SC_MF_AUTO ) &&
+ ( static_cast<const ScMergeFlagAttr&>(rPattern.GetItem(ATTR_MERGE_FLAG)).GetValue() & (SC_MF_AUTO|SC_MF_BUTTON|SC_MF_BUTTON_POPUP) ) &&
( !bBreak || mpRefDevice == pFmtDevice ) )
{
// filter drop-down width is now independent from row height