From f811e628411bda29a76ebb1f72eb107ce67d27f0 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Fri, 22 Apr 2005 10:25:55 +0000 Subject: [PATCH] INTEGRATION: CWS swqbugfixes29 (1.28.52); FILE MERGED 2005/04/19 11:23:23 od 1.28.52.1: #i44367# - do not delete graphic file from document storage, because it could be referenced by another object. --- sw/source/core/graphic/ndgrf.cxx | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 168eccce6f28..b3e0288d2197 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -2,9 +2,9 @@ * * $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 * either of the following licenses @@ -867,8 +867,19 @@ BOOL SwGrfNode::SavePersistentData() if( HasStreamName() && !SwapIn() ) return FALSE; - if( HasStreamName() ) - DelStreamName(); + // --> OD 2005-04-19 #i44367# + // 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 return (BOOL) SwapOut();