GNOME.org
 

ooo-build r12628 - in branches/ooo-build-2-4-1: . patches/vba

Author: pflin
Date: Thu May 22 06:39:42 2008
New Revision: 12628
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12628&view=rev

Log:
	* patches/vba/vba-worksheet-change-event.diff: Fixed for n#391880.



Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/vba/vba-worksheet-change-event.diff

Modified: branches/ooo-build-2-4-1/patches/vba/vba-worksheet-change-event.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/vba/vba-worksheet-change-event.diff	(original)
+++ branches/ooo-build-2-4-1/patches/vba/vba-worksheet-change-event.diff	Thu May 22 06:39:42 2008
@@ -1,5 +1,6 @@
---- sc/source/ui/docshell/docsh.cxx.orig	2008-05-15 15:34:26.000000000 +0800
-+++ sc/source/ui/docshell/docsh.cxx	2008-05-16 13:07:38.000000000 +0800
+diff -urp --exclude=CVS --exclude=unxlngx6.pro sc.bak/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx
+--- sc.bak/source/ui/docshell/docsh.cxx	2008-05-22 14:38:07.000000000 +0800
++++ sc/source/ui/docshell/docsh.cxx	2008-05-22 12:08:27.000000000 +0800
 @@ -140,6 +140,7 @@
  #include "compiler.hxx"
  #include "cfgids.hxx"
@@ -79,8 +80,9 @@
  
  void ScDocShell::SetDocumentModified( BOOL bIsModified /* = TRUE */ )
  {
---- sc/source/ui/inc/docsh.hxx.orig	2008-05-15 10:56:09.000000000 +0800
-+++ sc/source/ui/inc/docsh.hxx	2008-05-15 10:56:17.000000000 +0800
+diff -urp --exclude=CVS --exclude=unxlngx6.pro sc.bak/source/ui/inc/docsh.hxx sc/source/ui/inc/docsh.hxx
+--- sc.bak/source/ui/inc/docsh.hxx	2008-05-22 14:38:07.000000000 +0800
++++ sc/source/ui/inc/docsh.hxx	2008-05-19 10:23:38.000000000 +0800
 @@ -343,6 +343,8 @@ public:
  	void            PostPaintExtras();
  
@@ -90,174 +92,224 @@
  
  	void			UpdatePaintExt( USHORT& rExtFlags, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
  													   SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab );
---- sc/source/ui/undo/undoblk3.cxx.orig	2008-05-15 15:34:18.000000000 +0800
-+++ sc/source/ui/undo/undoblk3.cxx	2008-05-16 12:37:05.000000000 +0800
-@@ -117,6 +117,15 @@ ScUndoDeleteContents::ScUndoDeleteConten
- 	if ( !(aMarkData.IsMarked() || aMarkData.IsMultiMarked()) )		// keine Zelle markiert:
- 		aMarkData.SetMarkArea( aRange );							// Zelle unter Cursor markieren
+diff -urp --exclude=CVS --exclude=unxlngx6.pro sc.bak/source/ui/undo/undoblk3.cxx sc/source/ui/undo/undoblk3.cxx
+--- sc.bak/source/ui/undo/undoblk3.cxx	2008-05-22 14:38:07.000000000 +0800
++++ sc/source/ui/undo/undoblk3.cxx	2008-05-22 14:16:18.000000000 +0800
+@@ -84,7 +84,17 @@ TYPEINIT1(ScUndoInsertAreaLink,		SfxUndo
+ TYPEINIT1(ScUndoRemoveAreaLink,		SfxUndoAction);
+ TYPEINIT1(ScUndoUpdateAreaLink,		SfxUndoAction);
  
-+    if (aMarkData.IsMarked() || aMarkData.IsMultiMarked())
+-
++void lcl_PostContentChanged( ScDocShell* pDocShell, const ScMarkData& rMark, const ScRange& rRange )
++{
++    if (rMark.IsMarked() || rMark.IsMultiMarked())
 +    {
 +        ScRangeList aList;
-+        aMarkData.FillRangeListWithMarks(&aList, false);
++        rMark.FillRangeListWithMarks(&aList, false);
 +        pDocShell->PostContentChanged(aList);
 +    }
 +    else
-+        pDocShell->PostContentChanged( aRange );
-+
++        pDocShell->PostContentChanged( rRange );
++}
+ // To Do:
+ /*A*/	// SetOptimalHeight auf Dokument, wenn keine View
+ 
+@@ -118,6 +128,8 @@ ScUndoDeleteContents::ScUndoDeleteConten
+ 		aMarkData.SetMarkArea( aRange );							// Zelle unter Cursor markieren
+ 
  	SetChangeTrack();
++
++	lcl_PostContentChanged( pDocShell, aMarkData, aRange );
  }
  
-@@ -211,6 +220,15 @@ void ScUndoDeleteContents::DoChange( con
- 	if (pViewShell)
- 		pViewShell->CellContentChanged();
  
-+    /*if (aMarkData.IsMarked() || aMarkData.IsMultiMarked())
-+    {
-+        ScRangeList aList;
-+        aMarkData.FillRangeListWithMarks(&aList, false);
-+        pDocShell->PostContentChanged(aList);
-+    }
-+    else
-+        pDocShell->PostContentChanged( aRange );*/
-+
- 	ShowTable( aRange );
+@@ -222,6 +234,7 @@ void __EXPORT ScUndoDeleteContents::Undo
+ 	BeginUndo();
+ 	DoChange( TRUE );
+ 	EndUndo();
++	lcl_PostContentChanged( pDocShell, aMarkData, aRange );
+ }
+ 
+ 
+@@ -232,6 +245,7 @@ void __EXPORT ScUndoDeleteContents::Redo
+ 	BeginRedo();
+ 	DoChange( FALSE );
+ 	EndRedo();
++	lcl_PostContentChanged( pDocShell, aMarkData, aRange );
  }
  
