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

[mloiseleur svn gnome org]

Author: mloiseleur
Date: Mon Mar  9 07:42:37 2009
New Revision: 15504
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15504&view=rev

Log:
2009-03-09  Michel Loiseleur  <mloiseleur linagora com>

        * patches/dev300/sw-mailmerge-faster.diff: Update mail merge
        accelerator : no more regression on numbering list.



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

Modified: trunk/patches/dev300/sw-mailmerge-faster.diff
==============================================================================
--- trunk/patches/dev300/sw-mailmerge-faster.diff	(original)
+++ trunk/patches/dev300/sw-mailmerge-faster.diff	Mon Mar  9 07:42:37 2009
@@ -1,8 +1,8 @@
-diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
-index 34ad7f2..ae5ed73 100644
+diff --git sw/source/ui/dbui/dbmgr.cxx sw/source/ui/dbui/dbmgr.cxx
+index e17ff7b..d22779b 100644
 --- sw/source/ui/dbui/dbmgr.cxx
 +++ sw/source/ui/dbui/dbmgr.cxx
-@@ -3127,27 +3127,28 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
+@@ -3147,27 +3147,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,56 +3227,49 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
+@@ -3246,56 +3247,50 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
          long nStartRow, nEndRow;
          ULONG nDocNo = 1;
          sal_Int32 nDocCount = 0;
@@ -75,8 +75,6 @@
 +            pWorkDoc->EmbedAllLinks();
 +            if(UNDO_UI_DELETE_INVISIBLECNTNT == rWorkShell.GetUndoIds())
 +                rWorkShell.Undo();
-+            rWorkShell.RemoveInvisibleContent();
-+            rWorkShell.SetNumberingRestart();
 +            do
              {
 -                aMonitorDlg.SetCurrentPosition( nDocNo );
@@ -120,17 +118,18 @@
                  SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
                  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();
++                // Ensure numbering is correct on target document
+                 rWorkShell.RemoveInvisibleContent();
 -                rWorkShell.ConvertFieldsToText();
--                rWorkShell.SetNumberingRestart();
--
+                 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,
+@@ -3346,6 +3341,7 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
                      }
                  }
                  pTargetShell->Paste( rWorkShell.GetDoc(), sal_True );
@@ -138,7 +137,7 @@
                  //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,
+@@ -3362,21 +3358,28 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
                  rMMConfig.AddMergedDocument( aMergeInfo );
                  ++nRet;
  
@@ -180,3 +179,8 @@
          //deselect all, go out of the frame and go to the beginning of the document
          Point aPt(LONG_MIN, LONG_MIN);
          pTargetShell->SelectObj(aPt, SW_LEAVE_FRAME);
+@@ -3428,4 +3431,3 @@ void SwConnectionDisposedListener_Impl::disposing( const EventObject& rSource )
+         }
+     }
+ }
+-