diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-02-13 18:31:16 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-02-13 20:29:02 +0100 |
| commit | 7de3ea6a00a45f4860229571bf1df4866cffcdf5 (patch) | |
| tree | 02f627e45e9046dc8e8d04fb94dde6de4de01d5c /sw | |
| parent | 1fa153966332f57d23ee31fe97a24fd73317af9c (diff) | |
Pass GraphicObject instead of UniqueId for GetBlibID
Change-Id: I49d0c84a5beb4f8bf33c3ebac6ddc8ae302c6a4c
Reviewed-on: https://gerrit.libreoffice.org/49645
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index d50b66776a42..4b5d3e00916a 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1544,7 +1544,7 @@ void SwBasicEscherEx::WriteGrfBullet(const Graphic& rGrf) { aSize = OutputDevice::LogicToLogic( aSize,rGrf.GetPrefMapMode(), aMap100mm ); } - sal_uInt32 nBlibId = mxGlobal->GetBlibID( *(mxGlobal->QueryPictureStream()), aUniqueId ); + sal_uInt32 nBlibId = mxGlobal->GetBlibID( *(mxGlobal->QueryPictureStream()), aGraphicObject ); if (nBlibId) aPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, true); } @@ -1631,8 +1631,7 @@ sal_Int32 SwBasicEscherEx::WriteGrfFlyFrame(const SwFrameFormat& rFormat, sal_uI aGraphic.GetPrefMapMode(), aMap100mm ); } - sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(), - aUniqueId ); + sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(), aGraphicObject); if (nBlibId) aPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, true); } @@ -1855,8 +1854,7 @@ void SwBasicEscherEx::WriteBrushAttr(const SvxBrushItem &rBrush, rGraphic.GetPrefMapMode(), aMap100mm); } - sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(), - aUniqueId); + sal_uInt32 nBlibId = mxGlobal->GetBlibID(*QueryPictureStream(), *pGraphicObject); if (nBlibId) rPropOpt.AddOpt(ESCHER_Prop_fillBlip,nBlibId,true); } @@ -2923,8 +2921,8 @@ void SwBasicEscherEx::WriteOLEPicture(EscherPropertyContainer &rPropOpt, OString aId = aGraphicObject.GetUniqueID(); if (!aId.isEmpty()) { - sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(), - aId, pVisArea); // SJ: the fourth parameter (VisArea) should be set.. + // SJ: the fourth parameter (VisArea) should be set.. + sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(), aGraphicObject, pVisArea); if (nBlibId) rPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, true); } |