summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-05-12 20:59:29 -0400
committerAndras Timar <andras.timar@collabora.com>2014-05-15 17:37:57 +0000
commit5caa2548f837c54aac44fde0fdbb145145b60091 (patch)
treec60c04dd9e82750e6b22b8ddc25aa4ad20fe4ddd
parent1677cffc602e15968ffb76ee0d5fd0ebcdac6b3c (diff)
fdo#78391: When numbers are auto-fit, reset clipping parameters.
Else it would get processed further to a surprising result. Change-Id: I3d6f0d680e0c4c3ffe1d28dcbaf51a156f569359 (cherry picked from commit 162029e55af8f681966497ab7f20277888eac478) Reviewed-on: https://gerrit.libreoffice.org/9335 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--sc/source/ui/view/output2.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 75739d4c4c1f..d14c901c79e2 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1850,7 +1850,11 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
(long) ( aVars.GetLeftTotal() * mnPPTX ) +
(long) ( aVars.GetMargin()->GetRightMargin() * mnPPTX );
if ( nNeededWidth <= aAreaParam.maClipRect.GetWidth() )
+ {
+ // Cell value is no longer clipped. Reset relevant parameters.
aAreaParam.mbLeftClip = aAreaParam.mbRightClip = false;
+ aAreaParam.mnLeftClipLength = aAreaParam.mnRightClipLength = 0;
+ }
// If the "###" replacement doesn't fit into the cells, no clip marks
// are shown, as the "###" already denotes too little space.