---- sc/source/ui/undo/undoblk.cxx.orig	2008-05-15 15:34:18.000000000 +0800
-+++ sc/source/ui/undo/undoblk.cxx	2008-05-16 12:38:58.000000000 +0800
-@@ -129,6 +129,7 @@ ScUndoInsertCells::ScUndoInsertCells( Sc
- 		aEffRange.aEnd.SetRow(MAXROW);
+ 
+diff -urp --exclude=CVS --exclude=unxlngx6.pro sc.bak/source/ui/undo/undoblk.cxx sc/source/ui/undo/undoblk.cxx
+--- sc.bak/source/ui/undo/undoblk.cxx	2008-05-22 14:38:07.000000000 +0800
++++ sc/source/ui/undo/undoblk.cxx	2008-05-22 12:27:58.000000000 +0800
+@@ -130,6 +130,7 @@ ScUndoInsertCells::ScUndoInsertCells( Sc
  	}
  
-+	pDocShell->PostContentChanged( aEffRange );
  	SetChangeTrack();
++	pDocShell->PostContentChanged( aEffRange );
  }
  
-@@ -264,6 +265,7 @@ void ScUndoInsertCells::DoChange( const 
- 	if (pViewShell)
- 		pViewShell->CellContentChanged();
- 
-+	//pDocShell->PostContentChanged( aEffRange );
- 	ShowTable( aEffRange.aStart.Tab() );
+ __EXPORT ScUndoInsertCells::~ScUndoInsertCells()
+@@ -276,6 +277,7 @@ void __EXPORT ScUndoInsertCells::Undo()
+ 	BeginUndo();
+ 	DoChange( TRUE );
+ 	EndUndo();
++	pDocShell->PostContentChanged( aEffRange );
  }
  
-@@ -337,6 +339,8 @@ ScUndoDeleteCells::ScUndoDeleteCells( Sc
- 		aEffRange.aEnd.SetRow(MAXROW);
+ void __EXPORT ScUndoInsertCells::Redo()
+@@ -284,6 +286,7 @@ void __EXPORT ScUndoInsertCells::Redo()
+ 	BeginRedo();
+ 	DoChange( FALSE );
+ 	EndRedo();
++	pDocShell->PostContentChanged( aEffRange );
+ 
+ 	if ( pPasteUndo )
+ 		pPasteUndo->Redo();		// redo paste last
+@@ -338,6 +341,7 @@ ScUndoDeleteCells::ScUndoDeleteCells( Sc
  	}
  
-+	pDocShell->PostContentChanged( aEffRange );
-+
  	SetChangeTrack();
++	pDocShell->PostContentChanged( aEffRange );
  }
  
