diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 6 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshap4.cxx | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index d48f8de48a4b..bcbeb9f2e2ce 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -787,10 +787,8 @@ void SdrObject::GetGrabBagItem(css::uno::Any& rVal) const { if (pGrabBagItem != nullptr) pGrabBagItem->QueryValue(rVal); - else { - uno::Sequence<beans::PropertyValue> aValue(0); - rVal <<= aValue; - } + else + rVal <<= uno::Sequence<beans::PropertyValue>(); } void SdrObject::SetGrabBagItem(const css::uno::Any& rVal) diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 59f39cbbb702..541b340dc26d 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -29,6 +29,7 @@ #include <svx/svdomedia.hxx> #include <svx/svdpool.hxx> #include <comphelper/classids.hxx> +#include <comphelper/propertysequence.hxx> #include <sfx2/frmdescr.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> @@ -395,9 +396,9 @@ bool SvxOle2Shape::createObject( const SvGlobalName &aClassName ) if( SvxShape::getPropertyValue( UNO_NAME_OLE2_PERSISTNAME ) >>= aTmpStr ) aPersistName = aTmpStr; - uno::Sequence<beans::PropertyValue> objArgs(1); - objArgs[0].Name = "DefaultParentBaseURL"; - objArgs[0].Value <<= pPersist->getDocumentBaseURL(); + uno::Sequence<beans::PropertyValue> objArgs( comphelper::InitPropertySequence({ + { "DefaultParentBaseURL", Any(pPersist->getDocumentBaseURL()) } + })); //TODO/LATER: how to cope with creation failure?! uno::Reference<embed::XEmbeddedObject> xObj( pPersist->getEmbeddedObjectContainer().CreateEmbeddedObject( |