diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-08-24 15:17:43 +0300 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-08-30 12:22:24 +0000 |
| commit | c06d77c5eb57c1a7f5692028b6b04132593f9156 (patch) | |
| tree | abe4ed7061ae626edf313d3e8c84c75be014fd38 /writerfilter | |
| parent | 7f95c479f7f24791b6e991d1ce0595aa05748845 (diff) | |
tdf#101589 MS import: set 1-row table to don't split if row is set
Since .doc and .docx don't have an option to "don't split table",
we emulated that. For this IMPORT case when there is only one row,
consider the entire table to be unsplitable is the row is unsplitable.
This will give the expected results if the user starts adding more rows
to the table.
Change-Id: I8a2d817ff714ba0df65b5a5e263b27df4264e848
Reviewed-on: https://gerrit.libreoffice.org/28357
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 13 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyIds.cxx | 1 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyIds.hxx | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 176998295193..99087d50e645 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -576,6 +576,19 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo //fill default value - if not available m_aTableProperties->Insert( PROP_HEADER_ROW_COUNT, uno::makeAny( (sal_Int32)0), false); + // if table is only a single row, and row is set as don't split, set the same value for the whole table. + if( m_aRowProperties.size() == 1 && m_aRowProperties[0].get() ) + { + boost::optional<PropertyMap::Property> oSplitAllowed = m_aRowProperties[0]->getProperty(PROP_IS_SPLIT_ALLOWED); + if( oSplitAllowed ) + { + bool bRowCanSplit = true; + oSplitAllowed->second >>= bRowCanSplit; + if( !bRowCanSplit ) + m_aTableProperties->Insert( PROP_SPLIT, uno::makeAny(bRowCanSplit) ); + } + } + rInfo.aTableProperties = m_aTableProperties->GetPropertyValues(); #ifdef DEBUG_WRITERFILTER diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx index 426987fb635c..eec6ba265cce 100644 --- a/writerfilter/source/dmapper/PropertyIds.cxx +++ b/writerfilter/source/dmapper/PropertyIds.cxx @@ -238,6 +238,7 @@ OUString getPropertyName( PropertyIds eId ) case PROP_CREATE_FROM_OUTLINE : sName = "CreateFromOutline"; break; case PROP_CREATE_FROM_MARKS : sName = "CreateFromMarks"; break; case PROP_STANDARD : sName = "Standard"; break; + case PROP_SPLIT : sName = "Split"; break; case PROP_IS_SPLIT_ALLOWED : sName = "IsSplitAllowed"; break; case META_PROP_VERTICAL_BORDER : sName = "VerticalBorder"; break; case META_PROP_HORIZONTAL_BORDER : sName = "HorizontalBorder"; break; diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx index cf3abe89ce97..52a24f1e960a 100644 --- a/writerfilter/source/dmapper/PropertyIds.hxx +++ b/writerfilter/source/dmapper/PropertyIds.hxx @@ -260,6 +260,7 @@ enum PropertyIds ,PROP_SIZE_PROTECTED ,PROP_SIZE_TYPE ,PROP_SOURCE_NAME + ,PROP_SPLIT ,PROP_STANDARD ,PROP_START_AT ,PROP_START_WITH |