-@@ -469,6 +473,7 @@ void ScUndoDeleteCells::DoChange( const 
+ __EXPORT ScUndoDeleteCells::~ScUndoDeleteCells()
+@@ -479,6 +483,7 @@ void __EXPORT ScUndoDeleteCells::Undo()
+ 	BeginUndo();
+ 	DoChange( TRUE );
+ 	EndUndo();
++	pDocShell->PostContentChanged( aEffRange );
+     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
  
- 	pDocShell->PostDataChanged();
- 	//	CellContentChanged kommt mit der Markierung
-+	//pDocShell->PostContentChanged( aWorkRange );
+ 	// Markierung erst nach EndUndo
+@@ -493,6 +498,7 @@ void __EXPORT ScUndoDeleteCells::Redo()
+ 	BeginRedo();
+ 	DoChange( FALSE);
+ 	EndRedo();
++	pDocShell->PostContentChanged( aEffRange );
+     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
  
- 	ShowTable( aEffRange.aStart.Tab() );
- }
-@@ -718,6 +723,7 @@ ScUndoCut::ScUndoCut( ScDocShell* pNewDo
- 	pUndoDoc( pNewUndoDoc ),
+ 	ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
+@@ -719,6 +725,7 @@ ScUndoCut::ScUndoCut( ScDocShell* pNewDo
  	aExtendedRange( aRange )
  {
-+	pDocShell->PostContentChanged( aExtendedRange );
  	SetChangeTrack();
++	pDocShell->PostContentChanged( aExtendedRange );
  }
  
-@@ -776,6 +782,7 @@ void ScUndoCut::DoChange( const BOOL bUn
- 	pDocShell->PostDataChanged();
- 	if (pViewShell)
- 		pViewShell->CellContentChanged();
-+	//pDocShell->PostContentChanged( aExtendedRange );
+ __EXPORT ScUndoCut::~ScUndoCut()
+@@ -783,6 +790,7 @@ void __EXPORT ScUndoCut::Undo()
+ 	BeginUndo();
+ 	DoChange( TRUE );
+ 	EndUndo();
++	pDocShell->PostContentChanged( aExtendedRange );
  }
  
- void __EXPORT ScUndoCut::Undo()
-@@ -842,6 +849,7 @@ ScUndoPaste::ScUndoPaste( ScDocShell* pN
+ void __EXPORT ScUndoCut::Redo()
+@@ -793,6 +801,7 @@ void __EXPORT ScUndoCut::Redo()
+ 	DoChange( FALSE );
+ 	EnableDrawAdjust( pDoc, TRUE );					//! include in ScBlockUndo?
+ 	EndRedo();
++	pDocShell->PostContentChanged( aExtendedRange );
+ }
  
- 	if ( pOptions )
+ void __EXPORT ScUndoCut::Repeat(SfxRepeatTarget& rTarget)
+@@ -844,6 +853,7 @@ ScUndoPaste::ScUndoPaste( ScDocShell* pN
  		aPasteOptions = *pOptions;		// used only for Repeat
-+	pDocShell->PostContentChanged( aBlockRange );
  
  	SetChangeTrack();
++	pDocShell->PostContentChanged( aBlockRange );
  }
-@@ -1017,6 +1025,7 @@ void ScUndoPaste::DoChange( const BOOL b
- 	pDocShell->PostDataChanged();
- 	if (pViewShell)
- 		pViewShell->CellContentChanged();
-+	//pDocShell->PostContentChanged( aDrawRange );
+ 
+ __EXPORT ScUndoPaste::~ScUndoPaste()
+@@ -1025,6 +1035,7 @@ void __EXPORT ScUndoPaste::Undo()
+ 	DoChange( TRUE );
+ 	ShowTable( aBlockRange );
+ 	EndUndo();
++	pDocShell->PostContentChanged( aBlockRange );
+     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
+ }
+ 
+@@ -1036,6 +1047,7 @@ void __EXPORT ScUndoPaste::Redo()
+ 	DoChange( FALSE );
+ 	EnableDrawAdjust( pDoc, TRUE );					//! include in ScBlockUndo?
+ 	EndRedo();
++	pDocShell->PostContentChanged( aBlockRange );
+     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
  }
  
- void __EXPORT ScUndoPaste::Undo()
---- sc/source/ui/undo/undocell.cxx.orig	2008-05-15 15:34:18.000000000 +0800
-+++ sc/source/ui/undo/undocell.cxx	2008-05-16 12:34:41.000000000 +0800
-@@ -218,6 +218,7 @@ ScUndoEnterData::ScUndoEnterData( ScDocS
- 	nTab( nNewTab ),
+diff -urp --exclude=CVS --exclude=unxlngx6.pro sc.bak/source/ui/undo/undocell.cxx sc/source/ui/undo/undocell.cxx
+--- sc.bak/source/ui/undo/undocell.cxx	2008-05-22 14:38:07.000000000 +0800
++++ sc/source/ui/undo/undocell.cxx	2008-05-22 12:11:55.000000000 +0800
+@@ -219,6 +219,7 @@ ScUndoEnterData::ScUndoEnterData( ScDocS
  	nCount( nNewCount )
  {
-+	pDocShell->PostContentChanged( ScRange( ScAddress( nCol, nRow, nTab ) ) );
  	SetChangeTrack();
++	pDocShell->PostContentChanged( ScRange( ScAddress( nCol, nRow, nTab ) ) );
  }
  
-@@ -254,6 +255,7 @@ void ScUndoEnterData::DoChange() const
- 		pViewShell->MoveCursorAbs( nCol, nRow, SC_FOLLOW_JUMP, FALSE, FALSE );
- 	}
+ __EXPORT ScUndoEnterData::~ScUndoEnterData()
+@@ -324,6 +325,7 @@ void __EXPORT ScUndoEnterData::Undo()
  
-+//	pDocShell->PostContentChanged( ScRange( ScAddress( nCol, nRow, nTab ) ) );
- 	pDocShell->PostDataChanged();
+ 	DoChange();
+ 	EndUndo();
++	pDocShell->PostContentChanged( ScRange( ScAddress( nCol, nRow, nTab ) ) );
+ }
+ 
+ void __EXPORT ScUndoEnterData::Redo()
+@@ -345,6 +347,7 @@ void __EXPORT ScUndoEnterData::Redo()
+ 
+ 	DoChange();
+ 	EndRedo();
++	pDocShell->PostContentChanged( ScRange( ScAddress( nCol, nRow, nTab ) ) );
  }
  
