rpms/openoffice.org/devel openoffice.org-2.3.0.oooXXXXX.sd.textonlystyle.patch, NONE, 1.1 openoffice.org-2.3.0.oooXXXXX.sd.textonlystyle.tar.gz, NONE, 1.1 openoffice.org.ooo79953.dbusinhibitscreensaver.patch, 1.1, 1.2 openoffice.org.spec, 1.1230, 1.1231
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Fri Jul 27 15:49:12 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29454a
Modified Files:
openoffice.org.ooo79953.dbusinhibitscreensaver.patch
openoffice.org.spec
Added Files:
openoffice.org-2.3.0.oooXXXXX.sd.textonlystyle.patch
openoffice.org-2.3.0.oooXXXXX.sd.textonlystyle.tar.gz
Log Message:
Resolves: rhbz#247632 lessig-like layout style in impress
openoffice.org-2.3.0.oooXXXXX.sd.textonlystyle.patch:
--- NEW FILE openoffice.org-2.3.0.oooXXXXX.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.oooXXXXX.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.ooo79953.dbusinhibitscreensaver.patch:
Index: openoffice.org.ooo79953.dbusinhibitscreensaver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.ooo79953.dbusinhibitscreensaver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org.ooo79953.dbusinhibitscreensaver.patch 24 Jul 2007 09:27:59 -0000 1.1
+++ openoffice.org.ooo79953.dbusinhibitscreensaver.patch 27 Jul 2007 15:48:39 -0000 1.2
@@ -55,15 +55,14 @@
diff -u -r1.152 set_soenv.in
--- openoffice.org.orig/config_office/set_soenv.in 27 Jun 2007 17:52:06 -0000 1.152
+++ openoffice.org/config_office/set_soenv.in 24 Jul 2007 09:20:02 -0000
-@@ -1546,6 +1546,7 @@
+@@ -1556,6 +1556,7 @@
ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
ToFile( "ENABLE_CAIRO", "@ENABLE_CAIRO@", "e" );
+ToFile( "ENABLE_DBUS", "@ENABLE_DBUS@", "e" );
+ ToFile( "ENABLE_GSTREAMER", "@ENABLE_GSTREAMER@", "e" );
ToFile( "ENABLE_GNOMEVFS", "@ENABLE_GNOMEVFS@", "e" );
ToFile( "ENABLE_KDE", "@ENABLE_KDE@", "e" );
- ToFile( "KDE_CFLAGS", "@KDE_CFLAGS@", "e" );
-? unxlngx6.pro
Index: unx/gtk/window/gtkframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1230
retrieving revision 1.1231
diff -u -r1.1230 -r1.1231
--- openoffice.org.spec 26 Jul 2007 09:42:38 -0000 1.1230
+++ openoffice.org.spec 27 Jul 2007 15:48:39 -0000 1.1231
@@ -151,6 +151,8 @@
Patch86: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
Patch87: openoffice.org.ooo79953.dbusinhibitscreensaver.patch
Patch88: openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch
+Patch89: openoffice.org-2.3.0.oooXXXXX.sd.textonlystyle.patch
+Patch90: openoffice.org-2.3.0.oooXXXXX.sd.textonlystyle.tar.gz
%define instdir %{_libdir}/openoffice.org
@@ -1008,6 +1010,8 @@
%prep
%setup -q -n %{ooo_base_name}
+cp -p %{SOURCE1} extras/source/database/evolocal.odb
+cp -p %{SOURCE6} external/unowinreg/unowinreg.dll
%patch9 -p1 -b .rh133741.alwaysgtk.desktop.patch
%patch10 -p1 -b .rh161886.rpath.desktop.patch
%patch11 -p1 -b .rh151357.setlangtolocale.patch
@@ -1094,8 +1098,8 @@
%patch86 -p1 -b .ooo79481.sw.rowordcount.patch
%patch87 -p1 -b .ooo79953.dbusinhibitscreensaver.patch
%patch88 -p1 -b .ooo79878.vcl.honourwidthtype.patch
-
-cp %{SOURCE1} extras/source/database/evolocal.odb
+%patch89 -p1 -b .oooXXXXX.sd.textonlystyle.patch
+tar xzf %{PATCH90}
%if %{linkopt}
chmod a+x solenv/bin/mklinkscript.pl
@@ -1105,7 +1109,6 @@
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
#don't build localized helps which are poorly translated
POORHELPS=`grep "Working With %PRODUCTNAME" helpcontent2/source/text/swriter/localize.sdf | cut -f 10 | xargs`
-cp -p %{SOURCE6} external/unowinreg/unowinreg.dll
cd config_office
autoconf
export PATH=$PATH:/usr/sbin
@@ -2696,6 +2699,7 @@
- Resolves: ooo#79953 inhibit screensaver during presentations
- Resolves: rhbz#249196 propogate font width types up from the font ooo#79878
- Resolves: rhbz#249568 empty line in autocorrect options
+- Resolves: rhbz#247632 new text only impress layout
* Thu Jul 19 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.6
- FC-8 Test 1 Candidate
More information about the scm-commits
mailing list