Skip to content

C
core
Kaydet (Commit) eb1cd390 authored tarafından Mikhail Voitenko's avatar Mikhail Voitenko
Dosyalara gözat
Seçenekler

#112923# properties to initialize object

üst 0e38f351
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 75 deletions
embeddedobj/source/commonembedding/persistence.cxx
Dosyayı görüntüle @ eb1cd390
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: persistence.cxx,v $ * $RCSfile: persistence.cxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: mav $ $Date: 2003-11-26 16:44:03 $ * last change: $Author: mav $ $Date: 2003-12-08 12:49:36 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -535,13 +535,16 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( ...@@ -535,13 +535,16 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
const uno::Reference< embed::XStorage >& xStorage, const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
sal_Int32 nEntryConnectionMode, sal_Int32 nEntryConnectionMode,
const uno::Sequence< beans::PropertyValue >& lArguments ) const uno::Sequence< beans::PropertyValue >& lArguments,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
embed::WrongStateException, embed::WrongStateException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
uno::RuntimeException ) uno::RuntimeException )
{ {
// TODO: use lObjArgs
// the type of the object must be already set // the type of the object must be already set
// a kind of typedetection should be done in the factory // a kind of typedetection should be done in the factory
...@@ -719,13 +722,16 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn() ...@@ -719,13 +722,16 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn()
//------------------------------------------------------ //------------------------------------------------------
void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::XStorage >& xStorage, void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& lArguments ) const uno::Sequence< beans::PropertyValue >& lArguments,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
embed::WrongStateException, embed::WrongStateException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
uno::RuntimeException ) uno::RuntimeException )
{ {
// TODO: use lObjArgs
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed ) if ( m_bDisposed )
throw lang::DisposedException(); // TODO throw lang::DisposedException(); // TODO
...@@ -758,13 +764,16 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed:: ...@@ -758,13 +764,16 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
//------------------------------------------------------ //------------------------------------------------------
void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::XStorage >& xStorage, void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& lArguments ) const uno::Sequence< beans::PropertyValue >& lArguments,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
embed::WrongStateException, embed::WrongStateException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
uno::RuntimeException ) uno::RuntimeException )
{ {
// TODO: use lObjArgs
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed ) if ( m_bDisposed )
throw lang::DisposedException(); // TODO throw lang::DisposedException(); // TODO
...@@ -935,13 +944,16 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isReadonly() ...@@ -935,13 +944,16 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isReadonly()
//------------------------------------------------------ //------------------------------------------------------
void SAL_CALL OCommonEmbeddedObject::reload( void SAL_CALL OCommonEmbeddedObject::reload(
const uno::Sequence< beans::PropertyValue >& lArguments ) const uno::Sequence< beans::PropertyValue >& lArguments,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
embed::WrongStateException, embed::WrongStateException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
uno::RuntimeException ) uno::RuntimeException )
{ {
// TODO: use lObjArgs
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed ) if ( m_bDisposed )
throw lang::DisposedException(); // TODO throw lang::DisposedException(); // TODO
......
embeddedobj/source/commonembedding/xfactory.cxx
Dosyayı görüntüle @ eb1cd390
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: xfactory.cxx,v $ * $RCSfile: xfactory.cxx,v $
* *
* $Revision: 1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: mav $ $Date: 2003-11-28 17:26:38 $ * last change: $Author: mav $ $Date: 2003-12-08 12:49:37 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -228,6 +228,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta ...@@ -228,6 +228,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
xPersist->setPersistentEntry( xStorage, xPersist->setPersistentEntry( xStorage,
sEntName, sEntName,
embed::EntryInitModes::ENTRY_DEFAULT_INIT, embed::EntryInitModes::ENTRY_DEFAULT_INIT,
uno::Sequence< beans::PropertyValue >(),
uno::Sequence< beans::PropertyValue >() ); uno::Sequence< beans::PropertyValue >() );
return xResult; return xResult;
...@@ -237,7 +238,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta ...@@ -237,7 +238,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor( uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor(
const uno::Reference< embed::XStorage >& xStorage, const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& aMediaDescr ) const uno::Sequence< beans::PropertyValue >& aMediaDescr,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
...@@ -312,7 +314,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta ...@@ -312,7 +314,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
xPersist->setPersistentEntry( xStorage, xPersist->setPersistentEntry( xStorage,
sEntName, sEntName,
embed::EntryInitModes::ENTRY_MEDIA_DESCRIPTOR_INIT, embed::EntryInitModes::ENTRY_MEDIA_DESCRIPTOR_INIT,
aTempMedDescr ); aTempMedDescr,
lObjArgs );
return xResult; return xResult;
} }
...@@ -322,7 +325,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta ...@@ -322,7 +325,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
const uno::Sequence< sal_Int8 >& aClassID, const uno::Sequence< sal_Int8 >& aClassID,
const ::rtl::OUString& aClassName, const ::rtl::OUString& aClassName,
const uno::Reference< embed::XStorage >& xStorage, const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName ) const ::rtl::OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
...@@ -366,7 +370,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta ...@@ -366,7 +370,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
xPersist->setPersistentEntry( xStorage, xPersist->setPersistentEntry( xStorage,
sEntName, sEntName,
embed::EntryInitModes::ENTRY_TRUNCATE_INIT, embed::EntryInitModes::ENTRY_TRUNCATE_INIT,
uno::Sequence< beans::PropertyValue >() ); uno::Sequence< beans::PropertyValue >(),
lObjArgs );
return xResult; return xResult;
} }
...@@ -378,7 +383,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta ...@@ -378,7 +383,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
const uno::Reference< embed::XStorage >& xStorage, const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
sal_Int32 nEntryConnectionMode, sal_Int32 nEntryConnectionMode,
const uno::Sequence< beans::PropertyValue >& lArguments ) const uno::Sequence< beans::PropertyValue >& lArguments,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
...@@ -421,7 +427,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta ...@@ -421,7 +427,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
xPersist->setPersistentEntry( xStorage, xPersist->setPersistentEntry( xStorage,
sEntName, sEntName,
nEntryConnectionMode, nEntryConnectionMode,
uno::Sequence< beans::PropertyValue >() ); uno::Sequence< beans::PropertyValue >(),
lObjArgs );
} }
else else
...@@ -435,7 +442,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta ...@@ -435,7 +442,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInstanceLink( uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInstanceLink(
const uno::Reference< embed::XStorage >& xStorage, const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& aMediaDescr ) const uno::Sequence< beans::PropertyValue >& aMediaDescr,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
...@@ -506,6 +514,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta ...@@ -506,6 +514,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
throw io::IOException(); // TODO: throw io::IOException(); // TODO:
} }
// TODO: set persistence and use lObjArgs
return xResult; return xResult;
} }
...@@ -515,7 +525,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta ...@@ -515,7 +525,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
const ::rtl::OUString& aClassName, const ::rtl::OUString& aClassName,
const uno::Reference< embed::XStorage >& xStorage, const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& lArguments ) const uno::Sequence< beans::PropertyValue >& lArguments,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
...@@ -592,7 +603,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta ...@@ -592,7 +603,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
xPersist->setPersistentEntry( xStorage, xPersist->setPersistentEntry( xStorage,
sEntName, sEntName,
embed::EntryInitModes::ENTRY_MEDIA_DESCRIPTOR_INIT, embed::EntryInitModes::ENTRY_MEDIA_DESCRIPTOR_INIT,
uno::Sequence< beans::PropertyValue >() ); uno::Sequence< beans::PropertyValue >(),
lObjArgs );
} }
else else
......
embeddedobj/source/commonembedding/xfactory.hxx
Dosyayı görüntüle @ eb1cd390
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: xfactory.hxx,v $ * $RCSfile: xfactory.hxx,v $
* *
* $Revision: 1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: mav $ $Date: 2003-11-28 17:26:46 $ * last change: $Author: mav $ $Date: 2003-12-08 12:49:38 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -113,17 +113,17 @@ public: ...@@ -113,17 +113,17 @@ public:
// XEmbedObjectCreator // XEmbedObjectCreator
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Bool bIsReadonly ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Bool bIsReadonly ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XEmbedObjectFactory // XEmbedObjectFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XLinkCreator // XLinkCreator
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XLinkFactory // XLinkFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
......
embeddedobj/source/general/xcreator.cxx
Dosyayı görüntüle @ eb1cd390
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: xcreator.cxx,v $ * $RCSfile: xcreator.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: mav $ $Date: 2003-12-01 08:41:13 $ * last change: $Author: mav $ $Date: 2003-12-08 12:49:41 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -213,7 +213,8 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta ...@@ -213,7 +213,8 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
xStorage, xStorage,
sEntName, sEntName,
embed::EntryInitModes::ENTRY_DEFAULT_INIT, embed::EntryInitModes::ENTRY_DEFAULT_INIT,
aTempMediaDescr ); aTempMediaDescr,
uno::Sequence< beans::PropertyValue >() );
} }
else else
{ {
...@@ -277,12 +278,15 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta ...@@ -277,12 +278,15 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceInitFromMediaDescriptor( uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceInitFromMediaDescriptor(
const uno::Reference< embed::XStorage >& xStorage, const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& aMediaDescr ) const uno::Sequence< beans::PropertyValue >& aMediaDescr,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
uno::RuntimeException) uno::RuntimeException)
{ {
// TODO: use lObjArgs
if ( !xStorage.is() ) if ( !xStorage.is() )
throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ), throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( reinterpret_cast< ::cppu::OWeakObject* >(this) ), uno::Reference< uno::XInterface >( reinterpret_cast< ::cppu::OWeakObject* >(this) ),
...@@ -342,7 +346,8 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta ...@@ -342,7 +346,8 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
xStorage, xStorage,
sEntName, sEntName,
embed::EntryInitModes::ENTRY_MEDIA_DESCRIPTOR_INIT, embed::EntryInitModes::ENTRY_MEDIA_DESCRIPTOR_INIT,
aTempMedDescr ); aTempMedDescr,
lObjArgs );
} }
else else
{ {
...@@ -362,7 +367,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta ...@@ -362,7 +367,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
if ( !xOleEmbCreator.is() ) if ( !xOleEmbCreator.is() )
throw uno::RuntimeException(); // TODO: throw uno::RuntimeException(); // TODO:
xResult = xOleEmbCreator->createInstanceInitFromMediaDescriptor( xStorage, sEntName, aTempMedDescr ); xResult = xOleEmbCreator->createInstanceInitFromMediaDescriptor( xStorage, sEntName, aTempMedDescr, lObjArgs );
} }
return xResult; return xResult;
...@@ -372,7 +377,8 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta ...@@ -372,7 +377,8 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceLink( uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceLink(
const uno::Reference< embed::XStorage >& xStorage, const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& aMediaDescr ) const uno::Sequence< beans::PropertyValue >& aMediaDescr,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
...@@ -438,7 +444,8 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta ...@@ -438,7 +444,8 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
GetClassNameFromServName( aDocServiceName ), GetClassNameFromServName( aDocServiceName ),
xStorage, xStorage,
sEntName, sEntName,
aTempMedDescr ); aTempMedDescr,
lObjArgs );
} }
else else
{ {
...@@ -470,7 +477,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta ...@@ -470,7 +477,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
if ( !xLinkCreator.is() ) if ( !xLinkCreator.is() )
throw uno::RuntimeException(); // TODO: throw uno::RuntimeException(); // TODO:
xResult = xLinkCreator->createInstanceLink( xStorage, sEntName, aTempMedDescr ); xResult = xLinkCreator->createInstanceLink( xStorage, sEntName, aTempMedDescr, lObjArgs );
} }
return xResult; return xResult;
......
embeddedobj/source/inc/commonembobj.hxx
Dosyayı görüntüle @ eb1cd390
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: commonembobj.hxx,v $ * $RCSfile: commonembobj.hxx,v $
* *
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* last change: $Author: mav $ $Date: 2003-11-25 13:21:46 $ * last change: $Author: mav $ $Date: 2003-12-08 12:49:44 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -344,7 +344,8 @@ public: ...@@ -344,7 +344,8 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
sal_Int32 nEntryConnectionMode, sal_Int32 nEntryConnectionMode,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, ::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException, ::com::sun::star::io::IOException,
...@@ -357,7 +358,7 @@ public: ...@@ -357,7 +358,7 @@ public:
::com::sun::star::uno::Exception, ::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, ::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException, ::com::sun::star::io::IOException,
...@@ -367,7 +368,8 @@ public: ...@@ -367,7 +368,8 @@ public:
virtual void SAL_CALL storeAsEntry( virtual void SAL_CALL storeAsEntry(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, ::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException, ::com::sun::star::io::IOException,
...@@ -392,7 +394,8 @@ public: ...@@ -392,7 +394,8 @@ public:
::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL reload( virtual void SAL_CALL reload(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, ::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException, ::com::sun::star::io::IOException,
......
embeddedobj/source/inc/oleembobj.hxx
Dosyayı görüntüle @ eb1cd390
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: oleembobj.hxx,v $ * $RCSfile: oleembobj.hxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: mav $ $Date: 2003-11-26 10:27:46 $ * last change: $Author: mav $ $Date: 2003-12-08 12:49:46 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -285,7 +285,8 @@ public: ...@@ -285,7 +285,8 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
sal_Int32 nEntryConnectionMode, sal_Int32 nEntryConnectionMode,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, ::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException, ::com::sun::star::io::IOException,
...@@ -298,7 +299,7 @@ public: ...@@ -298,7 +299,7 @@ public:
::com::sun::star::uno::Exception, ::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, ::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException, ::com::sun::star::io::IOException,
...@@ -308,7 +309,8 @@ public: ...@@ -308,7 +309,8 @@ public:
virtual void SAL_CALL storeAsEntry( virtual void SAL_CALL storeAsEntry(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, ::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException, ::com::sun::star::io::IOException,
...@@ -333,7 +335,8 @@ public: ...@@ -333,7 +335,8 @@ public:
::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL reload( virtual void SAL_CALL reload(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, ::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException, ::com::sun::star::io::IOException,
......
embeddedobj/source/inc/xcreator.hxx
Dosyayı görüntüle @ eb1cd390
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: xcreator.hxx,v $ * $RCSfile: xcreator.hxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: mav $ $Date: 2003-11-28 17:54:18 $ * last change: $Author: mav $ $Date: 2003-12-08 12:49:47 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -105,10 +105,10 @@ public: ...@@ -105,10 +105,10 @@ public:
// XEmbedObjectCreator // XEmbedObjectCreator
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Bool bIsReadonly ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Bool bIsReadonly ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XLinkCreator // XLinkCreator
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
......
embeddedobj/source/msole/olepersist.cxx
Dosyayı görüntüle @ eb1cd390
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: olepersist.cxx,v $ * $RCSfile: olepersist.cxx,v $
* *
* $Revision: 1.9 $ * $Revision: 1.10 $
* *
* last change: $Author: mav $ $Date: 2003-12-02 15:21:04 $ * last change: $Author: mav $ $Date: 2003-12-08 12:49:49 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -247,13 +247,16 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( ...@@ -247,13 +247,16 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
const uno::Reference< embed::XStorage >& xStorage, const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
sal_Int32 nEntryConnectionMode, sal_Int32 nEntryConnectionMode,
const uno::Sequence< beans::PropertyValue >& lArguments ) const uno::Sequence< beans::PropertyValue >& lArguments,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
embed::WrongStateException, embed::WrongStateException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
uno::RuntimeException ) uno::RuntimeException )
{ {
// TODO: use lObjArgs
// the type of the object must be already set // the type of the object must be already set
// a kind of typedetection should be done in the factory; // a kind of typedetection should be done in the factory;
// the only exception is object initialized from a stream, // the only exception is object initialized from a stream,
...@@ -467,13 +470,16 @@ void SAL_CALL OleEmbeddedObject::storeOwn() ...@@ -467,13 +470,16 @@ void SAL_CALL OleEmbeddedObject::storeOwn()
//------------------------------------------------------ //------------------------------------------------------
void SAL_CALL OleEmbeddedObject::storeToEntry( const uno::Reference< embed::XStorage >& xStorage, void SAL_CALL OleEmbeddedObject::storeToEntry( const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& lArguments ) const uno::Sequence< beans::PropertyValue >& lArguments,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
embed::WrongStateException, embed::WrongStateException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
uno::RuntimeException ) uno::RuntimeException )
{ {
// TODO: use lObjArgs
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed ) if ( m_bDisposed )
throw lang::DisposedException(); // TODO throw lang::DisposedException(); // TODO
...@@ -521,13 +527,16 @@ void SAL_CALL OleEmbeddedObject::storeToEntry( const uno::Reference< embed::XSto ...@@ -521,13 +527,16 @@ void SAL_CALL OleEmbeddedObject::storeToEntry( const uno::Reference< embed::XSto
//------------------------------------------------------ //------------------------------------------------------
void SAL_CALL OleEmbeddedObject::storeAsEntry( const uno::Reference< embed::XStorage >& xStorage, void SAL_CALL OleEmbeddedObject::storeAsEntry( const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& lArguments ) const uno::Sequence< beans::PropertyValue >& lArguments,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
embed::WrongStateException, embed::WrongStateException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
uno::RuntimeException ) uno::RuntimeException )
{ {
// TODO: use lObjArgs
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed ) if ( m_bDisposed )
throw lang::DisposedException(); // TODO throw lang::DisposedException(); // TODO
...@@ -698,13 +707,16 @@ sal_Bool SAL_CALL OleEmbeddedObject::isReadonly() ...@@ -698,13 +707,16 @@ sal_Bool SAL_CALL OleEmbeddedObject::isReadonly()
//------------------------------------------------------ //------------------------------------------------------
void SAL_CALL OleEmbeddedObject::reload( void SAL_CALL OleEmbeddedObject::reload(
const uno::Sequence< beans::PropertyValue >& lArguments ) const uno::Sequence< beans::PropertyValue >& lArguments,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
embed::WrongStateException, embed::WrongStateException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
uno::RuntimeException ) uno::RuntimeException )
{ {
// TODO: use lObjArgs
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed ) if ( m_bDisposed )
throw lang::DisposedException(); // TODO throw lang::DisposedException(); // TODO
......
embeddedobj/source/msole/xolefactory.cxx
Dosyayı görüntüle @ eb1cd390
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: xolefactory.cxx,v $ * $RCSfile: xolefactory.cxx,v $
* *
* $Revision: 1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: mav $ $Date: 2003-11-28 17:27:12 $ * last change: $Author: mav $ $Date: 2003-12-08 12:49:50 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -155,6 +155,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta ...@@ -155,6 +155,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
xPersist->setPersistentEntry( xStorage, xPersist->setPersistentEntry( xStorage,
sEntName, sEntName,
embed::EntryInitModes::ENTRY_DEFAULT_INIT, embed::EntryInitModes::ENTRY_DEFAULT_INIT,
uno::Sequence< beans::PropertyValue >(),
uno::Sequence< beans::PropertyValue >() ); uno::Sequence< beans::PropertyValue >() );
return xResult; return xResult;
...@@ -164,7 +165,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta ...@@ -164,7 +165,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor( uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor(
const uno::Reference< embed::XStorage >& xStorage, const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& aMediaDescr ) const uno::Sequence< beans::PropertyValue >& aMediaDescr,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
...@@ -192,7 +194,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta ...@@ -192,7 +194,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
xPersist->setPersistentEntry( xStorage, xPersist->setPersistentEntry( xStorage,
sEntName, sEntName,
embed::EntryInitModes::ENTRY_MEDIA_DESCRIPTOR_INIT, embed::EntryInitModes::ENTRY_MEDIA_DESCRIPTOR_INIT,
aMediaDescr ); aMediaDescr,
lObjArgs );
return xResult; return xResult;
} }
...@@ -202,7 +205,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta ...@@ -202,7 +205,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
const uno::Sequence< sal_Int8 >& aClassID, const uno::Sequence< sal_Int8 >& aClassID,
const ::rtl::OUString& aClassName, const ::rtl::OUString& aClassName,
const uno::Reference< embed::XStorage >& xStorage, const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName ) const ::rtl::OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
...@@ -230,7 +234,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta ...@@ -230,7 +234,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
xPersist->setPersistentEntry( xStorage, xPersist->setPersistentEntry( xStorage,
sEntName, sEntName,
embed::EntryInitModes::ENTRY_TRUNCATE_INIT, embed::EntryInitModes::ENTRY_TRUNCATE_INIT,
uno::Sequence< beans::PropertyValue >() ); uno::Sequence< beans::PropertyValue >(),
lObjArgs );
return xResult; return xResult;
} }
...@@ -239,7 +244,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta ...@@ -239,7 +244,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceLink( uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceLink(
const uno::Reference< embed::XStorage >& xStorage, const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& aMediaDescr ) const uno::Sequence< beans::PropertyValue >& aMediaDescr,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
...@@ -269,7 +275,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta ...@@ -269,7 +275,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
xPersist->setPersistentEntry( xStorage, xPersist->setPersistentEntry( xStorage,
sEntName, sEntName,
embed::EntryInitModes::ENTRY_MEDIA_DESCRIPTOR_INIT, embed::EntryInitModes::ENTRY_MEDIA_DESCRIPTOR_INIT,
aMediaDescr ); aMediaDescr,
lObjArgs );
return xResult; return xResult;
} }
...@@ -281,7 +288,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta ...@@ -281,7 +288,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
const uno::Reference< embed::XStorage >& xStorage, const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName, const ::rtl::OUString& sEntName,
sal_Int32 nEntryConnectionMode, sal_Int32 nEntryConnectionMode,
const uno::Sequence< beans::PropertyValue >& lArguments ) const uno::Sequence< beans::PropertyValue >& lArguments,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException, throw ( lang::IllegalArgumentException,
io::IOException, io::IOException,
uno::Exception, uno::Exception,
...@@ -308,7 +316,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta ...@@ -308,7 +316,8 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
xPersist->setPersistentEntry( xStorage, xPersist->setPersistentEntry( xStorage,
sEntName, sEntName,
embed::EntryInitModes::ENTRY_DEFAULT_INIT, embed::EntryInitModes::ENTRY_DEFAULT_INIT,
uno::Sequence< beans::PropertyValue >() ); uno::Sequence< beans::PropertyValue >(),
lObjArgs );
} }
else else
......
embeddedobj/source/msole/xolefactory.hxx
Dosyayı görüntüle @ eb1cd390
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: xolefactory.hxx,v $ * $RCSfile: xolefactory.hxx,v $
* *
* $Revision: 1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: mav $ $Date: 2003-11-28 17:27:20 $ * last change: $Author: mav $ $Date: 2003-12-08 12:49:50 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -109,14 +109,14 @@ public: ...@@ -109,14 +109,14 @@ public:
// XEmbedObjectCreator // XEmbedObjectCreator
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Bool bIsReadonly ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Bool bIsReadonly ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XEmbedObjectFactory // XEmbedObjectFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XLinkCreator // XLinkCreator
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
......
embeddedobj/test/Container1/EmbedContApp.java
Dosyayı görüntüle @ eb1cd390
...@@ -950,7 +950,8 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie ...@@ -950,7 +950,8 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
Object oEmbObj = xEmbedFactory.createInstanceInitNew( pClassID, Object oEmbObj = xEmbedFactory.createInstanceInitNew( pClassID,
"Dummy name", "Dummy name",
m_xStorage, m_xStorage,
"EmbedSub" ); "EmbedSub",
new PropertyValue[0] );
xEmbObj = (XEmbeddedObject)UnoRuntime.queryInterface( XEmbeddedObject.class, oEmbObj ); xEmbObj = (XEmbeddedObject)UnoRuntime.queryInterface( XEmbeddedObject.class, oEmbObj );
} }
else else
...@@ -986,7 +987,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie ...@@ -986,7 +987,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
aMedDescr[0].Value = (Object) aLinkURL; aMedDescr[0].Value = (Object) aLinkURL;
aMedDescr[1].Name = "ReadOnly"; aMedDescr[1].Name = "ReadOnly";
aMedDescr[1].Value = (Object) new Boolean( false ); aMedDescr[1].Value = (Object) new Boolean( false );
Object oEmbObj = xLinkCreator.createInstanceLink( m_xStorage, "EmbedSub", aMedDescr ); Object oEmbObj = xLinkCreator.createInstanceLink( m_xStorage, "EmbedSub", aMedDescr, new PropertyValue[0] );
xEmbObj = (XEmbeddedObject)UnoRuntime.queryInterface( XEmbeddedObject.class, oEmbObj ); xEmbObj = (XEmbeddedObject)UnoRuntime.queryInterface( XEmbeddedObject.class, oEmbObj );
} }
else else
...@@ -1022,7 +1023,8 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie ...@@ -1022,7 +1023,8 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
aMedDescr[1].Value = (Object) new Boolean( false ); aMedDescr[1].Value = (Object) new Boolean( false );
Object oEmbObj = xEmbedCreator.createInstanceInitFromMediaDescriptor( m_xStorage, Object oEmbObj = xEmbedCreator.createInstanceInitFromMediaDescriptor( m_xStorage,
"EmbedSub", "EmbedSub",
aMedDescr ); aMedDescr,
new PropertyValue[0] );
xEmbObj = (XEmbeddedObject)UnoRuntime.queryInterface( XEmbeddedObject.class, oEmbObj ); xEmbObj = (XEmbeddedObject)UnoRuntime.queryInterface( XEmbeddedObject.class, oEmbObj );
} }
else else
...@@ -1123,7 +1125,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie ...@@ -1123,7 +1125,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
Object oStorage = xStorageFactory.createInstanceWithArguments( aArgs ); Object oStorage = xStorageFactory.createInstanceWithArguments( aArgs );
XStorage xTargetStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oStorage ); XStorage xTargetStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oStorage );
xPersist.storeAsEntry( xTargetStorage, "EmbedSub", new PropertyValue[0] ); xPersist.storeAsEntry( xTargetStorage, "EmbedSub", new PropertyValue[0], new PropertyValue[0] );
xPersist.saveCompleted( true ); xPersist.saveCompleted( true );
// the object must be already based on new storage // the object must be already based on new storage
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment