diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-08 09:27:32 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-08 22:57:37 +0200 |
| commit | aecab50c291a535bc0ccfd30b86060faf6bea994 (patch) | |
| tree | f61fb4459b176577560c51e0c2145572ba049035 /filter | |
| parent | e15f7b3f670a5146516beeb05269227c0dde75cf (diff) | |
tdf#118037 PPT import: fix lost crop of graphic
Regression from commit b11188835d3b87cd9d2a8cdb3da204cfda5d3e6e (DOC
import: lazy-read images, 2018-04-20).
(cherry picked from commit 11d542352e1088a2c870b0e73e14e10266276483)
Change-Id: Ie2155c971d94153352a9372a9795cbb9d820dd40
Reviewed-on: https://gerrit.libreoffice.org/55468
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 3e80858d9275..923013f96d82 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 |