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 /writerfilter | |
| 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 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 49435404c003..1c347d1fdfcf 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -983,8 +983,8 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) tools::Rectangle aSnapRect = pShape->GetSnapRect(); // Twips m_pImpl->nLeftPosition = ConversionHelper::convertTwipToMM100(aSnapRect.Left()); m_pImpl->nTopPosition = ConversionHelper::convertTwipToMM100(aSnapRect.Top()); - aLOSize.Width = ConversionHelper::convertTwipToMM100(aSnapRect.getWidth()); - aLOSize.Height = ConversionHelper::convertTwipToMM100(aSnapRect.getHeight()); + aLOSize.Width = ConversionHelper::convertTwipToMM100(aSnapRect.getOpenWidth()); + aLOSize.Height = ConversionHelper::convertTwipToMM100(aSnapRect.getOpenHeight()); } else { @@ -1051,8 +1051,8 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) tools::Rectangle aSnapRect = pShape->GetSnapRect(); // Twip aLOSnapRect.X = ConversionHelper::convertTwipToMM100(aSnapRect.Left()); aLOSnapRect.Y = ConversionHelper::convertTwipToMM100(aSnapRect.Top()); - aLOSnapRect.Width = ConversionHelper::convertTwipToMM100(aSnapRect.getWidth()); - aLOSnapRect.Height = ConversionHelper::convertTwipToMM100(aSnapRect.getHeight()); + aLOSnapRect.Width = ConversionHelper::convertTwipToMM100(aSnapRect.getOpenWidth()); + aLOSnapRect.Height = ConversionHelper::convertTwipToMM100(aSnapRect.getOpenHeight()); } m_pImpl->nLeftMargin += aLOSnapRect.X - aMSOBaseLeftTop.X; @@ -1093,8 +1093,8 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) tools::Rectangle aBoundRect = pShape->GetCurrentBoundRect(); // Twip aLOBoundRect.X = ConversionHelper::convertTwipToMM100(aBoundRect.Left()); aLOBoundRect.Y = ConversionHelper::convertTwipToMM100(aBoundRect.Top()); - aLOBoundRect.Width = ConversionHelper::convertTwipToMM100(aBoundRect.getWidth()); - aLOBoundRect.Height = ConversionHelper::convertTwipToMM100(aBoundRect.getHeight()); + aLOBoundRect.Width = ConversionHelper::convertTwipToMM100(aBoundRect.getOpenWidth()); + aLOBoundRect.Height = ConversionHelper::convertTwipToMM100(aBoundRect.getOpenHeight()); } m_pImpl->nLeftMargin += aLOBoundRect.X - aMSOBaseLeftTop.X; |