[Libreoffice-commits] core.git: writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Sun Feb 16 18:07:07 CET 2014
writerfilter/source/dmapper/DomainMapper.cxx | 26 +++++-----
writerfilter/source/doctok/resources.xmi | 60 -------------------------
writerfilter/source/ooxml/model.xml | 8 +--
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2
4 files changed, 18 insertions(+), 78 deletions(-)
New commits:
commit 6570eec5da5dc574c4fc2c10a96c46bb3c7309c9
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sun Feb 16 18:02:00 2014 +0100
writerfilter: PBrc{Top,Left,Bottom,Right} -> CT_PBdr_{top,left,bottom,right}
Change-Id: I955d905dfccb4b02afebbf0552a55713dc22e49c
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 229da91..c403675 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1091,10 +1091,10 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
case NS_ooxml::LN_CT_PrBase_pBdr: //paragraph border
resolveSprmProps(*this, rSprm);
break;
- case NS_sprm::LN_PBrcTop: // sprmPBrcTop
- case NS_sprm::LN_PBrcLeft: // sprmPBrcLeft
- case NS_sprm::LN_PBrcBottom: // sprmPBrcBottom
- case NS_sprm::LN_PBrcRight: // sprmPBrcRight
+ case NS_ooxml::LN_CT_PBdr_top:
+ case NS_ooxml::LN_CT_PBdr_left:
+ case NS_ooxml::LN_CT_PBdr_bottom:
+ case NS_ooxml::LN_CT_PBdr_right:
case NS_sprm::LN_PBrcBetween: // sprmPBrcBetween
{
//in binary format the borders are directly provided in OOXML they are inside of properties
@@ -1109,19 +1109,19 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
PropertyIds eBorderDistId = PropertyIds( 0 );
switch( nSprmId )
{
- case NS_sprm::LN_PBrcTop:
+ case NS_ooxml::LN_CT_PBdr_top:
eBorderId = PROP_TOP_BORDER;
eBorderDistId = PROP_TOP_BORDER_DISTANCE;
break;
- case NS_sprm::LN_PBrcLeft:
+ case NS_ooxml::LN_CT_PBdr_left:
eBorderId = PROP_LEFT_BORDER;
eBorderDistId = PROP_LEFT_BORDER_DISTANCE;
break;
- case NS_sprm::LN_PBrcBottom:
+ case NS_ooxml::LN_CT_PBdr_bottom:
eBorderId = PROP_BOTTOM_BORDER ;
eBorderDistId = PROP_BOTTOM_BORDER_DISTANCE;
break;
- case NS_sprm::LN_PBrcRight:
+ case NS_ooxml::LN_CT_PBdr_right:
eBorderId = PROP_RIGHT_BORDER;
eBorderDistId = PROP_RIGHT_BORDER_DISTANCE ;
break;
@@ -1134,7 +1134,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
rContext->Insert( eBorderId, uno::makeAny( pBorderHandler->getBorderLine()) , true);
if(eBorderDistId)
rContext->Insert(eBorderDistId, uno::makeAny( pBorderHandler->getLineDistance()), true);
- if (nSprmId == NS_sprm::LN_PBrcRight && pBorderHandler->getShadow())
+ if (nSprmId == NS_ooxml::LN_CT_PBdr_right && pBorderHandler->getShadow())
{
table::ShadowFormat aFormat = rContext->getShadowFromBorder(pBorderHandler->getBorderLine());
rContext->Insert(PROP_PARA_SHADOW_FORMAT, uno::makeAny(aFormat));
@@ -1152,19 +1152,19 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
case NS_sprm::LN_PBrcBetween: // sprmPBrcBetween
OSL_FAIL( "TODO: inner border is not handled");
break;
- case NS_sprm::LN_PBrcLeft: // sprmPBrcLeft
+ case NS_ooxml::LN_CT_PBdr_left:
eBorderId = PROP_LEFT_BORDER;
eBorderDistId = PROP_LEFT_BORDER_DISTANCE ;
break;
- case NS_sprm::LN_PBrcRight: // sprmPBrcRight
+ case NS_ooxml::LN_CT_PBdr_right:
eBorderId = PROP_RIGHT_BORDER ;
eBorderDistId = PROP_RIGHT_BORDER_DISTANCE ;
break;
- case NS_sprm::LN_PBrcTop: // sprmPBrcTop
+ case NS_ooxml::LN_CT_PBdr_top:
eBorderId = PROP_TOP_BORDER ;
eBorderDistId = PROP_TOP_BORDER_DISTANCE;
break;
- case NS_sprm::LN_PBrcBottom: // sprmPBrcBottom
+ case NS_ooxml::LN_CT_PBdr_bottom:
default:
eBorderId = PROP_BOTTOM_BORDER ;
eBorderDistId = PROP_BOTTOM_BORDER_DISTANCE;
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index c9653fa..8fa5eec 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -1968,66 +1968,6 @@
</UML:ModelElement.taggedValue>
</UML:Class>
<!--SPRM sprmPTableDepth-->
- <!--SPRM sprmPBrcTop-->
- <UML:Class xmi.id="sprmPBrcTop" name="sprmPBrcTop">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x6424</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="sprmcode"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- </UML:Class>
- <!--SPRM sprmPBrcTop-->
- <!--SPRM sprmPBrcLeft-->
- <UML:Class xmi.id="sprmPBrcLeft" name="sprmPBrcLeft">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x6425</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="sprmcode"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- </UML:Class>
- <!--SPRM sprmPBrcLeft-->
- <!--SPRM sprmPBrcBottom-->
- <UML:Class xmi.id="sprmPBrcBottom" name="sprmPBrcBottom">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x6426</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="sprmcode"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- </UML:Class>
- <!--SPRM sprmPBrcBottom-->
- <!--SPRM sprmPBrcRight-->
- <UML:Class xmi.id="sprmPBrcRight" name="sprmPBrcRight">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x6427</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="sprmcode"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- </UML:Class>
- <!--SPRM sprmPBrcRight-->
<!--SPRM sprmPBrcBetween-->
<UML:Class xmi.id="sprmPBrcBetween" name="sprmPBrcBetween">
<UML:ModelElement.stereotype>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 058b761..43e58b0 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22314,10 +22314,10 @@
</resource>
<resource name="CT_PBdr" resource="Properties" tag="paragraph">
<kind name="paragraph"/>
- <element name="top" tokenid="sprm:PBrcTop"/>
- <element name="left" tokenid="sprm:PBrcLeft"/>
- <element name="bottom" tokenid="sprm:PBrcBottom"/>
- <element name="right" tokenid="sprm:PBrcRight"/>
+ <element name="top" tokenid="ooxml:CT_PBdr_top"/>
+ <element name="left" tokenid="ooxml:CT_PBdr_left"/>
+ <element name="bottom" tokenid="ooxml:CT_PBdr_bottom"/>
+ <element name="right" tokenid="ooxml:CT_PBdr_right"/>
<element name="between" tokenid="sprm:PBrcBetween"/>
<element name="bar" tokenid="sprm:PBrcBar"/>
</resource>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index c6f5a999..61c813c 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -73,7 +73,7 @@ static Id lcl_getParagraphBorder(sal_uInt32 nIndex)
{
static const Id aBorderIds[] =
{
- NS_sprm::LN_PBrcTop, NS_sprm::LN_PBrcLeft, NS_sprm::LN_PBrcBottom, NS_sprm::LN_PBrcRight
+ NS_ooxml::LN_CT_PBdr_top, NS_ooxml::LN_CT_PBdr_left, NS_ooxml::LN_CT_PBdr_bottom, NS_ooxml::LN_CT_PBdr_right
};
return aBorderIds[nIndex];
More information about the Libreoffice-commits
mailing list