ooo-build r14437 - in trunk: . patches/dev300

[mloiseleur svn gnome org]

Author: mloiseleur
Date: Fri Oct 31 09:45:12 2008
New Revision: 14437
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14437&view=rev

Log:
2008-10-31  Michel Loiseleur  <mloiseleur linagora com>

* patches/dev300/apply: Reenable the patch, since the severe
regression encountered is now fixed.
* patches/dev300/sw-mailmerge-faster.diff:


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sw-mailmerge-faster.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Oct 31 09:45:12 2008
@@ -630,7 +630,7 @@
 # Allows to edit a csv data source after a mail merge
 sw-remove-csv-lock.diff, i#85133, mloiseleur
 # Provides a great speed-up for a mail merge operation : 7x faster
-# sw-mailmerge-faster.diff, i#40287, mloiseleur
+sw-mailmerge-faster.diff, i#40287, mloiseleur
 
 
 [ CalcFixes ]
@@ -2794,7 +2794,7 @@
 
 [ CalcExperimental ]
 
-# Don't adjust row height on xls load for better layout preservation and 
+# Don't adjust row height on xls load for better layout preservation and
 # faster file load.
 calc-xls-disable-adjust-row-height.diff, kohei
 
@@ -2815,4 +2815,3 @@
 psprint.defconfig_changes.diff, n#436441, flr
 [ CairoFonts < dev300-m28 < ooo300-m9 ]
 psprint.defconfig_changes-m7.diff, n#436441, flr
-

Modified: trunk/patches/dev300/sw-mailmerge-faster.diff
==============================================================================
--- trunk/patches/dev300/sw-mailmerge-faster.diff	(original)
+++ trunk/patches/dev300/sw-mailmerge-faster.diff	Fri Oct 31 09:45:12 2008
@@ -1,7 +1,7 @@
 diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
-index 34ad7f2..6e0c1c2 100644
---- sw/source/ui/dbui/dbmgr.cxx
-+++ sw/source/ui/dbui/dbmgr.cxx
+index 34ad7f2..ae5ed73 100644
+--- a/sw/source/ui/dbui/dbmgr.cxx
++++ b/sw/source/ui/dbui/dbmgr.cxx
 @@ -3127,27 +3127,28 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
      pImpl->pMergeData = new SwDSParam(
                  rMMConfig.GetCurrentDBData(), xResultSet, rMMConfig.GetSelection());
@@ -41,7 +41,7 @@
          DBG_ERROR("exception in MergeNew()")
      }
  
-@@ -3226,44 +3227,41 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
+@@ -3226,56 +3227,49 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
          long nStartRow, nEndRow;
          ULONG nDocNo = 1;
          sal_Int32 nDocCount = 0;
@@ -75,6 +75,8 @@
 +            pWorkDoc->EmbedAllLinks();
 +            if(UNDO_UI_DELETE_INVISIBLECNTNT == rWorkShell.GetUndoIds())
 +                rWorkShell.Undo();
++            rWorkShell.RemoveInvisibleContent();
++            rWorkShell.SetNumberingRestart();
 +            do
              {
 -                aMonitorDlg.SetCurrentPosition( nDocNo );
@@ -116,7 +118,27 @@
                  // create a layout
                  rWorkShell.CalcLayout();
                  SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
-@@ -3342,21 +3340,28 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
+                 rWorkShell.ViewShell::UpdateFlds();
+                 SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
+ 
+-                // strip invisible content and convert fields to text
+-                rWorkShell.RemoveInvisibleContent();
+-                rWorkShell.ConvertFieldsToText();
+-                rWorkShell.SetNumberingRestart();
+-
+-
+                 // insert the document into the target document
+                 rWorkShell.SttEndDoc(FALSE);
+                 rWorkShell.SttEndDoc(TRUE);
+@@ -3326,6 +3320,7 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
+                     }
+                 }
+                 pTargetShell->Paste( rWorkShell.GetDoc(), sal_True );
++                pTargetShell->ConvertFieldsToText();
+                 //convert fields in page styles (header/footer - has to be done after the first document has been pasted
+                 if(1 == nDocNo)
+                 {
+@@ -3342,21 +3337,28 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
                  rMMConfig.AddMergedDocument( aMergeInfo );
                  ++nRet;