-@@ -375,6 +377,7 @@ ScUndoEnterValue::ScUndoEnterValue( ScDo
- 	nValue		( nVal ),
+ void __EXPORT ScUndoEnterData::Repeat(SfxRepeatTarget& rTarget)
+@@ -376,6 +379,7 @@ ScUndoEnterValue::ScUndoEnterValue( ScDo
  	bNeedHeight	( bHeight )
  {
-+	pDocShell->PostContentChanged( ScRange( aPos ) );
  	SetChangeTrack();
++	pDocShell->PostContentChanged( ScRange( aPos ) );
  }
  
-@@ -425,6 +428,8 @@ void __EXPORT ScUndoEnterValue::Undo()
- 
- 	pDocShell->PostPaintCell( aPos.Col(), aPos.Row(), aPos.Tab() );
- 
-+	//pDocShell->PostContentChanged( ScRange( aPos ) );
-+
- 	ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
- 	if ( pChangeTrack )
+ __EXPORT ScUndoEnterValue::~ScUndoEnterValue()
+@@ -430,6 +434,7 @@ void __EXPORT ScUndoEnterValue::Undo()
  		pChangeTrack->Undo( nEndChangeAction, nEndChangeAction );
-@@ -440,6 +445,8 @@ void __EXPORT ScUndoEnterValue::Redo()
- 	pDoc->SetValue( aPos.Col(), aPos.Row(), aPos.Tab(), nValue );
- 	pDocShell->PostPaintCell( aPos.Col(), aPos.Row(), aPos.Tab() );
  
-+	//pDocShell->PostContentChanged( ScRange( aPos ) );
-+
+ 	EndUndo();
++	pDocShell->PostContentChanged( ScRange( aPos ) );
+ }
+ 
+ void __EXPORT ScUndoEnterValue::Redo()
+@@ -443,6 +448,7 @@ void __EXPORT ScUndoEnterValue::Redo()
  	SetChangeTrack();
  
  	EndRedo();
-@@ -469,6 +476,7 @@ ScUndoPutCell::ScUndoPutCell( ScDocShell
- 	pEnteredCell( pRedoCell ),
++	pDocShell->PostContentChanged( ScRange( aPos ) );
+ }
+ 
+ void __EXPORT ScUndoEnterValue::Repeat(SfxRepeatTarget& /* rTarget */)
+@@ -470,6 +476,7 @@ ScUndoPutCell::ScUndoPutCell( ScDocShell
  	bNeedHeight	( bHeight )
  {
-+	pDocShell->PostContentChanged( ScRange( aPos ) );
  	SetChangeTrack();
++	pDocShell->PostContentChanged( ScRange( aPos ) );
  }
  
-@@ -521,6 +529,8 @@ void __EXPORT ScUndoPutCell::Undo()
- 
- 	pDocShell->PostPaintCell( aPos.Col(), aPos.Row(), aPos.Tab() );
- 
-+	//pDocShell->PostContentChanged( ScRange( aPos ) );
-+
- 	ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
- 	if ( pChangeTrack )
+ __EXPORT ScUndoPutCell::~ScUndoPutCell()
+@@ -526,6 +533,7 @@ void __EXPORT ScUndoPutCell::Undo()
  		pChangeTrack->Undo( nEndChangeAction, nEndChangeAction );
-@@ -551,6 +561,8 @@ void __EXPORT ScUndoPutCell::Redo()
  
- 	pDocShell->PostPaintCell( aPos.Col(), aPos.Row(), aPos.Tab() );
+ 	EndUndo();
++	pDocShell->PostContentChanged( ScRange( aPos ) );
+ }
  
-+	//pDocShell->PostContentChanged( ScRange( aPos ) );
-+
+ void __EXPORT ScUndoPutCell::Redo()
+@@ -554,6 +562,7 @@ void __EXPORT ScUndoPutCell::Redo()
  	SetChangeTrack();
  
  	EndRedo();
++	pDocShell->PostContentChanged( ScRange( aPos ) );
+ }
+ 
+ void __EXPORT ScUndoPutCell::Repeat(SfxRepeatTarget& /* rTarget */)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]