rpms/openoffice.org/F-11 openoffice.org.spec, 1.1933, 1.1934 workspace.unifypaper01.patch, 1.1, 1.2
David Tardon
dtardon at fedoraproject.org
Mon Sep 7 12:08:29 UTC 2009
- Previous message (by thread): rpms/slang/devel .cvsignore, 1.15, 1.16 slang.spec, 1.56, 1.57 sources, 1.15, 1.16
- Next message (by thread): rpms/openoffice.org/devel openoffice.org.spec, 1.1999, 1.2000 workspace.unifypaper01.patch, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dtardon
Update of /cvs/extras/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22149
Modified Files:
openoffice.org.spec workspace.unifypaper01.patch
Log Message:
Resolves: rhbz#521460 - wrong page size for A3/A5
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1933
retrieving revision 1.1934
diff -u -p -r1.1933 -r1.1934
--- openoffice.org.spec 2 Sep 2009 13:45:41 -0000 1.1933
+++ openoffice.org.spec 7 Sep 2009 12:08:28 -0000 1.1934
@@ -1,6 +1,6 @@
%define oootag OOO310
%define ooomilestone 19
-%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}
@@ -4173,6 +4173,9 @@ fi
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Mon Sep 07 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.3-UNBUILT
+- Resolves: rhbz#521460 - wrong page size for A3/A5
+
* Wed Sep 02 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.2
- Resolves: rhbz#520772 copy/paste cockup
workspace.unifypaper01.patch:
i18npool/inc/i18npool/paper.hxx | 155
i18npool/prj/build.lst | 3
i18npool/prj/d.lst | 6
i18npool/source/paper/makefile.mk | 75
i18npool/source/paper/paper.cxx | 473 +
psprint/source/printer/printerinfomanager.cxx | 75
psprint/util/makefile.mk | 1
reportdesign/source/core/api/ReportDefinition.cxx | 2
reportdesign/source/ui/report/ReportController.cxx | 4
sc/source/core/data/stlsheet.cxx | 8
sc/source/filter/excel/biffdump.cxx | 9864 +++++++++++++++++++++
sc/source/filter/excel/xlpage.cxx | 206
sc/source/filter/html/htmlimp.cxx | 4
sc/source/ui/app/transobj.cxx | 2
sc/source/ui/inc/printfun.hxx | 2
sc/source/ui/view/printfun.cxx | 4
scp2/source/ooo/file_library_ooo.scp | 2
scp2/source/ooo/module_hidden_ooo.scp | 1
sd/source/core/drawdoc2.cxx | 5
sd/source/ui/app/sdmod1.cxx | 4
sd/source/ui/dlg/dlgpage.cxx | 4
sd/source/ui/view/PrintManager.cxx | 4
sfx2/source/doc/printhelper.cxx | 89
solenv/inc/libs.mk | 2
starmath/source/unomodel.cxx | 28
svx/inc/svx/dialogs.hrc | 42
svx/inc/svx/paperinf.hxx | 116
svx/inc/svx/svxenum.hxx | 43
svx/source/dialog/page.cxx | 32
svx/source/dialog/page.h | 42
svx/source/dialog/page.hxx | 9
svx/source/dialog/page.src | 128
svx/source/items/paperinf.cxx | 298
svx/source/items/paraitem.cxx | 1
svx/util/makefile.mk | 1
sw/inc/bookmrk.hxx | 218
sw/source/core/doc/docdesc.cxx | 6
sw/source/core/doc/poolfmt.cxx | 2
sw/source/core/unocore/unostyle.cxx | 5
sw/source/core/view/vprint.cxx | 2
sw/source/filter/basflt/shellio.cxx | 7
sw/source/filter/rtf/swparrtf.cxx | 10
sw/source/filter/rtf/wrtrtf.cxx | 5
sw/source/filter/ww8/dump/ww8scan.cxx | 2
sw/source/filter/ww8/writerwordglue.cxx | 49
sw/source/filter/ww8/writerwordglue.hxx | 19
sw/source/filter/ww8/ww8atr.cxx | 9
sw/source/filter/ww8/ww8par6.cxx | 13
sw/source/filter/ww8/ww8scan.cxx | 2
sw/source/filter/ww8/ww8scan.hxx | 5
sw/source/ui/app/appenv.cxx | 5
sw/source/ui/dochdl/swdtflvr.cxx | 2
sw/source/ui/envelp/envfmt.cxx | 26
sw/source/ui/envelp/envimg.cxx | 5
sw/source/ui/frmdlg/colex.cxx | 2
sw/source/ui/inc/colex.hxx | 3
sw/source/ui/uiview/pview.cxx | 6
sw/source/ui/uiview/viewport.cxx | 5
swext/mediawiki/build.xml | 6
vcl/aqua/source/gdi/salprn.cxx | 8
vcl/inc/vcl/jobset.h | 2
vcl/inc/vcl/print.hxx | 9
vcl/inc/vcl/prntypes.hxx | 28
vcl/inc/vcl/salprn.hxx | 2
vcl/source/gdi/print.cxx | 154
vcl/unx/headless/svpprn.cxx | 42
vcl/unx/source/gdi/salprnpsp.cxx | 44
vcl/util/linksvp/makefile.mk | 1
vcl/util/makefile.mk | 4
vcl/win/source/gdi/salprn.cxx | 325
writerfilter/source/dmapper/ConversionHelper.cxx | 51
writerfilter/source/dmapper/ConversionHelper.hxx | 1
writerfilter/source/dmapper/DomainMapper.cxx | 24
writerfilter/source/dmapper/PropertyMap.cxx | 10
writerfilter/util/makefile.mk | 1
75 files changed, 11637 insertions(+), 1218 deletions(-)
Index: workspace.unifypaper01.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-11/workspace.unifypaper01.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.unifypaper01.patch 28 Aug 2009 09:43:31 -0000 1.1
+++ workspace.unifypaper01.patch 7 Sep 2009 12:08:29 -0000 1.2
@@ -11240,7 +11240,8 @@ diff -ru --exclude='unxlng*.pro' --exclu
ItemList [ en-US ] =
{
- < "A3" ; PAPERSIZE_A3 ; > ;
-- < "A4" ; PAPERSIZE_A4 ; > ;
++ < "A3" ; PAPERSIZE_A3 ; > ;
+ < "A4" ; PAPERSIZE_A4 ; > ;
< "A5" ; PAPERSIZE_A5 ; > ;
- < "B4 (ISO)" ; PAPERSIZE_B4 ; > ;
- < "B5 (ISO)" ; PAPERSIZE_B5 ; > ;
@@ -11248,21 +11249,15 @@ diff -ru --exclude='unxlng*.pro' --exclu
- < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
- < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
- < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-+ < "A4" ; PAPERSIZE_A4 ; > ;
-+ < "A3" ; PAPERSIZE_A3 ; > ;
-+ < "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
-+ < "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
+ < "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 ; > ;
- < "C4" ; PAPERSIZE_C4 ; > ;
- < "C5" ; PAPERSIZE_C5 ; > ;
@@ -11279,17 +11274,21 @@ diff -ru --exclude='unxlng*.pro' --exclu
- < "32 kai" ; PAPERSIZE_KAI32; > ;
- < "32 kai large" ; PAPERSIZE_KAI32BIG; > ;
- };
-+ < "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
@@ -11297,10 +11296,11 @@ diff -ru --exclude='unxlng*.pro' --exclu
ItemList [ en-US ] =
{
- < "A0" ; PAPERSIZE_A0 ; > ;
-- < "A1" ; PAPERSIZE_A1 ; > ;
-- < "A2" ; PAPERSIZE_A2 ; > ;
-- < "A3" ; PAPERSIZE_A3 ; > ;
-- < "A4" ; PAPERSIZE_A4 ; > ;
++ < "A0" ; PAPERSIZE_A0 ; > ;
+ < "A1" ; PAPERSIZE_A1 ; > ;
+ < "A2" ; PAPERSIZE_A2 ; > ;
+ < "A3" ; PAPERSIZE_A3 ; > ;
+ < "A4" ; PAPERSIZE_A4 ; > ;
< "A5" ; PAPERSIZE_A5 ; > ;
- < "B4 (ISO)" ; PAPERSIZE_B4 ; > ;
- < "B5 (ISO)" ; PAPERSIZE_B5 ; > ;
@@ -11308,24 +11308,15 @@ diff -ru --exclude='unxlng*.pro' --exclu
- < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
- < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
- < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-+ < "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 ; > ;
+ < "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 ; > ;
- < "C4" ; PAPERSIZE_C4 ; > ;
- < "C5" ; PAPERSIZE_C5 ; > ;
@@ -11333,17 +11324,21 @@ diff -ru --exclude='unxlng*.pro' --exclu
- < "C6/5" ; PAPERSIZE_C65 ; > ;
- < "DL" ; PAPERSIZE_DL ; > ;
- < "Slide" ; PAPERSIZE_DIA ; > ;
-+ < "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; > ;
- < "32 kai large" ; PAPERSIZE_KAI32BIG; > ;
- };
++ < "16 Kai" ; PAPERSIZE_KAI16; > ;
++ < "32 Kai" ; PAPERSIZE_KAI32; > ;
++ < "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
++ < "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
};
+};
String RID_SVXSTR_PAPERBIN
- Previous message (by thread): rpms/slang/devel .cvsignore, 1.15, 1.16 slang.spec, 1.56, 1.57 sources, 1.15, 1.16
- Next message (by thread): rpms/openoffice.org/devel openoffice.org.spec, 1.1999, 1.2000 workspace.unifypaper01.patch, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list