[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sd/source

Xisco Fauli (via logerrit) logerrit at kemper.freedesktop.org
Fri Dec 4 12:23:19 UTC 2020


 sd/source/filter/eppt/epptso.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2d253ef05719144f5e3d5a773caf8f0b5ec0a02c
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Wed Dec 2 10:23:57 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Dec 4 13:22:22 2020 +0100

    related: tdf#127086: PPT: export custom shapes as Bitmap
    
    this way the cropping is kept after roundtrip
    
    found while working on fix for tdf#128501
    
    Change-Id: I5cf023b469407d5a70d83cbb5b499b2a1d6310e8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107051
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Tested-by: Jenkins
    (cherry picked from commit 0956226ca535a62ab22d8d2502b159037c327f7d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107095
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index b29c9c9d9e5f..153ef6f9bc3b 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1711,7 +1711,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                             // We can't map this custom shape to a PPT preset and it has a bitmap
                             // fill. Make sure that at least the bitmap fill is not lost.
                             mType = "drawing.GraphicObject";
-                            aGraphicPropertyName = "FillBitmap";
+                            aGraphicPropertyName = "Bitmap";
                         }
                     }
                 }


More information about the Libreoffice-commits mailing list