[Libreoffice-commits] core.git: 3 commits - writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Mon Dec 30 07:06:00 PST 2013
writerfilter/source/dmapper/BorderHandler.cxx | 10
writerfilter/source/dmapper/DomainMapper.cxx | 20
writerfilter/source/dmapper/GraphicImport.cxx | 10
writerfilter/source/dmapper/NumberingManager.cxx | 24
writerfilter/source/dmapper/NumberingManager.hxx | 2
writerfilter/source/dmapper/TDefTableHandler.cxx | 11
writerfilter/source/doctok/resources.xmi | 702 -----------------------
writerfilter/source/ooxml/model.xml | 22
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 20
9 files changed, 75 insertions(+), 746 deletions(-)
New commits:
commit d6174b128664be54936784aaaab5a55e55181f4f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Dec 30 16:00:43 2013 +0100
writerfilter: let the OOXML tokenizer not generate RTF tokens
The tokens were in 3 namespaces previously: sprm, ooxml and rtf. Given
that all rtf tokens have ooxml equivalent but not the other way around,
replace remaining rtf tokens with ooxml ones (in the OOXML tokenizer) to
make this area a little bit easier to understand for a newcomer.
Change-Id: I640ecf51b0f88da2cdf41e8e79cf44b4ddbffef4
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index afefbfa..6d16bb0 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -345,9 +345,9 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
break;
case NS_rtf::LN_CBGRPPRLPAPX:
break;
- case NS_rtf::LN_LSID:
+ case NS_ooxml::LN_CT_AbstractNum_nsid:
break;
- case NS_rtf::LN_TPLC:
+ case NS_ooxml::LN_CT_AbstractNum_tmpl:
break;
case NS_rtf::LN_RGISTD:
break;
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index efd463d..e26d41a 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -449,7 +449,7 @@ uno::Reference<drawing::XShape> NumPicBullet::GetShape()
//--------------------------------------- AbstractListDef implementation
AbstractListDef::AbstractListDef( ) :
- m_nTPLC( -1 )
+ m_nTmpl( -1 )
,m_nSimpleList( -1 )
,m_nRestart( -1 )
,m_nUnsigned( -1 )
@@ -465,8 +465,8 @@ void AbstractListDef::SetValue( sal_uInt32 nSprmId, sal_Int32 nValue )
{
switch( nSprmId )
{
- case NS_rtf::LN_TPLC:
- m_nTPLC = nValue;
+ case NS_ooxml::LN_CT_AbstractNum_tmpl:
+ m_nTmpl = nValue;
break;
case NS_rtf::LN_FSIMPLELIST:
m_nSimpleList = nValue;
@@ -788,10 +788,10 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal )
case NS_ooxml::LN_CT_Num_numId:
m_pCurrentDefinition->SetId( rVal.getString().toInt32( ) );
break;
- case NS_rtf::LN_LSID:
+ case NS_ooxml::LN_CT_AbstractNum_nsid:
m_pCurrentDefinition->SetId( nIntValue );
break;
- case NS_rtf::LN_TPLC:
+ case NS_ooxml::LN_CT_AbstractNum_tmpl:
case NS_rtf::LN_FSIMPLELIST:
case NS_rtf::LN_fAutoNum:
case NS_rtf::LN_fHybrid:
@@ -978,7 +978,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
break;
case NS_ooxml::LN_CT_AbstractNum_multiLevelType:
break;
- case NS_rtf::LN_TPLC:
+ case NS_ooxml::LN_CT_AbstractNum_tmpl:
m_pCurrentDefinition->SetValue( nSprmId, nIntValue );
break;
case NS_ooxml::LN_CT_AbstractNum_lvl:
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index d4bc418..eef50e6 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -132,7 +132,7 @@ private:
class AbstractListDef
{
private:
- sal_Int32 m_nTPLC; //LN_TPLC
+ sal_Int32 m_nTmpl;
OUString m_sRGISTD; //LN_RGISTD
sal_Int32 m_nSimpleList; //LN_FSIMPLELIST
sal_Int32 m_nRestart; //LN_FRESTARTHDN
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 8ba1cbe..d63baa1 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -1328,122 +1328,6 @@
</UML:Operation>
</UML:Classifier.feature>
<UML:Classifier.feature>
- <UML:Attribute name="lsid">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:LSID</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="S32"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Attribute name="tplc">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>4</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:TPLC</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="S32"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
<UML:Attribute name="fBuildIn">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 4c40b92..a7fbee9 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -23574,9 +23574,9 @@
</resource>
<resource name="CT_AbstractNum" resource="Properties" tag="numbering">
<kind name="paragraph"/>
- <element name="nsid" tokenid="rtf:LSID"/>
+ <element name="nsid" tokenid="ooxml:CT_AbstractNum_nsid"/>
<element name="multiLevelType" tokenid="ooxml:CT_AbstractNum_multiLevelType"/>
- <element name="tmpl" tokenid="rtf:TPLC"/>
+ <element name="tmpl" tokenid="ooxml:CT_AbstractNum_tmpl"/>
<element name="name" tokenid="ooxml:CT_AbstractNum_name"/>
<element name="styleLink" tokenid="ooxml:CT_AbstractNum_styleLink"/>
<element name="numStyleLink" tokenid="ooxml:CT_AbstractNum_numStyleLink"/>
@@ -23659,7 +23659,7 @@
<attribute name="default" tokenid="ooxml:CT_Style_default"/>
<attribute name="customStyle" tokenid="ooxml:CT_Style_customStyle"/>
</resource>
- <resource name="CT_Styles" resource="Table" tokenid="rtf:STYLESHEET" tag="style"/>
+ <resource name="CT_Styles" resource="Table" tokenid="ooxml:STYLESHEET" tag="style"/>
<resource name="ST_Panose" resource="Hex"/>
<resource name="CT_Panose" resource="Value" tag="font">
<attribute name="val" tokenid="ooxml:CT_Panose_val" action="setValue"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4278bdb..3b45b93 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2708,7 +2708,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_PNLVLBODY:
{
RTFValue::Pointer_t pValue(new RTFValue(2));
- m_aStates.top().aTableAttributes.set(NS_rtf::LN_LSID, pValue);
+ m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_AbstractNum_nsid, pValue);
}
break;
case RTF_PNDEC:
@@ -2719,7 +2719,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
break;
case RTF_PNLVLBLT:
{
- m_aStates.top().aTableAttributes.set(NS_rtf::LN_LSID, RTFValue::Pointer_t(new RTFValue(1)));
+ m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_AbstractNum_nsid, RTFValue::Pointer_t(new RTFValue(1)));
m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_numFmt, RTFValue::Pointer_t(new RTFValue(23))); // bullets, same as \levelnfc23
}
break;
@@ -3159,7 +3159,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
case RTF_LS:
{
if (m_aStates.top().nDestinationState == DESTINATION_LISTOVERRIDEENTRY)
- m_aStates.top().aTableAttributes.set(NS_rtf::LN_LSID, pIntValue);
+ m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_AbstractNum_nsid, pIntValue);
else
lcl_putNestedSprm(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PPrBase_tabs, NS_sprm::LN_PIlfo, pIntValue);
}
@@ -4551,7 +4551,7 @@ int RTFDocumentImpl::popState()
break;
case DESTINATION_PARAGRAPHNUMBERING:
{
- RTFValue::Pointer_t pIdValue = aState.aTableAttributes.find(NS_rtf::LN_LSID);
+ RTFValue::Pointer_t pIdValue = aState.aTableAttributes.find(NS_ooxml::LN_CT_AbstractNum_nsid);
if (pIdValue.get())
{
// Abstract numbering
@@ -4600,7 +4600,7 @@ int RTFDocumentImpl::popState()
// Numbering
RTFSprms aNumberingAttributes;
RTFSprms aNumberingSprms;
- aNumberingAttributes.set(NS_rtf::LN_LSID, pIdValue);
+ aNumberingAttributes.set(NS_ooxml::LN_CT_AbstractNum_nsid, pIdValue);
aNumberingSprms.set(NS_ooxml::LN_CT_Num_abstractNumId, pIdValue);
RTFValue::Pointer_t pNumberingValue(new RTFValue(aNumberingAttributes, aNumberingSprms));
aListTableSprms.set(NS_ooxml::LN_CT_Numbering_num, pNumberingValue, false);
commit 7b023f523dd6da7527b7685b74d8c6f0e1b61be4
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Dec 30 15:29:36 2013 +0100
writerfilter: unused NS_rtf::LN_{FSHADOW,FFRAME,IBKL,FCONVERTED}
Change-Id: I61dae1364951cb015b3f302bc0d88764748de13c
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index 0012493..0becb84 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -89,10 +89,10 @@ void BorderHandler::lcl_attribute(Id rName, Value & rVal)
m_nLineDistance = ConversionHelper::convertTwipToMM100( nIntValue * 20 );
appendGrabBag("space", OUString::number(nIntValue));
break;
- case NS_rtf::LN_FSHADOW: // 0x2875
+ case NS_ooxml::LN_CT_Border_shadow:
m_bShadow = nIntValue;
break;
- case NS_rtf::LN_FFRAME: // 0x2876
+ case NS_ooxml::LN_CT_Border_frame:
case NS_rtf::LN_UNUSED2_15: // 0x2877
// ignored
break;
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 0580b35..afefbfa 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -329,7 +329,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
break;
case NS_rtf::LN_FIDENTSAV:
break;
- case NS_rtf::LN_FCONVERTED:
+ case NS_ooxml::LN_CT_Lvl_legacy:
break;
case NS_rtf::LN_FTENTATIVE:
break;
@@ -595,9 +595,9 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
break;
case NS_ooxml::LN_CT_Border_space:
break;
- case NS_rtf::LN_FSHADOW:
+ case NS_ooxml::LN_CT_Border_shadow:
break;
- case NS_rtf::LN_FFRAME:
+ case NS_ooxml::LN_CT_Border_frame:
break;
case NS_rtf::LN_UNUSED2_15:
break;
@@ -740,7 +740,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
// sStringValue contains the bookmark name
sLocalBookmarkName = sStringValue;
break;
- case NS_rtf::LN_IBKL:
+ case NS_ooxml::LN_CT_MarkupRangeBookmark_id:
//contains the bookmark identifier - has to be added to the bookmark name imported before
//if it is already available then the bookmark should be inserted
m_pImpl->AddBookmark( sLocalBookmarkName, sStringValue );
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 8d10a9d..6af9300 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -674,10 +674,10 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
case NS_ooxml::LN_CT_Border_space:
m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineDistance = nIntValue;
break;
- case NS_rtf::LN_FSHADOW: // 0x175d
+ case NS_ooxml::LN_CT_Border_shadow:
m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].bHasShadow = nIntValue ? true : false;
break;
- case NS_rtf::LN_FFRAME: // ignored
+ case NS_ooxml::LN_CT_Border_frame: // ignored
case NS_rtf::LN_UNUSED2_15: // ignored
break;
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index d6e17d4..efd463d 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -127,7 +127,7 @@ void ListLevel::SetValue( Id nId, sal_Int32 nValue )
case NS_rtf::LN_FIDENTSAV:
m_nFPrev = nValue;
break;
- case NS_rtf::LN_FCONVERTED:
+ case NS_ooxml::LN_CT_Lvl_legacy:
m_nFPrevSpace = nValue;
break;
case NS_rtf::LN_IXCHFOLLOW:
@@ -777,7 +777,7 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal )
case NS_ooxml::LN_CT_Lvl_isLgl:
case NS_rtf::LN_FNORESTART:
case NS_rtf::LN_FIDENTSAV:
- case NS_rtf::LN_FCONVERTED:
+ case NS_ooxml::LN_CT_Lvl_legacy:
case NS_rtf::LN_IXCHFOLLOW:
if ( pCurrentLvl.get( ) )
pCurrentLvl->SetValue( nName, sal_Int32( nIntValue ) );
@@ -996,7 +996,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
case NS_ooxml::LN_CT_Lvl_isLgl:
case NS_rtf::LN_FNORESTART:
case NS_rtf::LN_FIDENTSAV:
- case NS_rtf::LN_FCONVERTED:
+ case NS_ooxml::LN_CT_Lvl_legacy:
case NS_rtf::LN_IXCHFOLLOW:
if (m_pCurrentDefinition->GetCurrentLevel().get())
m_pCurrentDefinition->GetCurrentLevel( )->SetValue( nSprmId, nIntValue );
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx
index 45a3fd7..d1892f1 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -342,9 +342,9 @@ void TDefTableHandler::lcl_attribute(Id rName, Value & rVal)
appendGrabBag("space", OUString::number(nIntValue));
m_nLineDistance = nIntValue;
break;
- case NS_rtf::LN_FSHADOW: // 0x2875
+ case NS_ooxml::LN_CT_Border_shadow:
//if 1 then line has shadow - unsupported
- case NS_rtf::LN_FFRAME: // 0x2876
+ case NS_ooxml::LN_CT_Border_frame:
case NS_rtf::LN_UNUSED2_15: // 0x2877
// ignored
break;
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 260f8da..8ba1cbe 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -734,64 +734,6 @@
</UML:Attribute>
</UML:Classifier.feature>
<UML:Classifier.feature>
- <UML:Attribute name="fConverted">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>5</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>2</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x4</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>1</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:FCONVERTED</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U8"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
<UML:Attribute name="fTentative">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
@@ -20434,65 +20376,6 @@
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:Classifier.feature>
- <UML:Attribute name="ibkl">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>index to BKL entry in plcfbkl that describes the
- ending position of this bookmark in the CP stream.</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:IBKL</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="S16"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
<UML:Attribute name="itcFirst">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
@@ -21514,123 +21397,6 @@
</UML:Attribute>
</UML:Classifier.feature>
<UML:Classifier.feature>
- <UML:Attribute name="fShadow">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>when 1, border is drawn with shadow. Must be 0 when BRC is a
- substructure of the TC</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x2</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>13</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>2000</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>:1</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:FSHADOW</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U16"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Attribute name="fFrame">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x2</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>14</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>4000</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>:1</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:FFRAME</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U16"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
<UML:Attribute name="unused2_15">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
@@ -22567,65 +22333,6 @@
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:Classifier.feature>
- <UML:Attribute name="ibkl">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>index to BKL entry in plcfbkl that describes the
- ending position of this bookmark in the CP stream.</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:IBKL</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="S16"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
<UML:Attribute name="itcFirst">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 19fa89e..4c40b92 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -21689,8 +21689,8 @@
<attribute name="themeShade" tokenid="ooxml:CT_Border_themeShade"/>
<attribute name="sz" tokenid="ooxml:CT_Border_sz"/>
<attribute name="space" tokenid="ooxml:CT_Border_space"/>
- <attribute name="shadow" tokenid="rtf:FSHADOW"/>
- <attribute name="frame" tokenid="rtf:FFRAME"/>
+ <attribute name="shadow" tokenid="ooxml:CT_Border_shadow"/>
+ <attribute name="frame" tokenid="ooxml:CT_Border_frame"/>
</resource>
<!-- This DOCX values will be mapped to match the 'DOC' values that are defined here: -->
<!-- http://msdn.microsoft.com/en-us/library/dd945712(v=office.12).aspx -->
@@ -22101,7 +22101,7 @@
<attribute name="displacedByCustomXml" tokenid="ooxml:CT_MarkupRange_displacedByCustomXml"/>
</resource>
<resource name="CT_MarkupRangeBookmark" resource="Properties" tag="redline">
- <attribute name="id" tokenid="rtf:IBKL"/>
+ <attribute name="id" tokenid="ooxml:CT_MarkupRangeBookmark_id"/>
</resource>
<resource name="CT_MarkupRangeCommentStart" resource="Properties" tag="content">
<attribute name="id" tokenid="ooxml:EG_RangeMarkupElements_commentRangeStart"/>
@@ -23551,7 +23551,7 @@
<element name="suff" tokenid="ooxml:CT_Lvl_suff"/>
<element name="lvlText" tokenid="ooxml:CT_Lvl_lvlText"/>
<element name="lvlPicBulletId" tokenid="ooxml:CT_Lvl_lvlPicBulletId"/>
- <element name="legacy" tokenid="rtf:FCONVERTED"/>
+ <element name="legacy" tokenid="ooxml:CT_Lvl_legacy"/>
<element name="lvlJc" tokenid="ooxml:CT_Lvl_lvlJc"/>
<element name="pPr" tokenid="ooxml:CT_Lvl_pPr"/>
<element name="rPr" tokenid="ooxml:CT_Lvl_rPr"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index de8efb7..4278bdb 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -176,7 +176,7 @@ static writerfilter::Reference<Properties>::Pointer_t lcl_getBookmarkProperties(
RTFValue::Pointer_t pString(new RTFValue(rString));
aAttributes.set(NS_ooxml::LN_CT_Bookmark_name, pString);
}
- aAttributes.set(NS_rtf::LN_IBKL, pPos);
+ aAttributes.set(NS_ooxml::LN_CT_MarkupRangeBookmark_id, pPos);
return writerfilter::Reference<Properties>::Pointer_t(new RTFReferenceProperties(aAttributes));
}
@@ -2755,7 +2755,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
m_aSettingsTableSprms.set(NS_ooxml::LN_CT_Settings_trackRevisions, RTFValue::Pointer_t(new RTFValue(1)));
break;
case RTF_BRDRSH:
- lcl_putBorderProperty(m_aStates, NS_rtf::LN_FSHADOW, RTFValue::Pointer_t(new RTFValue(1)));
+ lcl_putBorderProperty(m_aStates, NS_ooxml::LN_CT_Border_shadow, RTFValue::Pointer_t(new RTFValue(1)));
break;
default:
{
commit 791603f68648d84cf5a15fcdb0091ea7786729ed
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Dec 30 14:58:44 2013 +0100
writerfilter: unused NS_rtf::LN_{FLEGAL,BRCTYPE,DPTLINEWIDTH,DPTSPACE}
Change-Id: Ia88c495cf83081fecfa95916fd76cfdf04d08014
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index ec35fce..0012493 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -71,12 +71,12 @@ void BorderHandler::lcl_attribute(Id rName, Value & rVal)
}
}
break;
- case NS_rtf::LN_DPTLINEWIDTH: // 0x2871
+ case NS_ooxml::LN_CT_Border_sz:
// width of a single line in 1/8 pt, max of 32 pt -> twip * 5 / 2.
m_nLineWidth = nIntValue * 5 / 2;
appendGrabBag("sz", OUString::number(nIntValue));
break;
- case NS_rtf::LN_BRCTYPE: // 0x2872
+ case NS_ooxml::LN_CT_Border_val:
m_nLineType = nIntValue;
appendGrabBag("val", TDefTableHandler::getBorderTypeString(nIntValue));
break;
@@ -85,7 +85,7 @@ void BorderHandler::lcl_attribute(Id rName, Value & rVal)
m_nLineColor = nIntValue;
appendGrabBag("color", OStringToOUString(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true), RTL_TEXTENCODING_UTF8));
break;
- case NS_rtf::LN_DPTSPACE: // border distance in points
+ case NS_ooxml::LN_CT_Border_space: // border distance in points
m_nLineDistance = ConversionHelper::convertTwipToMM100( nIntValue * 20 );
appendGrabBag("space", OUString::number(nIntValue));
break;
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index f3151e7..0580b35 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -323,7 +323,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
break;
case NS_ooxml::LN_CT_Lvl_numFmt:
break;
- case NS_rtf::LN_FLEGAL:
+ case NS_ooxml::LN_CT_Lvl_isLgl:
break;
case NS_rtf::LN_FNORESTART:
break;
@@ -587,13 +587,13 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
break;
case NS_rtf::LN_SHDPATTERN:
break;
- case NS_rtf::LN_DPTLINEWIDTH:
+ case NS_ooxml::LN_CT_Border_sz:
break;
- case NS_rtf::LN_BRCTYPE:
+ case NS_ooxml::LN_CT_Border_val:
break;
case NS_rtf::LN_ICO:
break;
- case NS_rtf::LN_DPTSPACE:
+ case NS_ooxml::LN_CT_Border_space:
break;
case NS_rtf::LN_FSHADOW:
break;
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 501a6be..8d10a9d 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -662,16 +662,16 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
case NS_rtf::LN_shpblipbname :
break;
- case NS_rtf::LN_DPTLINEWIDTH: // 0x1759
+ case NS_ooxml::LN_CT_Border_sz:
m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineWidth = nIntValue;
break;
- case NS_rtf::LN_BRCTYPE: // 0x175a
+ case NS_ooxml::LN_CT_Border_val:
//graphic borders don't support different line types
break;
case NS_rtf::LN_ICO: // 0x175b
m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineColor = ConversionHelper::ConvertColor( nIntValue );
break;
- case NS_rtf::LN_DPTSPACE: // 0x175c
+ case NS_ooxml::LN_CT_Border_space:
m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineDistance = nIntValue;
break;
case NS_rtf::LN_FSHADOW: // 0x175d
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index a8ef3ad..d6e17d4 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -118,7 +118,7 @@ void ListLevel::SetValue( Id nId, sal_Int32 nValue )
case NS_rtf::LN_JC:
m_nJC = nValue;
break;
- case NS_rtf::LN_FLEGAL:
+ case NS_ooxml::LN_CT_Lvl_isLgl:
m_nFLegal = nValue;
break;
case NS_rtf::LN_FNORESTART:
@@ -774,7 +774,7 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal )
case NS_ooxml::LN_CT_Lvl_start:
case NS_ooxml::LN_CT_Lvl_numFmt:
case NS_rtf::LN_JC:
- case NS_rtf::LN_FLEGAL:
+ case NS_ooxml::LN_CT_Lvl_isLgl:
case NS_rtf::LN_FNORESTART:
case NS_rtf::LN_FIDENTSAV:
case NS_rtf::LN_FCONVERTED:
@@ -993,7 +993,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
case NS_ooxml::LN_CT_Lvl_start:
case NS_ooxml::LN_CT_Lvl_numFmt:
case NS_rtf::LN_JC:
- case NS_rtf::LN_FLEGAL:
+ case NS_ooxml::LN_CT_Lvl_isLgl:
case NS_rtf::LN_FNORESTART:
case NS_rtf::LN_FIDENTSAV:
case NS_rtf::LN_FCONVERTED:
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx
index fa71805..45a3fd7 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -324,13 +324,12 @@ void TDefTableHandler::lcl_attribute(Id rName, Value & rVal)
localResolve( rName, pProperties );
}
break;
- //from LN_BRCXXXX - handled within the BorderHandler
- case NS_rtf::LN_DPTLINEWIDTH: // 0x2871
+ case NS_ooxml::LN_CT_Border_sz:
// width of a single line in 1/8 pt, max of 32 pt -> twip * 5 / 2.
m_nLineWidth = nIntValue * 5 / 2;
appendGrabBag("sz", OUString::number(nIntValue));
break;
- case NS_rtf::LN_BRCTYPE: // 0x2872
+ case NS_ooxml::LN_CT_Border_val:
m_nLineType = nIntValue;
appendGrabBag("val", TDefTableHandler::getBorderTypeString(nIntValue));
break;
@@ -339,7 +338,7 @@ void TDefTableHandler::lcl_attribute(Id rName, Value & rVal)
appendGrabBag("color", OStringToOUString(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true), RTL_TEXTENCODING_UTF8));
m_nLineColor = nIntValue;
break;
- case NS_rtf::LN_DPTSPACE: // 0x2874
+ case NS_ooxml::LN_CT_Border_space:
appendGrabBag("space", OUString::number(nIntValue));
m_nLineDistance = nIntValue;
break;
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index c2a2610..260f8da 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -618,64 +618,6 @@
</UML:Attribute>
</UML:Classifier.feature>
<UML:Classifier.feature>
- <UML:Attribute name="fLegel">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>5</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>5</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x20</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>1</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:FLEGAL</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U8"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
<UML:Attribute name="fNoRestart">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
@@ -21514,149 +21456,6 @@
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:Classifier.feature>
- <UML:Attribute name="dptLineWidth">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>width of a single line in 1/8 pt, max of 32 pt.</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>00FF</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>:8</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:DPTLINEWIDTH</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U16"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Attribute name="brcType">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>border type code:
- 0 none
- 1 single
- 2 thick
- 3 double
- 5 hairline
- 6 dot
- 7 dash large gap
- 8 dot dash
- 9 dot dot dash
- 10 triple
- 11 thin-thick small gap
- 12 thick-thin small gap
- 13 thin-thick-thin small gap
- 14 thin-thick medium gap
- 15 thick-thin medium gap
- 16 thin-thick-thin medium gap
- 17 thin-thick large gap
- 18 thick-thin large gap
- 19 thin-thick-thin large gap
- 20 wave
- 21 double wave
- 22 dash small gap
- 23 dash dot stroked
- 24 emboss 3D
- 25 engrave 3D
- codes 64 - 230 represent border art types and are used only for
- page borders.</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>8</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>FF00</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>:8</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:BRCTYPE</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U16"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
<UML:Attribute name="ico">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
@@ -21715,66 +21514,6 @@
</UML:Attribute>
</UML:Classifier.feature>
<UML:Classifier.feature>
- <UML:Attribute name="dptSpace">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>width of space to maintain between border and text within
- border. Must be 0 when BRC is a substructure of TC. Stored in
- points.</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x2</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>8</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>1F00</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>:5</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:DPTSPACE</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U16"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
<UML:Attribute name="fShadow">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 9d6b17f..19fa89e 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -21682,13 +21682,13 @@
<value tokenid="227">zigZagStitch</value>
</resource>
<resource name="CT_Border" resource="Properties" tag="attribute">
- <attribute name="val" tokenid="rtf:BRCTYPE"/>
+ <attribute name="val" tokenid="ooxml:CT_Border_val"/>
<attribute name="color" tokenid="ooxml:CT_Border_color"/>
<attribute name="themeColor" tokenid="ooxml:CT_Border_themeColor"/>
<attribute name="themeTint" tokenid="ooxml:CT_Border_themeTint"/>
<attribute name="themeShade" tokenid="ooxml:CT_Border_themeShade"/>
- <attribute name="sz" tokenid="rtf:DPTLINEWIDTH"/>
- <attribute name="space" tokenid="rtf:DPTSPACE"/>
+ <attribute name="sz" tokenid="ooxml:CT_Border_sz"/>
+ <attribute name="space" tokenid="ooxml:CT_Border_space"/>
<attribute name="shadow" tokenid="rtf:FSHADOW"/>
<attribute name="frame" tokenid="rtf:FFRAME"/>
</resource>
@@ -23547,7 +23547,7 @@
<element name="numFmt" tokenid="ooxml:CT_Lvl_numFmt"/>
<element name="lvlRestart" tokenid="ooxml:CT_Lvl_lvlRestart"/>
<element name="pStyle" tokenid="ooxml:CT_Lvl_pStyle"/>
- <element name="isLgl" tokenid="rtf:FLEGAL"/>
+ <element name="isLgl" tokenid="ooxml:CT_Lvl_isLgl"/>
<element name="suff" tokenid="ooxml:CT_Lvl_suff"/>
<element name="lvlText" tokenid="ooxml:CT_Lvl_lvlText"/>
<element name="lvlPicBulletId" tokenid="ooxml:CT_Lvl_lvlPicBulletId"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 0eba6b7..de8efb7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2148,7 +2148,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
if (nParam >= 0)
{
RTFValue::Pointer_t pValue(new RTFValue(nParam));
- lcl_putBorderProperty(m_aStates, NS_rtf::LN_BRCTYPE, pValue);
+ lcl_putBorderProperty(m_aStates, NS_ooxml::LN_CT_Border_val, pValue);
return 0;
}
}
@@ -3118,7 +3118,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
if (nParam > 1)
nParam = nParam * 2 / 5;
RTFValue::Pointer_t pValue(new RTFValue(nParam));
- lcl_putBorderProperty(m_aStates, NS_rtf::LN_DPTLINEWIDTH, pValue);
+ lcl_putBorderProperty(m_aStates, NS_ooxml::LN_CT_Border_sz, pValue);
}
break;
case RTF_BRDRCF:
@@ -3131,7 +3131,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
{
// dmapper expects it in points, we have it in twip
RTFValue::Pointer_t pValue(new RTFValue(nParam / 20));
- lcl_putBorderProperty(m_aStates, NS_rtf::LN_DPTSPACE, pValue);
+ lcl_putBorderProperty(m_aStates, NS_ooxml::LN_CT_Border_space, pValue);
}
break;
case RTF_TX:
More information about the Libreoffice-commits
mailing list