diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-10-16 23:38:11 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-10-17 08:39:02 +0200 |
| commit | 7972ce0d6bc22a36d7fbaaa19bed11ec4cfe52d7 (patch) | |
| tree | 2bc2a7a0c462f884275501600f1da3ea51f8eb2f /writerfilter | |
| parent | ca0c26713e01409f529fe0f8f986e5400f97178b (diff) | |
writerfilter: clean up now redundant PROP_LAYOUT_IN_CELL
Which is now exactly the same as PROP_FOLLOW_TEXT_FLOW, so no need to
set it separately.
Change-Id: I32e1e2bdfb8ac46eb6a07f5187f780275d334b2f
Reviewed-on: https://gerrit.libreoffice.org/80926
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, 0 insertions, 7 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 2e2ff9e4eec1..d207f609a4f0 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1326,11 +1326,6 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer if( m_pImpl->rDomainMapper.IsInTable() && m_pImpl->bLayoutInCell ) 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 cf683112f30f..8667929183e2 100644 --- a/writerfilter/source/dmapper/PropertyIds.cxx +++ b/writerfilter/source/dmapper/PropertyIds.cxx @@ -349,7 +349,6 @@ 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; case PROP_DATABASE_NAME: sName = "DataBaseName"; break; case PROP_COMMAND_TYPE: sName = "DataCommandType"; break; case PROP_DATATABLE_NAME: sName = "DataTableName"; break; diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx index 8c8e9ca1a09c..ce44a1520e6d 100644 --- a/writerfilter/source/dmapper/PropertyIds.hxx +++ b/writerfilter/source/dmapper/PropertyIds.hxx @@ -349,7 +349,6 @@ enum PropertyIds ,PROP_RUBY_TEXT ,PROP_RUBY_ADJUST ,PROP_RUBY_POSITION - ,PROP_LAYOUT_IN_CELL ,PROP_DATABASE_NAME ,PROP_COMMAND_TYPE ,PROP_DATATABLE_NAME |