diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-12 09:32:02 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-12 16:53:22 +0100 |
| commit | c45753847dfc2b4645dc2f7500a18ec2c5d438df (patch) | |
| tree | 8d04962d7a4367a92d220beb0c35effb9490395b /sfx2 | |
| parent | 768cfcee178b284be6d96d384364e59e40ecb375 (diff) | |
Revert "remove Fraction::operator tools::Long()"
This reverts commit 48b667a7e7d25f835f95df89162a7849d6972531.
Reason for revert: some discussion required
Change-Id: Ia0990d280837fb68b7ddc9f472ec78b1467b4311
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105540
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/ipclient.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index c23f0af239e1..fbba1febc5c1 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -416,8 +416,8 @@ awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getPlacement() // apply scaling to object area and convert to pixels tools::Rectangle aRealObjArea( m_aObjArea ); - aRealObjArea.SetSize( Size( sal_Int32( aRealObjArea.GetWidth() * m_aScaleWidth), - sal_Int32( aRealObjArea.GetHeight() * m_aScaleHeight) ) ); + aRealObjArea.SetSize( Size( tools::Long( aRealObjArea.GetWidth() * m_aScaleWidth), + tools::Long( aRealObjArea.GetHeight() * m_aScaleHeight) ) ); // In Writer and Impress the map mode is disabled. So when a chart is // activated (for in place editing) we get the chart win size in 100th mm @@ -451,8 +451,8 @@ awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getClipRectangle() // currently(?) same as placement tools::Rectangle aRealObjArea( m_aObjArea ); - aRealObjArea.SetSize( Size( sal_Int32( aRealObjArea.GetWidth() * m_aScaleWidth), - sal_Int32( aRealObjArea.GetHeight() * m_aScaleHeight) ) ); + aRealObjArea.SetSize( Size( tools::Long( aRealObjArea.GetWidth() * m_aScaleWidth), + tools::Long( aRealObjArea.GetHeight() * m_aScaleHeight) ) ); // See comment for SfxInPlaceClient_Impl::getPlacement. if (comphelper::LibreOfficeKit::isActive()) @@ -522,8 +522,8 @@ void SAL_CALL SfxInPlaceClient_Impl::changedPlacement( const awt::Rectangle& aPo SfxBooleanFlagGuard aGuard( m_bResizeNoScale ); // new size of the object area without scaling - Size aNewObjSize( sal_Int32( aNewLogicRect.GetWidth() / m_aScaleWidth ), - sal_Int32( aNewLogicRect.GetHeight() / m_aScaleHeight ) ); + Size aNewObjSize( tools::Long( aNewLogicRect.GetWidth() / m_aScaleWidth ), + tools::Long( aNewLogicRect.GetHeight() / m_aScaleHeight ) ); // now remove scaling from new placement and keep this at the new object area aNewLogicRect.SetSize( aNewObjSize ); @@ -760,8 +760,8 @@ const tools::Rectangle& SfxInPlaceClient::GetObjArea() const tools::Rectangle SfxInPlaceClient::GetScaledObjArea() const { tools::Rectangle aRealObjArea( m_xImp->m_aObjArea ); - aRealObjArea.SetSize( Size( sal_Int32( aRealObjArea.GetWidth() * m_xImp->m_aScaleWidth ), - sal_Int32( aRealObjArea.GetHeight() * m_xImp->m_aScaleHeight ) ) ); + aRealObjArea.SetSize( Size( tools::Long( aRealObjArea.GetWidth() * m_xImp->m_aScaleWidth ), + tools::Long( aRealObjArea.GetHeight() * m_xImp->m_aScaleHeight ) ) ); return aRealObjArea; } @@ -815,8 +815,8 @@ void SfxInPlaceClient::Invalidate() // the object area is provided in logical coordinates of the window but without scaling applied tools::Rectangle aRealObjArea( m_xImp->m_aObjArea ); - aRealObjArea.SetSize( Size( sal_Int32( aRealObjArea.GetWidth() * m_xImp->m_aScaleWidth ), - sal_Int32( aRealObjArea.GetHeight() * m_xImp->m_aScaleHeight ) ) ); + aRealObjArea.SetSize( Size( tools::Long( aRealObjArea.GetWidth() * m_xImp->m_aScaleWidth ), + tools::Long( aRealObjArea.GetHeight() * m_xImp->m_aScaleHeight ) ) ); m_pEditWin->Invalidate( aRealObjArea ); ViewChanged(); |