diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-04-15 00:52:12 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-04-15 01:19:47 +0200 |
| commit | ecbea5fac49fe63280627ff215c0c7854d7ba953 (patch) | |
| tree | e47d0143f6e254563a0fc9872f2de31f4ccdc5ab /writerfilter | |
| parent | 69805b85f2643d3df4266a30f019e5f90c9a0826 (diff) | |
implement RTF import of zoom level
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 7 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.hxx | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index cab7df7450a2..2920d1ee1838 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -253,6 +253,7 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x m_bNeedCr(false), m_bNeedPar(true), m_aListTableSprms(), + m_aSettingsTableAttributes(), m_aSettingsTableSprms(), m_xStorage(), m_aTableBuffer(), @@ -374,8 +375,7 @@ void RTFDocumentImpl::checkFirstRun() if (m_bFirstRun) { // output settings table - RTFSprms aAttributes; - writerfilter::Reference<Properties>::Pointer_t const pProp(new RTFReferenceProperties(aAttributes, m_aSettingsTableSprms)); + writerfilter::Reference<Properties>::Pointer_t const pProp(new RTFReferenceProperties(m_aSettingsTableAttributes, m_aSettingsTableSprms)); RTFReferenceTable::Entries_t aSettingsTableEntries; aSettingsTableEntries.insert(make_pair(0, pProp)); writerfilter::Reference<Table>::Pointer_t const pTable(new RTFReferenceTable(aSettingsTableEntries)); @@ -2755,6 +2755,9 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) lcl_putNestedSprm(m_aStates.top().aTableSprms, NS_ooxml::LN_CT_Lvl_rPr, NS_sprm::LN_CRgFtc0, pValue); } break; + case RTF_VIEWSCALE: + m_aSettingsTableAttributes->push_back(make_pair(NS_ooxml::LN_CT_Zoom_percent, pIntValue)); + break; default: SAL_INFO("writerfilter", OSL_THIS_FUNC << ": TODO handle value '" << lcl_RtfToString(nKeyword) << "'"); aSkip.setParsed(false); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index e66f22e89899..898fb57fe3f4 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -425,7 +425,9 @@ namespace writerfilter { bool m_bNeedPar; /// The list table and list override table combined. RTFSprms m_aListTableSprms; - /// The settings table. + /// The settings table attributes. + RTFSprms m_aSettingsTableAttributes; + /// The settings table sprms. RTFSprms m_aSettingsTableSprms; oox::StorageRef m_xStorage; |