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

[noelpwer svn gnome org]

Author: noelpwer
Date: Sat Feb 14 19:21:48 2009
New Revision: 15336
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15336&view=rev

Log:

2009-02-12  Noel Power <noel power novell com>

	* patches/dev300/cygwin-make-ver.diff:
	* patches/dev300/2005-express-stl-remove.diff:
	* patches/dev300/mozilla-buildlibs-win32.diff:
	* patches/dev300/win32-activex-disable.diff:



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/gcc4-visibility-sc.diff
   trunk/patches/dev300/layoutdialogs2-development.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sat Feb 14 19:21:48 2009
@@ -874,6 +874,12 @@
 vba-xl-import-crash.diff, noelpwer
 
 fix-formulaaccess-core.diff, noelpwer, i#98240
+# 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/gcc4-visibility-sc.diff
==============================================================================
--- trunk/patches/dev300/gcc4-visibility-sc.diff	(original)
+++ trunk/patches/dev300/gcc4-visibility-sc.diff	Sat Feb 14 19:21:48 2009
@@ -1,19 +1,3 @@
---- sc/inc/miscuno.hxx.old	2005-03-23 13:44:54.000000000 +0100
-+++ sc/inc/miscuno.hxx	2005-08-02 19:38:06.000000000 +0200
-@@ -337,11 +337,11 @@
- 												com::sun::star::beans::XPropertySet>& xProp,
- 											const ::rtl::OUString& rName, long nDefault );
- 
--	static sal_Bool			GetBoolFromAny( const com::sun::star::uno::Any& aAny );
-+	SC_DLLPUBLIC static sal_Bool			GetBoolFromAny( const com::sun::star::uno::Any& aAny );
- 	static sal_Int16		GetInt16FromAny( const com::sun::star::uno::Any& aAny );
- 	static sal_Int32		GetInt32FromAny( const com::sun::star::uno::Any& aAny );
- 	static sal_Int32		GetEnumFromAny( const com::sun::star::uno::Any& aAny );
--	static void				SetBoolInAny( com::sun::star::uno::Any& rAny, sal_Bool bValue );
-+	SC_DLLPUBLIC static void				SetBoolInAny( com::sun::star::uno::Any& rAny, sal_Bool bValue );
- };
- 
- 
 --- sc/inc/optutil.hxx.old	2000-11-02 20:08:15.000000000 +0100
 +++ sc/inc/optutil.hxx	2005-08-02 19:32:54.000000000 +0200
 @@ -70,6 +70,7 @@

Modified: trunk/patches/dev300/layoutdialogs2-development.diff
==============================================================================
--- trunk/patches/dev300/layoutdialogs2-development.diff	(original)
+++ trunk/patches/dev300/layoutdialogs2-development.diff	Sat Feb 14 19:21:48 2009
@@ -574,12 +574,12 @@
      setChangeListener( this );
  }
  
-+bool
++/*bool
 +Container::emptyVisible ()
 +{
 +    return false;
 +}
-+
++*/
  uno::Any
  Container::queryInterface( const uno::Type & rType ) throw (uno::RuntimeException)
  {
@@ -591,7 +591,7 @@
      Container();
      virtual ~Container() {}
  
-+    virtual bool emptyVisible ();
++    virtual bool emptyVisible (){ return false; };
 +
      // XInterface
      virtual void SAL_CALL acquire() throw() { PropHelper::acquire(); }