rpms/openoffice.org/FC-6 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.26, 1.27 openoffice.org.spec, 1.934, 1.935

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Mar 29 12:36:43 UTC 2007


Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv19428

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org.spec 
Log Message:
Resolves: rhbz#234421 Wrong current sheet no for calc

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
 inc/jobset.hxx                                          |    0 
 inc/print.h                                             |    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                     |  602 +++++++++++++++-
 svtools/source/dialogs/printdlg.hrc                     |    2 
 svtools/util/makefile.mk                                |    8 
 util/makefile.mk                                        |    0 
 vcl/inc/jobset.hxx                                      |    3 
 vcl/inc/print.h                                         |    2 
 vcl/inc/print.hxx                                       |    3 
 vcl/source/gdi/jobset.cxx                               |  194 +++++
 vcl/source/gdi/print.cxx                                |   11 
 28 files changed, 865 insertions(+), 13 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	15 Mar 2007 12:29:48 -0000	1.26
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	29 Mar 2007 12:36:40 -0000	1.27
@@ -325,7 +325,7 @@
 diff -u -r1.23 printdlg.cxx
 --- openoffice.org.orig/svtools/source/dialogs/printdlg.cxx	17 Sep 2006 14:45:21 -0000	1.23
 +++ openoffice.org/svtools/source/dialogs/printdlg.cxx	16 Nov 2006 14:14:35 -0000
-@@ -85,9 +85,56 @@
+@@ -85,9 +85,62 @@
  #include <comphelper/processfactory.hxx>
  #endif
  
@@ -352,6 +352,10 @@
 +#include <com/sun/star/document/XFilter.hpp>
 +#include <com/sun/star/document/XExporter.hpp>
 +#include <com/sun/star/io/XOutputStream.hpp>
++#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
++#include <com/sun/star/sheet/XSpreadsheetView.hpp>
++#include <com/sun/star/sheet/XSpreadsheet.hpp>
++#include <com/sun/star/container/XNamed.hpp>
 +#include <unotools/streamwrap.hxx>
 +#include <unotools/ucbstreamhelper.hxx>
 +
@@ -378,6 +382,8 @@
  using namespace com::sun::star::ui::dialogs;
 +using namespace com::sun::star::view;
 +using namespace com::sun::star::document;
++using namespace com::sun::star::sheet;
++using namespace com::sun::star::container;
 +using namespace com::sun::star::io;
  using namespace rtl;
  
@@ -635,7 +641,7 @@
  short PrintDialog::Execute()
  {
  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -625,15 +908,260 @@
+@@ -625,15 +908,310 @@
  	ImplInitControls();
  	ImplModifyControlHdl( NULL );
  
@@ -775,7 +781,57 @@
 +					meCheckRange = PRINTDIALOG_RANGE;
 +				}
 +				else if (pStr && !strcmp(pStr, "current"))
++				{
 +					meCheckRange = PRINTDIALOG_RANGE;
++					
++                    try
++                    {
++                        Reference < XFramesSupplier > xDesktop = Reference < XFramesSupplier >(
++                                ::comphelper::getProcessServiceFactory()->
++                                createInstance( ASCII_STR("com.sun.star.frame.Desktop") ), UNO_QUERY );
++                        Reference < XFrame > xFrame( xDesktop->getActiveFrame() );
++                        if ( !xFrame.is() )
++                            xFrame = Reference < XFrame >( xDesktop, UNO_QUERY );
++
++                        Reference< XController > xController;
++                        Reference< XSpreadsheetView > xSpreadsheetView;
++                        Reference< XSpreadsheet> xSheet;
++                        Reference< XSpreadsheetDocument > xSheetDoc;
++                        Reference< XIndexAccess > xSheets;
++                        Reference< XNamed > xName;
++
++                        if (xFrame.is())
++                            xController = xFrame->getController();
++                        if (xController.is())
++                            xSpreadsheetView = Reference< XSpreadsheetView >(xController, UNO_QUERY);
++                        if (xSpreadsheetView.is())
++                            xSheet = Reference< XSpreadsheet>(xSpreadsheetView->getActiveSheet());
++                        if (xSheet.is())
++                            xName = Reference < XNamed >(xSheet, UNO_QUERY);
++                        if (xName.is())
++                            xSheetDoc = Reference< XSpreadsheetDocument >(xController->getModel(), UNO_QUERY);
++                        if (xSheetDoc.is())
++                            xSheets = Reference< XIndexAccess >(xSheetDoc->getSheets(), UNO_QUERY);
++                        if (xSheets.is())
++                        {
++                            const rtl::OUString &rName = xName->getName();
++
++                            sal_Int32 i;
++
++                            for( i = 0; i < xSheets->getCount(); ++i)
++                            {
++                                Reference < XNamed > xItem =
++                                    Reference < XNamed >(xSheets->getByIndex(i), UNO_QUERY);
++                                if (rName == xItem->getName())
++                                    break;
++                            }
++
++                            if (i < xSheets->getCount())
++                                maRangeText = String::CreateFromInt32( i + 1 );
++                        }
++                    }
++                    catch (...) {}
++				}
 +				else
 +					meCheckRange = PRINTDIALOG_ALL;
 +


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.934
retrieving revision 1.935
diff -u -r1.934 -r1.935
--- openoffice.org.spec	15 Mar 2007 12:11:13 -0000	1.934
+++ openoffice.org.spec	29 Mar 2007 12:36:40 -0000	1.935
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 5
-%define rh_rpm_release 5.17
+%define rh_rpm_release 5.18
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -2583,6 +2583,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Mar 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.18
+- Resolves: rhbz#234421 Wrong current sheet no for calc
+
 * Thu Mar 15 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.17
 - Resolves: rhbz#230993 Won't print to newly discovered printers
 




More information about the fedora-cvs-commits mailing list