diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 16:54:36 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 16:54:36 +0000 |
commit | 50164a81b96ed2eceba1231f655dbf0ac9b36e7e (patch) | |
tree | c6b7e9b2ffa2bb02b4132c6b075ebebbcf46dda9 /embeddedobj | |
parent | INTEGRATION: CWS fwkbugfix02 (1.2.10); FILE MERGED (diff) | |
download | core-50164a81b96ed2eceba1231f655dbf0ac9b36e7e.tar.gz core-50164a81b96ed2eceba1231f655dbf0ac9b36e7e.zip |
INTEGRATION: CWS fwkbugfix02 (1.3.10); FILE MERGED
2004/04/22 15:44:53 mav 1.3.10.3: #116056# Ole to OLE
2004/04/15 13:09:49 mav 1.3.10.2: #i27055# if an object is loaded from entry some properties of MediaDescriptor can make sence
2004/04/07 16:34:52 mav 1.3.10.1: #116056# adopt to incompatible changes
Diffstat (limited to 'embeddedobj')
-rw-r--r-- | embeddedobj/source/msole/xolefactory.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx index 7c0bd689d0f2..d635d3e462ae 100644 --- a/embeddedobj/source/msole/xolefactory.cxx +++ b/embeddedobj/source/msole/xolefactory.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xolefactory.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mav $ $Date: 2003-12-08 15:18:36 $ + * last change: $Author: hr $ $Date: 2004-05-10 17:54:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,15 +90,15 @@ using namespace ::com::sun::star; uno::Sequence< ::rtl::OUString > SAL_CALL OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.OleEmbeddedObjectFactory"); - aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.OleEmbeddedObjectFactory"); + aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.OLEEmbeddedObjectFactory"); + aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"); return aRet; } //------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OleEmbeddedObjectFactory::impl_staticGetImplementationName() { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.OleEmbeddedObjectFactory"); + return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"); } //------------------------------------------------------------------------- @@ -112,7 +112,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::impl_static uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceInitFromEntry( const uno::Reference< embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, - sal_Bool bIsReadonly, + const uno::Sequence< beans::PropertyValue >& aMedDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, container::NoSuchElementException, @@ -155,8 +155,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta xPersist->setPersistentEntry( xStorage, sEntName, - embed::EntryInitModes::ENTRY_DEFAULT_INIT, - uno::Sequence< beans::PropertyValue >(), + embed::EntryInitModes::DEFAULT_INIT, + aMedDescr, lObjArgs ); return xResult; @@ -194,7 +194,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta xPersist->setPersistentEntry( xStorage, sEntName, - embed::EntryInitModes::ENTRY_MEDIA_DESCRIPTOR_INIT, + embed::EntryInitModes::MEDIA_DESCRIPTOR_INIT, aMediaDescr, lObjArgs ); @@ -234,7 +234,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta xPersist->setPersistentEntry( xStorage, sEntName, - embed::EntryInitModes::ENTRY_TRUNCATE_INIT, + embed::EntryInitModes::TRUNCATE_INIT, uno::Sequence< beans::PropertyValue >(), lObjArgs ); @@ -275,7 +275,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta xPersist->setPersistentEntry( xStorage, sEntName, - embed::EntryInitModes::ENTRY_MEDIA_DESCRIPTOR_INIT, + embed::EntryInitModes::MEDIA_DESCRIPTOR_INIT, aMediaDescr, lObjArgs ); @@ -316,7 +316,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta { xPersist->setPersistentEntry( xStorage, sEntName, - embed::EntryInitModes::ENTRY_DEFAULT_INIT, + embed::EntryInitModes::DEFAULT_INIT, uno::Sequence< beans::PropertyValue >(), lObjArgs ); |