Tag: cws_src680_dba24c User: fs Date: 2007-10-22 20:57:17+0000 Modified: dba/dbaccess/source/core/dataaccess/documentcontainer.cxx dba/dbaccess/source/core/dataaccess/documentcontainer.hxx
Log: during #i73705# #i52527#: m_aObjectList is unused / outsourced the 'forms' and 'reports' storage names to ODatabaseModelImpl File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: documentcontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentcontainer.cxx?r1=1.24.40.1&r2=1.24.40.2 Delta lines: +3 -6 ------------------- --- documentcontainer.cxx 2007-09-20 18:34:05+0000 1.24.40.1 +++ documentcontainer.cxx 2007-10-22 20:57:14+0000 1.24.40.2 @@ -4,9 +4,9 @@ * * $RCSfile: documentcontainer.cxx,v $ * - * $Revision: 1.24.40.1 $ + * $Revision: 1.24.40.2 $ * - * last change: $Author: fs $ $Date: 2007/09/20 18:34:05 $ + * last change: $Author: fs $ $Date: 2007/10/22 20:57:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -224,7 +224,6 @@ else if ( aValue.Name.equalsAscii(PROPERTY_PERSISTENT_NAME) ) { aValue.Value >>= sPersistentName; - m_aObjectList.insert(PersistentNames::value_type(sPersistentName,true)); } else if ( aValue.Name.equalsAscii(PROPERTY_EMBEDDEDOBJECT) ) { @@ -703,10 +702,8 @@ // ----------------------------------------------------------------------------- Reference< XStorage> ODocumentContainer::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_bFormsContainer ? s_sForms : s_sReports ) + ? m_pImpl->m_pDataSource->getStorage( ODatabaseModelImpl::getObjectContainerStorageName( m_bFormsContainer ? ODatabaseModelImpl::E_FORM : ODatabaseModelImpl::E_REPORT ) ) : Reference< XStorage>(); } File [changed]: documentcontainer.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentcontainer.hxx?r1=1.12&r2=1.12.40.1 Delta lines: +3 -5 ------------------- --- documentcontainer.hxx 2007-07-06 07:53:54+0000 1.12 +++ documentcontainer.hxx 2007-10-22 20:57:14+0000 1.12.40.1 @@ -4,9 +4,9 @@ * * $RCSfile: documentcontainer.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.40.1 $ * - * last change: $Author: rt $ $Date: 2007/07/06 07:53:54 $ + * last change: $Author: fs $ $Date: 2007/10/22 20:57:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -81,8 +81,6 @@ , public ::comphelper::OPropertyStateContainer , public ::comphelper::OPropertyArrayUsageHelper< ODocumentContainer > { - DECLARE_STL_USTRINGACCESS_MAP(bool, PersistentNames); - PersistentNames m_aObjectList; sal_Bool m_bFormsContainer; public: /** constructs the container.<BR> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
