ooo-build r14722 - in branches/ooo-build-3-0: . patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Wed Dec  3 19:20:17 2008
New Revision: 14722
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14722&view=rev

Log:
More m12 bits


Added:
   branches/ooo-build-3-0/patches/dev300/remove-sfx-notify-sd-m11.diff
      - copied unchanged from r14720, /branches/ooo-build-3-0/patches/dev300/remove-sfx-notify-sd.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply
   branches/ooo-build-3-0/patches/dev300/remove-sfx-notify-sd.diff

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Wed Dec  3 19:20:17 2008
@@ -860,7 +860,14 @@
 remove-sfx-notify-basic.diff, i#89805, kohei
 remove-sfx-notify-chart2.diff, i#89806, kohei
 remove-sfx-notify-sc.diff, i#89807, kohei
+
+[ Misc < ooo680-m12 ]
+remove-sfx-notify-sd-m11.diff, i#89809, kohei
+
+[ Misc >= ooo680-m12 ]
 remove-sfx-notify-sd.diff, i#89809, kohei
+
+[ Misc ]
 remove-sfx-notify-sfx2.diff, i#89810, kohei
 remove-sfx-notify-svx.diff, i#89811, kohei
 #sfx-broadcaster-hashset-svtools.diff

Modified: branches/ooo-build-3-0/patches/dev300/remove-sfx-notify-sd.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/remove-sfx-notify-sd.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/remove-sfx-notify-sd.diff	Wed Dec  3 19:20:17 2008
@@ -6,7 +6,7 @@
  	using  SfxStyleSheetPool::Create;
  	virtual ~SdStyleSheetPool();
  
--	virtual void 		SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType );
+-//	virtual void 		SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType );
 +	virtual void 		Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
  
  	void AddStyleFamily( const SdPage* pPage );