Kaydet (Commit) 907366ac authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen Kaydeden (comit) Björn Michaelsen

expand complex cascading conditional operator

Change-Id: Ia139d06e04e04871373b9413a4f6386e87738df5
Reviewed-on: https://gerrit.libreoffice.org/13001Reviewed-by: 's avatarBjörn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: 's avatarBjörn Michaelsen <bjoern.michaelsen@canonical.com>
üst 36a7bf72
...@@ -368,10 +368,16 @@ bool SwTxtFrm::GetAutoPos( SwRect& rOrig, const SwPosition &rPos ) const ...@@ -368,10 +368,16 @@ bool SwTxtFrm::GetAutoPos( SwRect& rOrig, const SwPosition &rPos ) const
SwTwips nUpperMaxY = (pTmpFrm->*fnRect->fnGetPrtBottom)(); SwTwips nUpperMaxY = (pTmpFrm->*fnRect->fnGetPrtBottom)();
// nMaxY is in absolute value // nMaxY is in absolute value
SwTwips nMaxY = bVert ? SwTwips nMaxY;
( bVertL2R ? std::min( (pFrm->*fnRect->fnGetPrtBottom)(), nUpperMaxY ) : std::max( (pFrm->*fnRect->fnGetPrtBottom)(), nUpperMaxY ) ) : if ( bVert )
std::min( (pFrm->*fnRect->fnGetPrtBottom)(), nUpperMaxY ); {
if ( bVertL2R )
nMaxY = std::min( (pFrm->*fnRect->fnGetPrtBottom)(), nUpperMaxY );
else
nMaxY = std::max( (pFrm->*fnRect->fnGetPrtBottom)(), nUpperMaxY );
}
else
nMaxY = std::min( (pFrm->*fnRect->fnGetPrtBottom)(), nUpperMaxY );
if ( pFrm->IsEmpty() || ! (pFrm->Prt().*fnRect->fnGetHeight)() ) if ( pFrm->IsEmpty() || ! (pFrm->Prt().*fnRect->fnGetHeight)() )
{ {
Point aPnt1 = pFrm->Frm().Pos() + pFrm->Prt().Pos(); Point aPnt1 = pFrm->Frm().Pos() + pFrm->Prt().Pos();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment