include/tools/gen.hxx | 16
sw/source/core/access/accmap.cxx | 16
sw/source/core/bastyp/swrect.cxx | 16
sw/source/core/crsr/crsrsh.cxx | 8
sw/source/core/doc/doclay.cxx | 2
sw/source/core/doc/notxtfrm.cxx | 20 -
sw/source/core/doc/textboxhelper.cxx | 4
sw/source/core/docnode/swbaslnk.cxx | 16
sw/source/core/draw/dflyobj.cxx | 6
sw/source/core/fields/expfld.cxx | 2
sw/source/core/frmedt/fefly1.cxx | 8
sw/source/core/frmedt/feshview.cxx | 12
sw/source/core/frmedt/fews.cxx | 48 +-
sw/source/core/layout/anchoredobject.cxx | 8
sw/source/core/layout/atrfrm.cxx | 6
sw/source/core/layout/fly.cxx | 20 -
sw/source/core/layout/flylay.cxx | 6
sw/source/core/layout/frmtool.cxx | 4
sw/source/core/layout/ftnfrm.cxx | 8
sw/source/core/layout/hffrm.cxx | 2
sw/source/core/layout/laycache.cxx | 8
sw/source/core/layout/pagechg.cxx | 4
sw/source/core/layout/paintfrm.cxx | 136
++++----
sw/source/core/layout/ssfrm.cxx | 24 -
sw/source/core/layout/tabfrm.cxx | 4
sw/source/core/layout/trvlfrm.cxx | 62 +--
sw/source/core/layout/virtoutp.cxx | 8
sw/source/core/layout/wsfrm.cxx | 36 +-
sw/source/core/objectpositioning/anchoredobjectposition.cxx | 16
sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx | 28 -
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 40 +-
sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 18 -
sw/source/core/text/EnhancedPDFExportHelper.cxx | 8
sw/source/core/text/blink.cxx | 18 -
sw/source/core/text/frmcrsr.cxx | 64 +--
sw/source/core/text/frmform.cxx | 4
sw/source/core/text/frmpaint.cxx | 16
sw/source/core/text/inftxt.cxx | 78 ++--
sw/source/core/text/itrcrsr.cxx | 114
+++---
sw/source/core/text/itrform2.cxx | 18 -
sw/source/core/text/itrpaint.cxx | 10
sw/source/core/text/porfld.cxx | 12
sw/source/core/text/porglue.cxx | 2
sw/source/core/text/porlay.cxx | 2
sw/source/core/text/porrst.cxx | 14
sw/source/core/text/txtdrop.cxx | 8
sw/source/core/text/txtfrm.cxx | 30 -
sw/source/core/text/txtpaint.cxx | 2
sw/source/core/txtnode/fntcache.cxx | 96
++---
sw/source/core/txtnode/fntcap.cxx | 24 -
sw/source/core/txtnode/swfont.cxx | 42 +-
sw/source/core/undo/unattr.cxx | 4
sw/source/core/unocore/unosett.cxx | 4
sw/source/core/unocore/unotbl.cxx | 2
sw/source/core/view/pagepreviewlayout.cxx | 132
+++----
sw/source/core/view/vdraw.cxx | 8
sw/source/core/view/viewpg.cxx | 2
sw/source/core/view/viewsh.cxx | 56 +--
sw/source/core/view/vprint.cxx | 6
sw/source/filter/html/css1atr.cxx | 4
sw/source/filter/html/htmldrawreader.cxx | 18 -
sw/source/filter/html/htmldrawwriter.cxx | 10
sw/source/filter/html/htmlflywriter.cxx | 90
++---
sw/source/filter/html/htmlform.cxx | 50 +-
sw/source/filter/html/htmlforw.cxx | 8
sw/source/filter/html/htmlgrin.cxx | 32 -
sw/source/filter/html/htmlplug.cxx | 60 +--
sw/source/filter/html/htmltabw.cxx | 10
sw/source/filter/html/swhtml.cxx | 10
sw/source/filter/ww8/rtfattributeoutput.cxx | 8
sw/source/filter/ww8/wrtw8esh.cxx | 6
sw/source/filter/ww8/wrtww8gr.cxx | 8
sw/source/filter/ww8/ww8graf.cxx | 64 +--
sw/source/filter/ww8/ww8par.cxx | 20 -
sw/source/filter/ww8/ww8par4.cxx | 4
sw/source/filter/xml/xmlimp.cxx | 4
sw/source/ui/chrdlg/drpcps.cxx | 2
sw/source/ui/config/optpage.cxx | 4
sw/source/ui/dbui/createaddresslistdialog.cxx | 2
sw/source/ui/dbui/mmaddressblockpage.cxx | 2
sw/source/ui/envelp/labfmt.cxx | 24 -
sw/source/ui/envelp/mailmrge.cxx | 2
sw/source/ui/fldui/FldRefTreeListBox.cxx | 4
sw/source/ui/fldui/fldtdlg.cxx | 16
sw/source/ui/frmdlg/frmpage.cxx | 10
sw/source/ui/frmdlg/wrap.cxx | 4
sw/source/ui/index/cnttab.cxx | 24 -
sw/source/ui/misc/glosbib.cxx | 4
sw/source/ui/misc/glossary.cxx | 4
sw/source/ui/misc/outline.cxx | 4
sw/source/ui/misc/pggrid.cxx | 8
sw/source/ui/table/tautofmt.cxx | 18 -
sw/source/uibase/app/docsh.cxx | 2
sw/source/uibase/config/usrpref.cxx | 4
sw/source/uibase/dbui/mailmergehelper.cxx | 8
sw/source/uibase/docvw/AnnotationMenuButton.cxx | 8
sw/source/uibase/docvw/SidebarTxtControl.cxx | 2
sw/source/uibase/docvw/edtdd.cxx | 16
sw/source/uibase/docvw/edtwin.cxx | 18 -
sw/source/uibase/docvw/edtwin2.cxx | 8
sw/source/uibase/docvw/srcedtw.cxx | 14
sw/source/uibase/frmdlg/colex.cxx | 72 ++--
sw/source/uibase/frmdlg/frmmgr.cxx | 8
sw/source/uibase/misc/swruler.cxx | 20 -
sw/source/uibase/ribbar/conform.cxx | 8
sw/source/uibase/ribbar/drawbase.cxx | 12
sw/source/uibase/ribbar/inputwin.cxx | 14
sw/source/uibase/shells/drwbassh.cxx | 8
sw/source/uibase/shells/grfsh.cxx | 4
sw/source/uibase/shells/grfshex.cxx | 4
sw/source/uibase/shells/textsh.cxx | 6
sw/source/uibase/table/chartins.cxx | 22 -
sw/source/uibase/uiview/pview.cxx | 22 -
sw/source/uibase/uiview/srcview.cxx | 10
sw/source/uibase/uiview/swcli.cxx | 4
sw/source/uibase/uiview/view.cxx | 4
sw/source/uibase/uiview/view2.cxx | 6
sw/source/uibase/uiview/viewdraw.cxx | 12
sw/source/uibase/uiview/viewling.cxx | 4
sw/source/uibase/uiview/viewmdi.cxx | 16
sw/source/uibase/uiview/viewport.cxx | 170
+++++-----
sw/source/uibase/uiview/viewtab.cxx | 68 ++--
sw/source/uibase/uno/unomod.cxx | 4
sw/source/uibase/utlui/content.cxx | 6
sw/source/uibase/utlui/glbltree.cxx | 6
sw/source/uibase/utlui/navipi.cxx | 6
sw/source/uibase/utlui/shdwcrsr.cxx | 12
sw/source/uibase/utlui/viewlayoutctrl.cxx | 8
sw/source/uibase/wrtsh/move.cxx | 28 -
sw/source/uibase/wrtsh/wrtsh1.cxx | 16
130 files changed, 1293 insertions(+), 1293 deletions(-)
New commits:
commit 180f2860525fb7ed4892b417b20c3f2f9cbb44e0
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Wed Feb 21 10:13:03 2018 +0200
loplugin:changetoolsgen in sw
Change-Id: If07efe4c15cfc28df38a9327856d39313ca78d50
Reviewed-on: https://gerrit.libreoffice.org/50078
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index 38ca77af9046..ce79396e6788 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -82,8 +82,8 @@ public:
long& Y() { return nB; }
void Move( long nHorzMove, long nVertMove );
- void AdjustX( long nHorzMove ) { nA += nHorzMove; }
- void AdjustY( long nVertMove ) { nB += nVertMove; }
+ long AdjustX( long nHorzMove ) { nA += nHorzMove; return
nA; }
+ long AdjustY( long nVertMove ) { nB += nVertMove; return
nB; }
void RotateAround( long& rX, long& rY, short nOrientation )
const;
@@ -193,8 +193,8 @@ public:
long& Width() { return nA; }
long& Height() { return nB; }
- void AdjustWidth( long n ) { nA += n; }
- void AdjustHeight( long n ) { nB += n; }
+ long AdjustWidth( long n ) { nA += n; return nA; }
+ long AdjustHeight( long n ) { nB += n; return nB; }
long getWidth() const { return Width(); }
long getHeight() const { return Height(); }
@@ -404,10 +404,10 @@ public:
/// Move the top and left edges by a delta, preserving width and height
inline void Move( long nHorzMoveDelta, long nVertMoveDelta );
- void AdjustLeft( long nHorzMoveDelta ) { nLeft +=
nHorzMoveDelta; }
- void AdjustRight( long nHorzMoveDelta ) { nRight +=
nHorzMoveDelta; }
- void AdjustTop( long nVertMoveDelta ) { nTop +=
nVertMoveDelta; }
- void AdjustBottom( long nVertMoveDelta ) { nBottom +=
nVertMoveDelta; }
+ long AdjustLeft( long nHorzMoveDelta ) { nLeft +=
nHorzMoveDelta; return nLeft; }
+ long AdjustRight( long nHorzMoveDelta ) { nRight +=
nHorzMoveDelta; return nRight; }
+ long AdjustTop( long nVertMoveDelta ) { nTop +=
nVertMoveDelta; return nTop; }
+ long AdjustBottom( long nVertMoveDelta ) { nBottom +=
nVertMoveDelta; return nBottom; }
inline void SetPos( const Point& rPoint );
void SetSize( const Size& rSize );
inline Size GetSize() const;
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 98a50e784b5b..215985502de2 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -3220,14 +3220,14 @@ static inline void
lcl_CorrectRectangle(tools::Rectangle & rRect,
const tools::Rectangle & rSource,
const tools::Rectangle & rInGrid)
{
- rRect.Left() = lcl_CorrectCoarseValue(rRect.Left(), rSource.Left(),
- rInGrid.Left(), false);
- rRect.Top() = lcl_CorrectCoarseValue(rRect.Top(), rSource.Top(),
- rInGrid.Top(), false);
- rRect.Right() = lcl_CorrectCoarseValue(rRect.Right(), rSource.Right(),
- rInGrid.Right(), true);
- rRect.Bottom() = lcl_CorrectCoarseValue(rRect.Bottom(), rSource.Bottom(),
- rInGrid.Bottom(), true);
+ rRect.SetLeft( lcl_CorrectCoarseValue(rRect.Left(), rSource.Left(),
+ rInGrid.Left(), false) );
+ rRect.SetTop( lcl_CorrectCoarseValue(rRect.Top(), rSource.Top(),
+ rInGrid.Top(), false) );
+ rRect.SetRight( lcl_CorrectCoarseValue(rRect.Right(), rSource.Right(),
+ rInGrid.Right(), true) );
+ rRect.SetBottom( lcl_CorrectCoarseValue(rRect.Bottom(), rSource.Bottom(),
+ rInGrid.Bottom(), true) );
}
tools::Rectangle SwAccessibleMap::CoreToPixel( const tools::Rectangle& rRect )
const
diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx
index ac71a2023de3..8702d8f15733 100644
--- a/sw/source/core/bastyp/swrect.cxx
+++ b/sw/source/core/bastyp/swrect.cxx
@@ -150,9 +150,9 @@ void SwRect::Justify()
// Similar to the inline methods, but we need the function pointers
void SwRect::Width_( const long nNew ) { m_Size.setWidth(nNew); }
void SwRect::Height_( const long nNew ) { m_Size.setHeight(nNew); }
-void SwRect::Left_( const long nLeft ){ m_Size.Width() += m_Point.getX() -
nLeft; m_Point.setX(nLeft); }
+void SwRect::Left_( const long nLeft ){ m_Size.AdjustWidth(m_Point.getX() -
nLeft ); m_Point.setX(nLeft); }
void SwRect::Right_( const long nRight ){ m_Size.setWidth(nRight -
m_Point.getX()); }
-void SwRect::Top_( const long nTop ){ m_Size.Height() += m_Point.getY() -
nTop; m_Point.setY(nTop); }
+void SwRect::Top_( const long nTop ){ m_Size.AdjustHeight(m_Point.getY() -
nTop ); m_Point.setY(nTop); }
void SwRect::Bottom_( const long nBottom ){ m_Size.setHeight(nBottom -
m_Point.getY()); }
long SwRect::Width_() const{ return m_Size.getWidth(); }
@@ -162,12 +162,12 @@ long SwRect::Right_() const{ return m_Point.getX() +
m_Size.getWidth(); }
long SwRect::Top_() const{ return m_Point.getY(); }
long SwRect::Bottom_() const{ return m_Point.getY() + m_Size.getHeight(); }
-void SwRect::AddWidth( const long nAdd ) { m_Size.Width() += nAdd; }
-void SwRect::AddHeight( const long nAdd ) { m_Size.Height() += nAdd; }
-void SwRect::SubLeft( const long nSub ){ m_Size.Width() += nSub;
m_Point.setX(m_Point.getX() - nSub); }
-void SwRect::AddRight( const long nAdd ){ m_Size.Width() += nAdd; }
-void SwRect::SubTop( const long nSub ){ m_Size.Height() += nSub;
m_Point.setY(m_Point.getY() - nSub); }
-void SwRect::AddBottom( const long nAdd ){ m_Size.Height() += nAdd; }
+void SwRect::AddWidth( const long nAdd ) { m_Size.AdjustWidth(nAdd ); }
+void SwRect::AddHeight( const long nAdd ) { m_Size.AdjustHeight(nAdd ); }
+void SwRect::SubLeft( const long nSub ){ m_Size.AdjustWidth(nSub );
m_Point.setX(m_Point.getX() - nSub); }
+void SwRect::AddRight( const long nAdd ){ m_Size.AdjustWidth(nAdd ); }
+void SwRect::SubTop( const long nSub ){ m_Size.AdjustHeight(nSub );
m_Point.setY(m_Point.getY() - nSub); }
+void SwRect::AddBottom( const long nAdd ){ m_Size.AdjustHeight(nAdd ); }
void SwRect::SetPosX( const long nNew ){ m_Point.setX(nNew); }
void SwRect::SetPosY( const long nNew ){ m_Point.setY(nNew); }
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 3a0aef4fa6de..beece9959b25 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -565,7 +565,7 @@ bool SwCursorShell::SttEndDoc( bool bStt )
if( bRet )
{
if( bStt )
- pTmpCursor->GetPtPos().Y() = 0; // set to 0 explicitly (table
header)
+ pTmpCursor->GetPtPos().setY( 0 ); // set to 0 explicitly (table
header)
if( m_pBlockCursor )
{
m_pBlockCursor->clearPoints();
@@ -2795,8 +2795,8 @@ void SwCursorShell::MakeSelVisible()
}
if( !aTmp.HasArea() )
{
- aTmp.SSize().Height() += 1;
- aTmp.SSize().Width() += 1;
+ aTmp.SSize().AdjustHeight(1 );
+ aTmp.SSize().AdjustWidth(1 );
}
MakeVisible( aTmp );
}
@@ -2807,7 +2807,7 @@ void SwCursorShell::MakeSelVisible()
else
{
SwRect aTmp( m_aCharRect );
- aTmp.SSize().Height() += 1; aTmp.SSize().Width() += 1;
+ aTmp.SSize().AdjustHeight(1 ); aTmp.SSize().AdjustWidth(1 );
MakeVisible( aTmp );
}
}
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 53f9c85c5833..3b93cd9735da 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -266,7 +266,7 @@ SwFlyFrameFormat* SwDoc::MakeFlySection_( const SwPosition&
rAnchPos,
// Set size
Size aSize( pNoTextNode->GetTwipSize() );
if( MINFLY > aSize.Width() )
- aSize.Width() = DEF_FLY_WIDTH;
+ aSize.setWidth( DEF_FLY_WIDTH );
aFormatSize.SetWidth( aSize.Width() );
if( aSize.Height() )
{
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 009047c73584..65d6be161ed4 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -334,13 +334,13 @@ static void lcl_CalcRect( Point& rPt, Size& rDim,
MirrorGraph nMirror )
if( nMirror == MirrorGraph::Vertical || nMirror == MirrorGraph::Both )
{
rPt.setX(rPt.getX() + rDim.Width() -1);
- rDim.Width() = -rDim.Width();
+ rDim.setWidth( -rDim.Width() );
}
if( nMirror == MirrorGraph::Horizontal || nMirror == MirrorGraph::Both )
{
rPt.setY(rPt.getY() + rDim.Height() -1);
- rDim.Height() = -rDim.Height();
+ rDim.setHeight( -rDim.Height() );
}
}
@@ -382,7 +382,7 @@ void SwNoTextFrame::GetGrfArea( SwRect &rRect, SwRect*
pOrigRect ) const
Size aOrigSz( static_cast<const SwNoTextNode*>(GetNode())->GetTwipSize() );
if ( !aOrigSz.Width() )
{
- aOrigSz.Width() = aFramePrintArea.Width();
+ aOrigSz.setWidth( aFramePrintArea.Width() );
nLeftCrop = -rCrop.GetLeft();
nRightCrop = -rCrop.GetRight();
}
@@ -405,7 +405,7 @@ void SwNoTextFrame::GetGrfArea( SwRect &rRect, SwRect*
pOrigRect ) const
if( !aOrigSz.Height() )
{
- aOrigSz.Height() = aFramePrintArea.Height();
+ aOrigSz.setHeight( aFramePrintArea.Height() );
nTopCrop = -rCrop.GetTop();
nBottomCrop= -rCrop.GetBottom();
}
@@ -434,17 +434,17 @@ void SwNoTextFrame::GetGrfArea( SwRect &rRect, SwRect*
pOrigRect ) const
if ( nLeftCrop > 0 )
{
aVisPt.setX(aVisPt.getX() + nLeftCrop);
- aVisSz.Width() -= nLeftCrop;
+ aVisSz.AdjustWidth( -nLeftCrop );
}
if ( nTopCrop > 0 )
{
aVisPt.setY(aVisPt.getY() + nTopCrop);
- aVisSz.Height() -= nTopCrop;
+ aVisSz.AdjustHeight( -nTopCrop );
}
if ( nRightCrop > 0 )
- aVisSz.Width() -= nRightCrop;
+ aVisSz.AdjustWidth( -nRightCrop );
if ( nBottomCrop > 0 )
- aVisSz.Height() -= nBottomCrop;
+ aVisSz.AdjustHeight( -nBottomCrop );
rRect.Pos ( aVisPt );
rRect.SSize( aVisSz );
@@ -454,9 +454,9 @@ void SwNoTextFrame::GetGrfArea( SwRect &rRect, SwRect*
pOrigRect ) const
{
Size aTmpSz( aGrfSz );
aGrfPt.setX(aGrfPt.getX() + nLeftCrop);
- aTmpSz.Width() -= nLeftCrop + nRightCrop;
+ aTmpSz.AdjustWidth( -(nLeftCrop + nRightCrop) );
aGrfPt.setY(aGrfPt.getY() + nTopCrop);
- aTmpSz.Height()-= nTopCrop + nBottomCrop;
+ aTmpSz.AdjustHeight( -(nTopCrop + nBottomCrop) );
if( MirrorGraph::Dont != nMirror )
lcl_CalcRect( aGrfPt, aTmpSz, nMirror );
diff --git a/sw/source/core/doc/textboxhelper.cxx
b/sw/source/core/doc/textboxhelper.cxx
index facf350dea2a..ccfb7b4d5f53 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -298,8 +298,8 @@ tools::Rectangle
SwTextBoxHelper::getTextRectangle(SwFrameFormat* pShape, bool b
// Relative, so count the logic (reference) rectangle, see the
EnhancedCustomShape2d ctor.
Point aPoint(pCustomShape->GetSnapRect().Center());
Size aSize(pCustomShape->GetLogicRect().GetSize());
- aPoint.X() -= aSize.Width() / 2;
- aPoint.Y() -= aSize.Height() / 2;
+ aPoint.AdjustX( -(aSize.Width() / 2) );
+ aPoint.AdjustY( -(aSize.Height() / 2) );
tools::Rectangle aLogicRect(aPoint, aSize);
aRet.Move(-1 * aLogicRect.Left(), -1 * aLogicRect.Top());
}
diff --git a/sw/source/core/docnode/swbaslnk.cxx
b/sw/source/core/docnode/swbaslnk.cxx
index ca8b9183b96c..22f4f8bfe575 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -310,21 +310,21 @@ static bool SetGrfFlySize( const Size& rGrfSz, SwGrfNode*
pGrfNd, const Size& rO
Size aCalcSz( aSz );
if ( !aSz.Height() && aSz.Width() )
// Calculate the right height
- aCalcSz.Height() = rGrfSz.Height() *
- aSz.Width() / rGrfSz.Width();
+ aCalcSz.setHeight( rGrfSz.Height() *
+ aSz.Width() / rGrfSz.Width() );
else if ( !aSz.Width() && aSz.Height() )
// Calculate the right width
- aCalcSz.Width() = rGrfSz.Width() *
- aSz.Height() / rGrfSz.Height();
+ aCalcSz.setWidth( rGrfSz.Width() *
+ aSz.Height() / rGrfSz.Height() );
else
// Take over height and width
aCalcSz = rGrfSz;
const SvxBoxItem &rBox = pFormat->GetBox();
- aCalcSz.Width() += rBox.CalcLineSpace(SvxBoxItemLine::LEFT) +
- rBox.CalcLineSpace(SvxBoxItemLine::RIGHT);
- aCalcSz.Height()+= rBox.CalcLineSpace(SvxBoxItemLine::TOP) +
- rBox.CalcLineSpace(SvxBoxItemLine::BOTTOM);
+ aCalcSz.AdjustWidth(rBox.CalcLineSpace(SvxBoxItemLine::LEFT) +
+ rBox.CalcLineSpace(SvxBoxItemLine::RIGHT) );
+ aCalcSz.AdjustHeight(rBox.CalcLineSpace(SvxBoxItemLine::TOP) +
+ rBox.CalcLineSpace(SvxBoxItemLine::BOTTOM) );
const SwFormatFrameSize& rOldAttr = pFormat->GetFrameSize();
if( rOldAttr.GetSize() != aCalcSz )
{
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 5153dd45e53f..ac313abdd9df 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -1045,7 +1045,7 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef, const
Fraction& xFact, const
}
nMin -= MINFLY;
}
- aSz.Width() = std::max( aSz.Width(), nMin );
+ aSz.setWidth( std::max( aSz.Width(), nMin ) );
}
SwFrameFormat *pFormat = GetFormat();
@@ -1260,8 +1260,8 @@ SdrObject* SwVirtFlyDrawObj::CheckMacroHit( const
SdrObjMacroHitRec& rRec ) cons
{
aRect.Pos().setX(aRect.Pos().getX() + rRec.nTol);
aRect.Pos().setY(aRect.Pos().getY() + rRec.nTol);
- aRect.SSize().Height()-= 2 * rRec.nTol;
- aRect.SSize().Width() -= 2 * rRec.nTol;
+ aRect.SSize().AdjustHeight( -(2 * rRec.nTol) );
+ aRect.SSize().AdjustWidth( -(2 * rRec.nTol) );
if( aRect.IsInside( rRec.aPos ) )
{
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index e3de87396a88..77e8d9b3b54c 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -247,7 +247,7 @@ const SwTextNode* GetBodyTextNode( const SwDoc& rDoc,
SwPosition& rPos,
else
{
Point aPt( pLayout->getFrameArea().Pos() );
- aPt.Y()++; // get out of the header
+ aPt.AdjustY( 1 ); // get out of the header
pContentFrame = pPgFrame->GetContentPos( aPt, false, true );
pTextNode = GetFirstTextNode( rDoc, rPos, pContentFrame, aPt );
}
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index e965f746160d..ebd55b4c2da7 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1322,8 +1322,8 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect,
const uno::Reference <
aFrameSz.SetWidth( aNewSz.Width() );
if( ATT_MIN_SIZE != aFrameSz.GetHeightSizeType() )
{
- aNewSz.Height() += pChgFly->getFrameArea().Height() -
-
pFly->getFramePrintArea().Height();
+ aNewSz.AdjustHeight(pChgFly->getFrameArea().Height() -
+
pFly->getFramePrintArea().Height() );
if( std::abs( aNewSz.Height() -
pChgFly->getFrameArea().Height()) > 1 )
aFrameSz.SetHeight( aNewSz.Height() );
}
@@ -1337,8 +1337,8 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect,
const uno::Reference <
// set the new Size at the fly themself
if ( pFly->getFramePrintArea().Height() > 0 &&
pFly->getFramePrintArea().Width() > 0 )
{
- aSz.Width() += pFly->getFrameArea().Width() -
pFly->getFramePrintArea().Width();
- aSz.Height()+= pFly->getFrameArea().Height()-
pFly->getFramePrintArea().Height();
+ aSz.AdjustWidth(pFly->getFrameArea().Width() -
pFly->getFramePrintArea().Width() );
+ aSz.AdjustHeight(pFly->getFrameArea().Height()-
pFly->getFramePrintArea().Height() );
}
aResult = pFly->ChgSize( aSz );
diff --git a/sw/source/core/frmedt/feshview.cxx
b/sw/source/core/frmedt/feshview.cxx
index f515fb4260c9..3e88e65bb0db 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -837,7 +837,7 @@ static void lcl_NotifyNeighbours( const SdrMarkList *pLst )
bCheckNeighbours = true;
pFly->InvalidatePos();
SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*pFly);
- aFrm.Pos().Y() += 1;
+ aFrm.Pos().AdjustY(1 );
}
pPage = pFly->FindPageFrame();
@@ -884,7 +884,7 @@ static void lcl_NotifyNeighbours( const SdrMarkList *pLst )
{
pAct->InvalidatePos();
SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*pAct);
- aFrm.Pos().Y() += 1;
+ aFrm.Pos().AdjustY(1 );
}
}
}
@@ -1802,10 +1802,10 @@ bool SwFEShell::ImpEndCreate()
// The crsr should not be too far away
bCharBound = true;
tools::Rectangle aRect( aTmp.SVRect() );
- aRect.Left() -= MM50*2;
- aRect.Top() -= MM50*2;
- aRect.Right() += MM50*2;
- aRect.Bottom()+= MM50*2;
+ aRect.AdjustLeft( -(MM50*2) );
+ aRect.AdjustTop( -(MM50*2) );
+ aRect.AdjustRight(MM50*2 );
+ aRect.AdjustBottom(MM50*2 );
if( !aRect.IsOver( rBound ) && !::GetHtmlMode(
GetDoc()->GetDocShell() ))
bCharBound = false;
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index cd29703ced3d..fbcf8ea149b0 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -779,10 +779,10 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
switch ( _eHoriRelOrient )
{
case text::RelOrientation::PAGE_RIGHT:
- case text::RelOrientation::FRAME_RIGHT: aPos.Y() +=
pFrame->getFramePrintArea().Height();
+ case text::RelOrientation::FRAME_RIGHT:
aPos.AdjustY(pFrame->getFramePrintArea().Height() );
SAL_FALLTHROUGH;
case text::RelOrientation::PRINT_AREA:
- case text::RelOrientation::PAGE_PRINT_AREA: aPos.Y() +=
pFrame->getFramePrintArea().Top(); break;
+ case text::RelOrientation::PAGE_PRINT_AREA:
aPos.AdjustY(pFrame->getFramePrintArea().Top() ); break;
default: break;
}
}
@@ -791,11 +791,11 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
switch ( _eHoriRelOrient )
{
case text::RelOrientation::PRINT_AREA:
- case text::RelOrientation::PAGE_PRINT_AREA: aPos.X() +=
pFrame->getFramePrintArea().Width();
+ case text::RelOrientation::PAGE_PRINT_AREA:
aPos.AdjustX(pFrame->getFramePrintArea().Width() );
SAL_FALLTHROUGH;
case text::RelOrientation::PAGE_RIGHT:
- case text::RelOrientation::FRAME_RIGHT: aPos.X() +=
pFrame->getFramePrintArea().Left(); break;
- default: aPos.X() += pFrame->getFrameArea().Width();
+ case text::RelOrientation::FRAME_RIGHT:
aPos.AdjustX(pFrame->getFramePrintArea().Left() ); break;
+ default: aPos.AdjustX(pFrame->getFrameArea().Width() );
}
}
else if ( bRTL )
@@ -803,11 +803,11 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
switch ( _eHoriRelOrient )
{
case text::RelOrientation::PRINT_AREA:
- case text::RelOrientation::PAGE_PRINT_AREA: aPos.X() +=
pFrame->getFramePrintArea().Width();
+ case text::RelOrientation::PAGE_PRINT_AREA:
aPos.AdjustX(pFrame->getFramePrintArea().Width() );
SAL_FALLTHROUGH;
case text::RelOrientation::PAGE_LEFT:
- case text::RelOrientation::FRAME_LEFT: aPos.X() +=
pFrame->getFramePrintArea().Left() -
- pFrame->getFrameArea().Width();
break;
+ case text::RelOrientation::FRAME_LEFT:
aPos.AdjustX(pFrame->getFramePrintArea().Left() -
+ pFrame->getFrameArea().Width()
); break;
default: break;
}
}
@@ -816,10 +816,10 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
switch ( _eHoriRelOrient )
{
case text::RelOrientation::PAGE_RIGHT:
- case text::RelOrientation::FRAME_RIGHT: aPos.X() +=
pFrame->getFramePrintArea().Width();
+ case text::RelOrientation::FRAME_RIGHT:
aPos.AdjustX(pFrame->getFramePrintArea().Width() );
SAL_FALLTHROUGH;
case text::RelOrientation::PRINT_AREA:
- case text::RelOrientation::PAGE_PRINT_AREA: aPos.X() +=
pFrame->getFramePrintArea().Left(); break;
+ case text::RelOrientation::PAGE_PRINT_AREA:
aPos.AdjustX(pFrame->getFramePrintArea().Left() ); break;
default:break;
}
}
@@ -831,7 +831,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
case text::RelOrientation::PRINT_AREA:
case text::RelOrientation::PAGE_PRINT_AREA:
{
- aPos.X() -= pFrame->GetRightMargin();
+ aPos.AdjustX( -(pFrame->GetRightMargin()) );
}
break;
}
@@ -843,7 +843,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
case text::RelOrientation::PRINT_AREA:
case text::RelOrientation::PAGE_PRINT_AREA:
{
- aPos.X() += pFrame->GetLeftMargin();
+ aPos.AdjustX(pFrame->GetLeftMargin() );
}
break;
}
@@ -857,12 +857,12 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
{
if ( pFrame->IsPageFrame() )
{
- aPos.Y() =
- static_cast<const
SwPageFrame*>(pFrame)->PrtWithoutHeaderAndFooter().Top();
+ aPos.setY(
+ static_cast<const
SwPageFrame*>(pFrame)->PrtWithoutHeaderAndFooter().Top() );
}
else
{
- aPos.Y() += pFrame->getFramePrintArea().Top();
+ aPos.AdjustY(pFrame->getFramePrintArea().Top() );
}
}
break;
@@ -925,15 +925,15 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
{
if ( aRectFnSet.IsVert() && !aRectFnSet.IsVertL2R() )
{
- aPos.X() = aVertEnvironRect.Right();
+ aPos.setX( aVertEnvironRect.Right() );
}
else if ( aRectFnSet.IsVertL2R() )
{
- aPos.X() = aVertEnvironRect.Left();
+ aPos.setX( aVertEnvironRect.Left() );
}
else
{
- aPos.Y() = aVertEnvironRect.Top();
+ aPos.setY( aVertEnvironRect.Top() );
}
}
}
@@ -949,7 +949,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
{
if ( aRectFnSet.IsVert() && !aRectFnSet.IsVertL2R() )
{
- aPos.X() = aVertEnvironRect.Right();
+ aPos.setX( aVertEnvironRect.Right() );
if ( _eVertRelOrient ==
text::RelOrientation::PAGE_PRINT_AREA )
{
aPos.setX(aPos.getX() -
rVertEnvironLayFrame.GetRightMargin());
@@ -957,7 +957,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
}
else if ( aRectFnSet.IsVertL2R() )
{
- aPos.X() = aVertEnvironRect.Left();
+ aPos.setX( aVertEnvironRect.Left() );
if ( _eVertRelOrient ==
text::RelOrientation::PAGE_PRINT_AREA )
{
aPos.setX(aPos.getX() +
rVertEnvironLayFrame.GetLeftMargin());
@@ -965,7 +965,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
}
else
{
- aPos.Y() = aVertEnvironRect.Top();
+ aPos.setY( aVertEnvironRect.Top() );
if ( _eVertRelOrient ==
text::RelOrientation::PAGE_PRINT_AREA )
{
aPos.setY(aPos.getY() +
rVertEnvironLayFrame.GetTopMargin());
@@ -1203,7 +1203,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
switch ( _eHoriRelOrient )
{
case text::RelOrientation::FRAME_RIGHT:
- aPos.X() += pFrame->getFramePrintArea().Width();
+ aPos.AdjustX(pFrame->getFramePrintArea().Width() );
aPos += pFrame->getFramePrintArea().Pos();
break;
case text::RelOrientation::PRINT_AREA:
@@ -1266,9 +1266,9 @@ Size SwFEShell::GetGraphicDefaultSize() const
SwRect aBound;
CalcBoundRect( aBound, pFly->GetFormat()->GetAnchor().GetAnchorId());
if ( pFly->GetAnchorFrame()->IsVertical() )
- aRet.Width() = aBound.Width();
+ aRet.setWidth( aBound.Width() );
else
- aRet.Height() = aBound.Height();
+ aRet.setHeight( aBound.Height() );
}
return aRet;
}
diff --git a/sw/source/core/layout/anchoredobject.cxx
b/sw/source/core/layout/anchoredobject.cxx
index 13d67c902663..0145389eab9e 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -174,7 +174,7 @@ SwTwips SwAnchoredObject::GetRelCharY( const SwFrame*
pFrame ) const
void SwAnchoredObject::AddLastCharY( long nDiff )
{
- maLastCharRect.Pos().Y() += nDiff;
+ maLastCharRect.Pos().AdjustY(nDiff );
}
void SwAnchoredObject::ResetLastCharRectHeight()
@@ -577,8 +577,8 @@ const SwRect& SwAnchoredObject::GetObjRectWithSpaces() const
{
maObjRectWithSpaces.Top ( std::max( maObjRectWithSpaces.Top() -
long(rUL.GetUpper()), 0L ));
maObjRectWithSpaces.Left( std::max( maObjRectWithSpaces.Left()-
rLR.GetLeft(), 0L ));
- maObjRectWithSpaces.SSize().Height() += rUL.GetLower();
- maObjRectWithSpaces.SSize().Width() += rLR.GetRight();
+ maObjRectWithSpaces.SSize().AdjustHeight(rUL.GetLower() );
+ maObjRectWithSpaces.SSize().AdjustWidth(rLR.GetRight() );
}
mbObjRectWithSpacesValid = true;
@@ -888,7 +888,7 @@ Point SwAnchoredObject::GetRelPosToLine() const
Point aRelPos;
aRelPos = GetObjRect().Pos();
- aRelPos.Y() -= GetLastTopOfLine();
+ aRelPos.AdjustY( -(GetLastTopOfLine()) );
return aRelPos;
}
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 6e09e74547ab..3a364a9c84d6 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -295,8 +295,8 @@ bool SwFormatFrameSize::PutValue( const uno::Any& rVal,
sal_uInt8 nMemberId )
Size aTmp(aVal.Width, aVal.Height);
if(bConvert)
{
- aTmp.Height() = convertMm100ToTwip(aTmp.Height());
- aTmp.Width() = convertMm100ToTwip(aTmp.Width());
+ aTmp.setHeight( convertMm100ToTwip(aTmp.Height()) );
+ aTmp.setWidth( convertMm100ToTwip(aTmp.Width()) );
}
SetSize(aTmp);
}
@@ -2708,7 +2708,7 @@ SwRect SwFrameFormat::FindLayoutRect( const bool
bPrtArea, const Point* pPoint )
else
{
aRet = pFrame->getFrameArea();
- --aRet.Pos().Y();
+ aRet.Pos().AdjustY( -1 );
}
pFrame = nullptr; // the rect is finished by now
}
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 41f8479a0018..2ae868df995f 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -765,10 +765,10 @@ void SwFlyFrame::UpdateAttr_( const SfxPoolItem *pOld,
const SfxPoolItem *pNew,
SwRect aOld( getFrameArea() );
const SvxULSpaceItem &rUL = static_cast<const
SwFormatChg*>(pOld)->pChangedFormat->GetULSpace();
aOld.Top( std::max( aOld.Top() - long(rUL.GetUpper()), 0L ) );
- aOld.SSize().Height()+= rUL.GetLower();
+ aOld.SSize().AdjustHeight(rUL.GetLower() );
const SvxLRSpaceItem &rLR = static_cast<const
SwFormatChg*>(pOld)->pChangedFormat->GetLRSpace();
aOld.Left ( std::max( aOld.Left() - rLR.GetLeft(), 0L ) );
- aOld.SSize().Width() += rLR.GetRight();
+ aOld.SSize().AdjustWidth(rLR.GetRight() );
aNew.Union( aOld );
NotifyBackground( FindPageFrame(), aNew, PREP_CLEAR );
@@ -867,13 +867,13 @@ void SwFlyFrame::UpdateAttr_( const SfxPoolItem *pOld,
const SfxPoolItem *pNew,
{
const SvxULSpaceItem &rUL = *static_cast<const
SvxULSpaceItem*>(pNew);
aOld.Top( std::max( aOld.Top() - long(rUL.GetUpper()), 0L
) );
- aOld.SSize().Height()+= rUL.GetLower();
+ aOld.SSize().AdjustHeight(rUL.GetLower() );
}
else
{
const SvxLRSpaceItem &rLR = *static_cast<const
SvxLRSpaceItem*>(pNew);
aOld.Left ( std::max( aOld.Left() - rLR.GetLeft(), 0L ) );
- aOld.SSize().Width() += rLR.GetRight();
+ aOld.SSize().AdjustWidth(rLR.GetRight() );
}
}
aNew.Union( aOld );
@@ -2378,19 +2378,19 @@ Size SwFlyFrame::CalcRel( const SwFormatFrameSize &rSz
) const
}
if ( rSz.GetWidthPercent() && rSz.GetWidthPercent() !=
SwFormatFrameSize::SYNCED )
- aRet.Width() = nRelWidth * rSz.GetWidthPercent() / 100;
+ aRet.setWidth( nRelWidth * rSz.GetWidthPercent() / 100 );
if ( rSz.GetHeightPercent() && rSz.GetHeightPercent() !=
SwFormatFrameSize::SYNCED )
- aRet.Height() = nRelHeight * rSz.GetHeightPercent() / 100;
+ aRet.setHeight( nRelHeight * rSz.GetHeightPercent() / 100 );
if ( rSz.GetWidthPercent() == SwFormatFrameSize::SYNCED )
{
- aRet.Width() *= aRet.Height();
- aRet.Width() /= rSz.GetHeight();
+ aRet.setWidth( aRet.Width() * ( aRet.Height()) );
+ aRet.setWidth( aRet.Width() / ( rSz.GetHeight()) );
}
else if ( rSz.GetHeightPercent() == SwFormatFrameSize::SYNCED )
{
- aRet.Height() *= aRet.Width();
- aRet.Height() /= rSz.GetWidth();
+ aRet.setHeight( aRet.Height() * ( aRet.Width()) );
+ aRet.setHeight( aRet.Height() / ( rSz.GetWidth()) );
}
}
return aRet;
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index ea1dfa7de12f..2a20c9c70e9d 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -513,7 +513,7 @@ void SwFlyFreeFrame::CheckClip( const SwFormatFrameSize
&rSz )
if ( !bDisableOffPagePositioning || nOld <= nClipBot)
{
SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this);
- aFrm.Pos().Y() = std::max( aClip.Top(), nClipBot -
aFrm.Height() );
+ aFrm.Pos().setY( std::max( aClip.Top(), nClipBot -
aFrm.Height() ) );
}
if ( getFrameArea().Top() != nOld )
@@ -533,7 +533,7 @@ void SwFlyFreeFrame::CheckClip( const SwFormatFrameSize
&rSz )
if ( !bDisableOffPagePositioning || nOld <= nClipRig )
{
SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this);
- aFrm.Pos().X() = std::max( aClip.Left(), nClipRig -
aFrm.Width() );
+ aFrm.Pos().setX( std::max( aClip.Left(), nClipRig -
aFrm.Width() ) );
}
if ( getFrameArea().Left() != nOld )
@@ -544,7 +544,7 @@ void SwFlyFreeFrame::CheckClip( const SwFormatFrameSize
&rSz )
if( rH.GetHoriOrient() == text::HoriOrientation::LEFT )
{
SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this);
- aFrm.Pos().X() = nOld;
+ aFrm.Pos().setX( nOld );
}
else
{
diff --git a/sw/source/core/layout/frmtool.cxx
b/sw/source/core/layout/frmtool.cxx
index e12f02a8ffab..f5a1be87b1ec 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1134,11 +1134,11 @@ static void lcl_SetPos( SwFrame& _rNewFrame,
// notifications for a new calculated position after its formatting.
if ( aRectFnSet.IsVert() )
{
- aFrm.Pos().X() -= 1;
+ aFrm.Pos().AdjustX( -1 );
}
else
{
- aFrm.Pos().Y() += 1;
+ aFrm.Pos().AdjustY(1 );
}
}
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index a3fc1aebaf74..e8eddce278c1 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -344,7 +344,7 @@ SwTwips SwFootnoteContFrame::GrowFrame( SwTwips nDist, bool
bTst, bool )
if( IsVertical() && !IsVertLR() )
{
- aFrm.Pos().X() -= nDist;
+ aFrm.Pos().AdjustX( -nDist );
}
}
long nGrow = nDist - nAvail,
@@ -387,11 +387,11 @@ SwTwips SwFootnoteContFrame::GrowFrame( SwTwips nDist,
bool bTst, bool )
// We can only respect the boundless wish so much
SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this);
- aFrm.SSize().Height() -= nDist;
+ aFrm.SSize().AdjustHeight( -nDist );
if( IsVertical() && !IsVertLR() )
{
- aFrm.Pos().X() += nDist;
+ aFrm.Pos().AdjustX(nDist );
}
}
@@ -2745,7 +2745,7 @@ bool SwContentFrame::MoveFootnoteCntFwd( bool bMakePage,
SwFootnoteBossFrame *pO
{
SwFrameAreaDefinition::FrameAreaWriteAccess
aFrm(*pNewUp);
aFrm.Pos() = pTmpFootnote->getFrameArea().Pos();
- aFrm.Pos().Y() += 1; // for notifications
+ aFrm.Pos().AdjustY(1 ); // for notifications
}
// If the section frame has a successor then the latter
needs
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index f4ac216ab24e..c2d2a46718c6 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -385,7 +385,7 @@ void SwHeadFootFrame::FormatSize(SwTwips nUL, const
SwBorderAttrs * pAttrs)
aFrm.Bottom( nDeadLine );
SwFrameAreaDefinition::FramePrintAreaWriteAccess
aPrt(*this);
- aPrt.SSize().Height() = getFrameArea().Height() -
nBorder;
+ aPrt.SSize().setHeight( getFrameArea().Height() -
nBorder );
}
}
diff --git a/sw/source/core/layout/laycache.cxx
b/sw/source/core/layout/laycache.cxx
index a1977c68b287..3d605ffa397c 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -811,7 +811,7 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
{
SwFrameAreaDefinition::FrameAreaWriteAccess
aFrm(*mrpFrame);
aFrm.Pos() = mrpLay->getFrameArea().Pos();
- aFrm.Pos().Y() += 1;
+ aFrm.Pos().AdjustY(1 );
}
mrpPrv = mrpFrame;
@@ -921,7 +921,7 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
{
SwFrameAreaDefinition::FrameAreaWriteAccess
aFrm(*pSct);
aFrm.Pos() = mrpLay->getFrameArea().Pos();
- aFrm.Pos().Y() += 1; //because of the notifications
+ aFrm.Pos().AdjustY(1 ); //because of the notifications
}
mrpLay = pSct;
@@ -1022,8 +1022,8 @@ void SwLayHelper::CheckFlyCache_( SwPageFrame* pPage )
{
// we get the stored information
SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*pFly);
- aFrm.Pos().X() = pFlyCache->Left() +
pPage->getFrameArea().Left();
- aFrm.Pos().Y() = pFlyCache->Top() +
pPage->getFrameArea().Top();
+ aFrm.Pos().setX( pFlyCache->Left() +
pPage->getFrameArea().Left() );
+ aFrm.Pos().setY( pFlyCache->Top() +
pPage->getFrameArea().Top() );
if ( mpImpl->IsUseFlyCache() )
{
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index 6cb4f071d8e6..238f44cc1afb 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1379,7 +1379,7 @@ SwTwips SwRootFrame::GrowFrame( SwTwips nDist, bool bTst,
bool )
if ( !bTst )
{
SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this);
- aFrm.SSize().Height() += nDist;
+ aFrm.SSize().AdjustHeight(nDist );
}
return nDist;
@@ -1393,7 +1393,7 @@ SwTwips SwRootFrame::ShrinkFrame( SwTwips nDist, bool
bTst, bool )
if ( !bTst )
{
SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this);
- aFrm.SSize().Height() -= nDist;
+ aFrm.SSize().AdjustHeight( -nDist );
}
return nDist;
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index dc2837e2eed9..f692ff446eb0 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1838,43 +1838,43 @@ void DrawGraphic(
break;
case GPOS_MT:
- aGrf.Pos().Y() = rOrg.Top();
- aGrf.Pos().X() = rOrg.Left() + rOrg.Width()/2 - aGrfSize.Width()/2;
+ aGrf.Pos().setY( rOrg.Top() );
+ aGrf.Pos().setX( rOrg.Left() + rOrg.Width()/2 - aGrfSize.Width()/2 );
break;
case GPOS_RT:
- aGrf.Pos().Y() = rOrg.Top();
- aGrf.Pos().X() = rOrg.Right() - aGrfSize.Width();
+ aGrf.Pos().setY( rOrg.Top() );
+ aGrf.Pos().setX( rOrg.Right() - aGrfSize.Width() );
break;
case GPOS_LM:
- aGrf.Pos().Y() = rOrg.Top() + rOrg.Height()/2 - aGrfSize.Height()/2;
- aGrf.Pos().X() = rOrg.Left();
+ aGrf.Pos().setY( rOrg.Top() + rOrg.Height()/2 - aGrfSize.Height()/2 );
+ aGrf.Pos().setX( rOrg.Left() );
break;
case GPOS_MM:
- aGrf.Pos().Y() = rOrg.Top() + rOrg.Height()/2 - aGrfSize.Height()/2;
- aGrf.Pos().X() = rOrg.Left() + rOrg.Width()/2 - aGrfSize.Width()/2;
+ aGrf.Pos().setY( rOrg.Top() + rOrg.Height()/2 - aGrfSize.Height()/2 );
+ aGrf.Pos().setX( rOrg.Left() + rOrg.Width()/2 - aGrfSize.Width()/2 );
break;
case GPOS_RM:
- aGrf.Pos().Y() = rOrg.Top() + rOrg.Height()/2 - aGrfSize.Height()/2;
- aGrf.Pos().X() = rOrg.Right() - aGrfSize.Width();
+ aGrf.Pos().setY( rOrg.Top() + rOrg.Height()/2 - aGrfSize.Height()/2 );
+ aGrf.Pos().setX( rOrg.Right() - aGrfSize.Width() );
break;
case GPOS_LB:
- aGrf.Pos().Y() = rOrg.Bottom() - aGrfSize.Height();
- aGrf.Pos().X() = rOrg.Left();
+ aGrf.Pos().setY( rOrg.Bottom() - aGrfSize.Height() );
+ aGrf.Pos().setX( rOrg.Left() );
break;
case GPOS_MB:
- aGrf.Pos().Y() = rOrg.Bottom() - aGrfSize.Height();
- aGrf.Pos().X() = rOrg.Left() + rOrg.Width()/2 - aGrfSize.Width()/2;
+ aGrf.Pos().setY( rOrg.Bottom() - aGrfSize.Height() );
+ aGrf.Pos().setX( rOrg.Left() + rOrg.Width()/2 - aGrfSize.Width()/2 );
break;
case GPOS_RB:
- aGrf.Pos().Y() = rOrg.Bottom() - aGrfSize.Height();
- aGrf.Pos().X() = rOrg.Right() - aGrfSize.Width();
+ aGrf.Pos().setY( rOrg.Bottom() - aGrfSize.Height() );
+ aGrf.Pos().setX( rOrg.Right() - aGrfSize.Width() );
break;
case GPOS_AREA:
@@ -2156,30 +2156,30 @@ static void lcl_AdjustRectToPixelSize( SwRect&
io_aSwRect, const vcl::RenderCont
// the Twip-centers. Thus, adjust borders by half of pixel width/height
plus 1.
// Afterwards, adjust calculated Twip-positions of the all borders.
tools::Rectangle aSizedRect = aPxCenterRect;
- aSizedRect.Left() -= (aTwipToPxSize.Width()/2 + 1);
- aSizedRect.Right() += (aTwipToPxSize.Width()/2 + 1);
- aSizedRect.Top() -= (aTwipToPxSize.Height()/2 + 1);
- aSizedRect.Bottom() += (aTwipToPxSize.Height()/2 + 1);
+ aSizedRect.AdjustLeft( -(aTwipToPxSize.Width()/2 + 1) );
+ aSizedRect.AdjustRight( aTwipToPxSize.Width()/2 + 1 );
+ aSizedRect.AdjustTop( -(aTwipToPxSize.Height()/2 + 1) );
+ aSizedRect.AdjustBottom(aTwipToPxSize.Height()/2 + 1);
// adjust left()
while ( aOut.LogicToPixel(aSizedRect).Left() < aOrgPxRect.Left() )
{
- ++aSizedRect.Left();
+ aSizedRect.AdjustLeft( 1 );
}
// adjust right()
while ( aOut.LogicToPixel(aSizedRect).Right() > aOrgPxRect.Right() )
{
- --aSizedRect.Right();
+ aSizedRect.AdjustRight( -1 );
}
// adjust top()
while ( aOut.LogicToPixel(aSizedRect).Top() < aOrgPxRect.Top() )
{
- ++aSizedRect.Top();
+ aSizedRect.AdjustTop( 1 );
}
// adjust bottom()
while ( aOut.LogicToPixel(aSizedRect).Bottom() > aOrgPxRect.Bottom() )
{
- --aSizedRect.Bottom();
+ aSizedRect.AdjustBottom( -1 );
}
io_aSwRect = SwRect( aSizedRect );
@@ -2190,29 +2190,29 @@ static void lcl_AdjustRectToPixelSize( SwRect&
io_aSwRect, const vcl::RenderCont
OSL_ENSURE( aTestOrgPxRect == aTestNewPxRect,
"Error in lcl_AlignRectToPixelSize(..): Adjusted rectangle has
incorrect position or size");
// check Left()
- --aSizedRect.Left();
+ aSizedRect.AdjustLeft( -1 );
aTestNewPxRect = aOut.LogicToPixel( aSizedRect );
OSL_ENSURE( aTestOrgPxRect.Left() >= (aTestNewPxRect.Left()+1),
"Error in lcl_AlignRectToPixelSize(..): Left() not correct
adjusted");
- ++aSizedRect.Left();
+ aSizedRect.AdjustLeft( 1 );
// check Right()
- ++aSizedRect.Right();
+ aSizedRect.AdjustRight( 1 );
aTestNewPxRect = aOut.LogicToPixel( aSizedRect );
OSL_ENSURE( aTestOrgPxRect.Right() <= (aTestNewPxRect.Right()-1),
"Error in lcl_AlignRectToPixelSize(..): Right() not correct
adjusted");
- --aSizedRect.Right();
+ aSizedRect.AdjustRight( -1 );
// check Top()
- --aSizedRect.Top();
+ aSizedRect.AdjustTop( -1 );
aTestNewPxRect = aOut.LogicToPixel( aSizedRect );
OSL_ENSURE( aTestOrgPxRect.Top() >= (aTestNewPxRect.Top()+1),
"Error in lcl_AlignRectToPixelSize(..): Top() not correct
adjusted");
- ++aSizedRect.Top();
+ aSizedRect.AdjustTop( 1 );
// check Bottom()
- ++aSizedRect.Bottom();
+ aSizedRect.AdjustBottom( 1 );
aTestNewPxRect = aOut.LogicToPixel( aSizedRect );
OSL_ENSURE( aTestOrgPxRect.Bottom() <= (aTestNewPxRect.Bottom()-1),
"Error in lcl_AlignRectToPixelSize(..): Bottom() not correct
adjusted");
- --aSizedRect.Bottom();
+ aSizedRect.AdjustBottom( -1 );
#endif
}
@@ -2415,17 +2415,17 @@ void SwTabFramePainter::PaintLines(OutputDevice& rDev,
const SwRect& rRect) cons
Point aStart, aEnd;
if ( bHori )
{
- aStart.X() = rEntry.mnStartPos;
- aStart.Y() = rEntry.mnKey;
- aEnd.X() = rEntry.mnEndPos;
- aEnd.Y() = rEntry.mnKey;
+ aStart.setX( rEntry.mnStartPos );
+ aStart.setY( rEntry.mnKey );
+ aEnd.setX( rEntry.mnEndPos );
+ aEnd.setY( rEntry.mnKey );
}
else
{
- aStart.X() = rEntry.mnKey;
- aStart.Y() = rEntry.mnStartPos;
- aEnd.X() = rEntry.mnKey;
- aEnd.Y() = rEntry.mnEndPos;
+ aStart.setX( rEntry.mnKey );
+ aStart.setY( rEntry.mnStartPos );
+ aEnd.setX( rEntry.mnKey );
+ aEnd.setY( rEntry.mnEndPos );
}
svx::frame::Style aStyles[ 7 ];
@@ -2438,7 +2438,7 @@ void SwTabFramePainter::PaintLines(OutputDevice& rDev,
const SwRect& rRect) cons
if ( bHori )
{
aRepaintRect.Height( 2 * nRepaintRectSize );
- aRepaintRect.Pos().Y() -= nRepaintRectSize;
+ aRepaintRect.Pos().AdjustY( -nRepaintRectSize );
// To decide on visibility it is also necessary to expand the
RepaintRect
// to left/right according existing BorderLine overlap
matchings, else there
@@ -2449,13 +2449,13 @@ void SwTabFramePainter::PaintLines(OutputDevice& rDev,
const SwRect& rRect) cons
const double
fLineWidthMaxLeft(std::max(aStyles[1].GetWidth(), aStyles[3].GetWidth()));
const double
fLineWidthMaxRight(std::max(aStyles[4].GetWidth(), aStyles[6].GetWidth()));
aRepaintRect.Width(aRepaintRect.Width() +
(fLineWidthMaxLeft + fLineWidthMaxRight));
- aRepaintRect.Pos().X() -= fLineWidthMaxLeft;
+ aRepaintRect.Pos().AdjustX( -fLineWidthMaxLeft );
}
}
else
{
aRepaintRect.Width( 2 * nRepaintRectSize );
- aRepaintRect.Pos().X() -= nRepaintRectSize;
+ aRepaintRect.Pos().AdjustX( -nRepaintRectSize );
// Accordingly to horizontal case, but for top/bottom
// aStyles[3] == aTFromR, aStyles[1] == aTFromL, aStyles[6] ==
aBFromR, aStyles[4] == aBFromL
@@ -2464,7 +2464,7 @@ void SwTabFramePainter::PaintLines(OutputDevice& rDev,
const SwRect& rRect) cons
const double
fLineWidthMaxTop(std::max(aStyles[3].GetWidth(), aStyles[1].GetWidth()));
const double
fLineWidthMaxBottom(std::max(aStyles[6].GetWidth(), aStyles[4].GetWidth()));
aRepaintRect.Height(aRepaintRect.Height() +
(fLineWidthMaxTop + fLineWidthMaxBottom));
- aRepaintRect.Pos().Y() -= fLineWidthMaxTop;
+ aRepaintRect.Pos().AdjustY( -fLineWidthMaxTop );
}
}
@@ -2502,22 +2502,22 @@ void SwTabFramePainter::PaintLines(OutputDevice& rDev,
const SwRect& rRect) cons
// Therefore we tweak the outer borders a bit to achieve that
the outer
// borders match the subsidiary lines of the upper:
if (aStart.X() == aUpper.Left())
- aPaintStart.X() = aUpperAligned.Left();
+ aPaintStart.setX( aUpperAligned.Left() );
else if (aStart.X() == aUpper.Right_())
- aPaintStart.X() = aUpperAligned.Right_();
+ aPaintStart.setX( aUpperAligned.Right_() );
if (aStart.Y() == aUpper.Top())
- aPaintStart.Y() = aUpperAligned.Top();
+ aPaintStart.setY( aUpperAligned.Top() );
else if (aStart.Y() == aUpper.Bottom_())
- aPaintStart.Y() = aUpperAligned.Bottom_();
+ aPaintStart.setY( aUpperAligned.Bottom_() );
if (aEnd.X() == aUpper.Left())
- aPaintEnd.X() = aUpperAligned.Left();
+ aPaintEnd.setX( aUpperAligned.Left() );
else if (aEnd.X() == aUpper.Right_())
- aPaintEnd.X() = aUpperAligned.Right_();
+ aPaintEnd.setX( aUpperAligned.Right_() );
if (aEnd.Y() == aUpper.Top())
- aPaintEnd.Y() = aUpperAligned.Top();
+ aPaintEnd.setY( aUpperAligned.Top() );
else if (aEnd.Y() == aUpper.Bottom_())
- aPaintEnd.Y() = aUpperAligned.Bottom_();
+ aPaintEnd.setY( aUpperAligned.Bottom_() );
}
if(aStyles[0].IsUsed())
@@ -5324,7 +5324,7 @@ void SwPageFrame::PaintGrid( OutputDevice const * pOut,
SwRect const &rRect ) co
bool bBorder = bLeft || bRight;
while( nY > nRight )
{
- aTmp.Pos().X() = nY;
+ aTmp.Pos().setX( nY );
if( bGrid )
{
nY -= nGrid;
@@ -5339,7 +5339,7 @@ void SwPageFrame::PaintGrid( OutputDevice const * pOut,
SwRect const &rRect ) co
while( aVert.Top() <= nBottom )
{
PaintBorderLine(rRect,aVert,this,pCol);
- aVert.Pos().Y() += nGrid;
+ aVert.Pos().AdjustY(nGrid );
}
}
else if( bBorder )
@@ -5350,7 +5350,7 @@ void SwPageFrame::PaintGrid( OutputDevice const * pOut,
SwRect const &rRect ) co
PaintBorderLine(rRect,aVert,this,pCol);
if( bRight )
{
- aVert.Pos().Y() = nGridBottom;
+ aVert.Pos().setY( nGridBottom );
PaintBorderLine(rRect,aVert,this,pCol);
}
}
@@ -5371,7 +5371,7 @@ void SwPageFrame::PaintGrid( OutputDevice const * pOut,
SwRect const &rRect ) co
PaintBorderLine(rRect,aVert,this,pCol);
if( bRight )
{
- aVert.Pos().Y() = nGridBottom;
+ aVert.Pos().setY( nGridBottom );
PaintBorderLine(rRect,aVert,this,pCol);
}
}
@@ -5381,7 +5381,7 @@ void SwPageFrame::PaintGrid( OutputDevice const * pOut,
SwRect const &rRect ) co
}
while( nY >= aInter.Left() )
{
- aTmp.Pos().X() = nY;
+ aTmp.Pos().setX( nY );
PaintBorderLine( rRect, aTmp, this, pCol);
if( bGrid )
{
@@ -5397,7 +5397,7 @@ void SwPageFrame::PaintGrid( OutputDevice const * pOut,
SwRect const &rRect ) co
while( aVert.Top() <= nBottom )
{
PaintBorderLine(rRect,aVert,this,pCol);
- aVert.Pos().Y() += nGrid;
+ aVert.Pos().AdjustY(nGrid );
}
}
else if( bBorder )
@@ -5408,7 +5408,7 @@ void SwPageFrame::PaintGrid( OutputDevice const * pOut,
SwRect const &rRect ) co
PaintBorderLine(rRect,aVert,this,pCol);
if( bRight )
{
- aVert.Pos().Y() = nGridBottom;
+ aVert.Pos().setY( nGridBottom );
PaintBorderLine(rRect,aVert,this,pCol);
}
}
@@ -5429,7 +5429,7 @@ void SwPageFrame::PaintGrid( OutputDevice const * pOut,
SwRect const &rRect ) co
PaintBorderLine(rRect,aVert,this,pCol);
if( bRight )
{
- aVert.Pos().Y() = nGridBottom;
+ aVert.Pos().setY( nGridBottom );
PaintBorderLine(rRect,aVert,this,pCol);
}
}
@@ -5470,7 +5470,7 @@ void SwPageFrame::PaintGrid( OutputDevice const * pOut,
SwRect const &rRect ) co
while( aVert.Left() <= nRight )
{
PaintBorderLine(rRect,aVert,this,pCol);
- aVert.Pos().X() += nGridWidth; //for
textgrid refactor
+ aVert.Pos().AdjustX(nGridWidth );
//for textgrid refactor
}
}
else if ( bBorder )
@@ -5481,7 +5481,7 @@ void SwPageFrame::PaintGrid( OutputDevice const * pOut,
SwRect const &rRect ) co
PaintBorderLine(rRect,aVert,this,pCol);
if( bRight )
{
- aVert.Pos().X() = nGridRight;
+ aVert.Pos().setX( nGridRight );
PaintBorderLine(rRect,aVert,this,pCol);
}
}
@@ -5686,10 +5686,10 @@ static void lcl_paintBitmapExToRect(vcl::RenderContext
*pOut, const Point& aPoin
switch (eArea)
{
- case LEFT: aRect.Left() = aRect.Right() - 1; break;
- case RIGHT: aRect.Right() = aRect.Left() + 1; break;
- case TOP: aRect.Top() = aRect.Bottom() - 1; break;
- case BOTTOM: aRect.Bottom() = aRect.Top() + 1; break;
+ case LEFT: aRect.SetLeft( aRect.Right() - 1 ); break;
+ case RIGHT: aRect.SetRight( aRect.Left() + 1 ); break;
+ case TOP: aRect.SetTop( aRect.Bottom() - 1 ); break;
+ case BOTTOM: aRect.SetBottom( aRect.Top() + 1 ); break;
}
pOut->SetFillColor(SwViewOption::GetAppBackgroundColor());
@@ -7313,9 +7313,9 @@ Graphic SwFlyFrameFormat::MakeGraphic( ImageMap* pMap )
SwBorderAttrAccess aAccess( SwFrame::GetCache(), pFly );
const SwBorderAttrs &rAttrs = *aAccess.Get();
if ( rAttrs.CalcRightLine() )
- aOut.SSize().Width() += 2*gProp.nSPixelSzW;
+ aOut.SSize().AdjustWidth(2*gProp.nSPixelSzW );
if ( rAttrs.CalcBottomLine() )
- aOut.SSize().Height()+= 2*gProp.nSPixelSzH;
+ aOut.SSize().AdjustHeight(2*gProp.nSPixelSzH );
// #i92711# start Pre/PostPaint encapsulation before pOut is changed
to the buffering VDev
const vcl::Region aRepaintRegion(aOut.SVRect());
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 180ceba1ff9c..8fceca4e8bd9 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -105,7 +105,7 @@ void SwFrame::MakeBelowPos( const SwFrame* pUp, const
SwFrame* pPrv, bool bNotif
if( pPrv )
{
aFrm.Pos( pPrv->getFrameArea().Pos() );
- aFrm.Pos().Y() += pPrv->getFrameArea().Height();
+ aFrm.Pos().AdjustY(pPrv->getFrameArea().Height() );
}
else
{
@@ -115,7 +115,7 @@ void SwFrame::MakeBelowPos( const SwFrame* pUp, const
SwFrame* pPrv, bool bNotif
if( bNotify )
{
- aFrm.Pos().Y() += 1;
+ aFrm.Pos().AdjustY(1 );
}
}
@@ -126,18 +126,18 @@ void SwFrame::MakeLeftPos( const SwFrame* pUp, const
SwFrame* pPrv, bool bNotify
if( pPrv )
{
aFrm.Pos( pPrv->getFrameArea().Pos() );
- aFrm.Pos().X() -= aFrm.Width();
+ aFrm.Pos().AdjustX( -(aFrm.Width()) );
}
else
{
aFrm.Pos( pUp->getFrameArea().Pos() );
aFrm.Pos() += pUp->getFramePrintArea().Pos();
- aFrm.Pos().X() += pUp->getFramePrintArea().Width() - aFrm.Width();
+ aFrm.Pos().AdjustX(pUp->getFramePrintArea().Width() - aFrm.Width() );
}
if( bNotify )
{
- aFrm.Pos().X() -= 1;
+ aFrm.Pos().AdjustX( -1 );
}
}
@@ -148,7 +148,7 @@ void SwFrame::MakeRightPos( const SwFrame* pUp, const
SwFrame* pPrv, bool bNotif
if( pPrv )
{
aFrm.Pos( pPrv->getFrameArea().Pos() );
- aFrm.Pos().X() += pPrv->getFrameArea().Width();
+ aFrm.Pos().AdjustX(pPrv->getFrameArea().Width() );
}
else
{
@@ -158,7 +158,7 @@ void SwFrame::MakeRightPos( const SwFrame* pUp, const
SwFrame* pPrv, bool bNotif
if( bNotify )
{
- aFrm.Pos().X() += 1;
+ aFrm.Pos().AdjustX(1 );
}
}
@@ -288,16 +288,16 @@ Point SwFrame::GetFrameAnchorPos( bool
bIgnoreFlysAnchoredAtThisFrame ) const
Point aAnchor = getFrameArea().Pos();
if ( ( IsVertical() && !IsVertLR() ) || IsRightToLeft() )
- aAnchor.X() += getFrameArea().Width();
+ aAnchor.AdjustX(getFrameArea().Width() );
if ( IsTextFrame() )
{
SwTwips nBaseOfstForFly =
static_cast<const SwTextFrame*>(this)->GetBaseOfstForFly(
bIgnoreFlysAnchoredAtThisFrame );
if ( IsVertical() )
- aAnchor.Y() += nBaseOfstForFly;
+ aAnchor.AdjustY(nBaseOfstForFly );
else
- aAnchor.X() += nBaseOfstForFly;
+ aAnchor.AdjustX(nBaseOfstForFly );
// OD 2004-03-10 #i11860# - if option 'Use former object positioning'
// is OFF, consider the lower space and the line spacing of the
@@ -307,11 +307,11 @@ Point SwFrame::GetFrameAnchorPos( bool
bIgnoreFlysAnchoredAtThisFrame ) const
pThisTextFrame->GetUpperSpaceAmountConsideredForPrevFrameAndPageGrid();
if ( IsVertical() )
{
- aAnchor.X() -= nUpperSpaceAmountConsideredForPrevFrameAndPageGrid;
+ aAnchor.AdjustX(
-nUpperSpaceAmountConsideredForPrevFrameAndPageGrid );
}
else
{
- aAnchor.Y() += nUpperSpaceAmountConsideredForPrevFrameAndPageGrid;
+ aAnchor.AdjustY(nUpperSpaceAmountConsideredForPrevFrameAndPageGrid
);
}
}
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
old mode 100755
new mode 100644
index b816dfdf319e..fec639ea943e
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4532,7 +4532,7 @@ SwTwips SwRowFrame::ShrinkFrame( SwTwips nDist, bool
bTst, bool bInfo )
if( IsVertical() && !IsVertLR() )
{
- aFrm.Pos().X() += nReal;
+ aFrm.Pos().AdjustX(nReal );
}
}
@@ -4551,7 +4551,7 @@ SwTwips SwRowFrame::ShrinkFrame( SwTwips nDist, bool
bTst, bool bInfo )
if( IsVertical() && !IsVertLR() )
{
- aFrm.Pos().X() -= nReal;
+ aFrm.Pos().AdjustX( -nReal );
}
}
nReal = nTmp;
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index 4b0df5c5709e..f322cc9d9cc6 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -178,10 +178,10 @@ bool SwPageFrame::GetCursorOfst( SwPosition *pPos, Point
&rPoint,
// check, if we have to adjust the point
if ( !getFrameArea().IsInside( aPoint ) )
{
- aPoint.X() = std::max( aPoint.X(), getFrameArea().Left() );
- aPoint.X() = std::min( aPoint.X(), getFrameArea().Right() );
- aPoint.Y() = std::max( aPoint.Y(), getFrameArea().Top() );
- aPoint.Y() = std::min( aPoint.Y(), getFrameArea().Bottom() );
+ aPoint.setX( std::max( aPoint.X(), getFrameArea().Left() ) );
+ aPoint.setX( std::min( aPoint.X(), getFrameArea().Right() ) );
+ aPoint.setY( std::max( aPoint.Y(), getFrameArea().Top() ) );
+ aPoint.setY( std::min( aPoint.Y(), getFrameArea().Bottom() ) );
}
bool bTextRet = false;
@@ -1221,15 +1221,15 @@ const SwContentFrame *SwLayoutFrame::GetContentPos(
Point& rPoint,
//First set the vertical position
if ( aContentFrame.Top() > aContentPoint.Y() )
- aContentPoint.Y() = aContentFrame.Top();
+ aContentPoint.setY( aContentFrame.Top() );
else if ( aContentFrame.Bottom() < aContentPoint.Y() )
- aContentPoint.Y() = aContentFrame.Bottom();
+ aContentPoint.setY( aContentFrame.Bottom() );
//Now the horizontal position
if ( aContentFrame.Left() > aContentPoint.X() )
- aContentPoint.X() = aContentFrame.Left();
+ aContentPoint.setX( aContentFrame.Left() );
else if ( aContentFrame.Right() < aContentPoint.X() )
- aContentPoint.X() = aContentFrame.Right();
+ aContentPoint.setX( aContentFrame.Right() );
// pInside is a page area in which the point lies. As soon
// as pInside != 0 only frames are accepted which are
@@ -1321,41 +1321,41 @@ const SwContentFrame *SwLayoutFrame::GetContentPos(
Point& rPoint,
//A small correction at the first/last
Size aActualSize( pActual->getFramePrintArea().SSize() );
if ( aActualSize.Height() >
pActual->GetUpper()->getFramePrintArea().Height() )
- aActualSize.Height() =
pActual->GetUpper()->getFramePrintArea().Height();
+ aActualSize.setHeight(
pActual->GetUpper()->getFramePrintArea().Height() );
SwRectFnSet aRectFnSet(pActual);
if ( !pActual->GetPrev() &&
aRectFnSet.YDiff( aRectFnSet.GetPrtTop(*pActual),
aRectFnSet.IsVert() ? rPoint.X() : rPoint.Y() )
> 0 )
{
- aPoint.Y() = pActual->getFrameArea().Top() +
pActual->getFramePrintArea().Top();
- aPoint.X() = pActual->getFrameArea().Left() +
+ aPoint.setY( pActual->getFrameArea().Top() +
pActual->getFramePrintArea().Top() );
+ aPoint.setX( pActual->getFrameArea().Left() +
( pActual->IsRightToLeft() || aRectFnSet.IsVert() ?
pActual->getFramePrintArea().Right() :
- pActual->getFramePrintArea().Left() );
+ pActual->getFramePrintArea().Left() ) );
}
else if ( !pActual->GetNext() &&
aRectFnSet.YDiff( aRectFnSet.GetPrtBottom(*pActual),
aRectFnSet.IsVert() ? rPoint.X() :
rPoint.Y() ) < 0 )
{
- aPoint.Y() = pActual->getFrameArea().Top() +
pActual->getFramePrintArea().Bottom();
- aPoint.X() = pActual->getFrameArea().Left() +
+ aPoint.setY( pActual->getFrameArea().Top() +
pActual->getFramePrintArea().Bottom() );
+ aPoint.setX( pActual->getFrameArea().Left() +
( pActual->IsRightToLeft() || aRectFnSet.IsVert() ?
pActual->getFramePrintArea().Left() :
- pActual->getFramePrintArea().Right() );
+ pActual->getFramePrintArea().Right() ) );
}
//Bring the Point in to the PrtArea
const SwRect aRect( pActual->getFrameArea().Pos() +
pActual->getFramePrintArea().Pos(),
aActualSize );
if ( aPoint.Y() < aRect.Top() )
- aPoint.Y() = aRect.Top();
+ aPoint.setY( aRect.Top() );
else if ( aPoint.Y() > aRect.Bottom() )
- aPoint.Y() = aRect.Bottom();
+ aPoint.setY( aRect.Bottom() );
if ( aPoint.X() < aRect.Left() )
- aPoint.X() = aRect.Left();
+ aPoint.setX( aRect.Left() );
else if ( aPoint.X() > aRect.Right() )
- aPoint.X() = aRect.Right();
+ aPoint.setX( aRect.Right() );
rPoint = aPoint;
return pActual;
}
@@ -1396,15 +1396,15 @@ void SwPageFrame::GetContentPosition( const Point &rPt,
SwPosition &rPos ) const
//Calculate the vertical position first
if ( aContentFrame.Top() > rPt.Y() )
- aPoint.Y() = aContentFrame.Top();
+ aPoint.setY( aContentFrame.Top() );
else if ( aContentFrame.Bottom() < rPt.Y() )
- aPoint.Y() = aContentFrame.Bottom();
+ aPoint.setY( aContentFrame.Bottom() );
//And now the horizontal position
if ( aContentFrame.Left() > rPt.X() )
- aPoint.X() = aContentFrame.Left();
+ aPoint.setX( aContentFrame.Left() );
else if ( aContentFrame.Right() < rPt.X() )
- aPoint.X() = aContentFrame.Right();
+ aPoint.setX( aContentFrame.Right() );
const sal_uInt64 nDiff = ::CalcDiff( aPoint, rPt );
if ( nDiff < nDist )
@@ -1425,13 +1425,13 @@ void SwPageFrame::GetContentPosition( const Point &rPt,
SwPosition &rPos ) const
//Bring the point into the PrtArea.
const SwRect aRect( pAct->getFrameArea().Pos() +
pAct->getFramePrintArea().Pos(), pAct->getFramePrintArea().SSize() );
if ( aAct.Y() < aRect.Top() )
- aAct.Y() = aRect.Top();
+ aAct.setY( aRect.Top() );
else if ( aAct.Y() > aRect.Bottom() )
- aAct.Y() = aRect.Bottom();
+ aAct.setY( aRect.Bottom() );
if ( aAct.X() < aRect.Left() )
- aAct.X() = aRect.Left();
+ aAct.setX( aRect.Left() );
else if ( aAct.X() > aRect.Right() )
- aAct.X() = aRect.Right();
+ aAct.setX( aRect.Right() );
if (!pAct->isFrameAreaDefinitionValid() ||
(pAct->IsTextFrame() && !static_cast<SwTextFrame
const*>(pAct)->HasPara()))
@@ -2353,14 +2353,14 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor)
if( aTmpSt.Y() > aTmpEnd.Y() )
{
long nTmpY = aTmpEnd.Y();
- aTmpEnd.Y() = aTmpSt.Y();
- aTmpSt.Y() = nTmpY;
+ aTmpEnd.setY( aTmpSt.Y() );
+ aTmpSt.setY( nTmpY );
}
if( aTmpSt.X() > aTmpEnd.X() )
{
long nTmpX = aTmpEnd.X();
- aTmpEnd.X() = aTmpSt.X();
- aTmpSt.X() = nTmpX;
+ aTmpEnd.setX( aTmpSt.X() );
+ aTmpSt.setX( nTmpX );
}
}
diff --git a/sw/source/core/layout/virtoutp.cxx
b/sw/source/core/layout/virtoutp.cxx
index 523b340f99fd..c39055fea33b 100644
--- a/sw/source/core/layout/virtoutp.cxx
+++ b/sw/source/core/layout/virtoutp.cxx
@@ -99,11 +99,11 @@ bool SwLayVout::DoesFit( const Size &rNew )
if( rNew.Width() > aSize.Width() )
{
- aSize.Width() = rNew.Width();
+ aSize.setWidth( rNew.Width() );
if( !pVirDev->SetOutputSizePixel( aSize ) )
{
pVirDev.disposeAndClear();
- aSize.Width() = 0;
+ aSize.setWidth( 0 );
return false;
}
}
@@ -142,8 +142,8 @@ void SwLayVout::Enter( SwViewShell *pShell, SwRect &rRect,
bool bOn )
pOut = pO;
Size aPixSz( pOut->PixelToLogic( Size( 1,1 )) );
SwRect aTmp( rRect );
- aTmp.SSize().Width() += aPixSz.Width()/2 + 1;
- aTmp.SSize().Height()+= aPixSz.Height()/2 + 1;
+ aTmp.SSize().AdjustWidth(aPixSz.Width()/2 + 1 );
+ aTmp.SSize().AdjustHeight(aPixSz.Height()/2 + 1 );
tools::Rectangle aTmpRect( pO->LogicToPixel( aTmp.SVRect() ) );
OSL_ENSURE( !pSh->GetWin()->IsReallyVisible() ||
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 61195cbeef8b..1107da6c4e94 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -141,12 +141,12 @@ void SwFrameAreaDefinition::transform_translate(const
Point& rOffset)
if (aFrm.Pos().X() != FAR_AWAY)
{
- aFrm.Pos().X() += rOffset.X();
+ aFrm.Pos().AdjustX(rOffset.X() );
}
if (aFrm.Pos().Y() != FAR_AWAY)
{
- aFrm.Pos().Y() += rOffset.Y();
+ aFrm.Pos().AdjustY(rOffset.Y() );
}
}
@@ -1560,7 +1560,7 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff, bool
bTst )
SwRect aInva( pUp->getFrameArea() );
if ( pViewShell )
{
- aInva.Pos().X() = pViewShell->VisArea().Left();
+ aInva.Pos().setX( pViewShell->VisArea().Left() );
aInva.Width( pViewShell->VisArea().Width() );
}
if ( nDiff > 0 )
@@ -1637,12 +1637,12 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff,
bool bTst )
{
{
SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*pUp);
- aFrm.SSize().Height() += nChg;
+ aFrm.SSize().AdjustHeight(nChg );
}
{
SwFrameAreaDefinition::FramePrintAreaWriteAccess aPrt(*pUp);
- aPrt.SSize().Height() += nChg;
+ aPrt.SSize().AdjustHeight(nChg );
}
if ( pViewShell )
@@ -1673,7 +1673,7 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff, bool
bTst )
if ( IsBodyFrame() )
{
SwFrameAreaDefinition::FramePrintAreaWriteAccess
aPrt(*this);
- aPrt.SSize().Height() = nOldFrameHeight;
+ aPrt.SSize().setHeight( nOldFrameHeight );
}
if ( pUp->GetUpper() )
@@ -1682,10 +1682,10 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff,
bool bTst )
}
SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this);
- aFrm.SSize().Height() = nOldFrameHeight;
+ aFrm.SSize().setHeight( nOldFrameHeight );
SwFrameAreaDefinition::FramePrintAreaWriteAccess aPrt(*this);
- aPrt.SSize().Height() = nOldPrtHeight;
+ aPrt.SSize().setHeight( nOldPrtHeight );
mbCompletePaint = bOldComplete;
}
@@ -1787,7 +1787,7 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff, bool
bTst )
if( aRectFnSet.IsVert() && !aRectFnSet.IsVertL2R() )
{
- aFrm.Pos().X() += nAdd;
+ aFrm.Pos().AdjustX(nAdd );
}
}
@@ -1812,7 +1812,7 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff, bool
bTst )
if( aRectFnSet.IsVert() && !aRectFnSet.IsVertL2R() )
{
- aFrm.Pos().X() += nReal;
+ aFrm.Pos().AdjustX(nReal );
}
}
@@ -2047,7 +2047,7 @@ SwTwips SwContentFrame::GrowFrame( SwTwips nDist, bool
bTst, bool bInfo )
if( IsVertical() && !IsVertLR() )
{
- aFrm.Pos().X() -= nDist;
+ aFrm.Pos().AdjustX( -nDist );
}
}
@@ -2087,7 +2087,7 @@ SwTwips SwContentFrame::GrowFrame( SwTwips nDist, bool
bTst, bool bInfo )
if( IsVertical()&& !IsVertLR() )
{
- aFrm.Pos().X() -= nDist;
+ aFrm.Pos().AdjustX( -nDist );
}
}
@@ -2183,7 +2183,7 @@ SwTwips SwContentFrame::ShrinkFrame( SwTwips nDist, bool
bTst, bool bInfo )
if( IsVertical() && !IsVertLR() )
{
- aFrm.Pos().X() += nDist;
+ aFrm.Pos().AdjustX(nDist );
}
}
@@ -2579,7 +2579,7 @@ SwTwips SwLayoutFrame::GrowFrame( SwTwips nDist, bool
bTst, bool bInfo )
if( bChgPos && !IsVertLR() )
{
- aFrm.Pos().X() -= nDist;
+ aFrm.Pos().AdjustX( -nDist );
}
bMoveAccFrame = true;
@@ -2665,7 +2665,7 @@ SwTwips SwLayoutFrame::GrowFrame( SwTwips nDist, bool
bTst, bool bInfo )
if( bChgPos && !IsVertLR() )
{
- aFrm.Pos().X() = nFramePos - nReal;
+ aFrm.Pos().setX( nFramePos - nReal );
}
bMoveAccFrame = true;
@@ -2772,7 +2772,7 @@ SwTwips SwLayoutFrame::ShrinkFrame( SwTwips nDist, bool
bTst, bool bInfo )
if( bChgPos && !IsVertLR() )
{
- aFrm.Pos().X() += nReal;
+ aFrm.Pos().AdjustX(nReal );
}
bMoveAccFrame = true;
@@ -2797,7 +2797,7 @@ SwTwips SwLayoutFrame::ShrinkFrame( SwTwips nDist, bool
bTst, bool bInfo )
if( bChgPos && !IsVertLR() )
{
- aFrm.Pos().X() += nRealDist - nReal;
+ aFrm.Pos().AdjustX(nRealDist - nReal );
}
OSL_ENSURE( !IsAccessibleFrame(), "bMoveAccFrame has to be
set!" );
@@ -2814,7 +2814,7 @@ SwTwips SwLayoutFrame::ShrinkFrame( SwTwips nDist, bool
bTst, bool bInfo )
if( bChgPos && !IsVertLR() )
{
- aFrm.Pos().X() += nTmp - nReal;
+ aFrm.Pos().AdjustX(nTmp - nReal );
}
OSL_ENSURE( !IsAccessibleFrame(), "bMoveAccFrame has to be set!" );
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 45f8292b279a..e0d58f0b01e3 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -934,13 +934,13 @@ SwTwips
SwAnchoredObjectPosition::AdjustHoriRelPosForDrawAside(
Point aTmpPos = aRectFnSet.GetPos(rAnchorTextFrame.getFrameArea());
if( aRectFnSet.IsVert() )
{
- aTmpPos.X() -= _nRelPosY + aObjBoundRect.Width();
- aTmpPos.Y() += nAdjustedRelPosX;
+ aTmpPos.AdjustX( -(_nRelPosY + aObjBoundRect.Width()) );
+ aTmpPos.AdjustY(nAdjustedRelPosX );
}
else
{
- aTmpPos.X() += nAdjustedRelPosX;
- aTmpPos.Y() += _nRelPosY;
+ aTmpPos.AdjustX(nAdjustedRelPosX );
+ aTmpPos.AdjustY(_nRelPosY );
}
SwRect aTmpObjRect( aTmpPos, aObjBoundRect.SSize() );
@@ -987,8 +987,8 @@ SwTwips
SwAnchoredObjectPosition::AdjustHoriRelPosForDrawAside(
nAdjustedRelPosX = nTmp;
}
}
- aTmpObjRect.Pos().Y() =
rAnchorTextFrame.getFrameArea().Top() +
- nAdjustedRelPosX;
+ aTmpObjRect.Pos().setY(
rAnchorTextFrame.getFrameArea().Top() +
+ nAdjustedRelPosX );
}
}
else
@@ -1023,8 +1023,8 @@ SwTwips
SwAnchoredObjectPosition::AdjustHoriRelPosForDrawAside(
nAdjustedRelPosX = nTmp;
}
}
- aTmpObjRect.Pos().X() =
rAnchorTextFrame.getFrameArea().Left() +
- nAdjustedRelPosX;
+ aTmpObjRect.Pos().setX(
rAnchorTextFrame.getFrameArea().Left() +
+ nAdjustedRelPosX );
}
} // end of <if (bVert)>
} // end of <if DrawAsideFly(..)>
diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
index 5ecc5c3db6db..07f6d7c496d7 100644
--- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
@@ -130,9 +130,9 @@ void SwAsCharAnchoredObjectPosition::CalcPosition()
// left spacing is only considered, if requested.
if( mnFlags & AsCharFlags::UlSpace )
{
- aAnchorPos.X() += nLRSpaceLeft;
+ aAnchorPos.AdjustX(nLRSpaceLeft );
}
- aAnchorPos.Y() += nULSpaceUpper;
+ aAnchorPos.AdjustY(nULSpaceUpper );
// for drawing objects: consider difference between its bounding rectangle
// and its snapping rectangle by adjusting anchor position.
@@ -147,9 +147,9 @@ void SwAsCharAnchoredObjectPosition::CalcPosition()
if( mnFlags & AsCharFlags::UlSpace )
{
- aAnchorPos.X() += aSnapRect.Left() - aObjBoundRect.Left();
+ aAnchorPos.AdjustX(aSnapRect.Left() - aObjBoundRect.Left() );
}
- aAnchorPos.Y() += aSnapRect.Top() - aObjBoundRect.Top();
+ aAnchorPos.AdjustY(aSnapRect.Top() - aObjBoundRect.Top() );
}
// enlarge bounding rectangle of object by its spacing.
@@ -173,14 +173,14 @@ void SwAsCharAnchoredObjectPosition::CalcPosition()
if( mnFlags & AsCharFlags::Init && nRelPos < 0 && mnLineAscentInclObjs <
-nRelPos )
{
if( mnFlags & AsCharFlags::Rotate )
- aAnchorPos.X() -= mnLineAscentInclObjs + nRelPos;
+ aAnchorPos.AdjustX( -(mnLineAscentInclObjs + nRelPos) );
else
- aAnchorPos.Y() -= mnLineAscentInclObjs + nRelPos;
+ aAnchorPos.AdjustY( -(mnLineAscentInclObjs + nRelPos) );
}
// consider BIDI-multiportion by adjusting proposed anchor position
if( mnFlags & AsCharFlags::Bidi )
- aAnchorPos.X() -= aObjBoundRect.Width();
+ aAnchorPos.AdjustX( -(aObjBoundRect.Width()) );
// calculate relative position considering rotation and inside rotation
// reverse direction.
@@ -189,15 +189,15 @@ void SwAsCharAnchoredObjectPosition::CalcPosition()
if( mnFlags & AsCharFlags::Rotate )
{
if( mnFlags & AsCharFlags::Reverse )
- aRelPos.X() = -nRelPos - aObjBoundRect.Width();
+ aRelPos.setX( -nRelPos - aObjBoundRect.Width() );
else
{
- aRelPos.X() = nRelPos;
- aRelPos.Y() = -aObjBoundRect.Height();
+ aRelPos.setX( nRelPos );
+ aRelPos.setY( -aObjBoundRect.Height() );
}
}
else
- aRelPos.Y() = nRelPos;
+ aRelPos.setY( nRelPos );
}
if( !IsObjFly() )
@@ -224,7 +224,7 @@ void SwAsCharAnchoredObjectPosition::CalcPosition()
if ( rAnchorFrame.IsRightToLeft() )
{
rAnchorFrame.SwitchLTRtoRTL( aAbsAnchorPos );
- aAbsAnchorPos.X() -= nObjWidth;
+ aAbsAnchorPos.AdjustX( -nObjWidth );
}
if ( rAnchorFrame.IsVertical() )
rAnchorFrame.SwitchHorizontalToVertical( aAbsAnchorPos );
@@ -259,7 +259,7 @@ void SwAsCharAnchoredObjectPosition::CalcPosition()
if ( rAnchorFrame.IsRightToLeft() )
{
rAnchorFrame.SwitchLTRtoRTL( aAnchorPos );
- aAnchorPos.X() -= nObjWidth;
+ aAnchorPos.AdjustX( -nObjWidth );
}
if ( rAnchorFrame.IsVertical() )
rAnchorFrame.SwitchHorizontalToVertical( aAnchorPos );
@@ -280,7 +280,7 @@ void SwAsCharAnchoredObjectPosition::CalcPosition()
if ( rAnchorFrame.IsRightToLeft() )
{
rAnchorFrame.SwitchLTRtoRTL( aAnchorPos );
- aAnchorPos.X() -= nObjWidth;
+ aAnchorPos.AdjustX( -nObjWidth );
}
if ( rAnchorFrame.IsVertical() )
{
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index c19d1fba9648..4144f8241154 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -420,13 +420,13 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
// anchor position, depending on layout-direction
if ( aRectFnSet.IsVert() )
{
- aRelPos.X() = nRelPosY;
- maOffsetToFrameAnchorPos.X() = nAlignAreaOffset;
+ aRelPos.setX( nRelPosY );
+ maOffsetToFrameAnchorPos.setX( nAlignAreaOffset );
}
else
{
- aRelPos.Y() = nRelPosY;
- maOffsetToFrameAnchorPos.Y() = nAlignAreaOffset;
+ aRelPos.setY( nRelPosY );
+ maOffsetToFrameAnchorPos.setY( nAlignAreaOffset );
}
}
@@ -557,9 +557,9 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
// #i26791# - determine offset to 'vertical'
// frame anchor position, depending on layout-direction
if ( aRectFnSet.IsVert() )
- maOffsetToFrameAnchorPos.X() = nVertOffsetToFrameAnchorPos;
+ maOffsetToFrameAnchorPos.setX( nVertOffsetToFrameAnchorPos );
else
- maOffsetToFrameAnchorPos.Y() = nVertOffsetToFrameAnchorPos;
+ maOffsetToFrameAnchorPos.setY( nVertOffsetToFrameAnchorPos );
// #i11860# - use new method <GetTopForObjPos>
// to get top of frame for object positioning.
const SwTwips nTopOfAnch = GetTopForObjPos(
*pAnchorFrameForVertPos, aRectFnSet.FnRect(), aRectFnSet.IsVert() );
@@ -578,9 +578,9 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
DoesObjFollowsTextFlow(),
bCheckBottom );
if ( aRectFnSet.IsVert() )
- aRelPos.X() = nRelPosY;
+ aRelPos.setX( nRelPosY );
else
- aRelPos.Y() = nRelPosY;
+ aRelPos.setY( nRelPosY );
}
else
{
@@ -619,9 +619,9 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
DoesObjFollowsTextFlow(),
bCheckBottom );
if ( aRectFnSet.IsVert() )
- aRelPos.X() = nTmpRelPosY;
+ aRelPos.setX( nTmpRelPosY );
else
- aRelPos.Y() = nTmpRelPosY;
+ aRelPos.setY( nTmpRelPosY );
// #i23512# - use local variable
// <pLayoutFrameToGrow> provided by new method
@@ -704,9 +704,9 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
nRelPosY,
DoesObjFollowsTextFlow() );
if( aRectFnSet.IsVert() )
- aRelPos.X() = nRelPosY;
+ aRelPos.setX( nRelPosY );
else
- aRelPos.Y() = nRelPosY;
+ aRelPos.setY( nRelPosY );
nRelPosY = 0;
}
}
@@ -828,7 +828,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
false );
if ( aRectFnSet.IsVert() )
{
- aRelPos.X() = nTmpRelPosY;
+ aRelPos.setX( nTmpRelPosY );
// --> OD 2009-08-31 #mongolianlayout#
if ( !aRectFnSet.IsVertL2R() )
{
@@ -843,7 +843,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
}
else
{
- aRelPos.Y() = nTmpRelPosY;
+ aRelPos.setY( nTmpRelPosY );
GetAnchoredObj().SetObjTop( nTopOfAnch + aRelPos.Y() );
}
// If the anchor frame is the first content of the table
cell
@@ -910,9 +910,9 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
aRectFnSet.YDiff(
aRectFnSet.GetPrtTop(*pNextLay),
nTopOfAnch );
if ( aRectFnSet.IsVert() )
- aRelPos.X() = nTmpRelPosY;
+ aRelPos.setX( nTmpRelPosY );
else
- aRelPos.Y() = nTmpRelPosY;
+ aRelPos.setY( nTmpRelPosY );
pUpperOfOrientFrame = pNextLay;
aRectFnSet.Refresh(pUpperOfOrientFrame);
bMoveable = rAnchorTextFrame.IsMoveable(
pUpperOfOrientFrame );
@@ -1014,13 +1014,13 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
// anchor position, depending on layout-direction
if ( aRectFnSet.IsVert() )
{
- aRelPos.Y() = nRelPosX;
- maOffsetToFrameAnchorPos.Y() = nHoriOffsetToFrameAnchorPos;
+ aRelPos.setY( nRelPosX );
+ maOffsetToFrameAnchorPos.setY( nHoriOffsetToFrameAnchorPos );
}
else
{
- aRelPos.X() = nRelPosX;
- maOffsetToFrameAnchorPos.X() = nHoriOffsetToFrameAnchorPos;
+ aRelPos.setX( nRelPosX );
+ maOffsetToFrameAnchorPos.setX( nHoriOffsetToFrameAnchorPos );
}
// save calculated horizontal position - needed for filters
diff --git
a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
index 41ee37128e3d..6d6ad30275ee 100644
--- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
@@ -106,15 +106,15 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition()
if( aRectFnSet.IsVert() )
{
if ( aRectFnSet.IsVertL2R() )
- aRelPos.X() = nRelPosY;
+ aRelPos.setX( nRelPosY );
else
- aRelPos.X() = -nRelPosY - aObjBoundRect.Width();
- maOffsetToFrameAnchorPos.X() = nVertOffsetToFrameAnchorPos;
+ aRelPos.setX( -nRelPosY - aObjBoundRect.Width() );
+ maOffsetToFrameAnchorPos.setX( nVertOffsetToFrameAnchorPos );
}
else
{
- aRelPos.Y() = nRelPosY;
- maOffsetToFrameAnchorPos.Y() = nVertOffsetToFrameAnchorPos;
+ aRelPos.setY( nRelPosY );
+ maOffsetToFrameAnchorPos.setY( nVertOffsetToFrameAnchorPos );
}
// if in online-layout the bottom of to-page anchored object is beyond
@@ -196,13 +196,13 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition()
if( aRectFnSet.IsVert() || aRectFnSet.IsVertL2R() )
{
- aRelPos.Y() = nRelPosX;
- maOffsetToFrameAnchorPos.Y() = nOffset;
+ aRelPos.setY( nRelPosX );
+ maOffsetToFrameAnchorPos.setY( nOffset );
}
else
{
- aRelPos.X() = nRelPosX;
- maOffsetToFrameAnchorPos.X() = nOffset;
+ aRelPos.setX( nRelPosX );
+ maOffsetToFrameAnchorPos.setX( nOffset );
}
// keep the calculated relative horizontal position - needed for
filters
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 7c027284db4c..7d18ac32c423 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -1512,13 +1512,13 @@ tools::Rectangle
SwEnhancedPDFExportHelper::SwRectToPDFRect(const SwPageFrame* p
tools::Rectangle aRect(rRectangle);
Size aRectSize(aRect.GetSize());
double fScale = 0.75;
- aRectSize.Width() = (aRectSize.Width() * fScale);
- aRectSize.Height() = (aRectSize.Height() * fScale);
+ aRectSize.setWidth( aRectSize.Width() * fScale );
+ aRectSize.setHeight( aRectSize.Height() * fScale );
long nOrigHeight = pCurrPage->getFrameArea().Height();
long nNewHeight = nOrigHeight*fScale;
long nShiftY = (nOrigHeight-nNewHeight)/2;
- aRect.Left() = (aRect.Left() * fScale);
- aRect.Top() = (aRect.Top() * fScale);
+ aRect.SetLeft( aRect.Left() * fScale );
+ aRect.SetTop( aRect.Top() * fScale );
aRect.Move(0, nShiftY);
aRect.SetSize(aRectSize);
return aRect;
diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx
index 042a97fc53fa..82dd83543d3c 100644
--- a/sw/source/core/text/blink.cxx
+++ b/sw/source/core/text/blink.cxx
@@ -79,32 +79,32 @@ IMPL_LINK_NOARG(SwBlink, Blinker, Timer *, void)
switch ( pTmp->GetDirection() )
{
case 900:
- aPos.X() -= pTmp->GetPortion()->GetAscent();
- aPos.Y() -= pTmp->GetPortion()->Width();
+ aPos.AdjustX( -(pTmp->GetPortion()->GetAscent()) );
+ aPos.AdjustY( -(pTmp->GetPortion()->Width()) );
nWidth = pTmp->GetPortion()->SvLSize().Height();
nHeight = pTmp->GetPortion()->SvLSize().Width();
break;
case 1800:
- aPos.Y() -= pTmp->GetPortion()->Height() -
- pTmp->GetPortion()->GetAscent();
- aPos.X() -= pTmp->GetPortion()->Width();
+ aPos.AdjustY( -(pTmp->GetPortion()->Height() -
+ pTmp->GetPortion()->GetAscent()) );
+ aPos.AdjustX( -(pTmp->GetPortion()->Width()) );
nWidth = pTmp->GetPortion()->SvLSize().Width();
nHeight = pTmp->GetPortion()->SvLSize().Height();
break;
case 2700:
- aPos.X() -= pTmp->GetPortion()->Height() -
- pTmp->GetPortion()->GetAscent();
+ aPos.AdjustX( -(pTmp->GetPortion()->Height() -
+ pTmp->GetPortion()->GetAscent()) );
nWidth = pTmp->GetPortion()->SvLSize().Height();
nHeight = pTmp->GetPortion()->SvLSize().Width();
break;
default:
- aPos.Y() -= pTmp->GetPortion()->GetAscent();
+ aPos.AdjustY( -(pTmp->GetPortion()->GetAscent()) );
nWidth = pTmp->GetPortion()->SvLSize().Width();
nHeight = pTmp->GetPortion()->SvLSize().Height();
}
tools::Rectangle aRefresh( aPos, Size( nWidth, nHeight ) );
- aRefresh.Right() += ( aRefresh.Bottom()- aRefresh.Top() ) / 8;
+ aRefresh.AdjustRight(( aRefresh.Bottom()- aRefresh.Top() ) / 8
);
pTmp->GetRootFrame()
->GetCurrShell()->InvalidateWindows( aRefresh );
}
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index e5f65cd2168b..2d2dd975ed65 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -219,33 +219,33 @@ bool SwTextFrame::GetCharRect( SwRect& rOrig, const
SwPosition &rPos,
if ( aRectFnSet.IsVert() )
{
if( nFirstOffset > 0 )
- aPnt1.Y() += nFirstOffset;
+ aPnt1.AdjustY(nFirstOffset );
if ( aPnt1.X() < nMaxY && !aRectFnSet.IsVertL2R() )
- aPnt1.X() = nMaxY;
- aPnt2.X() = aPnt1.X() + pFrame->getFramePrintArea().Width();
- aPnt2.Y() = aPnt1.Y();
+ aPnt1.setX( nMaxY );
+ aPnt2.setX( aPnt1.X() + pFrame->getFramePrintArea().Width() );
+ aPnt2.setY( aPnt1.Y() );
if( aPnt2.X() < nMaxY )
- aPnt2.X() = nMaxY;
+ aPnt2.setX( nMaxY );
}
else
{
if( nFirstOffset > 0 )
- aPnt1.X() += nFirstOffset;
+ aPnt1.AdjustX(nFirstOffset );
if( aPnt1.Y() > nMaxY )
- aPnt1.Y() = nMaxY;
- aPnt2.X() = aPnt1.X();
- aPnt2.Y() = aPnt1.Y() + pFrame->getFramePrintArea().Height();
+ aPnt1.setY( nMaxY );
+ aPnt2.setX( aPnt1.X() );
+ aPnt2.setY( aPnt1.Y() + pFrame->getFramePrintArea().Height() );
if( aPnt2.Y() > nMaxY )
- aPnt2.Y() = nMaxY;
+ aPnt2.setY( nMaxY );
}
rOrig = SwRect( aPnt1, aPnt2 );
if ( pCMS )
{
- pCMS->m_aRealHeight.X() = 0;
- pCMS->m_aRealHeight.Y() = aRectFnSet.IsVert() ? -rOrig.Width() :
rOrig.Height();
+ pCMS->m_aRealHeight.setX( 0 );
+ pCMS->m_aRealHeight.setY( aRectFnSet.IsVert() ? -rOrig.Width() :
rOrig.Height() );
}
if ( pFrame->IsRightToLeft() )
@@ -311,13 +311,13 @@ bool SwTextFrame::GetCharRect( SwRect& rOrig, const
SwPosition &rPos,
{
if ( pCMS->m_bRealHeight )
{
- pCMS->m_aRealHeight.Y() = -pCMS->m_aRealHeight.Y();
+ pCMS->m_aRealHeight.setY( -pCMS->m_aRealHeight.Y() );
if ( pCMS->m_aRealHeight.Y() < 0 )
{
// writing direction is from top to bottom
- pCMS->m_aRealHeight.X() = ( rOrig.Width() -
- pCMS->m_aRealHeight.X() +
- pCMS->m_aRealHeight.Y() );
+ pCMS->m_aRealHeight.setX( rOrig.Width() -
+ pCMS->m_aRealHeight.X() +
+ pCMS->m_aRealHeight.Y() );
}
}
if( pCMS->m_b2Lines && pCMS->m_p2Lines)
@@ -388,21 +388,21 @@ bool SwTextFrame::GetAutoPos( SwRect& rOrig, const
SwPosition &rPos ) const
if ( aRectFnSet.IsVert() )
{
if ( aPnt1.X() < nMaxY && !aRectFnSet.IsVertL2R() )
- aPnt1.X() = nMaxY;
+ aPnt1.setX( nMaxY );
- aPnt2.X() = aPnt1.X() + pFrame->getFramePrintArea().Width();
- aPnt2.Y() = aPnt1.Y();
+ aPnt2.setX( aPnt1.X() + pFrame->getFramePrintArea().Width() );
+ aPnt2.setY( aPnt1.Y() );
if( aPnt2.X() < nMaxY )
- aPnt2.X() = nMaxY;
+ aPnt2.setX( nMaxY );
}
else
{
if( aPnt1.Y() > nMaxY )
- aPnt1.Y() = nMaxY;
- aPnt2.X() = aPnt1.X();
- aPnt2.Y() = aPnt1.Y() + pFrame->getFramePrintArea().Height();
+ aPnt1.setY( nMaxY );
+ aPnt2.setX( aPnt1.X() );
+ aPnt2.setY( aPnt1.Y() + pFrame->getFramePrintArea().Height() );
if( aPnt2.Y() > nMaxY )
- aPnt2.Y() = nMaxY;
+ aPnt2.setY( nMaxY );
}
rOrig = SwRect( aPnt1, aPnt2 );
return true;
@@ -424,7 +424,7 @@ bool SwTextFrame::GetAutoPos( SwRect& rOrig, const
SwPosition &rPos ) const
{
if( aTmpState.m_aRealHeight.X() >= 0 )
{
- rOrig.Pos().Y() += aTmpState.m_aRealHeight.X();
+ rOrig.Pos().AdjustY(aTmpState.m_aRealHeight.X() );
rOrig.Height( aTmpState.m_aRealHeight.Y() );
}
@@ -822,8 +822,8 @@ bool SwTextFrame::UnitUp_( SwPaM *pPam, const SwTwips
nOffset,
if ( bPrevLine || bSecondOfDouble )
{
- aCharBox.SSize().Width() /= 2;
- aCharBox.Pos().X() = aCharBox.Pos().X() - 150;
+ aCharBox.SSize().setWidth( aCharBox.SSize().Width() / 2 );
+ aCharBox.Pos().setX( aCharBox.Pos().X() - 150 );
// See comment in SwTextFrame::GetCursorOfst()
#if OSL_DEBUG_LEVEL > 0
@@ -850,7 +850,7 @@ bool SwTextFrame::UnitUp_( SwPaM *pPam, const SwTwips
nOffset,
if ( IsFollow() )
{
aLine.GetCharRect( &aCharBox, nPos );
- aCharBox.SSize().Width() /= 2;
+ aCharBox.SSize().setWidth( aCharBox.SSize().Width() / 2 );
}
break;
} while ( true );
@@ -881,7 +881,7 @@ bool SwTextFrame::UnitUp_( SwPaM *pPam, const SwTwips
nOffset,
}
if ( !pPrevPrev )
return pTmpPrev->SwContentFrame::UnitUp( pPam, nOffset,
bSetInReadOnly );
- aCharBox.Pos().Y() = pPrevPrev->getFrameArea().Bottom() - 1;
+ aCharBox.Pos().setY( pPrevPrev->getFrameArea().Bottom() - 1 );
return pPrevPrev->GetKeyCursorOfst( pPam->GetPoint(),
aCharBox.Pos() );
}
}
@@ -1184,7 +1184,7 @@ bool SwTextFrame::UnitDown_(SwPaM *pPam, const SwTwips
nOffset,
if( pNextLine || bFirstOfDouble )
{
- aCharBox.SSize().Width() /= 2;
+ aCharBox.SSize().setWidth( aCharBox.SSize().Width() / 2 );
#if OSL_DEBUG_LEVEL > 0
// See comment in SwTextFrame::GetCursorOfst()
const sal_uLong nOldNode = pPam->GetPoint()->nNode.GetIndex();
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
