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

writerfilter: store OOXML tokens in GraphicImport_Impl::nShapeOptionType

Browse Source 
Also remove all WW8 token handling in
GraphicImport::ProcessShapeOptions() that is effectively dead code,
since the OOXML/RTF tokenizers haven't ever produced such tokens.

Change-Id: I7c36b5c13148e855f1aaad98905b802bb77c330b
This commit is contained in:
Miklos Vajna
2013-12-31 12:28:21 +01:00
parent 81f4840c01
commit 19b99af0f5
3 changed files with 5 additions and 1529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
writerfilter/source/dmapper/GraphicImport.cxx
View File

@@ -860,24 +860,7 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
case NS_ooxml::LN_CT_Anchor_distL: // 90985; case NS_ooxml::LN_CT_Anchor_distL: // 90985;
case NS_ooxml::LN_CT_Anchor_distR: // 90986; case NS_ooxml::LN_CT_Anchor_distR: // 90986;
{ {
//redirect to shape option processing m_pImpl->nShapeOptionType = nName;
switch( nName )
{
case NS_ooxml::LN_CT_Anchor_distT: // 90983;
m_pImpl->nShapeOptionType = NS_dff::LN_shpdyWrapDistTop;
break;
case NS_ooxml::LN_CT_Anchor_distB: // 90984;
m_pImpl->nShapeOptionType = NS_dff::LN_shpdyWrapDistBottom;
break;
case NS_ooxml::LN_CT_Anchor_distL: // 90985;
m_pImpl->nShapeOptionType = NS_dff::LN_shpdxWrapDistLeft;
break;
case NS_ooxml::LN_CT_Anchor_distR: // 90986;
m_pImpl->nShapeOptionType = NS_dff::LN_shpdxWrapDistRight;
break;
//m_pImpl->nShapeOptionType = NS_dff::LN_shpcropFromTop
default: ;
}
ProcessShapeOptions(val); ProcessShapeOptions(val);
} }
break; break;
@@ -1109,135 +1092,21 @@ uno::Reference< ::com::sun::star::drawing::XShape> GraphicImport::GetXShapeObjec
void GraphicImport::ProcessShapeOptions(Value& val) void GraphicImport::ProcessShapeOptions(Value& val)
{ {
sal_Int32 nIntValue = val.getInt(); sal_Int32 nIntValue = val.getInt();
sal_Int32 nTwipValue = ConversionHelper::convertTwipToMM100(nIntValue);
switch( m_pImpl->nShapeOptionType ) switch( m_pImpl->nShapeOptionType )
{ {
case NS_dff::LN_shpcropFromTop /*256*/ : case NS_ooxml::LN_CT_Anchor_distL:
m_pImpl->nTopCrop = nTwipValue;
break;// rtf:shpcropFromTop
case NS_dff::LN_shpcropFromBottom /*257*/ :
m_pImpl->nBottomCrop= nTwipValue;
break;// rtf:shpcropFromBottom
case NS_dff::LN_shpcropFromLeft /*258*/ :
m_pImpl->nLeftCrop = nTwipValue;
break;// rtf:shpcropFromLeft
case NS_dff::LN_shpcropFromRight/*259*/ :
m_pImpl->nRightCrop = nTwipValue;
break;// rtf:shpcropFromRight
case NS_dff::LN_shppib/*260*/:
break; // rtf:shppib
case NS_dff::LN_shppibName/*261*/:
break; // rtf:shppibName
case NS_dff::LN_shppibFlags/*262*/: // rtf:shppibFlags
break;
case NS_dff::LN_shppictureContrast/*264*/: // rtf:shppictureContrast docu: "1<<16"
/*
0x10000 is msoffice 50%
< 0x10000 is in units of 1/50th of 0x10000 per 1%
> 0x10000 is in units where
a msoffice x% is stored as 50/(100-x) * 0x10000
plus, a (ui) microsoft % ranges from 0 to 100, OOO
from -100 to 100, so also normalize into that range
*/
if ( nIntValue > 0x10000 )
{
double fX = nIntValue;
fX /= 0x10000;
fX /= 51; // 50 + 1 to round
fX = 1/fX;
m_pImpl->nContrast = static_cast<sal_Int32>(fX);
m_pImpl->nContrast -= 100;
m_pImpl->nContrast = -m_pImpl->nContrast;
m_pImpl->nContrast = (m_pImpl->nContrast-50)*2;
}
else if ( nIntValue == 0x10000 )
m_pImpl->nContrast = 0;
else
{
m_pImpl->nContrast = nIntValue * 101; //100 + 1 to round
m_pImpl->nContrast /= 0x10000;
m_pImpl->nContrast -= 100;
}
break;
case NS_dff::LN_shppictureBrightness/*265*/: // rtf:shppictureBrightness
m_pImpl->nBrightness = ( (sal_Int32) nIntValue / 327 );
break;
case NS_dff::LN_shppictureGamma/*266*/: // rtf:shppictureGamma
//todo check gamma value with _real_ document
m_pImpl->fGamma = double(nIntValue/655);
break;
case NS_dff::LN_shppictureId /*267*/:
break; // rtf:shppictureId
case NS_dff::LN_shppictureDblCrMod /*268*/:
break; // rtf:shppictureDblCrMod
case NS_dff::LN_shppictureFillCrMod /*269*/:
break; // rtf:shppictureFillCrMod
case NS_dff::LN_shppictureLineCrMod /*270*/:
break; // rtf:shppictureLineCrMod
case NS_dff::LN_shppictureActive/*319*/: // rtf:shppictureActive
switch( nIntValue & 0x06 )
{
case 0 : m_pImpl->eColorMode = drawing::ColorMode_STANDARD; break;
case 4 : m_pImpl->eColorMode = drawing::ColorMode_GREYS; break;
case 6 : m_pImpl->eColorMode = drawing::ColorMode_MONO; break;
default:;
}
break;
case NS_dff::LN_shpfillColor /*385*/:
m_pImpl->nFillColor = (m_pImpl->nFillColor & 0xff000000) + ConversionHelper::ConvertColor( nIntValue );
break;
case NS_dff::LN_shpfillOpacity /*386*/:
{
sal_Int32 nTrans = 0xff - ( nIntValue * 0xff ) / 0xffff;
m_pImpl->nFillColor = (nTrans << 0x18 ) + (m_pImpl->nFillColor & 0xffffff);
}
break;
case NS_dff::LN_shpfNoFillHitTest /*447*/:
break; // rtf:shpfNoFillHitTest
case NS_dff::LN_shplineColor /*448*/:
m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineColor = ConversionHelper::ConvertColor( nIntValue );
break;
case NS_dff::LN_shplineWidth /*459*/:
//1pt == 12700 units
m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineWidth = ConversionHelper::convertTwipToMM100(nIntValue / 635);
break;
case NS_dff::LN_shplineDashing /*462*/:
//graphic borders don't support different dashing
/*MSOLINEDASHING
msolineSolid, // Solid (continuous) pen
msolineDashSys, // PS_DASH system dash style
msolineDotSys, // PS_DOT system dash style
msolineDashDotSys, // PS_DASHDOT system dash style
msolineDashDotDotSys, // PS_DASHDOTDOT system dash style
msolineDotGEL, // square dot style
msolineDashGEL, // dash style
msolineLongDashGEL, // long dash style
msolineDashDotGEL, // dash short dash
msolineLongDashDotGEL, // long dash short dash
msolineLongDashDotDotGEL // long dash short dash short dash*/
break;
case NS_dff::LN_shpfNoLineDrawDash /*511*/:
break; // rtf:shpfNoLineDrawDash
case NS_dff::LN_shpwzDescription /*897*/: //alternative text
m_pImpl->sAlternativeText = val.getString();
break;
case NS_dff::LN_shppWrapPolygonVertices/*899*/:
break; // rtf:shppWrapPolygonVertices
case NS_dff::LN_shpdxWrapDistLeft /*900*/: // contains a twip/635 value
//todo: changes have to be applied depending on the orientation, see SwWW8ImplReader::AdjustLRWrapForWordMargins() //todo: changes have to be applied depending on the orientation, see SwWW8ImplReader::AdjustLRWrapForWordMargins()
m_pImpl->nLeftMargin = nIntValue / 360; m_pImpl->nLeftMargin = nIntValue / 360;
break; break;
case NS_dff::LN_shpdyWrapDistTop /*901*/: // contains a twip/635 value case NS_ooxml::LN_CT_Anchor_distT:
//todo: changes have to be applied depending on the orientation, see SwWW8ImplReader::AdjustULWrapForWordMargins() //todo: changes have to be applied depending on the orientation, see SwWW8ImplReader::AdjustULWrapForWordMargins()
m_pImpl->nTopMargin = nIntValue / 360; m_pImpl->nTopMargin = nIntValue / 360;
break; break;
case NS_dff::LN_shpdxWrapDistRight /*902*/:// contains a twip/635 value case NS_ooxml::LN_CT_Anchor_distR:
//todo: changes have to be applied depending on the orientation, see SwWW8ImplReader::AdjustLRWrapForWordMargins() //todo: changes have to be applied depending on the orientation, see SwWW8ImplReader::AdjustLRWrapForWordMargins()
m_pImpl->nRightMargin = nIntValue / 360; m_pImpl->nRightMargin = nIntValue / 360;
break; break;
case NS_dff::LN_shpdyWrapDistBottom /*903*/:// contains a twip/635 value case NS_ooxml::LN_CT_Anchor_distB:
//todo: changes have to be applied depending on the orientation, see SwWW8ImplReader::AdjustULWrapForWordMargins() //todo: changes have to be applied depending on the orientation, see SwWW8ImplReader::AdjustULWrapForWordMargins()
m_pImpl->nBottomMargin = nIntValue / 360; m_pImpl->nBottomMargin = nIntValue / 360;
break; break;

28
writerfilter/source/doctok/resourceids.xsl
View File

@@ -107,34 +107,6 @@ const Id </xsl:text>
</xsl:for-each> </xsl:for-each>
<xsl:text> <xsl:text>
} }
namespace NS_dff
{</xsl:text>
<xsl:for-each select='.//UML:Class[.//UML:Stereotype/@xmi.idref="dffopt"]'>
<xsl:variable name ="optname">
<xsl:value-of select='.//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="optname"]/UML:TaggedValue.dataValue'/>
</xsl:variable>
<xsl:variable name="fopid">
<xsl:for-each select='.//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="fopid"]'>
<xsl:value-of select='UML:TaggedValue.dataValue'/>
</xsl:for-each>
</xsl:variable>
<xsl:text>
const Id </xsl:text>
<xsl:call-template name="idtoqname">
<xsl:with-param name="id"><xsl:value-of select="$optname"/></xsl:with-param>
</xsl:call-template>
<xsl:text> = </xsl:text>
<xsl:value-of select="$fopid"/>
<xsl:text>; // 0x</xsl:text>
<xsl:call-template name="dectohex">
<xsl:with-param name="number" select="$fopid"/>
</xsl:call-template>
</xsl:for-each>
<xsl:text>
}
} }
#endif // INCLUDED_RESOURCESIDS&#xa;</xsl:text></out> #endif // INCLUDED_RESOURCESIDS&#xa;</xsl:text></out>

1365
writerfilter/source/doctok/resources.xmi
View File

File diff suppressed because it is too large Load Diff