diff options
| author | Patrick Jaap <patrick.jaap@tu-dresden.de> | 2018-11-14 16:25:45 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-01-28 15:21:21 +0100 |
| commit | a454fe6ca36924bfcb0db984aab54ad5242949f0 (patch) | |
| tree | 64fae959f752c8b06ef8622d857d594abfb08439 /writerfilter | |
| parent | b761504aa81ac8e2f61ba87899a965de19dc35cc (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>
Reviewed-on: https://gerrit.libreoffice.org/66999
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 9f188d88b499..d999d5bd88fb 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1267,6 +1267,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 d8b99ada629e..b11b27ce7bcb 100644 --- a/writerfilter/source/dmapper/PropertyIds.cxx +++ b/writerfilter/source/dmapper/PropertyIds.cxx @@ -355,6 +355,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 65ab06aa8321..a936b93d6470 100644 --- a/writerfilter/source/dmapper/PropertyIds.hxx +++ b/writerfilter/source/dmapper/PropertyIds.hxx @@ -353,6 +353,7 @@ enum PropertyIds ,PROP_RUBY_TEXT ,PROP_RUBY_ADJUST ,PROP_RUBY_POSITION + ,PROP_LAYOUT_IN_CELL }; //Returns the UNO string equivalent to eId. |