[Libreoffice-commits] core.git: writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Tue Feb 18 20:37:27 CET 2014
writerfilter/source/dmapper/DomainMapper.cxx | 6 +-
writerfilter/source/doctok/resources.xmi | 62 -------------------------
writerfilter/source/ooxml/model.xml | 4 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 -
4 files changed, 7 insertions(+), 69 deletions(-)
New commits:
commit 9d40af0c791251ae21d5886e6e8b6e3344ee5470
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Feb 18 20:32:14 2014 +0100
writerfilter: convert sprm:PF{PageBreakBefore,NoLineNumb}
Change-Id: I1dd89236e81a7f62bb7abef5503f7520387772a0
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 34601fa..05c6978 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1000,9 +1000,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
case NS_ooxml::LN_CT_PPrBase_keepNext:
rContext->Insert(PROP_PARA_KEEP_TOGETHER, uno::makeAny( nIntValue ? true : false) );
break;
- case NS_sprm::LN_PFPageBreakBefore:
+ case NS_ooxml::LN_CT_PPrBase_pageBreakBefore:
rContext->Insert(PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE ) );
- break; // sprmPFPageBreakBefore
+ break;
case NS_ooxml::LN_CT_NumPr_ilvl:
if (nIntValue < 0 || 10 <= nIntValue) // Writer can't do everything
{
@@ -1058,7 +1058,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
}
}
break;
- case NS_sprm::LN_PFNoLineNumb: // sprmPFNoLineNumb
+ case NS_ooxml::LN_CT_PPrBase_suppressLineNumbers:
rContext->Insert(PROP_PARA_LINE_NUMBER_COUNT, uno::makeAny( nIntValue ? false : true) );
break;
case 0x845d: //right margin Asian - undocumented
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index c3ae23b..1b90437 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -100,68 +100,6 @@
</UML:ModelElement.taggedValue>
</UML:Class>
<!--SPRM sprmPJc-->
- <!--SPRM sprmPFPageBreakBefore-->
- <UML:Class xmi.id="sprmPFPageBreakBefore" name="sprmPFPageBreakBefore">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x2407</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="sprmcode"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:sprmPFPageBreakBefore</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="sprmid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>paragraph</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="kind"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- </UML:Class>
- <!--SPRM sprmPFPageBreakBefore-->
- <!--SPRM sprmPFNoLineNumb-->
- <UML:Class xmi.id="sprmPFNoLineNumb" name="sprmPFNoLineNumb">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x240C</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="sprmcode"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:sprmPFNoLineNumb</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="sprmid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>paragraph</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="kind"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- </UML:Class>
- <!--SPRM sprmPFNoLineNumb-->
<!--SPRM sprmPDxaRight-->
<UML:Class xmi.id="sprmPDxaRight" name="sprmPDxaRight">
<UML:ModelElement.stereotype>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index e833fc9..38f7419 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22340,11 +22340,11 @@
<element name="pStyle" tokenid="ooxml:CT_PPrBase_pStyle"/>
<element name="keepNext" tokenid="ooxml:CT_PPrBase_keepNext"/>
<element name="keepLines" tokenid="ooxml:CT_PPrBase_keepLines"/>
- <element name="pageBreakBefore" tokenid="sprm:PFPageBreakBefore"/>
+ <element name="pageBreakBefore" tokenid="ooxml:CT_PPrBase_pageBreakBefore"/>
<element name="framePr" tokenid="ooxml:CT_PPrBase_framePr"/>
<element name="widowControl" tokenid="ooxml:CT_PPrBase_widowControl"/>
<element name="numPr" tokenid="ooxml:CT_PPrBase_numPr"/>
- <element name="suppressLineNumbers" tokenid="sprm:PFNoLineNumb"/>
+ <element name="suppressLineNumbers" tokenid="ooxml:CT_PPrBase_suppressLineNumbers"/>
<element name="pBdr" tokenid="ooxml:CT_PrBase_pBdr"/>
<element name="shd" tokenid="sprm:PShd"/>
<element name="tabs" tokenid="ooxml:CT_PPrBase_tabs"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index f6651e8..4d49e89 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -442,7 +442,7 @@ void RTFDocumentImpl::checkNeedPap()
// Writer will ignore a page break before a text frame, so guard it with empty paragraphs
bool hasBreakBeforeFrame = m_aStates.top().aFrame.hasProperties() &&
- m_aStates.top().aParagraphSprms.find(NS_sprm::LN_PFPageBreakBefore).get();
+ m_aStates.top().aParagraphSprms.find(NS_ooxml::LN_CT_PPrBase_pageBreakBefore).get();
if (hasBreakBeforeFrame)
{
dispatchSymbol(RTF_PAR);
@@ -2296,7 +2296,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
}
break;
case RTF_PAGEBB:
- nParam = NS_sprm::LN_PFPageBreakBefore;
+ nParam = NS_ooxml::LN_CT_PPrBase_pageBreakBefore;
break;
default:
break;
More information about the Libreoffice-commits
mailing list