diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-05-23 14:50:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-23 21:32:32 +0100 |
| commit | 597ae8dd9c28ee370874b219d594fa1c105f2c72 (patch) | |
| tree | 0a91ae715b944a702e3609392ef413828f2d2a10 | |
| parent | Resolves: #i124946# only apply new embedded stream name... (diff) | |
| download | core-597ae8dd9c28ee370874b219d594fa1c105f2c72.tar.gz core-597ae8dd9c28ee370874b219d594fa1c105f2c72.zip | |
Resolves: #i124966# keep picture format information
- <GfxLink> instance - also for the reading of preview picture data
in order to avoid trouble on save in case that the preview data equals the
picture data
(cherry picked from commit d6af1b601bb8fe2569d17e01505f67e1becc9366)
Conflicts:
svx/source/svdraw/svdograf.cxx
Change-Id: Ifecb07b4d5d33d593502fccd6f21644893027d2d
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index df6189d5d3de..5a9496f8e541 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1352,9 +1352,11 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) { pFilterData = new com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >( 3 ); - com::sun::star::awt::Size aPreviewSizeHint( 64, 64 ); - bool bAllowPartialStreamRead = true; - bool bCreateNativeLink = false; + const com::sun::star::awt::Size aPreviewSizeHint( 64, 64 ); + const bool bAllowPartialStreamRead = true; + // create <GfxLink> instance also for previews in order to avoid that its corresponding + // data is cleared in the graphic cache entry in case that the preview data equals the complete graphic data + const bool bCreateNativeLink = true; (*pFilterData)[ 0 ].Name = "PreviewSizeHint"; (*pFilterData)[ 0 ].Value <<= aPreviewSizeHint; (*pFilterData)[ 1 ].Name = "AllowPartialStreamRead"; |