Tag: cws_src680_dbodf12import User: oj Date: 2007-11-01 09:17:09+0000 Modified: dba/dbaccess/source/core/dataaccess/databasedocument.cxx dba/dbaccess/source/core/dataaccess/documentdefinition.cxx
Log: #i83190# new string media type File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasedocument.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.cxx?r1=1.34&r2=1.34.32.1 Delta lines: +7 -10 -------------------- --- databasedocument.cxx 2007-09-26 14:39:51+0000 1.34 +++ databasedocument.cxx 2007-11-01 09:17:07+0000 1.34.32.1 @@ -4,9 +4,9 @@ * * $RCSfile: databasedocument.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.34.32.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:39:51 $ + * last change: $Author: oj $ $Date: 2007/11/01 09:17:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -891,11 +891,10 @@ xSeek->seek(0); } - String aPropName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("MediaType") ) ); ::rtl::OUString aMime( RTL_CONSTASCII_USTRINGPARAM("text/xml") ); Any aAny; aAny <<= aMime; - xStreamProp->setPropertyValue( aPropName, aAny ); + xStreamProp->setPropertyValue( INFO_MEDIATYPE, aAny ); if( bPlainStream ) { @@ -995,10 +994,9 @@ Reference<XPropertySet> xProp(_xStorageToSaveTo,UNO_QUERY); if ( xProp.is() ) { - static const ::rtl::OUString sPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")); Any aAny; aAny <<= MIMETYPE_OASIS_OPENDOCUMENT_DATABASE; - xProp->setPropertyValue( sPropName, aAny ); + xProp->setPropertyValue( INFO_MEDIATYPE, aAny ); } Reference<XComponent> xCom(static_cast<OWeakObject*>(this),UNO_QUERY); @@ -1058,15 +1056,14 @@ xConfigStorage = getDocumentSubStorage( aUIConfigFolderName, ElementModes::READWRITE ); if ( xConfigStorage.is() ) { - rtl::OUString aMediaTypeProp( RTL_CONSTASCII_USTRINGPARAM( "MediaType" )); rtl::OUString aUIConfigMediaType( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.xml.ui.configuration" )); rtl::OUString aMediaType; Reference< XPropertySet > xPropSet( xConfigStorage, UNO_QUERY ); - Any a = xPropSet->getPropertyValue( aMediaTypeProp ); + Any a = xPropSet->getPropertyValue( INFO_MEDIATYPE ); if ( !( a >>= aMediaType ) || ( aMediaType.getLength() == 0 )) { a <<= aUIConfigMediaType; - xPropSet->setPropertyValue( aMediaTypeProp, a ); + xPropSet->setPropertyValue( INFO_MEDIATYPE, a ); } } else File [changed]: documentdefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.47&r2=1.47.30.1 Delta lines: +4 -4 ------------------- --- documentdefinition.cxx 2007-09-26 14:40:19+0000 1.47 +++ documentdefinition.cxx 2007-11-01 09:17:07+0000 1.47.30.1 @@ -4,9 +4,9 @@ * * $RCSfile: documentdefinition.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.47.30.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:40:19 $ + * last change: $Author: oj $ $Date: 2007/11/01 09:17:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -463,7 +463,7 @@ ::rtl::OUString aMediaType; try { - Any aAny = xPropSet->getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) ); + Any aAny = xPropSet->getPropertyValue( INFO_MEDIATYPE ); aAny >>= aMediaType; } catch ( Exception& ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
