[Libreoffice-commits] core.git: 2 commits - sw/source
Tor Lillqvist
tml at collabora.com
Fri Apr 18 02:26:57 PDT 2014
sw/source/core/doc/docdraw.cxx | 3
sw/source/core/draw/dflyobj.cxx | 4
sw/source/core/draw/dview.cxx | 2
sw/source/core/inc/frame.hxx | 11 -
sw/source/core/layout/calcmove.cxx | 6
sw/source/core/layout/colfrm.cxx | 2
sw/source/core/layout/findfrm.cxx | 2
sw/source/core/layout/fly.cxx | 4
sw/source/core/layout/flycnt.cxx | 21 --
sw/source/core/layout/ftnfrm.cxx | 4
sw/source/core/layout/newfrm.cxx | 8
sw/source/core/layout/pagechg.cxx | 6
sw/source/core/layout/paintfrm.cxx | 83 +++++-----
sw/source/core/layout/ssfrm.cxx | 5
sw/source/core/layout/tabfrm.cxx | 4
sw/source/core/layout/trvlfrm.cxx | 1
sw/source/core/layout/wsfrm.cxx | 15 -
sw/source/core/objectpositioning/anchoredobjectposition.cxx | 2
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 2
sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 4
sw/source/core/text/frmcrsr.cxx | 3
sw/source/core/text/frmform.cxx | 2
sw/source/core/text/frmpaint.cxx | 2
sw/source/core/text/inftxt.cxx | 1
sw/source/core/text/itrtxt.cxx | 1
sw/source/core/text/txtfrm.cxx | 7
sw/source/core/text/txttab.cxx | 1
sw/source/core/text/widorp.cxx | 1
28 files changed, 71 insertions(+), 136 deletions(-)
New commits:
commit d1b2a6f63731a77f40ee1561f37a3805a99cac15
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 18 11:29:16 2014 +0300
Thanks Badaa and Jiayanmin but we don't use in-line commit comments
Change-Id: Iff5f70602e8451ea2b8432a58804bb38156d6b46
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 3df1d5d..f52f2cc 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -109,7 +109,7 @@ static void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
{
case FRMDIR_VERT_TOP_LEFT:
{
- // vertical from left-to-right - Badaa: supported now!
+ // vertical from left-to-right
bVert = true;
bR2L = true;
OSL_FAIL( "<lcl_AdjustPositioningAttr(..)> - vertical from left-to-right not supported." );
@@ -164,7 +164,6 @@ static void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
nHoriRelPos = aObjRect.Left() - aAnchorPos.getX();
nVertRelPos = aObjRect.Top() - aAnchorPos.getY();
}
- //End of SCMS
}
_pFrmFmt->SetFmtAttr( SwFmtHoriOrient( nHoriRelPos, text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 002dbe5..7c190ea 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -618,7 +618,7 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
{
//lXDiff -= rVert.GetPos();
//lYDiff += rHori.GetPos();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
if ( GetFlyFrm()->GetAnchorFrm()->IsVertLR() )
{
lXDiff += rVert.GetPos();
@@ -737,7 +737,6 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef,
const sal_Bool bRTL = pTmpFrm->IsRightToLeft();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
const bool bVertL2RX = pTmpFrm->IsVertLR();
const Point aNewPos( ( bVertX && !bVertL2RX ) || bRTL ?
aOutRect.Right() + 1 :
@@ -814,7 +813,6 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef,
{
if( aOutRect.TopRight() != aNewPos )
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
SwTwips nDeltaX;
if ( bVertL2RX )
nDeltaX = aNewPos.X() - aOutRect.Left();
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index c002b04..72342d9 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -239,7 +239,6 @@ void SwDrawView::AddCustomHdl()
}
// add anchor handle:
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
aHdl.AddHdl( new SwSdrHdl( aPos, ( pAnch->IsVertical() && !pAnch->IsVertLR() ) ||
pAnch->IsRightToLeft() ) );
}
@@ -702,7 +701,6 @@ const SwFrm* SwDrawView::CalcAnchor()
aMyRect = pObj->GetSnapRect();
}
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
const sal_Bool bTopRight = pAnch && ( ( pAnch->IsVertical() &&
!pAnch->IsVertLR() ) ||
pAnch->IsRightToLeft() );
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 5cce3a6..18b23b9 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -182,7 +182,6 @@ struct SwRectFnCollection
typedef SwRectFnCollection* SwRectFn;
-// Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
extern SwRectFn fnRectHori, fnRectVert, fnRectB2T, fnRectVL2R, fnRectVertL2R;
#define SWRECTFN( pFrm ) bool bVert = pFrm->IsVertical(); \
bool bRev = pFrm->IsReverse(); \
@@ -209,7 +208,7 @@ extern SwRectFn fnRectHori, fnRectVert, fnRectB2T, fnRectVL2R, fnRectVertL2R;
bool bNeighb = pFrm->IsNeighbourFrm(); \
SwRectFn fnRect = bVert == bNeighb ? \
fnRectHori : ( bVertL2R ? fnRectVertL2R : fnRectVert );
-//End of SCMS
+
#define POS_DIFF( aFrm1, aFrm2 ) \
( (aFrm1.*fnRect->fnGetTop)() != (aFrm2.*fnRect->fnGetTop)() || \
(aFrm1.*fnRect->fnGetLeft)() != (aFrm2.*fnRect->fnGetLeft)() )
@@ -350,7 +349,7 @@ protected:
sal_uInt16 mbInvalidVert : 1;
sal_uInt16 mbDerivedVert : 1;
sal_uInt16 mbVertical : 1;
- // Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
sal_uInt16 mbVertLR : 1;
sal_uInt16 mnType : 4; //Who am I?
@@ -549,11 +548,11 @@ public:
inline bool IsReverse() const { return mbReverse; }
inline void SetReverse( sal_Bool bNew ){ mbReverse = bNew ? 1 : 0; }
inline bool IsVertical() const;
- //Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
inline sal_Bool IsVertLR() const;
inline sal_Bool GetVerticalFlag() const;
inline void SetVertical( sal_Bool bNew ){ mbVertical = bNew ? 1 : 0; }
- //Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
inline void SetbVertLR( sal_Bool bNew ) { mbVertLR = bNew ? 1 : 0; }
inline void SetDerivedVert( sal_Bool bNew ){ mbDerivedVert = bNew ? 1 : 0; }
inline void SetInvalidVert( sal_Bool bNew) { mbInvalidVert = bNew ? 1 : 0; }
@@ -933,12 +932,10 @@ bool SwFrm::IsVertical() const
((SwFrm*)this)->SetDirFlags( sal_True );
return mbVertical != 0;
}
-//Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
inline sal_Bool SwFrm::IsVertLR() const
{
return mbVertLR != 0;
}
-//End of SCMS
sal_Bool SwFrm::GetVerticalFlag() const
{
return mbVertical != 0;
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 030bccf..ccbd8e8 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -511,7 +511,6 @@ void SwFrm::MakePos()
if( mbReverse )
maFrm.Pos().setX(maFrm.Pos().getX() + pPrv->Frm().Width());
else
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
{
if ( bVertL2R )
maFrm.Pos().setX(maFrm.Pos().getX() + pPrv->Frm().Width());
@@ -588,7 +587,6 @@ void SwFrm::MakePos()
maFrm.Pos().setX(maFrm.Pos().getX() + GetUpper()->Prt().Width()
- maFrm.Width());
}
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
else if( bVert && !bVertL2R && FRM_NOTE_VERT & nMyType && !mbReverse )
maFrm.Pos().setX(maFrm.Pos().getX() - maFrm.Width() + GetUpper()->Prt().Width());
}
@@ -598,7 +596,7 @@ void SwFrm::MakePos()
maFrm.Pos().setX(0);
maFrm.Pos().setY(0);
}
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
if( IsBodyFrm() && bVert && !bVertL2R && !mbReverse && GetUpper() )
maFrm.Pos().setX(maFrm.Pos().getX() + GetUpper()->Prt().Width() - maFrm.Width());
mbValidPos = sal_True;
@@ -786,7 +784,7 @@ void SwLayoutFrm::MakeAll()
// takes care of the notification in the dtor
const SwLayNotify aNotify( this );
bool bVert = IsVertical();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
SwRectFn fnRect = ( IsNeighbourFrm() == bVert )? fnRectHori : ( IsVertLR() ? fnRectVertL2R : fnRectVert );
SwBorderAttrAccess *pAccess = 0;
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index a640529..89d7232 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -289,7 +289,7 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, sal_Bool bAdjustAttribut
}
const sal_Bool bVert = IsVertical();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
SwRectFn fnRect = bVert ? ( IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori;
//If we have a pointer or we have to configure an attribute, we set the
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index 2c4b675..40e74bd 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1303,7 +1303,7 @@ void SwFrm::SetDirFlags( sal_Bool bVert )
mbReverse = pAsk->IsReverse() ? 1 : 0;
mbVertLR = pAsk->IsVertLR() ? 1 : 0;
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
if ( !pAsk->mbInvalidVert )
mbInvalidVert = sal_False;
}
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 1e8ef52..99baaf8 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -97,7 +97,6 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
mbDerivedR2L = 0;
if( FRMDIR_HORI_LEFT_TOP == nDir || FRMDIR_HORI_RIGHT_TOP == nDir )
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
mbVertLR = 0;
mbVertical = 0;
}
@@ -106,14 +105,13 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
const SwViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0;
if( pSh && pSh->GetViewOptions()->getBrowseMode() )
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
mbVertLR = 0;
mbVertical = 0;
}
else
{
mbVertical = 1;
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
if ( FRMDIR_VERT_TOP_LEFT == nDir )
mbVertLR = 1;
else
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index ea15254..6beb633 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -554,7 +554,7 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
while( pUp->IsSctFrm() )
pUp = pUp->GetUpper();
const bool bVert = pUp->IsVertical();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
const bool bVertL2R = pUp->IsVertLR();
//Follow the text flow.
@@ -575,7 +575,6 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
// <rPt> point is inside environment of given content frame
// #i70582#
if( bVert )
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
{
if ( bVertL2R )
rRet.nMain = rPt.X() - nTopForObjPos;
@@ -605,7 +604,6 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
// <rPt> point is in left border of environment
// #i70582#
if( bVert )
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
{
if ( bVertL2R )
rRet.nMain = rPt.X() - nTopForObjPos;
@@ -621,7 +619,6 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
}
else
{
- // Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
rRet.nMain = bVert
? ( bVertL2R
? ( (pUp->Frm().Left() + pUp->Prt().Right()) - nTopForObjPos )
@@ -647,7 +644,6 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
{
if( pLay->IsVertical() )
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( pLay->IsVertLR() )
nFrmTop = pLay->Frm().Left();
else
@@ -666,7 +662,6 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
pLay = pSect->GetUpper();
if( pLay->IsVertical() )
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( pLay->IsVertLR() )
{
nFrmTop = pSect->Frm().Right();
@@ -695,7 +690,6 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
{
if( pLay->IsVertical() )
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( pLay->IsVertLR() )
{
nFrmTop = pLay->Frm().Left();
@@ -749,7 +743,6 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
pSect = pNxtSect;
if( pLay->IsVertical() )
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( pLay->IsVertLR() )
{
nFrmTop = pLay->Frm().Left();
@@ -772,7 +765,6 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
pLay = pSect->GetUpper();
if( pLay->IsVertical() )
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( pLay->IsVertLR() )
{
nFrmTop = pSect->Frm().Right();
@@ -801,7 +793,6 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
{
if( pLay->IsVertical() )
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( pLay->IsVertLR() )
{
nFrmTop = pLay->Frm().Left();
@@ -826,7 +817,6 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
{
if ( pLay->Frm().IsInside( rPt ) )
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
SwTwips nDiff = pLay->IsVertical() ? ( pLay->IsVertLR() ? ( rPt.X() - nFrmTop ) : ( nFrmTop - rPt.X() ) )
: ( rPt.Y() - nFrmTop );
if( bSct || pSect )
@@ -1173,8 +1163,8 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
SwPageFrm *pOldPage = FindPageFrm();
const SwRect aOld( GetObjRectWithSpaces() );
Point aNew( rNew );
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
- if( ( GetAnchorFrm()->IsVertical() && !GetAnchorFrm()->IsVertLR() ) || GetAnchorFrm()->IsRightToLeft() )
+
+ if( ( GetAnchorFrm()->IsVertical() && !GetAnchorFrm()->IsVertLR() ) || GetAnchorFrm()->IsRightToLeft() )
aNew.setX(aNew.getX() + Frm().Width());
SwCntntFrm *pCnt = (SwCntntFrm*)::FindAnchor( GetAnchorFrm(), aNew );
if( pCnt->IsProtected() )
@@ -1182,7 +1172,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
SwPageFrm *pTmpPage = 0;
const bool bVert = pCnt->IsVertical();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
const bool bVertL2R = pCnt->IsVertLR();
const sal_Bool bRTL = pCnt->IsRightToLeft();
@@ -1225,7 +1215,6 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
: ( pCnt->Frm().Top() +
pCnt->GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid() );
if( bVert )
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
{
if ( bVertL2R )
nY = rNew.X() - nTopForObjPos;
@@ -1263,7 +1252,6 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
do
{ const SwFrm *pUp = pFollow->GetUpper();
if( pUp->IsVertical() )
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
{
if ( pUp->IsVertLR() )
nDiff += pUp->Prt().Width() - pFollow->GetRelPos().getX();
@@ -1296,7 +1284,6 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
: ( pCnt->Frm().Top() +
pCnt->GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid() );
if( bVert )
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
{
if ( bVertL2R )
nY = rNew.X() - nTopForObjPos;
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 6bf94cb..ce42173 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -320,7 +320,7 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool )
if ( !bTst )
{
(Frm().*fnRect->fnSetHeight)( (Frm().*fnRect->fnGetHeight)() + nDist );
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
if( IsVertical() && !IsVertLR() && !IsReverse() )
Frm().Pos().X() -= nDist;
}
@@ -362,7 +362,7 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool )
{
nDist -= nReal;
Frm().SSize().Height() -= nDist;
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
if( IsVertical() && !IsVertLR() && !IsReverse() )
Frm().Pos().X() += nDist;
}
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 5a8d3c1..ef68f12 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -269,7 +269,7 @@ static SwRectFnCollection aVerticalRightToLeft = {
&SwRect::SetBottomAndHeight,
&SwRect::SetLeftAndWidth
};
-//Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
static SwRectFnCollection aVerticalLeftToRight = {
/* fnRectGet */
&SwRect::_Left,
@@ -324,12 +324,12 @@ static SwRectFnCollection aVerticalLeftToRight = {
&SwRect::SetTopAndHeight,
&SwRect::SetLeftAndWidth
};
-//End of SCMS
+
SwRectFn fnRectHori = &aHorizontal;
SwRectFn fnRectVert = &aVertical;
-//Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
SwRectFn fnRectVertL2R = &aVerticalLeftToRight;
-//End of SCMS
+
SwRectFn fnRectB2T = &aBottomToTop;
SwRectFn fnRectVL2R = &aVerticalRightToLeft;
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 3f348b7..fb443fb 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -104,7 +104,7 @@ void SwBodyFrm::Format( const SwBorderAttrs * )
if ( nHeight < 0 )
nHeight = 0;
Frm().Height( nHeight );
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
if( IsVertical() && !IsVertLR() && !IsReverse() && nWidth != Frm().Width() )
Frm().Pos().setX(Frm().Pos().getX() + Frm().Width() - nWidth);
Frm().Width( nWidth );
@@ -309,7 +309,6 @@ void SwPageFrm::CheckDirection( bool bVert )
{
if( FRMDIR_HORI_LEFT_TOP == nDir || FRMDIR_HORI_RIGHT_TOP == nDir )
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
mbVertLR = 0;
mbVertical = 0;
}
@@ -318,14 +317,13 @@ void SwPageFrm::CheckDirection( bool bVert )
const SwViewShell *pSh = getRootFrm()->GetCurrShell();
if( pSh && pSh->GetViewOptions()->getBrowseMode() )
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
mbVertLR = 0;
mbVertical = 0;
}
else
{
mbVertical = 1;
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
if(FRMDIR_VERT_TOP_RIGHT == nDir)
mbVertLR = 0;
else if(FRMDIR_VERT_TOP_LEFT==nDir)
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index e394d15..c975039 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1401,7 +1401,6 @@ static void lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm,
if ( rAttrs.IsLine() || rAttrs.IsBorderDist() ||
(bShadow && rAttrs.GetShadow().GetLocation() != SVX_SHADOW_NONE) )
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
SwRectFn fnRect = pFrm->IsVertical() ? ( pFrm->IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori;
const SvxBoxItem &rBox = rAttrs.GetBox();
@@ -3478,7 +3477,6 @@ SwShortCut::SwShortCut( const SwFrm& rFrm, const SwRect& rRect )
}
else
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( rFrm.IsVertLR() )
{
fnCheck = &SwRect::GetLeftDistance;
@@ -5524,7 +5522,7 @@ void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFmtCol &rFmtCol,
const SwFrm *pCol = Lower();
if ( !pCol || !pCol->IsColumnFrm() )
return;
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
SwRectFn fnRect = pCol->IsVertical() ? ( pCol->IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori;
SwRect aLineRect = Prt();
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 87c037e..f1bdbac 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -213,7 +213,6 @@ void SwFrm::CheckDirChange()
SetInvalidVert( sal_True );
SetInvalidR2L( sal_True );
bool bChg = bOldR2L != IsRightToLeft();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
sal_Bool bOldVertL2R = IsVertLR();
if( ( IsVertical() != bOldVert ) || bChg || IsReverse() != bOldRev || bOldVertL2R != IsVertLR() )
{
@@ -305,7 +304,7 @@ void SwFrm::CheckDirChange()
Point SwFrm::GetFrmAnchorPos( sal_Bool bIgnoreFlysAnchoredAtThisFrame ) const
{
Point aAnchor = Frm().Pos();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
if ( ( IsVertical() && !IsVertLR() ) || IsRightToLeft() )
aAnchor.X() += Frm().Width();
@@ -574,7 +573,6 @@ const SwRect SwFrm::PaintArea() const
// Cell frames may not leave their upper:
SwRect aRect = IsRowFrm() ? GetUpper()->Frm() : Frm();
const sal_Bool bVert = IsVertical();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
SwRectFn fnRect = bVert ? ( IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori;
long nRight = (aRect.*fnRect->fnGetRight)();
long nLeft = (aRect.*fnRect->fnGetLeft)();
@@ -666,7 +664,6 @@ const SwRect SwFrm::PaintArea() const
const SwRect SwFrm::UnionFrm( sal_Bool bBorder ) const
{
sal_Bool bVert = IsVertical();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
SwRectFn fnRect = bVert ? ( IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori;
long nLeft = (Frm().*fnRect->fnGetLeft)();
long nWidth = (Frm().*fnRect->fnGetWidth)();
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index cb40be1..14ec809 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4331,7 +4331,7 @@ SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
{
SwTwips nHeight = (Frm().*fnRect->fnGetHeight)();
(Frm().*fnRect->fnSetHeight)( nHeight - nReal );
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
if( IsVertical() && !IsVertLR() && !bRev )
Frm().Pos().X() += nReal;
}
@@ -4346,7 +4346,7 @@ SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
nReal -= nTmp;
SwTwips nHeight = (Frm().*fnRect->fnGetHeight)();
(Frm().*fnRect->fnSetHeight)( nHeight + nReal );
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
if( IsVertical() && !IsVertLR() && !bRev )
Frm().Pos().X() -= nReal;
}
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 748ef4b..3e0efb8 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -2530,7 +2530,6 @@ void SwRootFrm::CalcFrmRects(
//At least the endframe...
bVert = pEndFrm->IsVertical();
bRev = pEndFrm->IsReverse();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
fnRect = bVert ? ( bRev ? fnRectVL2R : ( pEndFrm->IsVertLR() ? fnRectVertL2R : fnRectVert ) ) :
( bRev ? fnRectB2T : fnRectHori );
nTmpTwips = (aEndRect.*fnRect->fnGetTop)();
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 1a99bc3..84f0740 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -86,7 +86,6 @@ SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) :
{
OSL_ENSURE( pMod, "No frame format given." );
mbInvalidR2L = mbInvalidVert = 1;
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
mbDerivedR2L = mbDerivedVert = mbRightToLeft = mbVertical = mbReverse = mbVertLR = 0;
mbValidPos = mbValidPrtArea = mbValidSize = mbValidLineNum = mbRetouche =
@@ -123,7 +122,6 @@ void SwFrm::CheckDir( sal_uInt16 nDir, sal_Bool bVert, sal_Bool bOnlyBiDi, sal_B
mbInvalidVert = 0;
if( FRMDIR_HORI_LEFT_TOP == nDir || FRMDIR_HORI_RIGHT_TOP == nDir
|| bBrowse )
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
{
mbVertical = 0;
mbVertLR = 0;
@@ -1052,10 +1050,8 @@ void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
if ( IsHeaderFrm() || IsFooterFrm() )
fnRect = fnRectHori;
else if ( IsCellFrm() || IsColumnFrm() )
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
fnRect = GetUpper()->IsVertical() ? fnRectHori : ( GetUpper()->IsVertLR() ? fnRectVertL2R : fnRectVert );
else
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
fnRect = GetUpper()->IsVertical() ? ( GetUpper()->IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori;
if( (Frm().*fnRect->fnGetWidth)() != (pParent->Prt().*fnRect->fnGetWidth)())
@@ -1501,7 +1497,6 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, sal_Bool bTst )
if ( !bTst )
{
(pFrm->GetNext()->Frm().*fnRect->fnSetHeight)(nAddMax-nAdd);
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if( bVert && !bVertL2R && !bRev )
pFrm->GetNext()->Frm().Pos().X() += nAdd;
pFrm->GetNext()->InvalidatePrt();
@@ -1516,7 +1511,6 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, sal_Bool bTst )
{
SwTwips nTmp = (pFrm->Frm().*fnRect->fnGetHeight)();
(pFrm->Frm().*fnRect->fnSetHeight)( nTmp - nReal );
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if( bVert && !bVertL2R && !bRev )
pFrm->Frm().Pos().X() += nReal;
pFrm->InvalidatePrt();
@@ -1739,7 +1733,6 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
if ( !bTst )
{
(Frm().*fnRect->fnSetHeight)( nFrmHeight + nDist );
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if( IsVertical() && !IsVertLR() && !IsReverse() )
Frm().Pos().X() -= nDist;
if ( GetNext() )
@@ -1771,7 +1764,6 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
//Cntnts are always resized to the wished value.
long nOld = (Frm().*fnRect->fnGetHeight)();
(Frm().*fnRect->fnSetHeight)( nOld + nDist );
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if( IsVertical()&& !IsVertLR() && !IsReverse() )
Frm().Pos().X() -= nDist;
if ( nOld && IsInTab() )
@@ -1859,7 +1851,6 @@ SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
else
nRstHeight = nDist;
(Frm().*fnRect->fnSetHeight)( (Frm().*fnRect->fnGetHeight)() - nDist );
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if( IsVertical() && !IsVertLR() )
Frm().Pos().X() += nDist;
nDist = nRstHeight;
@@ -2249,7 +2240,6 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
if ( !bTst )
{
(Frm().*fnRect->fnSetHeight)( nFrmHeight + nDist );
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if( bChgPos && !IsVertLR() )
Frm().Pos().X() -= nDist;
bMoveAccFrm = true;
@@ -2331,7 +2321,6 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
( !IsCellFrm() || static_cast<SwCellFrm*>(this)->GetLayoutRowSpan() > 1 ) )
{
(Frm().*fnRect->fnSetHeight)( nFrmHeight + nReal );
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if( bChgPos && !IsVertLR() )
Frm().Pos().X() = nFrmPos - nReal;
bMoveAccFrm = true;
@@ -2416,7 +2405,6 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
if ( !bTst )
{
(Frm().*fnRect->fnSetHeight)( nFrmHeight - nReal );
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if( bChgPos && !IsVertLR() )
Frm().Pos().X() += nReal;
bMoveAccFrm = true;
@@ -2438,7 +2426,6 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
{
(Frm().*fnRect->fnSetHeight)( (Frm().*fnRect->fnGetHeight)()
+ nRealDist - nReal );
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if( bChgPos && !IsVertLR() )
Frm().Pos().X() += nRealDist - nReal;
OSL_ENSURE( !IsAccessibleFrm(), "bMoveAccFrm has to be set!" );
@@ -2452,7 +2439,6 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
{
(Frm().*fnRect->fnSetHeight)( (Frm().*fnRect->fnGetHeight)()
+ nReal - nTmp );
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if( bChgPos && !IsVertLR() )
Frm().Pos().X() += nTmp - nReal;
OSL_ENSURE( !IsAccessibleFrm(), "bMoveAccFrm has to be set!" );
@@ -2962,7 +2948,6 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs )
const sal_uInt16 nRight = (sal_uInt16)((SwBorderAttrs*)pAttrs)->CalcRight( this );
const sal_uInt16 nLower = pAttrs->CalcBottom();
bool bVert = IsVertical() && !IsPageFrm();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
SwRectFn fnRect = bVert ? ( IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori;
if ( !mbValidPrtArea )
{
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index fba24e4..b161f1c 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -345,7 +345,6 @@ SwTwips SwAnchoredObjectPosition::_GetVertRelPos(
break;
case text::VertOrientation::TOP:
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
nRelPosY += bVert
? ( bVertL2R
? _rLRSpacing.GetLeft()
@@ -360,7 +359,6 @@ SwTwips SwAnchoredObjectPosition::_GetVertRelPos(
break;
case text::VertOrientation::BOTTOM:
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
nRelPosY += nAlignAreaHeight -
( nObjHeight + ( bVert
? ( bVertL2R
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index 9861bc6..0245cb3 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -258,7 +258,6 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
// determine relative vertical position
SwTwips nRelPosY = nAlignAreaOffset;
const SwTwips nObjHeight = (aObjBoundRect.*fnRect->fnGetHeight)();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
const SwTwips nUpperSpace = bVert
? ( bVertL2R
? rLR.GetLeft()
@@ -278,7 +277,6 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
{
// bottom (to character anchored)
nRelPosY += nAlignAreaHeight + nUpperSpace;
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( bVert && !bVertL2R )
{
nRelPosY += nObjHeight;
diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
index c575b87..cf87309 100644
--- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
@@ -106,7 +106,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition()
if( bVert )
{
OSL_ENSURE( !bRev, "<SwToLayoutAnchoredObjectPosition::CalcPosition()> - reverse layout set." );
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
if ( bVertL2R )
aRelPos.X() = nRelPosY;
else
@@ -195,8 +195,6 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition()
// determine absolute 'horizontal' position, depending on layout-direction
// #i26791# - determine offset to 'horizontal' frame
// anchor position, depending on layout-direction
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
- // --> OD 2009-09-04 #mongolianlayout#
if( bVert || bVertL2R )
{
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 4a73939..19dfd62 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -198,7 +198,6 @@ bool SwTxtFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos,
const SwTwips nFrmMaxY = (pFrm->*fnRect->fnGetPrtBottom)();
// nMaxY is an absolute value
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
SwTwips nMaxY = bVert ?
( bVertL2R ? std::min( nFrmMaxY, nUpperMaxY ) : std::max( nFrmMaxY, nUpperMaxY ) ) :
std::min( nFrmMaxY, nUpperMaxY );
@@ -217,7 +216,6 @@ bool SwTxtFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos,
{
if( nFirstOffset > 0 )
aPnt1.Y() += nFirstOffset;
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( aPnt1.X() < nMaxY && !bVertL2R )
aPnt1.X() = nMaxY;
aPnt2.X() = aPnt1.X() + pFrm->Prt().Width();
@@ -369,7 +367,6 @@ bool SwTxtFrm::GetAutoPos( SwRect& rOrig, const SwPosition &rPos ) const
SwTwips nUpperMaxY = (pTmpFrm->*fnRect->fnGetPrtBottom)();
// nMaxY is in absolute value
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
SwTwips nMaxY = bVert ?
( bVertL2R ? std::min( (pFrm->*fnRect->fnGetPrtBottom)(), nUpperMaxY ) : std::max( (pFrm->*fnRect->fnGetPrtBottom)(), nUpperMaxY ) ) :
std::min( (pFrm->*fnRect->fnGetPrtBottom)(), nUpperMaxY );
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index d3992a4b..5eb0f47 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -428,7 +428,6 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, bool bHasToFit )
{
OSL_ENSURE( ! IsSwapped(),"Swapped frame while calculating nRstHeight" );
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( IsVertLR() )
nRstHeight = GetUpper()->Frm().Left()
+ GetUpper()->Prt().Left()
@@ -1095,7 +1094,6 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
// be rotated back after formatting, because we use the upper left point
// of the frame for rotation. This point changes when growing/shrinking.
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( IsVertical() && !IsVertLR() && nChg )
{
SwRect &rRepaint = *(pPara->GetRepaint());
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index c53d22a..9a6bf4a 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -425,7 +425,7 @@ SwRect SwTxtFrm::Paint()
// left margin
SwRepaint *pRepaint = GetPara()->GetRepaint();
long l;
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+
if ( IsVertLR() ) // mba: the following line was added, but we don't need it for the existing directions; kept for IsVertLR(), but should be checked
pRepaint->Chg( ( GetUpper()->Frm() ).Pos() + ( GetUpper()->Prt() ).Pos(), ( GetUpper()->Prt() ).SSize() );
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index d19f439..bf24d38 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -726,7 +726,6 @@ void SwTxtPaintInfo::CalcRect( const SwLinePortion& rPor,
else
{
aPoint.A() = X();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( GetTxtFrm()->IsVertLR() )
aPoint.B() = Y() - rPor.Height() + rPor.GetAscent();
else
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index aea80ef..5abe029 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -334,7 +334,6 @@ sal_uInt16 SwTxtCursor::AdjustBaseLine( const SwLineLayout& rLine,
case SvxParaVertAlignItem::AUTOMATIC :
if ( bAutoToCentered || GetInfo().GetTxtFrm()->IsVertical() )
{
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if( GetInfo().GetTxtFrm()->IsVertLR() )
nOfst += rLine.Height() - ( rLine.Height() - nPorHeight ) / 2 - nPorAscent;
else
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 1736839..eee6f2c 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -82,7 +82,6 @@ void SwTxtFrm::SwapWidthAndHeight()
{
const long nPrtOfstX = Prt().Pos().X();
Prt().Pos().X() = Prt().Pos().Y();
- // Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if( IsVertLR() )
Prt().Pos().Y() = nPrtOfstX;
else
@@ -93,7 +92,6 @@ void SwTxtFrm::SwapWidthAndHeight()
{
const long nPrtOfstY = Prt().Pos().Y();
Prt().Pos().Y() = Prt().Pos().X();
- // Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if( IsVertLR() )
Prt().Pos().X() = nPrtOfstY;
else
@@ -115,7 +113,6 @@ void SwTxtFrm::SwapWidthAndHeight()
void SwTxtFrm::SwitchHorizontalToVertical( SwRect& rRect ) const
{
// calc offset inside frame
- // Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
long nOfstX, nOfstY;
if ( IsVertLR() )
{
@@ -131,7 +128,6 @@ void SwTxtFrm::SwitchHorizontalToVertical( SwRect& rRect ) const
const long nWidth = rRect.Width();
const long nHeight = rRect.Height();
- // Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( IsVertLR() )
rRect.Left(Frm().Left() + nOfstY);
else
@@ -155,7 +151,6 @@ void SwTxtFrm::SwitchHorizontalToVertical( Point& rPoint ) const
// calc offset inside frame
const long nOfstX = rPoint.X() - Frm().Left();
const long nOfstY = rPoint.Y() - Frm().Top();
- // Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( IsVertLR() )
rPoint.X() = Frm().Left() + nOfstY;
else
@@ -187,7 +182,6 @@ void SwTxtFrm::SwitchVerticalToHorizontal( SwRect& rRect ) const
// calc offset inside frame
- // Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( IsVertLR() )
nOfstX = rRect.Left() - Frm().Left();
else
@@ -217,7 +211,6 @@ void SwTxtFrm::SwitchVerticalToHorizontal( Point& rPoint ) const
// calc offset inside frame
- // Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( IsVertLR() )
nOfstX = rPoint.X() - Frm().Left();
else
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index ee2b095..da1eb3a 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -117,7 +117,6 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto )
nLinePos - nTabPos :
nLinePos + nTabPos;
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
SwTwips nMyRight;
if ( pFrm->IsVertLR() )
nMyRight = Left();
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index a7e1c85..91f8303 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -224,7 +224,6 @@ void SwTxtFrmBreak::SetRstHeight( const SwTxtMargin &rLine )
nRstHeight = (pFrm->*fnRect->fnGetBottomMargin)();
if ( bVert )
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
{
if ( pFrm->IsVertLR() )
nRstHeight = (*fnRect->fnYDiff)( pFrm->SwitchHorizontalToVertical( rLine.Y() ) , nOrigin );
commit 23f15c5d4806ca570e81c8e9c95a3158197cb84a
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 18 11:12:56 2014 +0300
Don't inherit from std::vector
Change-Id: I9a37097d2d1e6d0728e2d465d0aa9355583dbdda
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index eb3133a..e394d15 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -162,10 +162,15 @@ public:
bool MakeUnion( const SwRect &rRect );
};
-class SwLineRects : public std::vector< SwLineRect >
+class SwLineRects
{
- size_t nLastCount; //avoid unnecessary cycles in PaintLines
public:
+ std::vector< SwLineRect > aLineRects;
+ typedef std::vector< SwLineRect >::const_iterator const_iterator;
+ typedef std::vector< SwLineRect >::iterator iterator;
+ typedef std::vector< SwLineRect >::reverse_iterator reverse_iterator;
+ typedef std::vector< SwLineRect >::size_type size_type;
+ size_t nLastCount; //avoid unnecessary cycles in PaintLines
SwLineRects() : nLastCount( 0 ) {}
void AddLineRect( const SwRect& rRect, const Color *pColor, const SvxBorderStyle nStyle,
const SwTabFrm *pTab, const sal_uInt8 nSCol );
@@ -174,7 +179,7 @@ public:
void LockLines( sal_Bool bLock );
//Limit lines to 100
- bool isFull() const { return this->size()>100 ? true : false; }
+ bool isFull() const { return aLineRects.size()>100 ? true : false; }
};
class SwSubsRects : public SwLineRects
@@ -632,7 +637,7 @@ void SwLineRects::AddLineRect( const SwRect &rRect, const Color *pCol, const Svx
//Loop backwards because lines which can be combined, can usually be painted
//in the same context.
- for (SwLineRects::reverse_iterator it = this->rbegin(); it != this->rend();
+ for (reverse_iterator it = aLineRects.rbegin(); it != aLineRects.rend();
++it)
{
SwLineRect &rLRect = (*it);
@@ -647,7 +652,7 @@ void SwLineRects::AddLineRect( const SwRect &rRect, const Color *pCol, const Svx
return;
}
}
- this->push_back( SwLineRect( rRect, pCol, nStyle, pTab, nSCol ) );
+ aLineRects.push_back( SwLineRect( rRect, pCol, nStyle, pTab, nSCol ) );
}
void SwLineRects::ConnectEdges( OutputDevice *pOut )
@@ -663,9 +668,9 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
std::vector<SwLineRect*> aCheck;
- for (size_t i = 0; i < this->size(); ++i)
+ for (size_t i = 0; i < aLineRects.size(); ++i)
{
- SwLineRect &rL1 = (*this)[i];
+ SwLineRect &rL1 = aLineRects[i];
if ( !rL1.GetTab() || rL1.IsPainted() || rL1.IsLocked() )
continue;
@@ -686,7 +691,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
}
// Collect all lines to possibly link with i1
- for (SwLineRects::iterator it2 = this->begin(); it2 != this->end(); ++it2)
+ for (iterator it2 = aLineRects.begin(); it2 != aLineRects.end(); ++it2)
{
SwLineRect &rL2 = (*it2);
if ( rL2.GetTab() != rL1.GetTab() ||
@@ -752,7 +757,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
aIns.Bottom( pLA->Bottom() );
if ( !rL1.IsInside( aIns ) )
continue;
- this->push_back( SwLineRect( aIns, rL1.GetColor(),
+ aLineRects.push_back( SwLineRect( aIns, rL1.GetColor(),
table::BorderLineStyle::SOLID,
rL1.GetTab(), SUBCOL_TAB ) );
if ( isFull() )
@@ -793,7 +798,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
aIns.Right( pLA->Right() );
if ( !rL1.IsInside( aIns ) )
continue;
- this->push_back( SwLineRect( aIns, rL1.GetColor(),
+ aLineRects.push_back( SwLineRect( aIns, rL1.GetColor(),
table::BorderLineStyle::SOLID,
rL1.GetTab(), SUBCOL_TAB ) );
if ( isFull() )
@@ -813,7 +818,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
}
if ( bRemove )
{
- this->erase(this->begin() + i);
+ aLineRects.erase(aLineRects.begin() + i);
--i;
}
}
@@ -823,11 +828,11 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
{
// All help lines that are covered by any border will be removed or split
- for (size_t i = 0; i < this->size(); ++i)
+ for (size_t i = 0; i < aLineRects.size(); ++i)
{
// get a copy instead of a reference, because an <insert> may destroy
// the object due to a necessary array resize.
- const SwLineRect aSubsLineRect = SwLineRect((*this)[i]);
+ const SwLineRect aSubsLineRect = SwLineRect(aLineRects[i]);
// add condition <aSubsLineRect.IsLocked()> in order to consider only
// border lines, which are *not* locked.
@@ -847,7 +852,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
aSubsRect.Top ( aSubsRect.Top() - (nPixelSzH+nHalfPixelSzH) );
aSubsRect.Bottom( aSubsRect.Bottom() + (nPixelSzH+nHalfPixelSzH) );
}
- for (SwLineRects::const_iterator itK = rRects.begin(); itK != rRects.end(); ++itK)
+ for (const_iterator itK = rRects.aLineRects.begin(); itK != rRects.aLineRects.end(); ++itK)
{
const SwLineRect &rLine = *itK;
@@ -871,7 +876,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
{
SwRect aNewSubsRect( aSubsLineRect );
aNewSubsRect.Bottom( nTmp );
- this->push_back( SwLineRect( aNewSubsRect, 0, aSubsLineRect.GetStyle(), 0,
+ aLineRects.push_back( SwLineRect( aNewSubsRect, 0, aSubsLineRect.GetStyle(), 0,
aSubsLineRect.GetSubColor() ) );
}
nTmp = rLine.Bottom()+nPixelSzH+1;
@@ -879,10 +884,10 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
{
SwRect aNewSubsRect( aSubsLineRect );
aNewSubsRect.Top( nTmp );
- this->push_back( SwLineRect( aNewSubsRect, 0, aSubsLineRect.GetStyle(), 0,
+ aLineRects.push_back( SwLineRect( aNewSubsRect, 0, aSubsLineRect.GetStyle(), 0,
aSubsLineRect.GetSubColor() ) );
}
- this->erase(this->begin() + i);
+ aLineRects.erase(aLineRects.begin() + i);
--i;
break;
}
@@ -897,7 +902,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
{
SwRect aNewSubsRect( aSubsLineRect );
aNewSubsRect.Right( nTmp );
- this->push_back( SwLineRect( aNewSubsRect, 0, aSubsLineRect.GetStyle(), 0,
+ aLineRects.push_back( SwLineRect( aNewSubsRect, 0, aSubsLineRect.GetStyle(), 0,
aSubsLineRect.GetSubColor() ) );
}
nTmp = rLine.Right()+nPixelSzW+1;
@@ -905,10 +910,10 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
{
SwRect aNewSubsRect( aSubsLineRect );
aNewSubsRect.Left( nTmp );
- this->push_back( SwLineRect( aNewSubsRect, 0, aSubsLineRect.GetStyle(), 0,
+ aLineRects.push_back( SwLineRect( aNewSubsRect, 0, aSubsLineRect.GetStyle(), 0,
aSubsLineRect.GetSubColor() ) );
}
- this->erase(this->begin() + i);
+ aLineRects.erase(aLineRects.begin() + i);
--i;
break;
}
@@ -920,7 +925,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
void SwLineRects::LockLines( sal_Bool bLock )
{
- for (SwLineRects::iterator it = this->begin(); it != this->end(); ++it)
+ for (iterator it = aLineRects.begin(); it != aLineRects.end(); ++it)
(*it).Lock( bLock );
}
@@ -966,7 +971,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
{
// Paint the borders. Sadly two passes are needed.
// Once for the inside and once for the outside edges of tables
- if ( this->size() != nLastCount )
+ if ( aLineRects.size() != nLastCount )
{
// #i16816# tagged pdf support
SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pOut );
@@ -978,11 +983,11 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
const Color *pLast = 0;
bool bPaint2nd = false;
- size_t nMinCount = this->size();
+ size_t nMinCount = aLineRects.size();
- for ( size_t i = 0; i < size(); ++i )
+ for ( size_t i = 0; i < aLineRects.size(); ++i )
{
- SwLineRect &rLRect = operator[](i);
+ SwLineRect &rLRect = aLineRects[i];
if ( rLRect.IsPainted() )
continue;
@@ -1045,9 +1050,9 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
}
if ( bPaint2nd )
{
- for ( size_t i = 0; i < size(); ++i )
+ for ( size_t i = 0; i < aLineRects.size(); ++i )
{
- SwLineRect &rLRect = operator[](i);
+ SwLineRect &rLRect = aLineRects[i];
if ( rLRect.IsPainted() )
continue;
@@ -1084,20 +1089,20 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
void SwSubsRects::PaintSubsidiary( OutputDevice *pOut,
const SwLineRects *pRects )
{
- if ( !this->empty() )
+ if ( !aLineRects.empty() )
{
// #i16816# tagged pdf support
SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pOut );
// Remove all help line that are almost covered (tables)
- for (SwSubsRects::size_type i = 0; i != this->size(); ++i)
+ for (size_type i = 0; i != aLineRects.size(); ++i)
{
- SwLineRect &rLi = (*this)[i];
+ SwLineRect &rLi = aLineRects[i];
const bool bVerticalSubs = rLi.Height() > rLi.Width();
- for (SwSubsRects::size_type k = i + 1; k != this->size(); ++k)
+ for (size_type k = i + 1; k != aLineRects.size(); ++k)
{
- SwLineRect &rLk = (*this)[k];
+ SwLineRect &rLk = aLineRects[k];
if ( rLi.SSize() == rLk.SSize() )
{
if ( bVerticalSubs == ( rLk.Height() > rLk.Width() ) )
@@ -1110,7 +1115,7 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut,
((nLi < rLk.Left() && nLi+21 > rLk.Left()) ||
(nLk < rLi.Left() && nLk+21 > rLi.Left())))
{
- this->erase(this->begin() + k);
+ aLineRects.erase(aLineRects.begin() + k);
// don't continue with inner loop any more:
// the array may shrink!
--i;
@@ -1125,7 +1130,7 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut,
((nLi < rLk.Top() && nLi+21 > rLk.Top()) ||
(nLk < rLi.Top() && nLk+21 > rLi.Top())))
{
- this->erase(this->begin() + k);
+ aLineRects.erase(aLineRects.begin() + k);
// don't continue with inner loop any more:
// the array may shrink!
--i;
@@ -1137,10 +1142,10 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut,
}
}
- if ( pRects && (!pRects->empty()) )
+ if ( pRects && (!pRects->aLineRects.empty()) )
RemoveSuperfluousSubsidiaryLines( *pRects );
- if ( !this->empty() )
+ if ( !aLineRects.empty() )
{
pOut->Push( PUSH_FILLCOLOR|PUSH_LINECOLOR );
pOut->SetLineColor();
@@ -1155,7 +1160,7 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut,
pOut->SetDrawMode( 0 );
}
- for (SwSubsRects::iterator it = this->begin(); it != this->end();
+ for (SwSubsRects::iterator it = aLineRects.begin(); it != aLineRects.end();
++it)
{
SwLineRect &rLRect = (*it);
More information about the Libreoffice-commits
mailing list