summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorLei De Bin <leidb@apache.org>2012-08-20 00:48:42 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-05-27 12:11:40 +0100
commitee0ecef811d445e2a3bf54710707713478e61fad (patch)
treeb2a865313d3d6cd44119d5fd6ebed4b06749e714 /filter
parent17f21e6bcc5283c5485cc42344610e8125547c0f (diff)
Resolves: #i120158# fix picture shadow lost after saved as doc in some case
Reported by: Yan Ji Patch by: Chen Zuo Jun Review by: Lei De Bin (cherry picked from commit fe549458ef04384ba777e4a36f34b68efc5b8b6d) Conflicts: filter/source/msfilter/msdffimp.cxx sw/source/filter/ww8/wrtw8esh.cxx Change-Id: I863ea7193f3dee563a892a6d857ee2385f58a862
Diffstat (limited to 'filter')
-rw-r--r--filter/source/msfilter/msdffimp.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index cc2dbf6e9000..23c95fe7660d 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2616,7 +2616,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObj
break;
}
}
- if ( ( ( nLineFlags & 0x08 ) == 0 ) && ( ( nFillFlags & 0x10 ) == 0 ) ) // if there is no fillstyle and linestyle
+ if ( ( ( nLineFlags & 0x08 ) == 0 ) && ( ( nFillFlags & 0x10 ) == 0 ) && ( rObjData.eShapeType != mso_sptPictureFrame )) // if there is no fillstyle and linestyle
bHasShadow = sal_False; // we are turning shadow off.
if ( bHasShadow )