summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-06-07 05:28:04 +0200
committerPetr Mladek <pmladek@suse.cz>2013-06-13 15:51:24 +0200
commit722b109fa3cde246384230c9ee25723988083eb6 (patch)
tree998b2515d63f173943cb6b3b2f817ff1319969a1
parentf073f36a7d58fab9e6415cf8419f8f04dc9009b2 (diff)
don't hide cell content behind pivot table buttons, fdo#60877
Change-Id: I1508aafcc7046c576a4d6de87900dc66f32b2f97 Reviewed-on: https://gerrit.libreoffice.org/4184 Reviewed-by: Kohei Yoshida <kohei.yoshida@suse.de> Tested-by: Kohei Yoshida <kohei.yoshida@suse.de>
-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 5461fec2c0e0..6fa83c32c95d 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1353,7 +1353,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