diff options
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 5a2a46e2534c..8385964e03f3 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -963,7 +963,13 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) // Standard is handled already in applyDefaults(). if (sConvertedStyleName != "Standard") + { m_pImpl->SetPropertiesToDefault(xStyle); + + // resolve import conflicts with built-in styles + if( pEntry->sBaseStyleIdentifier.isEmpty() && !xStyle->getParentStyle().isEmpty() ) + xStyle->setParentStyle( "Standard" ); + } } else { |