Tag: cws_src680_titles01 User: as Date: 2006/09/06 01:20:26 Modified: dba/dbaccess/source/core/dataaccess/documentdefinition.cxx
Log: RESYNC: (1.36-1.39); FILE MERGED 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.36.4.2&r2=1.36.4.3 Delta lines: +17 -24 --------------------- --- documentdefinition.cxx 28 Aug 2006 10:49:39 -0000 1.36.4.2 +++ documentdefinition.cxx 6 Sep 2006 08:20:23 -0000 1.36.4.3 @@ -489,10 +489,10 @@ aResult[1] = static_cast<sal_Int8>(( n1 << 8 ) >> 24); aResult[2] = static_cast<sal_Int8>(( n1 << 16 ) >> 24); aResult[3] = static_cast<sal_Int8>(( n1 << 24 ) >> 24); - aResult[4] = n2 >> 8; - aResult[5] = ( n2 << 8 ) >> 8; - aResult[6] = n3 >> 8; - aResult[7] = ( n3 << 8 ) >> 8; + aResult[4] = (sal_Int8)(n2 >> 8); + aResult[5] = (sal_Int8)(( n2 << 8 ) >> 8); + aResult[6] = (sal_Int8)(n3 >> 8); + aResult[7] = (sal_Int8)(( n3 << 8 ) >> 8); aResult[8] = b8; aResult[9] = b9; aResult[10] = b10; @@ -934,6 +934,7 @@ { xPersist->storeToEntry(xStorage,sPersistentName,Sequence<PropertyValue>(),Sequence<PropertyValue>()); xPersist->storeOwn(); + m_xEmbeddedObject->changeState(EmbedStates::LOADED); } else throw CommandAbortedException(); @@ -1343,17 +1344,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; @@ -1385,9 +1383,9 @@ } } // ----------------------------------------------------------------------------- -Any ODocumentDefinition::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/ ) const +void ODocumentDefinition::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, Any& _rDefault ) const { - return Any(); + _rDefault.clear(); } // ----------------------------------------------------------------------------- void ODocumentDefinition::fillDocumentInfo(Any& _rInfo) @@ -1531,10 +1529,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); } @@ -1568,9 +1563,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]
