?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
update ooo310-m15
[ooovba.git] / applied_patches / 0189-calc-change-track-xls-export-fix.diff
blob1c092b6f785efc4961ab3ee8e6874dcf600c7577
1 diff --git sc/inc/chgtrack.hxx sc/inc/chgtrack.hxx
2 index 946b862..0735a8d 100644
3 --- sc/inc/chgtrack.hxx
4 +++ sc/inc/chgtrack.hxx
5 @@ -1398,8 +1398,6 @@ public:
6 void NotifyModified( ScChangeTrackMsgType eMsgType,
7 ULONG nStartAction, ULONG nEndAction );
8
9 - SC_DLLPUBLIC BOOL Load( SvStream& rStrm, USHORT nVer );
10 - SC_DLLPUBLIC BOOL Store( SvStream& rStrm );
11 USHORT GetLoadedFileFormatVersion() const
12 { return nLoadedFileFormatVersion; }
13
14 @@ -1423,7 +1423,7 @@ public:
15 { return bTime100thSeconds; }
16
17 void AppendCloned( ScChangeAction* pAppend );
18 - ScChangeTrack* Clone( ScDocument* pDocument ) const;
19 + SC_DLLPUBLIC ScChangeTrack* Clone( ScDocument* pDocument ) const;
20 void MergeActionState( ScChangeAction* pAct, const ScChangeAction* pOtherAct );
21 #if DEBUG_CHANGETRACK
22 String ToString() const;
23 diff --git sc/source/core/tool/chgtrack.cxx sc/source/core/tool/chgtrack.cxx
24 index 86d81cc..830f397 100644
25 --- sc/source/core/tool/chgtrack.cxx
26 +++ sc/source/core/tool/chgtrack.cxx
27 @@ -2943,262 +2943,6 @@ void lcl_EnsureSorting( ScStrCollection& rCollection )
28 }
29 }
30
31 -
32 -BOOL ScChangeTrack::Load( SvStream& rStrm, USHORT nVer )
33 -{
34 - BOOL bOk = TRUE;
35 - SetLoadSave( TRUE );
36 -
37 - ScReadHeader aGlobalHdr( rStrm );
38 -
39 - BYTE n8;
40 - UINT16 n16;
41 - UINT32 n32;
42 -
43 - rStrm >> n16; nLoadedFileFormatVersion = n16;
44 - if ( (nLoadedFileFormatVersion & 0xFF00) > (SC_CHGTRACK_FILEFORMAT & 0xFF00) )
45 - { // inkompatible neuere Version
46 - Clear();
47 - rStrm.SetError( SCWARN_IMPORT_INFOLOST );
48 - return FALSE;
49 - }
50 -
51 - aUserCollection.Load( rStrm );
52 -
53 - ULONG nCount, nLastAction, nGeneratedCount;
54 - rStrm >> n32; nCount = n32;
55 - rStrm >> n32; nActionMax = n32;
56 - rStrm >> n32; nLastAction = n32;
57 -
58 - rStrm >> n32; nGeneratedCount = n32;
59 -
60 - // GeneratedDelContents laden
61 - {
62 - ScMultipleReadHeader aHdr( rStrm );
63 - for ( ULONG j = 0; j < nGeneratedCount && bOk; j++ )
64 - {
65 - ScChangeActionContent* pAct;
66 -
67 - aHdr.StartEntry();
68 -
69 - ScChangeActionType eType;
70 - rStrm >> n8; eType = (ScChangeActionType) n8;
71 -
72 - switch ( eType )
73 - {
74 - case SC_CAT_CONTENT :
75 - pAct = new ScChangeActionContent( rStrm, aHdr, pDoc, nVer, this );
76 - break;
77 - default:
78 - DBG_ERROR( "ScChangeTrack::Load: unknown GeneratedType" );
79 - pAct = NULL;
80 - bOk = FALSE;
81 - }
82 -
83 - aHdr.EndEntry();
84 -
85 - if ( pAct )
86 - {
87 - pAct->SetType( eType );
88 - if ( pFirstGeneratedDelContent )
89 - pFirstGeneratedDelContent->pPrev = pAct;
90 - pAct->pNext = pFirstGeneratedDelContent;
91 - pFirstGeneratedDelContent = pAct;
92 - aGeneratedTable.Insert( pAct->GetActionNumber(), pAct );
93 - }
94 - }
95 - rStrm >> n32; nGeneratedMin = n32;
96 - }
97 -
98 - if ( bOk )
99 - bOk = ( nGeneratedCount == aGeneratedTable.Count() );
100 - DBG_ASSERT( bOk, "ScChangeTrack::Load: Generated failed" );
101 -
102 -
103 - // erste Runde: Actions laden
104 - {
105 - ScMultipleReadHeader aHdr( rStrm );
106 - for ( ULONG j = 0; j < nCount && bOk; j++ )
107 - {
108 - ScChangeAction* pAct;
109 -
110 - aHdr.StartEntry();
111 -
112 - USHORT nUserIndex;
113 - rStrm >> n16; nUserIndex = n16;
114 -
115 - ScChangeActionType eType;
116 - rStrm >> n8; eType = (ScChangeActionType) n8;
117 -
118 - switch ( eType )
119 - {
120 - case SC_CAT_INSERT_COLS :
121 - case SC_CAT_INSERT_ROWS :
122 - case SC_CAT_INSERT_TABS :
123 - pAct = new ScChangeActionIns( rStrm, aHdr, this );
124 - break;
125 - case SC_CAT_DELETE_COLS :
126 - case SC_CAT_DELETE_ROWS :
127 - case SC_CAT_DELETE_TABS :
128 - pAct = new ScChangeActionDel( rStrm, aHdr, pDoc, nVer, this );
129 - break;
130 - case SC_CAT_MOVE :
131 - pAct = new ScChangeActionMove( rStrm, aHdr, this );
132 - break;
133 - case SC_CAT_CONTENT :
134 - pAct = new ScChangeActionContent( rStrm, aHdr, pDoc, nVer, this );
135 - break;
136 - case SC_CAT_REJECT :
137 - pAct = new ScChangeActionReject( rStrm, aHdr, this );
138 - break;
139 - default:
140 - DBG_ERROR( "ScChangeTrack::Load: unknown ScChangeActionType" );
141 - pAct = NULL;
142 - bOk = FALSE;
143 - }
144 -
145 - aHdr.EndEntry();
146 -
147 - if ( pAct )
148 - {
149 - pAct->SetType( eType );
150 - if ( nUserIndex != 0xffff )
151 - {
152 - StrData* pUser = (StrData*) aUserCollection.At( nUserIndex );
153 - if ( pUser )
154 - pAct->SetUser( pUser->GetString() );
155 - }
156 - AppendLoaded( pAct );
157 - }
158 - }
159 - }
160 -
161 - if ( pLast )
162 - nMarkLastSaved = pLast->GetActionNumber();
163 -
164 - if ( bOk )
165 - bOk = ( nMarkLastSaved == nLastAction && nCount == aTable.Count() );
166 - DBG_ASSERT( bOk, "ScChangeTrack::Load: failed" );
167 -
168 - // zweite Runde: Links laden und alles verpointern
169 - {
170 - ScMultipleReadHeader aHdr( rStrm );
171 - for ( ScChangeAction* p = GetFirst(); p && bOk; p = p->GetNext() )
172 - {
173 - aHdr.StartEntry();
174 - bOk = p->LoadLinks( rStrm, this );
175 - aHdr.EndEntry();
176 - }
177 - }
178 -
179 - SetLoadSave( FALSE );
180 -
181 - // versions between 583 and 633 had the sorting wrong -> correct (after loading the actions)
182 - lcl_EnsureSorting( aUserCollection );
183 -
184 - // den aktuellen User erst einfuegen, wenn die Actions bereits ihre User haben
185 - SetUser( aUser );
186 -
187 - if ( !bOk )
188 - {
189 - Clear(); // eindeutiger Zustand
190 - rStrm.SetError( SCWARN_IMPORT_INFOLOST );
191 - }
192 -
193 - return bOk;
194 -}
195 -
196 -
197 -BOOL ScChangeTrack::Store( SvStream& rStrm )
198 -{
199 - BOOL bOk = TRUE;
200 - SetLoadSave( TRUE );
201 -
202 - ScWriteHeader aGlobalHdr( rStrm );
203 -
204 - rStrm << (UINT16) SC_CHGTRACK_FILEFORMAT;
205 -
206 - aUserCollection.Store( rStrm );
207 -
208 - ULONG nCount = aTable.Count();
209 - ULONG nLastAction = ( pLast ? pLast->GetActionNumber() : 0 );
210 - ULONG nGeneratedCount = aGeneratedTable.Count();
211 - rStrm << (UINT32) nCount << (UINT32) nActionMax << (UINT32) nLastAction;
212 - rStrm << (UINT32) nGeneratedCount;
213 -
214 - // GeneratedDelContents speichern
215 - ULONG nSave = 0;
216 - {
217 - ScMultipleWriteHeader aHdr( rStrm );
218 - ULONG nNewGeneratedMin = SC_CHGTRACK_GENERATED_START;
219 - for ( ScChangeAction* p = pFirstGeneratedDelContent; p && bOk;
220 - p = p->GetNext() )
221 - {
222 - ++nSave;
223 - aHdr.StartEntry();
224 - rStrm << (BYTE) p->GetType();
225 - bOk = p->Store( rStrm, aHdr );
226 - aHdr.EndEntry();
227 - ULONG nAct = p->GetActionNumber();
228 - if ( nNewGeneratedMin > nAct )
229 - nNewGeneratedMin = nAct;
230 - }
231 - nGeneratedMin = nNewGeneratedMin; // evtl. unbenutzten Bereich freigeben
232 - rStrm << (UINT32) nGeneratedMin;
233 - }
234 -
235 - if ( bOk )
236 - bOk = ( nGeneratedCount == nSave );
237 - DBG_ASSERT( bOk, "ScChangeTrack::Store: failed" );
238 -
239 - // erste Runde: Actions speichern
240 - nSave = 0;
241 - {
242 - ScMultipleWriteHeader aHdr( rStrm );
243 - StrData* pUserSearch = new StrData( aUser );
244 - USHORT nUserIndex;
245 - for ( ScChangeAction* p = GetFirst(); p && bOk; p = p->GetNext() )
246 - {
247 - ++nSave;
248 - aHdr.StartEntry();
249 -
250 - pUserSearch->SetString( p->GetUser() );
251 - if ( aUserCollection.Search( pUserSearch, nUserIndex ) )
252 - rStrm << (UINT16) nUserIndex;
253 - else
254 - rStrm << (UINT16) 0xffff;
255 - rStrm << (BYTE) p->GetType();
256 -
257 - bOk = p->Store( rStrm, aHdr );
258 -
259 - aHdr.EndEntry();
260 - }
261 - delete pUserSearch;
262 - }
263 -
264 - if ( pLast )
265 - nMarkLastSaved = pLast->GetActionNumber();
266 -
267 - if ( bOk )
268 - bOk = ( nCount == nSave );
269 - DBG_ASSERT( bOk, "ScChangeTrack::Store: failed" );
270 -
271 - // zweite Runde: Links speichern
272 - {
273 - ScMultipleWriteHeader aHdr( rStrm );
274 - for ( ScChangeAction* p = GetFirst(); p && bOk; p = p->GetNext() )
275 - {
276 - aHdr.StartEntry();
277 - bOk = p->StoreLinks( rStrm );
278 - aHdr.EndEntry();
279 - }
280 - }
281 -
282 - SetLoadSave( FALSE );
283 - return bOk;
284 -}
285 -
286 -
287 void ScChangeTrack::MasterLinks( ScChangeAction* pAppend )
288 {
289 ScChangeActionType eType = pAppend->GetType();
290 diff --git sc/source/filter/inc/XclExpChangeTrack.hxx sc/source/filter/inc/XclExpChangeTrack.hxx
291 index 9ec2351..75ab49d 100644
292 --- sc/source/filter/inc/XclExpChangeTrack.hxx
293 +++ sc/source/filter/inc/XclExpChangeTrack.hxx
294 @@ -620,14 +620,13 @@ private:
295 XclExpChTrTabIdBuffer* pTabIdBuffer;
296
297 ScDocument* pTempDoc; // empty document
298 - ScChangeTrack* pTempChangeTrack; // copy of <pOrigChangeTrack>
299
300 sal_uInt32 nNewAction; // action number, 1-based
301 XclExpChTrHeader* pHeader; // header record for last GUID
302 sal_uInt8 aGUID[ 16 ]; // GUID for action info records
303 sal_Bool bValidGUID;
304
305 - sal_Bool CreateTempChangeTrack();
306 + SC_DLLPUBLIC ScChangeTrack* CreateTempChangeTrack();
307 void PushActionRecord( const ScChangeAction& rAction );
308
309 sal_Bool WriteUserNamesStream();
310 diff --git sc/source/filter/xcl97/XclExpChangeTrack.cxx sc/source/filter/xcl97/XclExpChangeTrack.cxx
311 index 4318d4f..79563aa 100644
312 --- sc/source/filter/xcl97/XclExpChangeTrack.cxx
313 +++ sc/source/filter/xcl97/XclExpChangeTrack.cxx
314 @@ -1073,7 +1073,6 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) :
315 aTabIdBufferList(),
316 pTabIdBuffer( NULL ),
317 pTempDoc( NULL ),
318 - pTempChangeTrack( NULL ),
319 nNewAction( 1 ),
320 pHeader( NULL ),
321 bValidGUID( sal_False )
322 @@ -1082,7 +1081,8 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) :
323 if( !GetOldRoot().pTabId )
324 return;
325
326 - if( !CreateTempChangeTrack() )
327 + ScChangeTrack* pTempChangeTrack = CreateTempChangeTrack();
328 + if (!pTempChangeTrack)
329 return;
330
331 pTabIdBuffer = new XclExpChTrTabIdBuffer( GetTabInfo().GetXclTabCount() );
332 @@ -1144,25 +1144,23 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) :
333
334 XclExpChangeTrack::~XclExpChangeTrack()
335 {
336 - if( pTempChangeTrack )
337 - delete pTempChangeTrack;
338 if( pTempDoc )
339 delete pTempDoc;
340 }
341
342 -sal_Bool XclExpChangeTrack::CreateTempChangeTrack()
343 +ScChangeTrack* XclExpChangeTrack::CreateTempChangeTrack()
344 {
345 // get original change track
346 ScChangeTrack* pOrigChangeTrack = GetDoc().GetChangeTrack();
347 DBG_ASSERT( pOrigChangeTrack, "XclExpChangeTrack::CreateTempChangeTrack - no change track data" );
348 if( !pOrigChangeTrack )
349 - return sal_False;
350 + return NULL;
351
352 // create empty document
353 pTempDoc = new ScDocument;
354 DBG_ASSERT( pTempDoc, "XclExpChangeTrack::CreateTempChangeTrack - no temp document" );
355 if( !pTempDoc )
356 - return sal_False;
357 + return NULL;
358
359 // adjust table count
360 SCTAB nOrigCount = GetDoc().GetTableCount();
361 @@ -1177,26 +1175,13 @@ sal_Bool XclExpChangeTrack::CreateTempChangeTrack()
362 if( nOrigCount != pTempDoc->GetTableCount() )
363 return sal_False;
364
365 - // create empty change track
366 - pTempChangeTrack = new ScChangeTrack( pTempDoc );
367 - DBG_ASSERT( pTempChangeTrack, "XclExpChangeTrack::CreateTempChangeTrack - no temp change track" );
368 - if( !pTempChangeTrack )
369 - return sal_False;
370 -
371 - // copy original change track
372 - SvMemoryStream aMemStrm;
373 - if( !pOrigChangeTrack->Store( aMemStrm ) )
374 - return sal_False;
375 - aMemStrm.Seek( STREAM_SEEK_TO_BEGIN );
376 - if( !pTempChangeTrack->Load( aMemStrm, (USHORT) pTempDoc->GetSrcVersion() ) )
377 - return sal_False;
378 -
379 - return sal_True;
380 + return pOrigChangeTrack->Clone(pTempDoc);
381 }
382
383 void XclExpChangeTrack::PushActionRecord( const ScChangeAction& rAction )
384 {
385 XclExpChTrAction* pXclAction = NULL;
386 + ScChangeTrack* pTempChangeTrack = pTempDoc->GetChangeTrack();
387 switch( rAction.GetType() )
388 {
389 case SC_CAT_CONTENT:
390 @@ -1206,7 +1191,8 @@ void XclExpChangeTrack::PushActionRecord( const ScChangeAction& rAction )
391 case SC_CAT_INSERT_COLS:
392 case SC_CAT_DELETE_ROWS:
393 case SC_CAT_DELETE_COLS:
394 - pXclAction = new XclExpChTrInsert( rAction, GetRoot(), *pTabIdBuffer, *pTempChangeTrack );
395 + if (pTempChangeTrack)
396 + pXclAction = new XclExpChTrInsert( rAction, GetRoot(), *pTabIdBuffer, *pTempChangeTrack );
397 break;
398 case SC_CAT_INSERT_TABS:
399 {
400 @@ -1218,7 +1204,8 @@ void XclExpChangeTrack::PushActionRecord( const ScChangeAction& rAction )
401 }
402 break;
403 case SC_CAT_MOVE:
404 - pXclAction = new XclExpChTrMoveRange( (const ScChangeActionMove&) rAction, GetRoot(), *pTabIdBuffer, *pTempChangeTrack );
405 + if (pTempChangeTrack)
406 + pXclAction = new XclExpChTrMoveRange( (const ScChangeActionMove&) rAction, GetRoot(), *pTabIdBuffer, *pTempChangeTrack );
407 break;
408 default:;
409 }
vba interoperability for OOo