mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS swqbugfixes29 (1.28.52); FILE MERGED

Browse Source 
2005/04/19 11:23:23 od 1.28.52.1: #i44367# <SwGrfNode::SavePersistentData()> - do not delete graphic file
	 from document storage, because it could be referenced by
	 another object.
This commit is contained in:
Oliver Bolte
2005-04-22 10:25:55 +00:00
parent 5e12d65472
commit f811e62841
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sw/source/core/graphic/ndgrf.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: ndgrf.cxx,v $ * $RCSfile: ndgrf.cxx,v $
* *
* $Revision: 1.28 $ * $Revision: 1.29 $
* *
* last change: $Author: vg $ $Date: 2005-03-23 11:52:13 $ * last change: $Author: obo $ $Date: 2005-04-22 11:25:55 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -867,8 +867,19 @@ BOOL SwGrfNode::SavePersistentData()
if( HasStreamName() && !SwapIn() ) if( HasStreamName() && !SwapIn() )
return FALSE; return FALSE;
if( HasStreamName() ) // --> OD 2005-04-19 #i44367#
DelStreamName(); // Do not delete graphic file in storage, because the graphic file could
// be referenced by other graphic nodes.
// Because it's hard to detect this case here and it would only fix
// one problem with shared graphic files - there are also problems,
// a certain graphic file is referenced by two independent graphic nodes,
// brush item or drawing objects, the stream isn't no longer removed here.
// To do this stuff correct, a reference counting on shared streams
// inside one document have to be implemented.
// Important note: see also fix for #i40014#
// if( HasStreamName() )
// DelStreamName();
// <--
// Und in TempFile rausswappen // Und in TempFile rausswappen
return (BOOL) SwapOut(); return (BOOL) SwapOut();