diff options
| author | Patrick Jaap <patrick.jaap@tu-dresden.de> | 2018-11-14 16:25:45 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2018-12-10 14:20:43 +0100 |
| commit | c3c80b6b63e998fd3117b5039e65a2ee9df90954 (patch) | |
| tree | d6d47fc936601315dc517401fd6b7818057d10d5 /writerfilter | |
| parent | 00b49f9ff9777cb1c1e971feec55b2448fba8be2 (diff) | |
tdf#115094 Part II: OOXML Feature: Add layoutInCell to Doc model
Change-Id: I50dcc2363982f8e6b68f10b0b724b59e9430d6c5
Reviewed-on: https://gerrit.libreoffice.org/63380
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 5 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyIds.cxx | 1 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyIds.hxx | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 3241990b8061..76b7797c161a 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1263,6 +1263,11 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer if( m_pImpl->rDomainMapper.IsInTable() && m_pImpl->bLayoutInCell && m_pImpl->nWrap != text::WrapTextMode_THROUGH ) xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_FOLLOW_TEXT_FLOW ), uno::makeAny(true)); + if( m_pImpl->rDomainMapper.IsInTable() && m_pImpl->bLayoutInCell ) + { + xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_LAYOUT_IN_CELL ), + uno::makeAny(true)); + } xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_SURROUND_CONTOUR ), uno::makeAny(m_pImpl->bContour)); diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx index 0842f9554b99..d47fec1613d0 100644 --- a/writerfilter/source/dmapper/PropertyIds.cxx +++ b/writerfilter/source/dmapper/PropertyIds.cxx @@ -350,6 +350,7 @@ OUString getPropertyName( PropertyIds eId ) case PROP_RUBY_TEXT: sName = "RubyText"; break; case PROP_RUBY_ADJUST: sName = "RubyAdjust"; break; case PROP_RUBY_POSITION: sName = "RubyPosition"; break; + case PROP_LAYOUT_IN_CELL: sName = "IsLayoutInCell"; break; } assert(sName.getLength()>0); return sName; diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx index 6b694db5f072..f8047b0aa76c 100644 --- a/writerfilter/source/dmapper/PropertyIds.hxx +++ b/writerfilter/source/dmapper/PropertyIds.hxx @@ -348,6 +348,7 @@ enum PropertyIds ,PROP_RUBY_TEXT ,PROP_RUBY_ADJUST ,PROP_RUBY_POSITION + ,PROP_LAYOUT_IN_CELL }; //Returns the UNO string equivalent to eId. |