diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-04-06 09:58:44 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-04-06 16:01:56 -0400 |
| commit | c60c5c1223d019ef17a14273ebd8ed2c60051dd3 (patch) | |
| tree | 8ae252ff9f689b422aeff3393262c182e9cc5789 /sc/source/ui/view/output2.cxx | |
| parent | 4d37821409f84c01d97a753667fafe85fcdb89b0 (diff) | |
isVerticallyOriented() is always true in this method.
Diffstat (limited to 'sc/source/ui/view/output2.cxx')
| -rw-r--r-- | sc/source/ui/view/output2.cxx | 41 |
1 files changed, 3 insertions, 38 deletions
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 221d8f97b0ef..5a0716a9462c 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -3431,7 +3431,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) // (do nothing) } - if (rParam.isVerticallyOriented() && rParam.mbBreak) + if (rParam.mbBreak) { // vertical adjustment is within the EditEngine if (rParam.mbPixelToLogic) @@ -3440,41 +3440,6 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) aLogicStart.Y() += nTopM; } - if (!rParam.isVerticallyOriented() && !rParam.mbBreak) - { - if (rParam.meVerJust==SVX_VER_JUSTIFY_BOTTOM || - rParam.meVerJust==SVX_VER_JUSTIFY_STANDARD) - { - //! if pRefDevice != pFmtDevice, keep heights in logic units, - //! only converting margin? - - if (rParam.mbPixelToLogic) - aLogicStart.Y() += pRefDevice->PixelToLogic( Size(0, nTopM + - pRefDevice->LogicToPixel(aCellSize).Height() - - pRefDevice->LogicToPixel(Size(0,nEngineHeight)).Height() - )).Height(); - else - aLogicStart.Y() += nTopM + aCellSize.Height() - nEngineHeight; - } - else if (rParam.meVerJust==SVX_VER_JUSTIFY_CENTER) - { - if (rParam.mbPixelToLogic) - aLogicStart.Y() += pRefDevice->PixelToLogic( Size(0, nTopM + ( - pRefDevice->LogicToPixel(aCellSize).Height() - - pRefDevice->LogicToPixel(Size(0,nEngineHeight)).Height() ) - / 2)).Height(); - else - aLogicStart.Y() += nTopM + (aCellSize.Height() - nEngineHeight) / 2; - } - else // top - { - if (rParam.mbPixelToLogic) - aLogicStart.Y() += pRefDevice->PixelToLogic(Size(0,nTopM)).Height(); - else - aLogicStart.Y() += nTopM; - } - } - Point aURLStart = aLogicStart; // copy before modifying for orientation short nOriVal = 900; // Angle of orientation @@ -3584,8 +3549,8 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) Size aPaper = rParam.mpEngine->GetPaperSize(); nURLWidth = aPaper.Width(); } - if ( rParam.isVerticallyOriented() ) - std::swap( nURLWidth, nURLHeight ); + + std::swap( nURLWidth, nURLHeight ); // vertical orientation Rectangle aURLRect( aURLStart, Size( nURLWidth, nURLHeight ) ); lcl_DoHyperlinkResult( pDev, aURLRect, rParam.mpCell ); |