rpms/openoffice.org/devel openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch, NONE, 1.1 openoffice.org.spec, 1.1334, 1.1335

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1166

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch 
Log Message:
add openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch

openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch:

--- NEW FILE openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch ---
Index: source/control/button.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/control/button.cxx,v
retrieving revision 1.54
diff -u -r1.54 button.cxx
--- openoffice.org.orig/vcl/source/control/button.cxx	24 Jul 2007 12:13:34 -0000	1.54
+++ openoffice.org/vcl/source/control/button.cxx	13 Nov 2007 07:32:33 -0000
@@ -3124,25 +3124,26 @@
 								 ImageList *pList, const ResId &rResId,
                                  USHORT nImages)
 {
-	Color pColorAry1[6];
-	Color pColorAry2[6];
-	pColorAry1[0] = Color( 0xC0, 0xC0, 0xC0 );
-	pColorAry1[1] = Color( 0xFF, 0xFF, 0x00 );
-	pColorAry1[2] = Color( 0xFF, 0xFF, 0xFF );
-	pColorAry1[3] = Color( 0x80, 0x80, 0x80 );
-	pColorAry1[4] = Color( 0x00, 0x00, 0x00 );
-	pColorAry1[5] = Color( 0x00, 0xFF, 0x00 );
-	pColorAry2[0] = rStyleSettings.GetFaceColor();
-	pColorAry2[1] = rStyleSettings.GetWindowColor();
-	pColorAry2[2] = rStyleSettings.GetLightColor();
-	pColorAry2[3] = rStyleSettings.GetShadowColor();
-	pColorAry2[4] = rStyleSettings.GetDarkShadowColor();
-	pColorAry2[5] = rStyleSettings.GetWindowTextColor();
+	Color aColorAry1[6];
+	Color aColorAry2[6];
+	aColorAry1[0] = Color( 0xC0, 0xC0, 0xC0 );
+	aColorAry1[1] = Color( 0xFF, 0xFF, 0x00 );
+	aColorAry1[2] = Color( 0xFF, 0xFF, 0xFF );
+	aColorAry1[3] = Color( 0x80, 0x80, 0x80 );
+	aColorAry1[4] = Color( 0x00, 0x00, 0x00 );
+	aColorAry1[5] = Color( 0x00, 0xFF, 0x00 );
+	aColorAry2[0] = rStyleSettings.GetFaceColor();
+	aColorAry2[1] = rStyleSettings.GetWindowColor();
+	aColorAry2[2] = rStyleSettings.GetLightColor();
+	aColorAry2[3] = rStyleSettings.GetShadowColor();
+	aColorAry2[4] = rStyleSettings.GetDarkShadowColor();
+	aColorAry2[5] = rStyleSettings.GetWindowTextColor();
 
 	Color aMaskColor(0x00, 0x00, 0xFF );
+        DBG_ASSERT( sizeof(aColorAry1) == (aColorAry2), "aColorAry1 must match aColorAry2" );
 	// FIXME: do we want the mask for the checkbox ?
-	pList->InsertFromHorizontalBitmap (rResId, nImages, &aMaskColor,
-									   pColorAry1, pColorAry2, nImages);
+	pList->InsertFromHorizontalBitmap (rResId, nImages, &aMaskColor, 
+        aColorAry1, aColorAry2, sizeof(aColorAry1) / sizeof(Color));
 }
 
 Image RadioButton::GetRadioImage( const AllSettings& rSettings, USHORT nFlags )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1334
retrieving revision 1.1335
diff -u -r1.1334 -r1.1335
--- openoffice.org.spec	12 Nov 2007 17:31:22 -0000	1.1334
+++ openoffice.org.spec	13 Nov 2007 07:47:16 -0000	1.1335
@@ -153,6 +153,7 @@
 Patch71: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
 Patch72: openoffice.org-2.3.0.ooo83169.colordialog.crash.patch
 Patch73: openoffice.org-2.3.1.ooo81307.sw.word2.patch
+Patch74: openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1105,6 +1106,7 @@
 %patch71 -p1 -b .ooo82966.svx.missing3d.patch
 %patch72 -p1 -b .ooo83169.colordialog.crash.patch
 %patch73 -p1 -b .ooo81307.sw.word2.patch
+%patch74 -p1 -b .ooo83591.vcl.checkboxes.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2818,6 +2820,7 @@
 * Mon Nov 12 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.8
 - tweak mime information and desktop files to support .oxt extensions
 - add openoffice.org-2.3.1.ooo81307.sw.word2.patch
+- add openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch
 
 * Fri Nov 09 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.7
 - rebuild for hunspell