[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa writerfilter/source
Michael Stahl
mstahl at redhat.com
Sun Aug 3 12:43:43 PDT 2014
sw/qa/extras/rtfimport/data/fdo81944.rtf | 15 ++++++
sw/qa/extras/rtfimport/rtfimport.cxx | 13 +++++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 6 +-
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 51 ++++++++--------------
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 3 -
5 files changed, 52 insertions(+), 36 deletions(-)
New commits:
commit aed0f1e27be04ecd43b2edd3885c1f2eea0a3de9
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Aug 2 18:55:55 2014 +0200
fdo#81944: writerfilter: RTF import: don't drop fonts in stylesheet
The font definitions in the style sheet meet an untimely death in
StyleSheetTable::lcl_sprm(), which special-cases LN_EG_RPrBase_rFonts,
routing it into TblStylePrHandler.
Avoid this by sending style entries to the domain mapper in the same way
as the OOXML tokenizer, i.e., with paragraph and run properties nested
below CT_Style_pPr/rPr.
This reveals that the CT_Style_basedOn was wrongly handled as paragraph
property.
Change-Id: Ic724ba48fe36bf782b1b430bdafdb1df480d5ad3
(cherry picked from commit f8e8e476aa0a5576234dbb4daac9dc299e044e61)
Reviewed-on: https://gerrit.libreoffice.org/10698
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/sw/qa/extras/rtfimport/data/fdo81944.rtf b/sw/qa/extras/rtfimport/data/fdo81944.rtf
new file mode 100644
index 0000000..780e9bd
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo81944.rtf
@@ -0,0 +1,15 @@
+{\rtf1
+
+{\fonttbl
+{\f38\fbidi \fswiss\fcharset0\fprq2 Segoe UI;}
+{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2 Times New Roman;}
+}
+
+{\stylesheet
+{\qc \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f38\fs18\lang1033\langfe1033 Normal;}
+}
+
+\pard
+
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index ca60321..44d49da 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1163,6 +1163,19 @@ DECLARE_RTFIMPORT_TEST(testPageBackground, "page-background.rtf")
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x92D050), getProperty<sal_Int32>(xPageStyle, "BackColor"));
}
+DECLARE_RTFIMPORT_TEST(testFdo81944, "fdo81944.rtf")
+{
+ // font properties in style were not imported
+ uno::Reference<beans::XPropertySet> xPropertySet(
+ getStyles("ParagraphStyles")->getByName("Standard"), uno::UNO_QUERY);
+ uno::Reference<style::XStyle> xStyle(xPropertySet, uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(OUString("Segoe UI"), getProperty<OUString>(xStyle, "CharFontName"));
+ CPPUNIT_ASSERT_EQUAL(9.0f, getProperty<float>(xStyle, "CharHeight"));
+ // not sure if this should be set on Asian or Complex or both?
+ CPPUNIT_ASSERT_EQUAL(OUString("Times New Roman"), getProperty<OUString>(xStyle, "CharFontNameComplex"));
+ CPPUNIT_ASSERT_EQUAL(11.0f, getProperty<float>(xStyle, "CharHeightComplex"));
+}
+
DECLARE_RTFIMPORT_TEST(testFdo62044, "fdo62044.rtf")
{
// The problem was that RTF import during copy&paste did not ignore existing paragraph styles.
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f6dc73e..f44b2bd 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4663,15 +4663,17 @@ uno::Reference<container::XIndexAccess> DomainMapper_Impl::GetCurrentNumberingRu
// So we are in a paragraph style and it has numbering. Look up the relevant numbering rules.
OUString aListName = ListDef::GetStyleName(nListId);
- uno::Reference< style::XStyleFamiliesSupplier > xStylesSupplier(GetTextDocument(), uno::UNO_QUERY);
+ uno::Reference< style::XStyleFamiliesSupplier > xStylesSupplier(GetTextDocument(), uno::UNO_QUERY_THROW);
uno::Reference< container::XNameAccess > xStyleFamilies = xStylesSupplier->getStyleFamilies();
uno::Reference<container::XNameAccess> xNumberingStyles;
xStyleFamilies->getByName("NumberingStyles") >>= xNumberingStyles;
uno::Reference<beans::XPropertySet> xStyle(xNumberingStyles->getByName(aListName), uno::UNO_QUERY);
xRet.set(xStyle->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
}
- catch( const uno::Exception& )
+ catch (const uno::Exception& e)
{
+ SAL_WARN("writerfilter.dmapper",
+ "GetCurrentNumberingRules: exception caught: " << e.Message);
}
return xRet;
}
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 21708cc..c716b2f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1164,7 +1164,7 @@ void RTFDocumentImpl::text(OUString& rString)
m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Style_name, pValue);
writerfilter::Reference<Properties>::Pointer_t const pProp(
- new RTFReferenceProperties(mergeAttributes(), mergeSprms())
+ createStyleProperties()
);
m_aStyleTableEntries.insert(make_pair(m_nCurrentStyleIndex, pProp));
}
@@ -3387,6 +3387,10 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
case RTF_LEVELPICTURE:
nSprm = NS_ooxml::LN_CT_Lvl_lvlPicBulletId;
break;
+ case RTF_SBASEDON:
+ nSprm = NS_ooxml::LN_CT_Style_basedOn;
+ pIntValue.reset(new RTFValue(getStyleName(nParam)));
+ break;
default:
break;
}
@@ -3466,10 +3470,6 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
case RTF_ITAP:
nSprm = NS_ooxml::LN_tblDepth;
break;
- case RTF_SBASEDON:
- nSprm = NS_ooxml::LN_CT_Style_basedOn;
- pIntValue.reset(new RTFValue(getStyleName(nParam)));
- break;
default:
break;
}
@@ -4792,19 +4792,21 @@ int RTFDocumentImpl::pushState()
return 0;
}
-RTFSprms RTFDocumentImpl::mergeSprms()
+writerfilter::Reference<Properties>::Pointer_t
+RTFDocumentImpl::createStyleProperties()
{
- RTFSprms aSprms;
- for (RTFSprms::Iterator_t i = m_aStates.top().aTableSprms.begin();
- i != m_aStates.top().aTableSprms.end(); ++i)
- aSprms.set(i->first, i->second);
- for (RTFSprms::Iterator_t i = m_aStates.top().aCharacterSprms.begin();
- i != m_aStates.top().aCharacterSprms.end(); ++i)
- aSprms.set(i->first, i->second);
- for (RTFSprms::Iterator_t i = m_aStates.top().aParagraphSprms.begin();
- i != m_aStates.top().aParagraphSprms.end(); ++i)
- aSprms.set(i->first, i->second);
- return aSprms;
+ RTFValue::Pointer_t const pParaProps(
+ new RTFValue(m_aStates.top().aParagraphAttributes, m_aStates.top().aParagraphSprms));
+ RTFValue::Pointer_t const pCharProps(
+ new RTFValue(m_aStates.top().aCharacterAttributes, m_aStates.top().aCharacterSprms));
+
+ // resetSprms will clean up this modification
+ m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Style_pPr, pParaProps);
+ m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Style_rPr, pCharProps);
+
+ writerfilter::Reference<Properties>::Pointer_t const pProps(
+ new RTFReferenceProperties(m_aStates.top().aTableAttributes, m_aStates.top().aTableSprms));
+ return pProps;
}
void RTFDocumentImpl::resetSprms()
@@ -4814,21 +4816,6 @@ void RTFDocumentImpl::resetSprms()
m_aStates.top().aParagraphSprms.clear();
}
-RTFSprms RTFDocumentImpl::mergeAttributes()
-{
- RTFSprms aAttributes;
- for (RTFSprms::Iterator_t i = m_aStates.top().aTableAttributes.begin();
- i != m_aStates.top().aTableAttributes.end(); ++i)
- aAttributes.set(i->first, i->second);
- for (RTFSprms::Iterator_t i = m_aStates.top().aCharacterAttributes.begin();
- i != m_aStates.top().aCharacterAttributes.end(); ++i)
- aAttributes.set(i->first, i->second);
- for (RTFSprms::Iterator_t i = m_aStates.top().aParagraphAttributes.begin();
- i != m_aStates.top().aParagraphAttributes.end(); ++i)
- aAttributes.set(i->first, i->second);
- return aAttributes;
-}
-
void RTFDocumentImpl::resetAttributes()
{
m_aStates.top().aTableAttributes.clear();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 437ab48..98a5523 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -382,8 +382,7 @@ public:
private:
SvStream& Strm();
sal_uInt32 getColorTable(sal_uInt32 nIndex);
- RTFSprms mergeSprms();
- RTFSprms mergeAttributes();
+ writerfilter::Reference<Properties>::Pointer_t createStyleProperties();
void resetSprms();
void resetAttributes();
void resolveSubstream(sal_Size nPos, Id nId);
More information about the Libreoffice-commits
mailing list