writerfilter/source/dmapper/ConversionHelper.cxx | 4
writerfilter/source/dmapper/ConversionHelper.hxx | 2
writerfilter/source/dmapper/DomainMapper.cxx | 6
writerfilter/source/dmapper/NumberingManager.cxx | 12 -
writerfilter/source/dmapper/NumberingManager.hxx | 4
writerfilter/source/doctok/resources.xmi | 190 -----------------------
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 12 -
writerfilter/source/ooxml/model.xml | 12 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 22 +-
9 files changed, 37 insertions(+), 227 deletions(-)
New commits:
commit 4b710225818e66917ef19ebf68d5e08223a13c2f
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Dec 29 14:26:51 2013 +0100
writerfilter: remove unused NFC in doctok
Change-Id: I224d6192d3e98172b76311a870c48493928ff900
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx
b/writerfilter/source/dmapper/ConversionHelper.cxx
index e6eadf3..102e5c8 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -270,10 +270,10 @@ sal_Int16 convertTableJustification( sal_Int32 nIntValue )
return nOrient;
}
-sal_Int16 ConvertNumberingType(sal_Int32 nNFC)
+sal_Int16 ConvertNumberingType(sal_Int32 nFmt)
{
sal_Int16 nRet;
- switch(nNFC)
+ switch(nFmt)
{
case NS_ooxml::LN_Value_ST_NumberFormat_decimal:
case 0:
diff --git a/writerfilter/source/dmapper/ConversionHelper.hxx
b/writerfilter/source/dmapper/ConversionHelper.hxx
index b23872b..352d29f 100644
--- a/writerfilter/source/dmapper/ConversionHelper.hxx
+++ b/writerfilter/source/dmapper/ConversionHelper.hxx
@@ -48,7 +48,7 @@ namespace ConversionHelper{
sal_Int32 convertEMUToMM100(sal_Int32 _t);
sal_Int32 ConvertColor(sal_Int32 nWordColor );
sal_Int16 convertTableJustification( sal_Int32 nIntValue );
- sal_Int16 ConvertNumberingType(sal_Int32 nNFC);
+ sal_Int16 ConvertNumberingType(sal_Int32 nFmt);
} // namespace ConversionHelper
} //namespace dmapper
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 1f3017a..f3151e7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -321,7 +321,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
break;
case NS_ooxml::LN_CT_Lvl_start:
break;
- case NS_rtf::LN_NFC:
+ case NS_ooxml::LN_CT_Lvl_numFmt:
break;
case NS_rtf::LN_FLEGAL:
break;
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index e74fc99..a8ef3ad 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -112,7 +112,7 @@ void ListLevel::SetValue( Id nId, sal_Int32 nValue )
case NS_ooxml::LN_CT_Lvl_start:
m_nIStartAt = nValue;
break;
- case NS_rtf::LN_NFC:
+ case NS_ooxml::LN_CT_Lvl_numFmt:
m_nNFC = nValue;
break;
case NS_rtf::LN_JC:
@@ -772,7 +772,7 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal )
}
break;
case NS_ooxml::LN_CT_Lvl_start:
- case NS_rtf::LN_NFC:
+ case NS_ooxml::LN_CT_Lvl_numFmt:
case NS_rtf::LN_JC:
case NS_rtf::LN_FLEGAL:
case NS_rtf::LN_FNORESTART:
@@ -991,7 +991,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
break;
case NS_rtf::LN_RGBXCHNUMS: break;
case NS_ooxml::LN_CT_Lvl_start:
- case NS_rtf::LN_NFC:
+ case NS_ooxml::LN_CT_Lvl_numFmt:
case NS_rtf::LN_JC:
case NS_rtf::LN_FLEGAL:
case NS_rtf::LN_FNORESTART:
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx
b/writerfilter/source/dmapper/NumberingManager.hxx
index b3dcf96..d4bc418 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -43,7 +43,7 @@ class StyleSheetEntry;
class ListLevel : public PropertyMap
{
sal_Int32 m_nIStartAt;
//LN_CT_Lvl_start
- sal_Int32 m_nNFC; //LN_NFC
+ sal_Int32 m_nNFC;
//LN_CT_Lvl_numFmt
sal_Int32 m_nJC; //LN_JC
sal_Int32 m_nFLegal;
//LN_FLEGAL
sal_Int32 m_nFNoRestart;
//LN_FNORESTART
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index 233db08..ad50f51 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -560,64 +560,6 @@
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:Classifier.feature>
- <UML:Attribute name="nfc">
- <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:NFC</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="jc">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index fa5635a..9d6b17f 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -23544,7 +23544,7 @@
<resource name="CT_Lvl" resource="Properties" tag="numbering">
<kind name="paragraph"/>
<element name="start" tokenid="ooxml:CT_Lvl_start"/>
- <element name="numFmt" tokenid="rtf:NFC"/>
+ <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"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index bf45476..0eba6b7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2714,13 +2714,13 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_PNDEC:
{
RTFValue::Pointer_t pValue(new RTFValue(0)); // decimal,
same as \levelnfc0
- m_aStates.top().aTableSprms.set(NS_rtf::LN_NFC, pValue);
+
m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_numFmt, pValue);
}
break;
case RTF_PNLVLBLT:
{
m_aStates.top().aTableAttributes.set(NS_rtf::LN_LSID,
RTFValue::Pointer_t(new RTFValue(1)));
- m_aStates.top().aTableSprms.set(NS_rtf::LN_NFC,
RTFValue::Pointer_t(new RTFValue(23))); // bullets, same as \levelnfc23
+
m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_numFmt,
RTFValue::Pointer_t(new RTFValue(23))); // bullets, same as \levelnfc23
}
break;
case RTF_LANDSCAPE:
@@ -2779,7 +2779,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
{
case RTF_FPRQ: nSprm = NS_rtf::LN_PRQ; break;
case RTF_LEVELJC: nSprm = NS_ooxml::LN_CT_Lvl_lvlJc; break;
- case RTF_LEVELNFC: nSprm = NS_rtf::LN_NFC; break;
+ case RTF_LEVELNFC: nSprm = NS_ooxml::LN_CT_Lvl_numFmt; break;
case RTF_LEVELSTARTAT: nSprm = NS_ooxml::LN_CT_Lvl_start; break;
case RTF_LEVELPICTURE: nSprm = NS_ooxml::LN_CT_Lvl_lvlPicBulletId;
break;
default: break;
@@ -4572,9 +4572,9 @@ int RTFDocumentImpl::popState()
RTFValue::Pointer_t pIlvlValue(new RTFValue(0));
aLevelAttributes.set(NS_ooxml::LN_CT_Lvl_ilvl, pIlvlValue);
- RTFValue::Pointer_t pNfcValue =
aState.aTableSprms.find(NS_rtf::LN_NFC);
- if (pNfcValue.get())
- aLevelSprms.set(NS_rtf::LN_NFC, pNfcValue);
+ RTFValue::Pointer_t pFmtValue =
aState.aTableSprms.find(NS_ooxml::LN_CT_Lvl_numFmt);
+ if (pFmtValue.get())
+ aLevelSprms.set(NS_ooxml::LN_CT_Lvl_numFmt, pFmtValue);
RTFValue::Pointer_t pStartatValue =
aState.aTableSprms.find(NS_ooxml::LN_CT_Lvl_start);
if (pStartatValue.get())
commit dd43df8845cc0eb334e4c74a4d344d49077d987c
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Dec 29 14:21:01 2013 +0100
writerfilter: remove unused ISTARTAT in doctok
Change-Id: I28124d68c195cbe5850e97af004ae5e6dc523f4a
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index e71da4d..1f3017a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -319,7 +319,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
}
}
break;
- case NS_rtf::LN_ISTARTAT:
+ case NS_ooxml::LN_CT_Lvl_start:
break;
case NS_rtf::LN_NFC:
break;
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 7a1787c..e74fc99 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -109,7 +109,7 @@ void ListLevel::SetValue( Id nId, sal_Int32 nValue )
{
switch( nId )
{
- case NS_rtf::LN_ISTARTAT:
+ case NS_ooxml::LN_CT_Lvl_start:
m_nIStartAt = nValue;
break;
case NS_rtf::LN_NFC:
@@ -771,7 +771,7 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal )
pCurrentLvl->SetBulletChar( rVal.getString() );
}
break;
- case NS_rtf::LN_ISTARTAT:
+ case NS_ooxml::LN_CT_Lvl_start:
case NS_rtf::LN_NFC:
case NS_rtf::LN_JC:
case NS_rtf::LN_FLEGAL:
@@ -990,7 +990,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
}
break;
case NS_rtf::LN_RGBXCHNUMS: break;
- case NS_rtf::LN_ISTARTAT:
+ case NS_ooxml::LN_CT_Lvl_start:
case NS_rtf::LN_NFC:
case NS_rtf::LN_JC:
case NS_rtf::LN_FLEGAL:
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx
b/writerfilter/source/dmapper/NumberingManager.hxx
index d04d0f9..b3dcf96 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -42,7 +42,7 @@ class StyleSheetEntry;
*/
class ListLevel : public PropertyMap
{
- sal_Int32 m_nIStartAt;
//LN_ISTARTAT
+ sal_Int32 m_nIStartAt;
//LN_CT_Lvl_start
sal_Int32 m_nNFC; //LN_NFC
sal_Int32 m_nJC; //LN_JC
sal_Int32 m_nFLegal;
//LN_FLEGAL
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index 72580b9..233db08 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -560,64 +560,6 @@
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:Classifier.feature>
- <UML:Attribute name="iStartAt">
- <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:ISTARTAT</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="U32"/>
- </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="nfc">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
@@ -2284,65 +2226,6 @@
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:Classifier.feature>
- <UML:Attribute name="iStartAt">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>start-at value if fFormatting ==
false and fStartAt == true.
- (if fFormatting == true, the start-at is stored in the
LVL)</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>4</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:ISTARTAT</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="ilvl">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 39d877f..fa5635a 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -23543,7 +23543,7 @@
</resource>
<resource name="CT_Lvl" resource="Properties" tag="numbering">
<kind name="paragraph"/>
- <element name="start" tokenid="rtf:ISTARTAT"/>
+ <element name="start" tokenid="ooxml:CT_Lvl_start"/>
<element name="numFmt" tokenid="rtf:NFC"/>
<element name="lvlRestart" tokenid="ooxml:CT_Lvl_lvlRestart"/>
<element name="pStyle" tokenid="ooxml:CT_Lvl_pStyle"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 9939f62..bf45476 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2780,7 +2780,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
case RTF_FPRQ: nSprm = NS_rtf::LN_PRQ; break;
case RTF_LEVELJC: nSprm = NS_ooxml::LN_CT_Lvl_lvlJc; break;
case RTF_LEVELNFC: nSprm = NS_rtf::LN_NFC; break;
- case RTF_LEVELSTARTAT: nSprm = NS_rtf::LN_ISTARTAT; break;
+ case RTF_LEVELSTARTAT: nSprm = NS_ooxml::LN_CT_Lvl_start; break;
case RTF_LEVELPICTURE: nSprm = NS_ooxml::LN_CT_Lvl_lvlPicBulletId;
break;
default: break;
}
@@ -3542,7 +3542,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
m_aStates.top().aDrawingObject.nBottom = TWIP_TO_MM100(nParam);
break;
case RTF_PNSTART:
- m_aStates.top().aTableSprms.set(NS_rtf::LN_ISTARTAT, pIntValue);
+ m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_start,
pIntValue);
break;
case RTF_PNF:
{
@@ -4576,9 +4576,9 @@ int RTFDocumentImpl::popState()
if (pNfcValue.get())
aLevelSprms.set(NS_rtf::LN_NFC, pNfcValue);
- RTFValue::Pointer_t pStartatValue =
aState.aTableSprms.find(NS_rtf::LN_ISTARTAT);
+ RTFValue::Pointer_t pStartatValue =
aState.aTableSprms.find(NS_ooxml::LN_CT_Lvl_start);
if (pStartatValue.get())
- aLevelSprms.set(NS_rtf::LN_ISTARTAT, pStartatValue);
+ aLevelSprms.set(NS_ooxml::LN_CT_Lvl_start,
pStartatValue);
RTFValue::Pointer_t pLeveltextValue(new
RTFValue(aLeveltextAttributes));
aLevelSprms.set(NS_ooxml::LN_CT_Lvl_lvlText,
pLeveltextValue);
commit b2b13057ecd8c2fc999549bbc0358a0551fb5b15
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Dec 29 14:10:49 2013 +0100
writerfilter: remove unused BOOKMARKNAME in doctok
Change-Id: If2d1a6eaa0939fe6e9012f4324f2b69ba7d798d4
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 48278e3..e71da4d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -736,7 +736,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
break;
case NS_rtf::LN_endnote:
break;
- case NS_rtf::LN_BOOKMARKNAME:
+ case NS_ooxml::LN_CT_Bookmark_name:
// sStringValue contains the bookmark name
sLocalBookmarkName = sStringValue;
break;
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index 4928196..72580b9 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -329,21 +329,6 @@
</UML:Attribute>
</UML:Classifier.feature>
<UML:Classifier.feature>
- <UML:Attribute name="bookmarkname">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
-
<UML:TaggedValue.dataValue>rtf:BOOKMARKNAME</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
<UML:Attribute name="XAlign">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 8e1f6d1..39d877f 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22116,7 +22116,7 @@
</resource>
<resource name="CT_Bookmark" resource="Properties" tag="reference">
<type name="Bookmark"/>
- <attribute name="name" tokenid="rtf:BOOKMARKNAME"/>
+ <attribute name="name" tokenid="ooxml:CT_Bookmark_name"/>
</resource>
<resource name="CT_MoveBookmark" resource="Properties" tag="reference">
<attribute name="author" tokenid="ooxml:CT_MoveBookmark_author"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 2e56c62..9939f62 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -174,7 +174,7 @@ static writerfilter::Reference<Properties>::Pointer_t
lcl_getBookmarkProperties(
{
// If present, this should be sent first.
RTFValue::Pointer_t pString(new RTFValue(rString));
- aAttributes.set(NS_rtf::LN_BOOKMARKNAME, pString);
+ aAttributes.set(NS_ooxml::LN_CT_Bookmark_name, pString);
}
aAttributes.set(NS_rtf::LN_IBKL, pPos);
return writerfilter::Reference<Properties>::Pointer_t(new
RTFReferenceProperties(aAttributes));
commit 5509b65710e83a95a89a4559ce54d30de78d19b7
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Dec 29 14:06:51 2013 +0100
writerfilter: ST_HrdFtr -> ST_HdrFtr
Change-Id: I78d4e9a3916eeda83f73fb416aafd07e25253be4
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index a746dbf..a5847ea 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -376,13 +376,13 @@ void OOXMLDocumentImpl::resolveHeader(Stream & rStream,
getSubStream(rId);
switch (type)
{
- case NS_ooxml::LN_Value_ST_HrdFtr_even:
+ case NS_ooxml::LN_Value_ST_HdrFtr_even:
resolveFastSubStreamWithId(rStream, pStream, NS_rtf::LN_headerl);
break;
- case NS_ooxml::LN_Value_ST_HrdFtr_default: // here we assume that default
is right, but not necessarily true :-(
+ case NS_ooxml::LN_Value_ST_HdrFtr_default: // here we assume that default
is right, but not necessarily true :-(
resolveFastSubStreamWithId(rStream, pStream, NS_rtf::LN_headerr);
break;
- case NS_ooxml::LN_Value_ST_HrdFtr_first:
+ case NS_ooxml::LN_Value_ST_HdrFtr_first:
resolveFastSubStreamWithId(rStream, pStream, NS_rtf::LN_headerf);
break;
default:
@@ -399,13 +399,13 @@ void OOXMLDocumentImpl::resolveFooter(Stream & rStream,
switch (type)
{
- case NS_ooxml::LN_Value_ST_HrdFtr_even:
+ case NS_ooxml::LN_Value_ST_HdrFtr_even:
resolveFastSubStreamWithId(rStream, pStream, NS_rtf::LN_footerl);
break;
- case NS_ooxml::LN_Value_ST_HrdFtr_default: // here we assume that default
is right, but not necessarily true :-(
+ case NS_ooxml::LN_Value_ST_HdrFtr_default: // here we assume that default
is right, but not necessarily true :-(
resolveFastSubStreamWithId(rStream, pStream, NS_rtf::LN_footerr);
break;
- case NS_ooxml::LN_Value_ST_HrdFtr_first:
+ case NS_ooxml::LN_Value_ST_HdrFtr_first:
resolveFastSubStreamWithId(rStream, pStream, NS_rtf::LN_footerf);
break;
default:
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 98580c0..8e1f6d1 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22564,9 +22564,9 @@
<attribute name="charSpace" tokenid="ooxml:CT_DocGrid_charSpace"/>
</resource>
<resource name="ST_HdrFtr" resource="List">
- <value tokenid="ooxml:Value_ST_HrdFtr_even">even</value>
- <value tokenid="ooxml:Value_ST_HrdFtr_default">default</value>
- <value tokenid="ooxml:Value_ST_HrdFtr_first">first</value>
+ <value tokenid="ooxml:Value_ST_HdrFtr_even">even</value>
+ <value tokenid="ooxml:Value_ST_HdrFtr_default">default</value>
+ <value tokenid="ooxml:Value_ST_HdrFtr_first">first</value>
</resource>
<resource name="ST_FtnEdn" resource="List" generated="yes">
<value name="normal"
tokenid="ooxml:Value_wordprocessingml_ST_FtnEdn_normal">normal</value>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
