User: obo Date: 2006/07/13 08:21:47 Modified: dba/dbaccess/source/core/dataaccess/documentdefinition.cxx
Log: INTEGRATION: CWS dba204a (1.35.54); FILE MERGED 2006/07/13 08:34:38 fs 1.35.54.3: RESYNC: (1.36-1.37); FILE MERGED 2006/07/05 08:03:32 oj 1.35.54.2: RESYNC: (1.35-1.36); FILE MERGED 2006/05/22 13:30:05 oj 1.35.54.1: #i64632# changestate to load after storing 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.37&r2=1.38 Delta lines: +8 -15 -------------------- --- documentdefinition.cxx 10 Jul 2006 15:11:25 -0000 1.37 +++ documentdefinition.cxx 13 Jul 2006 15:21:45 -0000 1.38 @@ -923,6 +923,7 @@ { xPersist->storeToEntry(xStorage,sPersistentName,Sequence<PropertyValue>(),Sequence<PropertyValue>()); xPersist->storeOwn(); + m_xEmbeddedObject->changeState(EmbedStates::LOADED); } else throw CommandAbortedException(); @@ -1332,17 +1333,14 @@ { Sequence<PropertyValue> aArgs = xModel->getArgs(); ::comphelper::MediaDescriptor aHelper(aArgs); - aHelper.createItemIfMissing( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ReadOnly" ) ), _bReadOnly ); + aHelper[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ReadOnly" ) )] <<= _bReadOnly; if ( m_pImpl->m_aProps.aTitle.getLength() ) - { - aHelper.createItemIfMissing( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentTitle" ) ), m_pImpl->m_aProps.aTitle ); - } + aHelper[ + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentTitle" ) )] <<= m_pImpl->m_aProps.aTitle; - aHelper.createItemIfMissing( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MacroExecutionMode" ) ), MacroExecMode::USE_CONFIG ); + aHelper[ + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MacroExecutionMode" ))] <<= MacroExecMode::USE_CONFIG; aHelper >> aArgs; @@ -1520,10 +1518,7 @@ { Sequence<PropertyValue> aArgs = xModel->getArgs(); ::comphelper::MediaDescriptor aHelper(aArgs); - static const ::rtl::OUString s_sReadOnly(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")); - if ( ! aHelper.createItemIfMissing(s_sReadOnly,_bReadOnly) ) - aHelper[s_sReadOnly] <<= _bReadOnly; - + aHelper[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ReadOnly" ) )] <<= _bReadOnly; aHelper >> aArgs; xModel->attachResource(xModel->getURL(),aArgs); } @@ -1557,9 +1552,7 @@ { Sequence<PropertyValue> aArgs = xModel->getArgs(); ::comphelper::MediaDescriptor aHelper(aArgs); - static const ::rtl::OUString s_sDocumentTitle(RTL_CONSTASCII_USTRINGPARAM("DocumentTitle")); - if ( ! aHelper.createItemIfMissing(s_sDocumentTitle,m_pImpl->m_aProps.aTitle) ) - aHelper[s_sDocumentTitle] <<= m_pImpl->m_aProps.aTitle; + aHelper[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentTitle" ) )] <<= m_pImpl->m_aProps.aTitle; aHelper >> aArgs; xModel->attachResource(xModel->getURL(),aArgs); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
