diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-13 15:24:42 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-14 07:27:38 +0100 |
commit | a9ca38bdf7ff9d15529b5903e640987fc14c0fa7 (patch) | |
tree | b8b22298011bdfea9575dc8c761203d5cb54bdf1 /dbaccess | |
parent | c8e19544cdc506dfc91dbd8045da208ded7d7d2c (diff) |
loplugin:changetoolsgen in dbaccess..desktop
Change-Id: I713a320e46f93dedd11266ac12e52110d13f451a
Reviewed-on: https://gerrit.libreoffice.org/49655
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
21 files changed, 125 insertions, 125 deletions
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 8e4d3931ecc7..ab5e48ca90d4 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -1268,13 +1268,13 @@ bool OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, tools::R if ( fGrfWH < fWinWH ) { - aNewSize.Width() = static_cast<long>( aWinSize.Height() * fGrfWH ); - aNewSize.Height()= aWinSize.Height(); + aNewSize.setWidth( static_cast<long>( aWinSize.Height() * fGrfWH ) ); + aNewSize.setHeight( aWinSize.Height() ); } else { - aNewSize.Width() = aWinSize.Width(); - aNewSize.Height()= static_cast<long>( aWinSize.Width() / fGrfWH); + aNewSize.setWidth( aWinSize.Width() ); + aNewSize.setHeight( static_cast<long>( aWinSize.Width() / fGrfWH) ); } const Point aNewPos( ( aWinSize.Width() - aNewSize.Width() ) >> 1, diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 294d631cc37d..e66afd50f6af 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -150,7 +150,7 @@ void OCreationList::ExecuteSearchEntry( const void* _pEntry ) const tools::Rectangle OCreationList::GetFocusRect( SvTreeListEntry* _pEntry, long _nLine ) { tools::Rectangle aRect = SvTreeListBox::GetFocusRect( _pEntry, _nLine ); - aRect.Left() = 0; + aRect.SetLeft( 0 ); // try to let the focus rect start before the bitmap item - this looks better SvLBoxItem* pBitmapItem = _pEntry->GetFirstItem(SvLBoxItemType::ContextBmp); @@ -158,11 +158,11 @@ tools::Rectangle OCreationList::GetFocusRect( SvTreeListEntry* _pEntry, long _nL SvViewDataItem* pItemData = pBitmapItem ? GetViewDataItem( _pEntry, pBitmapItem ) : nullptr; OSL_ENSURE( pTab && pItemData, "OCreationList::GetFocusRect: could not find the first bitmap item!" ); if ( pTab && pItemData ) - aRect.Left() = pTab->GetPos() - pItemData->maSize.Width() / 2; + aRect.SetLeft( pTab->GetPos() - pItemData->maSize.Width() / 2 ); // inflate the rectangle a little bit - looks better, too - aRect.Left() = std::max< long >( 0, aRect.Left() - 2 ); - aRect.Right() = std::min< long >( GetOutputSizePixel().Width() - 1, aRect.Right() + 2 ); + aRect.SetLeft( std::max< long >( 0, aRect.Left() - 2 ) ); + aRect.SetRight( std::min< long >( GetOutputSizePixel().Width() - 1, aRect.Right() + 2 ) ); return aRect; } diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index 4a98532f7c71..c982d421ba98 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -198,15 +198,15 @@ void UnoDataBrowserView::resizeDocumentView(tools::Rectangle& _rPlayground) { // calculate the splitter pos and size aSplitPos = m_pSplitter->GetPosPixel(); - aSplitPos.Y() = aPlaygroundPos.Y(); + aSplitPos.setY( aPlaygroundPos.Y() ); aSplitSize = m_pSplitter->GetOutputSizePixel(); - aSplitSize.Height() = aPlaygroundSize.Height(); + aSplitSize.setHeight( aPlaygroundSize.Height() ); if( ( aSplitPos.X() + aSplitSize.Width() ) > ( aPlaygroundSize.Width() )) - aSplitPos.X() = aPlaygroundSize.Width() - aSplitSize.Width(); + aSplitPos.setX( aPlaygroundSize.Width() - aSplitSize.Width() ); if( aSplitPos.X() <= aPlaygroundPos.X() ) - aSplitPos.X() = aPlaygroundPos.X() + sal_Int32(aPlaygroundSize.Width() * 0.2); + aSplitPos.setX( aPlaygroundPos.X() + sal_Int32(aPlaygroundSize.Width() * 0.2) ); // the tree pos and size Point aTreeViewPos( aPlaygroundPos ); @@ -217,11 +217,11 @@ void UnoDataBrowserView::resizeDocumentView(tools::Rectangle& _rPlayground) { Size aStatusSize(aPlaygroundPos.X(), GetTextHeight() + 2); aStatusSize = LogicToPixel(aStatusSize, MapMode(MapUnit::MapAppFont)); - aStatusSize.Width() = aTreeViewSize.Width() - 2 - 2; + aStatusSize.setWidth( aTreeViewSize.Width() - 2 - 2 ); Point aStatusPos( aPlaygroundPos.X() + 2, aTreeViewPos.Y() + aTreeViewSize.Height() - aStatusSize.Height() ); m_pStatus->SetPosSizePixel( aStatusPos, aStatusSize ); - aTreeViewSize.Height() -= aStatusSize.Height(); + aTreeViewSize.setHeight( aTreeViewSize.Height() - aStatusSize.Height() ); } // set the size of treelistbox diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index b31986f2306b..73b102c0eaa6 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -96,7 +96,7 @@ namespace dbaui // position the separator const Size aSeparatorSize( aPlayground.GetWidth(), 2 ); m_aSeparator->SetPosSizePixel( aPlayground.TopLeft(), aSeparatorSize ); - aPlayground.Top() += aSeparatorSize.Height() + 1; + aPlayground.SetTop( aPlayground.Top() + aSeparatorSize.Height() + 1 ); // position the controls of the document's view resizeDocumentView( aPlayground ); diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 5fe3ed5315af..cf20acabfa4f 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -600,8 +600,8 @@ void SbaGridHeader::ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMouseP if (HEADERBAR_ITEM_NOTFOUND != nId) { tools::Rectangle aColRect = GetItemRect(nId); - aColRect.Left() += nId ? 3 : 0; // the handle col (nId == 0) does not have a left margin for resizing - aColRect.Right() -= 3; + aColRect.SetLeft( aColRect.Left() + nId ? 3 : 0 ); // the handle col (nId == 0) does not have a left margin for resizing + aColRect.SetRight( aColRect.Right() - 3 ); bResizingCol = !aColRect.IsInside(_rMousePos); } if (!bResizingCol) diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 15db79ca2fa2..4870cd10ce7d 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -415,7 +415,7 @@ sal_Int32 OFieldDescControl::GetMaxControlHeight() const { const Size aTemp(pAggregate->GetOptimalSize()); if ( aTemp.Height() > aHeight.Height() ) - aHeight.Height() = aTemp.Height(); + aHeight.setHeight( aTemp.Height() ); } } @@ -996,7 +996,7 @@ void OFieldDescControl::SetPosSize( VclPtr<Control> const & rControl, long nRow, const sal_Int32 nControlHeight = GetMaxControlHeight(); Size aSize(0,nControlHeight); if ( isRightAligned() && nCol ) - aSize.Width() = LogicToPixel(Size(m_nWidth, 0), MapMode(MapUnit::MapAppFont)).Width(); + aSize.setWidth( LogicToPixel(Size(m_nWidth, 0), MapMode(MapUnit::MapAppFont)).Width() ); else { switch( nCol ) @@ -1022,8 +1022,8 @@ void OFieldDescControl::SetPosSize( VclPtr<Control> const & rControl, long nRow, switch( nCol ) { case 0: - aPosition.X() = 0; - aPosition.Y() = 1; + aPosition.setX( 0 ); + aPosition.setY( 1 ); break; case 1: case 3: @@ -1031,21 +1031,21 @@ void OFieldDescControl::SetPosSize( VclPtr<Control> const & rControl, long nRow, if ( isRightAligned() ) { Size aOwnSize = GetSizePixel(); - aPosition.X() = aOwnSize.Width() - aSize.Width(); + aPosition.setX( aOwnSize.Width() - aSize.Width() ); } else aPosition.X() = CONTROL_WIDTH_1 + CONTROL_SPACING_X; break; default: - aPosition.X() = 0; + aPosition.setX( 0 ); } rControl->SetSizePixel( aSize ); aSize = rControl->GetSizePixel( ); const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y), MapMode(MapUnit::MapAppFont)).Height(); - aPosition.Y() += ((nRow+1)*nControl_Spacing_y) + - (nRow*nControlHeight); + aPosition.setY( aPosition.Y() + ((nRow+1)*nControl_Spacing_y) + + (nRow*nControlHeight) ); // Display Control rControl->SetPosSizePixel( aPosition, aSize ); diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx index b12b1c9be94f..b24b34c9c538 100644 --- a/dbaccess/source/ui/control/VertSplitView.cxx +++ b/dbaccess/source/ui/control/VertSplitView.cxx @@ -115,14 +115,14 @@ void OSplitterView::Resize() { aSplitPos = m_pSplitter->GetPosPixel(); aSplitSize = m_pSplitter->GetOutputSizePixel(); - aSplitPos.X() = aPlaygroundPos.X(); - aSplitSize.Width() = aPlaygroundSize.Width(); + aSplitPos.setX( aPlaygroundPos.X() ); + aSplitSize.setWidth( aPlaygroundSize.Width() ); if( ( aSplitPos.Y() + aSplitSize.Height() ) > ( aPlaygroundSize.Height() )) - aSplitPos.Y() = aPlaygroundSize.Height() - aSplitSize.Height(); + aSplitPos.setY( aPlaygroundSize.Height() - aSplitSize.Height() ); if( aSplitPos.Y() <= aPlaygroundPos.Y() ) - aSplitPos.Y() = aPlaygroundPos.Y() + sal_Int32(aPlaygroundSize.Height() * 0.3); + aSplitPos.setY( aPlaygroundPos.Y() + sal_Int32(aPlaygroundSize.Height() * 0.3) ); // the tree pos and size Point aTreeViewPos( aPlaygroundPos ); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 987bca7031a4..c8cc274a7aef 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -276,7 +276,7 @@ namespace dbaui const long _nIndentAppFont ) { Point aReference = _rReference.GetPosPixel(); - aReference.Y() += _rReference.GetSizePixel().Height(); + aReference.setY( aReference.Y() + _rReference.GetSizePixel().Height() ); const vcl::Window* pConverter = _rControl.GetParent(); Size aOffset = pConverter->LogicToPixel(Size(_nIndentAppFont, 3), MapMode(MapUnit::MapAppFont)); diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 75119429fc9c..ea8ff0306ba2 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -116,7 +116,7 @@ namespace dbaui void IndexFieldsControl::PaintCell( OutputDevice& _rDev, const tools::Rectangle& _rRect, sal_uInt16 _nColumnId ) const { Point aPos(_rRect.TopLeft()); - aPos.X() += 1; + aPos.setX( aPos.X() + 1 ); OUString aText = GetRowCellText(m_aSeekRow,_nColumnId); Size TxtSize(GetDataWindow().GetTextWidth(aText), GetDataWindow().GetTextHeight()); diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 8710328989d7..73c8dfd8633d 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -479,7 +479,7 @@ void OSQLMessageBox::impl_positionControls() if ( bHaveSecondaryText ) aSecondaryRect = GetTextRect( aSecondaryRect, sSecondary, DrawTextFlags::WordBreak | DrawTextFlags::MultiLine | DrawTextFlags::Left ); else - aSecondaryRect.Bottom() = aSecondaryRect.Top() - 1; + aSecondaryRect.SetBottom( aSecondaryRect.Top() - 1 ); // adjust secondary control height accordingly m_aMessage->SetSizePixel( aSecondaryRect.GetSize() ); @@ -489,8 +489,8 @@ void OSQLMessageBox::impl_positionControls() if ( !bHaveSecondaryText ) { // then give the primary text as much horizontal space as it needs tools::Rectangle aSuggestedRect( GetTextRect( aPrimaryRect, sPrimary, DrawTextFlags::WordBreak | DrawTextFlags::MultiLine | DrawTextFlags::Center ) ); - aPrimaryRect.Right() = aPrimaryRect.Left() + aSuggestedRect.GetWidth(); - aPrimaryRect.Bottom() = aPrimaryRect.Top() + aSuggestedRect.GetHeight(); + aPrimaryRect.SetRight( aPrimaryRect.Left() + aSuggestedRect.GetWidth() ); + aPrimaryRect.SetBottom( aPrimaryRect.Top() + aSuggestedRect.GetHeight() ); // and center it horizontally m_aTitle->SetStyle( ( m_aTitle->GetStyle() & ~WB_LEFT ) | WB_CENTER ); @@ -498,7 +498,7 @@ void OSQLMessageBox::impl_positionControls() // also, if it's not as high as the image ... if ( aPrimaryRect.GetHeight() < m_aInfoImage->GetSizePixel().Height() ) { // ... make it fit the image height - aPrimaryRect.Bottom() += aInfoRect.GetHeight() - aPrimaryRect.GetHeight(); + aPrimaryRect.SetBottom( aPrimaryRect.Bottom() + aInfoRect.GetHeight() - aPrimaryRect.GetHeight() ); // and center it vertically m_aTitle->SetStyle( m_aTitle->GetStyle() | WB_VCENTER ); } @@ -515,8 +515,8 @@ void OSQLMessageBox::impl_positionControls() const tools::Rectangle& rBottomTextRect( bHaveSecondaryText ? aSecondaryRect : aPrimaryRect ); Size aBorderSize = LogicToPixel(Size(OUTER_MARGIN, OUTER_MARGIN), MapMode(MapUnit::MapAppFont)); Size aDialogSize( LogicToPixel(Size(DIALOG_WIDTH, 30), MapMode(MapUnit::MapAppFont))); - aDialogSize.Height() = rBottomTextRect.Bottom() + aBorderSize.Height(); - aDialogSize.Width() = aPrimaryRect.Right() + aBorderSize.Width(); + aDialogSize.setHeight( rBottomTextRect.Bottom() + aBorderSize.Height() ); + aDialogSize.setWidth( aPrimaryRect.Right() + aBorderSize.Width() ); SetSizePixel( aDialogSize ); SetPageSizePixel( aDialogSize ); diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index f96e6b9fd822..fccb5260b191 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -965,9 +965,9 @@ void adjustToolBoxSize(ToolBox* _pToolBox) Size aOldSize = _pToolBox->GetSizePixel(); Size aSize = _pToolBox->CalcWindowSizePixel(); if ( !aSize.Width() ) - aSize.Width() = aOldSize.Width(); + aSize.setWidth( aOldSize.Width() ); else if ( !aSize.Height() ) - aSize.Height() = aOldSize.Height(); + aSize.setHeight( aOldSize.Height() ); Size aTbSize = _pToolBox->GetSizePixel(); if ( (aSize.Width() && aSize.Width() != aTbSize.Width()) || diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx index 9c276b804bec..8e8569db5e39 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx @@ -56,17 +56,17 @@ namespace if ( pListBox ) { const long nRowHeight = pListBox->GetEntryHeight(); - aReturn.Top() = _aConnPos.Y() - nRowHeight; - aReturn.Bottom() = aReturn.Top() + nRowHeight; + aReturn.SetTop( _aConnPos.Y() - nRowHeight ); + aReturn.SetBottom( aReturn.Top() + nRowHeight ); if (_aDescrLinePos.X() < _aConnPos.X()) { - aReturn.Left() = _aDescrLinePos.X(); - aReturn.Right() = aReturn.Left() + _aConnPos.X() - _aDescrLinePos.X(); + aReturn.SetLeft( _aDescrLinePos.X() ); + aReturn.SetRight( aReturn.Left() + _aConnPos.X() - _aDescrLinePos.X() ); } else { - aReturn.Left() = _aConnPos.X(); - aReturn.Right() = aReturn.Left() + _aDescrLinePos.X() - _aConnPos.X(); + aReturn.SetLeft( _aConnPos.X() ); + aReturn.SetRight( aReturn.Left() + _aDescrLinePos.X() - _aConnPos.X() ); } } @@ -81,29 +81,29 @@ namespace void calcPointsYValue(const OTableWindow* _pWin,SvTreeListEntry* _pEntry,Point& _rNewConPos,Point& _rNewDescrPos) { const OTableWindowListBox* pListBox = _pWin->GetListBox(); - _rNewConPos.Y() = _pWin->GetPosPixel().Y(); + _rNewConPos.setY( _pWin->GetPosPixel().Y() ); if ( _pEntry ) { const long nRowHeight = pListBox->GetEntryHeight(); - _rNewConPos.Y() += pListBox->GetPosPixel().Y(); + _rNewConPos.setY( _rNewConPos.Y() + pListBox->GetPosPixel().Y() ); long nEntryPos = pListBox->GetEntryPosition( _pEntry ).Y(); if( nEntryPos >= 0 ) { - _rNewConPos.Y() += nEntryPos; + _rNewConPos.setY( _rNewConPos.Y() + nEntryPos ); _rNewConPos.Y() += static_cast<long>( 0.5 * nRowHeight ); } else - _rNewConPos.Y() -= static_cast<long>( 0.5 * nRowHeight ); + _rNewConPos.setY( _rNewConPos.Y() - static_cast<long>( 0.5 * nRowHeight ) ); long nListBoxBottom = _pWin->GetPosPixel().Y() + pListBox->GetPosPixel().Y() + pListBox->GetSizePixel().Height(); if( _rNewConPos.Y() > nListBoxBottom ) - _rNewConPos.Y() = nListBoxBottom + 2; + _rNewConPos.setY( nListBoxBottom + 2 ); } else - _rNewConPos.Y() += static_cast<sal_Int32>(pListBox->GetPosPixel().Y()*0.5); + _rNewConPos.setY( _rNewConPos.Y() + static_cast<sal_Int32>(pListBox->GetPosPixel().Y()*0.5) ); _rNewDescrPos.Y() = _rNewConPos.Y(); } @@ -157,24 +157,24 @@ tools::Rectangle OConnectionLine::GetBoundingRect() if( m_aSourceDescrLinePos.Y() <= m_aDestDescrLinePos.Y() ) { - aTopLeft.Y() = m_aSourceDescrLinePos.Y(); - aBottomRight.Y() = m_aDestDescrLinePos.Y(); + aTopLeft.setY( m_aSourceDescrLinePos.Y() ); + aBottomRight.setY( m_aDestDescrLinePos.Y() ); } else { - aTopLeft.Y() = m_aDestDescrLinePos.Y(); - aBottomRight.Y() = m_aSourceDescrLinePos.Y(); + aTopLeft.setY( m_aDestDescrLinePos.Y() ); + aBottomRight.setY( m_aSourceDescrLinePos.Y() ); } if( m_aSourceDescrLinePos.X() <= m_aDestDescrLinePos.X() ) { - aTopLeft.X() = m_aSourceDescrLinePos.X(); - aBottomRight.X() = m_aDestDescrLinePos.X(); + aTopLeft.setX( m_aSourceDescrLinePos.X() ); + aBottomRight.setX( m_aDestDescrLinePos.X() ); } else { - aTopLeft.X() = m_aDestDescrLinePos.X(); - aBottomRight.X() = m_aSourceDescrLinePos.X(); + aTopLeft.setX( m_aDestDescrLinePos.X() ); + aBottomRight.setX( m_aSourceDescrLinePos.X() ); } const OTableWindow* pSourceWin = m_pTabConn->GetSourceWin(); @@ -182,7 +182,7 @@ tools::Rectangle OConnectionLine::GetBoundingRect() // line proceeds in z-Form if( pSourceWin == pDestWin || std::abs(m_aSourceConnPos.X() - m_aDestConnPos.X()) > std::abs(m_aSourceDescrLinePos.X() - m_aDestDescrLinePos.X()) ) { - aTopLeft.X() -= DESCRIPT_LINE_WIDTH; + aTopLeft.setX( aTopLeft.X() - DESCRIPT_LINE_WIDTH ); aBottomRight.X() += DESCRIPT_LINE_WIDTH; } @@ -193,16 +193,16 @@ tools::Rectangle OConnectionLine::GetBoundingRect() void calcPointX1(const OTableWindow* _pWin,Point& _rNewConPos,Point& _rNewDescrPos) { - _rNewConPos.X() = _pWin->GetPosPixel().X() + _pWin->GetSizePixel().Width(); - _rNewDescrPos.X() = _rNewConPos.X(); - _rNewConPos.X() += DESCRIPT_LINE_WIDTH; + _rNewConPos.setX( _pWin->GetPosPixel().X() + _pWin->GetSizePixel().Width() ); + _rNewDescrPos.setX( _rNewConPos.X() ); + _rNewConPos.setX( _rNewConPos.X() + DESCRIPT_LINE_WIDTH ); } void calcPointX2(const OTableWindow* _pWin,Point& _rNewConPos,Point& _rNewDescrPos) { - _rNewConPos.X() = _pWin->GetPosPixel().X(); - _rNewDescrPos.X() = _rNewConPos.X(); - _rNewConPos.X() -= DESCRIPT_LINE_WIDTH; + _rNewConPos.setX( _pWin->GetPosPixel().X() ); + _rNewDescrPos.setX( _rNewConPos.X() ); + _rNewConPos.setX( _rNewConPos.X() - DESCRIPT_LINE_WIDTH ); } bool OConnectionLine::RecalcLine() @@ -221,8 +221,8 @@ bool OConnectionLine::RecalcLine() Point aSourceCenter( 0, 0 ); Point aDestCenter( 0, 0 ); - aSourceCenter.X() = pSourceWin->GetPosPixel().X() + static_cast<long>( 0.5*pSourceWin->GetSizePixel().Width() ); - aDestCenter.X() = pDestWin->GetPosPixel().X() + static_cast<long>( 0.5*pDestWin->GetSizePixel().Width() ); + aSourceCenter.setX( pSourceWin->GetPosPixel().X() + static_cast<long>( 0.5*pSourceWin->GetSizePixel().Width() ) ); + aDestCenter.setX( pDestWin->GetPosPixel().X() + static_cast<long>( 0.5*pDestWin->GetSizePixel().Width() ) ); const OTableWindow* pFirstWin = pDestWin; const OTableWindow* pSecondWin = pSourceWin; @@ -300,8 +300,8 @@ double dist_Euklid(const Point &p1, const Point& p2,const Point& pM, Point& q) double l = (v.X() * w.Y() - v.Y() * w.X()) / a; double a2 = w.X()*v.X()+w.Y()*v.Y(); a = a2 / (a * a); - q.X() = long(p1.X() + a * v.X()); - q.Y() = long(p1.Y() + a * v.Y()); + q.setX( long(p1.X() + a * v.X()) ); + q.setY( long(p1.Y() + a * v.Y()) ); return l; } @@ -336,7 +336,7 @@ tools::Rectangle OConnectionLine::GetDestTextPos() const Point OConnectionLine::getMidPoint() const { Point aDest = m_aDestConnPos - m_aSourceConnPos; - aDest.X() /= 2; + aDest.setX( aDest.X() / 2 ); aDest.Y() /= 2; return m_aSourceConnPos + aDest; diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 7abab13dc14f..b71b77b931c2 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -192,7 +192,7 @@ void OJoinController::SaveTabWinPosSize(OTableWindow const * pTabWin, long nOffs // set Position & Size of data anew (with current window parameters) Point aPos = pTabWin->GetPosPixel(); - aPos.X() += nOffsetX; + aPos.setX( aPos.X() + nOffsetX ); aPos.Y() += nOffsetY; pData->SetPosition(aPos); pData->SetSize(pTabWin->GetSizePixel()); @@ -378,9 +378,9 @@ void OJoinController::loadTableWindow( const ::comphelper::NamedValueCollection& pData->ShowAll(bShowAll); m_vTableData.push_back(pData); if ( m_aMinimumTableViewSize.X() < (nX+nWidth) ) - m_aMinimumTableViewSize.X() = (nX+nWidth); + m_aMinimumTableViewSize.setX( nX+nWidth ); if ( m_aMinimumTableViewSize.Y() < (nY+nHeight) ) - m_aMinimumTableViewSize.Y() = (nY+nHeight); + m_aMinimumTableViewSize.setY( nY+nHeight ); } } diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index f218e2ba0c6a..db24e13de26e 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -217,8 +217,8 @@ void OJoinTableView::Resize() return; // we have at least one table so resize it - m_aScrollOffset.X() = GetHScrollBar().GetThumbPos(); - m_aScrollOffset.Y() = GetVScrollBar().GetThumbPos(); + m_aScrollOffset.setX( GetHScrollBar().GetThumbPos() ); + m_aScrollOffset.setY( GetVScrollBar().GetThumbPos() ); VclPtr<OTableWindow> pCheck = m_aTableMap.begin()->second; Point aRealPos = pCheck->GetPosPixel(); @@ -532,8 +532,8 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin ) // determine rectangle for the corresponding line tools::Rectangle aRowRect( Point(0,0), aOutSize ); - aRowRect.Top() = nRow * ( TABWIN_SPACING_Y + TABWIN_HEIGHT_STD ); - aRowRect.Bottom() = (nRow+1) * ( TABWIN_SPACING_Y + TABWIN_HEIGHT_STD ); + aRowRect.SetTop( nRow * ( TABWIN_SPACING_Y + TABWIN_HEIGHT_STD ) ); + aRowRect.SetBottom( (nRow+1) * ( TABWIN_SPACING_Y + TABWIN_HEIGHT_STD ) ); // check occupied areas of this line OTableWindowMap::const_iterator aIter = m_aTableMap.begin(); @@ -567,7 +567,7 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin ) // insert it in the first row sal_Int32 nCount = m_aTableMap.size() % (nRow+1); ++nCount; - aNewPos.Y() = nCount * TABWIN_SPACING_Y + (nCount-1)*CalcZoom(TABWIN_HEIGHT_STD); + aNewPos.setY( nCount * TABWIN_SPACING_Y + (nCount-1)*CalcZoom(TABWIN_HEIGHT_STD) ); bEnd = true; } else @@ -581,7 +581,7 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin ) // check if the new position in inside the scrollbars ranges Point aBottom(aNewPos); - aBottom.X() += aNewSize.Width(); + aBottom.setX( aBottom.X() + aNewSize.Width() ); aBottom.Y() += aNewSize.Height(); if(!GetHScrollBar().GetRange().IsInside(aBottom.X())) @@ -692,9 +692,9 @@ bool OJoinTableView::ScrollPane( long nDelta, bool bHoriz, bool bPaintScrollBars // set ScrollOffset anew if (bHoriz) - m_aScrollOffset.X() = GetHScrollBar().GetThumbPos(); + m_aScrollOffset.setX( GetHScrollBar().GetThumbPos() ); else - m_aScrollOffset.Y() = GetVScrollBar().GetThumbPos(); + m_aScrollOffset.setY( GetVScrollBar().GetThumbPos() ); // move all windows OTableWindow* pTabWin; @@ -708,8 +708,8 @@ bool OJoinTableView::ScrollPane( long nDelta, bool bHoriz, bool bPaintScrollBars aPos = pTabWin->GetPosPixel(); if( bHoriz ) - aPos.X() -= nDelta; - else aPos.Y() -= nDelta; + aPos.setX( aPos.X() - nDelta ); + else aPos.setY( aPos.Y() - nDelta ); pTabWin->SetPosPixel( aPos ); } @@ -735,17 +735,17 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt ) Point aDragWinPos = rTEvt.GetMouseEvent().GetPosPixel() - m_aDragOffset; Size aDragWinSize = m_pDragWin->GetSizePixel(); if( aDragWinPos.X() < 0 ) - aDragWinPos.X() = 0; + aDragWinPos.setX( 0 ); if( aDragWinPos.Y() < 0 ) - aDragWinPos.Y() = 0; + aDragWinPos.setY( 0 ); if( (aDragWinPos.X() + aDragWinSize.Width()) > m_aOutputSize.Width() ) - aDragWinPos.X() = m_aOutputSize.Width() - aDragWinSize.Width() - 1; + aDragWinPos.setX( m_aOutputSize.Width() - aDragWinSize.Width() - 1 ); if( (aDragWinPos.Y() + aDragWinSize.Height()) > m_aOutputSize.Height() ) - aDragWinPos.Y() = m_aOutputSize.Height() - aDragWinSize.Height() - 1; + aDragWinPos.setY( m_aOutputSize.Height() - aDragWinSize.Height() - 1 ); if( aDragWinPos.X() < 0 ) - aDragWinPos.X() = 0; + aDragWinPos.setX( 0 ); if( aDragWinPos.Y() < 0 ) - aDragWinPos.Y() = 0; + aDragWinPos.setY( 0 ); // TODO : don't position window anew, if it is leaving range, but just expand the range // position window @@ -1026,7 +1026,7 @@ void OJoinTableView::ScrollWhileDragging() { bScrolling = ScrollPane( -LINE_SIZE, true, true ); if( !bScrolling && (aDragWinPos.X()<0) ) - aDragWinPos.X() = 0; + aDragWinPos.setX( 0 ); // do I need further (timer controlled) scrolling ? bNeedScrollTimer = bScrolling && (aDragWinPos.X() < 5); @@ -1036,7 +1036,7 @@ void OJoinTableView::ScrollWhileDragging() { bScrolling = ScrollPane( LINE_SIZE, true, true ) ; if( !bScrolling && ( aLowerRight.X() > m_aOutputSize.Width() ) ) - aDragWinPos.X() = m_aOutputSize.Width() - aDragWinSize.Width(); + aDragWinPos.setX( m_aOutputSize.Width() - aDragWinSize.Width() ); // do I need further (timer controlled) scrolling ? bNeedScrollTimer = bScrolling && (aLowerRight.X() > m_aOutputSize.Width() - 5); @@ -1046,7 +1046,7 @@ void OJoinTableView::ScrollWhileDragging() { bScrolling = ScrollPane( -LINE_SIZE, false, true ); if( !bScrolling && (aDragWinPos.Y()<0) ) - aDragWinPos.Y() = 0; + aDragWinPos.setY( 0 ); bNeedScrollTimer = bScrolling && (aDragWinPos.Y() < 5); } @@ -1055,7 +1055,7 @@ void OJoinTableView::ScrollWhileDragging() { bScrolling = ScrollPane( LINE_SIZE, false, true ); if( !bScrolling && ( (aDragWinPos.Y() + aDragWinSize.Height()) > m_aOutputSize.Height() ) ) - aDragWinPos.Y() = m_aOutputSize.Height() - aDragWinSize.Height(); + aDragWinPos.setY( m_aOutputSize.Height() - aDragWinSize.Height() ); bNeedScrollTimer = bScrolling && (aLowerRight.Y() > m_aOutputSize.Height() - 5); } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 15b0d430fba6..8a0f82fd05d3 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2530,10 +2530,10 @@ void OQueryDesignView::resizeDocumentView(tools::Rectangle& _rPlayground) Size aSplitSize( _rPlayground.GetSize().Width(), m_aSplitter->GetSizePixel().Height() ); if( ( aSplitPos.Y() + aSplitSize.Height() ) > ( aPlaygroundSize.Height() )) - aSplitPos.Y() = aPlaygroundSize.Height() - aSplitSize.Height(); + aSplitPos.setY( aPlaygroundSize.Height() - aSplitSize.Height() ); if( aSplitPos.Y() <= aPlaygroundPos.Y() ) - aSplitPos.Y() = aPlaygroundPos.Y() + sal_Int32(aPlaygroundSize.Height() * 0.2); + aSplitPos.setY( aPlaygroundPos.Y() + sal_Int32(aPlaygroundSize.Height() * 0.2) ); // position the table Size aTableViewSize(aPlaygroundSize.Width(), aSplitPos.Y() - aPlaygroundPos.Y()); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 07d27d06147c..8887e8d1ae63 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -345,7 +345,7 @@ void OSelectionBrowseBox::Init() { const Size aTemp(pControl->GetOptimalSize()); if ( aTemp.Height() > aHeight.Height() ) - aHeight.Height() = aTemp.Height(); + aHeight.setHeight( aTemp.Height() ); } SetDataRowHeight(aHeight.Height()); SetTitleLines(1); @@ -1231,7 +1231,7 @@ void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const tools::Rectangle& void OSelectionBrowseBox::PaintStatusCell(OutputDevice& rDev, const tools::Rectangle& rRect) const { tools::Rectangle aRect(rRect); - aRect.TopLeft().Y() -= 2; + aRect.TopLeft().setY( aRect.TopLeft().Y() - 2 ); OUString aLabel(DBA_RES(STR_QUERY_HANDLETEXT)); // from BROW_CRIT2_ROW onwards all rows are shown "or" @@ -1466,7 +1466,7 @@ tools::Rectangle OSelectionBrowseBox::GetInvalidRect( sal_uInt16 nColId ) // now update the left side tools::Rectangle aFieldRect(GetCellRect( 0, nColId )); // used instead of GetFieldRectPixel - aInvalidRect.Left() = aFieldRect.Left(); + aInvalidRect.SetLeft( aFieldRect.Left() ); return aInvalidRect; } @@ -1896,7 +1896,7 @@ Size OSelectionBrowseBox::CalcOptimalSize( const Size& _rAvailable ) { Size aReturn( _rAvailable.Width(), GetTitleHeight() ); - aReturn.Height() += ( m_nVisibleCount ? m_nVisibleCount : 15 ) * GetDataRowHeight(); + aReturn.setHeight( aReturn.Height() + ( m_nVisibleCount ? m_nVisibleCount : 15 ) * GetDataRowHeight() ); aReturn.Height() += 40; // just some space return aReturn; diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx index e08020f1ff12..17724bf13ea4 100644 --- a/dbaccess/source/ui/querydesign/TableConnection.cxx +++ b/dbaccess/source/ui/querydesign/TableConnection.cxx @@ -158,7 +158,7 @@ namespace dbaui void OTableConnection::InvalidateConnection() { tools::Rectangle rcBounding = GetBoundingRect(); - rcBounding.Bottom() += 1; + rcBounding.SetBottom( rcBounding.Bottom() + 1 ); rcBounding.Right() += 1; // I believe Invalidate and Draw(Rectangle) do not behave consistent: in any case it // could explain, why without the fake here when deleting a connection a dash remains at the lower end: diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 7e372a0c848a..d6752877f62d 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -340,33 +340,33 @@ tools::Rectangle OTableWindow::getSizingRect(const Point& _rPos,const Size& _rOu if( m_nSizingFlags & SizingFlags::Top ) { if( _rPos.Y() < 0 ) - aSizingRect.Top() = 0; + aSizingRect.SetTop( 0 ); else - aSizingRect.Top() = _rPos.Y(); + aSizingRect.SetTop( _rPos.Y() ); } if( m_nSizingFlags & SizingFlags::Bottom ) { if( _rPos.Y() > _rOutputSize.Height() ) - aSizingRect.Bottom() = _rOutputSize.Height(); + aSizingRect.SetBottom( _rOutputSize.Height() ); else - aSizingRect.Bottom() = _rPos.Y(); + aSizingRect.SetBottom( _rPos.Y() ); } if( m_nSizingFlags & SizingFlags::Right ) { if( _rPos.X() > _rOutputSize.Width() ) - aSizingRect.Right() = _rOutputSize.Width(); + aSizingRect.SetRight( _rOutputSize.Width() ); else - aSizingRect.Right() = _rPos.X(); + aSizingRect.SetRight( _rPos.X() ); } if( m_nSizingFlags & SizingFlags::Left ) { if( _rPos.X() < 0 ) - aSizingRect.Left() = 0; + aSizingRect.SetLeft( 0 ); else - aSizingRect.Left() = _rPos.X(); + aSizingRect.SetLeft( _rPos.X() ); } return aSizingRect; } @@ -609,27 +609,27 @@ bool OTableWindow::PreNotify(NotifyEvent& rNEvt) Point aStartPoint = GetPosPixel(); if ( rCode.IsShift() ) { - aStartPoint.X() = GetSizePixel().Width(); - aStartPoint.Y() = GetSizePixel().Height(); + aStartPoint.setX( GetSizePixel().Width() ); + aStartPoint.setY( GetSizePixel().Height() ); } switch( rCode.GetCode() ) { case KEY_DOWN: bHandled = true; - aStartPoint.Y() += m_nMoveIncrement; + aStartPoint.setY( aStartPoint.Y() + m_nMoveIncrement ); break; case KEY_UP: bHandled = true; - aStartPoint.Y() += -m_nMoveIncrement; + aStartPoint.setY( aStartPoint.Y() + -m_nMoveIncrement ); break; case KEY_LEFT: bHandled = true; - aStartPoint.X() += -m_nMoveIncrement; + aStartPoint.setX( aStartPoint.X() + -m_nMoveIncrement ); break; case KEY_RIGHT: bHandled = true; - aStartPoint.X() += m_nMoveIncrement; + aStartPoint.setX( aStartPoint.X() + m_nMoveIncrement ); break; } if ( bHandled ) diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx index dcf9bbedbc78..31573c33d181 100644 --- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx @@ -89,11 +89,11 @@ void OTableWindowTitle::RequestHelp( const HelpEvent& rHEvt ) tools::Rectangle aItemRect(Point(0,0),GetSizePixel()); aItemRect = LogicToPixel( aItemRect ); Point aPt = OutputToScreenPixel( aItemRect.TopLeft() ); - aItemRect.Left() = aPt.X(); - aItemRect.Top() = aPt.Y(); + aItemRect.SetLeft( aPt.X() ); + aItemRect.SetTop( aPt.Y() ); aPt = OutputToScreenPixel( aItemRect.BottomRight() ); - aItemRect.Right() = aPt.X(); - aItemRect.Bottom() = aPt.Y(); + aItemRect.SetRight( aPt.X() ); + aItemRect.SetBottom( aPt.Y() ); if( rHEvt.GetMode() == HelpEventMode::BALLOON ) Help::ShowBalloon( this, aItemRect.Center(), aItemRect, aHelpText); else @@ -133,7 +133,7 @@ void OTableWindowTitle::MouseButtonDown( const MouseEvent& rEvt ) Size aSize(GetTextWidth(GetText()) + 20, m_pTabWin->GetSizePixel().Height() - m_pTabWin->GetListBox()->GetSizePixel().Height()); - aSize.Height() += (m_pTabWin->GetListBox()->GetEntryCount() + 2) * m_pTabWin->GetListBox()->GetEntryHeight(); + aSize.setHeight( aSize.Height() + (m_pTabWin->GetListBox()->GetEntryCount() + 2) * m_pTabWin->GetListBox()->GetEntryHeight() ); if(m_pTabWin->GetSizePixel() != aSize) { m_pTabWin->SetSizePixel(aSize); diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index b22ceb332ad9..909c69af0261 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -97,13 +97,13 @@ namespace dbaui // calc pos and size of the splitter Point aSplitPos = m_pSplitter->GetPosPixel(); Size aSplitSize = m_pSplitter->GetOutputSizePixel(); - aSplitSize.Width() = aPlayground.GetWidth(); + aSplitSize.setWidth( aPlayground.GetWidth() ); if ( aSplitPos.Y() <= aPlayground.Top() ) - aSplitPos.Y() = aPlayground.Top() + sal_Int32( aPlayground.GetHeight() * 0.2 ); + aSplitPos.setY( aPlayground.Top() + sal_Int32( aPlayground.GetHeight() * 0.2 ) ); if ( aSplitPos.Y() + aSplitSize.Height() > aPlayground.GetHeight() ) - aSplitPos.Y() = aPlayground.GetHeight() - aSplitSize.Height(); + aSplitPos.setY( aPlayground.GetHeight() - aSplitSize.Height() ); // set pos and size of the splitter m_pSplitter->SetPosSizePixel( aSplitPos, aSplitSize ); @@ -114,7 +114,7 @@ namespace dbaui m_pBeamer->SetPosSizePixel( aPlayground.TopLeft(), aBeamerSize ); // shrink the playground by the size which is occupied by the beamer - aPlayground.Top() = aSplitPos.Y() + aSplitSize.Height(); + aPlayground.SetTop( aSplitPos.Y() + aSplitSize.Height() ); } ODataView::resizeAll( aPlayground ); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 1126b11fe4be..db033510843d 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -233,7 +233,7 @@ void OTableEditorCtrl::InitCellController() { const Size aTemp(pControl->GetOptimalSize()); if ( aTemp.Height() > aHeight.Height() ) - aHeight.Height() = aTemp.Height(); + aHeight.setHeight( aTemp.Height() ); } SetDataRowHeight(aHeight.Height()); |