[Libreoffice-commits] core.git: include/svx include/tools reportdesign/source sfx2/source starmath/inc starmath/source svtools/source svx/source tools/source xmloff/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Feb 28 11:47:59 UTC 2018
include/svx/svdpntv.hxx | 2
include/svx/svdtrans.hxx | 16 +--
include/tools/gen.hxx | 2
reportdesign/source/ui/report/SectionWindow.cxx | 2
reportdesign/source/ui/report/ViewsWindow.cxx | 22 ++--
reportdesign/source/ui/report/dlgedfunc.cxx | 4
sfx2/source/appl/workwin.cxx | 6 -
starmath/inc/rect.hxx | 2
starmath/source/node.cxx | 4
svtools/source/contnr/imivctl.hxx | 2
svtools/source/contnr/simptabl.cxx | 4
svtools/source/control/scriptedtext.cxx | 3
svtools/source/misc/imap.cxx | 4
svx/source/dialog/_contdlg.cxx | 10 +
svx/source/dialog/svxbmpnumvalueset.cxx | 6 -
svx/source/xoutdev/_xpoly.cxx | 44 ++++----
tools/source/generic/point.cxx | 10 +
xmloff/source/draw/sdxmlexp.cxx | 128 ++++++++++++------------
18 files changed, 150 insertions(+), 121 deletions(-)
New commits:
commit efe22f3fa2375c233b86d9a4556e2cd7eed85f9d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Feb 27 17:12:50 2018 +0200
drop old tools/gen methods in reportdesign..xmloff
Change-Id: I398831c526ba51d861557fa6c13c0e2fb44dfbe0
Reviewed-on: https://gerrit.libreoffice.org/50447
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 24bdb25d7d41..209a6ff183d8 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -391,7 +391,7 @@ public:
void SetGridCoarse(const Size& rSiz) { maGridBig=rSiz; }
void SetGridFine(const Size& rSiz) {
maGridFin=rSiz;
- if (maGridFin.Height()==0) maGridFin.Height()=maGridFin.Width();
+ if (maGridFin.Height()==0) maGridFin.setHeight(maGridFin.Width());
if (mbGridVisible) InvalidateAllWin();
}
const Size& GetGridCoarse() const { return maGridBig; }
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index 97bf7a5456a4..75a1bcff5789 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -113,27 +113,27 @@ inline void ResizePoint(Point& rPnt, const Point& rRef, const Fraction& xFract,
{
double nxFract = xFract.IsValid() ? static_cast<double>(xFract) : 1.0;
double nyFract = yFract.IsValid() ? static_cast<double>(yFract) : 1.0;
- rPnt.X() = rRef.X() + svx::Round( (rPnt.X() - rRef.X()) * nxFract );
- rPnt.Y() = rRef.Y() + svx::Round( (rPnt.Y() - rRef.Y()) * nyFract );
+ rPnt.setX(rRef.X() + svx::Round( (rPnt.X() - rRef.X()) * nxFract ));
+ rPnt.setY(rRef.Y() + svx::Round( (rPnt.Y() - rRef.Y()) * nyFract ));
}
inline void RotatePoint(Point& rPnt, const Point& rRef, double sn, double cs)
{
long dx=rPnt.X()-rRef.X();
long dy=rPnt.Y()-rRef.Y();
- rPnt.X()=svx::Round(rRef.X()+dx*cs+dy*sn);
- rPnt.Y()=svx::Round(rRef.Y()+dy*cs-dx*sn);
+ rPnt.setX(svx::Round(rRef.X()+dx*cs+dy*sn));
+ rPnt.setY(svx::Round(rRef.Y()+dy*cs-dx*sn));
}
inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear)
{
if (!bVShear) { // Horizontal
if (rPnt.Y()!=rRef.Y()) { // else not needed
- rPnt.X()-=svx::Round((rPnt.Y()-rRef.Y())*tn);
+ rPnt.AdjustX(-svx::Round((rPnt.Y()-rRef.Y())*tn));
}
} else { // or else vertical
if (rPnt.X()!=rRef.X()) { // else not needed
- rPnt.Y()-=svx::Round((rPnt.X()-rRef.X())*tn);
+ rPnt.AdjustY(-svx::Round((rPnt.X()-rRef.X())*tn));
}
}
}
@@ -144,11 +144,11 @@ inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad
if (bVertical) {
long dy=rPnt.Y()-rCenter.Y();
nAngle=static_cast<double>(dy)/static_cast<double>(rRad.Y());
- rPnt.Y()=rCenter.Y();
+ rPnt.setY(rCenter.Y());
} else {
long dx=rCenter.X()-rPnt.X();
nAngle=static_cast<double>(dx)/static_cast<double>(rRad.X());
- rPnt.X()=rCenter.X();
+ rPnt.setX(rCenter.X());
}
return nAngle;
}
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index 754f6c3b459c..38f80404e1f6 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -88,7 +88,7 @@ public:
long AdjustY( long nVertMove ) { nB += nVertMove; return nB; }
void RotateAround( long& rX, long& rY, short nOrientation ) const;
-
+ void RotateAround( Point&, short nOrientation ) const;
Point& operator += ( const Point& rPoint );
Point& operator -= ( const Point& rPoint );
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 0e98b03e0ae3..015775bd9e40 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -232,7 +232,7 @@ void OSectionWindow::Resize()
const Point aThumbPos = m_pParent->getView()->getThumbPos();
aOutputSize.AdjustWidth( -(aThumbPos.X()) );
- aOutputSize.Height() -= m_aSplitter->GetSizePixel().Height();
+ aOutputSize.AdjustHeight( -m_aSplitter->GetSizePixel().Height() );
if ( m_aStartMarker->isCollapsed() )
{
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 224977bc80de..5e48c8c209f3 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -770,8 +770,9 @@ void OViewsWindow::alignMarkedObjects(ControlModification _nControlModification,
bool bMove = true;
- ::std::function<long&(tools::Rectangle *)> aGetFun = ::std::mem_fn(static_cast<long&(tools::Rectangle:: *)()>(&tools::Rectangle::Bottom));
- ::std::function<long&(tools::Rectangle *)> aRefFun = ::std::mem_fn(static_cast<long&(tools::Rectangle:: *)()>(&tools::Rectangle::Top));
+ auto aGetFun = ::std::mem_fn(static_cast<long(tools::Rectangle:: *)() const>(&tools::Rectangle::Bottom));
+ auto aSetFun = ::std::mem_fn(&tools::Rectangle::SetBottom);
+ auto aRefFun = ::std::mem_fn(static_cast<long(tools::Rectangle:: *)() const>(&tools::Rectangle::Top));
TRectangleMap::const_iterator aRectIter = aSortRectangles.begin();
TRectangleMap::const_iterator aRectEnd = aSortRectangles.end();
for (;aRectIter != aRectEnd ; ++aRectIter)
@@ -790,8 +791,9 @@ void OViewsWindow::alignMarkedObjects(ControlModification _nControlModification,
switch(_nControlModification)
{
case ControlModification::TOP :
- aGetFun = ::std::mem_fn(static_cast<long&(tools::Rectangle:: *)()>(&tools::Rectangle::Top));
- aRefFun = ::std::mem_fn(static_cast<long&(tools::Rectangle:: *)()>(&tools::Rectangle::Bottom));
+ aGetFun = ::std::mem_fn(static_cast<long(tools::Rectangle:: *)() const>(&tools::Rectangle::Top));
+ aSetFun = ::std::mem_fn(&tools::Rectangle::SetTop);
+ aRefFun = ::std::mem_fn(static_cast<long(tools::Rectangle:: *)() const>(&tools::Rectangle::Bottom));
pValue = &nYMov;
break;
case ControlModification::BOTTOM:
@@ -804,16 +806,18 @@ void OViewsWindow::alignMarkedObjects(ControlModification _nControlModification,
bMove = false;
break;
case ControlModification::RIGHT :
- aGetFun = ::std::mem_fn(static_cast<long&(tools::Rectangle:: *)()>(&tools::Rectangle::Right));
- aRefFun = ::std::mem_fn(static_cast<long&(tools::Rectangle:: *)()>(&tools::Rectangle::Left));
+ aGetFun = ::std::mem_fn(static_cast<long(tools::Rectangle:: *)() const>(&tools::Rectangle::Right));
+ aSetFun = ::std::mem_fn(&tools::Rectangle::SetRight);
+ aRefFun = ::std::mem_fn(static_cast<long(tools::Rectangle:: *)() const>(&tools::Rectangle::Left));
break;
case ControlModification::CENTER_HORIZONTAL:
nXMov = aCenter.X() - aObjRect.Center().X();
bMove = false;
break;
case ControlModification::LEFT :
- aGetFun = ::std::mem_fn(static_cast<long&(tools::Rectangle:: *)()>(&tools::Rectangle::Left));
- aRefFun = ::std::mem_fn(static_cast<long&(tools::Rectangle:: *)()>(&tools::Rectangle::Right));
+ aGetFun = ::std::mem_fn(static_cast<long(tools::Rectangle:: *)() const>(&tools::Rectangle::Left));
+ aSetFun = ::std::mem_fn(&tools::Rectangle::SetLeft);
+ aRefFun = ::std::mem_fn(static_cast<long(tools::Rectangle:: *)() const>(&tools::Rectangle::Right));
break;
default:
bMove = false;
@@ -822,7 +826,7 @@ void OViewsWindow::alignMarkedObjects(ControlModification _nControlModification,
if ( bMove )
{
tools::Rectangle aTest = aObjRect;
- aGetFun(&aTest) = aGetFun(&aBound);
+ aSetFun(&aTest, aGetFun(&aBound));
TRectangleMap::const_iterator aInterSectRectIter = aSortRectangles.begin();
for (; aInterSectRectIter != aRectIter; ++aInterSectRectIter)
{
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 4ce3b25da416..04fb810066d6 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -78,11 +78,11 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
aStartWidth *= m_pParent->GetMapMode().GetScaleX();
aOut.AdjustWidth( -static_cast<long>(aStartWidth) );
- aOut.Height() = m_pParent->GetOutputSizePixel().Height();
+ aOut.setHeight( m_pParent->GetOutputSizePixel().Height() );
Point aPos = pScrollWindow->getThumbPos();
aPos.setX( aPos.X() * 0.5 );
- aPos.Y() *= 0.5;
+ aPos.setY( aPos.Y() * 0.5 );
tools::Rectangle aOutRect( aPos, aOut );
aOutRect = m_pParent->PixelToLogic( aOutRect );
tools::Rectangle aWorkArea(Point(), pScrollWindow->getTotalSize());
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 1da8891f4146..1f8ad2a573c9 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -828,7 +828,8 @@ SvBorder SfxWorkWindow::Arrange_Impl()
{
aBorder.Left() = aClientArea.Left();
aBorder.Right() = aClientArea.Right();
- aClientArea.Right() = aClientArea.Left() = aTmp.Left();
+ aClientArea.SetRight( aTmp.Left() );
+ aClientArea.SetLeft( aTmp.Left() );
}
if ( aClientArea.GetHeight() >= aBorder.Top() + aBorder.Bottom() )
@@ -840,7 +841,8 @@ SvBorder SfxWorkWindow::Arrange_Impl()
{
aBorder.Top() = aClientArea.Top();
aBorder.Bottom() = aClientArea.Bottom();
- aClientArea.Top() = aClientArea.Bottom() = aTmp.Top();
+ aClientArea.SetTop(aTmp.Top());
+ aClientArea.SetBottom(aTmp.Top());
}
return IsDockingAllowed() ? aBorder : SvBorder();
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index 83ebdcda5586..f48cc60554bd 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -116,7 +116,7 @@ public:
void SetItalicSpaces(long nLeftSpace, long nRightSpace);
- void SetWidth(sal_uLong nWidth) { aSize.Width() = nWidth; }
+ void SetWidth(sal_uLong nWidth) { aSize.setWidth(nWidth); }
void SetLeft(long nLeft);
void SetRight(long nRight);
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index abfacfff8c22..3d1190594002 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -1961,8 +1961,8 @@ void SmPolyLineNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat)
else
{
OSL_ENSURE(GetToken().eType == TWIDEBACKSLASH, "Sm : unexpected token");
- aPointA.X() =
- aPointA.Y() = nBorderwidth;
+ aPointA.setX( nBorderwidth );
+ aPointA.setY( nBorderwidth );
aPointB.setX( maToSize.Width() - nBorderwidth );
aPointB.setY( maToSize.Height() - nBorderwidth );
}
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index e142449e99ec..12e574e345f9 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -386,7 +386,7 @@ public:
const tools::Rectangle& GetEntryBoundRect( SvxIconChoiceCtrlEntry* );
void InvalidateBoundingRect( tools::Rectangle& rRect )
{
- rRect.Right() = LONG_MAX;
+ rRect.SetRight(LONG_MAX);
bBoundRectsDirty = true;
}
static bool IsBoundingRectValid( const tools::Rectangle& rRect ) { return ( rRect.Right() != LONG_MAX ); }
diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx
index 7807f93b39ad..5bb7eb91eb24 100644
--- a/svtools/source/contnr/simptabl.cxx
+++ b/svtools/source/contnr/simptabl.cxx
@@ -145,13 +145,13 @@ void SvSimpleTable::UpdateViewSize()
Size HbSize=aHeaderBar->GetSizePixel();
HbSize.setWidth(theWinSize.Width() );
- theWinSize.Height()-=HbSize.Height();
+ theWinSize.AdjustHeight(-HbSize.Height());
Point thePos(0,0);
aHeaderBar->SetPosPixel(thePos);
aHeaderBar->SetSizePixel(HbSize);
- thePos.Y()+=HbSize.Height();
+ thePos.AdjustY(HbSize.Height());
SvHeaderTabListBox::SetPosPixel(thePos);
SvHeaderTabListBox::SetSizePixel(theWinSize);
Invalidate();
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index 9d06321e42a5..16b90aedd764 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -102,7 +102,8 @@ const vcl::Font& SvtScriptedTextHelper_Impl::GetFont( sal_uInt16 _nScript ) cons
void SvtScriptedTextHelper_Impl::CalculateSizes()
{
- maTextSize.Width() = maTextSize.Height() = 0;
+ maTextSize.setWidth(0);
+ maTextSize.setHeight(0);
mrOutDevice.Push(PushFlags::FONT | PushFlags::TEXTCOLOR);
// calculate text portion widths and total width
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 3792f06996a6..19965aa8b50f 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -36,8 +36,8 @@
#include <memory>
-#define SCALEPOINT(aPT,aFracX,aFracY) (aPT).X()=long((aPT).X()*aFracX); \
- (aPT).Y()=long((aPT).Y()*aFracY);
+#define SCALEPOINT(aPT,aFracX,aFracY) (aPT).setX(long((aPT).X()*aFracX)); \
+ (aPT).setY(long((aPT).Y()*aFracY));
/******************************************************************************/
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 7e4180b8f986..62f18c8ddb26 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -158,9 +158,15 @@ tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
double fWH = static_cast<double>(aSizePix.Width()) / aSizePix.Height();
if( fWH <= 1.0 )
- aSizePix.setWidth( FRound( ( aSizePix.Height() = 512 ) * fWH ) );
+ {
+ aSizePix.setHeight(512);
+ aSizePix.setWidth( FRound( ( aSizePix.Height() ) * fWH ) );
+ }
else
- aSizePix.setHeight( FRound( ( aSizePix.Width() = 512 ) / fWH ) );
+ {
+ aSizePix.setWidth(512);
+ aSizePix.setHeight( FRound( ( aSizePix.Width() ) / fWH ) );
+ }
}
if( pVDev->SetOutputSizePixel( aSizePix ) )
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 4da581ed1241..6cce3e4a620a 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -180,9 +180,11 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
Point aEnd(aBLPos.X() + nRectWidth * 9 / 10,0);
for( sal_uInt16 i = 11; i < 100; i += 33)
{
- aStart.Y() = aEnd.Y() = aBLPos.Y() + nRectHeight * i / 100;
+ aStart.setY( aBLPos.Y() + nRectHeight * i / 100 );
+ aEnd.setY( aStart.Y() );
pVDev->DrawLine(aStart, aEnd);
- aStart.Y() = aEnd.Y() = aBLPos.Y() + nRectHeight * (i + 11) / 100;
+ aStart.setY( aBLPos.Y() + nRectHeight * (i + 11) / 100 );
+ aEnd.setY( aStart.Y() );
pVDev->DrawLine(aStart, aEnd);
}
}
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index 9f98aa2df29d..05fe65b17d89 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -405,8 +405,8 @@ void XPolygon::Move( long nHorzMove, long nVertMove )
for ( sal_uInt16 i = 0; i < nCount; i++ )
{
Point* pPt = &(pImpXPolygon->pPointAry[i]);
- pPt->X() += nHorzMove;
- pPt->Y() += nVertMove;
+ pPt->AdjustX( nHorzMove );
+ pPt->AdjustY( nVertMove );
}
}
@@ -536,28 +536,28 @@ void XPolygon::SubdivideBezier(sal_uInt16 nPos, bool bCalcFirst, double fT)
nPosInc = 1;
nIdxInc = 1;
}
- pPoints[nPos].X() = static_cast<long>(fU3 * pPoints[nIdx ].X() +
+ pPoints[nPos].setX( static_cast<long>(fU3 * pPoints[nIdx ].X() +
fT * fU2 * pPoints[nIdx+1].X() * 3 +
fT2 * fU * pPoints[nIdx+2].X() * 3 +
- fT3 * pPoints[nIdx+3].X());
- pPoints[nPos].Y() = static_cast<long>(fU3 * pPoints[nIdx ].Y() +
+ fT3 * pPoints[nIdx+3].X()) );
+ pPoints[nPos].setY( static_cast<long>(fU3 * pPoints[nIdx ].Y() +
fT * fU2 * pPoints[nIdx+1].Y() * 3 +
fT2 * fU * pPoints[nIdx+2].Y() * 3 +
- fT3 * pPoints[nIdx+3].Y());
+ fT3 * pPoints[nIdx+3].Y()) );
nPos = nPos + nPosInc;
nIdx = nIdx + nIdxInc;
- pPoints[nPos].X() = static_cast<long>(fU2 * pPoints[nIdx ].X() +
+ pPoints[nPos].setX( static_cast<long>(fU2 * pPoints[nIdx ].X() +
fT * fU * pPoints[nIdx+1].X() * 2 +
- fT2 * pPoints[nIdx+2].X());
- pPoints[nPos].Y() = static_cast<long>(fU2 * pPoints[nIdx ].Y() +
+ fT2 * pPoints[nIdx+2].X()) );
+ pPoints[nPos].setY( static_cast<long>(fU2 * pPoints[nIdx ].Y() +
fT * fU * pPoints[nIdx+1].Y() * 2 +
- fT2 * pPoints[nIdx+2].Y());
+ fT2 * pPoints[nIdx+2].Y()) );
nPos = nPos + nPosInc;
nIdx = nIdx + nIdxInc;
- pPoints[nPos].X() = static_cast<long>(fU * pPoints[nIdx ].X() +
- fT * pPoints[nIdx+1].X());
- pPoints[nPos].Y() = static_cast<long>(fU * pPoints[nIdx ].Y() +
- fT * pPoints[nIdx+1].Y());
+ pPoints[nPos].setX( static_cast<long>(fU * pPoints[nIdx ].X() +
+ fT * pPoints[nIdx+1].X()) );
+ pPoints[nPos].setY( static_cast<long>(fU * pPoints[nIdx ].Y() +
+ fT * pPoints[nIdx+1].Y()) );
}
/// Generate a Bézier arc
@@ -580,22 +580,26 @@ void XPolygon::GenBezArc(const Point& rCenter, long nRx, long nRy,
if ( nQuad == 0 || nQuad == 2 )
{
- pPoints[nFirst].X() += nRx; pPoints[nFirst+3].Y() += nRy;
+ pPoints[nFirst].AdjustX( nRx );
+ pPoints[nFirst+3].AdjustY( nRy );
}
else
{
- pPoints[nFirst].Y() += nRy; pPoints[nFirst+3].X() += nRx;
+ pPoints[nFirst].AdjustY( nRy );
+ pPoints[nFirst+3].AdjustX( nRx );
}
pPoints[nFirst+1] = pPoints[nFirst];
pPoints[nFirst+2] = pPoints[nFirst+3];
if ( nQuad == 0 || nQuad == 2 )
{
- pPoints[nFirst+1].Y() += nYHdl; pPoints[nFirst+2].X() += nXHdl;
+ pPoints[nFirst+1].AdjustY( nYHdl );
+ pPoints[nFirst+2].AdjustX( nXHdl );
}
else
{
- pPoints[nFirst+1].X() += nXHdl; pPoints[nFirst+2].Y() += nYHdl;
+ pPoints[nFirst+1].AdjustX( nXHdl );
+ pPoints[nFirst+2].AdjustY( nYHdl );
}
if ( nStart > 0 )
SubdivideBezier(nFirst, false, static_cast<double>(nStart) / 900);
@@ -769,8 +773,8 @@ void XPolygon::Scale(double fSx, double fSy)
for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point& rPnt = pImpXPolygon->pPointAry[i];
- rPnt.X() = static_cast<long>(fSx * rPnt.X());
- rPnt.Y() = static_cast<long>(fSy * rPnt.Y());
+ rPnt.setX( static_cast<long>(fSx * rPnt.X()) );
+ rPnt.setY( static_cast<long>(fSy * rPnt.Y()) );
}
}
diff --git a/tools/source/generic/point.cxx b/tools/source/generic/point.cxx
index 0b3d06c4753b..1b470c6065ec 100644
--- a/tools/source/generic/point.cxx
+++ b/tools/source/generic/point.cxx
@@ -22,6 +22,16 @@
#include <tools/gen.hxx>
#include <basegfx/numeric/ftools.hxx>
+void Point::RotateAround( Point& rPoint,
+ short nOrientation ) const
+{
+ long nX = rPoint.X();
+ long nY = rPoint.Y();
+ RotateAround(nX, nY, nOrientation);
+ rPoint.setX(nX);
+ rPoint.setY(nY);
+}
+
void Point::RotateAround( long& rX, long& rY,
short nOrientation ) const
{
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 68f34762be7b..763c692ccf5d 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -250,8 +250,8 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
aPagePos = Point(mpPageMasterInfo->GetBorderLeft(), mpPageMasterInfo->GetBorderTop());
aPageSize = Size(mpPageMasterInfo->GetWidth(), mpPageMasterInfo->GetHeight());
aPageInnerSize = aPageSize;
- aPageInnerSize.Width() -= mpPageMasterInfo->GetBorderLeft() + mpPageMasterInfo->GetBorderRight();
- aPageInnerSize.Height() -= mpPageMasterInfo->GetBorderTop() + mpPageMasterInfo->GetBorderBottom();
+ aPageInnerSize.AdjustWidth(-(mpPageMasterInfo->GetBorderLeft() + mpPageMasterInfo->GetBorderRight()));
+ aPageInnerSize.AdjustHeight(-(mpPageMasterInfo->GetBorderTop() + mpPageMasterInfo->GetBorderBottom()));
}
// title rectangle aligning
@@ -260,9 +260,9 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
if(mnType == 21 /* AUTOLAYOUT_NOTES */)
{
- aTitleSize.Height() = static_cast<long>(aTitleSize.Height() / 2.5);
+ aTitleSize.setHeight(static_cast<long>(aTitleSize.Height() / 2.5));
Point aPos = aTitlePos;
- aPos.Y() += long( aTitleSize.Height() * 0.083 );
+ aPos.AdjustY( long( aTitleSize.Height() * 0.083 ) );
Size aPartArea = aTitleSize;
Size aSize;
@@ -272,11 +272,11 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
if ( fH > fV )
fH = fV;
- aSize.Width() = static_cast<long>(fH * aPageSize.Width());
- aSize.Height() = static_cast<long>(fH * aPageSize.Height());
+ aSize.setWidth( static_cast<long>(fH * aPageSize.Width()) );
+ aSize.setHeight( static_cast<long>(fH * aPageSize.Height()) );
- aPos.X() += (aPartArea.Width() - aSize.Width()) / 2;
- aPos.Y() += (aPartArea.Height()- aSize.Height())/ 2;
+ aPos.AdjustX((aPartArea.Width() - aSize.Width()) / 2);
+ aPos.AdjustY((aPartArea.Height()- aSize.Height())/ 2);
aTitlePos = aPos;
aTitleSize = aSize;
@@ -298,17 +298,17 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
long( aLSize.Width() * 0.854 ),
long( aLSize.Height() * 0.444 ));
- aTitlePos.X() = (aClassicTPos.X() + aClassicTSize.Width()) - aClassicTSize.Height();
- aTitlePos.Y() = aClassicTPos.Y();
- aTitleSize.Width() = aClassicTSize.Height();
- aTitleSize.Height() = (aClassicLPos.Y() + aClassicLSize.Height()) - aClassicTPos.Y();
+ aTitlePos.setX( (aClassicTPos.X() + aClassicTSize.Width()) - aClassicTSize.Height() );
+ aTitlePos.setY( aClassicTPos.Y() );
+ aTitleSize.setWidth( aClassicTSize.Height() );
+ aTitleSize.setHeight( (aClassicLPos.Y() + aClassicLSize.Height()) - aClassicTPos.Y() );
}
else
{
- aTitlePos.X() += long( aTitleSize.Width() * 0.0735 );
- aTitlePos.Y() += long( aTitleSize.Height() * 0.083 );
- aTitleSize.Width() = long( aTitleSize.Width() * 0.854 );
- aTitleSize.Height() = long( aTitleSize.Height() * 0.167 );
+ aTitlePos.AdjustX( long( aTitleSize.Width() * 0.0735 ) );
+ aTitlePos.AdjustY( long( aTitleSize.Height() * 0.083 ) );
+ aTitleSize.setWidth( long( aTitleSize.Width() * 0.854 ) );
+ aTitleSize.setHeight( long( aTitleSize.Height() * 0.167 ) );
}
maTitleRect.SetPos(aTitlePos);
@@ -320,10 +320,10 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
if(mnType == 21 /* AUTOLAYOUT_NOTES */)
{
- aLayoutPos.X() += long( aLayoutSize.Width() * 0.0735 );
- aLayoutPos.Y() += long( aLayoutSize.Height() * 0.472 );
- aLayoutSize.Width() = long( aLayoutSize.Width() * 0.854 );
- aLayoutSize.Height() = long( aLayoutSize.Height() * 0.444 );
+ aLayoutPos.AdjustX( long( aLayoutSize.Width() * 0.0735 ) );
+ aLayoutPos.AdjustY( long( aLayoutSize.Height() * 0.472 ) );
+ aLayoutSize.setWidth( long( aLayoutSize.Width() * 0.854 ) );
+ aLayoutSize.setHeight( long( aLayoutSize.Height() * 0.444 ) );
}
else if((mnType >= 22 && mnType <= 26) || (mnType == 31)) // AUTOLAYOUT_HANDOUT*
{
@@ -359,24 +359,24 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
long( aLayoutSize.Width() * 0.854 ),
long( aLayoutSize.Height() * 0.444 ));
- aLayoutPos.X() = aClassicLPos.X();
- aLayoutPos.Y() = aClassicTPos.Y();
- aLayoutSize.Width() = (aClassicLPos.X() + aClassicLSize.Width())
- - (aClassicTSize.Height() + (aClassicLPos.Y() - (aClassicTPos.Y() + aClassicTSize.Height())));
- aLayoutSize.Height() = (aClassicLPos.Y() + aClassicLSize.Height()) - aClassicTPos.Y();
+ aLayoutPos.setX( aClassicLPos.X() );
+ aLayoutPos.setY( aClassicTPos.Y() );
+ aLayoutSize.setWidth( (aClassicLPos.X() + aClassicLSize.Width())
+ - (aClassicTSize.Height() + (aClassicLPos.Y() - (aClassicTPos.Y() + aClassicTSize.Height()))));
+ aLayoutSize.setHeight( (aClassicLPos.Y() + aClassicLSize.Height()) - aClassicTPos.Y() );
}
else if( mnType == AUTOLAYOUT_ONLY_TEXT )
{
aLayoutPos = aTitlePos;
- aLayoutSize.Width() = aTitleSize.Width();
- aLayoutSize.Height() = long( aLayoutSize.Height() * 0.825 );
+ aLayoutSize.setWidth( aTitleSize.Width() );
+ aLayoutSize.setHeight( long( aLayoutSize.Height() * 0.825 ) );
}
else
{
- aLayoutPos.X() += long( aLayoutSize.Width() * 0.0735 );
- aLayoutPos.Y() += long( aLayoutSize.Height() * 0.278 );
- aLayoutSize.Width() = long( aLayoutSize.Width() * 0.854 );
- aLayoutSize.Height() = long( aLayoutSize.Height() * 0.630 );
+ aLayoutPos.AdjustX( long( aLayoutSize.Width() * 0.0735 ) );
+ aLayoutPos.AdjustY( long( aLayoutSize.Height() * 0.278 ) );
+ aLayoutSize.setWidth( long( aLayoutSize.Width() * 0.854 ) );
+ aLayoutSize.setHeight( long( aLayoutSize.Height() * 0.630 ) );
}
maPresRect.SetPos(aLayoutPos);
@@ -782,7 +782,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
tools::Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
tools::Rectangle aRight(aLeft);
- aRight.Left() = long(aRight.Left() + aRight.GetWidth() * 1.05);
+ aRight.SetLeft(long(aRight.Left() + aRight.GetWidth() * 1.05));
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, aLeft);
@@ -794,7 +794,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
tools::Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
tools::Rectangle aRight(aLeft);
- aRight.Left() = long(aRight.Left() + aRight.GetWidth() * 1.05);
+ aRight.SetLeft( long(aRight.Left() + aRight.GetWidth() * 1.05) );
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, aLeft);
@@ -806,7 +806,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
tools::Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
tools::Rectangle aRight(aLeft);
- aRight.Left() = long(aRight.Left() + aRight.GetWidth() * 1.05);
+ aRight.SetLeft(long(aRight.Left() + aRight.GetWidth() * 1.05));
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, aLeft);
@@ -818,7 +818,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
tools::Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
tools::Rectangle aRight(aLeft);
- aRight.Left() = long(aRight.Left() + aRight.GetWidth() * 1.05);
+ aRight.SetLeft(long(aRight.Left() + aRight.GetWidth() * 1.05));
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderChart, aLeft);
@@ -836,7 +836,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
tools::Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
tools::Rectangle aRight(aLeft);
- aRight.Left() = long(aRight.Left() + aRight.GetWidth() * 1.05);
+ aRight.SetLeft(long(aRight.Left() + aRight.GetWidth() * 1.05));
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aLeft);
@@ -848,7 +848,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
tools::Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
tools::Rectangle aRight(aLeft);
- aRight.Left() = long(aRight.Left() + aRight.GetWidth() * 1.05);
+ aRight.SetLeft(long(aRight.Left() + aRight.GetWidth() * 1.05));
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, aLeft);
@@ -866,10 +866,10 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
tools::Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
tools::Rectangle aRightTop(aLeft);
- aRightTop.Left() = long(aRightTop.Left() + aRightTop.GetWidth() * 1.05);
+ aRightTop.SetLeft(long(aRightTop.Left() + aRightTop.GetWidth() * 1.05));
aRightTop.setHeight(long(aRightTop.GetHeight() * 0.477));
tools::Rectangle aRightBottom(aRightTop);
- aRightBottom.Top() = long(aRightBottom.Top() + aRightBottom.GetHeight() * 1.095);
+ aRightBottom.SetTop(long(aRightBottom.Top() + aRightBottom.GetHeight() * 1.095));
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, aLeft);
@@ -882,7 +882,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
tools::Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
tools::Rectangle aRight(aLeft);
- aRight.Left() = long(aRight.Left() + aRight.GetWidth() * 1.05);
+ aRight.SetLeft(long(aRight.Left() + aRight.GetWidth() * 1.05));
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderObject, aLeft);
@@ -894,7 +894,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
tools::Rectangle aTop(pInfo->GetPresRectangle());
aTop.setHeight(long(aTop.GetHeight() * 0.477));
tools::Rectangle aBottom(aTop);
- aBottom.Top() = long(aBottom.Top() + aBottom.GetHeight() * 1.095);
+ aBottom.SetTop(long(aBottom.Top() + aBottom.GetHeight() * 1.095));
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderObject, aTop);
@@ -906,10 +906,10 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
tools::Rectangle aLeftTop(pInfo->GetPresRectangle());
aLeftTop.setWidth(long(aLeftTop.GetWidth() * 0.488));
tools::Rectangle aRight(aLeftTop);
- aRight.Left() = long(aRight.Left() + aRight.GetWidth() * 1.05);
+ aRight.SetLeft(long(aRight.Left() + aRight.GetWidth() * 1.05));
aLeftTop.setHeight(long(aLeftTop.GetHeight() * 0.477));
tools::Rectangle aLeftBottom(aLeftTop);
- aLeftBottom.Top() = long(aLeftBottom.Top() + aLeftBottom.GetHeight() * 1.095);
+ aLeftBottom.SetTop(long(aLeftBottom.Top() + aLeftBottom.GetHeight() * 1.095));
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderObject, aLeftTop);
@@ -922,10 +922,10 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
tools::Rectangle aTopLeft(pInfo->GetPresRectangle());
aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));
tools::Rectangle aBottom(aTopLeft);
- aBottom.Top() = long(aBottom.Top() + aBottom.GetHeight() * 1.095);
+ aBottom.SetTop(long(aBottom.Top() + aBottom.GetHeight() * 1.095));
aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.488));
tools::Rectangle aTopRight(aTopLeft);
- aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 1.05);
+ aTopRight.SetLeft(long(aTopRight.Left() + aTopRight.GetWidth() * 1.05));
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderObject, aTopLeft);
@@ -938,7 +938,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
tools::Rectangle aTop(pInfo->GetPresRectangle());
aTop.setHeight(long(aTop.GetHeight() * 0.477));
tools::Rectangle aBottom(aTop);
- aBottom.Top() = long(aBottom.Top() + aBottom.GetHeight() * 1.095);
+ aBottom.SetTop(long(aBottom.Top() + aBottom.GetHeight() * 1.095));
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, aTop);
@@ -951,11 +951,11 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));
aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.488));
tools::Rectangle aBottomLeft(aTopLeft);
- aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);
+ aBottomLeft.SetTop(long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095));
tools::Rectangle aTopRight(aTopLeft);
- aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 1.05);
+ aTopRight.SetLeft(long(aTopRight.Left() + aTopRight.GetWidth() * 1.05));
tools::Rectangle aBottomRight(aTopRight);
- aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);
+ aBottomRight.SetTop(long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095));
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderObject, aTopLeft);
@@ -1010,24 +1010,24 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
if (nColCnt == 0 || nRowCnt == 0)
break;
- aPartSize.Width() = (aPartSize.Width() - ((nColCnt - 1) * nGapX)) / nColCnt;
- aPartSize.Height() = (aPartSize.Height() - ((nRowCnt - 1) * nGapY)) / nRowCnt;
+ aPartSize.setWidth( (aPartSize.Width() - ((nColCnt - 1) * nGapX)) / nColCnt );
+ aPartSize.setHeight( (aPartSize.Height() - ((nRowCnt - 1) * nGapY)) / nRowCnt );
Point aTmpPos(aPartPos);
for (sal_Int32 a = 0; a < nRowCnt; a++)
{
- aTmpPos.X() = aPartPos.X();
+ aTmpPos.setX(aPartPos.X());
for (sal_Int32 b = 0; b < nColCnt; b++)
{
tools::Rectangle aTmpRect(aTmpPos, aPartSize);
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderHandout, aTmpRect);
- aTmpPos.X() += aPartSize.Width() + nGapX;
+ aTmpPos.AdjustX( aPartSize.Width() + nGapX );
}
- aTmpPos.Y() += aPartSize.Height() + nGapY;
+ aTmpPos.AdjustY( aPartSize.Height() + nGapY );
}
break;
}
@@ -1036,7 +1036,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
tools::Rectangle aTop(pInfo->GetPresRectangle());
aTop.setHeight(long(aTop.GetHeight() * 0.488));
tools::Rectangle aBottom(aTop);
- aBottom.Top() = long(aBottom.Top() + aBottom.GetHeight() * 1.05);
+ aBottom.SetTop(long(aBottom.Top() + aBottom.GetHeight() * 1.05));
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderVerticalTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderVerticalOutline, aTop);
@@ -1060,7 +1060,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
tools::Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
tools::Rectangle aRight(aLeft);
- aRight.Left() = long(aRight.Left() + aRight.GetWidth() * 1.05);
+ aRight.SetLeft(long(aRight.Left() + aRight.GetWidth() * 1.05));
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aLeft);
@@ -1079,11 +1079,11 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));
aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.488));
tools::Rectangle aBottomLeft(aTopLeft);
- aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);
+ aBottomLeft.SetTop(long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095));
tools::Rectangle aTopRight(aTopLeft);
- aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 1.05);
+ aTopRight.SetLeft(long(aTopRight.Left() + aTopRight.GetWidth() * 1.05));
tools::Rectangle aBottomRight(aTopRight);
- aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);
+ aBottomRight.SetTop(long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095));
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft);
@@ -1099,16 +1099,16 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));
aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.322));
tools::Rectangle aTopCenter(aTopLeft);
- aTopCenter.Left() = long(aTopCenter.Left() + aTopCenter.GetWidth() * 1.05);
+ aTopCenter.SetLeft(long(aTopCenter.Left() + aTopCenter.GetWidth() * 1.05));
tools::Rectangle aTopRight(aTopLeft);
- aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 2 * 1.05);
+ aTopRight.SetLeft(long(aTopRight.Left() + aTopRight.GetWidth() * 2 * 1.05));
tools::Rectangle aBottomLeft(aTopLeft);
- aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);
+ aBottomLeft.SetTop(long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095));
tools::Rectangle aBottomCenter(aTopCenter);
- aBottomCenter.Top() = long(aBottomCenter.Top() + aBottomCenter.GetHeight() * 1.095);
+ aBottomCenter.SetTop(long(aBottomCenter.Top() + aBottomCenter.GetHeight() * 1.095));
tools::Rectangle aBottomRight(aTopRight);
- aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);
+ aBottomRight.SetTop(long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095));
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft);
More information about the Libreoffice-commits
mailing list