diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-12-19 23:29:17 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-12 09:00:15 +0000 |
| commit | df321f828b4dac343cc520ecb2d722f75c52efb7 (patch) | |
| tree | 54e9dbe424bf81e3a65429caf7e20d1c4b9f94ce /oox | |
| parent | ad5489e994c9ccdbc54ccd0e3721adb64a1e77ba (diff) | |
move saveInteropProperties from writerfilter to oox
Change-Id: I4f9769ad496198d2d002775dee4ee0a2f08d6f3b
(cherry picked from commit 9d0d41f0f3c5215770bc7246a089d54a7244df55)
Reviewed-on: https://gerrit.libreoffice.org/21351
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ole/oleobjecthelper.cxx | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx index f5d4df409748..5e6c057b0b56 100644 --- a/oox/source/ole/oleobjecthelper.cxx +++ b/oox/source/ole/oleobjecthelper.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Size.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/document/XEmbeddedObjectResolver.hpp> #include <com/sun/star/embed/Aspects.hpp> @@ -28,6 +29,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <osl/diagnose.h> +#include <comphelper/sequenceashashmap.hxx> #include "oox/helper/propertymap.hxx" namespace oox { @@ -72,6 +74,44 @@ OleObjectHelper::~OleObjectHelper() } } +void SaveInteropProperties(uno::Reference<frame::XModel> const& xModel, + OUString const& rObjectName, OUString const*const pOldObjectName, + OUString const& rProgId, OUString const& rDrawAspect) +{ + static const char sEmbeddingsPropName[] = "EmbeddedObjects"; + + // get interop grab bag from document + uno::Reference<beans::XPropertySet> const xDocProps(xModel, uno::UNO_QUERY); + comphelper::SequenceAsHashMap aGrabBag(xDocProps->getPropertyValue("InteropGrabBag")); + + // get EmbeddedObjects property inside grab bag + comphelper::SequenceAsHashMap objectsList; + if (aGrabBag.find(sEmbeddingsPropName) != aGrabBag.end()) + objectsList << aGrabBag[sEmbeddingsPropName]; + + uno::Sequence< beans::PropertyValue > aGrabBagAttribute(2); + aGrabBagAttribute[0].Name = "ProgID"; + aGrabBagAttribute[0].Value <<= rProgId; + aGrabBagAttribute[1].Name = "DrawAspect"; + aGrabBagAttribute[1].Value <<= rDrawAspect; + + // If we got an "old name", erase that first. + if (pOldObjectName) + { + comphelper::SequenceAsHashMap::iterator it = objectsList.find(*pOldObjectName); + if (it != objectsList.end()) + objectsList.erase(it); + } + + objectsList[rObjectName] = uno::Any( aGrabBagAttribute ); + + // put objects list back into the grab bag + aGrabBag[sEmbeddingsPropName] = uno::Any(objectsList.getAsConstPropertyValueList()); + + // put grab bag back into the document + xDocProps->setPropertyValue("InteropGrabBag", uno::Any(aGrabBag.getAsConstPropertyValueList())); +} + bool OleObjectHelper::importOleObject( PropertyMap& rPropMap, const OleObjectInfo& rOleObject, const awt::Size& rObjSize ) { bool bRet = false; |