diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-02-26 06:50:37 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-02-26 06:50:37 +0000 |
| commit | ad11ccc35353ba2ecf795ac65bb858b115dea7bf (patch) | |
| tree | af6efe892f03f380281dafee0d188dc3f038bbe8 | |
| parent | 15f6b8a5e71d06e5dbbd5d11ce1d9bfa093f5b15 (diff) | |
INTEGRATION: CWS mav28_DEV300 (1.28.20.1.2); FILE MERGED
2008/02/12 16:07:06 mav 1.28.20.1.2.1: #i86031# merge only necessary MediaDescriptor entries from the model
| -rw-r--r-- | framework/source/loadenv/loadenv.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 59452f261a76..b909421d74a6 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -4,9 +4,9 @@ * * $RCSfile: loadenv.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: vg $ $Date: 2008-02-12 13:11:06 $ + * last change: $Author: obo $ $Date: 2008-02-26 07:50:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -391,14 +391,16 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const //----------------------------------------------- ::comphelper::MediaDescriptor impl_mergeMediaDescriptorWithMightExistingModelArgs(const css::uno::Sequence< css::beans::PropertyValue >& lOutsideDescriptor) { - ::comphelper::MediaDescriptor lDescriptor(lOutsideDescriptor); + ::comphelper::MediaDescriptor lDescriptor(lOutsideDescriptor); css::uno::Reference< css::frame::XModel > xModel = lDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_MODEL (), css::uno::Reference< css::frame::XModel > ()); if (xModel.is ()) { ::comphelper::MediaDescriptor lModelDescriptor(xModel->getArgs()); - lDescriptor.update (lModelDescriptor); + ::comphelper::MediaDescriptor::iterator pIt = lModelDescriptor.find( ::comphelper::MediaDescriptor::PROP_MACROEXECUTIONMODE() ); + if ( pIt != lModelDescriptor.end() ) + lDescriptor[::comphelper::MediaDescriptor::PROP_MACROEXECUTIONMODE()] = pIt->second; } return lDescriptor; |