Tag: cws_src680_reportdesign02 User: oj Date: 2007-10-26 10:42:14+0000 Modified: dba/reportdesign/source/core/api/ReportEngineJFree.cxx dba/reportdesign/util/makefile.mk dba/reportdesign/util/makefile.pmk dba/reportdesign/util/manifest.xml
Log: #i82914# add configuration entry File Changes: Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: ReportEngineJFree.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/ReportEngineJFree.cxx?r1=1.4&r2=1.4.36.1 Delta lines: +31 -36 --------------------- --- ReportEngineJFree.cxx 2007-08-03 12:42:59+0000 1.4 +++ ReportEngineJFree.cxx 2007-10-26 10:42:11+0000 1.4.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: ReportEngineJFree.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.36.1 $ * - * last change: $Author: hr $ $Date: 2007/08/03 12:42:59 $ + * last change: $Author: oj $ $Date: 2007/10/26 10:42:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -99,13 +99,13 @@ #ifndef _RTL_USTRBUF_HXX_ #include <rtl/ustrbuf.hxx> #endif - // ============================================================================= namespace reportdesign { // ============================================================================= using namespace com::sun::star; using namespace comphelper; + DBG_NAME( rpt_OReportEngineJFree ) // ----------------------------------------------------------------------------- OReportEngineJFree::OReportEngineJFree( const uno::Reference< uno::XComponentContext >& context) @@ -279,12 +279,11 @@ aConvertedProperties[nPos++].Value <<= m_xRowSet; // create job factory and initialize - uno::Reference<task::XJob> xJob(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.pentaho.SOReportJobFactory")),m_xContext),uno::UNO_QUERY); - if ( xJob.is() ) - { + const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(uno::Reference< lang::XMultiServiceFactory >(m_xContext->getServiceManager(),uno::UNO_QUERY_THROW)); + uno::Reference<task::XJob> xJob(m_xContext->getServiceManager()->createInstanceWithContext(sReportEngineServiceName,m_xContext),uno::UNO_QUERY_THROW); if ( m_xReport->getCommand().getLength() ) { - uno::Reference< beans::XPropertySet> xRowSetProp(m_xRowSet,uno::UNO_QUERY); + uno::Reference< beans::XPropertySet> xRowSetProp(m_xRowSet,uno::UNO_QUERY_THROW); xRowSetProp->setPropertyValue(PROPERTY_ACTIVECONNECTION,uno::makeAny(m_xActiveConnection)); ::rtl::OUString sOrder = getOrderStatement(); @@ -311,11 +310,7 @@ } if ( xStorageProp.is() ) - { - //xStorageProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"))) >>= sOutputName; sOutputName = aFile.GetURL(); - } - } uno::Reference<embed::XTransactedObject> xTransact(xOut,uno::UNO_QUERY); if ( sOutputName.getLength() && xTransact.is() ) Directory: /dba/reportdesign/util/ ================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.mk?r1=1.8&r2=1.8.12.1 Delta lines: +20 -7 -------------------- --- makefile.mk 2007-09-26 14:25:36+0000 1.8 +++ makefile.mk 2007-10-26 10:42:11+0000 1.8.12.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.8.12.1 $ # -# last change: $Author: hr $ $Date: 2007/09/26 14:25:36 $ +# last change: $Author: oj $ $Date: 2007/10/26 10:42:11 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -47,7 +47,6 @@ .INCLUDE : settings.mk # ------------------------------------------------------------------ - # --- reportdesign core (rpt) ----------------------------------- LIB1TARGET=$(SLB)$/$(TARGET).lib @@ -213,6 +212,9 @@ XMLFILES := $(ZIP1DIR)$/description.xml \ $(ZIP1DIR)$/META-INF$/manifest.xml +XCU_FILES := $(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess.xcu \ + $(ZIP1DIR)$/merge$/org$/openoffice$/Office$/DataAccess.xcu + HTMLFILES := $(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html \ $(ZIP1DIR)$/readme_en-US.html \ $(ZIP1DIR)$/readme_en-US.txt @@ -246,6 +248,9 @@ $(ZIP1TARGETN) : $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(REPRORTJARFILES) .ENDIF # "$(ZIP1TARGETN)"!=" +$(MISC)$/update_report.flag : $(XCU_FILES) + $(TOUCH) $@ + $(ZIP1DIR)$/description.xml : pre.xml post.xml @@-$(MKDIRHIER) $(@:d) @@-$(RM) $(ZIP1DIR)$/description.xml @@ -265,6 +270,14 @@ @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ +$(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/%.xcu : $(MISC)$/registry$/data$/org$/openoffice$/Office$/%.xcu + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + +$(ZIP1DIR)$/merge$/org$/openoffice$/Office$/%.xcu : $(MISC)$/merge$/org$/openoffice$/Office$/%.xcu + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + $(ZIP1DIR)$/%.jar : $(SOLARBINDIR)$/%.jar @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ @@ -273,9 +286,9 @@ @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(ZIP1DIR)$/META-INF$/%.xml : %.xml +$(ZIP1DIR)$/META-INF$/manifest.xml : manifest.xml $(MISC)$/update_report.flag @@-$(MKDIRHIER) $(@:d) - $(COPY) $< $@ + $(PERL) $(SOLARENV)$/bin$/makemani.pl $(PRJ)$/util$/manifest.xml $(ZIP1DIR) registry $(@:d:d) $(ZIP1DIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.% @@-$(MKDIRHIER) $(@:d) File [changed]: makefile.pmk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.pmk?r1=1.2&r2=1.2.44.1 Delta lines: +6 -2 ------------------- --- makefile.pmk 2007-07-09 11:56:41+0000 1.2 +++ makefile.pmk 2007-10-26 10:42:11+0000 1.2.44.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.pmk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.2.44.1 $ # -# last change: $Author: rt $ $Date: 2007/07/09 11:56:41 $ +# last change: $Author: oj $ $Date: 2007/10/26 10:42:11 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -35,10 +35,14 @@ XSLDIR=$(SOLARXMLDIR)$/processing XCSROOT=$(SOLARXMLDIR) +ABSXCSROOT=$(SOLARXMLDIR) DTDDIR=$(SOLARXMLDIR) PROCESSOUT=$(MISC) PROCESSORDIR=$(SOLARBINDIR) +# no validation by inspector class +NO_INSPECTION=TRUE + JAVAPREPRO= .IF "$(JDK_VERSION)" == "110" JAVAPREPRO=-jdk11 File [changed]: manifest.xml Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/manifest.xml?r1=1.3&r2=1.3.36.1 Delta lines: +0 -1 ------------------- --- manifest.xml 2007-08-02 14:42:53+0000 1.3 +++ manifest.xml 2007-10-26 10:42:11+0000 1.3.36.1 @@ -2,4 +2,3 @@ <!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd"> <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest";> <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Java" manifest:full-path="sun-report-builder.jar"/> -</manifest:manifest> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
