rpms/openoffice.org/FC-6 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.21, 1.22 openoffice.org.spec, 1.926, 1.927
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Feb 12 10:41:05 UTC 2007
- Previous message (by thread): rpms/logwatch/devel logwatch-7.3.2-automount2.patch, NONE, 1.1 logwatch-7.3.2-named.patch, NONE, 1.1 logwatch-7.3.2-up2date.patch, NONE, 1.1 logwatch-7.3.2-xntpd2.patch, NONE, 1.1 logwatch.spec, 1.60, 1.61
- Next message (by thread): rpms/openoffice.org/FC-6 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.22, 1.23
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv23276
Modified Files:
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
openoffice.org.spec
Log Message:
Resolves: rhbz#228254 crash on print to pdf after print to ps
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
inc/jobset.hxx | 0
inc/print.hxx | 0
inc/printdlg.hxx | 0
openoffice.org.orig/svtools/source/dialogs/printdlg.src | 10
psprint/inc/cupsmgr.hxx | 2
psprint/inc/psprint/ppdparser.hxx | 4
psprint/inc/psprint/printerinfomanager.hxx | 2
psprint/source/printer/cupsmgr.cxx | 18
psprint/source/printer/printerinfomanager.cxx | 8
psprint/source/printergfx/printerjob.cxx | 3
source/dialogs/makefile.mk | 0
source/dialogs/printdlg.cxx | 0
source/dialogs/printdlg.hrc | 0
source/dialogs/printdlg.src | 0
source/gdi/jobset.cxx | 0
source/gdi/print.cxx | 0
svtools/inc/printdlg.hxx | 2
svtools/source/dialogs/makefile.mk | 4
svtools/source/dialogs/printdlg.cxx | 544 +++++++++++++++-
svtools/source/dialogs/printdlg.hrc | 2
svtools/util/makefile.mk | 8
util/makefile.mk | 0
vcl/inc/jobset.hxx | 3
vcl/inc/print.hxx | 3
vcl/source/gdi/jobset.cxx | 194 +++++
vcl/source/gdi/print.cxx | 11
26 files changed, 806 insertions(+), 12 deletions(-)
Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 30 Jan 2007 13:00:53 -0000 1.21
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 12 Feb 2007 10:40:58 -0000 1.22
@@ -857,15 +857,18 @@
+
+ int nPapers = mpPrinter->GetPaperInfoCount();
+ pStr = gtk_combo_box_get_active_text(GTK_COMBO_BOX(aHandle.paperwidget));
-+ rtl::OUString sPaper((const sal_Char*)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
-+ for (int i = 0; i < nPapers; ++i)
++ if ( nPapers && pStr )
+ {
-+ const vcl::PaperInfo &rInfo = mpPrinter->GetPaperInfo(i);
-+ if (rtl::OUString(rInfo.m_aPaperName) == sPaper)
-+ {
-+ mpPrinter->SetPaperFromInfo(rInfo);
-+ break;
-+ }
++ rtl::OUString sPaper((const sal_Char*)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
++ for (int i = 0; i < nPapers; ++i)
++ {
++ const vcl::PaperInfo &rInfo = mpPrinter->GetPaperInfo(i);
++ if (rtl::OUString(rInfo.m_aPaperName) == sPaper)
++ {
++ mpPrinter->SetPaperFromInfo(rInfo);
++ break;
++ }
++ }
+ }
+
+ if (1 == gtk_combo_box_get_active(GTK_COMBO_BOX(aHandle.orientwidget)))
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.926
retrieving revision 1.927
diff -u -r1.926 -r1.927
--- openoffice.org.spec 9 Feb 2007 14:47:22 -0000 1.926
+++ openoffice.org.spec 12 Feb 2007 10:40:58 -0000 1.927
@@ -2585,6 +2585,7 @@
- Resolves: rhbz#225097 library path problems for extensions
- Resolves: rhbz#225061 openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
- Resolves: rhbz#225143 detect newly added printers
+- Resolves: rhbz#228254 crash on print to pdf after print to ps
- Resolves: rhbz#226966 sc overflow
- Resolves: rhbz#227753 workspace.fwk55.patch
- Resolves: CVE-2007-0239 rhbz#228002 shell escape
- Previous message (by thread): rpms/logwatch/devel logwatch-7.3.2-automount2.patch, NONE, 1.1 logwatch-7.3.2-named.patch, NONE, 1.1 logwatch-7.3.2-up2date.patch, NONE, 1.1 logwatch-7.3.2-xntpd2.patch, NONE, 1.1 logwatch.spec, 1.60, 1.61
- Next message (by thread): rpms/openoffice.org/FC-6 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.22, 1.23
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list