diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-15 21:30:46 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-16 10:27:56 +0100 |
| commit | ef5812deb142d043e58965bf8f4829b50acffcee (patch) | |
| tree | 6fc631844fa7d91befbcd41ac8a08ad3dedcdb72 /basic | |
| parent | 3fcee07aa7edb927eec77ea865ad1c33f6bdabfa (diff) | |
can use LogicToLogic here
Change-Id: Ibb9b9d01baa2cf9e6635dc3707ccc53e5fa7166e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86890
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/runtime/stdobj1.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx index 79105d3e4ed3..aad42547a58e 100644 --- a/basic/source/runtime/stdobj1.cxx +++ b/basic/source/runtime/stdobj1.cxx @@ -84,10 +84,7 @@ void SbStdPicture::PropWidth( SbxVariable* pVar, bool bWrite ) return; } - Size aSize = aGraphic.GetPrefSize(); - aSize = Application::GetDefaultDevice()->LogicToPixel( aSize, aGraphic.GetPrefMapMode() ); - aSize = Application::GetDefaultDevice()->PixelToLogic( aSize, MapMode( MapUnit::MapTwip ) ); - + Size aSize = OutputDevice::LogicToLogic(aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode(), MapMode(MapUnit::MapTwip)); pVar->PutInteger( static_cast<sal_Int16>(aSize.Width()) ); } @@ -99,10 +96,7 @@ void SbStdPicture::PropHeight( SbxVariable* pVar, bool bWrite ) return; } - Size aSize = aGraphic.GetPrefSize(); - aSize = Application::GetDefaultDevice()->LogicToPixel( aSize, aGraphic.GetPrefMapMode() ); - aSize = Application::GetDefaultDevice()->PixelToLogic( aSize, MapMode( MapUnit::MapTwip ) ); - + Size aSize = OutputDevice::LogicToLogic(aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode(), MapMode(MapUnit::MapTwip)); pVar->PutInteger( static_cast<sal_Int16>(aSize.Height()) ); } |