rpms/openoffice.org/devel workspace.impressfontsize.tar.gz, NONE, 1.1 openoffice.org.spec, 1.1712, 1.1713 workspace.impressfontsize.patch, 1.1, 1.2 openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch, 1.3, NONE openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Mon Dec 8 16:38:48 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv844
Modified Files:
openoffice.org.spec workspace.impressfontsize.patch
Added Files:
workspace.impressfontsize.tar.gz
Removed Files:
openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
Log Message:
patches merged into upstream workspace
--- NEW FILE workspace.impressfontsize.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¬
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1712
retrieving revision 1.1713
diff -u -r1.1712 -r1.1713
--- openoffice.org.spec 8 Dec 2008 15:04:25 -0000 1.1712
+++ openoffice.org.spec 8 Dec 2008 16:38:18 -0000 1.1713
@@ -90,8 +90,8 @@
Patch17: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
Patch18: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
Patch19: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
-Patch20: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch21: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch20: workspace.impressfontsize.patch
+Patch21: workspace.impressfontsize.tar.gz
Patch22: openoffice.org-2.3.0.ooo76649.httpencoding.patch
Patch23: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
Patch24: workspace.cmcfixes48.patch
@@ -105,31 +105,30 @@
Patch32: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
Patch33: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
Patch34: workspace.locales31.patch
-Patch35: workspace.impressfontsize.patch
-Patch36: workspace.fpicker8.patch
-Patch37: workspace.cmcfixes49.patch
-Patch38: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch39: workspace.cmcfixes50.patch
-Patch40: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
-Patch41: workspace.sjfixes12.patch
-Patch42: workspace.vcl94.patch
-Patch43: workspace.vcl95.patch
-Patch44: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
-Patch45: workspace.mhu17.patch
-Patch46: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
-Patch47: openoffice.org-3.0.0.ooo95318.system-showicons.patch
-Patch48: workspace.vcl96.patch
-Patch49: workspace.hb12.patch
-Patch50: workspace.fwk92.patch
-Patch51: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
-Patch52: workspace.sb101.patch
-Patch53: openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch
-Patch54: workspace.cmcfixes51.patch
-Patch55: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
-Patch56: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
-Patch57: openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch
-Patch58: workspace.swffixes.patch
-Patch59: openoffice.org-3.0.1.ooo96970.pluginfixups.patch
+Patch35: workspace.fpicker8.patch
+Patch36: workspace.cmcfixes49.patch
+Patch37: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
+Patch38: workspace.cmcfixes50.patch
+Patch39: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
+Patch40: workspace.sjfixes12.patch
+Patch41: workspace.vcl94.patch
+Patch42: workspace.vcl95.patch
+Patch43: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
+Patch44: workspace.mhu17.patch
+Patch45: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
+Patch46: openoffice.org-3.0.0.ooo95318.system-showicons.patch
+Patch47: workspace.vcl96.patch
+Patch48: workspace.hb12.patch
+Patch49: workspace.fwk92.patch
+Patch50: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
+Patch51: workspace.sb101.patch
+Patch52: openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch
+Patch53: workspace.cmcfixes51.patch
+Patch54: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
+Patch55: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
+Patch56: openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch
+Patch57: workspace.swffixes.patch
+Patch58: openoffice.org-3.0.1.ooo96970.pluginfixups.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1344,7 +1343,7 @@
%patch17 -p1 -b .ooo76393.sal.dynamicsection.patch
%patch18 -p1 -b .ooo80816.selinux.bridges.patch
%patch19 -p1 -b .ooo7065.sw.titlepagedialog.patch
-%patch20 -p1 -b .ooo80257.sd.textonlystyle.patch
+%patch20 -p1 -b .workspace.impressfontsize.patch
tar xzf %{PATCH21}
%patch22 -p1 -b .ooo76649.httpencoding.patch
%patch23 -p1 -b .ooo83878.unopkg.enablelinking.patch
@@ -1359,31 +1358,30 @@
%patch32 -p1 -b .ooo87970.vcl.samenamesubs.patch
%patch33 -p1 -b .ooo48400.svx.fixspelling.patch
%patch34 -p1 -b .workspace.locales31.patch
-%patch35 -p1 -b .workspace.impressfontsize.patch
-%patch36 -p1 -b .workspace.fpicker8.patch
-%patch37 -p0 -b .workspace.cmcfixes49.patch
-%patch38 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch39 -p1 -b .workspace.cmcfixes50.patch
-%patch40 -p1 -b .ooo93515.vcl.jrb-frames.patch
-%patch41 -p1 -b .workspace.sjfixes12.patch
-%patch42 -p1 -b .workspace.vcl94.patch
-%patch43 -p1 -b .workspace.vcl95.patch
-%patch44 -p1 -b .ooo94938.unopkg.handleexception.patch
-%patch45 -p1 -b .workspace.mhu17.patch
-%patch46 -p1 -b .ooo95018.sal.fdwarnings.patch
-%patch47 -p1 -b .ooo95318.system-showicons.patch
-%patch48 -p1 -b .workspace.vcl96.patch
-%patch49 -p1 -b .workspace.hb12.patch
-%patch50 -p1 -b .workspace.fwk92.patch
-%patch51 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
-%patch52 -p1 -b .workspace.sb101.patch
-%patch53 -p1 -b .ooo90072.sw.undo-longtext.patch
-%patch54 -p1 -b .workspace.cmcfixes51.patch
-%patch55 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
-%patch56 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
-%patch57 -p1 -b .ooo96906.ucb.symlinks.and.size.patch
-%patch58 -p1 -b .workspace.swffixes.patch
-%patch59 -p1 -b .ooo96970.pluginfixups.patch
+%patch35 -p1 -b .workspace.fpicker8.patch
+%patch36 -p0 -b .workspace.cmcfixes49.patch
+%patch37 -p1 -b .ooo91924.svx.consistentordering.patch
+%patch38 -p1 -b .workspace.cmcfixes50.patch
+%patch39 -p1 -b .ooo93515.vcl.jrb-frames.patch
+%patch40 -p1 -b .workspace.sjfixes12.patch
+%patch41 -p1 -b .workspace.vcl94.patch
+%patch42 -p1 -b .workspace.vcl95.patch
+%patch43 -p1 -b .ooo94938.unopkg.handleexception.patch
+%patch44 -p1 -b .workspace.mhu17.patch
+%patch45 -p1 -b .ooo95018.sal.fdwarnings.patch
+%patch46 -p1 -b .ooo95318.system-showicons.patch
+%patch47 -p1 -b .workspace.vcl96.patch
+%patch48 -p1 -b .workspace.hb12.patch
+%patch49 -p1 -b .workspace.fwk92.patch
+%patch50 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
+%patch51 -p1 -b .workspace.sb101.patch
+%patch52 -p1 -b .ooo90072.sw.undo-longtext.patch
+%patch53 -p1 -b .workspace.cmcfixes51.patch
+%patch54 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
+%patch55 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
+%patch56 -p1 -b .ooo96906.ucb.symlinks.and.size.patch
+%patch57 -p1 -b .workspace.swffixes.patch
+%patch58 -p1 -b .ooo96970.pluginfixups.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3752,8 +3750,9 @@
%changelog
* Mon Dec 08 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-12.4
- rhbz#474719 add libXinerama-devel BuildRequires
-- rename openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch to
- upstream workspace.impressfontsize.patch
+- merge openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch and
+ openoffice.org-2.3.0.ooo80257.sd.textonlystyle to upstream
+ workspace.impressfontsize.patch
* Sat Dec 06 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-12.3
- rebuild for python
workspace.impressfontsize.patch:
Index: workspace.impressfontsize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.impressfontsize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.impressfontsize.patch 8 Dec 2008 15:04:25 -0000 1.1
+++ workspace.impressfontsize.patch 8 Dec 2008 16:38:18 -0000 1.2
@@ -1,3 +1,128 @@
+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
+@@ -177,6 +177,10 @@
+ {
+ Text [ en-US ] = "Title Only" ;
+ };
++String STR_AUTOLAYOUT_ONLY_TEXT
++{
++ Text [ en-US ] = "Centered Text" ;
++};
+ String STR_AUTOLAYOUT_TITLE
+ {
+ Text [ en-US ] = "Title Slide" ;
+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+334
+ #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
+@@ -202,6 +202,7 @@
+ #define STR_AUTOLAYOUT_HANDOUT6 (RID_APP_START+235)
+ #define STR_AUTOLAYOUT_NOTES (RID_APP_START+236)
+ #define STR_AUTOLAYOUT_HANDOUT9 (RID_APP_START+237)
++#define STR_AUTOLAYOUT_ONLY_TEXT (RID_APP_START+238)
+
+ #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,
+Index: source/token/tokens.txt
+===================================================================
+RCS file: /cvs/xml/oox/source/token/tokens.txt,v
+retrieving revision 1.2
+diff -u -r1.2 tokens.txt
+--- openoffice.org.orig/oox/source/token/tokens.txt 17 Jan 2008 08:06:07 -0000 1.2
++++ openoffice.org/oox/source/token/tokens.txt 10 Mar 2008 15:57:51 -0000
+@@ -2431,6 +2431,7 @@
+ handoutMasterId
+ handoutMasterIdLst
+ handoutView
++handouts
+ handouts1
+ handouts2
+ handouts3
Index: source/ui/app/optsitem.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/app/optsitem.cxx,v
--- openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch DELETED ---
--- openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz DELETED ---
More information about the fedora-extras-commits
mailing list