accessibility/source/extended/AccessibleGridControlHeader.cxx | 8 - chart2/source/controller/accessibility/AccessibleBase.cxx | 2 chart2/source/controller/main/ChartController_Window.cxx | 6 chart2/source/controller/main/PositionAndSizeHelper.cxx | 38 ++-- dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx | 2 desktop/source/lib/init.cxx | 2 drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 4 filter/source/msfilter/msdffimp.cxx | 8 - framework/source/layoutmanager/toolbarlayoutmanager.cxx | 80 +++++----- include/tools/gen.hxx | 13 - oox/source/export/shapes.cxx | 4 oox/source/export/vmlexport.cxx | 2 reportdesign/source/core/sdr/RptObject.cxx | 4 reportdesign/source/ui/misc/UITools.cxx | 6 reportdesign/source/ui/report/ReportController.cxx | 2 reportdesign/source/ui/report/ReportSection.cxx | 18 +- reportdesign/source/ui/report/ViewsWindow.cxx | 36 ++-- sc/qa/unit/filters-test.cxx | 12 - sc/qa/unit/jumbosheets-test.cxx | 8 - sc/qa/unit/subsequent_filters_test.cxx | 4 sc/source/filter/xml/xmlexprt.cxx | 12 - sc/source/ui/view/tabview.cxx | 2 sc/source/ui/view/tabview3.cxx | 4 sd/qa/unit/misc-tests.cxx | 2 sd/qa/unit/tiledrendering/tiledrendering.cxx | 28 +-- sd/source/ui/accessibility/AccessiblePageShape.cxx | 4 sd/source/ui/animations/CustomAnimationList.cxx | 2 sd/source/ui/dlg/headerfooterdlg.cxx | 4 sd/source/ui/table/tablefunction.cxx | 8 - sd/source/ui/unoidl/unomodel.cxx | 2 sd/source/ui/view/drviewsh.cxx | 4 sfx2/source/control/recentdocsview.cxx | 2 sfx2/source/control/thumbnailviewitem.cxx | 6 slideshow/source/engine/rehearsetimingsactivity.cxx | 4 svl/source/items/rectitem.cxx | 8 - svtools/source/control/tabbar.cxx | 6 svx/source/accessibility/AccessibleShape.cxx | 4 svx/source/customshapes/EnhancedCustomShape3d.cxx | 8 - svx/source/sdr/contact/viewcontactofe3dscene.cxx | 4 svx/source/sdr/properties/defaultproperties.cxx | 4 svx/source/svdraw/svdedtv1.cxx | 2 svx/source/svdraw/svdoashp.cxx | 2 svx/source/table/accessiblecell.cxx | 2 svx/source/table/svdotable.cxx | 6 svx/source/table/tablelayouter.cxx | 16 +- svx/source/tbxctrls/fontworkgallery.cxx | 2 svx/source/unodraw/unoshape.cxx | 2 sw/qa/extras/tiledrendering/tiledrendering.cxx | 4 sw/qa/extras/uiwriter/uiwriter.cxx | 2 sw/source/core/crsr/FormFieldButton.cxx | 2 sw/source/core/crsr/contentcontrolbutton.cxx | 2 sw/source/core/doc/textboxhelper.cxx | 10 - sw/source/core/draw/dflyobj.cxx | 4 sw/source/filter/html/htmlflywriter.cxx | 4 sw/source/filter/ww8/docxsdrexport.cxx | 17 +- sw/source/filter/ww8/wrtw8esh.cxx | 12 - sw/source/uibase/docvw/HeaderFooterWin.cxx | 2 sw/source/uibase/docvw/PageBreakWin.cxx | 4 toolkit/source/awt/vclxtoolkit.cxx | 4 tools/qa/cppunit/test_rectangle.cxx | 10 - tools/source/generic/gen.cxx | 5 vbahelper/source/vbahelper/vbahelper.cxx | 6 vcl/qa/cppunit/complextext.cxx | 4 vcl/source/app/svapp.cxx | 2 vcl/source/control/button.cxx | 2 vcl/source/control/combobox.cxx | 6 vcl/source/control/fixedhyper.cxx | 4 vcl/source/control/imp_listbox.cxx | 2 vcl/source/control/scrbar.cxx | 4 vcl/source/filter/ipdf/pdfdocument.cxx | 8 - vcl/source/filter/ipict/ipict.cxx | 4 vcl/source/helper/canvasbitmap.cxx | 10 - vcl/source/outdev/transparent.cxx | 2 vcl/source/treelist/svlbitm.cxx | 4 vcl/source/window/cursor.cxx | 2 vcl/source/window/menu.cxx | 8 - vcl/source/window/splitwin.cxx | 4 vcl/source/window/toolbox.cxx | 14 - vcl/workben/minvcl.cxx | 2 vcl/workben/vcldemo.cxx | 6 writerfilter/source/dmapper/GraphicImport.cxx | 12 - 81 files changed, 300 insertions(+), 297 deletions(-)
New commits: commit 934985becc567114c3f38a72322056a628aad7c9 Author: Chris Sherlock <[email protected]> AuthorDate: Wed Jun 29 00:06:03 2022 +1000 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Mon Jul 11 11:06:53 2022 +0200 tools: rename getHeight/Width() to GetOpenHeight/Width() By default Rectangle uses closed interval, if we really want to use half open intervals then we should specifically say as such in the name. Change-Id: Id7a91120ba1a1a4bc330014216b73a692dbf03a2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136575 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index d88b3421812d..077e3ea5b6dd 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -192,9 +192,9 @@ tools::Rectangle AccessibleGridControlHeader::implGetBoundingBox() tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ) ); tools::Rectangle aHeaderRect (m_aTable.calcHeaderRect(isColumnBar())); if(isColumnBar()) - return tools::Rectangle(aGridRect.TopLeft(), Size(aGridRect.getWidth(),aHeaderRect.getHeight())); + return tools::Rectangle(aGridRect.TopLeft(), Size(aGridRect.getOpenWidth(),aHeaderRect.getOpenHeight())); else - return tools::Rectangle(aGridRect.TopLeft(), Size(aHeaderRect.getWidth(),aGridRect.getHeight())); + return tools::Rectangle(aGridRect.TopLeft(), Size(aHeaderRect.getOpenWidth(),aGridRect.getOpenHeight())); } @@ -203,9 +203,9 @@ tools::Rectangle AccessibleGridControlHeader::implGetBoundingBoxOnScreen() tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( nullptr ) ); tools::Rectangle aHeaderRect (m_aTable.calcHeaderRect(isColumnBar())); if(isColumnBar()) - return tools::Rectangle(aGridRect.TopLeft(), Size(aGridRect.getWidth(),aHeaderRect.getHeight())); + return tools::Rectangle(aGridRect.TopLeft(), Size(aGridRect.getOpenWidth(),aHeaderRect.getOpenHeight())); else - return tools::Rectangle(aGridRect.TopLeft(), Size(aHeaderRect.getWidth(),aGridRect.getHeight())); + return tools::Rectangle(aGridRect.TopLeft(), Size(aHeaderRect.getOpenWidth(),aGridRect.getOpenHeight())); } // internal helper methods ---------------------------------------------------- diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index e3949a1bac8e..47159ddd29e3 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -638,7 +638,7 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds() aParentLocOnScreen.Y - aULOnScreen.Y ); return awt::Rectangle( aRect.Left() - aOffset.X, aRect.Top() - aOffset.Y, - aRect.getWidth(), aRect.getHeight()); + aRect.getOpenWidth(), aRect.getOpenHeight()); } } diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index c50749c42a87..510420c91a2c 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -871,9 +871,9 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt ) bool bMoved = PositionAndSizeHelper::moveObject( m_aSelection.getSelectedCID() , xModel - , awt::Rectangle(aObjectRect.Left(),aObjectRect.Top(),aObjectRect.getWidth(),aObjectRect.getHeight()) + , awt::Rectangle(aObjectRect.Left(),aObjectRect.Top(),aObjectRect.getOpenWidth(),aObjectRect.getOpenHeight()) , awt::Rectangle(aOldObjectRect.Left(), aOldObjectRect.Top(), 0, 0) - , awt::Rectangle(aPageRect.Left(),aPageRect.Top(),aPageRect.getWidth(),aPageRect.getHeight()) ); + , awt::Rectangle(aPageRect.Left(),aPageRect.Top(),aPageRect.getOpenWidth(),aPageRect.getOpenHeight()) ); if( bMoved || bChanged ) { @@ -1510,7 +1510,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) else bReturn = PositionAndSizeHelper::moveObject( m_aSelection.getSelectedCID(), getChartModel(), - awt::Rectangle(aRect.Left() + fShiftAmountX, aRect.Top() + fShiftAmountY, aRect.getWidth(), aRect.getHeight()), + awt::Rectangle(aRect.Left() + fShiftAmountX, aRect.Top() + fShiftAmountY, aRect.getOpenWidth(), aRect.getOpenHeight()), awt::Rectangle(aRect.Left(), aRect.Top(), 0, 0), awt::Rectangle(0, 0, aPageSize.Width, aPageSize.Height)); } diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index ca8a4549adfe..6bdb41a7de02 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -46,7 +46,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType tools::Rectangle aPageRect( Point(rPageRectangle.X,rPageRectangle.Y), Size(rPageRectangle.Width,rPageRectangle.Height) ); // every following branch divides by width and height - if (aPageRect.getWidth() == 0 || aPageRect.getHeight() == 0) + if (aPageRect.getOpenWidth() == 0 || aPageRect.getOpenHeight() == 0) return false; if( eObjectType==OBJECTTYPE_TITLE ) @@ -56,16 +56,16 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType aRelativePosition.Anchor = drawing::Alignment_CENTER; //the anchor point at the title object is top/middle Point aPos = aObjectRect.TopLeft(); - aRelativePosition.Primary = (double(aPos.X())+double(aObjectRect.getWidth())/2.0)/double(aPageRect.getWidth()); - aRelativePosition.Secondary = (double(aPos.Y())+double(aObjectRect.getHeight())/2.0)/double(aPageRect.getHeight()); + aRelativePosition.Primary = (double(aPos.X())+double(aObjectRect.getOpenWidth())/2.0)/double(aPageRect.getOpenWidth()); + aRelativePosition.Secondary = (double(aPos.Y())+double(aObjectRect.getOpenHeight())/2.0)/double(aPageRect.getOpenHeight()); xObjectProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) ); } else if( eObjectType == OBJECTTYPE_DATA_LABEL ) { RelativePosition aAbsolutePosition; RelativePosition aCustomLabelPosition; - aAbsolutePosition.Primary = double(rOldPositionAndSize.X) / double(aPageRect.getWidth()); - aAbsolutePosition.Secondary = double(rOldPositionAndSize.Y) / double(aPageRect.getHeight()); + aAbsolutePosition.Primary = double(rOldPositionAndSize.X) / double(aPageRect.getOpenWidth()); + aAbsolutePosition.Secondary = double(rOldPositionAndSize.Y) / double(aPageRect.getOpenHeight()); if( xObjectProp->getPropertyValue("CustomLabelPosition") >>= aCustomLabelPosition ) { @@ -82,8 +82,8 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType else if( fRotation == 270.0 ) aPos = aObjectRect.TopRight(); - aCustomLabelPosition.Primary = double(aPos.X()) / double(aPageRect.getWidth()) - aAbsolutePosition.Primary; - aCustomLabelPosition.Secondary = double(aPos.Y()) / double(aPageRect.getHeight()) - aAbsolutePosition.Secondary; + aCustomLabelPosition.Primary = double(aPos.X()) / double(aPageRect.getOpenWidth()) - aAbsolutePosition.Primary; + aCustomLabelPosition.Secondary = double(aPos.Y()) / double(aPageRect.getOpenHeight()) - aAbsolutePosition.Secondary; xObjectProp->setPropertyValue("CustomLabelPosition", uno::Any(aCustomLabelPosition)); } else if( eObjectType==OBJECTTYPE_DATA_CURVE_EQUATION ) @@ -93,8 +93,8 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT; //the anchor point at the title object is top/middle Point aPos = aObjectRect.TopLeft(); - aRelativePosition.Primary = double(aPos.X())/double(aPageRect.getWidth()); - aRelativePosition.Secondary = double(aPos.Y())/double(aPageRect.getHeight()); + aRelativePosition.Primary = double(aPos.X())/double(aPageRect.getOpenWidth()); + aRelativePosition.Secondary = double(aPos.Y())/double(aPageRect.getOpenHeight()); xObjectProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) ); } else if(eObjectType==OBJECTTYPE_LEGEND) @@ -106,21 +106,21 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType aRelativePosition.Primary = static_cast< double >( aAnchor.X()) / - static_cast< double >( aPageRect.getWidth() ); + static_cast< double >( aPageRect.getOpenWidth() ); aRelativePosition.Secondary = static_cast< double >( aAnchor.Y()) / - static_cast< double >( aPageRect.getHeight()); + static_cast< double >( aPageRect.getOpenHeight()); xObjectProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) ); aRelativeSize.Primary = - static_cast< double >( aObjectRect.getWidth()) / - static_cast< double >( aPageRect.getWidth() ); + static_cast< double >( aObjectRect.getOpenWidth()) / + static_cast< double >( aPageRect.getOpenWidth() ); if (aRelativeSize.Primary > 1.0) aRelativeSize.Primary = 1.0; aRelativeSize.Secondary = - static_cast< double >( aObjectRect.getHeight()) / - static_cast< double >( aPageRect.getHeight()); + static_cast< double >( aObjectRect.getOpenHeight()) / + static_cast< double >( aPageRect.getOpenHeight()); if (aRelativeSize.Secondary > 1.0) aRelativeSize.Secondary = 1.0; @@ -135,16 +135,16 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType aRelativePosition.Anchor = drawing::Alignment_CENTER; Point aPos = aObjectRect.Center(); - aRelativePosition.Primary = double(aPos.X())/double(aPageRect.getWidth()); - aRelativePosition.Secondary = double(aPos.Y())/double(aPageRect.getHeight()); + aRelativePosition.Primary = double(aPos.X())/double(aPageRect.getOpenWidth()); + aRelativePosition.Secondary = double(aPos.Y())/double(aPageRect.getOpenHeight()); xObjectProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) ); //set size: RelativeSize aRelativeSize; //the anchor points for the diagram are in the middle of the diagram //and in the middle of the page - aRelativeSize.Primary = double(aObjectRect.getWidth())/double(aPageRect.getWidth()); - aRelativeSize.Secondary = double(aObjectRect.getHeight())/double(aPageRect.getHeight()); + aRelativeSize.Primary = double(aObjectRect.getOpenWidth())/double(aPageRect.getOpenWidth()); + aRelativeSize.Secondary = double(aObjectRect.getOpenHeight())/double(aPageRect.getOpenHeight()); xObjectProp->setPropertyValue( "RelativeSize", uno::Any(aRelativeSize) ); } else diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index f11ca853c930..85dc65276861 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -113,7 +113,7 @@ namespace dbaui { ::osl::MutexGuard aGuard( m_aMutex ); tools::Rectangle aRect(m_pLine ? m_pLine->GetBoundingRect() : tools::Rectangle()); - return awt::Rectangle(aRect.Left(),aRect.Top(),aRect.getWidth(),aRect.getHeight()); + return awt::Rectangle(aRect.Left(),aRect.Top(),aRect.getOpenWidth(),aRect.getOpenHeight()); } awt::Point SAL_CALL OConnectionLineAccess::getLocation( ) { diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 776eba17c6c4..4b135250c538 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -483,7 +483,7 @@ tools::Rectangle RectangleAndPart::SanitizedRectangle(tools::Long nLeft, tools:: tools::Rectangle RectangleAndPart::SanitizedRectangle(const tools::Rectangle& rect) { - return SanitizedRectangle(rect.Left(), rect.Top(), rect.getWidth(), rect.getHeight()); + return SanitizedRectangle(rect.Left(), rect.Top(), rect.getOpenWidth(), rect.getOpenHeight()); } const std::string& CallbackFlushHandler::CallbackData::getPayload() const diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index be17e620de40..f229aed520a4 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -70,8 +70,8 @@ namespace drawinglayer::primitive2d aAdaptedTransform.translate(-aMtfTarget.Left(), -aMtfTarget.Top()); aAdaptedTransform.scale( - aMtfTarget.getWidth() ? 1.0 / aMtfTarget.getWidth() : 1.0, - aMtfTarget.getHeight() ? 1.0 / aMtfTarget.getHeight() : 1.0); + aMtfTarget.getOpenWidth() ? 1.0 / aMtfTarget.getOpenWidth() : 1.0, + aMtfTarget.getOpenHeight() ? 1.0 / aMtfTarget.getOpenHeight() : 1.0); aAdaptedTransform = getTransform() * aAdaptedTransform; // embed to target transformation diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 66bac102ac89..ae12b5679b09 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4507,8 +4507,8 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r && aObjName.match( "PowerPlusWaterMarkObject" ) ) { double fRatio = static_cast<double>(pDevice->GetTextHeight()) / nTextWidth; - sal_Int32 nNewHeight = fRatio * aObjData.aBoundRect.getWidth(); - sal_Int32 nPaddingY = aObjData.aBoundRect.getHeight() - nNewHeight; + sal_Int32 nNewHeight = fRatio * aObjData.aBoundRect.getOpenWidth(); + sal_Int32 nPaddingY = aObjData.aBoundRect.getOpenHeight() - nNewHeight; if ( nPaddingY > 0 ) aObjData.aBoundRect.setHeight( nNewHeight ); @@ -4680,8 +4680,8 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r { double fLogicXOfs(0.0); // LogicLeft_LO = LogicLeft_MS + fXLogicOfs double fLogicYOfs(0.0); - double fLogicPieWidth(aObjData.aBoundRect.getWidth()); - double fLogicPieHeight(aObjData.aBoundRect.getHeight()); + double fLogicPieWidth(aObjData.aBoundRect.getOpenWidth()); + double fLogicPieHeight(aObjData.aBoundRect.getOpenHeight()); double fLogicEllipseWidth(0.0); // to be LogicWidth_LO double fLogicEllipseHeight(0.0); if (aPieRect_MS.getWidth()) diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 34b2b0899eaf..cf444b5ab31d 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -2221,7 +2221,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D if ( nSpace > 0 ) { - sal_Int32 nMove = std::min( nSpace, static_cast<sal_Int32>(aFrontDockingRect.getWidth()) ); + sal_Int32 nMove = std::min( nSpace, static_cast<sal_Int32>(aFrontDockingRect.getOpenWidth()) ); if ( bHorzDockArea ) aFrontDockingRect.Move( -nMove, 0 ); else @@ -2696,19 +2696,19 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( // Determine if the tracking rect must be located before/after the docked toolbar. ::tools::Rectangle aUIElementRect( aWindowRect ); - sal_Int32 nMiddle( bHorizontalDockArea ? ( aWindowRect.Left() + aWindowRect.getWidth() / 2 ) : - ( aWindowRect.Top() + aWindowRect.getHeight() / 2 )); + sal_Int32 nMiddle( bHorizontalDockArea ? ( aWindowRect.Left() + aWindowRect.getOpenWidth() / 2 ) : + ( aWindowRect.Top() + aWindowRect.getOpenHeight() / 2 )); bool bInsertBefore( bHorizontalDockArea ? ( rMousePos.X() < nMiddle ) : ( rMousePos.Y() < nMiddle )); if ( bInsertBefore ) { if ( bHorizontalDockArea ) { sal_Int32 nSize = std::clamp( sal_Int32(aContainerWinSize.Width() - aWindowRect.Left()), - sal_Int32(0), sal_Int32(aTrackingRect.getWidth()) ); + sal_Int32(0), sal_Int32(aTrackingRect.getOpenWidth()) ); if ( nSize == 0 ) - nSize = aWindowRect.getWidth(); + nSize = aWindowRect.getOpenWidth(); - aUIElementRect.SetSize( ::Size( nSize, aWindowRect.getHeight() )); + aUIElementRect.SetSize( ::Size( nSize, aWindowRect.getOpenHeight() )); aWindowRect = implts_determineFrontDockingRect( eDockedArea, nRowCol, aWindowRect,rUIElement.m_aName, aUIElementRect ); // Set virtual position @@ -2718,11 +2718,11 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( else { sal_Int32 nSize = std::clamp( sal_Int32(nTopDockingAreaSize + nMaxLeftRightDockAreaSize - aWindowRect.Top()), - sal_Int32(0), sal_Int32(aTrackingRect.getHeight()) ); + sal_Int32(0), sal_Int32(aTrackingRect.getOpenHeight()) ); if ( nSize == 0 ) - nSize = aWindowRect.getHeight(); + nSize = aWindowRect.getOpenHeight(); - aUIElementRect.SetSize( ::Size( aWindowRect.getWidth(), nSize )); + aUIElementRect.SetSize( ::Size( aWindowRect.getOpenWidth(), nSize )); aWindowRect = implts_determineFrontDockingRect( eDockedArea, nRowCol, aWindowRect, rUIElement.m_aName, aUIElementRect ); // Set virtual position @@ -2740,18 +2740,18 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( if ( bHorizontalDockArea ) { sal_Int32 nSize = ::std::clamp( sal_Int32(aContainerWinSize.Width() - aWindowRect.Right()), - sal_Int32(0), sal_Int32(aTrackingRect.getWidth()) ); + sal_Int32(0), sal_Int32(aTrackingRect.getOpenWidth()) ); if ( nSize == 0 ) { - aUIElementRect.SetPos( ::Point( aContainerWinSize.Width() - aTrackingRect.getWidth(), aWindowRect.Top() )); - aUIElementRect.SetSize( ::Size( aTrackingRect.getWidth(), aWindowRect.getHeight() )); + aUIElementRect.SetPos( ::Point( aContainerWinSize.Width() - aTrackingRect.getOpenWidth(), aWindowRect.Top() )); + aUIElementRect.SetSize( ::Size( aTrackingRect.getOpenWidth(), aWindowRect.getOpenHeight() )); rUIElement.m_aDockedData.m_aPos.X = aUIElementRect.Left(); } else { aUIElementRect.SetPos( ::Point( aWindowRect.Right(), aWindowRect.Top() )); - aUIElementRect.SetSize( ::Size( nSize, aWindowRect.getHeight() )); + aUIElementRect.SetSize( ::Size( nSize, aWindowRect.getOpenHeight() )); rUIElement.m_aDockedData.m_aPos.X = aWindowRect.Right(); } @@ -2761,9 +2761,9 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( else { sal_Int32 nSize = std::clamp( sal_Int32(nTopDockingAreaSize + nMaxLeftRightDockAreaSize - aWindowRect.Bottom()), - sal_Int32(0), sal_Int32(aTrackingRect.getHeight()) ); + sal_Int32(0), sal_Int32(aTrackingRect.getOpenHeight()) ); aUIElementRect.SetPos( ::Point( aWindowRect.Left(), aWindowRect.Bottom() )); - aUIElementRect.SetSize( ::Size( aWindowRect.getWidth(), nSize )); + aUIElementRect.SetSize( ::Size( aWindowRect.getOpenWidth(), nSize )); // Set virtual position sal_Int32 nPosY( 0 ); @@ -2805,9 +2805,9 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( sal_Int32 nOffsetX( 0 ); sal_Int32 nOffsetY( 0 ); if ( bHorizontalDockArea ) - nOffsetY = sal_Int32( floor( aRowColumnRect.getHeight() / 2.0 + 0.5 )); + nOffsetY = sal_Int32( floor( aRowColumnRect.getOpenHeight() / 2.0 + 0.5 )); else - nOffsetX = sal_Int32( floor( aRowColumnRect.getWidth() / 2.0 + 0.5 )); + nOffsetX = sal_Int32( floor( aRowColumnRect.getOpenWidth() / 2.0 + 0.5 )); if ( rDockingOperation == DOCKOP_BEFORE_COLROW ) { @@ -2857,24 +2857,24 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( if ( bHorizontalDockArea ) { sal_Int32 nPosX( std::max( sal_Int32( rTrackingRect.Left()), sal_Int32( 0 ))); - if (( nPosX + rTrackingRect.getWidth()) > aContainerWinSize.Width() ) + if (( nPosX + rTrackingRect.getOpenWidth()) > aContainerWinSize.Width() ) nPosX = std::min( nPosX, - std::max( sal_Int32( aContainerWinSize.Width() - rTrackingRect.getWidth() ), + std::max( sal_Int32( aContainerWinSize.Width() - rTrackingRect.getOpenWidth() ), sal_Int32( 0 ))); - sal_Int32 nSize = std::min( aContainerWinSize.Width(), rTrackingRect.getWidth() ); - sal_Int32 nDockHeight = std::max( static_cast<sal_Int32>(aDockingAreaRect.getHeight()), sal_Int32( 0 )); + sal_Int32 nSize = std::min( aContainerWinSize.Width(), rTrackingRect.getOpenWidth() ); + sal_Int32 nDockHeight = std::max( static_cast<sal_Int32>(aDockingAreaRect.getOpenHeight()), sal_Int32( 0 )); if ( nDockHeight == 0 ) { sal_Int32 nPosY( std::max( aDockingAreaRect.Top(), aDockingAreaRect.Bottom() )); if ( eDockedArea == ui::DockingArea_DOCKINGAREA_BOTTOM ) - nPosY -= rTrackingRect.getHeight(); + nPosY -= rTrackingRect.getOpenHeight(); rTrackingRect.SetPos( Point( nPosX, nPosY )); rUIElement.m_aDockedData.m_aPos.Y = 0; } else if ( rMousePos.Y() < ( aDockingAreaRect.Top() + ( nDockHeight / 2 ))) { - rTrackingRect.SetPos( Point( nPosX, aDockingAreaRect.Top() - rTrackingRect.getHeight() )); + rTrackingRect.SetPos( Point( nPosX, aDockingAreaRect.Top() - rTrackingRect.getOpenHeight() )); if ( eDockedArea == ui::DockingArea_DOCKINGAREA_TOP ) rUIElement.m_aDockedData.m_aPos.Y = 0; else @@ -2903,24 +2903,24 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( { sal_Int32 nMaxDockingAreaHeight = std::max<sal_Int32>( 0, nMaxLeftRightDockAreaSize ); sal_Int32 nPosY( std::max<sal_Int32>( aTrackingRect.Top(), nTopDockingAreaSize )); - if (( nPosY + aTrackingRect.getHeight()) > ( nTopDockingAreaSize + nMaxDockingAreaHeight )) + if (( nPosY + aTrackingRect.getOpenHeight()) > ( nTopDockingAreaSize + nMaxDockingAreaHeight )) nPosY = std::min( nPosY, - std::max<sal_Int32>( nTopDockingAreaSize + ( nMaxDockingAreaHeight - aTrackingRect.getHeight() ), + std::max<sal_Int32>( nTopDockingAreaSize + ( nMaxDockingAreaHeight - aTrackingRect.getOpenHeight() ), nTopDockingAreaSize )); - sal_Int32 nSize = std::min( nMaxDockingAreaHeight, static_cast<sal_Int32>(aTrackingRect.getHeight()) ); - sal_Int32 nDockWidth = std::max( static_cast<sal_Int32>(aDockingAreaRect.getWidth()), sal_Int32( 0 )); + sal_Int32 nSize = std::min( nMaxDockingAreaHeight, static_cast<sal_Int32>(aTrackingRect.getOpenHeight()) ); + sal_Int32 nDockWidth = std::max( static_cast<sal_Int32>(aDockingAreaRect.getOpenWidth()), sal_Int32( 0 )); if ( nDockWidth == 0 ) { sal_Int32 nPosX( std::max( aDockingAreaRect.Left(), aDockingAreaRect.Right() )); if ( eDockedArea == ui::DockingArea_DOCKINGAREA_RIGHT ) - nPosX -= rTrackingRect.getWidth(); + nPosX -= rTrackingRect.getOpenWidth(); rTrackingRect.SetPos( Point( nPosX, nPosY )); rUIElement.m_aDockedData.m_aPos.X = 0; } else if ( rMousePos.X() < ( aDockingAreaRect.Left() + ( nDockWidth / 2 ))) { - rTrackingRect.SetPos( Point( aDockingAreaRect.Left() - rTrackingRect.getWidth(), nPosY )); + rTrackingRect.SetPos( Point( aDockingAreaRect.Left() - rTrackingRect.getOpenWidth(), nPosY )); if ( eDockedArea == ui::DockingArea_DOCKINGAREA_LEFT ) rUIElement.m_aDockedData.m_aPos.X = 0; else @@ -2959,7 +2959,7 @@ framework::ToolbarLayoutManager::DockingOperation ToolbarLayoutManager::implts_d { if ( isHorizontalDockingArea( DockingArea )) { - sal_Int32 nRegion = rRowColRect.getHeight() / nHorzVerticalRegionSize; + sal_Int32 nRegion = rRowColRect.getOpenHeight() / nHorzVerticalRegionSize; sal_Int32 nPosY = rRowColRect.Top() + nRegion; if ( rMousePos.Y() < nPosY ) @@ -2971,7 +2971,7 @@ framework::ToolbarLayoutManager::DockingOperation ToolbarLayoutManager::implts_d } else { - sal_Int32 nRegion = rRowColRect.getWidth() / nHorzVerticalRegionSize; + sal_Int32 nRegion = rRowColRect.getOpenWidth() / nHorzVerticalRegionSize; sal_Int32 nPosX = rRowColRect.Left() + nRegion; if ( rMousePos.X() < nPosX ) @@ -3013,16 +3013,16 @@ framework::ToolbarLayoutManager::DockingOperation ToolbarLayoutManager::implts_d if ( bHorizontalDockArea ) { sal_Int32 nPosX( std::max( sal_Int32( rTrackingRect.Left()), sal_Int32( 0 ))); - if (( nPosX + rTrackingRect.getWidth()) > rContainerWinSize.Width() ) + if (( nPosX + rTrackingRect.getOpenWidth()) > rContainerWinSize.Width() ) nPosX = std::min( nPosX, - std::max( sal_Int32( rContainerWinSize.Width() - rTrackingRect.getWidth() ), + std::max( sal_Int32( rContainerWinSize.Width() - rTrackingRect.getOpenWidth() ), sal_Int32( 0 ))); - sal_Int32 nSize = std::min( rContainerWinSize.Width(), rTrackingRect.getWidth() ); + sal_Int32 nSize = std::min( rContainerWinSize.Width(), rTrackingRect.getOpenWidth() ); aTrackingRect.SetPos( ::Point( nPosX, rRowColumnRect.Top() )); aTrackingRect.setWidth( nSize ); - aTrackingRect.setHeight( rRowColumnRect.getHeight() ); + aTrackingRect.setHeight( rRowColumnRect.getOpenHeight() ); // Set virtual position rUIElement.m_aDockedData.m_aPos.X = nPosX; @@ -3033,15 +3033,15 @@ framework::ToolbarLayoutManager::DockingOperation ToolbarLayoutManager::implts_d sal_Int32 nMaxDockingAreaHeight = std::max<sal_Int32>( 0, nMaxLeftRightDockAreaSize ); sal_Int32 nPosY( std::max<sal_Int32>( aTrackingRect.Top(), nTopDockingAreaSize )); - if (( nPosY + aTrackingRect.getHeight()) > ( nTopDockingAreaSize + nMaxDockingAreaHeight )) + if (( nPosY + aTrackingRect.getOpenHeight()) > ( nTopDockingAreaSize + nMaxDockingAreaHeight )) nPosY = std::min( nPosY, - std::max<sal_Int32>( nTopDockingAreaSize + ( nMaxDockingAreaHeight - aTrackingRect.getHeight() ), + std::max<sal_Int32>( nTopDockingAreaSize + ( nMaxDockingAreaHeight - aTrackingRect.getOpenHeight() ), nTopDockingAreaSize )); - sal_Int32 nSize = std::min( nMaxDockingAreaHeight, static_cast<sal_Int32>(aTrackingRect.getHeight()) ); + sal_Int32 nSize = std::min( nMaxDockingAreaHeight, static_cast<sal_Int32>(aTrackingRect.getOpenHeight()) ); aTrackingRect.SetPos( ::Point( rRowColumnRect.Left(), nPosY )); - aTrackingRect.setWidth( rRowColumnRect.getWidth() ); + aTrackingRect.setWidth( rRowColumnRect.getOpenWidth() ); aTrackingRect.setHeight( nSize ); aReadGuard.reset(); @@ -3381,7 +3381,7 @@ awt::DockingData SAL_CALL ToolbarLayoutManager::docking( const awt::DockingEvent ::Point aScreenPos = pContainerWindow->OutputToScreenPixel( aNewDockingRect.TopLeft() ); aDockingData.TrackingRectangle = awt::Rectangle( aScreenPos.X(), aScreenPos.Y(), - aNewDockingRect.getWidth(), aNewDockingRect.getHeight() ); + aNewDockingRect.getOpenWidth(), aNewDockingRect.getOpenHeight() ); } else if (pToolBox) { diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx index ab8b443ca403..5ed473c62857 100644 --- a/include/tools/gen.hxx +++ b/include/tools/gen.hxx @@ -478,13 +478,12 @@ inline std::basic_ostream<charT, traits> & operator <<( /// /// If you have the misfortune of having to use this class, don't immediately /// despair but first take note that the uppercase GetWidth() / GetHeight() -/// etc. methods interpret the interval as closed, while the lowercase -/// getWidth() / getHeight() etc. methods interpret the interval as half-open. -/// Ok, now is the time for despair. +/// etc. methods interpret the interval as closed. To use the half open versions, +/// use GetOpenWidth() / GetOpenHeight(). /// /// If you want to work with Size, you must use the closed interval functions! -/// And don't add getSize / setSize; this will probably just introduce bugs, -/// especially when used in combination with list-initialization. +/// And don't add GetOpenSize() / setSize; this will probably just introduce +/// bugs, especially when used in combination with list-initialization. /// /// (Eventually you might notice, that the same engineer was also working on /// Qt at some point; see documentation on QRect::bottom / QRect::right ;-). @@ -579,9 +578,9 @@ public: tools::Long getX() const { return nLeft; } tools::Long getY() const { return nTop; } /// Returns the difference between right and left, assuming the range includes one end, but not the other. - tools::Long getWidth() const { return Right() - Left(); } + tools::Long getOpenWidth() const { return Right() - Left(); } /// Returns the difference between bottom and top, assuming the range includes one end, but not the other. - tools::Long getHeight() const { return Bottom() - Top(); } + tools::Long getOpenHeight() const { return Bottom() - Top(); } void setWidth( tools::Long n ) { nRight = nLeft + n; } void setHeight( tools::Long n ) { nBottom = nTop + n; } /// Returns the string representation of the rectangle, format is "x, y, width, height". diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 79691c338985..f0b446a7eb33 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1712,14 +1712,14 @@ ShapeExport& ShapeExport::WriteConnectorShape( const Reference< XShape >& xShape } tools::Rectangle aRect( Point( aStartPoint.X, aStartPoint.Y ), Point( aEndPoint.X, aEndPoint.Y ) ); - if( aRect.getWidth() < 0 ) { + if( aRect.getOpenWidth() < 0 ) { aRect.SetLeft(aEndPoint.X); aRect.setWidth( aStartPoint.X - aEndPoint.X ); if (eConnectorType == ConnectorType_LINE) bFlipH = true; } - if( aRect.getHeight() < 0 ) { + if( aRect.getOpenHeight() < 0 ) { aRect.SetTop(aEndPoint.Y); aRect.setHeight( aStartPoint.Y - aEndPoint.Y ); if (eConnectorType == ConnectorType_LINE) diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index 236407677340..47a196908a4d 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -390,7 +390,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle& nPaddingY += pItem->GetValue(); tools::Rectangle aRect( rRect ); - aRect.setHeight( aRect.getHeight() + nPaddingY ); + aRect.setHeight( aRect.getOpenHeight() + nPaddingY ); AddRectangleDimensions( m_ShapeStyle, aRect ); } else diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 4c90a556e810..8081e4fa4c00 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -389,8 +389,8 @@ void OObjectBase::SetPropsFromRect(const tools::Rectangle& _rRect) if ( pPage && !_rRect.IsEmpty() ) { const uno::Reference<report::XSection>& xSection = pPage->getSection(); - assert(_rRect.getHeight() >= 0); - const sal_uInt32 newHeight( ::std::max(tools::Long(0), _rRect.getHeight()+_rRect.Top()) ); + assert(_rRect.getOpenHeight() >= 0); + const sal_uInt32 newHeight( ::std::max(tools::Long(0), _rRect.getOpenHeight()+_rRect.Top()) ); if ( xSection.is() && ( newHeight > xSection->getHeight() ) ) xSection->setHeight( newHeight ); diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 87062e35c6f6..2eec8fe9fa2a 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -957,8 +957,8 @@ tools::Rectangle getRectangleFromControl(SdrObject* _pControl) if (xComponent.is()) { tools::Rectangle aRect(VCLPoint(xComponent->getPosition()),VCLSize(xComponent->getSize())); - aRect.setHeight(aRect.getHeight() + 1); - aRect.setWidth(aRect.getWidth() + 1); + aRect.setHeight(aRect.getOpenHeight() + 1); + aRect.setWidth(aRect.getOpenWidth() + 1); return aRect; } } @@ -980,7 +980,7 @@ void correctOverlapping(SdrObject* _pControl,OReportSection const & _aReportSect if ( bOverlapping ) { const tools::Rectangle& aLogicRect = pOverlappedObj->GetLogicRect(); - aRect.Move(0,aLogicRect.Top() + aLogicRect.getHeight() - aRect.Top()); + aRect.Move(0,aLogicRect.Top() + aLogicRect.getOpenHeight() - aRect.Top()); xComponent->setPositionY(aRect.Top()); } } diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 7c588a99791c..b53cfad7b87f 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -3579,7 +3579,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) if ( bOverlapping ) { const tools::Rectangle& aLogicRect = pOverlappedObj->GetLogicRect(); - aLabelAndTextfield.Move(0,aLogicRect.Top() + aLogicRect.getHeight() - aLabelAndTextfield.Top()); + aLabelAndTextfield.Move(0,aLogicRect.Top() + aLogicRect.getOpenHeight() - aLabelAndTextfield.Top()); bHasToMove = true; } } diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index ebbbad48c2e9..ca62459ddb30 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -255,22 +255,22 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC SdrObject* pNewObj(pObject->CloneSdrObject(*m_pModel)); m_pPage->InsertObject(pNewObj, SAL_MAX_SIZE); tools::Rectangle aRet(VCLPoint(rCopy->getPosition()),VCLSize(rCopy->getSize())); - aRet.setHeight(aRet.getHeight() + 1); - aRet.setWidth(aRet.getWidth() + 1); + aRet.setHeight(aRet.getOpenHeight() + 1); + aRet.setWidth(aRet.getOpenWidth() + 1); bool bOverlapping = true; while ( bOverlapping ) { bOverlapping = isOver(aRet,*m_pPage,*m_pView,true,pNewObj) != nullptr; if ( bOverlapping ) { - aRet.Move(0,aRet.getHeight()+1); + aRet.Move(0,aRet.getOpenHeight()+1); pNewObj->SetLogicRect(aRet); } } m_pView->AddUndo( m_pView->GetModel()->GetSdrUndoFactory().CreateUndoNewObject( *pNewObj ) ); m_pView->MarkObj( pNewObj, m_pView->GetSdrPageView() ); - if ( m_xSection.is() && (o3tl::make_unsigned(aRet.getHeight() + aRet.Top()) > m_xSection->getHeight()) ) - m_xSection->setHeight(aRet.getHeight() + aRet.Top()); + if ( m_xSection.is() && (o3tl::make_unsigned(aRet.getOpenHeight() + aRet.Top()) > m_xSection->getHeight()) ) + m_xSection->setHeight(aRet.getOpenHeight() + aRet.Top()); } } } @@ -538,10 +538,10 @@ void OReportSection::impl_adjustObjectSizePosition(sal_Int32 i_nPaperWidth,sal_I xReportComponent->setPosition(aPos); correctOverlapping(pObject,*this,false); tools::Rectangle aRet(VCLPoint(xReportComponent->getPosition()),VCLSize(xReportComponent->getSize())); - aRet.setHeight(aRet.getHeight() + 1); - aRet.setWidth(aRet.getWidth() + 1); - if ( m_xSection.is() && (o3tl::make_unsigned(aRet.getHeight() + aRet.Top()) > m_xSection->getHeight()) ) - m_xSection->setHeight(aRet.getHeight() + aRet.Top()); + aRet.setHeight(aRet.getOpenHeight() + 1); + aRet.setWidth(aRet.getOpenWidth() + 1); + if ( m_xSection.is() && (o3tl::make_unsigned(aRet.getOpenHeight() + aRet.Top()) > m_xSection->getHeight()) ) + m_xSection->setHeight(aRet.getOpenHeight() + aRet.Top()); pObject->RecalcBoundRect(); } diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index b5ce7a48fe60..9dfec8d91574 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -100,14 +100,14 @@ static bool lcl_getNewRectSize(const tools::Rectangle& _aObjRect,tools::Long& _n break; case ControlModification::CENTER_HORIZONTAL: if ( _aObjRect.Left() < aOverlappingRect.Left() ) - nXTemp += aOverlappingRect.Left() - aNewRect.Left() - aNewRect.getWidth(); + nXTemp += aOverlappingRect.Left() - aNewRect.Left() - aNewRect.getOpenWidth(); else nXTemp += aOverlappingRect.Right() - aNewRect.Left(); bMoveAllowed = _nXMov != nXTemp; break; case ControlModification::CENTER_VERTICAL: if ( _aObjRect.Top() < aOverlappingRect.Top() ) - nYTemp += aOverlappingRect.Top() - aNewRect.Top() - aNewRect.getHeight(); + nYTemp += aOverlappingRect.Top() - aNewRect.Top() - aNewRect.getOpenHeight(); else nYTemp += aOverlappingRect.Bottom() - aNewRect.Top(); bMoveAllowed = _nYMov != nYTemp; @@ -140,9 +140,9 @@ static bool lcl_getNewRectSize(const tools::Rectangle& _aObjRect,tools::Long& _n aNewRect.SetTop( aIntersectionRect.Bottom() ); } } - nYTemp = aNewRect.getHeight(); + nYTemp = aNewRect.getOpenHeight(); bMoveAllowed = _nYMov != nYTemp; - nXTemp = aNewRect.getWidth(); + nXTemp = aNewRect.getOpenWidth(); bMoveAllowed = bMoveAllowed && _nXMov != nXTemp; } } @@ -651,19 +651,19 @@ void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles, switch(_nControlModification) { case ControlModification::WIDTH_SMALLEST: - if ( _rResize.getWidth() > aObjRect.getWidth() ) + if ( _rResize.getOpenWidth() > aObjRect.getOpenWidth() ) _rResize = aObjRect; break; case ControlModification::HEIGHT_SMALLEST: - if ( _rResize.getHeight() > aObjRect.getHeight() ) + if ( _rResize.getOpenHeight() > aObjRect.getOpenHeight() ) _rResize = aObjRect; break; case ControlModification::WIDTH_GREATEST: - if ( _rResize.getWidth() < aObjRect.getWidth() ) + if ( _rResize.getOpenWidth() < aObjRect.getOpenWidth() ) _rResize = aObjRect; break; case ControlModification::HEIGHT_GREATEST: - if ( _rResize.getHeight() < aObjRect.getHeight() ) + if ( _rResize.getOpenHeight() < aObjRect.getOpenHeight() ) _rResize = aObjRect; break; default: break; @@ -824,16 +824,16 @@ void OViewsWindow::alignMarkedObjects(ControlModification _nControlModification, // resizing control if ( !aResize.IsEmpty() && aObjRect != aResize ) { - nXMov = aResize.getWidth(); - nYMov = aResize.getHeight(); + nXMov = aResize.getOpenWidth(); + nYMov = aResize.getOpenHeight(); switch(_nControlModification) { case ControlModification::WIDTH_GREATEST: case ControlModification::HEIGHT_GREATEST: if ( _nControlModification == ControlModification::HEIGHT_GREATEST ) - nXMov = aObjRect.getWidth(); + nXMov = aObjRect.getOpenWidth(); else if ( _nControlModification == ControlModification::WIDTH_GREATEST ) - nYMov = aObjRect.getHeight(); + nYMov = aObjRect.getOpenHeight(); lcl_getNewRectSize(aObjRect,nXMov,nYMov,pObj,pView,_nControlModification); [[fallthrough]]; case ControlModification::WIDTH_SMALLEST: @@ -845,9 +845,9 @@ void OViewsWindow::alignMarkedObjects(ControlModification _nControlModification, if ( pObjBase ) { if ( _nControlModification == ControlModification::WIDTH_SMALLEST || _nControlModification == ControlModification::WIDTH_GREATEST ) - pObjBase->getReportComponent()->setSize(awt::Size(nXMov,aObjRect.getHeight())); + pObjBase->getReportComponent()->setSize(awt::Size(nXMov,aObjRect.getOpenHeight())); else if ( _nControlModification == ControlModification::HEIGHT_GREATEST || _nControlModification == ControlModification::HEIGHT_SMALLEST ) - pObjBase->getReportComponent()->setSize(awt::Size(aObjRect.getWidth(),nYMov)); + pObjBase->getReportComponent()->setSize(awt::Size(aObjRect.getOpenWidth(),nYMov)); } } break; @@ -1463,7 +1463,7 @@ void OViewsWindow::handleKey(const vcl::KeyCode& _rCode) if ( nCode == KEY_UP ) { aPos.setX( aMarkRect.Left() ); - aPos.setY( aOver.Top() - aMarkRect.getHeight() ); + aPos.setY( aOver.Top() - aMarkRect.getOpenHeight() ); nY += (aPos.Y() - aMarkRect.Top()); } else if ( nCode == KEY_DOWN ) @@ -1474,7 +1474,7 @@ void OViewsWindow::handleKey(const vcl::KeyCode& _rCode) } else if ( nCode == KEY_LEFT ) { - aPos.setX( aOver.Left() - aMarkRect.getWidth() ); + aPos.setX( aOver.Left() - aMarkRect.getOpenWidth() ); aPos.setY( aMarkRect.Top() ); nX += (aPos.X() - aMarkRect.Left()); } @@ -1553,8 +1553,8 @@ void OViewsWindow::handleKey(const vcl::KeyCode& _rCode) case SdrHdlKind::Right: case SdrHdlKind::LowerRight: case SdrHdlKind::Lower: - aNewRect.setWidth(aNewRect.getWidth() + nX); - aNewRect.setHeight(aNewRect.getHeight() + nY); + aNewRect.setWidth(aNewRect.getOpenWidth() + nX); + aNewRect.setHeight(aNewRect.getOpenHeight() + nY); break; default: break; diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 7025fdc52018..9c14df33b862 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -502,19 +502,19 @@ void ScFiltersTest::testCommentSize() CPPUNIT_ASSERT(pCaption); const tools::Rectangle& rOldRect = pCaption->GetLogicRect(); - CPPUNIT_ASSERT_EQUAL(tools::Long(2899), rOldRect.getWidth()); - CPPUNIT_ASSERT_EQUAL(tools::Long(939), rOldRect.getHeight()); + CPPUNIT_ASSERT_EQUAL(tools::Long(2899), rOldRect.getOpenWidth()); + CPPUNIT_ASSERT_EQUAL(tools::Long(939), rOldRect.getOpenHeight()); pNote->SetText(aPos, "first\nsecond\nthird"); const tools::Rectangle& rNewRect = pCaption->GetLogicRect(); - CPPUNIT_ASSERT_EQUAL(rOldRect.getWidth(), rNewRect.getWidth()); - CPPUNIT_ASSERT_EQUAL(tools::Long(1605), rNewRect.getHeight()); + CPPUNIT_ASSERT_EQUAL(rOldRect.getOpenWidth(), rNewRect.getOpenWidth()); + CPPUNIT_ASSERT_EQUAL(tools::Long(1605), rNewRect.getOpenHeight()); rDoc.GetUndoManager()->Undo(); - CPPUNIT_ASSERT_EQUAL(rOldRect.getWidth(), pCaption->GetLogicRect().getWidth()); - CPPUNIT_ASSERT_EQUAL(rOldRect.getHeight(), pCaption->GetLogicRect().getHeight()); + CPPUNIT_ASSERT_EQUAL(rOldRect.getOpenWidth(), pCaption->GetLogicRect().getOpenWidth()); + CPPUNIT_ASSERT_EQUAL(rOldRect.getOpenHeight(), pCaption->GetLogicRect().getOpenHeight()); xDocSh->DoClose(); } diff --git a/sc/qa/unit/jumbosheets-test.cxx b/sc/qa/unit/jumbosheets-test.cxx index f21c27aafbda..e3ae57564499 100644 --- a/sc/qa/unit/jumbosheets-test.cxx +++ b/sc/qa/unit/jumbosheets-test.cxx @@ -255,8 +255,8 @@ void ScJumboSheetsTest::testTdf134553() // Without the fix in place, this test would have failed here CPPUNIT_ASSERT(pOleObj); - CPPUNIT_ASSERT_EQUAL(tools::Long(12741), pOleObj->GetLogicRect().getWidth()); - CPPUNIT_ASSERT_EQUAL(tools::Long(7620), pOleObj->GetLogicRect().getHeight()); + CPPUNIT_ASSERT_EQUAL(tools::Long(12741), pOleObj->GetLogicRect().getOpenWidth()); + CPPUNIT_ASSERT_EQUAL(tools::Long(7620), pOleObj->GetLogicRect().getOpenHeight()); CPPUNIT_ASSERT_EQUAL(tools::Long(4574), pOleObj->GetLogicRect().getX()); CPPUNIT_ASSERT_EQUAL(tools::Long(437), pOleObj->GetLogicRect().getY()); @@ -279,8 +279,8 @@ void ScJumboSheetsTest::testTdf134553() pOleObj = getSingleChartObject(rDoc, 0); CPPUNIT_ASSERT(pOleObj); - CPPUNIT_ASSERT_EQUAL(tools::Long(12741), pOleObj->GetLogicRect().getWidth()); - CPPUNIT_ASSERT_EQUAL(tools::Long(7620), pOleObj->GetLogicRect().getHeight()); + CPPUNIT_ASSERT_EQUAL(tools::Long(12741), pOleObj->GetLogicRect().getOpenWidth()); + CPPUNIT_ASSERT_EQUAL(tools::Long(7620), pOleObj->GetLogicRect().getOpenHeight()); CPPUNIT_ASSERT_EQUAL(tools::Long(5097), pOleObj->GetLogicRect().getX()); // tdf#147458: Without the fix in place, this test would have failed with // - Expected: 1058 diff --git a/sc/qa/unit/subsequent_filters_test.cxx b/sc/qa/unit/subsequent_filters_test.cxx index 0019b50ce192..1dea49286b1a 100644 --- a/sc/qa/unit/subsequent_filters_test.cxx +++ b/sc/qa/unit/subsequent_filters_test.cxx @@ -1916,8 +1916,8 @@ void ScFiltersTest::testChartImportXLS() const SdrOle2Obj* pOleObj = getSingleChartObject(rDoc, 0); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve a chart object from the 2nd sheet.", pOleObj); - CPPUNIT_ASSERT_EQUAL(tools::Long(11137), pOleObj->GetLogicRect().getWidth()); - CPPUNIT_ASSERT(8640L > pOleObj->GetLogicRect().getHeight()); + CPPUNIT_ASSERT_EQUAL(tools::Long(11137), pOleObj->GetLogicRect().getOpenWidth()); + CPPUNIT_ASSERT(8640L > pOleObj->GetLogicRect().getOpenHeight()); xDocSh->DoClose(); } diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 8a781127035a..2babb82a6f84 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3533,14 +3533,14 @@ void ScXMLExport::WriteShapes(const ScMyCell& rMyCell) aRectFull.SetTop(aStartCellRect.Top() + aSnapStartOffset.Y()); aRectFull.SetBottom(aEndCellRect.Top() + aSnapEndOffset.Y()); aRectReduced = pObjData->getShapeRect(); - if(abs(aRectFull.getWidth() - aRectReduced.getWidth()) > 1 - || abs(aRectFull.getHeight() - aRectReduced.getHeight()) > 1) + if(abs(aRectFull.getOpenWidth() - aRectReduced.getOpenWidth()) > 1 + || abs(aRectFull.getOpenHeight() - aRectReduced.getOpenHeight()) > 1) { bNeedsRestore = true; - Fraction aScaleWidth(aRectFull.getWidth(), aRectReduced.getWidth()); + Fraction aScaleWidth(aRectFull.getOpenWidth(), aRectReduced.getOpenWidth()); if (!aScaleWidth.IsValid()) aScaleWidth = Fraction(1.0); - Fraction aScaleHeight(aRectFull.getHeight(), aRectReduced.getHeight()); + Fraction aScaleHeight(aRectFull.getOpenHeight(), aRectReduced.getOpenHeight()); if (!aScaleHeight.IsValid()) aScaleHeight = Fraction(1.0); pObj->NbcResize(pObj->GetRelativePos(), aScaleWidth, aScaleHeight); @@ -5190,9 +5190,9 @@ void ScXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& rProps) pProps[++i].Name = "VisibleAreaLeft"; pProps[i].Value <<= static_cast<sal_Int32>(aRect.Left()); pProps[++i].Name = "VisibleAreaWidth"; - pProps[i].Value <<= static_cast<sal_Int32>(aRect.getWidth()); + pProps[i].Value <<= static_cast<sal_Int32>(aRect.getOpenWidth()); pProps[++i].Name = "VisibleAreaHeight"; - pProps[i].Value <<= static_cast<sal_Int32>(aRect.getHeight()); + pProps[i].Value <<= static_cast<sal_Int32>(aRect.getOpenHeight()); } } } diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 523044c7531a..4e66be551f8b 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -2594,7 +2594,7 @@ void lcl_ExtendTiledDimension(bool bColumn, const SCCOLROW nEnd, const SCCOLROW tools::Rectangle(0, aOldSize.getHeight(), aNewSize.getWidth(), aNewSize.getHeight()); // Only invalidate if spreadsheet has extended to the right or bottom - if ((bColumn && aNewArea.getWidth()) || (!bColumn && aNewArea.getHeight())) + if ((bColumn && aNewArea.getOpenWidth()) || (!bColumn && aNewArea.getOpenHeight())) { rTabView.UpdateSelectionOverlay(); SfxLokHelper::notifyInvalidation(rViewData.GetViewShell(), &aNewArea); diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index ae960b0a8c1f..7284c160e6a8 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -429,13 +429,13 @@ void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, bool bNew ) tools::Rectangle aNewRowArea(0, aOldSize.getHeight(), aOldSize.getWidth(), aNewSize.getHeight()); // Only invalidate if spreadsheet extended to the right - if (aNewColArea.getWidth()) + if (aNewColArea.getOpenWidth()) { SfxLokHelper::notifyInvalidation(aViewData.GetViewShell(), &aNewColArea); } // Only invalidate if spreadsheet extended to the bottom - if (aNewRowArea.getHeight()) + if (aNewRowArea.getOpenHeight()) { SfxLokHelper::notifyInvalidation(aViewData.GetViewShell(), &aNewRowArea); } diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx index f864dfa6b938..39d36fa35ef5 100644 --- a/sd/qa/unit/misc-tests.cxx +++ b/sd/qa/unit/misc-tests.cxx @@ -902,7 +902,7 @@ void SdMiscTest::testTdf131033() // Error was, that the 2D representation of the scene did not contain the default 20° // rotation of the new scene around x-axis and therefore was not high enough. - const double fSnapRectHeight = pObj->GetSnapRect().getHeight(); + const double fSnapRectHeight = pObj->GetSnapRect().getOpenHeight(); CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("2D height", 7096.0, fSnapRectHeight, 1.0); xDocShRef->DoClose(); diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index e9f3f012bc6c..fdd01128b7bf 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -570,8 +570,8 @@ void SdTiledRenderingTest::testSetGraphicSelection() ::tools::Rectangle aShapeAfter = pObject->GetSnapRect(); // Check that a resize happened, but aspect ratio is not kept. - CPPUNIT_ASSERT_EQUAL(aShapeBefore.getWidth(), aShapeAfter.getWidth()); - CPPUNIT_ASSERT(aShapeBefore.getHeight() < aShapeAfter.getHeight()); + CPPUNIT_ASSERT_EQUAL(aShapeBefore.getOpenWidth(), aShapeAfter.getOpenWidth()); + CPPUNIT_ASSERT(aShapeBefore.getOpenHeight() < aShapeAfter.getOpenHeight()); } void SdTiledRenderingTest::testUndoShells() @@ -1146,8 +1146,8 @@ void SdTiledRenderingTest::testCursorVisibility_SingleClick() // Click once outside of the text (in the first quartile) => no editing. const ::tools::Rectangle aRect = pTextObject->GetCurrentBoundRect(); - const auto cornerX = o3tl::toTwips(aRect.Left() + (aRect.getWidth() / 4), o3tl::Length::mm100); - const auto cornerY = o3tl::toTwips(aRect.Top() + (aRect.getHeight() / 4), o3tl::Length::mm100); + const auto cornerX = o3tl::toTwips(aRect.Left() + (aRect.getOpenWidth() / 4), o3tl::Length::mm100); + const auto cornerY = o3tl::toTwips(aRect.Top() + (aRect.getOpenHeight() / 4), o3tl::Length::mm100); pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, cornerX, cornerY, 1, MOUSE_LEFT, 0); @@ -1161,8 +1161,8 @@ void SdTiledRenderingTest::testCursorVisibility_SingleClick() CPPUNIT_ASSERT(!aView1.m_bCursorVisible); // Click again, now on the text, in the center, to start editing. - const auto centerX = o3tl::toTwips(aRect.Left() + (aRect.getWidth() / 2), o3tl::Length::mm100); - const auto centerY = o3tl::toTwips(aRect.Top() + (aRect.getHeight() / 2), o3tl::Length::mm100); + const auto centerX = o3tl::toTwips(aRect.Left() + (aRect.getOpenWidth() / 2), o3tl::Length::mm100); + const auto centerY = o3tl::toTwips(aRect.Top() + (aRect.getOpenHeight() / 2), o3tl::Length::mm100); pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, centerX, centerY, 1, MOUSE_LEFT, 0); @@ -1195,8 +1195,8 @@ void SdTiledRenderingTest::testCursorVisibility_DoubleClick() // Double-click outside the text to enter edit mode. const ::tools::Rectangle aRect = pTextObject->GetCurrentBoundRect(); - const auto cornerX = o3tl::toTwips(aRect.Left() + (aRect.getWidth() / 4), o3tl::Length::mm100); - const auto cornerY = o3tl::toTwips(aRect.Top() + (aRect.getHeight() / 4), o3tl::Length::mm100); + const auto cornerX = o3tl::toTwips(aRect.Left() + (aRect.getOpenWidth() / 4), o3tl::Length::mm100); + const auto cornerY = o3tl::toTwips(aRect.Top() + (aRect.getOpenHeight() / 4), o3tl::Length::mm100); pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, cornerX, cornerY, 2, MOUSE_LEFT, 0); @@ -1239,8 +1239,8 @@ void SdTiledRenderingTest::testCursorVisibility_MultiView() SfxLokHelper::setView(nView1); ::tools::Rectangle aRect = pTextObject->GetCurrentBoundRect(); - const auto centerX = o3tl::toTwips(aRect.Left() + (aRect.getWidth() / 2), o3tl::Length::mm100); - const auto centerY = o3tl::toTwips(aRect.Top() + (aRect.getHeight() / 2), o3tl::Length::mm100); + const auto centerX = o3tl::toTwips(aRect.Left() + (aRect.getOpenWidth() / 2), o3tl::Length::mm100); + const auto centerY = o3tl::toTwips(aRect.Top() + (aRect.getOpenHeight() / 2), o3tl::Length::mm100); pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, centerX, centerY, 2, MOUSE_LEFT, 0); @@ -1275,8 +1275,8 @@ void SdTiledRenderingTest::testCursorVisibility_Escape() // Click once on the text to start editing. const ::tools::Rectangle aRect = pTextObject->GetCurrentBoundRect(); - const auto centerX = o3tl::toTwips(aRect.Left() + (aRect.getWidth() / 2), o3tl::Length::mm100); - const auto centerY = o3tl::toTwips(aRect.Top() + (aRect.getHeight() / 2), o3tl::Length::mm100); + const auto centerX = o3tl::toTwips(aRect.Left() + (aRect.getOpenWidth() / 2), o3tl::Length::mm100); + const auto centerY = o3tl::toTwips(aRect.Top() + (aRect.getOpenHeight() / 2), o3tl::Length::mm100); pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, centerX, centerY, 1, MOUSE_LEFT, 0); @@ -2070,8 +2070,8 @@ void SdTiledRenderingTest::testMultiViewInsertDeletePage2() // Double-click outside the text to enter edit mode. const ::tools::Rectangle aRect = pTextObject->GetCurrentBoundRect(); - const auto cornerX = o3tl::toTwips(aRect.Left() + (aRect.getWidth() / 4), o3tl::Length::mm100); - const auto cornerY = o3tl::toTwips(aRect.Top() + (aRect.getHeight() / 4), o3tl::Length::mm100); + const auto cornerX = o3tl::toTwips(aRect.Left() + (aRect.getOpenWidth() / 4), o3tl::Length::mm100); + const auto cornerY = o3tl::toTwips(aRect.Top() + (aRect.getOpenHeight() / 4), o3tl::Length::mm100); pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, cornerX, cornerY, 2, MOUSE_LEFT, 0); diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 2900019aee49..517d3fb09a7a 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -121,8 +121,8 @@ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds() aBoundingBox = awt::Rectangle ( aBBox.Left(), aBBox.Top(), - aBBox.getWidth(), - aBBox.getHeight()); + aBBox.getOpenWidth(), + aBBox.getOpenHeight()); } else aBoundingBox = awt::Rectangle ( diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index cc85ed74f615..993d3dc8ff40 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -588,7 +588,7 @@ IMPL_LINK(CustomAnimationList, KeyInputHdl, const KeyEvent&, rKEvt, bool) if (mxTreeView->get_cursor(xEntry.get())) { auto aRect = mxTreeView->get_row_area(*xEntry); - const Point aPos(aRect.getWidth() / 2, aRect.getHeight() / 2); + const Point aPos(aRect.getOpenWidth() / 2, aRect.getOpenHeight() / 2); const CommandEvent aCEvt(aPos, CommandEventId::ContextMenu); CommandHdl(aCEvt); return true; diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 703f2f59809f..0c0786d3eebb 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -659,8 +659,8 @@ void PresLayoutPreview::Paint(vcl::RenderContext& rRenderContext, SdrTextObj con // build complete transformation by adding view transformation from // logic page coordinates to local pixel coordinates - const double fScaleX(static_cast<double>(maOutRect.getWidth()) / static_cast<double>(maPageSize.Width())); - const double fScaleY(static_cast<double>(maOutRect.getHeight()) / static_cast<double>(maPageSize.Height())); + const double fScaleX(static_cast<double>(maOutRect.getOpenWidth()) / static_cast<double>(maPageSize.Width())); + const double fScaleY(static_cast<double>(maOutRect.getOpenHeight()) / static_cast<double>(maPageSize.Height())); aObjectTransform.scale(fScaleX, fScaleY); aObjectTransform.translate(maOutRect.Left(), maOutRect.Top()); diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index c19445429128..146e8d9e3cb9 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -118,10 +118,10 @@ static void InsertTableImpl(const DrawViewShell* pShell, } else { - if( aMaxSize.Height() > aWinRect.getHeight() ) - aMaxSize.setHeight( aWinRect.getHeight() ); - if( aMaxSize.Width() > aWinRect.getWidth() ) - aMaxSize.setWidth( aWinRect.getWidth() ); + if( aMaxSize.Height() > aWinRect.getOpenHeight() ) + aMaxSize.setHeight( aWinRect.getOpenHeight() ); + if( aMaxSize.Width() > aWinRect.getOpenWidth() ) + aMaxSize.setWidth( aWinRect.getOpenWidth() ); } if( aSize.Width() > aMaxSize.getWidth() ) diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index ff66696d7d8f..8f296d598dec 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1297,7 +1297,7 @@ uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& Property break; const ::tools::Rectangle& aRect = pEmbeddedObj->GetVisArea(); - awt::Rectangle aVisArea( aRect.Left(), aRect.Top(), aRect.getWidth(), aRect.getHeight() ); + awt::Rectangle aVisArea( aRect.Left(), aRect.Top(), aRect.getOpenWidth(), aRect.getOpenHeight() ); aAny <<= aVisArea; } break; diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index c0e09a4787de..f323497ac46f 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -53,8 +53,8 @@ void DrawViewShell::MakeVisible(const ::tools::Rectangle& rRect, vcl::Window& rW // tdf#98646 check if Rectangle which contains the bounds of the region to // be shown eventually contains values that cause overflows when processing // e.g. when calling GetWidth() - const bool bOverflowInX(!rtl::math::approxEqual(static_cast<double>(rRect.getWidth()), static_cast<double>(rRect.Right()) - static_cast<double>(rRect.Left()))); - const bool bOverflowInY(!rtl::math::approxEqual(static_cast<double>(rRect.getHeight()), static_cast<double>(rRect.Bottom()) - static_cast<double>(rRect.Top()))); + const bool bOverflowInX(!rtl::math::approxEqual(static_cast<double>(rRect.getOpenWidth()), static_cast<double>(rRect.Right()) - static_cast<double>(rRect.Left()))); + const bool bOverflowInY(!rtl::math::approxEqual(static_cast<double>(rRect.getOpenHeight()), static_cast<double>(rRect.Bottom()) - static_cast<double>(rRect.Top()))); if(bOverflowInX || bOverflowInY) { diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index b7a6ba4adcea..9eea0e1c2488 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -229,7 +229,7 @@ void RecentDocsView::Paint(vcl::RenderContext& rRenderContext, const tools::Rect if (maWelcomeImage.IsEmpty()) { - const tools::Long aWidth(aRect.GetWidth() > aRect.getHeight() ? aRect.GetHeight()/2 : aRect.GetWidth()/2); + const tools::Long aWidth(aRect.GetWidth() > aRect.getOpenHeight() ? aRect.GetHeight()/2 : aRect.GetWidth()/2); maWelcomeImage = SfxApplication::GetApplicationLogo(aWidth); } diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index 158c27f29b79..36a33edc086b 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -218,7 +218,7 @@ void ThumbnailViewItem::addTextPrimitives (const OUString& rText, const Thumbnai aTextEngine.SetFont(getVclFontFromFontAttribute(pAttrs->aFontAttr, pAttrs->aFontSize.getX(), pAttrs->aFontSize.getY(), 0, css::lang::Locale())); - aTextEngine.SetMaxTextWidth(maDrawArea.getWidth()); + aTextEngine.SetMaxTextWidth(maDrawArea.getOpenWidth()); aTextEngine.SetText(aOrigText); sal_Int32 nPrimitives = rSeq.size(); @@ -240,7 +240,7 @@ void ThumbnailViewItem::addTextPrimitives (const OUString& rText, const Thumbnai double nDotsWidth = aTextDev.getTextWidth("...",0,3); sal_Int32 nLength = nLineLength - 1; - while ( nDotsWidth + aTextDev.getTextWidth(aText, nLineStart, nLength) > maDrawArea.getWidth() && nLength > 0) + while ( nDotsWidth + aTextDev.getTextWidth(aText, nLineStart, nLength) > maDrawArea.getOpenWidth() && nLength > 0) { --nLength; } @@ -249,7 +249,7 @@ void ThumbnailViewItem::addTextPrimitives (const OUString& rText, const Thumbnai nLineLength = nLength + 3; } - double nLineX = maDrawArea.Left() + (maDrawArea.getWidth() - nLineWidth) / 2.0; + double nLineX = maDrawArea.Left() + (maDrawArea.getOpenWidth() - nLineWidth) / 2.0; basegfx::B2DHomMatrix aTextMatrix( createScaleTranslateB2DHomMatrix( pAttrs->aFontSize.getX(), pAttrs->aFontSize.getY(), diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index dd4e5beac67f..23cc82cf3e31 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -163,7 +163,7 @@ RehearseTimingsActivity::RehearseTimingsActivity( const SlideShowContext& rConte tools::Rectangle rect; const FontMetric metric( blackHole->GetFontMetric() ); blackHole->GetTextBoundRect( rect, "XX:XX:XX" ); - maSpriteSizePixel.setX( rect.getWidth() * 12 / 10 ); + maSpriteSizePixel.setX( rect.getOpenWidth() * 12 / 10 ); maSpriteSizePixel.setY( metric.GetLineHeight() * 11 / 10 ); mnYOffset = (metric.GetAscent() + (metric.GetLineHeight() / 20)); @@ -455,7 +455,7 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas ) blackHole->DrawRect( rect ); blackHole->GetTextBoundRect( rect, time ); blackHole->DrawText( - Point( (maSpriteSizePixel.getX() - rect.getWidth()) / 2, + Point( (maSpriteSizePixel.getX() - rect.getOpenWidth()) / 2, mnYOffset ), time ); metaFile.Stop(); diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index 43aa86a76d30..9f6789d3b707 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -80,14 +80,14 @@ bool SfxRectangleItem::QueryValue( css::uno::Any& rVal, { rVal <<= css::awt::Rectangle( aVal.Left(), aVal.Top(), - aVal.getWidth(), - aVal.getHeight() ); + aVal.getOpenWidth(), + aVal.getOpenHeight() ); break; } case MID_RECT_LEFT: rVal <<= aVal.Left(); break; case MID_RECT_RIGHT: rVal <<= aVal.Top(); break; - case MID_WIDTH: rVal <<= aVal.getWidth(); break; - case MID_HEIGHT: rVal <<= aVal.getHeight(); break; + case MID_WIDTH: rVal <<= aVal.getOpenWidth(); break; + case MID_HEIGHT: rVal <<= aVal.getOpenHeight(); break; default: OSL_FAIL("Wrong MemberID!"); return false; } diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index a62d0ae6fad9..d47d96bc105a 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -105,8 +105,8 @@ public: tools::Long nTextWidth = mrRenderContext.GetTextWidth(aText); tools::Long nTextHeight = mrRenderContext.GetTextHeight(); Point aPos = aRect.TopLeft(); - aPos.AdjustX((aRect.getWidth() - nTextWidth) / 2 ); - aPos.AdjustY((aRect.getHeight() - nTextHeight) / 2 ); + aPos.AdjustX((aRect.getOpenWidth() - nTextWidth) / 2 ); + aPos.AdjustY((aRect.getOpenHeight() - nTextHeight) / 2 ); if (mbEnabled) mrRenderContext.DrawText(aPos, aText); @@ -157,7 +157,7 @@ public: BitmapEx aBitmap(BMP_TAB_LOCK); Point aPosition = maRect.TopLeft(); aPosition.AdjustX(2); - aPosition.AdjustY((maRect.getHeight() - aBitmap.GetSizePixel().Height()) / 2); + aPosition.AdjustY((maRect.getOpenHeight() - aBitmap.GetSizePixel().Height()) / 2); mrRenderContext.DrawBitmapEx(aPosition, aBitmap); } } diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 2caf0841a104..567f65978352 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -559,8 +559,8 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds() aBoundingBox = awt::Rectangle ( aBBox.Left(), aBBox.Top(), - aBBox.getWidth(), - aBBox.getHeight()); + aBBox.getOpenWidth(), + aBBox.getOpenHeight()); } else { diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 00a59ebf5a66..731f8208d2f6 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -571,8 +571,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( pScene->NbcSetSnapRect( aSnapRect ); // InitScene replacement - double fW = aBoundRect2d.getWidth(); - double fH = aBoundRect2d.getHeight(); + double fW = aBoundRect2d.getOpenWidth(); + double fH = aBoundRect2d.getOpenHeight(); rCamera.SetAutoAdjustProjection( false ); rCamera.SetViewWindow( -fW / 2, - fH / 2, fW, fH); basegfx::B3DPoint aLookAt( 0.0, 0.0, 0.0 ); @@ -620,8 +620,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( GetRotateAngle( rGeometryItem, fXRotate, fYRotate ); drawing::Direction3D aRotationCenterDefault( 0, 0, 0 ); drawing::Direction3D aRotationCenter( GetDirection3D( rGeometryItem, "RotationCenter", aRotationCenterDefault ) ); - aRotationCenter.DirectionX *= aSnapRect.getWidth(); - aRotationCenter.DirectionY *= aSnapRect.getHeight(); + aRotationCenter.DirectionX *= aSnapRect.getOpenWidth(); + aRotationCenter.DirectionY *= aSnapRect.getOpenHeight(); if (pMap) { aRotationCenter.DirectionZ *= *pMap; diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx index 6bae552631d5..4040ace8c8f6 100644 --- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx @@ -238,8 +238,8 @@ void ViewContactOfE3dScene::createObjectTransformation() // create 2d Object Transformation from relative point in 2d scene to world const tools::Rectangle aRectangle(GetE3dScene().GetSnapRect()); - maObjectTransformation.set(0, 0, aRectangle.getWidth()); - maObjectTransformation.set(1, 1, aRectangle.getHeight()); + maObjectTransformation.set(0, 0, aRectangle.getOpenWidth()); + maObjectTransformation.set(1, 1, aRectangle.getOpenHeight()); maObjectTransformation.set(0, 2, aRectangle.Left()); maObjectTransformation.set(1, 2, aRectangle.Top()); } diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index fa52924585c5..2db2e018ed77 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -163,8 +163,8 @@ namespace sdr::properties { // Shape is filled by a vector graphic: tell it our size as a hint. basegfx::B2DTuple aSizeHint; - aSizeHint.setX(GetSdrObject().GetSnapRect().getWidth()); - aSizeHint.setY(GetSdrObject().GetSnapRect().getHeight()); + aSizeHint.setX(GetSdrObject().GetSnapRect().getOpenWidth()); + aSizeHint.setY(GetSdrObject().GetSnapRect().getOpenHeight()); pVectorData->setSizeHint(aSizeHint); } } diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 371584bd891a..bc5d2bb5003c 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -1489,7 +1489,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const // multiple objects, range is collected in aRect aTransformation = basegfx::utils::createScaleTranslateB2DHomMatrix( aRect.Left(), aRect.Top(), - aRect.getWidth(), aRect.getHeight()); + aRect.getOpenWidth(), aRect.getOpenHeight()); } else { diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index a21c594157a6..16f5be67f7f3 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -2342,7 +2342,7 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(tools::Rectangle& rR, bool // Both 'resize shape to fix text' and multiple columns are enabled. The // first means a dynamic height, the second expects a fixed height. // Resolve this conflict by going with the original height. - nHgt = rR.getHeight(); + nHgt = rR.getOpenHeight(); } } rOutliner.Clear(); diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 0cb9072fb04b..1f2678782834 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -307,7 +307,7 @@ css::awt::Rectangle SAL_CALL AccessibleCell::getBounds() awt::Size aParentSize (xParentComponent->getSize()); ::tools::Rectangle aParentBBox (0,0, aParentSize.Width, aParentSize.Height); aBBox = aBBox.GetIntersection (aParentBBox); - aBoundingBox = awt::Rectangle ( aBBox.Left(), aBBox.Top(), aBBox.getWidth(), aBBox.getHeight()); + aBoundingBox = awt::Rectangle ( aBBox.Left(), aBBox.Top(), aBBox.getOpenWidth(), aBBox.getOpenHeight()); } else { diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 4cfa65900ac1..87f26b31704f 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -1917,8 +1917,8 @@ void SdrTableObj::NbcSetLogicRect(const tools::Rectangle& rRect) { maLogicRect=rRect; ImpJustifyRect(maLogicRect); - const bool bWidth = maLogicRect.getWidth() != maRect.getWidth(); - const bool bHeight = maLogicRect.getHeight() != maRect.getHeight(); + const bool bWidth = maLogicRect.getOpenWidth() != maRect.getOpenWidth(); + const bool bHeight = maLogicRect.getOpenHeight() != maRect.getOpenHeight(); maRect = maLogicRect; if (mpImpl->mbSkipChangeLayout) // Avoid distributing newly available space between existing cells. @@ -1932,7 +1932,7 @@ void SdrTableObj::NbcSetLogicRect(const tools::Rectangle& rRect) void SdrTableObj::AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool /* bShrinkOnly = false */ ) { tools::Rectangle aAdjustRect( rMaxRect ); - aAdjustRect.setHeight( GetLogicRect().getHeight() ); + aAdjustRect.setHeight( GetLogicRect().getOpenHeight() ); SetLogicRect( aAdjustRect ); } diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 87bd4436e7f3..6c55b57bb97c 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -647,9 +647,9 @@ void TableLayouter::LayoutTableWidth( tools::Rectangle& rArea, bool bFit ) } // if we have optimal sized rows, distribute what is given (left) - if( !bFit && !aOptimalColumns.empty() && (nCurrentWidth < rArea.getWidth()) ) + if( !bFit && !aOptimalColumns.empty() && (nCurrentWidth < rArea.getOpenWidth()) ) { - sal_Int32 nLeft = rArea.getWidth() - nCurrentWidth; + sal_Int32 nLeft = rArea.getOpenWidth() - nCurrentWidth; sal_Int32 nDistribute = nLeft / aOptimalColumns.size(); auto iter( aOptimalColumns.begin() ); @@ -697,8 +697,8 @@ void TableLayouter::LayoutTableWidth( tools::Rectangle& rArea, bool bFit ) } // now scale if wanted and needed - if( bFit && (nCurrentWidth != rArea.getWidth()) ) - distribute( maColumns, rArea.getWidth() - nCurrentWidth ); + if( bFit && (nCurrentWidth != rArea.getOpenWidth()) ) + distribute( maColumns, rArea.getOpenWidth() - nCurrentWidth ); // last step, update left edges sal_Int32 nNewWidth = 0; @@ -834,9 +834,9 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit ) } // if we have optimal sized rows, distribute what is given (left) - if( !bFit && !aOptimalRows.empty() && (nCurrentHeight < rArea.getHeight()) ) + if( !bFit && !aOptimalRows.empty() && (nCurrentHeight < rArea.getOpenHeight()) ) { - sal_Int32 nLeft = rArea.getHeight() - nCurrentHeight; + sal_Int32 nLeft = rArea.getOpenHeight() - nCurrentHeight; sal_Int32 nDistribute = nLeft / aOptimalRows.size(); auto iter( aOptimalRows.begin() ); @@ -881,8 +881,8 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit ) } // now scale if wanted and needed - if( bFit && nCurrentHeight != rArea.getHeight() ) - distribute(maRows, o3tl::saturating_sub<sal_Int32>(rArea.getHeight(), nCurrentHeight)); + if( bFit && nCurrentHeight != rArea.getOpenHeight() ) + distribute(maRows, o3tl::saturating_sub<sal_Int32>(rArea.getOpenHeight(), nCurrentHeight)); // last step, update left edges sal_Int32 nNewHeight = 0; diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 802cc1f4fcb8..472bed1ecfc6 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -210,7 +210,7 @@ void FontWorkGalleryDialog::insertSelectedFontwork() aPagePos.setX(convertTwipToMm100(aPagePos.X())); aPagePos.setY(convertTwipToMm100(aPagePos.Y())); - sal_Int32 nLOKViewWidth = 0.8 * convertTwipToMm100(pViewShell->getLOKVisibleArea().getWidth()); + sal_Int32 nLOKViewWidth = 0.8 * convertTwipToMm100(pViewShell->getLOKVisibleArea().getOpenWidth()); if (aFontworkSize.getWidth() > nLOKViewWidth) { double fScale = static_cast<double>(aFontworkSize.getWidth()) / nLOKViewWidth; diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index e618c209d697..2280402dcb76 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -1157,7 +1157,7 @@ awt::Size SAL_CALL SvxShape::getSize() if(HasSdrObject()) { tools::Rectangle aRect( svx_getLogicRectHack(GetSdrObject()) ); - Size aObjSize( aRect.getWidth(), aRect.getHeight() ); + Size aObjSize( aRect.getOpenWidth(), aRect.getOpenHeight() ); ForceMetricTo100th_mm(aObjSize); return css::awt::Size( aObjSize.getWidth(), aObjSize.getHeight() ); } diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index a4a9d7b318b3..15fd2ab4e6c8 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -445,8 +445,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSetGraphicSelection) pXTextDocument->setGraphicSelection(LOK_SETGRAPHICSELECTION_END, pHdl->GetPos().getX(), pHdl->GetPos().getY() + 1000); tools::Rectangle aShapeAfter = pObject->GetSnapRect(); // Check that a resize happened, but aspect ratio is not kept. - CPPUNIT_ASSERT_EQUAL(aShapeBefore.getWidth(), aShapeAfter.getWidth()); - CPPUNIT_ASSERT_EQUAL(aShapeBefore.getHeight() + 1000, aShapeAfter.getHeight()); + CPPUNIT_ASSERT_EQUAL(aShapeBefore.getOpenWidth(), aShapeAfter.getOpenWidth()); + CPPUNIT_ASSERT_EQUAL(aShapeBefore.getOpenHeight() + 1000, aShapeAfter.getOpenHeight()); } CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testResetSelection) diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index c1a77a6b8747..d075eab58b22 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -978,7 +978,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testShapeTextboxAutosize) // Shape -> textbox synchronization was missing, the second shape had the // same height as the first, even though the first contained 1 paragraph // and the other 2 ones. - CPPUNIT_ASSERT(pFirst->GetSnapRect().getHeight() < pSecond->GetSnapRect().getHeight()); + CPPUNIT_ASSERT(pFirst->GetSnapRect().getOpenHeight() < pSecond->GetSnapRect().getOpenHeight()); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testFdo82191) diff --git a/sw/source/core/crsr/FormFieldButton.cxx b/sw/source/core/crsr/FormFieldButton.cxx index 43534de207c0..319dcdb9c0dd 100644 --- a/sw/source/core/crsr/FormFieldButton.cxx +++ b/sw/source/core/crsr/FormFieldButton.cxx @@ -121,7 +121,7 @@ void FormFieldButton::Paint(vcl::RenderContext& rRenderContext, const tools::Rec Point aButtonPos(aFrameRect.TopLeft()); aButtonPos.AdjustX(aFrameRect.GetSize().getWidth() - 1); Size aButtonSize(aFrameRect.GetSize()); - aButtonSize.setWidth(GetSizePixel().getWidth() - aFrameRect.getWidth() - nPadding); + aButtonSize.setWidth(GetSizePixel().getWidth() - aFrameRect.getOpenWidth() - nPadding); const tools::Rectangle aButtonRect(tools::Rectangle(aButtonPos, aButtonSize)); // Background & border diff --git a/sw/source/core/crsr/contentcontrolbutton.cxx b/sw/source/core/crsr/contentcontrolbutton.cxx index 34cbd38e663a..310eba3092f1 100644 --- a/sw/source/core/crsr/contentcontrolbutton.cxx +++ b/sw/source/core/crsr/contentcontrolbutton.cxx @@ -111,7 +111,7 @@ void SwContentControlButton::Paint(vcl::RenderContext& rRenderContext, const too Point aButtonPos(aFrameRect.TopLeft()); aButtonPos.AdjustX(aFrameRect.GetSize().getWidth() - nPadding * 2); Size aButtonSize(aFrameRect.GetSize()); - aButtonSize.setWidth(GetSizePixel().getWidth() - aFrameRect.getWidth() - nPadding); + aButtonSize.setWidth(GetSizePixel().getWidth() - aFrameRect.getOpenWidth() - nPadding); const tools::Rectangle aButtonRect(tools::Rectangle(aButtonPos, aButtonSize)); // Background & border diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx index 1ac5ccf71787..445abf738141 100644 --- a/sw/source/core/doc/textboxhelper.cxx +++ b/sw/source/core/doc/textboxhelper.cxx @@ -989,8 +989,8 @@ void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_u } else if (bAdjustSize) { - awt::Size aSize(convertTwipToMm100(aRect.getWidth()), - convertTwipToMm100(aRect.getHeight())); + awt::Size aSize(convertTwipToMm100(aRect.getOpenWidth()), + convertTwipToMm100(aRect.getOpenHeight())); aValue <<= aSize; } } @@ -1105,7 +1105,7 @@ void SwTextBoxHelper::syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet const& SwFormatFrameSize aSize(pFormat->GetFrameSize()); if (!aRect.IsEmpty()) { - aSize.SetHeight(aRect.getHeight()); + aSize.SetHeight(aRect.getOpenHeight()); aTextBoxSet.Put(aSize); } } @@ -1159,8 +1159,8 @@ void SwTextBoxHelper::syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet const& aTextBoxSet.Put(aHoriOrient); } - aSize.SetWidth(aRect.getWidth()); - aSize.SetHeight(aRect.getHeight()); + aSize.SetWidth(aRect.getOpenWidth()); + aSize.SetHeight(aRect.getOpenHeight()); aTextBoxSet.Put(aSize); } } diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index b2b7239db0e9..f082e456b5f2 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -945,8 +945,8 @@ void SwVirtFlyDrawObj::NbcCrop(const basegfx::B2DPoint& rRef, double fxFact, dou // Create the new TopLeft of the unrotated, cropped object by creating // as if re-creating the unrotated geometry aNewTopLeft = Point( - basegfx::fround(aRotNewCenter.getX() - (0.5 * aNewRect.getWidth())), - basegfx::fround(aRotNewCenter.getY() - (0.5 * aNewRect.getHeight()))); + basegfx::fround(aRotNewCenter.getX() - (0.5 * aNewRect.getOpenWidth())), + basegfx::fround(aRotNewCenter.getY() - (0.5 * aNewRect.getOpenHeight()))); } // check if we have movement and execute if yes diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 0e27a89d8516..00d6db3dc16f 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -934,9 +934,9 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma const tools::Rectangle& rSnapRect = pObject->GetSnapRect(); aFrameSize.emplace(); aFrameSize->SetWidthSizeType(SwFrameSize::Fixed); - aFrameSize->SetWidth(rSnapRect.getWidth()); + aFrameSize->SetWidth(rSnapRect.getOpenWidth()); aFrameSize->SetHeightSizeType(SwFrameSize::Fixed); - aFrameSize->SetHeight(rSnapRect.getHeight()); + aFrameSize->SetHeight(rSnapRect.getOpenHeight()); pFSItem = &*aFrameSize; } if( (nFrameOptions & HtmlFrmOpts::Size) && diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index c3c5b742e1ed..c3524d3c74d3 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -158,8 +158,8 @@ void lcl_calculateMSOBaseRectangle(const SdrObject& rObj, double& rfMSOLeft, dou // directly usable as 'base rectangle'. double fCenterX = (rObj.GetSnapRect().Left() + rObj.GetSnapRect().Right()) / 2.0; double fCenterY = (rObj.GetSnapRect().Top() + rObj.GetSnapRect().Bottom()) / 2.0; - double fHalfWidth = rObj.GetLogicRect().getWidth() / 2.0; - double fHalfHeight = rObj.GetLogicRect().getHeight() / 2.0; + double fHalfWidth = rObj.GetLogicRect().getOpenWidth() / 2.0; + double fHalfHeight = rObj.GetLogicRect().getOpenHeight() / 2.0; // MSO swaps width and height depending on rotation angle; exception: Word 2007 (vers 12) never // swaps width and height for images. @@ -334,9 +334,9 @@ tools::Polygon lcl_CreateContourPolygon(SdrObject* pSdrObj) basegfx::B2DHomMatrix aTranslateToOrigin( basegfx::utils::createTranslateB2DHomMatrix(-aCenter.X(), -aCenter.Y())); aPolyPolygon.transform(aTranslateToOrigin); - const double fWidth(pSdrObj->GetLogicRect().getWidth()); + const double fWidth(pSdrObj->GetLogicRect().getOpenWidth()); double fScaleX = fWidth == 0.0 ? 1.0 : 21600.0 / fWidth; - const double fHeight(pSdrObj->GetLogicRect().getHeight()); + const double fHeight(pSdrObj->GetLogicRect().getOpenHeight()); double fScaleY = fHeight == 0.0 ? 1.0 : 21600.0 / fHeight; basegfx::B2DHomMatrix aScale(basegfx::utils::createScaleB2DHomMatrix(fScaleX, fScaleY)); aPolyPolygon.transform(aScale); @@ -386,9 +386,9 @@ tools::Polygon lcl_CreateContourPolygon(SdrObject* pSdrObj) basegfx::utils::createTranslateB2DHomMatrix(-aCenter.X(), -aCenter.Y())); aPolyPolygon.transform(aTranslateToOrigin); - const double fWidth(pSdrObj->GetLogicRect().getWidth()); + const double fWidth(pSdrObj->GetLogicRect().getOpenWidth()); double fScaleX = fWidth == 0.0 ? 1.0 : 21600.0 / fWidth; - const double fHeight(pSdrObj->GetLogicRect().getHeight()); + const double fHeight(pSdrObj->GetLogicRect().getOpenHeight()); double fScaleY = fHeight == 0.0 ? 1.0 : 21600.0 / fHeight; basegfx::B2DHomMatrix aScale( basegfx::utils::createScaleB2DHomMatrix(fScaleX, fScaleY)); @@ -1384,7 +1384,8 @@ void DocxSdrExport::writeDMLDrawing(const SdrObject* pSdrObject, const SwFrameFo m_pImpl->getExport().DocxAttrOutput().GetSdtEndBefore(pSdrObject); sax_fastparser::FSHelperPtr pFS = m_pImpl->getSerializer(); - Size aSize(pSdrObject->GetLogicRect().getWidth(), pSdrObject->GetLogicRect().getHeight()); + Size aSize(pSdrObject->GetLogicRect().getOpenWidth(), + pSdrObject->GetLogicRect().getOpenHeight()); startDMLAnchorInline(pFrameFormat, aSize); rtl::Reference<sax_fastparser::FastAttributeList> pDocPrAttrList @@ -1665,7 +1666,7 @@ void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrameFormat uno::UNO_QUERY); // write necessary tags to document.xml - Size aSize(sdrObject->GetSnapRect().getWidth(), sdrObject->GetSnapRect().getHeight()); + Size aSize(sdrObject->GetSnapRect().getOpenWidth(), sdrObject->GetSnapRect().getOpenHeight()); startDMLAnchorInline(&rFrameFormat, aSize); m_pImpl->getDrawingML()->SetFS(m_pImpl->getSerializer()); diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index d2de899f2d3d..bcfc410ffb6e 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -676,8 +676,8 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const const bool bAllowSwap = pObj->GetObjIdentifier() != SdrObjKind::Line && pObj->GetObjIdentifier() != SdrObjKind::Group; if ( bAllowSwap && (( nAngle > 4500_deg100 && nAngle <= 13500_deg100 ) || ( nAngle > 22500_deg100 && nAngle <= 31500_deg100 )) ) { - const tools::Long nWidth = aRect.getWidth(); - const tools::Long nHeight = aRect.getHeight(); + const tools::Long nWidth = aRect.getOpenWidth(); + const tools::Long nHeight = aRect.getOpenHeight(); aRect.setWidth( nHeight ); aRect.setHeight( nWidth ); bHasHeightWidthSwapped = true; @@ -749,10 +749,10 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const { SwTwips nXOff; SwTwips nYOff; - SwTwips nSnapWidth = pObj->GetSnapRect().getWidth(); - SwTwips nSnapHeight = pObj->GetSnapRect().getHeight(); - SwTwips nLogicWidth = pObj->GetLogicRect().getWidth(); - SwTwips nLogicHeight = pObj->GetLogicRect().getHeight(); + SwTwips nSnapWidth = pObj->GetSnapRect().getOpenWidth(); + SwTwips nSnapHeight = pObj->GetSnapRect().getOpenHeight(); + SwTwips nLogicWidth = pObj->GetLogicRect().getOpenWidth(); + SwTwips nLogicHeight = pObj->GetLogicRect().getOpenHeight(); // +1 for to compensate integer arithmetic rounding errors if(bHasHeightWidthSwapped) { diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index 85d3da00f529..cca26f41e78c 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -323,7 +323,7 @@ void SwHeaderFooterWin::PaintButton() // Create the 'plus' or 'arrow' primitive B2DRectangle aSignArea(B2DPoint(aRect.Right() - BUTTON_WIDTH, 0.0), - B2DSize(aRect.Right(), aRect.getHeight())); + B2DSize(aRect.Right(), aRect.getOpenHeight())); B2DPolygon aSign; bool bIsEmptyHeaderFooter = IsEmptyHeaderFooter(); diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index 103503d55efc..7356ea31f727 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -211,9 +211,9 @@ void SwPageBreakWin::PaintButton() aSeq[2].set(new drawinglayer::primitive2d::DiscreteBitmapPrimitive2D( aBmpEx, B2DPoint(nImgOfstX, 1.0))); - double nTop = double(aRect.getHeight()) / 2.0; + double nTop = double(aRect.getOpenHeight()) / 2.0; double nBottom = nTop + 4.0; - double nLeft = aRect.getWidth() - ARROW_WIDTH - 6.0; + double nLeft = aRect.getOpenWidth() - ARROW_WIDTH - 6.0; if (bRtl) nLeft = ARROW_WIDTH - 2.0; double nRight = nLeft + 8.0; diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index e73511960dea..4916352aa5c5 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -1010,8 +1010,8 @@ css::awt::Rectangle VCLXToolkit::getWorkArea( ) css::awt::Rectangle aNotherRect; aNotherRect.X = aWorkRect.Left(); aNotherRect.Y = aWorkRect.Top(); - aNotherRect.Width = aWorkRect.getWidth(); - aNotherRect.Height = aWorkRect.getHeight(); + aNotherRect.Width = aWorkRect.getOpenWidth(); + aNotherRect.Height = aWorkRect.getOpenHeight(); return aNotherRect; } diff --git a/tools/qa/cppunit/test_rectangle.cxx b/tools/qa/cppunit/test_rectangle.cxx index 2b6518d797c4..4cf1b57d8b2b 100644 --- a/tools/qa/cppunit/test_rectangle.cxx +++ b/tools/qa/cppunit/test_rectangle.cxx @@ -32,8 +32,8 @@ void Test::test_rectangle() CPPUNIT_ASSERT_EQUAL(tools::Long(1), aRect.GetWidth()); CPPUNIT_ASSERT_EQUAL(tools::Long(1), aRect.GetHeight()); ... etc. - the rest is truncated
