GNOME.org
 

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

Author: kyoshida
Date: Sat Dec 13 21:57:20 2008
New Revision: 14847
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14847&view=rev

Log:
2008-12-13  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-dp-custom-names-sc-m36.diff: patch for dev300-m36
	or less.

	* patches/dev300/calc-dp-custom-names-sc.diff: patch for dev300-m37 or 
	above.	
	
	* patches/dev300/apply: attempted to build for dev300-m37.  There are 
	quite a few patches that don't apply against dev300-m37.  I've commented
	them out with #FIXME_m37 for now.  Please fix them if you are the owner 
	of one of those patches.  Thanks!

	The following patches have been commented out for m37 (they do still 
	get applied against m36).

	reportdesigner-no-license.diff
	forms-radio-button-group-names.diff
	xl-import-formradiobutton.diff
	dialog-groupname-persist.diff
	unxsplash-rework.diff
	unxsplash-new-osl-pipe.diff
	unxsplash-new-osl-pipe-slot.diff
	unxsplash-finish-on-hangup.diff
	unxsplash-rpath.diff
	unxsplash-3layer.diff
	unxsplash-bmp-alias.diff
	vcl-bigger-icons-kde-gnome.diff
	controls-with-images-in-document.diff
	enhanced-form-userform-controls.diff
	vba-compatible-mode-uno.diff
	vba-spinbutton-in-userform.diff
	vba-userform-geometry-tweak.diff
	gstreamer-config-office.diff


Added:
   trunk/patches/dev300/calc-dp-custom-names-sc-m36.diff
      - copied unchanged from r14843, /trunk/patches/dev300/calc-dp-custom-names-sc.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/calc-dp-custom-names-sc.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sat Dec 13 21:57:20 2008
@@ -360,9 +360,13 @@
 # no bogus license question when registering these extensions
 #solenv-no-extension-license.diff
 
-[ ExtensionFixes ]
+[ ExtensionFixes <= dev300-m36 ]
 reportdesigner-no-license.diff
 
+[ ExtensionFixes > dev300-m36 ]
+#FIXME_m37 reportdesigner-no-license.diff
+
+[ ExtensionFixes ]
 presentation-minimizer-no-license.diff
 presenterscreen-no-license.diff
 # extensions: fix & unbundle system java
@@ -526,7 +530,7 @@
 # FIXME 2008-11-26: partly applies to dev300-m35 with several "fuzz 2", partly not at all
 #xmloff-field-patch.diff, flr, n#248354
 
-[ RadioButtons ]
+[ RadioButtons <= dev300-m36 ]
 # Add a GroupName property to RadioButtons so that RadioButtons don't need to
 # share the same name to be part of the same group.
 forms-radio-button-group-names.diff, n#310052, i#30823, jonp
@@ -535,6 +539,15 @@
 # persist the groupname for basic dialogs also
 dialog-groupname-persist.diff, noelpwer, i#30823
 
+[ RadioButtons > dev300-m36 ]
+# Add a GroupName property to RadioButtons so that RadioButtons don't need to
+# share the same name to be part of the same group.
+#FIXME_m37 forms-radio-button-group-names.diff, n#310052, i#30823, jonp
+# depends on forms-radio-button-group-names.diff,
+#FIXME_m37 xl-import-formradiobutton.diff, noelpwer, i#30823
+# persist the groupname for basic dialogs also
+#FIXME_m37 dialog-groupname-persist.diff, noelpwer, i#30823
+
 [ SELinux ]
 # make OOo work under SELinux
 ooo80816.selinux.bridges.diff, i#80816
@@ -591,9 +604,13 @@
 gnome-vfs-late-init.diff, i#84137, jholesov
 
 
-[ QuickStarter ]
+[ QuickStarter <= dev300-m36 ]
 unxsplash-rework.diff, i#60696, michael/jholesov
 
+[ QuickStarter > dev300-m36 ]
+#FIXME_m37 unxsplash-rework.diff, i#60696, michael/jholesov
+
+[ QuickStarter ]
 # fix the systray quickstarter
 sfx2-quickstarter-fix.diff, i#88382, michael
 
@@ -601,6 +618,7 @@
 # due to being unused. fix properly.
 hack-readd-GetStringParam.diff
 
