Tag: cws_dev300_dba31a User: fs Date: 2008-07-16 06:16:32+0000 Modified: dba/reportdesign/inc/ReportDefinition.hxx dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportJob.java dba/reportdesign/source/core/api/ReportDefinition.cxx dba/reportdesign/source/filter/xml/xmlExport.cxx dba/reportdesign/source/filter/xml/xmlExport.hxx dba/reportdesign/util/description.xml
Log: RESYNC: (1.8-1.9); FILE MERGED File Changes: Directory: /dba/reportdesign/inc/ ================================= File [changed]: ReportDefinition.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/ReportDefinition.hxx?r1=1.8.4.1&r2=1.8.4.2 Delta lines: +9 -4 ------------------- --- ReportDefinition.hxx 2008-07-10 06:36:08+0000 1.8.4.1 +++ ReportDefinition.hxx 2008-07-16 06:16:03+0000 1.8.4.2 @@ -32,7 +32,7 @@ #define REPORTDESIGN_API_REPORTDEFINITION_HXX #include <com/sun/star/report/XReportDefinition.hpp> -#include <cppuhelper/compbase10.hxx> +#include <cppuhelper/compbase11.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> @@ -40,6 +40,7 @@ #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> #include <com/sun/star/frame/XUntitledNumbers.hpp> +#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <cppuhelper/propertysetmixin.hxx> #include <comphelper/uno3.hxx> #include <comphelper/embeddedobjectcontainer.hxx> @@ -61,7 +62,7 @@ namespace reportdesign { class OReportComponentProperties; - typedef ::cppu::WeakComponentImplHelper10< com::sun::star::report::XReportDefinition + typedef ::cppu::WeakComponentImplHelper11< com::sun::star::report::XReportDefinition ,com::sun::star::document::XEventBroadcaster ,com::sun::star::lang::XServiceInfo ,com::sun::star::frame::XModule @@ -70,6 +71,7 @@ ,::com::sun::star::frame::XTitle ,::com::sun::star::frame::XTitleChangeBroadcaster ,::com::sun::star::frame::XUntitledNumbers + ,::com::sun::star::document::XDocumentPropertiesSupplier ,SvxUnoDrawMSFactory> ReportDefinitionBase; typedef ::cppu::PropertySetMixin<com::sun::star::report::XReportDefinition> ReportDefinitionPropertySet; @@ -353,6 +355,9 @@ virtual void SAL_CALL releaseNumberForComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xComponent ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getUntitledPrefix( ) throw (::com::sun::star::uno::RuntimeException); + // XDocumentPropertiesSupplier + virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > SAL_CALL getDocumentProperties( ) throw (::com::sun::star::uno::RuntimeException); + // comphelper::IEmbeddedHelper virtual com::sun::star::uno::Reference < com::sun::star::embed::XStorage > getStorage() const; virtual ::comphelper::EmbeddedObjectContainer& getEmbeddedObjectContainer() const; Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/ ============================================================== File [changed]: PentahoReportJob.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportJob.java?r1=1.7.4.1&r2=1.7.4.2 Delta lines: +5 -2 ------------------- --- PentahoReportJob.java 2008-07-07 12:22:55+0000 1.7.4.1 +++ PentahoReportJob.java 2008-07-16 06:16:06+0000 1.7.4.2 @@ -341,6 +341,9 @@ report.setQuery(command); parameters.put(SDBCReportDataFactory.COMMAND_TYPE, commandType); + final String filter = (String) officeReport.getAttribute(OfficeNamespaces.OOREPORT_NS, "filter"); + parameters.put(SDBCReportDataFactory.UNO_FILTER, filter); + final long startTime = System.currentTimeMillis(); final ReportProcessor rp = getProcessorForContentType(contentType); rp.processReport(job); Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: ReportDefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/ReportDefinition.cxx?r1=1.10.4.1&r2=1.10.4.2 Delta lines: +32 -4 -------------------- --- ReportDefinition.cxx 2008-07-10 06:44:41+0000 1.10.4.1 +++ ReportDefinition.cxx 2008-07-16 06:16:14+0000 1.10.4.2 @@ -527,6 +527,7 @@ uno::Reference< sdbc::XConnection> m_xActiveConnection; uno::Reference< frame::XTitle > m_xTitleHelper; uno::Reference< frame::XUntitledNumbers > m_xNumberedControllers; + uno::Reference< document::XDocumentProperties > m_xDocumentProperties; ::boost::shared_ptr< ::comphelper::EmbeddedObjectContainer> m_pObjectContainer; @@ -1426,6 +1427,21 @@ if( !bErr ) { if( !WriteThroughComponent( + xCom, "meta.xml", + "com.sun.star.comp.report.XMLMetaExporter", + aDelegatorArguments, aProps, sal_True,_xStorageToSaveTo ) ) + { + if( !bWarn ) + { + bWarn = sal_True; + sWarnFile = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("meta.xml")); + } + } + } // if( !bErr ) + + if( !bErr ) + { + if( !WriteThroughComponent( xCom, "styles.xml", "com.sun.star.comp.report.XMLStylesExporter", aDelegatorArguments, aProps, sal_True,_xStorageToSaveTo ) ) @@ -2606,7 +2622,6 @@ { uno::Reference< frame::XModel > xThis (static_cast< frame::XModel* >(this), uno::UNO_QUERY_THROW); ::comphelper::NumberedCollection* pHelper = new ::comphelper::NumberedCollection(); - m_pImpl->m_xNumberedControllers = uno::Reference< frame::XUntitledNumbers >(static_cast< ::cppu::OWeakObject* >(pHelper), uno::UNO_QUERY_THROW); pHelper->setOwner (xThis); @@ -2723,7 +2738,20 @@ return impl_getUntitledHelper_throw()->getUntitledPrefix (); } // ----------------------------------------------------------------------------- - +uno::Reference< document::XDocumentProperties > SAL_CALL OReportDefinition::getDocumentProperties( ) throw (uno::RuntimeException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); + if ( !m_pImpl->m_xDocumentProperties.is() ) + { + uno::Reference< lang::XInitialization > xDocProps( + m_aProps->m_xContext->getServiceManager()->createInstanceWithContext( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.DocumentProperties")) ,m_aProps->m_xContext), + uno::UNO_QUERY_THROW); + m_pImpl->m_xDocumentProperties.set(xDocProps, uno::UNO_QUERY_THROW); + } + return m_pImpl->m_xDocumentProperties; +} // ============================================================================= }// namespace reportdesign // ============================================================================= Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlExport.cxx?r1=1.10.12.1&r2=1.10.12.2 Delta lines: +21 -3 -------------------- --- xmlExport.cxx 2008-07-01 07:02:09+0000 1.10.12.1 +++ xmlExport.cxx 2008-07-16 06:16:19+0000 1.10.12.2 @@ -136,6 +136,24 @@ } //--------------------------------------------------------------------- + Reference< XInterface > ORptMetaExportHelper::create(Reference< XComponentContext > const & xContext) + { + return static_cast< XServiceInfo* >(new ORptExport(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY),EXPORT_META )); + } + //--------------------------------------------------------------------- + ::rtl::OUString ORptMetaExportHelper::getImplementationName_Static( ) throw (RuntimeException) + { + return ::rtl::OUString::createFromAscii("com.sun.star.comp.report.XMLMetaExporter"); + } + //--------------------------------------------------------------------- + Sequence< ::rtl::OUString > ORptMetaExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) + { + Sequence< ::rtl::OUString > aSupported(1); + aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter"); + return aSupported; + } + + //--------------------------------------------------------------------- Reference< XInterface > ODBFullExportHelper::create(Reference< XComponentContext > const & xContext) { return static_cast< XServiceInfo* >(new ORptExport(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY),EXPORT_ALL)); Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlExport.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlExport.hxx?r1=1.10.12.1&r2=1.10.12.2 Delta lines: +15 -3 -------------------- --- xmlExport.hxx 2008-07-01 07:02:10+0000 1.10.12.1 +++ xmlExport.hxx 2008-07-16 06:16:23+0000 1.10.12.2 @@ -256,6 +256,18 @@ create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); }; +/** Exports only meta data + * \ingroup reportdesign_source_filter_xml + * + */ +class ORptMetaExportHelper +{ +public: + static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); + static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL + create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); +}; /** Exports all * \ingroup reportdesign_source_filter_xml * Directory: /dba/reportdesign/util/ ================================== File [changed]: description.xml Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/description.xml?r1=1.4.22.1&r2=1.4.22.2 Delta lines: +4 -0 ------------------- --- description.xml 2008-07-01 07:02:16+0000 1.4.22.1 +++ description.xml 2008-07-16 06:16:26+0000 1.4.22.2 @@ -2,6 +2,10 @@ <description xmlns="http://openoffice.org/extensions/description/2006"; xmlns:d="http://openoffice.org/extensions/description/2006"; xmlns:xlink="http://www.w3.org/1999/xlink";> + <display-name> + <name lang="en-US">Sun⢠Report Builder</name> + <!-- <name lang="en-US">Sun(TM) Report Builder</name> --> + </display-name> <registration> <simple-license accept-by="admin" default-license-id="en-US" > <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
