Tag: cws_src680_oj14 User: oj Date: 2007-05-31 07:32:08+0000 Modified: dba/dbaccess/source/core/dataaccess/documentcontainer.cxx dba/dbaccess/source/core/dataaccess/documentdefinition.cxx dba/dbaccess/source/core/dataaccess/documentdefinition.hxx
Log: #i77258# remove unused code and some new static functions for media type inserted 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.16.4.6&r2=1.16.4.7 Delta lines: +3 -5 ------------------- --- documentcontainer.cxx 2007-05-21 13:33:38+0000 1.16.4.6 +++ documentcontainer.cxx 2007-05-31 07:32:05+0000 1.16.4.7 @@ -4,9 +4,9 @@ * * $RCSfile: documentcontainer.cxx,v $ * - * $Revision: 1.16.4.6 $ + * $Revision: 1.16.4.7 $ * - * last change: $Author: lla $ $Date: 2007/05/21 13:33:38 $ + * last change: $Author: oj $ $Date: 2007/05/31 07:32:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -261,9 +261,7 @@ } if ( ( aClassID.getLength() == 0 ) && ( 0 == sURL.getLength() ) ) - // default the class id, if none is given - // #i57097# / 2005-11-01 / [EMAIL PROTECTED] - aClassID = MimeConfigurationHelper::GetSequenceClassID(SO3_SW_CLASSID); + ODocumentDefinition::GetDocumentServiceFromMediaType(getStorage(),sPersistentName,m_xORB,aClassID); } ODefinitionContainer_Impl::const_iterator aFind = rDefinitions.find( sName ); File [changed]: documentdefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.29.4.7&r2=1.29.4.8 Delta lines: +4 -17 -------------------- --- documentdefinition.cxx 2007-05-09 11:44:24+0000 1.29.4.7 +++ documentdefinition.cxx 2007-05-31 07:32:05+0000 1.29.4.8 @@ -436,7 +436,7 @@ m_xParentContainer = _xParent; } -::rtl::OUString lcl_GetDocumentServiceFromMediaType( const Reference< XStorage >& xStorage +::rtl::OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const Reference< XStorage >& xStorage ,const ::rtl::OUString& sEntName ,const Reference< XMultiServiceFactory >& _xORB ,Sequence< sal_Int8 >& _rClassId @@ -1263,11 +1263,10 @@ { nEntryConnectionMode = EntryInitModes::TRUNCATE_INIT; bSetSize = sal_True; - xStorage = OStorageHelper::GetTemporaryStorage(m_xORB); } else { - sDocumentService = lcl_GetDocumentServiceFromMediaType(xStorage,m_pImpl->m_aProps.sPersistentName,m_xORB,aClassID); + sDocumentService = GetDocumentServiceFromMediaType(xStorage,m_pImpl->m_aProps.sPersistentName,m_xORB,aClassID); if ( !aClassID.getLength() ) { if ( m_bForm ) @@ -1290,18 +1289,6 @@ ),UNO_QUERY); if ( m_xEmbeddedObject.is() ) { - if ( bSetSize ) - { - Reference<XEmbedPersist> xPersist(m_xEmbeddedObject,UNO_QUERY); - if ( xPersist.is() ) - { - xPersist->storeAsEntry( getStorage() - ,m_pImpl->m_aProps.sPersistentName - ,aArgs - ,aEmbeddedObjectDescriptor); - xPersist->saveCompleted(sal_True); - } - } if ( !m_pClientHelper ) { m_pClientHelper = new OEmbeddedClientHelper(this); File [changed]: documentdefinition.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.hxx?r1=1.18&r2=1.18.50.1 Delta lines: +9 -3 ------------------- --- documentdefinition.hxx 2006-08-15 10:45:56+0000 1.18 +++ documentdefinition.hxx 2007-05-31 07:32:05+0000 1.18.50.1 @@ -4,9 +4,9 @@ * * $RCSfile: documentdefinition.hxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.18.50.1 $ * - * last change: $Author: hr $ $Date: 2006/08/15 10:45:56 $ + * last change: $Author: oj $ $Date: 2007/05/31 07:32:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -214,6 +214,12 @@ */ void impl_removeFrameFromDesktop_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ); + static ::rtl::OUString GetDocumentServiceFromMediaType( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage + ,const ::rtl::OUString& sEntName + ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB + ,::com::sun::star::uno::Sequence< sal_Int8 >& _rClassId + ); + protected: // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
