rpms/openoffice.org/devel openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch, NONE, 1.1 openoffice.org.spec, 1.2043, 1.2044
David Tardon
dtardon at fedoraproject.org
Mon Oct 19 06:31:26 UTC 2009
Author: dtardon
Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2030
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch
Log Message:
Resolves: rhbz#521460 - wrong page size for A3/A5
openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch:
page.src | 62 +++++++++++++++++++++++++++++++-------------------------------
1 file changed, 31 insertions(+), 31 deletions(-)
--- NEW FILE openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch ---
--- OOO320_m2/svx/source/cui/page.src 2009-06-12 12:36:34.000000000 +0200
+++ ../F-11/OOO310_m19/svx/source/dialog/page.src 2009-10-19 08:00:55.000000000 +0200
@@ -527,67 +527,67 @@ StringArray RID_SVXSTRARY_PAPERSIZE_STD
{
ItemList [ en-US ] =
{
- < "A5" ; PAPERSIZE_A5 ; > ;
- < "A4" ; PAPERSIZE_A4 ; > ;
< "A3" ; PAPERSIZE_A3 ; > ;
- < "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
- < "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
+ < "A4" ; PAPERSIZE_A4 ; > ;
+ < "A5" ; PAPERSIZE_A5 ; > ;
< "B4 (ISO)" ; PAPERSIZE_B4_ISO ; > ;
+ < "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
+ < "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
+ < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
+ < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
+ < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
< "Letter" ; PAPERSIZE_LETTER ; > ;
< "Legal" ; PAPERSIZE_LEGAL ; > ;
- < "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
< "Tabloid" ; PAPERSIZE_TABLOID ; > ;
- < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
- < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
- < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
- < "16 Kai" ; PAPERSIZE_KAI16; > ;
- < "32 Kai" ; PAPERSIZE_KAI32; > ;
- < "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
< "User" ; PAPERSIZE_USER ; > ;
- < "DL Envelope" ; PAPERSIZE_DL ; > ;
+ < "C4 Envelope" ; PAPERSIZE_C4 ; > ;
+ < "C5 Envelope" ; PAPERSIZE_C5 ; > ;
< "C6 Envelope" ; PAPERSIZE_C6 ; > ;
< "C6/5 Envelope" ; PAPERSIZE_C65 ; > ;
- < "C5 Envelope" ; PAPERSIZE_C5 ; > ;
- < "C4 Envelope" ; PAPERSIZE_C4 ; > ;
+ < "DL Envelope" ; PAPERSIZE_DL ; > ;
< "#6 3/4 (Personal) Envelope" ; PAPERSIZE_COM675; > ;
< "#8 (Monarch) Envelope" ; PAPERSIZE_MONARCH; > ;
< "#9 Envelope" ; PAPERSIZE_COM9; > ;
< "#10 Envelope" ; PAPERSIZE_COM10; > ;
< "#11 Envelope" ; PAPERSIZE_COM11; > ;
< "#12 Envelope" ; PAPERSIZE_COM12; > ;
+ < "16 Kai" ; PAPERSIZE_KAI16; > ;
+ < "32 Kai" ; PAPERSIZE_KAI32; > ;
+ < "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
+ < "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
};
};
StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
{
ItemList [ en-US ] =
{
- < "A5" ; PAPERSIZE_A5 ; > ;
- < "A4" ; PAPERSIZE_A4 ; > ;
- < "A3" ; PAPERSIZE_A3 ; > ;
- < "A2" ; PAPERSIZE_A2 ; > ;
- < "A1" ; PAPERSIZE_A1 ; > ;
< "A0" ; PAPERSIZE_A0 ; > ;
- < "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
- < "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
+ < "A1" ; PAPERSIZE_A1 ; > ;
+ < "A2" ; PAPERSIZE_A2 ; > ;
+ < "A3" ; PAPERSIZE_A3 ; > ;
+ < "A4" ; PAPERSIZE_A4 ; > ;
+ < "A5" ; PAPERSIZE_A5 ; > ;
< "B4 (ISO)" ; PAPERSIZE_B4_ISO ; > ;
+ < "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
+ < "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
+ < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
+ < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
+ < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
< "Letter" ; PAPERSIZE_LETTER ; > ;
< "Legal" ; PAPERSIZE_LEGAL ; > ;
- < "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
< "Tabloid" ; PAPERSIZE_TABLOID ; > ;
- < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
- < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
- < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
- < "16 Kai" ; PAPERSIZE_KAI16; > ;
- < "32 Kai" ; PAPERSIZE_KAI32; > ;
- < "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
< "User" ; PAPERSIZE_USER ; > ;
- < "DL Envelope" ; PAPERSIZE_DL ; > ;
+ < "C4 Envelope" ; PAPERSIZE_C4 ; > ;
+ < "C5 Envelope" ; PAPERSIZE_C5 ; > ;
< "C6 Envelope" ; PAPERSIZE_C6 ; > ;
< "C6/5 Envelope" ; PAPERSIZE_C65 ; > ;
- < "C5 Envelope" ; PAPERSIZE_C5 ; > ;
- < "C4 Envelope" ; PAPERSIZE_C4 ; > ;
+ < "DL Envelope" ; PAPERSIZE_DL ; > ;
< "Dia Slide" ; PAPERSIZE_DIA ; > ;
< "Screen" ; PAPERSIZE_SCREEN ; > ;
+ < "16 Kai" ; PAPERSIZE_KAI16; > ;
+ < "32 Kai" ; PAPERSIZE_KAI32; > ;
+ < "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
+ < "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
};
};
String RID_SVXSTR_PAPERBIN
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2043
retrieving revision 1.2044
diff -u -p -r1.2043 -r1.2044
--- openoffice.org.spec 17 Oct 2009 15:48:05 -0000 1.2043
+++ openoffice.org.spec 19 Oct 2009 06:31:23 -0000 1.2044
@@ -1,6 +1,6 @@
%define oootag OOO320
%define ooomilestone 2
-%define rh_rpm_release 2
+%define rh_rpm_release 3
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -116,6 +116,7 @@ Patch42: workspace.vcl106.patch
Patch43: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
Patch44: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
Patch45: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
+Patch46: openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1621,6 +1622,7 @@ cat %{PATCH10} >> svtools/source/dialogs
%patch43 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
%patch44 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
%patch45 -p0 -b .ooo105988.svx.a11ycrash.patch
+%patch46 -p1 -b .rhbz521460.svx.revert-paper-sizes-reordering.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4121,8 +4123,11 @@ fi
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Mon Oct 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-2.3
+- Resolves: rhbz#521460 - wrong page size for A3/A5 (dtardon)
+
* Sat Oct 17 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-2.2
-- Resolves: ooo#105988 a11y crash in impress
+- Resolves: ooo#105988 a11y crash in impress (caolanm)
* Thu Oct 15 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-2.1
- Resolves: rhbz#529127 [Indic][Various] Default font in oowriter is
More information about the fedora-extras-commits
mailing list