You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2014/06/19 11:22:00 UTC
svn commit: r1603774 - in /openoffice/branches/AOO410: ./ main/
main/svx/source/svdraw/svdograf.cxx
Author: orw
Date: Thu Jun 19 09:21:59 2014
New Revision: 1603774
URL: http://svn.apache.org/r1603774
Log:
124966: 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 trunk
Modified:
openoffice/branches/AOO410/ (props changed)
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/svx/source/svdraw/svdograf.cxx
Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1597109
Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main:r1597109
Modified: openoffice/branches/AOO410/main/svx/source/svdraw/svdograf.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/svx/source/svdraw/svdograf.cxx?rev=1603774&r1=1603773&r2=1603774&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/svx/source/svdraw/svdograf.cxx (original)
+++ openoffice/branches/AOO410/main/svx/source/svdraw/svdograf.cxx Thu Jun 19 09:21:59 2014
@@ -1537,9 +1537,11 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, Graph
{
pFilterData = new com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >( 3 );
- com::sun::star::awt::Size aPreviewSizeHint( 64, 64 );
- sal_Bool bAllowPartialStreamRead = sal_True;
- sal_Bool bCreateNativeLink = sal_False;
+ const com::sun::star::awt::Size aPreviewSizeHint( 64, 64 );
+ const sal_Bool bAllowPartialStreamRead = sal_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 sal_Bool bCreateNativeLink = sal_True;
(*pFilterData)[ 0 ].Name = String( RTL_CONSTASCII_USTRINGPARAM( "PreviewSizeHint" ) );
(*pFilterData)[ 0 ].Value <<= aPreviewSizeHint;
(*pFilterData)[ 1 ].Name = String( RTL_CONSTASCII_USTRINGPARAM( "AllowPartialStreamRead" ) );