ooo-build r12812 - in branches/ooo-build-2-4: . patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Thu Jun  5 16:41:58 2008
New Revision: 12812
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12812&view=rev

Log:
2008-06-05  Chris Cheney  <ccheney ubuntu com>

	* patches/src680/apply: apply patch in FedoraFixes.
	* patches/src680/ooo87071.sd.backgroundfix.diff: add patch from Fedora
	  to allow saving background image of slide master.



Added:
   branches/ooo-build-2-4/patches/src680/ooo87071.sd.backgroundfix.diff
Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/src680/apply

Modified: branches/ooo-build-2-4/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4/patches/src680/apply	(original)
+++ branches/ooo-build-2-4/patches/src680/apply	Thu Jun  5 16:41:58 2008
@@ -1835,6 +1835,8 @@
 
 ooo85931.inconsistent.getentrypos.diff, ccheney
 
+ooo87071.sd.backgroundfix.diff
+
 [ CairoFonts ]
 # needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
 ooo59127.vcl.honourcairofont.diff

Added: branches/ooo-build-2-4/patches/src680/ooo87071.sd.backgroundfix.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4/patches/src680/ooo87071.sd.backgroundfix.diff	Thu Jun  5 16:41:58 2008
@@ -0,0 +1,11 @@
+--- sd/source/ui/func/fupage.cxx	26 Nov 2007 17:01:36 -0000	1.29
++++ sd/source/ui/func/fupage.cxx	26 Apr 2008 14:31:03 -0000
+@@ -342,7 +342,7 @@
+ 				pTempSet.reset( new SfxItemSet( mpDoc->GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST, 0) );
+ 
+ 				pTempSet->Put( XFillStyleItem( XFILL_BITMAP ) );
+-				pTempSet->Put( XFillBitmapItem( String(), XOBitmap(aGraphic) ) );
++				pTempSet->Put( XFillBitmapItem( String(RTL_CONSTASCII_USTRINGPARAM("background")), XOBitmap(aGraphic) ) );
+ 				pTempSet->Put( XFillBmpStretchItem( TRUE ));
+ 				pTempSet->Put( XFillBmpTileItem( FALSE ));
+ 			}