diff options
| author | Luke Deller <luke@deller.id.au> | 2019-08-07 00:30:43 +1000 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-08-07 09:12:23 +0200 |
| commit | 58b784119646820f9164b455f065fc91286cb1f4 (patch) | |
| tree | ae6ab14885320855430b2c860f74ae2bde980a0a /sw | |
| parent | 1c5465ef1158ebf0f3f64e3343c2ed610024e5a8 (diff) | |
Remove code for GetBlibID unused param rBoundRect
commit 60fd81d83a2dbcb64a38910de49f8e2620353702 removed an unused
parameter rBoundRect from EscherGraphicProvider::GetBlibID
Now remove some code which was used only to provide that parameter, and
is no longer needed.
Change-Id: If3bc6be8cb4f971ef67a9e31a316c1c495f64beb
Reviewed-on: https://gerrit.libreoffice.org/77033
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index c8d04367c808..919ff1fd46b0 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1584,16 +1584,6 @@ void SwBasicEscherEx::WriteGrfBullet(const Graphic& rGrf) OString aUniqueId = aGraphicObject.GetUniqueID(); if ( !aUniqueId.isEmpty() ) { - const MapMode aMap100mm( MapUnit::Map100thMM ); - Size aSize( rGrf.GetPrefSize() ); - if ( MapUnit::MapPixel == rGrf.GetPrefMapMode().GetMapUnit() ) - { - aSize = Application::GetDefaultDevice()->PixelToLogic(aSize, aMap100mm ); - } - else - { - aSize = OutputDevice::LogicToLogic( aSize,rGrf.GetPrefMapMode(), aMap100mm ); - } sal_uInt32 nBlibId = mxGlobal->GetBlibID( *(mxGlobal->QueryPictureStream()), aGraphicObject ); if (nBlibId) aPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, true); @@ -1663,20 +1653,6 @@ sal_Int32 SwBasicEscherEx::WriteGrfFlyFrame(const SwFrameFormat& rFormat, sal_uI if (!aUniqueId.isEmpty()) { - const MapMode aMap100mm( MapUnit::Map100thMM ); - Size aSize( aGraphic.GetPrefSize() ); - - if ( MapUnit::MapPixel == aGraphic.GetPrefMapMode().GetMapUnit() ) - { - aSize = Application::GetDefaultDevice()->PixelToLogic( - aSize, aMap100mm ); - } - else - { - aSize = OutputDevice::LogicToLogic( aSize, - aGraphic.GetPrefMapMode(), aMap100mm ); - } - sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(), aGraphicObject); if (nBlibId) aPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, true); @@ -1886,20 +1862,6 @@ void SwBasicEscherEx::WriteBrushAttr(const SvxBrushItem &rBrush, OString aUniqueId = pGraphicObject->GetUniqueID(); if (!aUniqueId.isEmpty()) { - const Graphic &rGraphic = pGraphicObject->GetGraphic(); - Size aSize(rGraphic.GetPrefSize()); - const MapMode aMap100mm(MapUnit::Map100thMM); - if (MapUnit::MapPixel == rGraphic.GetPrefMapMode().GetMapUnit()) - { - aSize = Application::GetDefaultDevice()->PixelToLogic( - aSize, aMap100mm); - } - else - { - aSize = OutputDevice::LogicToLogic(aSize, - rGraphic.GetPrefMapMode(), aMap100mm); - } - sal_uInt32 nBlibId = mxGlobal->GetBlibID(*QueryPictureStream(), *pGraphicObject); if (nBlibId) rPropOpt.AddOpt(ESCHER_Prop_fillBlip,nBlibId,true); @@ -2945,7 +2907,7 @@ void SwBasicEscherEx::WriteOLEPicture(EscherPropertyContainer &rPropOpt, OString aId = aGraphicObject.GetUniqueID(); if (!aId.isEmpty()) { - // SJ: the fourth parameter (VisArea) should be set.. + // SJ: the third parameter (pVisArea) should be set.. sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(), aGraphicObject, pVisArea); if (nBlibId) rPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, true); |