+[ QuickStarter <= dev300-m36 ]
 # handling of osl pipe has changed, see i#84045
 unxsplash-new-osl-pipe.diff, i#60696, jholesov
 
@@ -619,6 +637,25 @@
 # fix bitmap reading; the lines are aliased to 4 bytes
 unxsplash-bmp-alias.diff, i#60696, jholesov
 
+[ QuickStarter > dev300-m36 ]
+# handling of osl pipe has changed, see i#84045
+#FIXME_m37 unxsplash-new-osl-pipe.diff, i#60696, jholesov
+
+# fix the slot: handling again :-(
+#FIXME_m37 unxsplash-new-osl-pipe-slot.diff, i#60696, n#375529, jholesov
+
+# when OOo fails during startup, don't loop endlessly
+#FIXME_m37 unxsplash-finish-on-hangup.diff, i#60696, n#357659, jholesov
+
+# the 'three layer OOo' needs rpath
+#FIXME_m37 unxsplash-rpath.diff, i#60696, jholesov
+
+# the OSL_PIPE protocol has changed thanks to 3-layer OOo again :-(
+#FIXME_m37 unxsplash-3layer.diff, i#60696, jholesov
+
+# fix bitmap reading; the lines are aliased to 4 bytes
+#FIXME_m37 unxsplash-bmp-alias.diff, i#60696, jholesov
+
 [ Fixes < dev300-m37 ]
 cwscheckapi-envset.diff, i#95204
 
@@ -835,10 +872,17 @@
 # Pivot cache field import fix.
 calc-dp-pivotcache-fix.diff, n#433658, i#96326, kohei
 
+[ CalcFixes <= dev300-m36 ]
+# support custom names in data pilot tables.
+calc-dp-custom-names-sc-m36.diff, n#338014, i#22029, kohei
+calc-dp-custom-names-offapi.diff, n#338014, i#22029, kohei
+
+[ CalcFixes > dev300-m36 ]
 # support custom names in data pilot tables.
 calc-dp-custom-names-sc.diff,     n#338014, i#22029, kohei
 calc-dp-custom-names-offapi.diff, n#338014, i#22029, kohei
 
+[ CalcFixes ]
 # fix menu text translation for French locale.
 calc-status-subtotal-menu-trans-sc.diff,  n#448699, i#96775, kohei
 calc-status-subtotal-menu-trans-svx.diff, n#448699, i#96775, kohei
@@ -1329,10 +1373,16 @@
 # enable vcl to load bitmaps when height it negative
 vcl-bitmap2-negative-height.diff
 
+[ VCL <= dev300-m36 ]
 # There's no reason to arbitrary use smaller icons - it looks ugly in the
 # modern desktop environments
 vcl-bigger-icons-kde-gnome.diff, i#95220, jholesov
 
+[ VCL > dev300-m36 ]
+# There's no reason to arbitrary use smaller icons - it looks ugly in the
+# modern desktop environments
+#FIXME_m37 vcl-bigger-icons-kde-gnome.diff, i#95220, jholesov
+
 [ SystemBits ]
 # use getopt() and readdir_r() from system glibc
 #FIXME src680: system-libc.diff, i#69033, rengelha
@@ -1613,27 +1663,49 @@
 #make properties available for non class modules
 #also allow paramaters to be supported for Get properties
 vba-support-properties-inmodules.diff
+
+[ VBAObjects <= dev300-m36 ]
 controls-with-images-in-document.diff, i#38215, noelpwer
 
+[ VBAObjects > dev300-m36 ]
+#FIXME_m37 controls-with-images-in-document.diff, i#38215, noelpwer
+
+[ VBAObjects ]
 # import graphic for image control
 controls-with-images-import.diff, Fong
 
+[ VBAObjects <= dev300-m36 ]
 #use of form control models in userforms/dialogs, additionally
 #enables use of document embedded images in image control for
 #userforms/dialogs ( note: depends on controls-with-images-in-document.diff )
 enhanced-form-userform-controls.diff, noelpwer
 
