ooo-build r11377 - in trunk: . patches/src680 patches/vba

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Jan 23 15:51:38 2008
New Revision: 11377
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11377&view=rev

Log:
        * patches/src680/apply,
          patches/vba/vba-keep-codenames-in-sync-m3.diff,
          patches/vba/vba-keep-codenames-in-sync.diff: ooh680-m4


Added:
   trunk/patches/vba/vba-keep-codenames-in-sync-m3.diff
      - copied unchanged from r11375, /trunk/patches/vba/vba-keep-codenames-in-sync.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/vba/vba-keep-codenames-in-sync.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Wed Jan 23 15:51:38 2008
@@ -1322,7 +1322,13 @@
 vba-workbook-worksheet-events.diff
 vba-workbook-worksheet-events-buildfix.diff
 
+[ VBAObjects < ooh680-m4 ]
+vba-keep-codenames-in-sync-m3.diff
+
+[ VBAObjects >= ooh680-m4 ]
 vba-keep-codenames-in-sync.diff
+
+[ VBAObjects ]
 #associating sheet and codename when insert a sheet
 # sc-insert-sheet-codename.diff, i#80869, jianhua
 

Modified: trunk/patches/vba/vba-keep-codenames-in-sync.diff
==============================================================================
--- trunk/patches/vba/vba-keep-codenames-in-sync.diff	(original)
+++ trunk/patches/vba/vba-keep-codenames-in-sync.diff	Wed Jan 23 15:51:38 2008
@@ -57,13 +57,13 @@
 --- sc/source/core/data/document.cxx	2007-09-06 14:47:12.000000000 +0800
 +++ sc/source/core/data/document.cxx	2007-09-06 14:48:36.000000000 +0800
 @@ -105,6 +105,7 @@
- #endif
+ #include "progress.hxx"
  #include "autonamecache.hxx"
  #include "bcaslot.hxx"
 +#include "scextopt.hxx"
+ #include "postit.hxx"
  
  struct ScDefaultAttr
- {
 @@ -291,6 +292,7 @@ BOOL ScDocument::InsertTab( SCTAB nPos, 
  {
  	SCTAB	nTabCount = GetTableCount();