diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2022-06-29 00:06:03 +1000 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2022-07-11 11:06:53 +0200 |
| commit | 934985becc567114c3f38a72322056a628aad7c9 (patch) | |
| tree | 54530473a4d3a0a5876aff68b3727d51fa4dc88d /oox | |
| parent | a19e01812b60580c656cf31619e212803e2ca0fa (diff) | |
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 <quikee@gmail.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/shapes.cxx | 4 | ||||
| -rw-r--r-- | oox/source/export/vmlexport.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
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 |