Tag: cws_src680_reportdesign02 User: oj Date: 2007-12-20 11:49:17+0000 Modified: dba/dbaccess/source/core/dataaccess/documentdefinition.cxx dba/dbaccess/source/core/dataaccess/documentdefinition.hxx
Log: merge conflicts resolved File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: documentdefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.47.22.3&r2=1.47.22.4 Delta lines: +5 -5 ------------------- --- documentdefinition.cxx 2007-12-20 07:51:04+0000 1.47.22.3 +++ documentdefinition.cxx 2007-12-20 11:49:14+0000 1.47.22.4 @@ -4,9 +4,9 @@ * * $RCSfile: documentdefinition.cxx,v $ * - * $Revision: 1.47.22.3 $ + * $Revision: 1.47.22.4 $ * - * last change: $Author: oj $ $Date: 2007/12/20 07:51:04 $ + * last change: $Author: oj $ $Date: 2007/12/20 11:49:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1305,7 +1305,7 @@ pRequest->addContinuation(pAbort); // create the handler, let it handle the request - Reference< XInteractionHandler > xHandler(m_xORB->createInstance(SERVICE_SDB_INTERACTION_HANDLER), UNO_QUERY); + Reference< XInteractionHandler > xHandler(m_aContext.createComponent(::rtl::OUString(SERVICE_SDB_INTERACTION_HANDLER)), UNO_QUERY); if ( xHandler.is() ) xHandler->handle(xRequest); @@ -1495,7 +1495,7 @@ { // we seems to be a new report, check if report extension is present. Reference< XContentEnumerationAccess > xEnumAccess( m_aContext.getLegacyServiceFactory(), UNO_QUERY ); - const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_xORB); + const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_aContext.getLegacyServiceFactory()); Reference< XEnumeration > xEnumDrivers = xEnumAccess->createContentEnumeration(sReportEngineServiceName); if ( !xEnumDrivers.is() || !xEnumDrivers->hasMoreElements() ) { File [changed]: documentdefinition.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.hxx?r1=1.23.24.2&r2=1.23.24.3 Delta lines: +4 -4 ------------------- --- documentdefinition.hxx 2007-12-20 07:51:07+0000 1.23.24.2 +++ documentdefinition.hxx 2007-12-20 11:49:14+0000 1.23.24.3 @@ -4,9 +4,9 @@ * * $RCSfile: documentdefinition.hxx,v $ * - * $Revision: 1.23.24.2 $ + * $Revision: 1.23.24.3 $ * - * last change: $Author: oj $ $Date: 2007/12/20 07:51:07 $ + * last change: $Author: oj $ $Date: 2007/12/20 11:49:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -149,7 +149,7 @@ sal_Bool saveAs(); void closeObject(); sal_Bool isModified(); - void fillReportData(sal_Bool _bFill = sal_True); + void fillReportData(); inline sal_Bool isNewReport() const { return !m_bForm && !m_pImpl->m_aProps.bAsTemplate; } /** prepares closing the document component --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
