Kaydet (Commit) 0c7a1b6e authored tarafından Eike Rathke's avatar Eike Rathke

resolved fdo#60087 corrected .xlsx export of functions

Change-Id: I6c7ba47dde88a73d035b1db5f7f4cede78b262db
üst 63e3d867
...@@ -1406,6 +1406,9 @@ void XclExpFmlaCompImpl::ProcessFunction( const XclExpScToken& rTokData ) ...@@ -1406,6 +1406,9 @@ void XclExpFmlaCompImpl::ProcessFunction( const XclExpScToken& rTokData )
void XclExpFmlaCompImpl::PrepareFunction( XclExpFuncData& rFuncData ) void XclExpFmlaCompImpl::PrepareFunction( XclExpFuncData& rFuncData )
{ {
// For OOXML these are not rewritten anymore.
if (GetOutput() != EXC_OUTPUT_XML_2007)
{
switch( rFuncData.GetOpCode() ) switch( rFuncData.GetOpCode() )
{ {
case ocCosecant: // simulate CSC(x) by (1/SIN(x)) case ocCosecant: // simulate CSC(x) by (1/SIN(x))
...@@ -1421,6 +1424,7 @@ void XclExpFmlaCompImpl::PrepareFunction( XclExpFuncData& rFuncData ) ...@@ -1421,6 +1424,7 @@ void XclExpFmlaCompImpl::PrepareFunction( XclExpFuncData& rFuncData )
break; break;
default:; default:;
} }
}
} }
void XclExpFmlaCompImpl::FinishFunction( XclExpFuncData& rFuncData, sal_uInt8 nCloseSpaces ) void XclExpFmlaCompImpl::FinishFunction( XclExpFuncData& rFuncData, sal_uInt8 nCloseSpaces )
...@@ -1468,12 +1472,20 @@ void XclExpFmlaCompImpl::FinishFunction( XclExpFuncData& rFuncData, sal_uInt8 nC ...@@ -1468,12 +1472,20 @@ void XclExpFmlaCompImpl::FinishFunction( XclExpFuncData& rFuncData, sal_uInt8 nC
case ocCosecantHyp: // simulate CSCH(x) by (1/SINH(x)) case ocCosecantHyp: // simulate CSCH(x) by (1/SINH(x))
case ocSecantHyp: // simulate SECH(x) by (1/COSH(x)) case ocSecantHyp: // simulate SECH(x) by (1/COSH(x))
case ocCotHyp: // simulate COTH(x) by (1/TANH(x)) case ocCotHyp: // simulate COTH(x) by (1/TANH(x))
// For OOXML not rewritten anymore.
if (GetOutput() != EXC_OUTPUT_XML_2007)
{
AppendBinaryOperatorToken( EXC_TOKID_DIV, true ); AppendBinaryOperatorToken( EXC_TOKID_DIV, true );
AppendParenToken(); AppendParenToken();
}
break; break;
case ocArcCot: // simulate ACOT(x) by (PI/2-ATAN(x)) case ocArcCot: // simulate ACOT(x) by (PI/2-ATAN(x))
// For OOXML not rewritten anymore.
if (GetOutput() != EXC_OUTPUT_XML_2007)
{
AppendBinaryOperatorToken( EXC_TOKID_SUB, true ); AppendBinaryOperatorToken( EXC_TOKID_SUB, true );
AppendParenToken(); AppendParenToken();
}
break; break;
default:; default:;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment