diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2014-04-13 23:06:58 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-04-16 17:07:21 +0200 |
| commit | 0ba1986137f25bd8a0590de40daabaa1b2012f65 (patch) | |
| tree | bb8a13c8a9a0943a89fb4167c9d8329327b5afed /filter | |
| parent | 10115a5aacde8926529d98d1da2044d28f22e699 (diff) | |
handle .doc cropping also inside groups (fdo#38411)
Writer does handle cropping on its own, but only for "toplevel" images,
not for those inside groups, so there still use the generic code.
Change-Id: I805a4cbd2d4cea7008e0322688ccd7f35a6d4a2c
(cherry picked from commit af51f3fb5aee469423b154958ccb3fe61284122f)
Reviewed-on: https://gerrit.libreoffice.org/8950
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index c0db6dced4e1..63847b3c8bd9 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3744,8 +3744,9 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons } if ( bGrfRead ) { - // the writer is doing it's own cropping, so this part affects only impress and calc - if ( GetSvxMSDffSettings() & SVXMSDFF_SETTINGS_CROP_BITMAPS ) + // the writer is doing its own cropping, so this part affects only impress and calc, + // unless we're inside a group, in which case writer doesn't crop either + if (( GetSvxMSDffSettings() & SVXMSDFF_SETTINGS_CROP_BITMAPS ) || rObjData.nCalledByGroup != 0 ) lcl_ApplyCropping( *this, ( rObjData.nSpFlags & SP_FOLESHAPE ) == 0 ? &rSet : NULL, aGraf ); if ( IsProperty( DFF_Prop_pictureTransparent ) ) |