diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-05-15 20:37:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-15 20:37:13 +0100 |
| commit | 78123a504b5215d061935d7b2771ba51e68cae0e (patch) | |
| tree | d20a1fc1742aa9851b27db01114ccae92e065690 /sw/source/core/draw | |
| parent | d278cc769e484b0452b1fb6000e213561d8d955d (diff) | |
Resolves: fdo#64584 revert convert Point::X/Y to Point::set/getX/Y
This reverts commit 69c52bc5b7973a2e414209470f5bf9b66dcc4f30
I found one place where Y should have been X, but didn't clear
the problem, so threw my hat at it and reverted the lot, its
cosmetic anyway so no functionality lost be reverting.
Diffstat (limited to 'sw/source/core/draw')
| -rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/draw/dpage.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/draw/dview.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 18337b209e28..0733af1ccd8e 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -879,8 +879,8 @@ SdrObject* SwVirtFlyDrawObj::CheckMacroHit( const SdrObjMacroHitRec& rRec ) cons if( aRect.IsInside( rRec.aPos ) ) { - aRect.Pos().setX(aRect.Pos().getX() + rRec.nTol); - aRect.Pos().setY(aRect.Pos().getY() + rRec.nTol); + aRect.Pos().X() += rRec.nTol; + aRect.Pos().Y() += rRec.nTol; aRect.SSize().Height()-= 2 * rRec.nTol; aRect.SSize().Width() -= 2 * rRec.nTol; diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index ff1fcde712a6..cee0e0dabaa2 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -167,8 +167,8 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView, // without MapMode-Offset, without Offset, w ... !!!!! aPt = pWindow->LogicToPixel( aPt, MapMode( MAP_TWIP ) ); - ((( sTxt += '?' ) += OUString::number( aPt.getX() )) - += ',' ) += OUString::number( aPt.getY() ); + ((( sTxt += '?' ) += OUString::number( aPt.X() )) + += ',' ) += OUString::number( aPt.Y() ); } } diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 6cbd572ee37a..694f91521117 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -730,7 +730,7 @@ const SwFrm* SwDrawView::CalcAnchor() } else if ( !bFly ) { - const SwRect aRect( aPt.getX(), aPt.getY(), 1, 1 ); + const SwRect aRect( aPt.X(), aPt.Y(), 1, 1 ); SwDrawContact* pContact = (SwDrawContact*)GetUserCall(pObj); if ( pContact->GetAnchorFrm( pObj ) && |