mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use constants for ST_TabTlc values

Browse Source 
Change-Id: Idd277a770a42d33a9c92f41f0452039eba60b6ce
This commit is contained in:
Miklos Vajna 2014-10-04 13:46:25 +02:00
parent afcb935c93
commit ef24a18e36
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
writerfilter/source/dmapper/DomainMapper.cxx
View File

@ -3341,16 +3341,16 @@ sal_Unicode DomainMapper::getFillCharFromValue(const sal_Int32 nIntValue)
{
switch (nIntValue)
{
case 1: // dot
case NS_ooxml::LN_Value_ST_TabTlc_dot:
return sal_Unicode(0x002e);
case 2: // hyphen
case NS_ooxml::LN_Value_ST_TabTlc_hyphen:
return sal_Unicode(0x002d);
case 3: // underscore
case 4: // heavy FIXME ???
case NS_ooxml::LN_Value_ST_TabTlc_underscore:
case NS_ooxml::LN_Value_ST_TabTlc_heavy: // FIXME ???
return sal_Unicode(0x005f);
case NS_ooxml::LN_Value_ST_TabTlc_middleDot: // middleDot
return sal_Unicode(0x00b7);
case 0: // none
case NS_ooxml::LN_Value_ST_TabTlc_none:
default:
return sal_Unicode(0x0020); // blank space
}

10
writerfilter/source/ooxml/model.xml
View File

@ -17078,11 +17078,11 @@
<value tokenid="ooxml:Value_ST_TabJc_num">num</value>
</resource>
<resource name="ST_TabTlc" resource="List">
<value tokenid="0">none</value>
<value tokenid="1">dot</value>
<value tokenid="2">hyphen</value>
<value tokenid="3">underscore</value>
<value tokenid="4">heavy</value>
<value tokenid="ooxml:Value_ST_TabTlc_none">none</value>
<value tokenid="ooxml:Value_ST_TabTlc_dot">dot</value>
<value tokenid="ooxml:Value_ST_TabTlc_hyphen">hyphen</value>
<value tokenid="ooxml:Value_ST_TabTlc_underscore">underscore</value>
<value tokenid="ooxml:Value_ST_TabTlc_heavy">heavy</value>
<value tokenid="ooxml:Value_ST_TabTlc_middleDot">middleDot</value>
</resource>
<resource name="CT_TabStop" resource="Properties">

10
writerfilter/source/rtftok/rtfdocumentimpl.cxx
View File

@ -2538,22 +2538,22 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
switch (nKeyword)
{
case RTF_TLDOT:
nParam = 1;
nParam = NS_ooxml::LN_Value_ST_TabTlc_dot;
break;
case RTF_TLMDOT:
nParam = NS_ooxml::LN_Value_ST_TabTlc_middleDot;
break;
case RTF_TLHYPH:
nParam = 2;
nParam = NS_ooxml::LN_Value_ST_TabTlc_hyphen;
break;
case RTF_TLUL:
nParam = 3;
nParam = NS_ooxml::LN_Value_ST_TabTlc_underscore;
break;
case RTF_TLTH:
nParam = 2;
nParam = NS_ooxml::LN_Value_ST_TabTlc_hyphen;
break; // thick line is not supported by dmapper, this is just a hack
case RTF_TLEQ:
nParam = 0;
nParam = NS_ooxml::LN_Value_ST_TabTlc_none;
break; // equal sign isn't, either
default:
break;