[Libreoffice-commits] core.git: sw/source

[Luke Deller (via logerrit)]

 sw/source/filter/ww8/wrtw8esh.cxx |   40 --------------------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

New commits:
commit 58b784119646820f9164b455f065fc91286cb1f4
Author:     Luke Deller <luke at deller.id.au>
AuthorDate: Wed Aug 7 00:30:43 2019 +1000
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Aug 7 09:12:23 2019 +0200

    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 at collabora.co.uk>

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);