rpms/openoffice.org/devel openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch, NONE, 1.1 openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz, NONE, 1.1 openoffice.org-2.3.0.oooXXXXX.sd.textonlystyle.patch, 1.1, NONE openoffice.org-2.3.0.oooXXXXX.sd.textonlystyle.tar.gz, 1.1, NONE

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Wed Aug 1 12:04:03 UTC 2007


Author: caolanm

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

Added Files:
	openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch 
	openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz 
Removed Files:
	openoffice.org-2.3.0.oooXXXXX.sd.textonlystyle.patch 
	openoffice.org-2.3.0.oooXXXXX.sd.textonlystyle.tar.gz 
Log Message:
change upstream id

openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch:

--- NEW FILE openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch ---
diff -ruN sd.orig/inc/pres.hxx sd/inc/pres.hxx
--- openoffice.org.orig/sd/inc/pres.hxx	2006-12-12 17:23:42.000000000 +0100
+++ openoffice.org/sd/inc/pres.hxx	2007-07-24 14:27:46.000000000 +0200
@@ -82,6 +82,7 @@
 	AUTOLAYOUT_TEXTOVEROBJ,
 	AUTOLAYOUT_4OBJ,
 	AUTOLAYOUT_ONLY_TITLE,
+	AUTOLAYOUT_ONLY_TEXT,
 	AUTOLAYOUT_NONE,
 	AUTOLAYOUT_NOTES,
 	AUTOLAYOUT_HANDOUT1,
diff -ruN sd.orig/source/core/sdpage.cxx sd/source/core/sdpage.cxx
--- openoffice.org.orig/sd/source/core/sdpage.cxx	2006-12-12 17:33:13.000000000 +0100
+++ openoffice.org/sd/source/core/sdpage.cxx	2007-07-26 14:53:24.000000000 +0200
@@ -1244,6 +1244,7 @@
 		LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OBJECT, PRESOBJ_OBJECT,					// AUTOLAYOUT_4OBJ
 			PRESOBJ_OBJECT, PRESOBJ_OBJECT ),
 		LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_NONE ),									// AUTOLAYOUT_ONLY_TITLE
+		LayoutDescriptor( 10, PRESOBJ_TITLE, PRESOBJ_NONE ),								// AUTOLAYOUT_ONLY_TEXT
 		LayoutDescriptor( 0, PRESOBJ_NONE ),												// AUTOLAYOUT_NONE
 		LayoutDescriptor( 0, PRESOBJ_PAGE, PRESOBJ_NOTES ),									// AUTOLAYOUT_NOTES
 		LayoutDescriptor( 0 ),																// AUTOLAYOUT_HANDOUT1
@@ -1436,6 +1437,13 @@
 		rRectangle[1].SetSize( aSize );
 		break;
 	}
+	case 10: // onlytext
+	{
+		Size aSize( rRectangle[0].GetSize().Width(), rRectangle[1].BottomLeft().Y() - rRectangle[0].TopLeft().Y() );
+		rRectangle[0].SetSize( aSize );
+		rRectangle[0].SetPos( aTitlePos);
+		break;
+	}
 	}
 }
 
diff -ruN sd.orig/source/ui/app/res_bmp.src sd/source/ui/app/res_bmp.src
--- openoffice.org.orig/sd/source/ui/app/res_bmp.src	2005-09-23 14:28:54.000000000 +0200
+++ openoffice.org/sd/source/ui/app/res_bmp.src	2007-07-27 14:55:46.000000000 +0200
@@ -322,6 +322,14 @@
 {
 	File = "foil24_h.bmp" ;
 };
+Bitmap BMP_FOIL_25
+{
+	File = "foil25.bmp" ;
+};
+Bitmap BMP_FOIL_25_H
+{
+	File = "foil25_h.bmp" ;
+};
 Bitmap BMP_FOILH_01
 {
 	File = "foilh01.bmp" ;
diff -ruN sd.orig/source/ui/app/strings.src sd/source/ui/app/strings.src
--- openoffice.org.orig/sd/source/ui/app/strings.src	2006-10-06 12:37:22.000000000 +0200
+++ openoffice.org/sd/source/ui/app/strings.src	2007-07-27 15:12:40.000000000 +0200
@@ -544,6 +544,10 @@
 	Text [ de ] = "Nur Titel" ;
 	Text [ en-US ] = "Title Only" ;
 };
