ooo-build r13920 - branches/ooo-build-3-0/scratch/sw-wizard

[freuter svn gnome org]

Author: freuter
Date: Wed Sep 17 14:51:03 2008
New Revision: 13920
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13920&view=rev

Log:
don't loose this patch...

Added:
   branches/ooo-build-3-0/scratch/sw-wizard/
   branches/ooo-build-3-0/scratch/sw-wizard/sw-scan-document.diff

Added: branches/ooo-build-3-0/scratch/sw-wizard/sw-scan-document.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/scratch/sw-wizard/sw-scan-document.diff	Wed Sep 17 14:51:03 2008
@@ -0,0 +1,176 @@
+diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
+index 21028eb..c0b0c30 100644
+--- sw/inc/cmdid.h
++++ sw/inc/cmdid.h
+@@ -263,6 +263,8 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
+ 
+ #define FN_EDIT_HYPERLINK     		 (FN_EDIT2 + 35) 	/* edit hyperlink */
+ #define FN_NUM_CONTINUE              (FN_EDIT2 + 36)    /* continue previous numbering */
++
++#define FN_SCAN_DOCUMENT             (FN_EDIT2 + 37)
+ /*--------------------------------------------------------------------
+ 	Bereich: Bearbeiten
+  --------------------------------------------------------------------*/
+diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
+index c971473..0641763 100644
+--- sw/inc/doc.hxx
++++ sw/inc/doc.hxx
+@@ -2111,6 +2111,8 @@ public:
+ 	{
+ 		return n32DummyCompatabilityOptions2;
+ 	}
++
++    void ScanDocument();
+ };
+ 
+ 
+diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
+index 00e1d94..c2186c6 100644
+--- sw/inc/viewsh.hxx
++++ sw/inc/viewsh.hxx
+@@ -380,6 +380,7 @@ public:
+ 	void UpdateAllCharts();
+ 	sal_Bool HasCharts() const;
+ 
++        void ScanDocument();
+     //
+     // DOCUMENT COMPATIBILITY FLAGS START
+     //
+diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi
+index 7930ddc..ab151a1 100644
+--- sw/sdi/_basesh.sdi
++++ sw/sdi/_basesh.sdi
+@@ -144,6 +144,11 @@ interface BaseTextSelection
+ 		ExecMethod = Execute ;
+ 		StateMethod = NoState ;
+ 	]
++	FN_SCAN_DOCUMENT
++	[
++		ExecMethod = Execute ;	
++		StateMethod = NoState ;
++	]
+ 
+ 	FN_UPDATE_CHARTS // status(final|play)
+ 	[
+diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
+index 85b02d8..b744715 100644
+--- sw/sdi/swriter.sdi
++++ sw/sdi/swriter.sdi
+@@ -8703,6 +8703,32 @@ SfxVoidItem UpdateFields FN_UPDATE_FIELDS
+ ]
+ 
+ //--------------------------------------------------------------------------
++SfxVoidItem ScanDocument FN_SCAN_DOCUMENT
++()
++[
++	/* flags: */
++	AutoUpdate = FALSE,
++	Cachable = Cachable,
++	FastCall = TRUE,
++	HasCoreId = FALSE,
++	HasDialog = FALSE,
++	ReadOnlyDoc = FALSE,
++	Toggle = FALSE,
++	Container = FALSE,
++	RecordAbsolute = FALSE,
++	RecordPerSet;
++	Synchron;
++
++	/* config: */
++	AccelConfig = TRUE,
++	MenuConfig = TRUE,
++	StatusBarConfig = FALSE,
++	ToolBoxConfig = TRUE,
++	GroupId = GID_EDIT;
++]
++
++
++//--------------------------------------------------------------------------
+ SfxVoidItem UpdateInputFields FN_UPDATE_INPUTFIELDS
+ ()
+ [
+diff --git a/sw/sdi/swslots.src b/sw/sdi/swslots.src
+index ffbec7f..70722f1 100644
+--- sw/sdi/swslots.src
++++ sw/sdi/swslots.src
+@@ -1290,6 +1290,10 @@ SfxSlotInfo FN_UPDATE_FIELDS
+ {
+ 	Slotname [ en-US ] = "Update Fields";
+ };
++SfxSlotInfo FN_SCAN_DOCUMENT
++{
++	Slotname [ en-US ] = "Scan Document";
++};
+ SfxSlotInfo FN_UPDATE_INPUTFIELDS
+ {
+ 	Slotname [ en-US ] = "Update Input Fields";
+diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
+index 27ffb9a..d28d3aa 100644
+--- sw/source/core/doc/docfld.cxx
++++ sw/source/core/doc/docfld.cxx
+@@ -2819,3 +2819,8 @@ bool SwDoc::PutValueToField(const SwPosition & rPos,
+ 
+     return pField->PutValue(rVal, nWhich);
+ }
++
++
++void SwDoc::ScanDocument() {
++    printf("ScanDocument\n");
++}
+diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
+index 31f1b67..3313026 100644
+--- sw/source/core/view/viewsh.cxx
++++ sw/source/core/view/viewsh.cxx
+@@ -677,6 +677,25 @@ void ViewShell::UpdateFlds(BOOL bCloseDB)
+ 		EndAction();
+ }
+ 
++void ViewShell::ScanDocument()
++{
++	SET_CURR_SHELL( this );
++
++	BOOL bCrsr = ISA(SwCrsrShell);
++	if ( bCrsr )
++		((SwCrsrShell*)this)->StartAction();
++	else
++		StartAction();
++
++	GetDoc()->ScanDocument();
++
++	if ( bCrsr )
++		((SwCrsrShell*)this)->EndAction();
++	else
++		EndAction();
++}
++
++
+ // update all charts, for that exists any table
+ void ViewShell::UpdateAllCharts()
+ {
+diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
+index 9b2e4a6..4f3b102 100644
+--- sw/source/ui/shells/basesh.cxx
++++ sw/source/ui/shells/basesh.cxx
+@@ -628,6 +628,22 @@ void SwBaseShell::Execute(SfxRequest &rReq)
+ 				}
+ 			}
+ 			break;
++		case FN_SCAN_DOCUMENT:
++			{
++				SwDocStat aDocStat;
++				rSh.UpdateDocStat(aDocStat);
++				rSh.EndAllTblBoxEdit();
++				rSh.ViewShell::ScanDocument();
++
++				if( rSh.IsCrsrInTbl() )
++				{
++					if( !rSh.IsTblComplexForChart() )
++						SwTableFUNC( &rSh, FALSE).UpdateChart();
++					rSh.ClearTblBoxCntnt();
++					rSh.SaveTblBoxCntnt();
++				}
++			}
++			break;
+ 		case FN_UPDATE_CHARTS:
+ 			{
+ 				SwWait aWait( *rView.GetDocShell(), TRUE );