+[ VBAObjects > dev300-m36 ]
+#use of form control models in userforms/dialogs, additionally
+#enables use of document embedded images in image control for
+#userforms/dialogs ( note: depends on controls-with-images-in-document.diff )
+#FIXME_m37 enhanced-form-userform-controls.diff, noelpwer
+
+[ VBAObjects ]
 # object module support... getting there
 ObjectModule.diff
 # userform ( depends on ObjectModule.diff )
 vba-userform.diff
 
+[ VBAObjects <= dev300-m36 ]
 # uno interface for vba mode
 vba-compatible-mode-uno.diff, Fong
 
 # support to display spinbutton in userform
 vba-spinbutton-in-userform.diff, Fong
 
+[ VBAObjects > dev300-m36 ]
+# uno interface for vba mode
+#FIXME_m37 vba-compatible-mode-uno.diff, Fong
+
+# support to display spinbutton in userform
+#FIXME_m37 vba-spinbutton-in-userform.diff, Fong
+
 [ VBAObjects ]
 vbaevents-services-sources.diff, i#68893
 
@@ -1673,9 +1745,14 @@
 # fix bug comparing string that can't be converted to number
 stringnumbercompare.diff, n#422559
 
+[ VBAObjects <= dev300-m36 ]
 # fix import sizes and geometry of userforms
 vba-userform-geometry-tweak.diff
 
+[ VBAObjects > dev300-m36 ]
+# fix import sizes and geometry of userforms
+#FIXME_m37 vba-userform-geometry-tweak.diff
+
 [ VBAObjects ]
 # n#426415
 vba-allow-forms-resetvalue-binding.diff
@@ -1692,8 +1769,12 @@
 # don't apply regex to MATCH function if typical
 # 'regex' like characters are present
 vba-noregrex-for-match.diff
+
+[ VBAObjects <= dev300-m36 ]
 # fix queryInterface problem
 vba-fix-n431657.diff, n#431657
+
+[ VBAObjects ]
 # fix treatment of NULL with
 # a) NOT operator b) comparison operators
 vba-null-not-treatment.diff
@@ -2016,7 +2097,14 @@
 gstreamer-avmedia.diff
 gstreamer-sd.diff
 gstreamer-scp2.diff
+
+[ GStreamer <= dev300-m36 ]
 gstreamer-config-office.diff
+
+[ GStreamer > dev300-m36 ]
+#FIXME_m37 gstreamer-config-office.diff
+
+[ GStreamer ]
 gstreamer-slideshow.diff
 gstreamer-solenv.diff
 gstreamer-svtools-content-types.diff

Modified: trunk/patches/dev300/calc-dp-custom-names-sc.diff
==============================================================================
--- trunk/patches/dev300/calc-dp-custom-names-sc.diff	(original)
+++ trunk/patches/dev300/calc-dp-custom-names-sc.diff	Sat Dec 13 21:57:20 2008
@@ -80,20 +80,6 @@
  	BOOL		bIsDataLayout;
  	BOOL		bDupFlag;
  	USHORT		nOrientation;
-@@ -113,10 +121,12 @@ public:
- private:
-     MemberHash maMemberHash;
-     MemberList maMemberList;
-+
-+    ScDPSaveDimension(); // disabled
- public:
- 							ScDPSaveDimension(const String& rName, BOOL bDataLayout);
- 							ScDPSaveDimension(const ScDPSaveDimension& r);
--							ScDPSaveDimension(SvStream& rStream);
-+                            ScDPSaveDimension(SvStream& rStream);
- 							~ScDPSaveDimension();
- 
- 	BOOL		 			operator== ( const ScDPSaveDimension& r ) const;
 @@ -143,9 +153,14 @@ public:
      USHORT                  GetFunction() const { return nFunction; }
  	void					SetUsedHierarchy(long nNew);
@@ -646,14 +632,6 @@
  }
  
  ScDPSaveDimension::ScDPSaveDimension(SvStream& rStream)
-@@ -334,7 +369,6 @@ ScDPSaveDimension::ScDPSaveDimension(SvStream& rStream)
-     pSortInfo = NULL;
-     pAutoShowInfo = NULL;
-     pLayoutInfo = NULL;
--	pLayoutName = NULL;
- 	pSelectedPage = NULL;
- }
- 
 @@ -376,7 +410,6 @@ ScDPSaveDimension::~ScDPSaveDimension()
      delete pSortInfo;
      delete pAutoShowInfo;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]