diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-11-29 10:22:33 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-11-29 10:22:33 +0100 |
| commit | 361c6eb18c9ba4043652ba91036094379aeaf05f (patch) | |
| tree | d1e610a5cb59c0d7a2f467b4d7b9675cc7b658e9 /reportdesign | |
| parent | 603bca03c1b546d627fa7c6fe33021690ce374c5 (diff) | |
Use Size::Width/Height instead of inherited Pair::A/B
Change-Id: Ie0346d5ec054fbe7eff1d4b73814a5e2b9f654c2
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/core/sdr/RptObject.cxx | 16 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportSection.cxx | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 32a7b77a54c0..fda99cebfab8 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -505,8 +505,8 @@ void OCustomShape::NbcMove( const Size& rSize ) { OReportModel* pRptModel = static_cast<OReportModel*>(GetModel()); OXUndoEnvironment::OUndoEnvLock aLock(pRptModel->GetUndoEnv()); - m_xReportComponent->setPositionX(m_xReportComponent->getPositionX() + rSize.A()); - m_xReportComponent->setPositionY(m_xReportComponent->getPositionY() + rSize.B()); + m_xReportComponent->setPositionX(m_xReportComponent->getPositionX() + rSize.Width()); + m_xReportComponent->setPositionY(m_xReportComponent->getPositionY() + rSize.Height()); } // set geometry properties @@ -677,12 +677,12 @@ void OUnoObject::NbcMove( const Size& rSize ) OXUndoEnvironment::OUndoEnvLock aLock(pRptModel->GetUndoEnv()); // LLA: why there exists getPositionX and getPositionY and NOT getPosition() which return a Point? - int nNewX = m_xReportComponent->getPositionX() + rSize.A(); + int nNewX = m_xReportComponent->getPositionX() + rSize.Width(); m_xReportComponent->setPositionX(nNewX); - int nNewY = m_xReportComponent->getPositionY() + rSize.B(); + int nNewY = m_xReportComponent->getPositionY() + rSize.Height(); if (nNewY < 0 && !bUndoMode) { - aUndoSize.B() = abs(nNewY); + aUndoSize.Height() = abs(nNewY); bPositionFixed = true; nNewY = 0; } @@ -957,17 +957,17 @@ void OOle2Obj::NbcMove( const Size& rSize ) OXUndoEnvironment::OUndoEnvLock aLock(pRptModel->GetUndoEnv()); // LLA: why there exists getPositionX and getPositionY and NOT getPosition() which return a Point? - int nNewX = m_xReportComponent->getPositionX() + rSize.A(); + int nNewX = m_xReportComponent->getPositionX() + rSize.Width(); // can this hinder us to set components outside the area? // if (nNewX < 0) // { // nNewX = 0; // } m_xReportComponent->setPositionX(nNewX); - int nNewY = m_xReportComponent->getPositionY() + rSize.B(); + int nNewY = m_xReportComponent->getPositionY() + rSize.Height(); if (nNewY < 0 && !bUndoMode) { - aUndoSize.B() = abs(nNewY); + aUndoSize.Height() = abs(nNewY); bPositionFixed = true; nNewY = 0; } diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index bf8687340a6b..b93988ea6477 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -202,8 +202,8 @@ void OReportSection::fill() m_pView->SetGridFine(aGridSizeFine); // #i93595# set snap grid width to snap to all existing subdivisions - const Fraction aX(aGridSizeFine.A()); - const Fraction aY(aGridSizeFine.B()); + const Fraction aX(aGridSizeFine.Width()); + const Fraction aY(aGridSizeFine.Height()); m_pView->SetSnapGridWidth(aX, aY); m_pView->SetGridSnap( true ); |