diff options
Diffstat (limited to 'writerfilter/source/dmapper/StyleSheetTable.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 42 |
1 files changed, 34 insertions, 8 deletions
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 1e8ab405f408..9ae7d1df6e41 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -1029,10 +1029,33 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable ) pEntry->pProperties->Insert(PROP_PARA_WIDOWS, aTwo, false); pEntry->pProperties->Insert(PROP_PARA_ORPHANS, aTwo, false); - // Left-to-right direction if not already set - pEntry->pProperties->Insert(PROP_WRITING_MODE, uno::makeAny( sal_Int16(text::WritingMode_LR_TB) ), false); - // Left alignment if not already set - pEntry->pProperties->Insert(PROP_PARA_ADJUST, uno::makeAny( sal_Int16(style::ParagraphAdjust_LEFT) ), false); + // tdf#87533 explicitly set writing mode value based on default paragraph properties + // specified inside styles.xml: <w:docDefaults><w:pPrDefault><w:pPr><w:bidi> + { + const PropertyMapPtr & propertyMap = m_pImpl->m_pDefaultParaProps; + + boost::optional<PropertyMap::Property> writingMode; + if (propertyMap && (writingMode = propertyMap->getProperty(PROP_WRITING_MODE))) + { + pEntry->pProperties->Insert(PROP_WRITING_MODE, writingMode->second, false); + } + else + { + // Left-to-right direction if not already set + pEntry->pProperties->Insert(PROP_WRITING_MODE, uno::makeAny(sal_Int16(text::WritingMode_LR_TB)), false); + } + + boost::optional<PropertyMap::Property> paraAdjust; + if (propertyMap && (paraAdjust = propertyMap->getProperty(PROP_PARA_ADJUST))) + { + pEntry->pProperties->Insert(PROP_PARA_ADJUST, paraAdjust->second, false); + } + else + { + // Left alignment if not already set + pEntry->pProperties->Insert(PROP_PARA_ADJUST, uno::makeAny(sal_Int16(style::ParagraphAdjust_LEFT)), false); + } + } } auto aPropValues = comphelper::sequenceToContainer< std::vector<beans::PropertyValue> >(pEntry->pProperties->GetPropertyValues()); @@ -1452,6 +1475,8 @@ OUString StyleSheetTable::ConvertStyleName( const OUString& rWWName, bool bExten ++aIt; } } + + // create a map only once if(m_pImpl->m_aStyleNameMap.empty()) { for( sal_uInt32 nPair = 0; nPair < SAL_N_ELEMENTS(aStyleNamePairs)/2; ++nPair) @@ -1465,15 +1490,15 @@ OUString StyleSheetTable::ConvertStyleName( const OUString& rWWName, bool bExten } } } + + // find style-name using map StringPairMap_t::iterator aIt = m_pImpl->m_aStyleNameMap.find( sRet ); - bool bConverted = false; + if (aIt != m_pImpl->m_aStyleNameMap.end()) { - bConverted = true; sRet = aIt->second; } - - if (!bConverted) + else { // SwStyleNameMapper doc says: If the UI style name equals a // programmatic name, then it must append " (user)" to the end. @@ -1481,6 +1506,7 @@ OUString StyleSheetTable::ConvertStyleName( const OUString& rWWName, bool bExten if (aReservedIt != m_pImpl->m_aReservedStyleNames.end()) sRet += " (user)"; } + return sRet; } |