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

[pmladek svn gnome org]

Author: pmladek
Date: Mon Feb 16 17:05:10 2009
New Revision: 15340
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15340&view=rev

Log:
2009-02-16  Petr Mladek  <pmladek suse cz>

	* patches/dev300/sc-winbuild-tweak-m0.diff:
	* patches/dev300/sc-winbuild-tweak.diff:
	* patches/dev300/apply: udpate for ooo310-m1



Added:
   trunk/patches/dev300/sc-winbuild-tweak-m0.diff   (props changed)
      - copied unchanged from r15338, /trunk/patches/dev300/sc-winbuild-tweak.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sc-winbuild-tweak.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Feb 16 17:05:10 2009
@@ -874,12 +874,20 @@
 vba-xl-import-crash.diff, noelpwer
 
 fix-formulaaccess-core.diff, noelpwer, i#98240
+
+[ CalcFixes <= dev300-m41 <= ooo310-m0 ]
+
+sc-winbuild-tweak-m0.diff
+
+[ CalcFixes > dev300-m41 > ooo310-m0 ]
+
 # some visibilty specifications have changed on m40, looks like
 # some cws(s) are based off earlier versions which make methods
 # of now public classes visible ( windows doesn't like that )
 # additionally there is another tweak for ScTableProtectionImpl from
 # cws-scsheetprotectxxxx.diff to move it to the header file ( so auto_ptr is happy )
 sc-winbuild-tweak.diff
+
 [ LinuxOnly ]
 # accelerate linking, by extreme cunning i#63927
 # this is an increasingly marginal win ...

Modified: trunk/patches/dev300/sc-winbuild-tweak.diff
==============================================================================
--- trunk/patches/dev300/sc-winbuild-tweak.diff	(original)
+++ trunk/patches/dev300/sc-winbuild-tweak.diff	Mon Feb 16 17:05:10 2009
@@ -198,14 +198,3 @@
  
      void                    SetMemberPosition( const String& rName, sal_Int32 nNewPos );
  
---- /cygdrive/g/ooo-build/build/dev300-m40/sc/inc/olinetab.hxx	2009-02-14 07:55:20.558500000 +0000
-+++ sc/inc/olinetab.hxx	2009-02-13 16:40:08.386905000 +0000
-@@ -111,7 +111,7 @@ public:
- 
-     ScOutlineEntry*         GetEntry( USHORT nLevel, USHORT nIndex ) const;
-     USHORT                  GetCount( USHORT nLevel ) const;
--    SC_DLLPUBLIC ScOutlineEntry*         GetEntryByPos( USHORT nLevel, SCCOLROW nPos ) const;
-+    ScOutlineEntry*         GetEntryByPos( USHORT nLevel, SCCOLROW nPos ) const;
- 
-     BOOL                    GetEntryIndex( USHORT nLevel, SCCOLROW nPos, USHORT& rnIndex ) const;
-     BOOL                    GetEntryIndexInRange(