diff options
Diffstat (limited to 'writerfilter/source/dmapper/StyleSheetTable.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 5f45672fe915..8b3bc02b44a6 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -464,8 +464,12 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val) if (m_pImpl->m_pCurrentEntry->nStyleTypeCode != STYLE_TYPE_UNKNOWN) { // "If this attribute is specified by multiple styles, then the last instance shall be used." - if ( m_pImpl->m_pCurrentEntry->nStyleTypeCode == STYLE_TYPE_PARA && !m_pImpl->m_pCurrentEntry->sStyleIdentifierD.isEmpty() ) + if (m_pImpl->m_pCurrentEntry->bIsDefaultStyle + && m_pImpl->m_pCurrentEntry->nStyleTypeCode == STYLE_TYPE_PARA + && !m_pImpl->m_pCurrentEntry->sStyleIdentifierD.isEmpty()) + { m_pImpl->m_sDefaultParaStyleName = m_pImpl->m_pCurrentEntry->sStyleIdentifierD; + } beans::PropertyValue aValue; aValue.Name = "default"; @@ -1489,13 +1493,13 @@ OUString StyleSheetTable::ConvertStyleName( const OUString& rWWName, bool bExten // { "Table of Figures", "" }, { "Envelope Address", "Addressee" }, { "Envelope Return", "Sender" }, - { "footnote reference", "Footnote Characters" }, - { "Footnote Reference", "Footnote Characters" }, + { "footnote reference", "Footnote Symbol" }, + { "Footnote Reference", "Footnote Symbol" }, // { "Annotation Reference", "" }, { "Line Number", "Line numbering" }, { "Page Number", "Page Number" }, - { "endnote reference", "Endnote Characters" }, - { "Endnote Reference", "Endnote Characters" }, + { "endnote reference", "Endnote Symbol" }, + { "Endnote Reference", "Endnote Symbol" }, { "endnote text", "Endnote" }, { "Endnote Text", "Endnote" }, // { "Table of Authorities", "" }, |