Tag: cws_src680_dba201b User: fs Date: 05/06/08 07:06:50 Modified: /dba/dbaccess/source/core/dataaccess/ documentdefinition.cxx
Log: #i50475# be more conservative with the readonly flag, don't switch to not-readonly if not necessary 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.26&r2=1.26.18.1 Delta lines: +12 -15 --------------------- --- documentdefinition.cxx 18 Apr 2005 08:46:22 -0000 1.26 +++ documentdefinition.cxx 8 Jun 2005 14:06:45 -0000 1.26.18.1 @@ -2,9 +2,9 @@ * * $RCSfile: documentdefinition.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.26.18.1 $ * - * last change: $Author: obo $ $Date: 2005/04/18 08:46:22 $ + * last change: $Author: fs $ $Date: 2005/06/08 14:06:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -813,7 +813,7 @@ Reference< XStorage> xStorage(aIni[0],UNO_QUERY); ::rtl::OUString sPersistentName; aIni[1] >>= sPersistentName; - loadEmbeddedObject(); + loadEmbeddedObject( Sequence< sal_Int8 >(), Reference< XConnection >(), sal_True ); Reference<XEmbedPersist> xPersist(m_xEmbeddedObject,UNO_QUERY); if ( xPersist.is() ) { @@ -1164,20 +1164,17 @@ { 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.createItemIfMissing( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ReadOnly" ) ), _bReadOnly ); if ( m_pImpl->m_aProps.aTitle.getLength() ) { - 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.createItemIfMissing( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentTitle" ) ), m_pImpl->m_aProps.aTitle ); } - static const ::rtl::OUString s_sMacroExecutionMode(RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode")); - if ( ! aHelper.createItemIfMissing(s_sMacroExecutionMode,MacroExecMode::USE_CONFIG) ) - aHelper[s_sMacroExecutionMode] <<= MacroExecMode::USE_CONFIG; + aHelper.createItemIfMissing( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MacroExecutionMode" ) ), MacroExecMode::USE_CONFIG ); aHelper >> aArgs; @@ -1192,7 +1189,7 @@ // ----------------------------------------------------------------------------- void ODocumentDefinition::generateNewImage(Any& _rImage) { - loadEmbeddedObject(); + loadEmbeddedObject( Sequence< sal_Int8 >(), Reference< XConnection >(), sal_True ); if ( m_xEmbeddedObject.is() ) { try @@ -1221,7 +1218,7 @@ // ----------------------------------------------------------------------------- void ODocumentDefinition::fillDocumentInfo(Any& _rInfo) { - loadEmbeddedObject(); + loadEmbeddedObject( Sequence< sal_Int8 >(), Reference< XConnection >(), sal_True ); if ( m_xEmbeddedObject.is() ) { try --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
