diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-08-25 22:53:39 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-08-25 22:53:39 -0400 |
| commit | 073bebb7ffce60979dfbd6f5371da3e31329c714 (patch) | |
| tree | 0df50bfb6b7c1d8ab23fa6d4207bfff61523d0b1 /sc | |
| parent | 11f382320afed27ee071312e44e651781be2e359 (diff) | |
Second if condition is always true when the first one is.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/view/output2.cxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 5476ae054149..5086605233ca 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -3984,16 +3984,14 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) // for break, the first GetOutputArea call is sufficient GetOutputArea( nXForPos, nArrYForPos, rParam.mnPosX, rParam.mnPosY, rParam.mnCellX, rParam.mnCellY, nNeededPixel, *rParam.mpPattern, sal::static_int_cast<sal_uInt16>(eOutHorJust), - rParam.mbCellIsValue || bRepeat || bShrink, false, false, aAreaParam ); + true, false, false, aAreaParam ); + + ShrinkEditEngine( *rParam.mpEngine, aAreaParam.maAlignRect, + nLeftM, nTopM, nRightM, nBottomM, true, + sal::static_int_cast<sal_uInt16>(rParam.meOrient), 0, rParam.mbPixelToLogic, + nEngineWidth, nEngineHeight, nNeededPixel, + aAreaParam.mbLeftClip, aAreaParam.mbRightClip ); - if ( bShrink ) - { - ShrinkEditEngine( *rParam.mpEngine, aAreaParam.maAlignRect, - nLeftM, nTopM, nRightM, nBottomM, true, - sal::static_int_cast<sal_uInt16>(rParam.meOrient), 0, rParam.mbPixelToLogic, - nEngineWidth, nEngineHeight, nNeededPixel, - aAreaParam.mbLeftClip, aAreaParam.mbRightClip ); - } if ( bRepeat && !aAreaParam.mbLeftClip && !aAreaParam.mbRightClip && rParam.mpEngine->GetParagraphCount() == 1 ) { // First check if twice the space for the formatted text is available |