summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-01-14 11:39:44 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-01-14 12:06:18 +0100
commit3e5d5437d2f941496e6f4dbbaad92104de6bdb3f (patch)
treecf79952122d023e109d8d1601e46867f22cce23c
parentf0bae2b9c3491a9458eb7324bf5955614215cc27 (diff)
DOCX drawingML shape filter: import title and description
Change-Id: Ica71b7c2bc31a211cccbb473071d1c4c82f4a4f4
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index d3594d9d7bab..ba0a67ffa1fb 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -390,6 +390,7 @@ public:
void applyName(uno::Reference<beans::XPropertySet>& xGraphicObjectProperties) const
{
+ PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
try
{
if( !sName.isEmpty() )
@@ -397,6 +398,10 @@ public:
uno::Reference< container::XNamed > xNamed( xGraphicObjectProperties, uno::UNO_QUERY_THROW );
xNamed->setName( sName );
}
+ xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_DESCRIPTION ),
+ uno::makeAny( sAlternativeText ));
+ xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_TITLE ),
+ uno::makeAny( title ));
}
catch( const uno::Exception& e )
{
@@ -1239,10 +1244,6 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
}
// setting properties for all types
- xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_DESCRIPTION ),
- uno::makeAny( m_pImpl->sAlternativeText ));
- xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_TITLE ),
- uno::makeAny( m_pImpl->title ));
if( m_pImpl->bPositionProtected )
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_POSITION_PROTECTED ),
uno::makeAny(true));