diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 17:30:51 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 17:30:51 +0000 |
| commit | 3172f3c8a0b3a807684ef05bcc88307dc102ea55 (patch) | |
| tree | f684a9706b491dea67b98e0a189730b4cd9e0404 /comphelper/source | |
| parent | de32a558fc299735ff6ff87e9ca6e26244760c97 (diff) | |
INTEGRATION: CWS inplaceobjects (1.16.46); FILE MERGED
2006/09/28 20:47:15 mba 1.16.46.2: RESYNC: (1.16-1.17); FILE MERGED
2006/06/09 10:34:41 mba 1.16.46.1: #i66239#: create OLE objects with special MiscStatus
Diffstat (limited to 'comphelper/source')
| -rw-r--r-- | comphelper/source/container/embeddedobjectcontainer.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index 0853b0426fd2..0e3585e6ac00 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -4,9 +4,9 @@ * * $RCSfile: embeddedobjectcontainer.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: obo $ $Date: 2006-09-17 17:06:48 $ + * last change: $Author: vg $ $Date: 2006-11-01 18:30:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -375,7 +375,8 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedOb return xObj; } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbeddedObject( const uno::Sequence < sal_Int8 >& rClassId, ::rtl::OUString& rNewName ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbeddedObject( const uno::Sequence < sal_Int8 >& rClassId, + const uno::Sequence < beans::PropertyValue >& rArgs, ::rtl::OUString& rNewName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::CreateEmbeddedObject" ); @@ -393,7 +394,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbedde xObj = uno::Reference < embed::XEmbeddedObject >( xFactory->createInstanceInitNew( rClassId, ::rtl::OUString(), pImpl->mxStorage, rNewName, - uno::Sequence < beans::PropertyValue >() ), uno::UNO_QUERY ); + rArgs ), uno::UNO_QUERY ); AddEmbeddedObject( xObj, rNewName ); @@ -407,6 +408,11 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbedde return xObj; } +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbeddedObject( const uno::Sequence < sal_Int8 >& rClassId, ::rtl::OUString& rNewName ) +{ + return CreateEmbeddedObject( rClassId, uno::Sequence < beans::PropertyValue >(), rNewName ); +} + void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, const ::rtl::OUString& rName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::AddEmbeddedObject" ); |