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

[mloiseleur svn gnome org]

Author: mloiseleur
Date: Fri Oct  3 14:12:43 2008
New Revision: 14201
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14201&view=rev

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

        * patches/dev300/apply: Fix previous commit, with good suffix
        * sw-remove-csv-lock.diff:
        * sw-mailmerge-faster.diff

Added:
   trunk/patches/dev300/sw-mailmerge-faster.diff
      - copied, changed from r14200, /trunk/patches/dev300/sw-mailmerge-faster.patch
   trunk/patches/dev300/sw-remove-csv-lock.diff
      - copied, changed from r14200, /trunk/patches/dev300/sw-remove-csv-lock.patch
Removed:
   trunk/patches/dev300/sw-mailmerge-faster.patch
   trunk/patches/dev300/sw-remove-csv-lock.patch
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Oct  3 14:12:43 2008
@@ -620,9 +620,9 @@
 # Allows to copy/paste html text which is between 2 unknown tags.
 sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
 # Allows to edit a csv data source after a mail merge
-sw-remove-csv-lock.patch, i#85133, mloiseleur
+sw-remove-csv-lock.diff, i#85133, mloiseleur
 # Provides a great speed-up for a mail merge operation : 7x faster
-sw-mailmerge-faster.patch, i#40287, mloiseleur
+sw-mailmerge-faster.diff, i#40287, mloiseleur
 
 
 [ CalcFixes ]

Copied: trunk/patches/dev300/sw-mailmerge-faster.diff (from r14200, /trunk/patches/dev300/sw-mailmerge-faster.patch)
==============================================================================
--- /trunk/patches/dev300/sw-mailmerge-faster.patch	(original)
+++ trunk/patches/dev300/sw-mailmerge-faster.diff	Fri Oct  3 14:12:43 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
---- a/sw/source/ui/dbui/dbmgr.cxx
-+++ b/sw/source/ui/dbui/dbmgr.cxx
+--- sw/source/ui/dbui/dbmgr.cxx
++++ 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());

Copied: trunk/patches/dev300/sw-remove-csv-lock.diff (from r14200, /trunk/patches/dev300/sw-remove-csv-lock.patch)
==============================================================================
--- /trunk/patches/dev300/sw-remove-csv-lock.patch	(original)
+++ trunk/patches/dev300/sw-remove-csv-lock.diff	Fri Oct  3 14:12:43 2008
@@ -1,7 +1,7 @@
 diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
 index f403d1a..8bb23ec 100644
---- a/sw/source/core/fields/dbfld.cxx
-+++ b/sw/source/core/fields/dbfld.cxx
+--- sw/source/core/fields/dbfld.cxx
++++ sw/source/core/fields/dbfld.cxx
 @@ -351,9 +351,6 @@ void SwDBField::Evaluate()
  
  	SvNumberFormatter* pDocFormatter = GetDoc()->GetNumberFormatter();