summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2018-06-08 09:27:32 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-06-08 10:20:58 +0200
commit11d542352e1088a2c870b0e73e14e10266276483 (patch)
tree6ce8010f815f68c1fa28601ea1915376cb5b8bb5 /filter
parentbff31df1398b81c0348aebae2c346474724c4884 (diff)
tdf#118037 PPT import: fix lost crop of graphic
Regression from commit b11188835d3b87cd9d2a8cdb3da204cfda5d3e6e (DOC import: lazy-read images, 2018-04-20). Change-Id: Ie2155c971d94153352a9372a9795cbb9d820dd40 Reviewed-on: https://gerrit.libreoffice.org/55452 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'filter')
-rw-r--r--filter/source/msfilter/msdffimp.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 2e6843eb2d61..7d7e5e385390 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3719,6 +3719,9 @@ static void lcl_ApplyCropping( const DffPropSet& rPropSet, SfxItemSet* pSet, Gra
BitmapEx aCropBitmap;
sal_uInt32 nTop( 0 ), nBottom( 0 ), nLeft( 0 ), nRight( 0 );
+ // Cropping has to be applied on a loaded graphic.
+ rGraf.makeAvailable();
+
if ( pSet ) // use crop attributes ?
aCropSize = lcl_GetPrefSize(rGraf, MapMode(MapUnit::Map100thMM));
else