+String STR_AUTOLAYOUT_ONLY_TEXT
+{
+	Text [ en-US ] = "Centered Text" ;
+};
 String STR_AUTOLAYOUT_TITLE
 {
 	Text [ de ] = "Titelfolie" ;
diff -ruN sd.orig/source/ui/inc/res_bmp.hrc sd/source/ui/inc/res_bmp.hrc
--- openoffice.org.orig/sd/source/ui/inc/res_bmp.hrc	2005-09-09 07:51:35.000000000 +0200
+++ openoffice.org/sd/source/ui/inc/res_bmp.hrc	2007-07-27 15:15:48.000000000 +0200
@@ -111,6 +111,7 @@
 #define BMP_FOIL_18 			RID_APP_START+28
 #define BMP_FOIL_19 			RID_APP_START+29
 #define BMP_FOIL_20 			RID_APP_START+30
+#define BMP_FOIL_25			RID_APP_START+41
 #define BMP_FOILH_01			RID_APP_START+31
 #define BMP_FOILH_02			RID_APP_START+32
 #define BMP_FOILH_03			RID_APP_START+33
@@ -289,6 +290,7 @@
 #define BMP_FOIL_22_H 						RID_SD_START+204
 #define BMP_FOIL_23_H 						RID_SD_START+205
 #define BMP_FOIL_24_H 						RID_SD_START+206
+#define BMP_FOIL_25_H 						RID_SD_START+333
 #define BMP_FOILH_01_H						RID_SD_START+207
 #define BMP_FOILH_02_H						RID_SD_START+208
 #define BMP_FOILH_03_H						RID_SD_START+209
diff -ruN sd.orig/source/ui/inc/strings.hrc sd/source/ui/inc/strings.hrc
--- openoffice.org.orig/sd/source/ui/inc/strings.hrc	2006-07-05 23:53:36.000000000 +0200
+++ openoffice.org/sd/source/ui/inc/strings.hrc	2007-07-27 15:13:52.000000000 +0200
@@ -295,6 +295,7 @@
 #define STR_AUTOLAYOUT_HANDOUT4 	(RID_APP_START+234)
 #define STR_AUTOLAYOUT_HANDOUT6 	(RID_APP_START+235)
 #define STR_AUTOLAYOUT_NOTES		(RID_APP_START+236)
+#define STR_AUTOLAYOUT_ONLY_TEXT	(RID_APP_START+237)
 
 
 #define STR_TRANSFORM				(RID_APP_START+240)
diff -ruN sd.orig/source/ui/toolpanel/LayoutMenu.cxx sd/source/ui/toolpanel/LayoutMenu.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/LayoutMenu.cxx	2006-12-12 19:40:07.000000000 +0100
+++ openoffice.org/sd/source/ui/toolpanel/LayoutMenu.cxx	2007-07-27 15:13:02.000000000 +0200
@@ -185,6 +185,8 @@
      AUTOLAYOUT_2TEXT},
     {BMP_FOIL_19, BMP_FOIL_19_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB,
      AUTOLAYOUT_ONLY_TITLE},
+    {BMP_FOIL_25, BMP_FOIL_25_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB,
+     AUTOLAYOUT_ONLY_TEXT},
     {BMP_FOIL_11, BMP_FOIL_11_H, STR_AUTOLAYOUT_OBJ, WritingMode_LR_TB,
      AUTOLAYOUT_OBJ},
     {BMP_FOIL_02, BMP_FOIL_02_H, STR_AUTOLAYOUT_CHART, WritingMode_LR_TB,


--- NEW FILE openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz ---
‹
jþ/NA*â3¨SÌÿF&ˆüodÌÿæ¦æÆ£ùŸ€ùŸ—Atò¥¿Œ@¡…°üïÈuXA€õBÄžíUE»5:R.Oy´äýzŸ°Ê’·]ÞùH­ŽÊ.9£ðäg®¦ªÞÊ­f×*÷—kºª|½÷üøuå×]Z~Ÿ®Û”³Ûzq”𷯓¯ˆ"ƒ«S7Pß}ñJ¬¥Åßï÷v™þ½¢»¬›Óª|ïÖ©óÊ+W_¨ T¼?~Õ³îf¥"«ü·^’3W|:
‹“éGÁ(£`Œ‚Q0
FÁ(£`Œ‚Q0
FÁ(£`Œ‚Q0
FÁ(£`Œ‚Q0¬

--- openoffice.org-2.3.0.oooXXXXX.sd.textonlystyle.patch DELETED ---


--- openoffice.org-2.3.0.oooXXXXX.sd.textonlystyle.tar.gz DELETED ---




More information about the fedora-extras-commits mailing list