rpms/openoffice.org/devel openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch, 1.2, 1.3 openoffice.org.spec, 1.1746, 1.1747 workspace.impressfontsize.patch, 1.3, 1.4
Caolan McNamara
caolanm at fedoraproject.org
Wed Jan 7 12:51:54 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv832
Modified Files:
openoffice.org.spec workspace.impressfontsize.patch
Added Files:
openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
Log Message:
fixup
openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch:
Index: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
===================================================================
RCS file: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
diff -N openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch 7 Jan 2009 12:51:24 -0000 1.3
@@ -0,0 +1,19 @@
+--- openoffice.org.orig/svx/source/dialog/optgdlg.cxx 2008-08-29 08:29:20.000000000 +0100
++++ openoffice.org/svx/source/dialog/optgdlg.cxx 2008-08-29 08:31:35.000000000 +0100
+@@ -795,11 +795,11 @@
+ switch( Application::GetSettings().GetStyleSettings().GetAutoSymbolsStyle() )
+ {
+ case STYLE_SYMBOLS_DEFAULT: aAutoStr += aIconStyleLB.GetEntry( 1 ); break;
+- case STYLE_SYMBOLS_INDUSTRIAL: aAutoStr += aIconStyleLB.GetEntry( 2 ); break;
+- case STYLE_SYMBOLS_CRYSTAL: aAutoStr += aIconStyleLB.GetEntry( 3 ); break;
+- case STYLE_SYMBOLS_TANGO: aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
+- case STYLE_SYMBOLS_CLASSIC: aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
+- case STYLE_SYMBOLS_HICONTRAST: aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
++ case STYLE_SYMBOLS_HICONTRAST: aAutoStr += aIconStyleLB.GetEntry( 2 ); break;
++ case STYLE_SYMBOLS_INDUSTRIAL: aAutoStr += aIconStyleLB.GetEntry( 3 ); break;
++ case STYLE_SYMBOLS_CRYSTAL: aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
++ case STYLE_SYMBOLS_TANGO: aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
++ case STYLE_SYMBOLS_CLASSIC: aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
+ }
+
+ aIconStyleLB.RemoveEntry( 0 );
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1746
retrieving revision 1.1747
diff -u -r1.1746 -r1.1747
--- openoffice.org.spec 7 Jan 2009 12:27:59 -0000 1.1746
+++ openoffice.org.spec 7 Jan 2009 12:51:24 -0000 1.1747
@@ -107,7 +107,7 @@
Patch34: workspace.locales31.patch
Patch35: workspace.fpicker8.patch
Patch36: workspace.cmcfixes49.patch
-Patch37: workspace.impressfontsize.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.vcl94.patch
@@ -1386,7 +1386,7 @@
%patch34 -p1 -b .workspace.locales31.patch
%patch35 -p1 -b .workspace.fpicker8.patch
%patch36 -p0 -b .workspace.cmcfixes49.patch
-%patch37 -p1 -b .workspace.impressfontsize.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.vcl94.patch
workspace.impressfontsize.patch:
Index: workspace.impressfontsize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.impressfontsize.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.impressfontsize.patch 7 Jan 2009 12:27:59 -0000 1.3
+++ workspace.impressfontsize.patch 7 Jan 2009 12:51:24 -0000 1.4
@@ -1,19 +1,143 @@
---- openoffice.org.orig/svx/source/dialog/optgdlg.cxx 2008-08-29 08:29:20.000000000 +0100
-+++ openoffice.org/svx/source/dialog/optgdlg.cxx 2008-08-29 08:31:35.000000000 +0100
-@@ -795,11 +795,11 @@
- switch( Application::GetSettings().GetStyleSettings().GetAutoSymbolsStyle() )
- {
- case STYLE_SYMBOLS_DEFAULT: aAutoStr += aIconStyleLB.GetEntry( 1 ); break;
-- case STYLE_SYMBOLS_INDUSTRIAL: aAutoStr += aIconStyleLB.GetEntry( 2 ); break;
-- case STYLE_SYMBOLS_CRYSTAL: aAutoStr += aIconStyleLB.GetEntry( 3 ); break;
-- case STYLE_SYMBOLS_TANGO: aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
-- case STYLE_SYMBOLS_CLASSIC: aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
-- case STYLE_SYMBOLS_HICONTRAST: aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
-+ case STYLE_SYMBOLS_HICONTRAST: aAutoStr += aIconStyleLB.GetEntry( 2 ); break;
-+ case STYLE_SYMBOLS_INDUSTRIAL: aAutoStr += aIconStyleLB.GetEntry( 3 ); break;
-+ case STYLE_SYMBOLS_CRYSTAL: aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
-+ case STYLE_SYMBOLS_TANGO: aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
-+ case STYLE_SYMBOLS_CLASSIC: aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
- }
+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;
++ }
+ }
+ }
- aIconStyleLB.RemoveEntry( 0 );
+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
+retrieving revision 1.43
+diff -u -r1.43 optsitem.cxx
+--- openoffice.org.orig/sd/source/ui/app/optsitem.cxx 10 Apr 2008 19:25:45 -0000 1.43
++++ openoffice.org/sd/source/ui/app/optsitem.cxx 21 Jul 2008 09:50:19 -0000
+@@ -1584,8 +1584,8 @@
+ if( pValues[12].hasValue() ) SetNotes( *(sal_Bool*) pValues[ 12 ].getValue() );
+ if( pValues[13].hasValue() ) SetHandout( *(sal_Bool*) pValues[ 13 ].getValue() );
+ if( pValues[14].hasValue() ) SetOutline( *(sal_Bool*) pValues[ 14 ].getValue() );
+- if( pValues[15].hasValue() ) SetHandoutHorizontal( *(sal_Bool*) pValues[12].getValue() );
+- if( pValues[16].hasValue() ) SetHandoutPages( (UINT16)*(sal_Int32*) pValues[13].getValue() );
++ if( pValues[15].hasValue() ) SetHandoutHorizontal( *(sal_Bool*) pValues[15].getValue() );
++ if( pValues[16].hasValue() ) SetHandoutPages( (UINT16)*(sal_Int32*) pValues[16].getValue() );
+ }
+
+ return TRUE;
More information about the fedora-extras-commits
mailing list