summaryrefslogtreecommitdiff
path: root/embeddedobj/source/general
diff options
context:
space:
mode:
authorMikhail Voitenko <mav@openoffice.org>2003-12-08 14:18:37 +0000
committerMikhail Voitenko <mav@openoffice.org>2003-12-08 14:18:37 +0000
commit52765102b6b16d83c038c4dc9fe7952c1da12023 (patch)
tree13ca8de06c943e908071bf6be0846167be9f1b1d /embeddedobj/source/general
parentcea282a900c0b7da3d48a3f4024ccfa7bf953ea0 (diff)
#112923# loading of an object from entry can require object descriptor
Diffstat (limited to 'embeddedobj/source/general')
-rw-r--r--embeddedobj/source/general/xcreator.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index f641bd2700dd..2a6eca13d820 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xcreator.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: mav $ $Date: 2003-12-08 14:39:02 $
+ * last change: $Author: mav $ $Date: 2003-12-08 15:18:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -192,7 +192,8 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceInitFromEntry(
const uno::Reference< embed::XStorage >& xStorage,
const ::rtl::OUString& sEntName,
- sal_Bool bIsReadonly )
+ sal_Bool bIsReadonly,
+ const uno::Sequence< beans::PropertyValue >& lObjArgs )
throw ( lang::IllegalArgumentException,
container::NoSuchElementException,
io::IOException,
@@ -277,7 +278,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
sEntName,
embed::EntryInitModes::ENTRY_DEFAULT_INIT,
aTempMediaDescr,
- uno::Sequence< beans::PropertyValue >() );
+ lObjArgs );
}
else
{
@@ -321,7 +322,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
if ( !xOleEmbCreator.is() )
throw uno::RuntimeException(); // TODO:
- xResult = xOleEmbCreator->createInstanceInitFromEntry( xStorage, sEntName, bIsReadonly );
+ xResult = xOleEmbCreator->createInstanceInitFromEntry( xStorage, sEntName, bIsReadonly, lObjArgs );
}
else
{