Tag: cws_src680_dba24c User: fs Date: 2007-10-22 20:58:12+0000 Modified: dba/dbaccess/source/core/dataaccess/documentdefinition.cxx
Log: during #i73705# #i52527#: outsourced the 'forms' and 'reports' storage names to ODatabaseModelImpl / some minor refactoring 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.46.20.4&r2=1.46.20.5 Delta lines: +5 -7 ------------------- --- documentdefinition.cxx 2007-10-22 08:26:59+0000 1.46.20.4 +++ documentdefinition.cxx 2007-10-22 20:58:09+0000 1.46.20.5 @@ -4,9 +4,9 @@ * * $RCSfile: documentdefinition.cxx,v $ * - * $Revision: 1.46.20.4 $ + * $Revision: 1.46.20.5 $ * - * last change: $Author: fs $ $Date: 2007/10/22 08:26:59 $ + * last change: $Author: fs $ $Date: 2007/10/22 20:58:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -851,7 +851,7 @@ // our own macro execution mode // Note that we don't pass an interaction handler here. If the user has not been asked/notified // by now (i.e. during loading the whole DB document), then this won't happen anymore. - bool bExecuteOwnMacros = m_pImpl->m_pDataSource->m_aMacroMode.adjustMacroMode( NULL ); + bool bExecuteOwnMacros = m_pImpl->m_pDataSource->adjustMacroMode_AutoReject(); sal_Int16 nDocumentMacroMode = MacroExecMode::ALWAYS_EXECUTE_NO_WARN; ::comphelper::NamedValueCollection aDocumentArgs; @@ -1606,10 +1606,8 @@ // ----------------------------------------------------------------------------- Reference< XStorage> ODocumentDefinition::getStorage() const { - static const ::rtl::OUString s_sForms = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("forms")); - static const ::rtl::OUString s_sReports = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("reports")); return m_pImpl->m_pDataSource - ? m_pImpl->m_pDataSource->getStorage( m_bForm ? s_sForms : s_sReports ) + ? m_pImpl->m_pDataSource->getStorage( ODatabaseModelImpl::getObjectContainerStorageName( m_bForm ? ODatabaseModelImpl::E_FORM : ODatabaseModelImpl::E_REPORT ) ) : Reference< XStorage>(); } // ----------------------------------------------------------------------------- @@ -1669,7 +1667,7 @@ // ----------------------------------------------------------------------------- void ODocumentDefinition::fillReportData() { - if ( !m_bForm && m_pImpl->m_aProps.bAsTemplate ) // open a report in alive mode, so we need to fill it + if ( !m_bForm && m_pImpl->m_aProps.bAsTemplate && !m_bOpenInDesign ) // open a report in alive mode, so we need to fill it { Sequence<Any> aArgs(2); PropertyValue aValue; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
