From 858b404472c09a140d05b2e8e83a7655fbe5e708 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 2 Nov 2011 13:48:35 +0100 Subject: fix ooxml custom shapes sizing - ooxml custom shapes width and height are in actual (logic) coordinates space and not in "virtual" 21600x21600 space --- oox/source/drawingml/customshapegeometry.cxx | 18 +- oox/source/drawingml/customshapepresets1.cxx | 578 +++++++++++------------ oox/source/drawingml/customshapepresets2.cxx | 538 +++++++++++----------- oox/source/drawingml/customshapepresets3.cxx | 612 ++++++++++++------------- oox/source/drawingml/customshapepresets4.cxx | 592 ++++++++++++------------ oox/source/drawingml/customshapepresets5.cxx | 532 ++++++++++----------- oox/source/drawingml/customshapepresets6.cxx | 190 ++++---- oox/source/drawingml/customshapeproperties.cxx | 3 +- 8 files changed, 1532 insertions(+), 1531 deletions(-) (limited to 'oox') diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index c99665631544..c75463a2b668 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -261,13 +261,13 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu { CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = CREATE_OUSTRING( "height" ); + aGuide.maFormula = CREATE_OUSTRING( "logheight" ); aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; } else - aRet.Type = EnhancedCustomShapeParameterType::HEIGHT; // TODO: HEIGHT needs to be implemented + aRet.Type = EnhancedCustomShapeParameterType::LOGHEIGHT; // TODO: HEIGHT needs to be implemented } break; @@ -291,7 +291,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = CREATE_OUSTRING( "height/" ) + rtl::OUString::valueOf( nIntVal ); + aGuide.maFormula = CREATE_OUSTRING( "logheight/" ) + rtl::OUString::valueOf( nIntVal ); aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; @@ -310,7 +310,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu { CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = CREATE_OUSTRING( "max(width,height)" ); + aGuide.maFormula = CREATE_OUSTRING( "max(logwidth,logheight)" ); aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; @@ -320,7 +320,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu { CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = CREATE_OUSTRING( "min(width,height)" ); + aGuide.maFormula = CREATE_OUSTRING( "min(logwidth,logheight)" ); aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; @@ -342,7 +342,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = CREATE_OUSTRING( "min(width,height)/" ) + rtl::OUString::valueOf( nIntVal ); + aGuide.maFormula = CREATE_OUSTRING( "min(logwidth,logheight)/" ) + rtl::OUString::valueOf( nIntVal ); aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; @@ -356,13 +356,13 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu { CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = CREATE_OUSTRING( "width" ); + aGuide.maFormula = CREATE_OUSTRING( "logwidth" ); aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; } else - aRet.Type = EnhancedCustomShapeParameterType::WIDTH; + aRet.Type = EnhancedCustomShapeParameterType::LOGWIDTH; } break; @@ -389,7 +389,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = CREATE_OUSTRING( "width/" ) + rtl::OUString::valueOf( nIntVal ); + aGuide.maFormula = CREATE_OUSTRING( "logwidth/" ) + rtl::OUString::valueOf( nIntVal ); aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx index ad4235567640..0fe0dd32f897 100644 --- a/oox/source/drawingml/customshapepresets1.cxx +++ b/oox/source/drawingml/customshapepresets1.cxx @@ -28,12 +28,12 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (24); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[1] = CREATE_OUSTRING ("?0 *3/8"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +0-?1 "); aStringSequence[4] = CREATE_OUSTRING ("?2 +?1 -0"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?1 "); aStringSequence[7] = CREATE_OUSTRING ("?5 +?1 -0"); aStringSequence[8] = CREATE_OUSTRING ("?0 *3/4"); @@ -50,8 +50,8 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[19] = CREATE_OUSTRING ("?6 +?10 -0"); aStringSequence[20] = CREATE_OUSTRING ("?6 +?11 -0"); aStringSequence[21] = CREATE_OUSTRING ("?6 +?13 -0"); - aStringSequence[22] = CREATE_OUSTRING ("width"); - aStringSequence[23] = CREATE_OUSTRING ("height"); + aStringSequence[22] = CREATE_OUSTRING ("logwidth"); + aStringSequence[23] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -845,14 +845,14 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (8); - aStringSequence[0] = CREATE_OUSTRING ("height*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("width*$1 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("height*$2 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width*$3 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("width"); - aStringSequence[5] = CREATE_OUSTRING ("height/2"); - aStringSequence[6] = CREATE_OUSTRING ("width/2"); - aStringSequence[7] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*$1 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*$2 /100000"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*$3 /100000"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth"); + aStringSequence[5] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -1178,12 +1178,12 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (14); - aStringSequence[0] = CREATE_OUSTRING ("sqrt(width*width+height*height+0*0)"); + aStringSequence[0] = CREATE_OUSTRING ("sqrt(logwidth*logwidth+logheight*logheight+0*0)"); aStringSequence[1] = CREATE_OUSTRING ("1*?0 /20"); - aStringSequence[2] = CREATE_OUSTRING ("0+height-?1 "); - aStringSequence[3] = CREATE_OUSTRING ("0+width-?1 "); - aStringSequence[4] = CREATE_OUSTRING ("height"); - aStringSequence[5] = CREATE_OUSTRING ("width"); + aStringSequence[2] = CREATE_OUSTRING ("0+logheight-?1 "); + aStringSequence[3] = CREATE_OUSTRING ("0+logwidth-?1 "); + aStringSequence[4] = CREATE_OUSTRING ("logheight"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth"); aStringSequence[6] = CREATE_OUSTRING ("(0)/60000.0"); aStringSequence[7] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[8] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -1651,30 +1651,30 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (61); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*height/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logheight/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("if(0-$0 ,0,if(?2 -$0 ,$0 ,?2 ))"); aStringSequence[4] = CREATE_OUSTRING ("?0 *?3 /100000"); aStringSequence[5] = CREATE_OUSTRING ("?0 *?2 /100000"); aStringSequence[6] = CREATE_OUSTRING ("(?4 +?5 )/4"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?6 "); aStringSequence[9] = CREATE_OUSTRING ("?8 *2/1"); aStringSequence[10] = CREATE_OUSTRING ("?9 *?9 /1"); aStringSequence[11] = CREATE_OUSTRING ("?4 *?4 /1"); aStringSequence[12] = CREATE_OUSTRING ("?10 +0-?11 "); aStringSequence[13] = CREATE_OUSTRING ("sqrt(?12 )"); - aStringSequence[14] = CREATE_OUSTRING ("?13 *width/?9 "); + aStringSequence[14] = CREATE_OUSTRING ("?13 *logwidth/?9 "); aStringSequence[15] = CREATE_OUSTRING ("100000*?14 /?0 "); aStringSequence[16] = CREATE_OUSTRING ("if(0-$2 ,0,if(?15 -$2 ,$2 ,?15 ))"); aStringSequence[17] = CREATE_OUSTRING ("?0 *?16 /100000"); aStringSequence[18] = CREATE_OUSTRING ("?8 +?4 -0"); - aStringSequence[19] = CREATE_OUSTRING ("width*width/1"); + aStringSequence[19] = CREATE_OUSTRING ("logwidth*logwidth/1"); aStringSequence[20] = CREATE_OUSTRING ("?17 *?17 /1"); aStringSequence[21] = CREATE_OUSTRING ("?19 +0-?20 "); aStringSequence[22] = CREATE_OUSTRING ("sqrt(?21 )"); - aStringSequence[23] = CREATE_OUSTRING ("?22 *?8 /width"); + aStringSequence[23] = CREATE_OUSTRING ("?22 *?8 /logwidth"); aStringSequence[24] = CREATE_OUSTRING ("?8 +?23 -0"); aStringSequence[25] = CREATE_OUSTRING ("?18 +?23 -0"); aStringSequence[26] = CREATE_OUSTRING ("?5 +0-?4 "); @@ -1682,7 +1682,7 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[28] = CREATE_OUSTRING ("?24 +0-?27 "); aStringSequence[29] = CREATE_OUSTRING ("?25 +?27 -0"); aStringSequence[30] = CREATE_OUSTRING ("?5 *1/2"); - aStringSequence[31] = CREATE_OUSTRING ("height+0-?30 "); + aStringSequence[31] = CREATE_OUSTRING ("logheight+0-?30 "); aStringSequence[32] = CREATE_OUSTRING ("0+?17 -0"); aStringSequence[33] = CREATE_OUSTRING ("(10800000*atan2(?23 ,?17 ))/pi"); aStringSequence[34] = CREATE_OUSTRING ("0+0-?33 "); @@ -1693,9 +1693,9 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[39] = CREATE_OUSTRING ("?38 +0-?33 "); aStringSequence[40] = CREATE_OUSTRING ("?33 +?38 -0"); aStringSequence[41] = CREATE_OUSTRING ("0+0-?38 "); - aStringSequence[42] = CREATE_OUSTRING ("width"); - aStringSequence[43] = CREATE_OUSTRING ("height"); - aStringSequence[44] = CREATE_OUSTRING ("width"); + aStringSequence[42] = CREATE_OUSTRING ("logwidth"); + aStringSequence[43] = CREATE_OUSTRING ("logheight"); + aStringSequence[44] = CREATE_OUSTRING ("logwidth"); aStringSequence[45] = CREATE_OUSTRING ("(?33 )/60000.0"); aStringSequence[46] = CREATE_OUSTRING ("(?39 )/60000.0"); aStringSequence[47] = CREATE_OUSTRING ("(?41 )/60000.0"); @@ -2542,15 +2542,15 @@ void CustomShapeProperties::initializePresetsMap1() { Sequence< OUString > aStringSequence (10); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width+0-?2 "); - aStringSequence[4] = CREATE_OUSTRING ("height+0-?2 "); + aStringSequence[3] = CREATE_OUSTRING ("logwidth+0-?2 "); + aStringSequence[4] = CREATE_OUSTRING ("logheight+0-?2 "); aStringSequence[5] = CREATE_OUSTRING ("?2 *1/2"); - aStringSequence[6] = CREATE_OUSTRING ("width+0-?5 "); - aStringSequence[7] = CREATE_OUSTRING ("height+0-?5 "); - aStringSequence[8] = CREATE_OUSTRING ("width"); - aStringSequence[9] = CREATE_OUSTRING ("height"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth+0-?5 "); + aStringSequence[7] = CREATE_OUSTRING ("logheight+0-?5 "); + aStringSequence[8] = CREATE_OUSTRING ("logwidth"); + aStringSequence[9] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -2817,33 +2817,33 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[0] = CREATE_OUSTRING ("if(0-$2 ,0,if(33333-$2 ,$2 ,33333))"); aStringSequence[1] = CREATE_OUSTRING ("100000+0-?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); - aStringSequence[3] = CREATE_OUSTRING ("width/2"); - aStringSequence[4] = CREATE_OUSTRING ("width/32"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth/32"); aStringSequence[5] = CREATE_OUSTRING ("?3 +0-?4 "); - aStringSequence[6] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[6] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[7] = CREATE_OUSTRING ("100000*?5 /?6 "); aStringSequence[8] = CREATE_OUSTRING ("if(0-$1 ,0,if(?7 -$1 ,$1 ,?7 ))"); aStringSequence[9] = CREATE_OUSTRING ("?6 *?8 /100000"); - aStringSequence[10] = CREATE_OUSTRING ("width+0-?9 "); - aStringSequence[11] = CREATE_OUSTRING ("height*?2 /200000"); - aStringSequence[12] = CREATE_OUSTRING ("height*?0 /-200000"); - aStringSequence[13] = CREATE_OUSTRING ("height/2"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth+0-?9 "); + aStringSequence[11] = CREATE_OUSTRING ("logheight*?2 /200000"); + aStringSequence[12] = CREATE_OUSTRING ("logheight*?0 /-200000"); + aStringSequence[13] = CREATE_OUSTRING ("logheight/2"); aStringSequence[14] = CREATE_OUSTRING ("?13 +?12 -?11 "); aStringSequence[15] = CREATE_OUSTRING ("?13 +?11 -?12 "); aStringSequence[16] = CREATE_OUSTRING ("?14 +?11 -0"); - aStringSequence[17] = CREATE_OUSTRING ("height+0-?16 "); + aStringSequence[17] = CREATE_OUSTRING ("logheight+0-?16 "); aStringSequence[18] = CREATE_OUSTRING ("?16 *2/1"); - aStringSequence[19] = CREATE_OUSTRING ("height+0-?18 "); + aStringSequence[19] = CREATE_OUSTRING ("logheight+0-?18 "); aStringSequence[20] = CREATE_OUSTRING ("?18 +0-?14 "); - aStringSequence[21] = CREATE_OUSTRING ("height+0-?20 "); + aStringSequence[21] = CREATE_OUSTRING ("logheight+0-?20 "); aStringSequence[22] = CREATE_OUSTRING ("?0 *?6 /400000"); - aStringSequence[23] = CREATE_OUSTRING ("width/2"); + aStringSequence[23] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[24] = CREATE_OUSTRING ("?23 +0-?4 "); aStringSequence[25] = CREATE_OUSTRING ("?23 +?4 -0"); aStringSequence[26] = CREATE_OUSTRING ("?14 +?22 -0"); aStringSequence[27] = CREATE_OUSTRING ("?21 +0-?22 "); - aStringSequence[28] = CREATE_OUSTRING ("width"); - aStringSequence[29] = CREATE_OUSTRING ("height"); + aStringSequence[28] = CREATE_OUSTRING ("logwidth"); + aStringSequence[29] = CREATE_OUSTRING ("logheight"); aStringSequence[30] = CREATE_OUSTRING ("(16200000)/60000.0"); aStringSequence[31] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[32] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -4051,11 +4051,11 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (39); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[1] = CREATE_OUSTRING ("?0 *3/8"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +0-?1 "); - aStringSequence[4] = CREATE_OUSTRING ("width/2"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[5] = CREATE_OUSTRING ("?4 +0-?1 "); aStringSequence[6] = CREATE_OUSTRING ("?0 *3/4"); aStringSequence[7] = CREATE_OUSTRING ("?6 *1/32"); @@ -4076,8 +4076,8 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[22] = CREATE_OUSTRING ("?5 +?11 -0"); aStringSequence[23] = CREATE_OUSTRING ("?5 +?12 -0"); aStringSequence[24] = CREATE_OUSTRING ("?6 *3/32"); - aStringSequence[25] = CREATE_OUSTRING ("width"); - aStringSequence[26] = CREATE_OUSTRING ("height"); + aStringSequence[25] = CREATE_OUSTRING ("logwidth"); + aStringSequence[26] = CREATE_OUSTRING ("logheight"); aStringSequence[27] = CREATE_OUSTRING ("(16200000)/60000.0"); aStringSequence[28] = CREATE_OUSTRING ("(21600000)/60000.0"); aStringSequence[29] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -5371,14 +5371,14 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (8); - aStringSequence[0] = CREATE_OUSTRING ("width*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("width*$2 /100000"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*$2 /100000"); aStringSequence[2] = CREATE_OUSTRING ("(?0 +?1 )/2"); - aStringSequence[3] = CREATE_OUSTRING ("height*$1 /100000"); + aStringSequence[3] = CREATE_OUSTRING ("logheight*$1 /100000"); aStringSequence[4] = CREATE_OUSTRING ("(0+?3 )/2"); - aStringSequence[5] = CREATE_OUSTRING ("(height+?3 )/2"); - aStringSequence[6] = CREATE_OUSTRING ("width"); - aStringSequence[7] = CREATE_OUSTRING ("height"); + aStringSequence[5] = CREATE_OUSTRING ("(logheight+?3 )/2"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth"); + aStringSequence[7] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -5707,13 +5707,13 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("if(1-$2 ,1,if(21599999-$2 ,$2 ,21599999))"); aStringSequence[4] = CREATE_OUSTRING ("if(0-$3 ,0,if(21599999-$3 ,$3 ,21599999))"); - aStringSequence[5] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[5] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[6] = CREATE_OUSTRING ("?5 *?2 /100000"); aStringSequence[7] = CREATE_OUSTRING ("?5 *?0 /100000"); aStringSequence[8] = CREATE_OUSTRING ("?6 *1/2"); - aStringSequence[9] = CREATE_OUSTRING ("width/2"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[10] = CREATE_OUSTRING ("?9 +?8 -?7 "); - aStringSequence[11] = CREATE_OUSTRING ("height/2"); + aStringSequence[11] = CREATE_OUSTRING ("logheight/2"); aStringSequence[12] = CREATE_OUSTRING ("?11 +?8 -?7 "); aStringSequence[13] = CREATE_OUSTRING ("?10 +0-?6 "); aStringSequence[14] = CREATE_OUSTRING ("?12 +0-?6 "); @@ -5723,9 +5723,9 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[18] = CREATE_OUSTRING ("?16 *cos(pi*(?3 )/10800000)"); aStringSequence[19] = CREATE_OUSTRING ("?15 *(cos(atan2(?17 ,?18 )))"); aStringSequence[20] = CREATE_OUSTRING ("?16 *(sin(atan2(?17 ,?18 )))"); - aStringSequence[21] = CREATE_OUSTRING ("width/2"); + aStringSequence[21] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[22] = CREATE_OUSTRING ("?21 +?19 -0"); - aStringSequence[23] = CREATE_OUSTRING ("height/2"); + aStringSequence[23] = CREATE_OUSTRING ("logheight/2"); aStringSequence[24] = CREATE_OUSTRING ("?23 +?20 -0"); aStringSequence[25] = CREATE_OUSTRING ("min(?13 ,?14 )"); aStringSequence[26] = CREATE_OUSTRING ("?19 *?19 /1"); @@ -6280,29 +6280,29 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (23); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("?2 *2/1"); aStringSequence[4] = CREATE_OUSTRING ("if(0-$0 ,0,if(?3 -$0 ,$0 ,?3 ))"); - aStringSequence[5] = CREATE_OUSTRING ("100000*height/?0 "); + aStringSequence[5] = CREATE_OUSTRING ("100000*logheight/?0 "); aStringSequence[6] = CREATE_OUSTRING ("if(0-$2 ,0,if(?5 -$2 ,$2 ,?5 ))"); - aStringSequence[7] = CREATE_OUSTRING ("?6 *?0 /height"); + aStringSequence[7] = CREATE_OUSTRING ("?6 *?0 /logheight"); aStringSequence[8] = CREATE_OUSTRING ("100000+0-?7 "); aStringSequence[9] = CREATE_OUSTRING ("if(0-$3 ,0,if(?8 -$3 ,$3 ,?8 ))"); aStringSequence[10] = CREATE_OUSTRING ("?0 *?2 /100000"); aStringSequence[11] = CREATE_OUSTRING ("?0 *?4 /200000"); - aStringSequence[12] = CREATE_OUSTRING ("width/2"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[13] = CREATE_OUSTRING ("?12 +0-?10 "); aStringSequence[14] = CREATE_OUSTRING ("?12 +0-?11 "); aStringSequence[15] = CREATE_OUSTRING ("?12 +?11 -0"); aStringSequence[16] = CREATE_OUSTRING ("?12 +?10 -0"); aStringSequence[17] = CREATE_OUSTRING ("?0 *?6 /100000"); - aStringSequence[18] = CREATE_OUSTRING ("height+0-?17 "); - aStringSequence[19] = CREATE_OUSTRING ("height*?9 /100000"); + aStringSequence[18] = CREATE_OUSTRING ("logheight+0-?17 "); + aStringSequence[19] = CREATE_OUSTRING ("logheight*?9 /100000"); aStringSequence[20] = CREATE_OUSTRING ("?19 *1/2"); - aStringSequence[21] = CREATE_OUSTRING ("height"); - aStringSequence[22] = CREATE_OUSTRING ("width"); + aStringSequence[21] = CREATE_OUSTRING ("logheight"); + aStringSequence[22] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -6745,12 +6745,12 @@ void CustomShapeProperties::initializePresetsMap1() { Sequence< OUString > aStringSequence (9); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(100000-$0 ,$0 ,100000))"); - aStringSequence[1] = CREATE_OUSTRING ("height*?0 /200000"); - aStringSequence[2] = CREATE_OUSTRING ("width*73490/200000"); - aStringSequence[3] = CREATE_OUSTRING ("height/2"); + aStringSequence[1] = CREATE_OUSTRING ("logheight*?0 /200000"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth*73490/200000"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/2"); aStringSequence[4] = CREATE_OUSTRING ("?3 +0-?1 "); aStringSequence[5] = CREATE_OUSTRING ("?3 +?1 -0"); - aStringSequence[6] = CREATE_OUSTRING ("width/2"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[7] = CREATE_OUSTRING ("?6 +0-?2 "); aStringSequence[8] = CREATE_OUSTRING ("?6 +?2 -0"); aPropertyMap [PROP_Equations] <<= aStringSequence; @@ -6942,15 +6942,15 @@ void CustomShapeProperties::initializePresetsMap1() Sequence< OUString > aStringSequence (265); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(20000-$0 ,$0 ,20000))"); aStringSequence[1] = CREATE_OUSTRING ("if(0-$1 ,0,if(2679-$1 ,$1 ,2679))"); - aStringSequence[2] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[2] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[3] = CREATE_OUSTRING ("?2 *?0 /100000"); aStringSequence[4] = CREATE_OUSTRING ("?2 *?1 /100000"); aStringSequence[5] = CREATE_OUSTRING ("?3 *1/2"); aStringSequence[6] = CREATE_OUSTRING ("?4 *1/2"); aStringSequence[7] = CREATE_OUSTRING ("?5 +?6 -0"); - aStringSequence[8] = CREATE_OUSTRING ("height/2"); + aStringSequence[8] = CREATE_OUSTRING ("logheight/2"); aStringSequence[9] = CREATE_OUSTRING ("?8 +0-?3 "); - aStringSequence[10] = CREATE_OUSTRING ("width/2"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[11] = CREATE_OUSTRING ("?10 +0-?3 "); aStringSequence[12] = CREATE_OUSTRING ("?11 +0-?9 "); aStringSequence[13] = CREATE_OUSTRING ("if(?12 ,?9 ,?11 )"); @@ -6966,9 +6966,9 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[23] = CREATE_OUSTRING ("?11 *?9 /?22 "); aStringSequence[24] = CREATE_OUSTRING ("?23 *cos(pi*(?19 )/10800000)"); aStringSequence[25] = CREATE_OUSTRING ("?23 *sin(pi*(?19 )/10800000)"); - aStringSequence[26] = CREATE_OUSTRING ("width/2"); + aStringSequence[26] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[27] = CREATE_OUSTRING ("?26 +?24 -0"); - aStringSequence[28] = CREATE_OUSTRING ("height/2"); + aStringSequence[28] = CREATE_OUSTRING ("logheight/2"); aStringSequence[29] = CREATE_OUSTRING ("?28 +?25 -0"); aStringSequence[30] = CREATE_OUSTRING ("?11 *cos(pi*(?16 )/10800000)"); aStringSequence[31] = CREATE_OUSTRING ("?9 *sin(pi*(?16 )/10800000)"); @@ -7128,32 +7128,32 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[185] = CREATE_OUSTRING ("?11 *cos(pi*(?181 )/10800000)"); aStringSequence[186] = CREATE_OUSTRING ("?9 *sin(pi*(?181 )/10800000)"); aStringSequence[187] = CREATE_OUSTRING ("(10800000*atan2(?186 ,?185 ))/pi"); - aStringSequence[188] = CREATE_OUSTRING ("width+0-?150 "); - aStringSequence[189] = CREATE_OUSTRING ("width+0-?178 "); - aStringSequence[190] = CREATE_OUSTRING ("width+0-?176 "); + aStringSequence[188] = CREATE_OUSTRING ("logwidth+0-?150 "); + aStringSequence[189] = CREATE_OUSTRING ("logwidth+0-?178 "); + aStringSequence[190] = CREATE_OUSTRING ("logwidth+0-?176 "); aStringSequence[191] = CREATE_OUSTRING ("?184 +0-?154 "); aStringSequence[192] = CREATE_OUSTRING ("9000000+?14 -0"); aStringSequence[193] = CREATE_OUSTRING ("?11 *cos(pi*(?192 )/10800000)"); aStringSequence[194] = CREATE_OUSTRING ("?9 *sin(pi*(?192 )/10800000)"); aStringSequence[195] = CREATE_OUSTRING ("(10800000*atan2(?194 ,?193 ))/pi"); - aStringSequence[196] = CREATE_OUSTRING ("width+0-?109 "); - aStringSequence[197] = CREATE_OUSTRING ("width+0-?137 "); - aStringSequence[198] = CREATE_OUSTRING ("width+0-?135 "); + aStringSequence[196] = CREATE_OUSTRING ("logwidth+0-?109 "); + aStringSequence[197] = CREATE_OUSTRING ("logwidth+0-?137 "); + aStringSequence[198] = CREATE_OUSTRING ("logwidth+0-?135 "); aStringSequence[199] = CREATE_OUSTRING ("11400000+?14 -0"); aStringSequence[200] = CREATE_OUSTRING ("?11 *cos(pi*(?199 )/10800000)"); aStringSequence[201] = CREATE_OUSTRING ("?9 *sin(pi*(?199 )/10800000)"); aStringSequence[202] = CREATE_OUSTRING ("(10800000*atan2(?201 ,?200 ))/pi"); - aStringSequence[203] = CREATE_OUSTRING ("width+0-?68 "); - aStringSequence[204] = CREATE_OUSTRING ("width+0-?96 "); - aStringSequence[205] = CREATE_OUSTRING ("width+0-?94 "); + aStringSequence[203] = CREATE_OUSTRING ("logwidth+0-?68 "); + aStringSequence[204] = CREATE_OUSTRING ("logwidth+0-?96 "); + aStringSequence[205] = CREATE_OUSTRING ("logwidth+0-?94 "); aStringSequence[206] = CREATE_OUSTRING ("13800000+?14 -0"); aStringSequence[207] = CREATE_OUSTRING ("?11 *cos(pi*(?206 )/10800000)"); aStringSequence[208] = CREATE_OUSTRING ("?9 *sin(pi*(?206 )/10800000)"); aStringSequence[209] = CREATE_OUSTRING ("(10800000*atan2(?208 ,?207 ))/pi"); - aStringSequence[210] = CREATE_OUSTRING ("width+0-?39 "); - aStringSequence[211] = CREATE_OUSTRING ("width+0-?27 "); - aStringSequence[212] = CREATE_OUSTRING ("width+0-?56 "); - aStringSequence[213] = CREATE_OUSTRING ("width+0-?54 "); + aStringSequence[210] = CREATE_OUSTRING ("logwidth+0-?39 "); + aStringSequence[211] = CREATE_OUSTRING ("logwidth+0-?27 "); + aStringSequence[212] = CREATE_OUSTRING ("logwidth+0-?56 "); + aStringSequence[213] = CREATE_OUSTRING ("logwidth+0-?54 "); aStringSequence[214] = CREATE_OUSTRING ("16200000+0-?14 "); aStringSequence[215] = CREATE_OUSTRING ("16200000+?14 -0"); aStringSequence[216] = CREATE_OUSTRING ("?11 *cos(pi*(?215 )/10800000)"); @@ -7183,10 +7183,10 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[240] = CREATE_OUSTRING ("(?136 +?134 )/2"); aStringSequence[241] = CREATE_OUSTRING ("(?178 +?176 )/2"); aStringSequence[242] = CREATE_OUSTRING ("(?177 +?175 )/2"); - aStringSequence[243] = CREATE_OUSTRING ("(width+0)/?241 "); - aStringSequence[244] = CREATE_OUSTRING ("(width+0)/?239 "); - aStringSequence[245] = CREATE_OUSTRING ("(width+0)/?237 "); - aStringSequence[246] = CREATE_OUSTRING ("(width+0)/?235 "); + aStringSequence[243] = CREATE_OUSTRING ("(logwidth+0)/?241 "); + aStringSequence[244] = CREATE_OUSTRING ("(logwidth+0)/?239 "); + aStringSequence[245] = CREATE_OUSTRING ("(logwidth+0)/?237 "); + aStringSequence[246] = CREATE_OUSTRING ("(logwidth+0)/?235 "); aStringSequence[247] = CREATE_OUSTRING ("(?32 )/60000.0"); aStringSequence[248] = CREATE_OUSTRING ("(?97 )/60000.0"); aStringSequence[249] = CREATE_OUSTRING ("(?72 )/60000.0"); @@ -8291,15 +8291,15 @@ void CustomShapeProperties::initializePresetsMap1() { Sequence< OUString > aStringSequence (12); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width+0-?2 "); + aStringSequence[3] = CREATE_OUSTRING ("logwidth+0-?2 "); aStringSequence[4] = CREATE_OUSTRING ("?2 *29289/100000"); - aStringSequence[5] = CREATE_OUSTRING ("width+0-?4 "); - aStringSequence[6] = CREATE_OUSTRING ("width/2"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); - aStringSequence[8] = CREATE_OUSTRING ("height"); - aStringSequence[9] = CREATE_OUSTRING ("width"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth+0-?4 "); + aStringSequence[6] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[8] = CREATE_OUSTRING ("logheight"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth"); aStringSequence[10] = CREATE_OUSTRING ("(16200000)/60000.0"); aStringSequence[11] = CREATE_OUSTRING ("(5400000)/60000.0"); aPropertyMap [PROP_Equations] <<= aStringSequence; @@ -8553,37 +8553,37 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[17] = CREATE_OUSTRING ("100000+0-?13 "); aStringSequence[18] = CREATE_OUSTRING ("100000+0-?14 "); aStringSequence[19] = CREATE_OUSTRING ("100000+0-?15 "); - aStringSequence[20] = CREATE_OUSTRING ("width*18436/21600"); - aStringSequence[21] = CREATE_OUSTRING ("height*3163/21600"); - aStringSequence[22] = CREATE_OUSTRING ("width*3163/21600"); - aStringSequence[23] = CREATE_OUSTRING ("height*18436/21600"); - aStringSequence[24] = CREATE_OUSTRING ("width*?9 /100000"); - aStringSequence[25] = CREATE_OUSTRING ("width*?10 /100000"); - aStringSequence[26] = CREATE_OUSTRING ("width*?11 /100000"); - aStringSequence[27] = CREATE_OUSTRING ("width*?13 /100000"); - aStringSequence[28] = CREATE_OUSTRING ("width*?14 /100000"); - aStringSequence[29] = CREATE_OUSTRING ("width*?15 /100000"); - aStringSequence[30] = CREATE_OUSTRING ("width*?16 /100000"); - aStringSequence[31] = CREATE_OUSTRING ("width*?17 /100000"); - aStringSequence[32] = CREATE_OUSTRING ("width*?18 /100000"); - aStringSequence[33] = CREATE_OUSTRING ("width*?19 /100000"); - aStringSequence[34] = CREATE_OUSTRING ("width*?0 /100000"); - aStringSequence[35] = CREATE_OUSTRING ("width*?1 /100000"); - aStringSequence[36] = CREATE_OUSTRING ("height*?1 /100000"); - aStringSequence[37] = CREATE_OUSTRING ("height*?9 /100000"); - aStringSequence[38] = CREATE_OUSTRING ("height*?10 /100000"); - aStringSequence[39] = CREATE_OUSTRING ("height*?11 /100000"); - aStringSequence[40] = CREATE_OUSTRING ("height*?13 /100000"); - aStringSequence[41] = CREATE_OUSTRING ("height*?14 /100000"); - aStringSequence[42] = CREATE_OUSTRING ("height*?15 /100000"); - aStringSequence[43] = CREATE_OUSTRING ("height*?16 /100000"); - aStringSequence[44] = CREATE_OUSTRING ("height*?17 /100000"); - aStringSequence[45] = CREATE_OUSTRING ("height*?18 /100000"); - aStringSequence[46] = CREATE_OUSTRING ("height*?19 /100000"); - aStringSequence[47] = CREATE_OUSTRING ("height/2"); - aStringSequence[48] = CREATE_OUSTRING ("width/2"); - aStringSequence[49] = CREATE_OUSTRING ("height"); - aStringSequence[50] = CREATE_OUSTRING ("width"); + aStringSequence[20] = CREATE_OUSTRING ("logwidth*18436/21600"); + aStringSequence[21] = CREATE_OUSTRING ("logheight*3163/21600"); + aStringSequence[22] = CREATE_OUSTRING ("logwidth*3163/21600"); + aStringSequence[23] = CREATE_OUSTRING ("logheight*18436/21600"); + aStringSequence[24] = CREATE_OUSTRING ("logwidth*?9 /100000"); + aStringSequence[25] = CREATE_OUSTRING ("logwidth*?10 /100000"); + aStringSequence[26] = CREATE_OUSTRING ("logwidth*?11 /100000"); + aStringSequence[27] = CREATE_OUSTRING ("logwidth*?13 /100000"); + aStringSequence[28] = CREATE_OUSTRING ("logwidth*?14 /100000"); + aStringSequence[29] = CREATE_OUSTRING ("logwidth*?15 /100000"); + aStringSequence[30] = CREATE_OUSTRING ("logwidth*?16 /100000"); + aStringSequence[31] = CREATE_OUSTRING ("logwidth*?17 /100000"); + aStringSequence[32] = CREATE_OUSTRING ("logwidth*?18 /100000"); + aStringSequence[33] = CREATE_OUSTRING ("logwidth*?19 /100000"); + aStringSequence[34] = CREATE_OUSTRING ("logwidth*?0 /100000"); + aStringSequence[35] = CREATE_OUSTRING ("logwidth*?1 /100000"); + aStringSequence[36] = CREATE_OUSTRING ("logheight*?1 /100000"); + aStringSequence[37] = CREATE_OUSTRING ("logheight*?9 /100000"); + aStringSequence[38] = CREATE_OUSTRING ("logheight*?10 /100000"); + aStringSequence[39] = CREATE_OUSTRING ("logheight*?11 /100000"); + aStringSequence[40] = CREATE_OUSTRING ("logheight*?13 /100000"); + aStringSequence[41] = CREATE_OUSTRING ("logheight*?14 /100000"); + aStringSequence[42] = CREATE_OUSTRING ("logheight*?15 /100000"); + aStringSequence[43] = CREATE_OUSTRING ("logheight*?16 /100000"); + aStringSequence[44] = CREATE_OUSTRING ("logheight*?17 /100000"); + aStringSequence[45] = CREATE_OUSTRING ("logheight*?18 /100000"); + aStringSequence[46] = CREATE_OUSTRING ("logheight*?19 /100000"); + aStringSequence[47] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[48] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[49] = CREATE_OUSTRING ("logheight"); + aStringSequence[50] = CREATE_OUSTRING ("logwidth"); aStringSequence[51] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[52] = CREATE_OUSTRING ("(21600000)/60000.0"); aPropertyMap [PROP_Equations] <<= aStringSequence; @@ -9328,17 +9328,17 @@ void CustomShapeProperties::initializePresetsMap1() { Sequence< OUString > aStringSequence (20); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width+0-?2 "); - aStringSequence[4] = CREATE_OUSTRING ("height+0-?2 "); + aStringSequence[3] = CREATE_OUSTRING ("logwidth+0-?2 "); + aStringSequence[4] = CREATE_OUSTRING ("logheight+0-?2 "); aStringSequence[5] = CREATE_OUSTRING ("?2 *70711/100000"); - aStringSequence[6] = CREATE_OUSTRING ("width+0-?5 "); - aStringSequence[7] = CREATE_OUSTRING ("height+0-?5 "); - aStringSequence[8] = CREATE_OUSTRING ("width/2"); - aStringSequence[9] = CREATE_OUSTRING ("height/2"); - aStringSequence[10] = CREATE_OUSTRING ("height"); - aStringSequence[11] = CREATE_OUSTRING ("width"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth+0-?5 "); + aStringSequence[7] = CREATE_OUSTRING ("logheight+0-?5 "); + aStringSequence[8] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[9] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[10] = CREATE_OUSTRING ("logheight"); + aStringSequence[11] = CREATE_OUSTRING ("logwidth"); aStringSequence[12] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[13] = CREATE_OUSTRING ("(-5400000)/60000.0"); aStringSequence[14] = CREATE_OUSTRING ("(10800000)/60000.0"); @@ -9710,18 +9710,18 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (12); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("100000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("100000*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("?0 *?2 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("width+0-?3 "); + aStringSequence[4] = CREATE_OUSTRING ("logwidth+0-?3 "); aStringSequence[5] = CREATE_OUSTRING ("?4 *1/2"); aStringSequence[6] = CREATE_OUSTRING ("?4 +0-?3 "); aStringSequence[7] = CREATE_OUSTRING ("if(?6 ,?3 ,0)"); - aStringSequence[8] = CREATE_OUSTRING ("if(?6 ,?4 ,width)"); - aStringSequence[9] = CREATE_OUSTRING ("height/2"); - aStringSequence[10] = CREATE_OUSTRING ("height"); - aStringSequence[11] = CREATE_OUSTRING ("width"); + aStringSequence[8] = CREATE_OUSTRING ("if(?6 ,?4 ,logwidth)"); + aStringSequence[9] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[10] = CREATE_OUSTRING ("logheight"); + aStringSequence[11] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -9937,12 +9937,12 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (6); - aStringSequence[0] = CREATE_OUSTRING ("width*4/5"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); - aStringSequence[3] = CREATE_OUSTRING ("height"); - aStringSequence[4] = CREATE_OUSTRING ("width"); - aStringSequence[5] = CREATE_OUSTRING ("width/5"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*4/5"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/5"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -10119,16 +10119,16 @@ void CustomShapeProperties::initializePresetsMap1() { Sequence< OUString > aStringSequence (11); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(100000-$0 ,$0 ,100000))"); - aStringSequence[1] = CREATE_OUSTRING ("width*?0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*?0 /100000"); aStringSequence[2] = CREATE_OUSTRING ("?1 *1/2"); - aStringSequence[3] = CREATE_OUSTRING ("(?1 +width)/2"); - aStringSequence[4] = CREATE_OUSTRING ("height*?0 /100000"); + aStringSequence[3] = CREATE_OUSTRING ("(?1 +logwidth)/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight*?0 /100000"); aStringSequence[5] = CREATE_OUSTRING ("?4 *1/2"); - aStringSequence[6] = CREATE_OUSTRING ("(?4 +height)/2"); - aStringSequence[7] = CREATE_OUSTRING ("width/2"); - aStringSequence[8] = CREATE_OUSTRING ("height/2"); - aStringSequence[9] = CREATE_OUSTRING ("width"); - aStringSequence[10] = CREATE_OUSTRING ("height"); + aStringSequence[6] = CREATE_OUSTRING ("(?4 +logheight)/2"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[8] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth"); + aStringSequence[10] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -10316,17 +10316,17 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (19); - aStringSequence[0] = CREATE_OUSTRING ("width/2"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[1] = CREATE_OUSTRING ("?0 *$0 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 *$1 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("height/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight/2"); aStringSequence[5] = CREATE_OUSTRING ("?4 *$1 /100000"); aStringSequence[6] = CREATE_OUSTRING ("?1 *cos(pi*(1080000)/10800000)"); aStringSequence[7] = CREATE_OUSTRING ("?1 *cos(pi*(18360000)/10800000)"); aStringSequence[8] = CREATE_OUSTRING ("?3 *sin(pi*(1080000)/10800000)"); aStringSequence[9] = CREATE_OUSTRING ("?3 *sin(pi*(18360000)/10800000)"); - aStringSequence[10] = CREATE_OUSTRING ("width/2"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[11] = CREATE_OUSTRING ("?10 +0-?6 "); aStringSequence[12] = CREATE_OUSTRING ("?10 +0-?7 "); aStringSequence[13] = CREATE_OUSTRING ("?10 +?7 -0"); @@ -10334,7 +10334,7 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[15] = CREATE_OUSTRING ("?5 +0-?8 "); aStringSequence[16] = CREATE_OUSTRING ("?5 +0-?9 "); aStringSequence[17] = CREATE_OUSTRING ("?15 *?7 /?6 "); - aStringSequence[18] = CREATE_OUSTRING ("height"); + aStringSequence[18] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -10488,11 +10488,11 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (43); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[1] = CREATE_OUSTRING ("?0 *1/20"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +0-?1 "); - aStringSequence[4] = CREATE_OUSTRING ("height/4"); + aStringSequence[4] = CREATE_OUSTRING ("logheight/4"); aStringSequence[5] = CREATE_OUSTRING ("?4 +0-?1 "); aStringSequence[6] = CREATE_OUSTRING ("?2 *cos(pi*(480000)/10800000)"); aStringSequence[7] = CREATE_OUSTRING ("?4 *sin(pi*(480000)/10800000)"); @@ -10509,7 +10509,7 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[18] = CREATE_OUSTRING ("?2 *?4 /?17 "); aStringSequence[19] = CREATE_OUSTRING ("?18 *cos(pi*(?10 )/10800000)"); aStringSequence[20] = CREATE_OUSTRING ("?18 *sin(pi*(?10 )/10800000)"); - aStringSequence[21] = CREATE_OUSTRING ("width/2"); + aStringSequence[21] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[22] = CREATE_OUSTRING ("?21 +?19 -0"); aStringSequence[23] = CREATE_OUSTRING ("?4 +?20 -0"); aStringSequence[24] = CREATE_OUSTRING ("?14 *cos(pi*(?8 )/10800000)"); @@ -10519,12 +10519,12 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[28] = CREATE_OUSTRING ("?27 *cos(pi*(?8 )/10800000)"); aStringSequence[29] = CREATE_OUSTRING ("?27 *sin(pi*(?8 )/10800000)"); aStringSequence[30] = CREATE_OUSTRING ("?21 +?28 -0"); - aStringSequence[31] = CREATE_OUSTRING ("height+0-?14 "); + aStringSequence[31] = CREATE_OUSTRING ("logheight+0-?14 "); aStringSequence[32] = CREATE_OUSTRING ("?31 +?29 -0"); aStringSequence[33] = CREATE_OUSTRING ("?2 +0-?3 "); aStringSequence[34] = CREATE_OUSTRING ("10800000*2/1"); - aStringSequence[35] = CREATE_OUSTRING ("width"); - aStringSequence[36] = CREATE_OUSTRING ("height"); + aStringSequence[35] = CREATE_OUSTRING ("logwidth"); + aStringSequence[36] = CREATE_OUSTRING ("logheight"); aStringSequence[37] = CREATE_OUSTRING ("(?10 )/60000.0"); aStringSequence[38] = CREATE_OUSTRING ("(?11 )/60000.0"); aStringSequence[39] = CREATE_OUSTRING ("(?8 )/60000.0"); @@ -11093,14 +11093,14 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (8); - aStringSequence[0] = CREATE_OUSTRING ("height*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("width*$1 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("height*$2 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width*$3 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("width"); - aStringSequence[5] = CREATE_OUSTRING ("height/2"); - aStringSequence[6] = CREATE_OUSTRING ("width/2"); - aStringSequence[7] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*$1 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*$2 /100000"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*$3 /100000"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth"); + aStringSequence[5] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -11500,21 +11500,21 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (15); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("100000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("100000*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(100000-$0 ,$0 ,100000))"); aStringSequence[3] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[4] = CREATE_OUSTRING ("?0 *?3 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("width+0-?4 "); - aStringSequence[6] = CREATE_OUSTRING ("height*?2 /200000"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth+0-?4 "); + aStringSequence[6] = CREATE_OUSTRING ("logheight*?2 /200000"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?6 "); aStringSequence[9] = CREATE_OUSTRING ("?7 +?6 -0"); - aStringSequence[10] = CREATE_OUSTRING ("height/2"); + aStringSequence[10] = CREATE_OUSTRING ("logheight/2"); aStringSequence[11] = CREATE_OUSTRING ("?6 *?4 /?10 "); - aStringSequence[12] = CREATE_OUSTRING ("width+0-?11 "); - aStringSequence[13] = CREATE_OUSTRING ("width"); - aStringSequence[14] = CREATE_OUSTRING ("height"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth+0-?11 "); + aStringSequence[13] = CREATE_OUSTRING ("logwidth"); + aStringSequence[14] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -11814,20 +11814,20 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (22); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*height/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logheight/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("?0 *?2 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("height+0-?3 "); - aStringSequence[5] = CREATE_OUSTRING ("width*cos(pi*(2700000)/10800000)"); + aStringSequence[4] = CREATE_OUSTRING ("logheight+0-?3 "); + aStringSequence[5] = CREATE_OUSTRING ("logwidth*cos(pi*(2700000)/10800000)"); aStringSequence[6] = CREATE_OUSTRING ("?3 *sin(pi*(2700000)/10800000)"); aStringSequence[7] = CREATE_OUSTRING ("0+?5 -0"); aStringSequence[8] = CREATE_OUSTRING ("?3 +0-?6 "); - aStringSequence[9] = CREATE_OUSTRING ("height+?6 -?3 "); - aStringSequence[10] = CREATE_OUSTRING ("width"); - aStringSequence[11] = CREATE_OUSTRING ("height"); - aStringSequence[12] = CREATE_OUSTRING ("height/2"); - aStringSequence[13] = CREATE_OUSTRING ("width"); + aStringSequence[9] = CREATE_OUSTRING ("logheight+?6 -?3 "); + aStringSequence[10] = CREATE_OUSTRING ("logwidth"); + aStringSequence[11] = CREATE_OUSTRING ("logheight"); + aStringSequence[12] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[13] = CREATE_OUSTRING ("logwidth"); aStringSequence[14] = CREATE_OUSTRING ("(16200000)/60000.0"); aStringSequence[15] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[16] = CREATE_OUSTRING ("(0)/60000.0"); @@ -12207,11 +12207,11 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (5); - aStringSequence[0] = CREATE_OUSTRING ("height*4/5"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); - aStringSequence[3] = CREATE_OUSTRING ("height"); - aStringSequence[4] = CREATE_OUSTRING ("width"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*4/5"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -12373,22 +12373,22 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (16); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(100000-$0 ,$0 ,100000))"); aStringSequence[3] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[4] = CREATE_OUSTRING ("?0 *?3 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("width+0-?4 "); - aStringSequence[6] = CREATE_OUSTRING ("height*?2 /200000"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth+0-?4 "); + aStringSequence[6] = CREATE_OUSTRING ("logheight*?2 /200000"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?6 "); aStringSequence[9] = CREATE_OUSTRING ("?7 +?6 -0"); - aStringSequence[10] = CREATE_OUSTRING ("height/2"); + aStringSequence[10] = CREATE_OUSTRING ("logheight/2"); aStringSequence[11] = CREATE_OUSTRING ("?8 *?4 /?10 "); aStringSequence[12] = CREATE_OUSTRING ("?4 +0-?11 "); aStringSequence[13] = CREATE_OUSTRING ("?5 +?11 -0"); - aStringSequence[14] = CREATE_OUSTRING ("width"); - aStringSequence[15] = CREATE_OUSTRING ("height"); + aStringSequence[14] = CREATE_OUSTRING ("logwidth"); + aStringSequence[15] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -12724,24 +12724,24 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (18); - aStringSequence[0] = CREATE_OUSTRING ("height/2"); + aStringSequence[0] = CREATE_OUSTRING ("logheight/2"); aStringSequence[1] = CREATE_OUSTRING ("?0 *$0 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 *cos(pi*(2160000)/10800000)"); aStringSequence[4] = CREATE_OUSTRING ("?2 *cos(pi*(4320000)/10800000)"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?3 "); aStringSequence[7] = CREATE_OUSTRING ("?5 +0-?4 "); aStringSequence[8] = CREATE_OUSTRING ("?5 +?4 -0"); aStringSequence[9] = CREATE_OUSTRING ("?5 +?3 -0"); aStringSequence[10] = CREATE_OUSTRING ("?1 *sin(pi*(4320000)/10800000)"); aStringSequence[11] = CREATE_OUSTRING ("?1 *sin(pi*(2160000)/10800000)"); - aStringSequence[12] = CREATE_OUSTRING ("height/2"); + aStringSequence[12] = CREATE_OUSTRING ("logheight/2"); aStringSequence[13] = CREATE_OUSTRING ("?12 +0-?10 "); aStringSequence[14] = CREATE_OUSTRING ("?12 +0-?11 "); aStringSequence[15] = CREATE_OUSTRING ("?12 +?11 -0"); aStringSequence[16] = CREATE_OUSTRING ("?12 +?10 -0"); - aStringSequence[17] = CREATE_OUSTRING ("width"); + aStringSequence[17] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -12985,11 +12985,11 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (68); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[1] = CREATE_OUSTRING ("?0 *3/8"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +0-?1 "); - aStringSequence[4] = CREATE_OUSTRING ("width/2"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[5] = CREATE_OUSTRING ("?4 +0-?1 "); aStringSequence[6] = CREATE_OUSTRING ("?0 *3/4"); aStringSequence[7] = CREATE_OUSTRING ("?6 *1/7"); @@ -13009,8 +13009,8 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[21] = CREATE_OUSTRING ("?5 +?11 -0"); aStringSequence[22] = CREATE_OUSTRING ("?6 *1/14"); aStringSequence[23] = CREATE_OUSTRING ("?6 *3/28"); - aStringSequence[24] = CREATE_OUSTRING ("width"); - aStringSequence[25] = CREATE_OUSTRING ("height"); + aStringSequence[24] = CREATE_OUSTRING ("logwidth"); + aStringSequence[25] = CREATE_OUSTRING ("logheight"); aStringSequence[26] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[27] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[28] = CREATE_OUSTRING ("(0)/60000.0"); @@ -14483,21 +14483,21 @@ void CustomShapeProperties::initializePresetsMap1() { Sequence< OUString > aStringSequence (85); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[2] = CREATE_OUSTRING ("?1 *cos(pi*(900000)/10800000)"); aStringSequence[3] = CREATE_OUSTRING ("?1 *cos(pi*(1800000)/10800000)"); aStringSequence[4] = CREATE_OUSTRING ("?1 *cos(pi*(2700000)/10800000)"); - aStringSequence[5] = CREATE_OUSTRING ("width/4"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/4"); aStringSequence[6] = CREATE_OUSTRING ("?5 "); aStringSequence[7] = CREATE_OUSTRING ("?1 *cos(pi*(4500000)/10800000)"); - aStringSequence[8] = CREATE_OUSTRING ("height/2"); + aStringSequence[8] = CREATE_OUSTRING ("logheight/2"); aStringSequence[9] = CREATE_OUSTRING ("?8 *sin(pi*(4500000)/10800000)"); aStringSequence[10] = CREATE_OUSTRING ("?8 *sin(pi*(3600000)/10800000)"); aStringSequence[11] = CREATE_OUSTRING ("?8 *sin(pi*(2700000)/10800000)"); - aStringSequence[12] = CREATE_OUSTRING ("height/4"); + aStringSequence[12] = CREATE_OUSTRING ("logheight/4"); aStringSequence[13] = CREATE_OUSTRING ("?12 "); aStringSequence[14] = CREATE_OUSTRING ("?8 *sin(pi*(900000)/10800000)"); - aStringSequence[15] = CREATE_OUSTRING ("width/2"); + aStringSequence[15] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[16] = CREATE_OUSTRING ("?15 +0-?2 "); aStringSequence[17] = CREATE_OUSTRING ("?15 +0-?3 "); aStringSequence[18] = CREATE_OUSTRING ("?15 +0-?4 "); @@ -14508,7 +14508,7 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[23] = CREATE_OUSTRING ("?15 +?4 -0"); aStringSequence[24] = CREATE_OUSTRING ("?15 +?3 -0"); aStringSequence[25] = CREATE_OUSTRING ("?15 +?2 -0"); - aStringSequence[26] = CREATE_OUSTRING ("height/2"); + aStringSequence[26] = CREATE_OUSTRING ("logheight/2"); aStringSequence[27] = CREATE_OUSTRING ("?26 +0-?9 "); aStringSequence[28] = CREATE_OUSTRING ("?26 +0-?10 "); aStringSequence[29] = CREATE_OUSTRING ("?26 +0-?11 "); @@ -14564,9 +14564,9 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[79] = CREATE_OUSTRING ("?15 +?75 -0"); aStringSequence[80] = CREATE_OUSTRING ("?26 +?76 -0"); aStringSequence[81] = CREATE_OUSTRING ("?26 +0-?38 "); - aStringSequence[82] = CREATE_OUSTRING ("min(width,height)/50"); - aStringSequence[83] = CREATE_OUSTRING ("height"); - aStringSequence[84] = CREATE_OUSTRING ("width"); + aStringSequence[82] = CREATE_OUSTRING ("min(logwidth,logheight)/50"); + aStringSequence[83] = CREATE_OUSTRING ("logheight"); + aStringSequence[84] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -15553,28 +15553,28 @@ void CustomShapeProperties::initializePresetsMap1() aStringSequence[0] = CREATE_OUSTRING ("if(1000-$0 ,1000,if(36745-$0 ,$0 ,36745))"); aStringSequence[1] = CREATE_OUSTRING ("0+0-?0 "); aStringSequence[2] = CREATE_OUSTRING ("(73490+?1 )/4"); - aStringSequence[3] = CREATE_OUSTRING ("36745*width/height"); + aStringSequence[3] = CREATE_OUSTRING ("36745*logwidth/logheight"); aStringSequence[4] = CREATE_OUSTRING ("min(?2 ,?3 )"); aStringSequence[5] = CREATE_OUSTRING ("if(1000-$2 ,1000,if(?4 -$2 ,$2 ,?4 ))"); aStringSequence[6] = CREATE_OUSTRING ("-4*?5 /1"); aStringSequence[7] = CREATE_OUSTRING ("73490+?6 -?0 "); aStringSequence[8] = CREATE_OUSTRING ("if(0-$1 ,0,if(?7 -$1 ,$1 ,?7 ))"); - aStringSequence[9] = CREATE_OUSTRING ("height*?0 /200000"); - aStringSequence[10] = CREATE_OUSTRING ("height*?8 /100000"); - aStringSequence[11] = CREATE_OUSTRING ("height*?5 /100000"); - aStringSequence[12] = CREATE_OUSTRING ("width*73490/200000"); - aStringSequence[13] = CREATE_OUSTRING ("height/2"); + aStringSequence[9] = CREATE_OUSTRING ("logheight*?0 /200000"); + aStringSequence[10] = CREATE_OUSTRING ("logheight*?8 /100000"); + aStringSequence[11] = CREATE_OUSTRING ("logheight*?5 /100000"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth*73490/200000"); + aStringSequence[13] = CREATE_OUSTRING ("logheight/2"); aStringSequence[14] = CREATE_OUSTRING ("?13 +0-?9 "); aStringSequence[15] = CREATE_OUSTRING ("?13 +?9 -0"); aStringSequence[16] = CREATE_OUSTRING ("?10 +?11 -0"); aStringSequence[17] = CREATE_OUSTRING ("?14 +0-?16 "); aStringSequence[18] = CREATE_OUSTRING ("?17 +0-?11 "); - aStringSequence[19] = CREATE_OUSTRING ("height+0-?18 "); - aStringSequence[20] = CREATE_OUSTRING ("width/2"); + aStringSequence[19] = CREATE_OUSTRING ("logheight+0-?18 "); + aStringSequence[20] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[21] = CREATE_OUSTRING ("?20 +0-?12 "); aStringSequence[22] = CREATE_OUSTRING ("?20 +?12 -0"); aStringSequence[23] = CREATE_OUSTRING ("?20 +0-?11 "); - aStringSequence[24] = CREATE_OUSTRING ("width"); + aStringSequence[24] = CREATE_OUSTRING ("logwidth"); aStringSequence[25] = CREATE_OUSTRING ("(16200000)/60000.0"); aStringSequence[26] = CREATE_OUSTRING ("(21600000)/60000.0"); aStringSequence[27] = CREATE_OUSTRING ("(5400000)/60000.0"); @@ -15998,18 +15998,18 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (12); - aStringSequence[0] = CREATE_OUSTRING ("width*$0 /100000"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*$0 /100000"); aStringSequence[1] = CREATE_OUSTRING ("(0+?0 )/2"); - aStringSequence[2] = CREATE_OUSTRING ("(width+?0 )/2"); + aStringSequence[2] = CREATE_OUSTRING ("(logwidth+?0 )/2"); aStringSequence[3] = CREATE_OUSTRING ("(?0 +?2 )/2"); - aStringSequence[4] = CREATE_OUSTRING ("(?2 +width)/2"); - aStringSequence[5] = CREATE_OUSTRING ("height*$1 /100000"); + aStringSequence[4] = CREATE_OUSTRING ("(?2 +logwidth)/2"); + aStringSequence[5] = CREATE_OUSTRING ("logheight*$1 /100000"); aStringSequence[6] = CREATE_OUSTRING ("(0+?5 )/2"); aStringSequence[7] = CREATE_OUSTRING ("(0+?6 )/2"); aStringSequence[8] = CREATE_OUSTRING ("(?6 +?5 )/2"); - aStringSequence[9] = CREATE_OUSTRING ("(height+?5 )/2"); - aStringSequence[10] = CREATE_OUSTRING ("width"); - aStringSequence[11] = CREATE_OUSTRING ("height"); + aStringSequence[9] = CREATE_OUSTRING ("(logheight+?5 )/2"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth"); + aStringSequence[11] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -16341,18 +16341,18 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (28); - aStringSequence[0] = CREATE_OUSTRING ("width/2"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[1] = CREATE_OUSTRING ("?0 *cos(pi*(2700000)/10800000)"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 *sin(pi*(2700000)/10800000)"); - aStringSequence[4] = CREATE_OUSTRING ("width/2"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[5] = CREATE_OUSTRING ("?4 +0-?1 "); aStringSequence[6] = CREATE_OUSTRING ("?4 +?1 -0"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?3 "); aStringSequence[9] = CREATE_OUSTRING ("?7 +?3 -0"); - aStringSequence[10] = CREATE_OUSTRING ("height"); - aStringSequence[11] = CREATE_OUSTRING ("width"); + aStringSequence[10] = CREATE_OUSTRING ("logheight"); + aStringSequence[11] = CREATE_OUSTRING ("logwidth"); aStringSequence[12] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[13] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[14] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -16926,18 +16926,18 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (12); - aStringSequence[0] = CREATE_OUSTRING ("height*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("width*$1 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("height*$2 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width*$3 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("height*$4 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("width*$5 /100000"); - aStringSequence[6] = CREATE_OUSTRING ("height*$6 /100000"); - aStringSequence[7] = CREATE_OUSTRING ("width*$7 /100000"); - aStringSequence[8] = CREATE_OUSTRING ("width"); - aStringSequence[9] = CREATE_OUSTRING ("height/2"); - aStringSequence[10] = CREATE_OUSTRING ("width/2"); - aStringSequence[11] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*$1 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*$2 /100000"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*$3 /100000"); + aStringSequence[4] = CREATE_OUSTRING ("logheight*$4 /100000"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth*$5 /100000"); + aStringSequence[6] = CREATE_OUSTRING ("logheight*$6 /100000"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth*$7 /100000"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth"); + aStringSequence[9] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[11] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -17445,32 +17445,32 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (26); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("?2 *2/1"); aStringSequence[4] = CREATE_OUSTRING ("if(0-$0 ,0,if(?3 -$0 ,$0 ,?3 ))"); - aStringSequence[5] = CREATE_OUSTRING ("50000*height/?0 "); + aStringSequence[5] = CREATE_OUSTRING ("50000*logheight/?0 "); aStringSequence[6] = CREATE_OUSTRING ("if(0-$2 ,0,if(?5 -$2 ,$2 ,?5 ))"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); aStringSequence[8] = CREATE_OUSTRING ("?6 *?0 /?7 "); aStringSequence[9] = CREATE_OUSTRING ("100000+0-?8 "); aStringSequence[10] = CREATE_OUSTRING ("if(0-$3 ,0,if(?9 -$3 ,$3 ,?9 ))"); aStringSequence[11] = CREATE_OUSTRING ("?0 *?2 /100000"); aStringSequence[12] = CREATE_OUSTRING ("?0 *?4 /200000"); - aStringSequence[13] = CREATE_OUSTRING ("width/2"); + aStringSequence[13] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[14] = CREATE_OUSTRING ("?13 +0-?11 "); aStringSequence[15] = CREATE_OUSTRING ("?13 +0-?12 "); aStringSequence[16] = CREATE_OUSTRING ("?13 +?12 -0"); aStringSequence[17] = CREATE_OUSTRING ("?13 +?11 -0"); aStringSequence[18] = CREATE_OUSTRING ("?0 *?6 /100000"); - aStringSequence[19] = CREATE_OUSTRING ("height+0-?18 "); - aStringSequence[20] = CREATE_OUSTRING ("height*?10 /200000"); - aStringSequence[21] = CREATE_OUSTRING ("height/2"); + aStringSequence[19] = CREATE_OUSTRING ("logheight+0-?18 "); + aStringSequence[20] = CREATE_OUSTRING ("logheight*?10 /200000"); + aStringSequence[21] = CREATE_OUSTRING ("logheight/2"); aStringSequence[22] = CREATE_OUSTRING ("?21 +0-?20 "); aStringSequence[23] = CREATE_OUSTRING ("?21 +?20 -0"); - aStringSequence[24] = CREATE_OUSTRING ("width"); - aStringSequence[25] = CREATE_OUSTRING ("height"); + aStringSequence[24] = CREATE_OUSTRING ("logwidth"); + aStringSequence[25] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -18034,14 +18034,14 @@ void CustomShapeProperties::initializePresetsMap1() } { Sequence< OUString > aStringSequence (8); - aStringSequence[0] = CREATE_OUSTRING ("width*3/4"); - aStringSequence[1] = CREATE_OUSTRING ("height*3/4"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); - aStringSequence[3] = CREATE_OUSTRING ("height/2"); - aStringSequence[4] = CREATE_OUSTRING ("height"); - aStringSequence[5] = CREATE_OUSTRING ("width"); - aStringSequence[6] = CREATE_OUSTRING ("width/4"); - aStringSequence[7] = CREATE_OUSTRING ("height/4"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4"); + aStringSequence[1] = CREATE_OUSTRING ("logheight*3/4"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth/4"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/4"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { diff --git a/oox/source/drawingml/customshapepresets2.cxx b/oox/source/drawingml/customshapepresets2.cxx index 74b5ee13a93e..f7ddd2ad7362 100644 --- a/oox/source/drawingml/customshapepresets2.cxx +++ b/oox/source/drawingml/customshapepresets2.cxx @@ -44,32 +44,32 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (26); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*height/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logheight/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("?2 *2/1"); aStringSequence[4] = CREATE_OUSTRING ("if(0-$0 ,0,if(?3 -$0 ,$0 ,?3 ))"); - aStringSequence[5] = CREATE_OUSTRING ("50000*width/?0 "); + aStringSequence[5] = CREATE_OUSTRING ("50000*logwidth/?0 "); aStringSequence[6] = CREATE_OUSTRING ("if(0-$2 ,0,if(?5 -$2 ,$2 ,?5 ))"); - aStringSequence[7] = CREATE_OUSTRING ("width/2"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[8] = CREATE_OUSTRING ("?6 *?0 /?7 "); aStringSequence[9] = CREATE_OUSTRING ("100000+0-?8 "); aStringSequence[10] = CREATE_OUSTRING ("if(0-$3 ,0,if(?9 -$3 ,$3 ,?9 ))"); aStringSequence[11] = CREATE_OUSTRING ("?0 *?2 /100000"); aStringSequence[12] = CREATE_OUSTRING ("?0 *?4 /200000"); - aStringSequence[13] = CREATE_OUSTRING ("height/2"); + aStringSequence[13] = CREATE_OUSTRING ("logheight/2"); aStringSequence[14] = CREATE_OUSTRING ("?13 +0-?11 "); aStringSequence[15] = CREATE_OUSTRING ("?13 +0-?12 "); aStringSequence[16] = CREATE_OUSTRING ("?13 +?12 -0"); aStringSequence[17] = CREATE_OUSTRING ("?13 +?11 -0"); aStringSequence[18] = CREATE_OUSTRING ("?0 *?6 /100000"); - aStringSequence[19] = CREATE_OUSTRING ("width+0-?18 "); - aStringSequence[20] = CREATE_OUSTRING ("width*?10 /200000"); - aStringSequence[21] = CREATE_OUSTRING ("width/2"); + aStringSequence[19] = CREATE_OUSTRING ("logwidth+0-?18 "); + aStringSequence[20] = CREATE_OUSTRING ("logwidth*?10 /200000"); + aStringSequence[21] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[22] = CREATE_OUSTRING ("?21 +0-?20 "); aStringSequence[23] = CREATE_OUSTRING ("?21 +?20 -0"); - aStringSequence[24] = CREATE_OUSTRING ("height"); - aStringSequence[25] = CREATE_OUSTRING ("width"); + aStringSequence[24] = CREATE_OUSTRING ("logheight"); + aStringSequence[25] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -633,13 +633,13 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (7); - aStringSequence[0] = CREATE_OUSTRING ("width*4/5"); - aStringSequence[1] = CREATE_OUSTRING ("width*9/10"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); - aStringSequence[3] = CREATE_OUSTRING ("width/10"); - aStringSequence[4] = CREATE_OUSTRING ("height/2"); - aStringSequence[5] = CREATE_OUSTRING ("height"); - aStringSequence[6] = CREATE_OUSTRING ("width/5"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*4/5"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*9/10"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth/10"); + aStringSequence[4] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[5] = CREATE_OUSTRING ("logheight"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth/5"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -785,16 +785,16 @@ void CustomShapeProperties::initializePresetsMap2() Sequence< OUString > aStringSequence (14); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); aStringSequence[1] = CREATE_OUSTRING ("if(0-$1 ,0,if(50000-$1 ,$1 ,50000))"); - aStringSequence[2] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[2] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[3] = CREATE_OUSTRING ("?2 *?0 /100000"); aStringSequence[4] = CREATE_OUSTRING ("?2 *?1 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("width+0-?4 "); + aStringSequence[5] = CREATE_OUSTRING ("logwidth+0-?4 "); aStringSequence[6] = CREATE_OUSTRING ("?3 *29289/100000"); - aStringSequence[7] = CREATE_OUSTRING ("(?5 +width)/2"); - aStringSequence[8] = CREATE_OUSTRING ("width"); - aStringSequence[9] = CREATE_OUSTRING ("height/2"); - aStringSequence[10] = CREATE_OUSTRING ("width/2"); - aStringSequence[11] = CREATE_OUSTRING ("height"); + aStringSequence[7] = CREATE_OUSTRING ("(?5 +logwidth)/2"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth"); + aStringSequence[9] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[11] = CREATE_OUSTRING ("logheight"); aStringSequence[12] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[13] = CREATE_OUSTRING ("(5400000)/60000.0"); aPropertyMap [PROP_Equations] <<= aStringSequence; @@ -1103,16 +1103,16 @@ void CustomShapeProperties::initializePresetsMap2() { Sequence< OUString > aStringSequence (15); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(73490-$0 ,$0 ,73490))"); - aStringSequence[1] = CREATE_OUSTRING ("width*73490/200000"); - aStringSequence[2] = CREATE_OUSTRING ("height*73490/200000"); - aStringSequence[3] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*73490/200000"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*73490/200000"); + aStringSequence[3] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[4] = CREATE_OUSTRING ("?3 *?0 /200000"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?1 "); aStringSequence[7] = CREATE_OUSTRING ("?5 +0-?4 "); aStringSequence[8] = CREATE_OUSTRING ("?5 +?4 -0"); aStringSequence[9] = CREATE_OUSTRING ("?5 +?1 -0"); - aStringSequence[10] = CREATE_OUSTRING ("height/2"); + aStringSequence[10] = CREATE_OUSTRING ("logheight/2"); aStringSequence[11] = CREATE_OUSTRING ("?10 +0-?2 "); aStringSequence[12] = CREATE_OUSTRING ("?10 +0-?4 "); aStringSequence[13] = CREATE_OUSTRING ("?10 +?4 -0"); @@ -1440,16 +1440,16 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (10); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[1] = CREATE_OUSTRING ("?0 *3/8"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +0-?1 "); aStringSequence[4] = CREATE_OUSTRING ("?2 +?1 -0"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?1 "); aStringSequence[7] = CREATE_OUSTRING ("?5 +?1 -0"); - aStringSequence[8] = CREATE_OUSTRING ("width"); - aStringSequence[9] = CREATE_OUSTRING ("height"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth"); + aStringSequence[9] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -1925,17 +1925,17 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (25); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*height/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logheight/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("?0 *?2 /200000"); aStringSequence[4] = CREATE_OUSTRING ("?3 +?3 -0"); - aStringSequence[5] = CREATE_OUSTRING ("height+0-?3 "); - aStringSequence[6] = CREATE_OUSTRING ("width/2"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); - aStringSequence[8] = CREATE_OUSTRING ("height"); - aStringSequence[9] = CREATE_OUSTRING ("width"); - aStringSequence[10] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logheight+0-?3 "); + aStringSequence[6] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[8] = CREATE_OUSTRING ("logheight"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[11] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[12] = CREATE_OUSTRING ("(-10800000)/60000.0"); aStringSequence[13] = CREATE_OUSTRING ("(0)/60000.0"); @@ -2500,17 +2500,17 @@ void CustomShapeProperties::initializePresetsMap2() { Sequence< OUString > aStringSequence (12); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); aStringSequence[3] = CREATE_OUSTRING ("?2 *1/5"); - aStringSequence[4] = CREATE_OUSTRING ("width+0-?2 "); + aStringSequence[4] = CREATE_OUSTRING ("logwidth+0-?2 "); aStringSequence[5] = CREATE_OUSTRING ("?4 +?3 -0"); - aStringSequence[6] = CREATE_OUSTRING ("height+0-?2 "); + aStringSequence[6] = CREATE_OUSTRING ("logheight+0-?2 "); aStringSequence[7] = CREATE_OUSTRING ("?6 +?3 -0"); - aStringSequence[8] = CREATE_OUSTRING ("height"); - aStringSequence[9] = CREATE_OUSTRING ("width/2"); - aStringSequence[10] = CREATE_OUSTRING ("height/2"); - aStringSequence[11] = CREATE_OUSTRING ("width"); + aStringSequence[8] = CREATE_OUSTRING ("logheight"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[10] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[11] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -2959,7 +2959,7 @@ void CustomShapeProperties::initializePresetsMap2() { Sequence< OUString > aStringSequence (107); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[2] = CREATE_OUSTRING ("?1 *98079/100000"); aStringSequence[3] = CREATE_OUSTRING ("?1 *92388/100000"); aStringSequence[4] = CREATE_OUSTRING ("?1 *83147/100000"); @@ -2967,7 +2967,7 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[6] = CREATE_OUSTRING ("?1 *55557/100000"); aStringSequence[7] = CREATE_OUSTRING ("?1 *38268/100000"); aStringSequence[8] = CREATE_OUSTRING ("?1 *19509/100000"); - aStringSequence[9] = CREATE_OUSTRING ("height/2"); + aStringSequence[9] = CREATE_OUSTRING ("logheight/2"); aStringSequence[10] = CREATE_OUSTRING ("?9 *98079/100000"); aStringSequence[11] = CREATE_OUSTRING ("?9 *92388/100000"); aStringSequence[12] = CREATE_OUSTRING ("?9 *83147/100000"); @@ -2975,7 +2975,7 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[14] = CREATE_OUSTRING ("?9 *55557/100000"); aStringSequence[15] = CREATE_OUSTRING ("?9 *38268/100000"); aStringSequence[16] = CREATE_OUSTRING ("?9 *19509/100000"); - aStringSequence[17] = CREATE_OUSTRING ("width/2"); + aStringSequence[17] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[18] = CREATE_OUSTRING ("?17 +0-?2 "); aStringSequence[19] = CREATE_OUSTRING ("?17 +0-?3 "); aStringSequence[20] = CREATE_OUSTRING ("?17 +0-?4 "); @@ -2990,7 +2990,7 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[29] = CREATE_OUSTRING ("?17 +?4 -0"); aStringSequence[30] = CREATE_OUSTRING ("?17 +?3 -0"); aStringSequence[31] = CREATE_OUSTRING ("?17 +?2 -0"); - aStringSequence[32] = CREATE_OUSTRING ("height/2"); + aStringSequence[32] = CREATE_OUSTRING ("logheight/2"); aStringSequence[33] = CREATE_OUSTRING ("?32 +0-?10 "); aStringSequence[34] = CREATE_OUSTRING ("?32 +0-?11 "); aStringSequence[35] = CREATE_OUSTRING ("?32 +0-?12 "); @@ -3062,9 +3062,9 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[101] = CREATE_OUSTRING ("?17 +?97 -0"); aStringSequence[102] = CREATE_OUSTRING ("?32 +?98 -0"); aStringSequence[103] = CREATE_OUSTRING ("?32 +0-?48 "); - aStringSequence[104] = CREATE_OUSTRING ("min(width,height)/50"); - aStringSequence[105] = CREATE_OUSTRING ("height"); - aStringSequence[106] = CREATE_OUSTRING ("width"); + aStringSequence[104] = CREATE_OUSTRING ("min(logwidth,logheight)/50"); + aStringSequence[105] = CREATE_OUSTRING ("logheight"); + aStringSequence[106] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -4324,12 +4324,12 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (6); - aStringSequence[0] = CREATE_OUSTRING ("width/2"); - aStringSequence[1] = CREATE_OUSTRING ("height/2"); - aStringSequence[2] = CREATE_OUSTRING ("height"); - aStringSequence[3] = CREATE_OUSTRING ("width"); - aStringSequence[4] = CREATE_OUSTRING ("width/8"); - aStringSequence[5] = CREATE_OUSTRING ("height/8"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[1] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth/8"); + aStringSequence[5] = CREATE_OUSTRING ("logheight/8"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -4683,23 +4683,23 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (17); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*height/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logheight/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(100000-$0 ,$0 ,100000))"); aStringSequence[3] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[4] = CREATE_OUSTRING ("?0 *?3 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("height+0-?4 "); - aStringSequence[6] = CREATE_OUSTRING ("width*?2 /200000"); - aStringSequence[7] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logheight+0-?4 "); + aStringSequence[6] = CREATE_OUSTRING ("logwidth*?2 /200000"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?6 "); aStringSequence[9] = CREATE_OUSTRING ("?7 +?6 -0"); - aStringSequence[10] = CREATE_OUSTRING ("width/2"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[11] = CREATE_OUSTRING ("?8 *?4 /?10 "); aStringSequence[12] = CREATE_OUSTRING ("?4 +0-?11 "); aStringSequence[13] = CREATE_OUSTRING ("?5 +?11 -0"); - aStringSequence[14] = CREATE_OUSTRING ("height/2"); - aStringSequence[15] = CREATE_OUSTRING ("height"); - aStringSequence[16] = CREATE_OUSTRING ("width"); + aStringSequence[14] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[15] = CREATE_OUSTRING ("logheight"); + aStringSequence[16] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -5031,18 +5031,18 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (12); - aStringSequence[0] = CREATE_OUSTRING ("width*9722/21600"); - aStringSequence[1] = CREATE_OUSTRING ("width*5372/21600"); - aStringSequence[2] = CREATE_OUSTRING ("width*11612/21600"); - aStringSequence[3] = CREATE_OUSTRING ("width*14640/21600"); - aStringSequence[4] = CREATE_OUSTRING ("height*1887/21600"); - aStringSequence[5] = CREATE_OUSTRING ("height*6382/21600"); - aStringSequence[6] = CREATE_OUSTRING ("height*12877/21600"); - aStringSequence[7] = CREATE_OUSTRING ("height*19712/21600"); - aStringSequence[8] = CREATE_OUSTRING ("height*18842/21600"); - aStringSequence[9] = CREATE_OUSTRING ("height*15935/21600"); - aStringSequence[10] = CREATE_OUSTRING ("height*6645/21600"); - aStringSequence[11] = CREATE_OUSTRING ("width"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*9722/21600"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*5372/21600"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth*11612/21600"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*14640/21600"); + aStringSequence[4] = CREATE_OUSTRING ("logheight*1887/21600"); + aStringSequence[5] = CREATE_OUSTRING ("logheight*6382/21600"); + aStringSequence[6] = CREATE_OUSTRING ("logheight*12877/21600"); + aStringSequence[7] = CREATE_OUSTRING ("logheight*19712/21600"); + aStringSequence[8] = CREATE_OUSTRING ("logheight*18842/21600"); + aStringSequence[9] = CREATE_OUSTRING ("logheight*15935/21600"); + aStringSequence[10] = CREATE_OUSTRING ("logheight*6645/21600"); + aStringSequence[11] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -5622,20 +5622,20 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[1] = CREATE_OUSTRING ("?0 *2/1"); aStringSequence[2] = CREATE_OUSTRING ("100000+0-2"); aStringSequence[3] = CREATE_OUSTRING ("if(0-$1 ,0,if(?2 -$1 ,$1 ,?2 ))"); - aStringSequence[4] = CREATE_OUSTRING ("height*?0 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("height*?3 /200000"); - aStringSequence[6] = CREATE_OUSTRING ("width*73490/200000"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight*?0 /100000"); + aStringSequence[5] = CREATE_OUSTRING ("logheight*?3 /200000"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth*73490/200000"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?5 "); aStringSequence[9] = CREATE_OUSTRING ("?7 +?5 -0"); aStringSequence[10] = CREATE_OUSTRING ("?8 +0-?4 "); aStringSequence[11] = CREATE_OUSTRING ("?9 +?4 -0"); - aStringSequence[12] = CREATE_OUSTRING ("width/2"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[13] = CREATE_OUSTRING ("?12 +0-?6 "); aStringSequence[14] = CREATE_OUSTRING ("?12 +?6 -0"); aStringSequence[15] = CREATE_OUSTRING ("(?10 +?8 )/2"); aStringSequence[16] = CREATE_OUSTRING ("(?9 +?11 )/2"); - aStringSequence[17] = CREATE_OUSTRING ("width"); + aStringSequence[17] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -5954,17 +5954,17 @@ void CustomShapeProperties::initializePresetsMap2() { Sequence< OUString > aStringSequence (38); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[2] = CREATE_OUSTRING ("?1 *cos(pi*(1800000)/10800000)"); - aStringSequence[3] = CREATE_OUSTRING ("height/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/2"); aStringSequence[4] = CREATE_OUSTRING ("?3 *sin(pi*(3600000)/10800000)"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?2 "); - aStringSequence[7] = CREATE_OUSTRING ("width*3/4"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth*3/4"); aStringSequence[8] = CREATE_OUSTRING ("?5 +?2 -0"); - aStringSequence[9] = CREATE_OUSTRING ("height/2"); + aStringSequence[9] = CREATE_OUSTRING ("logheight/2"); aStringSequence[10] = CREATE_OUSTRING ("?9 +0-?4 "); - aStringSequence[11] = CREATE_OUSTRING ("height*3/4"); + aStringSequence[11] = CREATE_OUSTRING ("logheight*3/4"); aStringSequence[12] = CREATE_OUSTRING ("?9 +?4 -0"); aStringSequence[13] = CREATE_OUSTRING ("?1 *?0 /50000"); aStringSequence[14] = CREATE_OUSTRING ("?3 *?0 /50000"); @@ -5987,10 +5987,10 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[31] = CREATE_OUSTRING ("?9 +?19 -0"); aStringSequence[32] = CREATE_OUSTRING ("?9 +?18 -0"); aStringSequence[33] = CREATE_OUSTRING ("?9 +0-?14 "); - aStringSequence[34] = CREATE_OUSTRING ("height/4"); - aStringSequence[35] = CREATE_OUSTRING ("width"); - aStringSequence[36] = CREATE_OUSTRING ("height"); - aStringSequence[37] = CREATE_OUSTRING ("width/4"); + aStringSequence[34] = CREATE_OUSTRING ("logheight/4"); + aStringSequence[35] = CREATE_OUSTRING ("logwidth"); + aStringSequence[36] = CREATE_OUSTRING ("logheight"); + aStringSequence[37] = CREATE_OUSTRING ("logwidth/4"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -6553,22 +6553,22 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[0] = CREATE_OUSTRING ("if(0-$1 ,0,if(25000-$1 ,$1 ,25000))"); aStringSequence[1] = CREATE_OUSTRING ("?0 *2/1"); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); - aStringSequence[3] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[4] = CREATE_OUSTRING ("?2 *?3 /height"); + aStringSequence[3] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[4] = CREATE_OUSTRING ("?2 *?3 /logheight"); aStringSequence[5] = CREATE_OUSTRING ("100000+0-?4 "); - aStringSequence[6] = CREATE_OUSTRING ("?5 *height/?3 "); + aStringSequence[6] = CREATE_OUSTRING ("?5 *logheight/?3 "); aStringSequence[7] = CREATE_OUSTRING ("if(0-$2 ,0,if(?6 -$2 ,$2 ,?6 ))"); aStringSequence[8] = CREATE_OUSTRING ("?7 +?2 -0"); - aStringSequence[9] = CREATE_OUSTRING ("?8 *?3 /height"); + aStringSequence[9] = CREATE_OUSTRING ("?8 *?3 /logheight"); aStringSequence[10] = CREATE_OUSTRING ("if(?9 -$4 ,?9 ,if(100000-$4 ,$4 ,100000))"); aStringSequence[11] = CREATE_OUSTRING ("?3 *?2 /100000"); aStringSequence[12] = CREATE_OUSTRING ("?3 *?0 /100000"); aStringSequence[13] = CREATE_OUSTRING ("?11 *1/2"); aStringSequence[14] = CREATE_OUSTRING ("?12 +0-?13 "); - aStringSequence[15] = CREATE_OUSTRING ("height*?10 /100000"); + aStringSequence[15] = CREATE_OUSTRING ("logheight*?10 /100000"); aStringSequence[16] = CREATE_OUSTRING ("?3 *?7 /100000"); aStringSequence[17] = CREATE_OUSTRING ("?15 +0-?16 "); - aStringSequence[18] = CREATE_OUSTRING ("width+0-?14 "); + aStringSequence[18] = CREATE_OUSTRING ("logwidth+0-?14 "); aStringSequence[19] = CREATE_OUSTRING ("?18 *1/2"); aStringSequence[20] = CREATE_OUSTRING ("min(?19 ,?17 )"); aStringSequence[21] = CREATE_OUSTRING ("?20 *100000/?3 "); @@ -6577,14 +6577,14 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[24] = CREATE_OUSTRING ("?23 +0-?11 "); aStringSequence[25] = CREATE_OUSTRING ("max(?24 ,0)"); aStringSequence[26] = CREATE_OUSTRING ("?11 +?25 -0"); - aStringSequence[27] = CREATE_OUSTRING ("width+0-?12 "); + aStringSequence[27] = CREATE_OUSTRING ("logwidth+0-?12 "); aStringSequence[28] = CREATE_OUSTRING ("?27 +0-?12 "); aStringSequence[29] = CREATE_OUSTRING ("?28 +?14 -0"); aStringSequence[30] = CREATE_OUSTRING ("?18 +0-?23 "); aStringSequence[31] = CREATE_OUSTRING ("?29 +0-?25 "); aStringSequence[32] = CREATE_OUSTRING ("(?11 +?29 )/2"); - aStringSequence[33] = CREATE_OUSTRING ("height"); - aStringSequence[34] = CREATE_OUSTRING ("width"); + aStringSequence[33] = CREATE_OUSTRING ("logheight"); + aStringSequence[34] = CREATE_OUSTRING ("logwidth"); aStringSequence[35] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[36] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[37] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -7266,12 +7266,12 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (6); - aStringSequence[0] = CREATE_OUSTRING ("sqrt(width*width+height*height+0*0)"); + aStringSequence[0] = CREATE_OUSTRING ("sqrt(logwidth*logwidth+logheight*logheight+0*0)"); aStringSequence[1] = CREATE_OUSTRING ("1*?0 /20"); - aStringSequence[2] = CREATE_OUSTRING ("0+height-?1 "); - aStringSequence[3] = CREATE_OUSTRING ("0+width-?1 "); - aStringSequence[4] = CREATE_OUSTRING ("height"); - aStringSequence[5] = CREATE_OUSTRING ("width"); + aStringSequence[2] = CREATE_OUSTRING ("0+logheight-?1 "); + aStringSequence[3] = CREATE_OUSTRING ("0+logwidth-?1 "); + aStringSequence[4] = CREATE_OUSTRING ("logheight"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -7713,25 +7713,25 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[3] = CREATE_OUSTRING ("100000+0-?1 "); aStringSequence[4] = CREATE_OUSTRING ("?3 *1/2"); aStringSequence[5] = CREATE_OUSTRING ("if(0-$2 ,0,if(?4 -$2 ,$2 ,?4 ))"); - aStringSequence[6] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[6] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[7] = CREATE_OUSTRING ("?6 *?5 /100000"); aStringSequence[8] = CREATE_OUSTRING ("?6 *?0 /100000"); - aStringSequence[9] = CREATE_OUSTRING ("width/2"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[10] = CREATE_OUSTRING ("?9 +0-?8 "); aStringSequence[11] = CREATE_OUSTRING ("?9 +?8 -0"); aStringSequence[12] = CREATE_OUSTRING ("?6 *?2 /200000"); aStringSequence[13] = CREATE_OUSTRING ("?9 +0-?12 "); aStringSequence[14] = CREATE_OUSTRING ("?9 +?12 -0"); - aStringSequence[15] = CREATE_OUSTRING ("width+0-?7 "); + aStringSequence[15] = CREATE_OUSTRING ("logwidth+0-?7 "); aStringSequence[16] = CREATE_OUSTRING ("?6 *?0 /50000"); - aStringSequence[17] = CREATE_OUSTRING ("height+0-?16 "); - aStringSequence[18] = CREATE_OUSTRING ("height+0-?8 "); + aStringSequence[17] = CREATE_OUSTRING ("logheight+0-?16 "); + aStringSequence[18] = CREATE_OUSTRING ("logheight+0-?8 "); aStringSequence[19] = CREATE_OUSTRING ("?18 +0-?12 "); aStringSequence[20] = CREATE_OUSTRING ("?18 +?12 -0"); aStringSequence[21] = CREATE_OUSTRING ("?12 *?7 /?8 "); - aStringSequence[22] = CREATE_OUSTRING ("width+0-?21 "); - aStringSequence[23] = CREATE_OUSTRING ("width"); - aStringSequence[24] = CREATE_OUSTRING ("height"); + aStringSequence[22] = CREATE_OUSTRING ("logwidth+0-?21 "); + aStringSequence[23] = CREATE_OUSTRING ("logwidth"); + aStringSequence[24] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -8237,16 +8237,16 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (10); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("100000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("100000*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("?0 *?2 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("width+0-?3 "); - aStringSequence[5] = CREATE_OUSTRING ("(?4 +width)/2"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth+0-?3 "); + aStringSequence[5] = CREATE_OUSTRING ("(?4 +logwidth)/2"); aStringSequence[6] = CREATE_OUSTRING ("?4 *1/2"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); - aStringSequence[8] = CREATE_OUSTRING ("height"); - aStringSequence[9] = CREATE_OUSTRING ("width"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[8] = CREATE_OUSTRING ("logheight"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -8444,16 +8444,16 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (10); - aStringSequence[0] = CREATE_OUSTRING ("width*2894/21600"); - aStringSequence[1] = CREATE_OUSTRING ("width*7906/21600"); - aStringSequence[2] = CREATE_OUSTRING ("width*13694/21600"); - aStringSequence[3] = CREATE_OUSTRING ("width*18706/21600"); - aStringSequence[4] = CREATE_OUSTRING ("height*2894/21600"); - aStringSequence[5] = CREATE_OUSTRING ("height*7906/21600"); - aStringSequence[6] = CREATE_OUSTRING ("height*13694/21600"); - aStringSequence[7] = CREATE_OUSTRING ("height*18706/21600"); - aStringSequence[8] = CREATE_OUSTRING ("width"); - aStringSequence[9] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*2894/21600"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*7906/21600"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth*13694/21600"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*18706/21600"); + aStringSequence[4] = CREATE_OUSTRING ("logheight*2894/21600"); + aStringSequence[5] = CREATE_OUSTRING ("logheight*7906/21600"); + aStringSequence[6] = CREATE_OUSTRING ("logheight*13694/21600"); + aStringSequence[7] = CREATE_OUSTRING ("logheight*18706/21600"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth"); + aStringSequence[9] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -8749,29 +8749,29 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (23); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*height/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logheight/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("?2 *2/1"); aStringSequence[4] = CREATE_OUSTRING ("if(0-$0 ,0,if(?3 -$0 ,$0 ,?3 ))"); - aStringSequence[5] = CREATE_OUSTRING ("100000*width/?0 "); + aStringSequence[5] = CREATE_OUSTRING ("100000*logwidth/?0 "); aStringSequence[6] = CREATE_OUSTRING ("if(0-$2 ,0,if(?5 -$2 ,$2 ,?5 ))"); - aStringSequence[7] = CREATE_OUSTRING ("?6 *?0 /width"); + aStringSequence[7] = CREATE_OUSTRING ("?6 *?0 /logwidth"); aStringSequence[8] = CREATE_OUSTRING ("100000+0-?7 "); aStringSequence[9] = CREATE_OUSTRING ("if(0-$3 ,0,if(?8 -$3 ,$3 ,?8 ))"); aStringSequence[10] = CREATE_OUSTRING ("?0 *?2 /100000"); aStringSequence[11] = CREATE_OUSTRING ("?0 *?4 /200000"); - aStringSequence[12] = CREATE_OUSTRING ("height/2"); + aStringSequence[12] = CREATE_OUSTRING ("logheight/2"); aStringSequence[13] = CREATE_OUSTRING ("?12 +0-?10 "); aStringSequence[14] = CREATE_OUSTRING ("?12 +0-?11 "); aStringSequence[15] = CREATE_OUSTRING ("?12 +?11 -0"); aStringSequence[16] = CREATE_OUSTRING ("?12 +?10 -0"); aStringSequence[17] = CREATE_OUSTRING ("?0 *?6 /100000"); - aStringSequence[18] = CREATE_OUSTRING ("width*?9 /100000"); - aStringSequence[19] = CREATE_OUSTRING ("width+0-?18 "); - aStringSequence[20] = CREATE_OUSTRING ("(?19 +width)/2"); - aStringSequence[21] = CREATE_OUSTRING ("height"); - aStringSequence[22] = CREATE_OUSTRING ("width"); + aStringSequence[18] = CREATE_OUSTRING ("logwidth*?9 /100000"); + aStringSequence[19] = CREATE_OUSTRING ("logwidth+0-?18 "); + aStringSequence[20] = CREATE_OUSTRING ("(?19 +logwidth)/2"); + aStringSequence[21] = CREATE_OUSTRING ("logheight"); + aStringSequence[22] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -9222,9 +9222,9 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[2] = CREATE_OUSTRING ("?1 +0-?0 "); aStringSequence[3] = CREATE_OUSTRING ("?2 +21600000-0"); aStringSequence[4] = CREATE_OUSTRING ("if(?2 ,?2 ,?3 )"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 *sin(pi*(?0 )/10800000)"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 *cos(pi*(?0 )/10800000)"); aStringSequence[9] = CREATE_OUSTRING ("?5 *(cos(atan2(?6 ,?8 )))"); aStringSequence[10] = CREATE_OUSTRING ("?7 *(sin(atan2(?6 ,?8 )))"); @@ -9232,9 +9232,9 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[12] = CREATE_OUSTRING ("?7 *cos(pi*(?1 )/10800000)"); aStringSequence[13] = CREATE_OUSTRING ("?5 *(cos(atan2(?11 ,?12 )))"); aStringSequence[14] = CREATE_OUSTRING ("?7 *(sin(atan2(?11 ,?12 )))"); - aStringSequence[15] = CREATE_OUSTRING ("width/2"); + aStringSequence[15] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[16] = CREATE_OUSTRING ("?15 +?9 -0"); - aStringSequence[17] = CREATE_OUSTRING ("height/2"); + aStringSequence[17] = CREATE_OUSTRING ("logheight/2"); aStringSequence[18] = CREATE_OUSTRING ("?17 +?10 -0"); aStringSequence[19] = CREATE_OUSTRING ("?15 +?13 -0"); aStringSequence[20] = CREATE_OUSTRING ("?17 +?14 -0"); @@ -9437,30 +9437,30 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[5] = CREATE_OUSTRING ("?4 *2/1"); aStringSequence[6] = CREATE_OUSTRING ("100000+0-?5 "); aStringSequence[7] = CREATE_OUSTRING ("if(?2 -$3 ,?2 ,if(?6 -$3 ,$3 ,?6 ))"); - aStringSequence[8] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[8] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[9] = CREATE_OUSTRING ("?8 *?0 /100000"); aStringSequence[10] = CREATE_OUSTRING ("?8 *?2 /200000"); aStringSequence[11] = CREATE_OUSTRING ("?8 *?4 /100000"); - aStringSequence[12] = CREATE_OUSTRING ("width*?7 /200000"); - aStringSequence[13] = CREATE_OUSTRING ("height*?7 /200000"); - aStringSequence[14] = CREATE_OUSTRING ("width+0-?11 "); - aStringSequence[15] = CREATE_OUSTRING ("width/2"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth*?7 /200000"); + aStringSequence[13] = CREATE_OUSTRING ("logheight*?7 /200000"); + aStringSequence[14] = CREATE_OUSTRING ("logwidth+0-?11 "); + aStringSequence[15] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[16] = CREATE_OUSTRING ("?15 +0-?12 "); aStringSequence[17] = CREATE_OUSTRING ("?15 +?12 -0"); aStringSequence[18] = CREATE_OUSTRING ("?15 +0-?9 "); aStringSequence[19] = CREATE_OUSTRING ("?15 +?9 -0"); aStringSequence[20] = CREATE_OUSTRING ("?15 +0-?10 "); aStringSequence[21] = CREATE_OUSTRING ("?15 +?10 -0"); - aStringSequence[22] = CREATE_OUSTRING ("height+0-?11 "); - aStringSequence[23] = CREATE_OUSTRING ("height/2"); + aStringSequence[22] = CREATE_OUSTRING ("logheight+0-?11 "); + aStringSequence[23] = CREATE_OUSTRING ("logheight/2"); aStringSequence[24] = CREATE_OUSTRING ("?23 +0-?13 "); aStringSequence[25] = CREATE_OUSTRING ("?23 +?13 -0"); aStringSequence[26] = CREATE_OUSTRING ("?23 +0-?9 "); aStringSequence[27] = CREATE_OUSTRING ("?23 +?9 -0"); aStringSequence[28] = CREATE_OUSTRING ("?23 +0-?10 "); aStringSequence[29] = CREATE_OUSTRING ("?23 +?10 -0"); - aStringSequence[30] = CREATE_OUSTRING ("width"); - aStringSequence[31] = CREATE_OUSTRING ("height"); + aStringSequence[30] = CREATE_OUSTRING ("logwidth"); + aStringSequence[31] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -10276,12 +10276,12 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (15); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[1] = CREATE_OUSTRING ("?0 *3/8"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +0-?1 "); aStringSequence[4] = CREATE_OUSTRING ("?2 +?1 -0"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?1 "); aStringSequence[7] = CREATE_OUSTRING ("?5 +?1 -0"); aStringSequence[8] = CREATE_OUSTRING ("?0 *3/4"); @@ -10289,8 +10289,8 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[10] = CREATE_OUSTRING ("?8 *1/4"); aStringSequence[11] = CREATE_OUSTRING ("?6 +?9 -0"); aStringSequence[12] = CREATE_OUSTRING ("?6 +?10 -0"); - aStringSequence[13] = CREATE_OUSTRING ("width"); - aStringSequence[14] = CREATE_OUSTRING ("height"); + aStringSequence[13] = CREATE_OUSTRING ("logwidth"); + aStringSequence[14] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -11032,18 +11032,18 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (20); - aStringSequence[0] = CREATE_OUSTRING ("width/2"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[1] = CREATE_OUSTRING ("?0 *cos(pi*(2700000)/10800000)"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 *sin(pi*(2700000)/10800000)"); - aStringSequence[4] = CREATE_OUSTRING ("width/2"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[5] = CREATE_OUSTRING ("?4 +0-?1 "); aStringSequence[6] = CREATE_OUSTRING ("?4 +?1 -0"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?3 "); aStringSequence[9] = CREATE_OUSTRING ("?7 +?3 -0"); - aStringSequence[10] = CREATE_OUSTRING ("height"); - aStringSequence[11] = CREATE_OUSTRING ("width"); + aStringSequence[10] = CREATE_OUSTRING ("logheight"); + aStringSequence[11] = CREATE_OUSTRING ("logwidth"); aStringSequence[12] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[13] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[14] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -11277,12 +11277,12 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (15); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[1] = CREATE_OUSTRING ("?0 *3/8"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +0-?1 "); aStringSequence[4] = CREATE_OUSTRING ("?2 +?1 -0"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?1 "); aStringSequence[7] = CREATE_OUSTRING ("?5 +?1 -0"); aStringSequence[8] = CREATE_OUSTRING ("?0 *3/4"); @@ -11290,8 +11290,8 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[10] = CREATE_OUSTRING ("?8 *7/8"); aStringSequence[11] = CREATE_OUSTRING ("?6 +?9 -0"); aStringSequence[12] = CREATE_OUSTRING ("?6 +?10 -0"); - aStringSequence[13] = CREATE_OUSTRING ("width"); - aStringSequence[14] = CREATE_OUSTRING ("height"); + aStringSequence[13] = CREATE_OUSTRING ("logwidth"); + aStringSequence[14] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -12046,9 +12046,9 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[2] = CREATE_OUSTRING ("?1 +0-?0 "); aStringSequence[3] = CREATE_OUSTRING ("?2 +21600000-0"); aStringSequence[4] = CREATE_OUSTRING ("if(?2 ,?2 ,?3 )"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 *sin(pi*(?0 )/10800000)"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 *cos(pi*(?0 )/10800000)"); aStringSequence[9] = CREATE_OUSTRING ("?5 *(cos(atan2(?6 ,?8 )))"); aStringSequence[10] = CREATE_OUSTRING ("?7 *(sin(atan2(?6 ,?8 )))"); @@ -12056,22 +12056,22 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[12] = CREATE_OUSTRING ("?7 *cos(pi*(?1 )/10800000)"); aStringSequence[13] = CREATE_OUSTRING ("?5 *(cos(atan2(?11 ,?12 )))"); aStringSequence[14] = CREATE_OUSTRING ("?7 *(sin(atan2(?11 ,?12 )))"); - aStringSequence[15] = CREATE_OUSTRING ("width/2"); + aStringSequence[15] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[16] = CREATE_OUSTRING ("?15 +?9 -0"); - aStringSequence[17] = CREATE_OUSTRING ("height/2"); + aStringSequence[17] = CREATE_OUSTRING ("logheight/2"); aStringSequence[18] = CREATE_OUSTRING ("?17 +?10 -0"); aStringSequence[19] = CREATE_OUSTRING ("?15 +?13 -0"); aStringSequence[20] = CREATE_OUSTRING ("?17 +?14 -0"); aStringSequence[21] = CREATE_OUSTRING ("21600000+0-?0 "); aStringSequence[22] = CREATE_OUSTRING ("?4 +0-?21 "); aStringSequence[23] = CREATE_OUSTRING ("max(?16 ,?19 )"); - aStringSequence[24] = CREATE_OUSTRING ("if(?22 ,width,?23 )"); + aStringSequence[24] = CREATE_OUSTRING ("if(?22 ,logwidth,?23 )"); aStringSequence[25] = CREATE_OUSTRING ("5400000+0-?0 "); aStringSequence[26] = CREATE_OUSTRING ("27000000+0-?0 "); aStringSequence[27] = CREATE_OUSTRING ("if(?25 ,?25 ,?26 )"); aStringSequence[28] = CREATE_OUSTRING ("?4 +0-?27 "); aStringSequence[29] = CREATE_OUSTRING ("max(?18 ,?20 )"); - aStringSequence[30] = CREATE_OUSTRING ("if(?28 ,height,?29 )"); + aStringSequence[30] = CREATE_OUSTRING ("if(?28 ,logheight,?29 )"); aStringSequence[31] = CREATE_OUSTRING ("10800000+0-?0 "); aStringSequence[32] = CREATE_OUSTRING ("32400000+0-?0 "); aStringSequence[33] = CREATE_OUSTRING ("if(?31 ,?31 ,?32 )"); @@ -12361,22 +12361,22 @@ void CustomShapeProperties::initializePresetsMap2() { Sequence< OUString > aStringSequence (58); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[2] = CREATE_OUSTRING ("?1 *92388/100000"); aStringSequence[3] = CREATE_OUSTRING ("?1 *70711/100000"); aStringSequence[4] = CREATE_OUSTRING ("?1 *38268/100000"); - aStringSequence[5] = CREATE_OUSTRING ("height/2"); + aStringSequence[5] = CREATE_OUSTRING ("logheight/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 *92388/100000"); aStringSequence[7] = CREATE_OUSTRING ("?5 *70711/100000"); aStringSequence[8] = CREATE_OUSTRING ("?5 *38268/100000"); - aStringSequence[9] = CREATE_OUSTRING ("width/2"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[10] = CREATE_OUSTRING ("?9 +0-?2 "); aStringSequence[11] = CREATE_OUSTRING ("?9 +0-?3 "); aStringSequence[12] = CREATE_OUSTRING ("?9 +0-?4 "); aStringSequence[13] = CREATE_OUSTRING ("?9 +?4 -0"); aStringSequence[14] = CREATE_OUSTRING ("?9 +?3 -0"); aStringSequence[15] = CREATE_OUSTRING ("?9 +?2 -0"); - aStringSequence[16] = CREATE_OUSTRING ("height/2"); + aStringSequence[16] = CREATE_OUSTRING ("logheight/2"); aStringSequence[17] = CREATE_OUSTRING ("?16 +0-?6 "); aStringSequence[18] = CREATE_OUSTRING ("?16 +0-?7 "); aStringSequence[19] = CREATE_OUSTRING ("?16 +0-?8 "); @@ -12416,8 +12416,8 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[53] = CREATE_OUSTRING ("?9 +?49 -0"); aStringSequence[54] = CREATE_OUSTRING ("?16 +?50 -0"); aStringSequence[55] = CREATE_OUSTRING ("?16 +0-?24 "); - aStringSequence[56] = CREATE_OUSTRING ("width"); - aStringSequence[57] = CREATE_OUSTRING ("height"); + aStringSequence[56] = CREATE_OUSTRING ("logwidth"); + aStringSequence[57] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -13105,30 +13105,30 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (24); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("100000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("100000*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("?0 *?2 /200000"); aStringSequence[4] = CREATE_OUSTRING ("?0 *?2 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("width+0-?3 "); - aStringSequence[6] = CREATE_OUSTRING ("width+0-?4 "); + aStringSequence[5] = CREATE_OUSTRING ("logwidth+0-?3 "); + aStringSequence[6] = CREATE_OUSTRING ("logwidth+0-?4 "); aStringSequence[7] = CREATE_OUSTRING ("?6 *1/2"); - aStringSequence[8] = CREATE_OUSTRING ("width+0-?7 "); - aStringSequence[9] = CREATE_OUSTRING ("width/2"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth+0-?7 "); + aStringSequence[9] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[10] = CREATE_OUSTRING ("?9 *?2 /?1 "); aStringSequence[11] = CREATE_OUSTRING ("5*?2 /?1 "); aStringSequence[12] = CREATE_OUSTRING ("(1+?11 )/12"); - aStringSequence[13] = CREATE_OUSTRING ("?12 *width/1"); - aStringSequence[14] = CREATE_OUSTRING ("?12 *height/1"); - aStringSequence[15] = CREATE_OUSTRING ("width+0-?10 "); - aStringSequence[16] = CREATE_OUSTRING ("height+0-?14 "); - aStringSequence[17] = CREATE_OUSTRING ("width/2"); - aStringSequence[18] = CREATE_OUSTRING ("height*?17 /?4 "); - aStringSequence[19] = CREATE_OUSTRING ("if(0-?18 ,0,if(height-?18 ,?18 ,height))"); - aStringSequence[20] = CREATE_OUSTRING ("height+0-?19 "); - aStringSequence[21] = CREATE_OUSTRING ("height/2"); - aStringSequence[22] = CREATE_OUSTRING ("height"); - aStringSequence[23] = CREATE_OUSTRING ("width"); + aStringSequence[13] = CREATE_OUSTRING ("?12 *logwidth/1"); + aStringSequence[14] = CREATE_OUSTRING ("?12 *logheight/1"); + aStringSequence[15] = CREATE_OUSTRING ("logwidth+0-?10 "); + aStringSequence[16] = CREATE_OUSTRING ("logheight+0-?14 "); + aStringSequence[17] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[18] = CREATE_OUSTRING ("logheight*?17 /?4 "); + aStringSequence[19] = CREATE_OUSTRING ("if(0-?18 ,0,if(logheight-?18 ,?18 ,logheight))"); + aStringSequence[20] = CREATE_OUSTRING ("logheight+0-?19 "); + aStringSequence[21] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[22] = CREATE_OUSTRING ("logheight"); + aStringSequence[23] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -13313,14 +13313,14 @@ void CustomShapeProperties::initializePresetsMap2() { Sequence< OUString > aStringSequence (9); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width+0-?2 "); - aStringSequence[4] = CREATE_OUSTRING ("height+0-?2 "); - aStringSequence[5] = CREATE_OUSTRING ("width"); - aStringSequence[6] = CREATE_OUSTRING ("height/2"); - aStringSequence[7] = CREATE_OUSTRING ("width/2"); - aStringSequence[8] = CREATE_OUSTRING ("height"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth+0-?2 "); + aStringSequence[4] = CREATE_OUSTRING ("logheight+0-?2 "); + aStringSequence[5] = CREATE_OUSTRING ("logwidth"); + aStringSequence[6] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[8] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -14273,17 +14273,17 @@ void CustomShapeProperties::initializePresetsMap2() { Sequence< OUString > aStringSequence (20); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width+0-?2 "); - aStringSequence[4] = CREATE_OUSTRING ("height+0-?2 "); + aStringSequence[3] = CREATE_OUSTRING ("logwidth+0-?2 "); + aStringSequence[4] = CREATE_OUSTRING ("logheight+0-?2 "); aStringSequence[5] = CREATE_OUSTRING ("?2 *29289/100000"); - aStringSequence[6] = CREATE_OUSTRING ("width+0-?5 "); - aStringSequence[7] = CREATE_OUSTRING ("height+0-?5 "); - aStringSequence[8] = CREATE_OUSTRING ("width/2"); - aStringSequence[9] = CREATE_OUSTRING ("height/2"); - aStringSequence[10] = CREATE_OUSTRING ("height"); - aStringSequence[11] = CREATE_OUSTRING ("width"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth+0-?5 "); + aStringSequence[7] = CREATE_OUSTRING ("logheight+0-?5 "); + aStringSequence[8] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[9] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[10] = CREATE_OUSTRING ("logheight"); + aStringSequence[11] = CREATE_OUSTRING ("logwidth"); aStringSequence[12] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[13] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[14] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -14667,14 +14667,14 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (8); - aStringSequence[0] = CREATE_OUSTRING ("height*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("width*$1 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("height*$2 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width*$3 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("width"); - aStringSequence[5] = CREATE_OUSTRING ("height/2"); - aStringSequence[6] = CREATE_OUSTRING ("width/2"); - aStringSequence[7] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*$1 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*$2 /100000"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*$3 /100000"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth"); + aStringSequence[5] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -15066,14 +15066,14 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (8); - aStringSequence[0] = CREATE_OUSTRING ("width*3/4"); - aStringSequence[1] = CREATE_OUSTRING ("height*3/4"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); - aStringSequence[3] = CREATE_OUSTRING ("height/2"); - aStringSequence[4] = CREATE_OUSTRING ("height"); - aStringSequence[5] = CREATE_OUSTRING ("width"); - aStringSequence[6] = CREATE_OUSTRING ("width/4"); - aStringSequence[7] = CREATE_OUSTRING ("height/4"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4"); + aStringSequence[1] = CREATE_OUSTRING ("logheight*3/4"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth/4"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/4"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -15376,14 +15376,14 @@ void CustomShapeProperties::initializePresetsMap2() { Sequence< OUString > aStringSequence (28); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[2] = CREATE_OUSTRING ("?1 *cos(pi*(2700000)/10800000)"); - aStringSequence[3] = CREATE_OUSTRING ("width/2"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[4] = CREATE_OUSTRING ("?3 +0-?2 "); aStringSequence[5] = CREATE_OUSTRING ("?3 +?2 -0"); - aStringSequence[6] = CREATE_OUSTRING ("height/2"); + aStringSequence[6] = CREATE_OUSTRING ("logheight/2"); aStringSequence[7] = CREATE_OUSTRING ("?6 *sin(pi*(2700000)/10800000)"); - aStringSequence[8] = CREATE_OUSTRING ("height/2"); + aStringSequence[8] = CREATE_OUSTRING ("logheight/2"); aStringSequence[9] = CREATE_OUSTRING ("?8 +0-?7 "); aStringSequence[10] = CREATE_OUSTRING ("?8 +?7 -0"); aStringSequence[11] = CREATE_OUSTRING ("?1 *?0 /50000"); @@ -15401,8 +15401,8 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[23] = CREATE_OUSTRING ("?8 +?16 -0"); aStringSequence[24] = CREATE_OUSTRING ("?8 +?15 -0"); aStringSequence[25] = CREATE_OUSTRING ("?8 +0-?12 "); - aStringSequence[26] = CREATE_OUSTRING ("width"); - aStringSequence[27] = CREATE_OUSTRING ("height"); + aStringSequence[26] = CREATE_OUSTRING ("logwidth"); + aStringSequence[27] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -15798,16 +15798,16 @@ void CustomShapeProperties::initializePresetsMap2() } { Sequence< OUString > aStringSequence (18); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)/54"); - aStringSequence[1] = CREATE_OUSTRING ("width+0-?0 "); - aStringSequence[2] = CREATE_OUSTRING ("height+0-?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)/54"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth+0-?0 "); + aStringSequence[2] = CREATE_OUSTRING ("logheight+0-?0 "); aStringSequence[3] = CREATE_OUSTRING ("?0 *29289/100000"); - aStringSequence[4] = CREATE_OUSTRING ("width+0-?3 "); - aStringSequence[5] = CREATE_OUSTRING ("height+0-?3 "); - aStringSequence[6] = CREATE_OUSTRING ("width/2"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); - aStringSequence[8] = CREATE_OUSTRING ("height"); - aStringSequence[9] = CREATE_OUSTRING ("width"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth+0-?3 "); + aStringSequence[5] = CREATE_OUSTRING ("logheight+0-?3 "); + aStringSequence[6] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[8] = CREATE_OUSTRING ("logheight"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth"); aStringSequence[10] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[11] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[12] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -16136,25 +16136,25 @@ void CustomShapeProperties::initializePresetsMap2() { Sequence< OUString > aStringSequence (44); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(87500-$0 ,$0 ,87500))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("?2 *width/?1 "); + aStringSequence[3] = CREATE_OUSTRING ("?2 *logwidth/?1 "); aStringSequence[4] = CREATE_OUSTRING ("?1 +0-?2 "); aStringSequence[5] = CREATE_OUSTRING ("?2 *?2 /?4 "); aStringSequence[6] = CREATE_OUSTRING ("?1 *?1 /?4 "); aStringSequence[7] = CREATE_OUSTRING ("?6 *2/1"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?5 "); aStringSequence[9] = CREATE_OUSTRING ("?8 +0-?2 "); - aStringSequence[10] = CREATE_OUSTRING ("?9 *width/?1 "); + aStringSequence[10] = CREATE_OUSTRING ("?9 *logwidth/?1 "); aStringSequence[11] = CREATE_OUSTRING ("?8 *1/2"); aStringSequence[12] = CREATE_OUSTRING ("?11 +0-?2 "); - aStringSequence[13] = CREATE_OUSTRING ("height/2"); + aStringSequence[13] = CREATE_OUSTRING ("logheight/2"); aStringSequence[14] = CREATE_OUSTRING ("?12 *?13 /?1 "); - aStringSequence[15] = CREATE_OUSTRING ("height/2"); + aStringSequence[15] = CREATE_OUSTRING ("logheight/2"); aStringSequence[16] = CREATE_OUSTRING ("?15 +0-?14 "); aStringSequence[17] = CREATE_OUSTRING ("?15 +?14 -0"); aStringSequence[18] = CREATE_OUSTRING ("?2 *9598/32768"); - aStringSequence[19] = CREATE_OUSTRING ("?18 *width/?1 "); + aStringSequence[19] = CREATE_OUSTRING ("?18 *logwidth/?1 "); aStringSequence[20] = CREATE_OUSTRING ("?1 +0-?18 "); aStringSequence[21] = CREATE_OUSTRING ("?1 *?1 /1"); aStringSequence[22] = CREATE_OUSTRING ("?20 *?20 /1"); @@ -16165,16 +16165,16 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[27] = CREATE_OUSTRING ("?15 +?25 -0"); aStringSequence[28] = CREATE_OUSTRING ("?10 +0-?3 "); aStringSequence[29] = CREATE_OUSTRING ("?28 *1/2"); - aStringSequence[30] = CREATE_OUSTRING ("?3 +?29 -width"); + aStringSequence[30] = CREATE_OUSTRING ("?3 +?29 -logwidth"); aStringSequence[31] = CREATE_OUSTRING ("?30 *-1/1"); aStringSequence[32] = CREATE_OUSTRING ("?13 *-1/1"); aStringSequence[33] = CREATE_OUSTRING ("(10800000*atan2(?32 ,?31 ))/pi"); aStringSequence[34] = CREATE_OUSTRING ("(10800000*atan2(?13 ,?31 ))/pi"); aStringSequence[35] = CREATE_OUSTRING ("?34 +0-21600000"); aStringSequence[36] = CREATE_OUSTRING ("?35 +0-?33 "); - aStringSequence[37] = CREATE_OUSTRING ("width"); - aStringSequence[38] = CREATE_OUSTRING ("height"); - aStringSequence[39] = CREATE_OUSTRING ("width"); + aStringSequence[37] = CREATE_OUSTRING ("logwidth"); + aStringSequence[38] = CREATE_OUSTRING ("logheight"); + aStringSequence[39] = CREATE_OUSTRING ("logwidth"); aStringSequence[40] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[41] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[42] = CREATE_OUSTRING ("(?33 )/60000.0"); @@ -16385,17 +16385,17 @@ void CustomShapeProperties::initializePresetsMap2() { Sequence< OUString > aStringSequence (23); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[2] = CREATE_OUSTRING ("?1 *$1 /100000"); aStringSequence[3] = CREATE_OUSTRING ("?2 *cos(pi*(1800000)/10800000)"); - aStringSequence[4] = CREATE_OUSTRING ("width/2"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[5] = CREATE_OUSTRING ("?4 +0-?3 "); aStringSequence[6] = CREATE_OUSTRING ("?4 +?3 -0"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); - aStringSequence[8] = CREATE_OUSTRING ("height/4"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[8] = CREATE_OUSTRING ("logheight/4"); aStringSequence[9] = CREATE_OUSTRING ("?7 +?8 -0"); aStringSequence[10] = CREATE_OUSTRING ("?2 *?0 /50000"); - aStringSequence[11] = CREATE_OUSTRING ("height/2"); + aStringSequence[11] = CREATE_OUSTRING ("logheight/2"); aStringSequence[12] = CREATE_OUSTRING ("?11 *?0 /50000"); aStringSequence[13] = CREATE_OUSTRING ("?10 *1/2"); aStringSequence[14] = CREATE_OUSTRING ("?4 +0-?10 "); @@ -16406,7 +16406,7 @@ void CustomShapeProperties::initializePresetsMap2() aStringSequence[19] = CREATE_OUSTRING ("?7 +0-?18 "); aStringSequence[20] = CREATE_OUSTRING ("?7 +?18 -0"); aStringSequence[21] = CREATE_OUSTRING ("?7 +0-?12 "); - aStringSequence[22] = CREATE_OUSTRING ("height"); + aStringSequence[22] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { diff --git a/oox/source/drawingml/customshapepresets3.cxx b/oox/source/drawingml/customshapepresets3.cxx index 10abbfc9f717..6689ed0532bd 100644 --- a/oox/source/drawingml/customshapepresets3.cxx +++ b/oox/source/drawingml/customshapepresets3.cxx @@ -38,22 +38,22 @@ void CustomShapeProperties::initializePresetsMap3() Sequence< OUString > aStringSequence (26); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); aStringSequence[1] = CREATE_OUSTRING ("if(0-$1 ,0,if(50000-$1 ,$1 ,50000))"); - aStringSequence[2] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[2] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[3] = CREATE_OUSTRING ("?2 *?0 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("width+0-?3 "); + aStringSequence[4] = CREATE_OUSTRING ("logwidth+0-?3 "); aStringSequence[5] = CREATE_OUSTRING ("?2 *?1 /100000"); - aStringSequence[6] = CREATE_OUSTRING ("width+0-?5 "); - aStringSequence[7] = CREATE_OUSTRING ("height+0-?5 "); + aStringSequence[6] = CREATE_OUSTRING ("logwidth+0-?5 "); + aStringSequence[7] = CREATE_OUSTRING ("logheight+0-?5 "); aStringSequence[8] = CREATE_OUSTRING ("?3 +0-?5 "); aStringSequence[9] = CREATE_OUSTRING ("?3 *29289/100000"); aStringSequence[10] = CREATE_OUSTRING ("?5 *29289/100000"); aStringSequence[11] = CREATE_OUSTRING ("if(?8 ,?9 ,?10 )"); - aStringSequence[12] = CREATE_OUSTRING ("width+0-?11 "); - aStringSequence[13] = CREATE_OUSTRING ("height+0-?10 "); - aStringSequence[14] = CREATE_OUSTRING ("height"); - aStringSequence[15] = CREATE_OUSTRING ("width"); - aStringSequence[16] = CREATE_OUSTRING ("height/2"); - aStringSequence[17] = CREATE_OUSTRING ("width/2"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth+0-?11 "); + aStringSequence[13] = CREATE_OUSTRING ("logheight+0-?10 "); + aStringSequence[14] = CREATE_OUSTRING ("logheight"); + aStringSequence[15] = CREATE_OUSTRING ("logwidth"); + aStringSequence[16] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[17] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[18] = CREATE_OUSTRING ("(16200000)/60000.0"); aStringSequence[19] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[20] = CREATE_OUSTRING ("(0)/60000.0"); @@ -497,26 +497,26 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (20); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[4] = CREATE_OUSTRING ("?0 *?2 /200000"); aStringSequence[5] = CREATE_OUSTRING ("?0 *?2 /100000"); aStringSequence[6] = CREATE_OUSTRING ("?0 *?3 /100000"); - aStringSequence[7] = CREATE_OUSTRING ("width+0-?6 "); - aStringSequence[8] = CREATE_OUSTRING ("(width+?7 )/2"); - aStringSequence[9] = CREATE_OUSTRING ("width/3"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth+0-?6 "); + aStringSequence[8] = CREATE_OUSTRING ("(logwidth+?7 )/2"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth/3"); aStringSequence[10] = CREATE_OUSTRING ("?9 *?2 /?1 "); aStringSequence[11] = CREATE_OUSTRING ("max(?2 ,?3 )"); - aStringSequence[12] = CREATE_OUSTRING ("height/3"); + aStringSequence[12] = CREATE_OUSTRING ("logheight/3"); aStringSequence[13] = CREATE_OUSTRING ("?12 *?11 /?1 "); aStringSequence[14] = CREATE_OUSTRING ("?9 *?3 /?1 "); - aStringSequence[15] = CREATE_OUSTRING ("width+0-?14 "); - aStringSequence[16] = CREATE_OUSTRING ("height/2"); - aStringSequence[17] = CREATE_OUSTRING ("width/2"); - aStringSequence[18] = CREATE_OUSTRING ("height"); - aStringSequence[19] = CREATE_OUSTRING ("width"); + aStringSequence[15] = CREATE_OUSTRING ("logwidth+0-?14 "); + aStringSequence[16] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[17] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[18] = CREATE_OUSTRING ("logheight"); + aStringSequence[19] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -740,14 +740,14 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (8); - aStringSequence[0] = CREATE_OUSTRING ("width*3/4"); - aStringSequence[1] = CREATE_OUSTRING ("height*3/4"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); - aStringSequence[3] = CREATE_OUSTRING ("height/2"); - aStringSequence[4] = CREATE_OUSTRING ("height"); - aStringSequence[5] = CREATE_OUSTRING ("width"); - aStringSequence[6] = CREATE_OUSTRING ("width/4"); - aStringSequence[7] = CREATE_OUSTRING ("height/4"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4"); + aStringSequence[1] = CREATE_OUSTRING ("logheight*3/4"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth/4"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/4"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -902,32 +902,32 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[4] = CREATE_OUSTRING ("?0 +0-?3 "); aStringSequence[5] = CREATE_OUSTRING ("max(0,?4 )"); aStringSequence[6] = CREATE_OUSTRING ("if(?5 -$2 ,?5 ,if(?0 -$2 ,$2 ,?0 ))"); - aStringSequence[7] = CREATE_OUSTRING ("width*?1 /200000"); - aStringSequence[8] = CREATE_OUSTRING ("width/2"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth*?1 /200000"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[9] = CREATE_OUSTRING ("?8 +0-?7 "); - aStringSequence[10] = CREATE_OUSTRING ("width/8"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth/8"); aStringSequence[11] = CREATE_OUSTRING ("?9 +?10 -0"); - aStringSequence[12] = CREATE_OUSTRING ("width+0-?11 "); - aStringSequence[13] = CREATE_OUSTRING ("width+0-?9 "); - aStringSequence[14] = CREATE_OUSTRING ("width+0-?10 "); - aStringSequence[15] = CREATE_OUSTRING ("height*?6 /100000"); - aStringSequence[16] = CREATE_OUSTRING ("4*?15 /width"); - aStringSequence[17] = CREATE_OUSTRING ("?11 *?11 /width"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth+0-?11 "); + aStringSequence[13] = CREATE_OUSTRING ("logwidth+0-?9 "); + aStringSequence[14] = CREATE_OUSTRING ("logwidth+0-?10 "); + aStringSequence[15] = CREATE_OUSTRING ("logheight*?6 /100000"); + aStringSequence[16] = CREATE_OUSTRING ("4*?15 /logwidth"); + aStringSequence[17] = CREATE_OUSTRING ("?11 *?11 /logwidth"); aStringSequence[18] = CREATE_OUSTRING ("?11 +0-?17 "); aStringSequence[19] = CREATE_OUSTRING ("?16 *?18 /1"); aStringSequence[20] = CREATE_OUSTRING ("?11 *1/2"); aStringSequence[21] = CREATE_OUSTRING ("?16 *?20 /1"); - aStringSequence[22] = CREATE_OUSTRING ("width+0-?20 "); - aStringSequence[23] = CREATE_OUSTRING ("height*?0 /100000"); + aStringSequence[22] = CREATE_OUSTRING ("logwidth+0-?20 "); + aStringSequence[23] = CREATE_OUSTRING ("logheight*?0 /100000"); aStringSequence[24] = CREATE_OUSTRING ("?17 +0-?15 "); - aStringSequence[25] = CREATE_OUSTRING ("?9 *?9 /width"); + aStringSequence[25] = CREATE_OUSTRING ("?9 *?9 /logwidth"); aStringSequence[26] = CREATE_OUSTRING ("?9 +0-?25 "); aStringSequence[27] = CREATE_OUSTRING ("?16 *?26 /1"); aStringSequence[28] = CREATE_OUSTRING ("?27 +?24 -0"); aStringSequence[29] = CREATE_OUSTRING ("?15 +?24 -?28 "); aStringSequence[30] = CREATE_OUSTRING ("?29 +?15 -0"); aStringSequence[31] = CREATE_OUSTRING ("?30 +?24 -0"); - aStringSequence[32] = CREATE_OUSTRING ("height+0-?17 "); + aStringSequence[32] = CREATE_OUSTRING ("logheight+0-?17 "); aStringSequence[33] = CREATE_OUSTRING ("?15 *14/16"); aStringSequence[34] = CREATE_OUSTRING ("(?33 +?32 )/2"); aStringSequence[35] = CREATE_OUSTRING ("?27 +?32 -0"); @@ -935,13 +935,13 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[37] = CREATE_OUSTRING ("?9 *1/2"); aStringSequence[38] = CREATE_OUSTRING ("?16 *?37 /1"); aStringSequence[39] = CREATE_OUSTRING ("?38 +?32 -0"); - aStringSequence[40] = CREATE_OUSTRING ("width+0-?37 "); + aStringSequence[40] = CREATE_OUSTRING ("logwidth+0-?37 "); aStringSequence[41] = CREATE_OUSTRING ("?31 +?32 -0"); aStringSequence[42] = CREATE_OUSTRING ("?19 +?24 -0"); aStringSequence[43] = CREATE_OUSTRING ("?17 +?17 -?42 "); - aStringSequence[44] = CREATE_OUSTRING ("height+0-?15 "); - aStringSequence[45] = CREATE_OUSTRING ("height"); - aStringSequence[46] = CREATE_OUSTRING ("width"); + aStringSequence[44] = CREATE_OUSTRING ("logheight+0-?15 "); + aStringSequence[45] = CREATE_OUSTRING ("logheight"); + aStringSequence[46] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -2439,16 +2439,16 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (10); - aStringSequence[0] = CREATE_OUSTRING ("height*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("width*$1 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("height*$2 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width*$3 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("height*$4 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("width*$5 /100000"); - aStringSequence[6] = CREATE_OUSTRING ("width"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); - aStringSequence[8] = CREATE_OUSTRING ("width/2"); - aStringSequence[9] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*$1 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*$2 /100000"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*$3 /100000"); + aStringSequence[4] = CREATE_OUSTRING ("logheight*$4 /100000"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth*$5 /100000"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[9] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -2870,15 +2870,15 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[2] = CREATE_OUSTRING ("?1 +0-?0 "); aStringSequence[3] = CREATE_OUSTRING ("?2 +21600000-0"); aStringSequence[4] = CREATE_OUSTRING ("if(?2 ,?2 ,?3 )"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 *sin(pi*(?0 )/10800000)"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 *cos(pi*(?0 )/10800000)"); aStringSequence[9] = CREATE_OUSTRING ("?5 *(cos(atan2(?6 ,?8 )))"); aStringSequence[10] = CREATE_OUSTRING ("?7 *(sin(atan2(?6 ,?8 )))"); - aStringSequence[11] = CREATE_OUSTRING ("width/2"); + aStringSequence[11] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[12] = CREATE_OUSTRING ("?11 +?9 -0"); - aStringSequence[13] = CREATE_OUSTRING ("height/2"); + aStringSequence[13] = CREATE_OUSTRING ("logheight/2"); aStringSequence[14] = CREATE_OUSTRING ("?13 +?10 -0"); aStringSequence[15] = CREATE_OUSTRING ("?5 *sin(pi*(?1 )/10800000)"); aStringSequence[16] = CREATE_OUSTRING ("?7 *cos(pi*(?1 )/10800000)"); @@ -2892,8 +2892,8 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[24] = CREATE_OUSTRING ("?11 +?21 -0"); aStringSequence[25] = CREATE_OUSTRING ("?13 +0-?22 "); aStringSequence[26] = CREATE_OUSTRING ("?13 +?22 -0"); - aStringSequence[27] = CREATE_OUSTRING ("width"); - aStringSequence[28] = CREATE_OUSTRING ("height"); + aStringSequence[27] = CREATE_OUSTRING ("logwidth"); + aStringSequence[28] = CREATE_OUSTRING ("logheight"); aStringSequence[29] = CREATE_OUSTRING ("(?0 )/60000.0"); aStringSequence[30] = CREATE_OUSTRING ("(?4 )/60000.0"); aPropertyMap [PROP_Equations] <<= aStringSequence; @@ -3088,21 +3088,21 @@ void CustomShapeProperties::initializePresetsMap3() { Sequence< OUString > aStringSequence (16); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /50000"); - aStringSequence[3] = CREATE_OUSTRING ("height/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/2"); aStringSequence[4] = CREATE_OUSTRING ("?3 *?0 /50000"); aStringSequence[5] = CREATE_OUSTRING ("?2 *cos(pi*(2700000)/10800000)"); aStringSequence[6] = CREATE_OUSTRING ("?4 *sin(pi*(2700000)/10800000)"); - aStringSequence[7] = CREATE_OUSTRING ("width/2"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?5 "); aStringSequence[9] = CREATE_OUSTRING ("?7 +?5 -0"); - aStringSequence[10] = CREATE_OUSTRING ("height/2"); + aStringSequence[10] = CREATE_OUSTRING ("logheight/2"); aStringSequence[11] = CREATE_OUSTRING ("?10 +0-?6 "); aStringSequence[12] = CREATE_OUSTRING ("?10 +?6 -0"); aStringSequence[13] = CREATE_OUSTRING ("?10 +0-?4 "); - aStringSequence[14] = CREATE_OUSTRING ("height"); - aStringSequence[15] = CREATE_OUSTRING ("width"); + aStringSequence[14] = CREATE_OUSTRING ("logheight"); + aStringSequence[15] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -3354,12 +3354,12 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (6); - aStringSequence[0] = CREATE_OUSTRING ("width*7/8"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); - aStringSequence[3] = CREATE_OUSTRING ("height"); - aStringSequence[4] = CREATE_OUSTRING ("width"); - aStringSequence[5] = CREATE_OUSTRING ("width/8"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*7/8"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/8"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -3705,13 +3705,13 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (15); - aStringSequence[0] = CREATE_OUSTRING ("height*9/10"); - aStringSequence[1] = CREATE_OUSTRING ("height*4/5"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); - aStringSequence[3] = CREATE_OUSTRING ("height/10"); - aStringSequence[4] = CREATE_OUSTRING ("height/2"); - aStringSequence[5] = CREATE_OUSTRING ("width"); - aStringSequence[6] = CREATE_OUSTRING ("height/5"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*9/10"); + aStringSequence[1] = CREATE_OUSTRING ("logheight*4/5"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/10"); + aStringSequence[4] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth"); + aStringSequence[6] = CREATE_OUSTRING ("logheight/5"); aStringSequence[7] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[8] = CREATE_OUSTRING ("(-10800000)/60000.0"); aStringSequence[9] = CREATE_OUSTRING ("(10800000)/60000.0"); @@ -3975,10 +3975,10 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (4); - aStringSequence[0] = CREATE_OUSTRING ("width"); - aStringSequence[1] = CREATE_OUSTRING ("height"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); - aStringSequence[3] = CREATE_OUSTRING ("height/2"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth"); + aStringSequence[1] = CREATE_OUSTRING ("logheight"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/2"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -4118,10 +4118,10 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (4); - aStringSequence[0] = CREATE_OUSTRING ("width*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("height/2"); - aStringSequence[2] = CREATE_OUSTRING ("width"); - aStringSequence[3] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth"); + aStringSequence[3] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -4301,12 +4301,12 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (6); - aStringSequence[0] = CREATE_OUSTRING ("sqrt(width*width+height*height+0*0)"); + aStringSequence[0] = CREATE_OUSTRING ("sqrt(logwidth*logwidth+logheight*logheight+0*0)"); aStringSequence[1] = CREATE_OUSTRING ("1*?0 /20"); - aStringSequence[2] = CREATE_OUSTRING ("0+height-?1 "); - aStringSequence[3] = CREATE_OUSTRING ("0+width-?1 "); - aStringSequence[4] = CREATE_OUSTRING ("height"); - aStringSequence[5] = CREATE_OUSTRING ("width"); + aStringSequence[2] = CREATE_OUSTRING ("0+logheight-?1 "); + aStringSequence[3] = CREATE_OUSTRING ("0+logwidth-?1 "); + aStringSequence[4] = CREATE_OUSTRING ("logheight"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -4666,15 +4666,15 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (24); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); - aStringSequence[3] = CREATE_OUSTRING ("height/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/2"); aStringSequence[4] = CREATE_OUSTRING ("?3 *$1 /100000"); aStringSequence[5] = CREATE_OUSTRING ("?0 *?2 /100000"); - aStringSequence[6] = CREATE_OUSTRING ("width+0-?5 "); + aStringSequence[6] = CREATE_OUSTRING ("logwidth+0-?5 "); aStringSequence[7] = CREATE_OUSTRING ("?4 *sin(pi*(3600000)/10800000)"); - aStringSequence[8] = CREATE_OUSTRING ("height/2"); + aStringSequence[8] = CREATE_OUSTRING ("logheight/2"); aStringSequence[9] = CREATE_OUSTRING ("?8 +0-?7 "); aStringSequence[10] = CREATE_OUSTRING ("?8 +?7 -0"); aStringSequence[11] = CREATE_OUSTRING ("?1 *-1/2"); @@ -4685,11 +4685,11 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[16] = CREATE_OUSTRING ("(?2 +?15 )/?11 "); aStringSequence[17] = CREATE_OUSTRING ("?16 *?14 /-1"); aStringSequence[18] = CREATE_OUSTRING ("?13 +?17 -0"); - aStringSequence[19] = CREATE_OUSTRING ("width*?18 /24"); - aStringSequence[20] = CREATE_OUSTRING ("height*?18 /24"); - aStringSequence[21] = CREATE_OUSTRING ("width+0-?19 "); - aStringSequence[22] = CREATE_OUSTRING ("height+0-?20 "); - aStringSequence[23] = CREATE_OUSTRING ("width"); + aStringSequence[19] = CREATE_OUSTRING ("logwidth*?18 /24"); + aStringSequence[20] = CREATE_OUSTRING ("logheight*?18 /24"); + aStringSequence[21] = CREATE_OUSTRING ("logwidth+0-?19 "); + aStringSequence[22] = CREATE_OUSTRING ("logheight+0-?20 "); + aStringSequence[23] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -4905,18 +4905,18 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (20); - aStringSequence[0] = CREATE_OUSTRING ("width/2"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[1] = CREATE_OUSTRING ("?0 *cos(pi*(2700000)/10800000)"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 *sin(pi*(2700000)/10800000)"); - aStringSequence[4] = CREATE_OUSTRING ("width/2"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[5] = CREATE_OUSTRING ("?4 +0-?1 "); aStringSequence[6] = CREATE_OUSTRING ("?4 +?1 -0"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?3 "); aStringSequence[9] = CREATE_OUSTRING ("?7 +?3 -0"); - aStringSequence[10] = CREATE_OUSTRING ("height"); - aStringSequence[11] = CREATE_OUSTRING ("width"); + aStringSequence[10] = CREATE_OUSTRING ("logheight"); + aStringSequence[11] = CREATE_OUSTRING ("logwidth"); aStringSequence[12] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[13] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[14] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -5150,12 +5150,12 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (16); - aStringSequence[0] = CREATE_OUSTRING ("height*5/6"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); - aStringSequence[2] = CREATE_OUSTRING ("height/3"); - aStringSequence[3] = CREATE_OUSTRING ("height/2"); - aStringSequence[4] = CREATE_OUSTRING ("height"); - aStringSequence[5] = CREATE_OUSTRING ("width"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*5/6"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/3"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth"); aStringSequence[6] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[7] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[8] = CREATE_OUSTRING ("(0)/60000.0"); @@ -5577,20 +5577,20 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (14); - aStringSequence[0] = CREATE_OUSTRING ("width*49/48"); - aStringSequence[1] = CREATE_OUSTRING ("width*10/48"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*49/48"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*10/48"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +0-?0 "); aStringSequence[4] = CREATE_OUSTRING ("?2 +0-?1 "); aStringSequence[5] = CREATE_OUSTRING ("?2 +?1 -0"); aStringSequence[6] = CREATE_OUSTRING ("?2 +?0 -0"); - aStringSequence[7] = CREATE_OUSTRING ("height/3"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/3"); aStringSequence[8] = CREATE_OUSTRING ("0+0-?7 "); - aStringSequence[9] = CREATE_OUSTRING ("width*1/6"); - aStringSequence[10] = CREATE_OUSTRING ("width*5/6"); - aStringSequence[11] = CREATE_OUSTRING ("height*2/3"); - aStringSequence[12] = CREATE_OUSTRING ("height/4"); - aStringSequence[13] = CREATE_OUSTRING ("height"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth*1/6"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth*5/6"); + aStringSequence[11] = CREATE_OUSTRING ("logheight*2/3"); + aStringSequence[12] = CREATE_OUSTRING ("logheight/4"); + aStringSequence[13] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -5790,29 +5790,29 @@ void CustomShapeProperties::initializePresetsMap3() Sequence< OUString > aStringSequence (58); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(33333-$0 ,$0 ,33333))"); aStringSequence[1] = CREATE_OUSTRING ("if(25000-$1 ,25000,if(75000-$1 ,$1 ,75000))"); - aStringSequence[2] = CREATE_OUSTRING ("width/8"); - aStringSequence[3] = CREATE_OUSTRING ("width+0-?2 "); - aStringSequence[4] = CREATE_OUSTRING ("width*?1 /200000"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/8"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth+0-?2 "); + aStringSequence[4] = CREATE_OUSTRING ("logwidth*?1 /200000"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?4 "); aStringSequence[7] = CREATE_OUSTRING ("?5 +?4 -0"); - aStringSequence[8] = CREATE_OUSTRING ("width/32"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth/32"); aStringSequence[9] = CREATE_OUSTRING ("?6 +?8 -0"); aStringSequence[10] = CREATE_OUSTRING ("?7 +0-?8 "); aStringSequence[11] = CREATE_OUSTRING ("?6 +?2 -0"); aStringSequence[12] = CREATE_OUSTRING ("?7 +0-?2 "); aStringSequence[13] = CREATE_OUSTRING ("?11 +0-?8 "); aStringSequence[14] = CREATE_OUSTRING ("?12 +?8 -0"); - aStringSequence[15] = CREATE_OUSTRING ("height*?0 /200000"); - aStringSequence[16] = CREATE_OUSTRING ("height+0-?15 "); - aStringSequence[17] = CREATE_OUSTRING ("height*?0 /100000"); - aStringSequence[18] = CREATE_OUSTRING ("height+0-?17 "); + aStringSequence[15] = CREATE_OUSTRING ("logheight*?0 /200000"); + aStringSequence[16] = CREATE_OUSTRING ("logheight+0-?15 "); + aStringSequence[17] = CREATE_OUSTRING ("logheight*?0 /100000"); + aStringSequence[18] = CREATE_OUSTRING ("logheight+0-?17 "); aStringSequence[19] = CREATE_OUSTRING ("0+?17 -0"); - aStringSequence[20] = CREATE_OUSTRING ("(?19 +height)/2"); - aStringSequence[21] = CREATE_OUSTRING ("height*?0 /400000"); - aStringSequence[22] = CREATE_OUSTRING ("height+0-?21 "); + aStringSequence[20] = CREATE_OUSTRING ("(?19 +logheight)/2"); + aStringSequence[21] = CREATE_OUSTRING ("logheight*?0 /400000"); + aStringSequence[22] = CREATE_OUSTRING ("logheight+0-?21 "); aStringSequence[23] = CREATE_OUSTRING ("?16 +0-?21 "); - aStringSequence[24] = CREATE_OUSTRING ("height"); + aStringSequence[24] = CREATE_OUSTRING ("logheight"); aStringSequence[25] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[26] = CREATE_OUSTRING ("(-10800000)/60000.0"); aStringSequence[27] = CREATE_OUSTRING ("(5400000)/60000.0"); @@ -5821,7 +5821,7 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[30] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[31] = CREATE_OUSTRING ("(16200000)/60000.0"); aStringSequence[32] = CREATE_OUSTRING ("(-10800000)/60000.0"); - aStringSequence[33] = CREATE_OUSTRING ("width"); + aStringSequence[33] = CREATE_OUSTRING ("logwidth"); aStringSequence[34] = CREATE_OUSTRING ("(0)/60000.0"); aStringSequence[35] = CREATE_OUSTRING ("(-5400000)/60000.0"); aStringSequence[36] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -7646,22 +7646,22 @@ void CustomShapeProperties::initializePresetsMap3() { Sequence< OUString > aStringSequence (49); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(25000-$0 ,$0 ,25000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); aStringSequence[3] = CREATE_OUSTRING ("?1 *?0 /50000"); - aStringSequence[4] = CREATE_OUSTRING ("width+0-?3 "); - aStringSequence[5] = CREATE_OUSTRING ("width+0-?2 "); - aStringSequence[6] = CREATE_OUSTRING ("height/2"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth+0-?3 "); + aStringSequence[5] = CREATE_OUSTRING ("logwidth+0-?2 "); + aStringSequence[6] = CREATE_OUSTRING ("logheight/2"); aStringSequence[7] = CREATE_OUSTRING ("?6 +0-?2 "); aStringSequence[8] = CREATE_OUSTRING ("?6 +?2 -0"); - aStringSequence[9] = CREATE_OUSTRING ("height+0-?2 "); + aStringSequence[9] = CREATE_OUSTRING ("logheight+0-?2 "); aStringSequence[10] = CREATE_OUSTRING ("?2 *29289/100000"); aStringSequence[11] = CREATE_OUSTRING ("?2 +?10 -0"); - aStringSequence[12] = CREATE_OUSTRING ("width+0-?11 "); - aStringSequence[13] = CREATE_OUSTRING ("height+0-?10 "); - aStringSequence[14] = CREATE_OUSTRING ("width/2"); - aStringSequence[15] = CREATE_OUSTRING ("height"); - aStringSequence[16] = CREATE_OUSTRING ("width"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth+0-?11 "); + aStringSequence[13] = CREATE_OUSTRING ("logheight+0-?10 "); + aStringSequence[14] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[15] = CREATE_OUSTRING ("logheight"); + aStringSequence[16] = CREATE_OUSTRING ("logwidth"); aStringSequence[17] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[18] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[19] = CREATE_OUSTRING ("(0)/60000.0"); @@ -8737,11 +8737,11 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (5); - aStringSequence[0] = CREATE_OUSTRING ("width*3/4"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); - aStringSequence[2] = CREATE_OUSTRING ("width/4"); - aStringSequence[3] = CREATE_OUSTRING ("height/2"); - aStringSequence[4] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/4"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -8859,12 +8859,12 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (31); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[1] = CREATE_OUSTRING ("?0 *3/8"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +0-?1 "); aStringSequence[4] = CREATE_OUSTRING ("?2 +?1 -0"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?1 "); aStringSequence[7] = CREATE_OUSTRING ("?5 +?1 -0"); aStringSequence[8] = CREATE_OUSTRING ("?0 *3/4"); @@ -8888,8 +8888,8 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[26] = CREATE_OUSTRING ("?6 +?15 -0"); aStringSequence[27] = CREATE_OUSTRING ("?6 +?17 -0"); aStringSequence[28] = CREATE_OUSTRING ("?6 +?18 -0"); - aStringSequence[29] = CREATE_OUSTRING ("width"); - aStringSequence[30] = CREATE_OUSTRING ("height"); + aStringSequence[29] = CREATE_OUSTRING ("logwidth"); + aStringSequence[30] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -10209,18 +10209,18 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (12); - aStringSequence[0] = CREATE_OUSTRING ("height*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("width*$1 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("height*$2 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width*$3 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("height*$4 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("width*$5 /100000"); - aStringSequence[6] = CREATE_OUSTRING ("height*$6 /100000"); - aStringSequence[7] = CREATE_OUSTRING ("width*$7 /100000"); - aStringSequence[8] = CREATE_OUSTRING ("width"); - aStringSequence[9] = CREATE_OUSTRING ("height/2"); - aStringSequence[10] = CREATE_OUSTRING ("width/2"); - aStringSequence[11] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*$1 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*$2 /100000"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*$3 /100000"); + aStringSequence[4] = CREATE_OUSTRING ("logheight*$4 /100000"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth*$5 /100000"); + aStringSequence[6] = CREATE_OUSTRING ("logheight*$6 /100000"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth*$7 /100000"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth"); + aStringSequence[9] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[11] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -10778,11 +10778,11 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (5); - aStringSequence[0] = CREATE_OUSTRING ("width*3/4"); - aStringSequence[1] = CREATE_OUSTRING ("height/2"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); - aStringSequence[3] = CREATE_OUSTRING ("height"); - aStringSequence[4] = CREATE_OUSTRING ("width/4"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4"); + aStringSequence[1] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth/4"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -11044,16 +11044,16 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (10); - aStringSequence[0] = CREATE_OUSTRING ("width*4627/21600"); - aStringSequence[1] = CREATE_OUSTRING ("width*8485/21600"); - aStringSequence[2] = CREATE_OUSTRING ("width*16702/21600"); - aStringSequence[3] = CREATE_OUSTRING ("width*14522/21600"); - aStringSequence[4] = CREATE_OUSTRING ("height*6320/21600"); - aStringSequence[5] = CREATE_OUSTRING ("height*8615/21600"); - aStringSequence[6] = CREATE_OUSTRING ("height*13937/21600"); - aStringSequence[7] = CREATE_OUSTRING ("height*13290/21600"); - aStringSequence[8] = CREATE_OUSTRING ("height"); - aStringSequence[9] = CREATE_OUSTRING ("width"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*4627/21600"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*8485/21600"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth*16702/21600"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*14522/21600"); + aStringSequence[4] = CREATE_OUSTRING ("logheight*6320/21600"); + aStringSequence[5] = CREATE_OUSTRING ("logheight*8615/21600"); + aStringSequence[6] = CREATE_OUSTRING ("logheight*13937/21600"); + aStringSequence[7] = CREATE_OUSTRING ("logheight*13290/21600"); + aStringSequence[8] = CREATE_OUSTRING ("logheight"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -11567,26 +11567,26 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[3] = CREATE_OUSTRING ("100000+0-?1 "); aStringSequence[4] = CREATE_OUSTRING ("?3 *1/2"); aStringSequence[5] = CREATE_OUSTRING ("if(0-$2 ,0,if(?4 -$2 ,$2 ,?4 ))"); - aStringSequence[6] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[6] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[7] = CREATE_OUSTRING ("?6 *?5 /100000"); aStringSequence[8] = CREATE_OUSTRING ("?6 *?0 /100000"); - aStringSequence[9] = CREATE_OUSTRING ("width/2"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[10] = CREATE_OUSTRING ("?9 +0-?8 "); aStringSequence[11] = CREATE_OUSTRING ("?9 +?8 -0"); aStringSequence[12] = CREATE_OUSTRING ("?6 *?2 /200000"); aStringSequence[13] = CREATE_OUSTRING ("?9 +0-?12 "); aStringSequence[14] = CREATE_OUSTRING ("?9 +?12 -0"); - aStringSequence[15] = CREATE_OUSTRING ("width+0-?7 "); - aStringSequence[16] = CREATE_OUSTRING ("height/2"); + aStringSequence[15] = CREATE_OUSTRING ("logwidth+0-?7 "); + aStringSequence[16] = CREATE_OUSTRING ("logheight/2"); aStringSequence[17] = CREATE_OUSTRING ("?16 +0-?8 "); aStringSequence[18] = CREATE_OUSTRING ("?16 +?8 -0"); aStringSequence[19] = CREATE_OUSTRING ("?16 +0-?12 "); aStringSequence[20] = CREATE_OUSTRING ("?16 +?12 -0"); - aStringSequence[21] = CREATE_OUSTRING ("height+0-?7 "); + aStringSequence[21] = CREATE_OUSTRING ("logheight+0-?7 "); aStringSequence[22] = CREATE_OUSTRING ("?12 *?7 /?8 "); - aStringSequence[23] = CREATE_OUSTRING ("width+0-?22 "); - aStringSequence[24] = CREATE_OUSTRING ("width"); - aStringSequence[25] = CREATE_OUSTRING ("height"); + aStringSequence[23] = CREATE_OUSTRING ("logwidth+0-?22 "); + aStringSequence[24] = CREATE_OUSTRING ("logwidth"); + aStringSequence[25] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -12226,21 +12226,21 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[1] = CREATE_OUSTRING ("100000+0-?0 "); aStringSequence[2] = CREATE_OUSTRING ("min(?1 ,?0 )"); aStringSequence[3] = CREATE_OUSTRING ("?2 *1/2"); - aStringSequence[4] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[5] = CREATE_OUSTRING ("?3 *height/?4 "); + aStringSequence[4] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[5] = CREATE_OUSTRING ("?3 *logheight/?4 "); aStringSequence[6] = CREATE_OUSTRING ("if(0-$0 ,0,if(?5 -$0 ,$0 ,?5 ))"); aStringSequence[7] = CREATE_OUSTRING ("?4 *?6 /100000"); - aStringSequence[8] = CREATE_OUSTRING ("height*?0 /100000"); + aStringSequence[8] = CREATE_OUSTRING ("logheight*?0 /100000"); aStringSequence[9] = CREATE_OUSTRING ("?8 +?7 -0"); - aStringSequence[10] = CREATE_OUSTRING ("width/2"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[11] = CREATE_OUSTRING ("?10 *cos(pi*(2700000)/10800000)"); aStringSequence[12] = CREATE_OUSTRING ("?7 *sin(pi*(2700000)/10800000)"); - aStringSequence[13] = CREATE_OUSTRING ("width+0-?11 "); + aStringSequence[13] = CREATE_OUSTRING ("logwidth+0-?11 "); aStringSequence[14] = CREATE_OUSTRING ("?7 +0-?12 "); - aStringSequence[15] = CREATE_OUSTRING ("height+?12 -?7 "); - aStringSequence[16] = CREATE_OUSTRING ("width/2"); - aStringSequence[17] = CREATE_OUSTRING ("width"); - aStringSequence[18] = CREATE_OUSTRING ("height"); + aStringSequence[15] = CREATE_OUSTRING ("logheight+?12 -?7 "); + aStringSequence[16] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[17] = CREATE_OUSTRING ("logwidth"); + aStringSequence[18] = CREATE_OUSTRING ("logheight"); aStringSequence[19] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[20] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[21] = CREATE_OUSTRING ("(0)/60000.0"); @@ -12880,20 +12880,20 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (22); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*height/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logheight/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("?0 *?2 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("height+0-?3 "); - aStringSequence[5] = CREATE_OUSTRING ("width*cos(pi*(2700000)/10800000)"); + aStringSequence[4] = CREATE_OUSTRING ("logheight+0-?3 "); + aStringSequence[5] = CREATE_OUSTRING ("logwidth*cos(pi*(2700000)/10800000)"); aStringSequence[6] = CREATE_OUSTRING ("?3 *sin(pi*(2700000)/10800000)"); - aStringSequence[7] = CREATE_OUSTRING ("width+0-?5 "); + aStringSequence[7] = CREATE_OUSTRING ("logwidth+0-?5 "); aStringSequence[8] = CREATE_OUSTRING ("?3 +0-?6 "); - aStringSequence[9] = CREATE_OUSTRING ("height+?6 -?3 "); - aStringSequence[10] = CREATE_OUSTRING ("width"); - aStringSequence[11] = CREATE_OUSTRING ("height/2"); - aStringSequence[12] = CREATE_OUSTRING ("height"); - aStringSequence[13] = CREATE_OUSTRING ("width"); + aStringSequence[9] = CREATE_OUSTRING ("logheight+?6 -?3 "); + aStringSequence[10] = CREATE_OUSTRING ("logwidth"); + aStringSequence[11] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[12] = CREATE_OUSTRING ("logheight"); + aStringSequence[13] = CREATE_OUSTRING ("logwidth"); aStringSequence[14] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[15] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[16] = CREATE_OUSTRING ("(10800000)/60000.0"); @@ -13292,9 +13292,9 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[4] = CREATE_OUSTRING ("?3 +21600000-0"); aStringSequence[5] = CREATE_OUSTRING ("if(?3 ,?3 ,?4 )"); aStringSequence[6] = CREATE_OUSTRING ("0+0-?5 "); - aStringSequence[7] = CREATE_OUSTRING ("width/2"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 *sin(pi*(?0 )/10800000)"); - aStringSequence[9] = CREATE_OUSTRING ("height/2"); + aStringSequence[9] = CREATE_OUSTRING ("logheight/2"); aStringSequence[10] = CREATE_OUSTRING ("?9 *cos(pi*(?0 )/10800000)"); aStringSequence[11] = CREATE_OUSTRING ("?7 *sin(pi*(?1 )/10800000)"); aStringSequence[12] = CREATE_OUSTRING ("?9 *cos(pi*(?1 )/10800000)"); @@ -13302,13 +13302,13 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[14] = CREATE_OUSTRING ("?9 *(sin(atan2(?8 ,?10 )))"); aStringSequence[15] = CREATE_OUSTRING ("?7 *(cos(atan2(?11 ,?12 )))"); aStringSequence[16] = CREATE_OUSTRING ("?9 *(sin(atan2(?11 ,?12 )))"); - aStringSequence[17] = CREATE_OUSTRING ("width/2"); + aStringSequence[17] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[18] = CREATE_OUSTRING ("?17 +?13 -0"); - aStringSequence[19] = CREATE_OUSTRING ("height/2"); + aStringSequence[19] = CREATE_OUSTRING ("logheight/2"); aStringSequence[20] = CREATE_OUSTRING ("?19 +?14 -0"); aStringSequence[21] = CREATE_OUSTRING ("?17 +?15 -0"); aStringSequence[22] = CREATE_OUSTRING ("?19 +?16 -0"); - aStringSequence[23] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[23] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[24] = CREATE_OUSTRING ("?23 *?2 /100000"); aStringSequence[25] = CREATE_OUSTRING ("?7 +0-?24 "); aStringSequence[26] = CREATE_OUSTRING ("?9 +0-?24 "); @@ -13329,7 +13329,7 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[41] = CREATE_OUSTRING ("max(?18 ,?35 )"); aStringSequence[42] = CREATE_OUSTRING ("max(?21 ,?37 )"); aStringSequence[43] = CREATE_OUSTRING ("max(?41 ,?42 )"); - aStringSequence[44] = CREATE_OUSTRING ("if(?40 ,width,?43 )"); + aStringSequence[44] = CREATE_OUSTRING ("if(?40 ,logwidth,?43 )"); aStringSequence[45] = CREATE_OUSTRING ("5400000+0-?0 "); aStringSequence[46] = CREATE_OUSTRING ("27000000+0-?0 "); aStringSequence[47] = CREATE_OUSTRING ("if(?45 ,?45 ,?46 )"); @@ -13337,7 +13337,7 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[49] = CREATE_OUSTRING ("max(?20 ,?36 )"); aStringSequence[50] = CREATE_OUSTRING ("max(?22 ,?38 )"); aStringSequence[51] = CREATE_OUSTRING ("max(?49 ,?50 )"); - aStringSequence[52] = CREATE_OUSTRING ("if(?48 ,height,?51 )"); + aStringSequence[52] = CREATE_OUSTRING ("if(?48 ,logheight,?51 )"); aStringSequence[53] = CREATE_OUSTRING ("10800000+0-?0 "); aStringSequence[54] = CREATE_OUSTRING ("32400000+0-?0 "); aStringSequence[55] = CREATE_OUSTRING ("if(?53 ,?53 ,?54 )"); @@ -13614,14 +13614,14 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (8); - aStringSequence[0] = CREATE_OUSTRING ("width*$0 /100000"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*$0 /100000"); aStringSequence[1] = CREATE_OUSTRING ("(0+?0 )/2"); - aStringSequence[2] = CREATE_OUSTRING ("(width+?0 )/2"); - aStringSequence[3] = CREATE_OUSTRING ("height*3/4"); - aStringSequence[4] = CREATE_OUSTRING ("height/2"); - aStringSequence[5] = CREATE_OUSTRING ("width"); - aStringSequence[6] = CREATE_OUSTRING ("height"); - aStringSequence[7] = CREATE_OUSTRING ("height/4"); + aStringSequence[2] = CREATE_OUSTRING ("(logwidth+?0 )/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight*3/4"); + aStringSequence[4] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth"); + aStringSequence[6] = CREATE_OUSTRING ("logheight"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/4"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -13867,30 +13867,30 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (51); - aStringSequence[0] = CREATE_OUSTRING ("width*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("height*$1 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logheight*$1 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +?0 -0"); - aStringSequence[4] = CREATE_OUSTRING ("height/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight/2"); aStringSequence[5] = CREATE_OUSTRING ("?4 +?1 -0"); - aStringSequence[6] = CREATE_OUSTRING ("?0 *height/width"); + aStringSequence[6] = CREATE_OUSTRING ("?0 *logheight/logwidth"); aStringSequence[7] = CREATE_OUSTRING ("abs(?1 )"); aStringSequence[8] = CREATE_OUSTRING ("abs(?6 )"); aStringSequence[9] = CREATE_OUSTRING ("?7 +0-?8 "); aStringSequence[10] = CREATE_OUSTRING ("if(?0 ,7,2)"); aStringSequence[11] = CREATE_OUSTRING ("if(?0 ,10,5)"); - aStringSequence[12] = CREATE_OUSTRING ("width*?10 /12"); - aStringSequence[13] = CREATE_OUSTRING ("width*?11 /12"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth*?10 /12"); + aStringSequence[13] = CREATE_OUSTRING ("logwidth*?11 /12"); aStringSequence[14] = CREATE_OUSTRING ("if(?1 ,7,2)"); aStringSequence[15] = CREATE_OUSTRING ("if(?1 ,10,5)"); - aStringSequence[16] = CREATE_OUSTRING ("height*?14 /12"); - aStringSequence[17] = CREATE_OUSTRING ("height*?15 /12"); + aStringSequence[16] = CREATE_OUSTRING ("logheight*?14 /12"); + aStringSequence[17] = CREATE_OUSTRING ("logheight*?15 /12"); aStringSequence[18] = CREATE_OUSTRING ("if(?0 ,0,?3 )"); aStringSequence[19] = CREATE_OUSTRING ("if(?9 ,0,?18 )"); aStringSequence[20] = CREATE_OUSTRING ("if(?1 ,?12 ,?3 )"); aStringSequence[21] = CREATE_OUSTRING ("if(?9 ,?20 ,?12 )"); - aStringSequence[22] = CREATE_OUSTRING ("if(?0 ,?3 ,width)"); - aStringSequence[23] = CREATE_OUSTRING ("if(?9 ,width,?22 )"); + aStringSequence[22] = CREATE_OUSTRING ("if(?0 ,?3 ,logwidth)"); + aStringSequence[23] = CREATE_OUSTRING ("if(?9 ,logwidth,?22 )"); aStringSequence[24] = CREATE_OUSTRING ("if(?1 ,?3 ,?12 )"); aStringSequence[25] = CREATE_OUSTRING ("if(?9 ,?24 ,?12 )"); aStringSequence[26] = CREATE_OUSTRING ("if(?0 ,?16 ,?5 )"); @@ -13899,17 +13899,17 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[29] = CREATE_OUSTRING ("if(?9 ,?28 ,0)"); aStringSequence[30] = CREATE_OUSTRING ("if(?0 ,?5 ,?16 )"); aStringSequence[31] = CREATE_OUSTRING ("if(?9 ,?16 ,?30 )"); - aStringSequence[32] = CREATE_OUSTRING ("if(?1 ,?5 ,height)"); - aStringSequence[33] = CREATE_OUSTRING ("if(?9 ,?32 ,height)"); - aStringSequence[34] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[32] = CREATE_OUSTRING ("if(?1 ,?5 ,logheight)"); + aStringSequence[33] = CREATE_OUSTRING ("if(?9 ,?32 ,logheight)"); + aStringSequence[34] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[35] = CREATE_OUSTRING ("?34 *$2 /100000"); - aStringSequence[36] = CREATE_OUSTRING ("width+0-?35 "); - aStringSequence[37] = CREATE_OUSTRING ("height+0-?35 "); + aStringSequence[36] = CREATE_OUSTRING ("logwidth+0-?35 "); + aStringSequence[37] = CREATE_OUSTRING ("logheight+0-?35 "); aStringSequence[38] = CREATE_OUSTRING ("?35 *29289/100000"); - aStringSequence[39] = CREATE_OUSTRING ("width+0-?38 "); - aStringSequence[40] = CREATE_OUSTRING ("height+0-?38 "); - aStringSequence[41] = CREATE_OUSTRING ("height"); - aStringSequence[42] = CREATE_OUSTRING ("width"); + aStringSequence[39] = CREATE_OUSTRING ("logwidth+0-?38 "); + aStringSequence[40] = CREATE_OUSTRING ("logheight+0-?38 "); + aStringSequence[41] = CREATE_OUSTRING ("logheight"); + aStringSequence[42] = CREATE_OUSTRING ("logwidth"); aStringSequence[43] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[44] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[45] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -14520,12 +14520,12 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (46); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[1] = CREATE_OUSTRING ("?0 *3/8"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +0-?1 "); aStringSequence[4] = CREATE_OUSTRING ("?2 +?1 -0"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?1 "); aStringSequence[7] = CREATE_OUSTRING ("?5 +?1 -0"); aStringSequence[8] = CREATE_OUSTRING ("?0 *3/4"); @@ -14564,8 +14564,8 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[41] = CREATE_OUSTRING ("?3 +?24 -0"); aStringSequence[42] = CREATE_OUSTRING ("?3 +?25 -0"); aStringSequence[43] = CREATE_OUSTRING ("?3 +?26 -0"); - aStringSequence[44] = CREATE_OUSTRING ("width"); - aStringSequence[45] = CREATE_OUSTRING ("height"); + aStringSequence[44] = CREATE_OUSTRING ("logwidth"); + aStringSequence[45] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -15901,11 +15901,11 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (9); - aStringSequence[0] = CREATE_OUSTRING ("width*5/6"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); - aStringSequence[3] = CREATE_OUSTRING ("height"); - aStringSequence[4] = CREATE_OUSTRING ("width/6"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*5/6"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth/6"); aStringSequence[5] = CREATE_OUSTRING ("(16200000)/60000.0"); aStringSequence[6] = CREATE_OUSTRING ("(-10800000)/60000.0"); aStringSequence[7] = CREATE_OUSTRING ("(5400000)/60000.0"); @@ -16127,15 +16127,15 @@ void CustomShapeProperties::initializePresetsMap3() Sequence< OUString > aStringSequence (124); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(20000-$0 ,$0 ,20000))"); aStringSequence[1] = CREATE_OUSTRING ("if(0-$1 ,0,if(5358-$1 ,$1 ,5358))"); - aStringSequence[2] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[2] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[3] = CREATE_OUSTRING ("?2 *?0 /100000"); aStringSequence[4] = CREATE_OUSTRING ("?2 *?1 /100000"); aStringSequence[5] = CREATE_OUSTRING ("?3 *1/2"); aStringSequence[6] = CREATE_OUSTRING ("?4 *1/2"); aStringSequence[7] = CREATE_OUSTRING ("?5 +?6 -0"); - aStringSequence[8] = CREATE_OUSTRING ("height/2"); + aStringSequence[8] = CREATE_OUSTRING ("logheight/2"); aStringSequence[9] = CREATE_OUSTRING ("?8 +0-?3 "); - aStringSequence[10] = CREATE_OUSTRING ("width/2"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[11] = CREATE_OUSTRING ("?10 +0-?3 "); aStringSequence[12] = CREATE_OUSTRING ("?11 +0-?9 "); aStringSequence[13] = CREATE_OUSTRING ("if(?12 ,?9 ,?11 )"); @@ -16151,9 +16151,9 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[23] = CREATE_OUSTRING ("?11 *?9 /?22 "); aStringSequence[24] = CREATE_OUSTRING ("?23 *cos(pi*(?19 )/10800000)"); aStringSequence[25] = CREATE_OUSTRING ("?23 *sin(pi*(?19 )/10800000)"); - aStringSequence[26] = CREATE_OUSTRING ("width/2"); + aStringSequence[26] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[27] = CREATE_OUSTRING ("?26 +?24 -0"); - aStringSequence[28] = CREATE_OUSTRING ("height/2"); + aStringSequence[28] = CREATE_OUSTRING ("logheight/2"); aStringSequence[29] = CREATE_OUSTRING ("?28 +?25 -0"); aStringSequence[30] = CREATE_OUSTRING ("?11 *cos(pi*(?16 )/10800000)"); aStringSequence[31] = CREATE_OUSTRING ("?9 *sin(pi*(?16 )/10800000)"); @@ -16204,39 +16204,39 @@ void CustomShapeProperties::initializePresetsMap3() aStringSequence[76] = CREATE_OUSTRING ("?11 *cos(pi*(?74 )/10800000)"); aStringSequence[77] = CREATE_OUSTRING ("?9 *sin(pi*(?74 )/10800000)"); aStringSequence[78] = CREATE_OUSTRING ("(10800000*atan2(?77 ,?76 ))/pi"); - aStringSequence[79] = CREATE_OUSTRING ("height+0-?40 "); + aStringSequence[79] = CREATE_OUSTRING ("logheight+0-?40 "); aStringSequence[80] = CREATE_OUSTRING ("?11 *cos(pi*(?75 )/10800000)"); aStringSequence[81] = CREATE_OUSTRING ("?9 *sin(pi*(?75 )/10800000)"); aStringSequence[82] = CREATE_OUSTRING ("(10800000*atan2(?81 ,?80 ))/pi"); - aStringSequence[83] = CREATE_OUSTRING ("height+0-?29 "); - aStringSequence[84] = CREATE_OUSTRING ("height+0-?55 "); - aStringSequence[85] = CREATE_OUSTRING ("height+0-?53 "); + aStringSequence[83] = CREATE_OUSTRING ("logheight+0-?29 "); + aStringSequence[84] = CREATE_OUSTRING ("logheight+0-?55 "); + aStringSequence[85] = CREATE_OUSTRING ("logheight+0-?53 "); aStringSequence[86] = CREATE_OUSTRING ("?54 "); aStringSequence[87] = CREATE_OUSTRING ("?78 +0-?32 "); aStringSequence[88] = CREATE_OUSTRING ("5400000+?14 -0"); aStringSequence[89] = CREATE_OUSTRING ("?11 *cos(pi*(?88 )/10800000)"); aStringSequence[90] = CREATE_OUSTRING ("?9 *sin(pi*(?88 )/10800000)"); aStringSequence[91] = CREATE_OUSTRING ("(10800000*atan2(?90 ,?89 ))/pi"); - aStringSequence[92] = CREATE_OUSTRING ("height+0-?68 "); - aStringSequence[93] = CREATE_OUSTRING ("height+0-?72 "); + aStringSequence[92] = CREATE_OUSTRING ("logheight+0-?68 "); + aStringSequence[93] = CREATE_OUSTRING ("logheight+0-?72 "); aStringSequence[94] = CREATE_OUSTRING ("9000000+?14 -0"); aStringSequence[95] = CREATE_OUSTRING ("?11 *cos(pi*(?94 )/10800000)"); aStringSequence[96] = CREATE_OUSTRING ("?9 *sin(pi*(?94 )/10800000)"); aStringSequence[97] = CREATE_OUSTRING ("(10800000*atan2(?96 ,?95 ))/pi"); - aStringSequence[98] = CREATE_OUSTRING ("width+0-?39 "); - aStringSequence[99] = CREATE_OUSTRING ("width+0-?54 "); - aStringSequence[100] = CREATE_OUSTRING ("width+0-?56 "); + aStringSequence[98] = CREATE_OUSTRING ("logwidth+0-?39 "); + aStringSequence[99] = CREATE_OUSTRING ("logwidth+0-?54 "); + aStringSequence[100] = CREATE_OUSTRING ("logwidth+0-?56 "); aStringSequence[101] = CREATE_OUSTRING ("12600000+?14 -0"); aStringSequence[102] = CREATE_OUSTRING ("?11 *cos(pi*(?101 )/10800000)"); aStringSequence[103] = CREATE_OUSTRING ("?9 *sin(pi*(?101 )/10800000)"); aStringSequence[104] = CREATE_OUSTRING ("(10800000*atan2(?103 ,?102 ))/pi"); - aStringSequence[105] = CREATE_OUSTRING ("width+0-?27 "); - aStringSequence[106] = CREATE_OUSTRING ("width+0-?56 "); - aStringSequence[107] = CREATE_OUSTRING ("width+0-?54 "); + aStringSequence[105] = CREATE_OUSTRING ("logwidth+0-?27 "); + aStringSequence[106] = CREATE_OUSTRING ("logwidth+0-?56 "); + aStringSequence[107] = CREATE_OUSTRING ("logwidth+0-?54 "); aStringSequence[108] = CREATE_OUSTRING ("(?56 +?54 )/2"); aStringSequence[109] = CREATE_OUSTRING ("(?55 +?53 )/2"); - aStringSequence[110] = CREATE_OUSTRING ("height+0-?109 "); - aStringSequence[111] = CREATE_OUSTRING ("(width+0)/?108 "); + aStringSequence[110] = CREATE_OUSTRING ("logheight+0-?109 "); + aStringSequence[111] = CREATE_OUSTRING ("(logwidth+0)/?108 "); aStringSequence[112] = CREATE_OUSTRING ("(?32 )/60000.0"); aStringSequence[113] = CREATE_OUSTRING ("(?87 )/60000.0"); aStringSequence[114] = CREATE_OUSTRING ("(?82 )/60000.0"); @@ -17032,27 +17032,27 @@ void CustomShapeProperties::initializePresetsMap3() } { Sequence< OUString > aStringSequence (21); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("100000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("100000*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("?0 *?2 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("height*?3 /width"); - aStringSequence[5] = CREATE_OUSTRING ("height+0-?4 "); + aStringSequence[4] = CREATE_OUSTRING ("logheight*?3 /logwidth"); + aStringSequence[5] = CREATE_OUSTRING ("logheight+0-?4 "); aStringSequence[6] = CREATE_OUSTRING ("100000*?5 /?0 "); aStringSequence[7] = CREATE_OUSTRING ("if(0-$0 ,0,if(?6 -$0 ,$0 ,?6 ))"); aStringSequence[8] = CREATE_OUSTRING ("?0 *?7 /100000"); - aStringSequence[9] = CREATE_OUSTRING ("?8 *width/height"); - aStringSequence[10] = CREATE_OUSTRING ("width+0-?9 "); - aStringSequence[11] = CREATE_OUSTRING ("?3 *height/width"); - aStringSequence[12] = CREATE_OUSTRING ("height+0-?11 "); + aStringSequence[9] = CREATE_OUSTRING ("?8 *logwidth/logheight"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth+0-?9 "); + aStringSequence[11] = CREATE_OUSTRING ("?3 *logheight/logwidth"); + aStringSequence[12] = CREATE_OUSTRING ("logheight+0-?11 "); aStringSequence[13] = CREATE_OUSTRING ("?3 *1/2"); - aStringSequence[14] = CREATE_OUSTRING ("(?12 +height)/2"); - aStringSequence[15] = CREATE_OUSTRING ("(?10 +width)/2"); + aStringSequence[14] = CREATE_OUSTRING ("(?12 +logheight)/2"); + aStringSequence[15] = CREATE_OUSTRING ("(?10 +logwidth)/2"); aStringSequence[16] = CREATE_OUSTRING ("?8 *1/2"); - aStringSequence[17] = CREATE_OUSTRING ("height/2"); - aStringSequence[18] = CREATE_OUSTRING ("width/2"); - aStringSequence[19] = CREATE_OUSTRING ("width"); - aStringSequence[20] = CREATE_OUSTRING ("height"); + aStringSequence[17] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[18] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[19] = CREATE_OUSTRING ("logwidth"); + aStringSequence[20] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -17322,22 +17322,22 @@ void CustomShapeProperties::initializePresetsMap3() Sequence< OUString > aStringSequence (18); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); aStringSequence[1] = CREATE_OUSTRING ("if(0-$1 ,0,if(50000-$1 ,$1 ,50000))"); - aStringSequence[2] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[2] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[3] = CREATE_OUSTRING ("?2 *?0 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("width+0-?3 "); + aStringSequence[4] = CREATE_OUSTRING ("logwidth+0-?3 "); aStringSequence[5] = CREATE_OUSTRING ("?2 *?1 /100000"); - aStringSequence[6] = CREATE_OUSTRING ("width+0-?5 "); - aStringSequence[7] = CREATE_OUSTRING ("height+0-?5 "); + aStringSequence[6] = CREATE_OUSTRING ("logwidth+0-?5 "); + aStringSequence[7] = CREATE_OUSTRING ("logheight+0-?5 "); aStringSequence[8] = CREATE_OUSTRING ("?3 +0-?5 "); aStringSequence[9] = CREATE_OUSTRING ("if(?8 ,?3 ,?5 )"); aStringSequence[10] = CREATE_OUSTRING ("?9 *1/2"); - aStringSequence[11] = CREATE_OUSTRING ("width+0-?10 "); + aStringSequence[11] = CREATE_OUSTRING ("logwidth+0-?10 "); aStringSequence[12] = CREATE_OUSTRING ("?3 *1/2"); - aStringSequence[13] = CREATE_OUSTRING ("(?7 +height)/2"); - aStringSequence[14] = CREATE_OUSTRING ("height"); - aStringSequence[15] = CREATE_OUSTRING ("width"); - aStringSequence[16] = CREATE_OUSTRING ("height/2"); - aStringSequence[17] = CREATE_OUSTRING ("width/2"); + aStringSequence[13] = CREATE_OUSTRING ("(?7 +logheight)/2"); + aStringSequence[14] = CREATE_OUSTRING ("logheight"); + aStringSequence[15] = CREATE_OUSTRING ("logwidth"); + aStringSequence[16] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[17] = CREATE_OUSTRING ("logwidth/2"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -17638,13 +17638,13 @@ void CustomShapeProperties::initializePresetsMap3() { Sequence< OUString > aStringSequence (8); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(100000-$0 ,$0 ,100000))"); - aStringSequence[1] = CREATE_OUSTRING ("width*?0 /200000"); - aStringSequence[2] = CREATE_OUSTRING ("width*?0 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width/2"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*?0 /200000"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth*?0 /100000"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[4] = CREATE_OUSTRING ("?1 +?3 -0"); - aStringSequence[5] = CREATE_OUSTRING ("height/2"); - aStringSequence[6] = CREATE_OUSTRING ("height"); - aStringSequence[7] = CREATE_OUSTRING ("width"); + aStringSequence[5] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[6] = CREATE_OUSTRING ("logheight"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { diff --git a/oox/source/drawingml/customshapepresets4.cxx b/oox/source/drawingml/customshapepresets4.cxx index b7f30c475c02..9e5f354b6371 100644 --- a/oox/source/drawingml/customshapepresets4.cxx +++ b/oox/source/drawingml/customshapepresets4.cxx @@ -34,17 +34,17 @@ void CustomShapeProperties::initializePresetsMap4() Sequence< OUString > aStringSequence (30); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(200000-$0 ,$0 ,200000))"); aStringSequence[1] = CREATE_OUSTRING ("sqrt(2)"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 *?1 /1"); - aStringSequence[4] = CREATE_OUSTRING ("height/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight/2"); aStringSequence[5] = CREATE_OUSTRING ("?4 *?1 /1"); aStringSequence[6] = CREATE_OUSTRING ("?3 *?0 /100000"); aStringSequence[7] = CREATE_OUSTRING ("?5 *?0 /100000"); aStringSequence[8] = CREATE_OUSTRING ("?6 *cos(pi*(2700000)/10800000)"); aStringSequence[9] = CREATE_OUSTRING ("?7 *sin(pi*(2700000)/10800000)"); - aStringSequence[10] = CREATE_OUSTRING ("width/2"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[11] = CREATE_OUSTRING ("?10 +?8 -0"); - aStringSequence[12] = CREATE_OUSTRING ("height/2"); + aStringSequence[12] = CREATE_OUSTRING ("logheight/2"); aStringSequence[13] = CREATE_OUSTRING ("?12 +0-?9 "); aStringSequence[14] = CREATE_OUSTRING ("(?10 +?11 )/2"); aStringSequence[15] = CREATE_OUSTRING ("(?12 +?13 )/2"); @@ -54,8 +54,8 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[19] = CREATE_OUSTRING ("?10 +?16 -0"); aStringSequence[20] = CREATE_OUSTRING ("?12 +0-?17 "); aStringSequence[21] = CREATE_OUSTRING ("?12 +?17 -0"); - aStringSequence[22] = CREATE_OUSTRING ("width"); - aStringSequence[23] = CREATE_OUSTRING ("height"); + aStringSequence[22] = CREATE_OUSTRING ("logwidth"); + aStringSequence[23] = CREATE_OUSTRING ("logheight"); aStringSequence[24] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[25] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[26] = CREATE_OUSTRING ("(0)/60000.0"); @@ -379,11 +379,11 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (5); - aStringSequence[0] = CREATE_OUSTRING ("height*17322/21600"); - aStringSequence[1] = CREATE_OUSTRING ("height*20172/21600"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); - aStringSequence[3] = CREATE_OUSTRING ("height/2"); - aStringSequence[4] = CREATE_OUSTRING ("width"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*17322/21600"); + aStringSequence[1] = CREATE_OUSTRING ("logheight*20172/21600"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -577,29 +577,29 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (23); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*height/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logheight/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("?2 *2/1"); aStringSequence[4] = CREATE_OUSTRING ("if(0-$0 ,0,if(?3 -$0 ,$0 ,?3 ))"); - aStringSequence[5] = CREATE_OUSTRING ("100000*width/?0 "); + aStringSequence[5] = CREATE_OUSTRING ("100000*logwidth/?0 "); aStringSequence[6] = CREATE_OUSTRING ("if(0-$2 ,0,if(?5 -$2 ,$2 ,?5 ))"); - aStringSequence[7] = CREATE_OUSTRING ("?6 *?0 /width"); + aStringSequence[7] = CREATE_OUSTRING ("?6 *?0 /logwidth"); aStringSequence[8] = CREATE_OUSTRING ("100000+0-?7 "); aStringSequence[9] = CREATE_OUSTRING ("if(0-$3 ,0,if(?8 -$3 ,$3 ,?8 ))"); aStringSequence[10] = CREATE_OUSTRING ("?0 *?2 /100000"); aStringSequence[11] = CREATE_OUSTRING ("?0 *?4 /200000"); - aStringSequence[12] = CREATE_OUSTRING ("height/2"); + aStringSequence[12] = CREATE_OUSTRING ("logheight/2"); aStringSequence[13] = CREATE_OUSTRING ("?12 +0-?10 "); aStringSequence[14] = CREATE_OUSTRING ("?12 +0-?11 "); aStringSequence[15] = CREATE_OUSTRING ("?12 +?11 -0"); aStringSequence[16] = CREATE_OUSTRING ("?12 +?10 -0"); aStringSequence[17] = CREATE_OUSTRING ("?0 *?6 /100000"); - aStringSequence[18] = CREATE_OUSTRING ("width+0-?17 "); - aStringSequence[19] = CREATE_OUSTRING ("width*?9 /100000"); + aStringSequence[18] = CREATE_OUSTRING ("logwidth+0-?17 "); + aStringSequence[19] = CREATE_OUSTRING ("logwidth*?9 /100000"); aStringSequence[20] = CREATE_OUSTRING ("?19 *1/2"); - aStringSequence[21] = CREATE_OUSTRING ("width"); - aStringSequence[22] = CREATE_OUSTRING ("height"); + aStringSequence[21] = CREATE_OUSTRING ("logwidth"); + aStringSequence[22] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -1049,22 +1049,22 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[1] = CREATE_OUSTRING ("100000+0-?0 "); aStringSequence[2] = CREATE_OUSTRING ("min(?1 ,?0 )"); aStringSequence[3] = CREATE_OUSTRING ("?2 *1/2"); - aStringSequence[4] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[5] = CREATE_OUSTRING ("?3 *height/?4 "); + aStringSequence[4] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[5] = CREATE_OUSTRING ("?3 *logheight/?4 "); aStringSequence[6] = CREATE_OUSTRING ("if(0-$0 ,0,if(?5 -$0 ,$0 ,?5 ))"); aStringSequence[7] = CREATE_OUSTRING ("?4 *?6 /100000"); - aStringSequence[8] = CREATE_OUSTRING ("height*?0 /100000"); + aStringSequence[8] = CREATE_OUSTRING ("logheight*?0 /100000"); aStringSequence[9] = CREATE_OUSTRING ("?8 +0-?7 "); - aStringSequence[10] = CREATE_OUSTRING ("height+0-?7 "); - aStringSequence[11] = CREATE_OUSTRING ("width/2"); + aStringSequence[10] = CREATE_OUSTRING ("logheight+0-?7 "); + aStringSequence[11] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[12] = CREATE_OUSTRING ("?11 *cos(pi*(2700000)/10800000)"); aStringSequence[13] = CREATE_OUSTRING ("?7 *sin(pi*(2700000)/10800000)"); aStringSequence[14] = CREATE_OUSTRING ("0+?12 -0"); aStringSequence[15] = CREATE_OUSTRING ("?7 +0-?13 "); - aStringSequence[16] = CREATE_OUSTRING ("height+?13 -?7 "); - aStringSequence[17] = CREATE_OUSTRING ("width/2"); - aStringSequence[18] = CREATE_OUSTRING ("width"); - aStringSequence[19] = CREATE_OUSTRING ("height"); + aStringSequence[16] = CREATE_OUSTRING ("logheight+?13 -?7 "); + aStringSequence[17] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[18] = CREATE_OUSTRING ("logwidth"); + aStringSequence[19] = CREATE_OUSTRING ("logheight"); aStringSequence[20] = CREATE_OUSTRING ("(16200000)/60000.0"); aStringSequence[21] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[22] = CREATE_OUSTRING ("(10800000)/60000.0"); @@ -1943,12 +1943,12 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (6); - aStringSequence[0] = CREATE_OUSTRING ("width/2"); - aStringSequence[1] = CREATE_OUSTRING ("height/10"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); - aStringSequence[3] = CREATE_OUSTRING ("height"); - aStringSequence[4] = CREATE_OUSTRING ("width"); - aStringSequence[5] = CREATE_OUSTRING ("height/5"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[1] = CREATE_OUSTRING ("logheight/10"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth"); + aStringSequence[5] = CREATE_OUSTRING ("logheight/5"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -2084,11 +2084,11 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (5); - aStringSequence[0] = CREATE_OUSTRING ("width*3/4"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); - aStringSequence[2] = CREATE_OUSTRING ("width/4"); - aStringSequence[3] = CREATE_OUSTRING ("height/2"); - aStringSequence[4] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/4"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -2206,8 +2206,8 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (2); - aStringSequence[0] = CREATE_OUSTRING ("width"); - aStringSequence[1] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth"); + aStringSequence[1] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -2309,21 +2309,21 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (15); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("100000*height/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("100000*logheight/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(100000-$0 ,$0 ,100000))"); aStringSequence[3] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[4] = CREATE_OUSTRING ("?0 *?3 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("height+0-?4 "); - aStringSequence[6] = CREATE_OUSTRING ("width*?2 /200000"); - aStringSequence[7] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logheight+0-?4 "); + aStringSequence[6] = CREATE_OUSTRING ("logwidth*?2 /200000"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?6 "); aStringSequence[9] = CREATE_OUSTRING ("?7 +?6 -0"); - aStringSequence[10] = CREATE_OUSTRING ("width/2"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[11] = CREATE_OUSTRING ("?8 *?4 /?10 "); aStringSequence[12] = CREATE_OUSTRING ("?5 +?11 -0"); - aStringSequence[13] = CREATE_OUSTRING ("height"); - aStringSequence[14] = CREATE_OUSTRING ("width"); + aStringSequence[13] = CREATE_OUSTRING ("logheight"); + aStringSequence[14] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -2613,30 +2613,30 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (62); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("if(0-$0 ,0,if(100000-$0 ,$0 ,100000))"); aStringSequence[4] = CREATE_OUSTRING ("?0 *?3 /100000"); aStringSequence[5] = CREATE_OUSTRING ("?0 *?2 /100000"); aStringSequence[6] = CREATE_OUSTRING ("(?4 +?5 )/4"); - aStringSequence[7] = CREATE_OUSTRING ("width/2"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?6 "); aStringSequence[9] = CREATE_OUSTRING ("?8 *2/1"); aStringSequence[10] = CREATE_OUSTRING ("?9 *?9 /1"); aStringSequence[11] = CREATE_OUSTRING ("?4 *?4 /1"); aStringSequence[12] = CREATE_OUSTRING ("?10 +0-?11 "); aStringSequence[13] = CREATE_OUSTRING ("sqrt(?12 )"); - aStringSequence[14] = CREATE_OUSTRING ("?13 *height/?9 "); + aStringSequence[14] = CREATE_OUSTRING ("?13 *logheight/?9 "); aStringSequence[15] = CREATE_OUSTRING ("100000*?14 /?0 "); aStringSequence[16] = CREATE_OUSTRING ("if(0-$2 ,0,if(?15 -$2 ,$2 ,?15 ))"); aStringSequence[17] = CREATE_OUSTRING ("?0 *$2 /100000"); aStringSequence[18] = CREATE_OUSTRING ("?8 +?4 -0"); - aStringSequence[19] = CREATE_OUSTRING ("height*height/1"); + aStringSequence[19] = CREATE_OUSTRING ("logheight*logheight/1"); aStringSequence[20] = CREATE_OUSTRING ("?17 *?17 /1"); aStringSequence[21] = CREATE_OUSTRING ("?19 +0-?20 "); aStringSequence[22] = CREATE_OUSTRING ("sqrt(?21 )"); - aStringSequence[23] = CREATE_OUSTRING ("?22 *?8 /height"); + aStringSequence[23] = CREATE_OUSTRING ("?22 *?8 /logheight"); aStringSequence[24] = CREATE_OUSTRING ("?8 +?23 -0"); aStringSequence[25] = CREATE_OUSTRING ("?18 +?23 -0"); aStringSequence[26] = CREATE_OUSTRING ("?5 +0-?4 "); @@ -2644,11 +2644,11 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[28] = CREATE_OUSTRING ("?24 +0-?27 "); aStringSequence[29] = CREATE_OUSTRING ("?25 +?27 -0"); aStringSequence[30] = CREATE_OUSTRING ("?5 *1/2"); - aStringSequence[31] = CREATE_OUSTRING ("width+0-?30 "); - aStringSequence[32] = CREATE_OUSTRING ("height+0-?17 "); + aStringSequence[31] = CREATE_OUSTRING ("logwidth+0-?30 "); + aStringSequence[32] = CREATE_OUSTRING ("logheight+0-?17 "); aStringSequence[33] = CREATE_OUSTRING ("(10800000*atan2(?23 ,?17 ))/pi"); aStringSequence[34] = CREATE_OUSTRING ("0+0-?33 "); - aStringSequence[35] = CREATE_OUSTRING ("height+0-?14 "); + aStringSequence[35] = CREATE_OUSTRING ("logheight+0-?14 "); aStringSequence[36] = CREATE_OUSTRING ("(?8 +?18 )/2"); aStringSequence[37] = CREATE_OUSTRING ("?4 *1/2"); aStringSequence[38] = CREATE_OUSTRING ("(10800000*atan2(?37 ,?14 ))/pi"); @@ -2656,9 +2656,9 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[40] = CREATE_OUSTRING ("16200000+0-?38 "); aStringSequence[41] = CREATE_OUSTRING ("?38 +0-5400000"); aStringSequence[42] = CREATE_OUSTRING ("5400000+?38 -0"); - aStringSequence[43] = CREATE_OUSTRING ("height"); - aStringSequence[44] = CREATE_OUSTRING ("width"); - aStringSequence[45] = CREATE_OUSTRING ("height"); + aStringSequence[43] = CREATE_OUSTRING ("logheight"); + aStringSequence[44] = CREATE_OUSTRING ("logwidth"); + aStringSequence[45] = CREATE_OUSTRING ("logheight"); aStringSequence[46] = CREATE_OUSTRING ("(?39 )/60000.0"); aStringSequence[47] = CREATE_OUSTRING ("(?34 )/60000.0"); aStringSequence[48] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -3530,12 +3530,12 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (49); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[1] = CREATE_OUSTRING ("?0 *3/8"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +0-?1 "); aStringSequence[4] = CREATE_OUSTRING ("?2 +?1 -0"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?1 "); aStringSequence[7] = CREATE_OUSTRING ("?5 +?1 -0"); aStringSequence[8] = CREATE_OUSTRING ("?0 *3/4"); @@ -3553,8 +3553,8 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[20] = CREATE_OUSTRING ("?6 +?12 -0"); aStringSequence[21] = CREATE_OUSTRING ("?6 +?13 -0"); aStringSequence[22] = CREATE_OUSTRING ("?8 *1/8"); - aStringSequence[23] = CREATE_OUSTRING ("width"); - aStringSequence[24] = CREATE_OUSTRING ("height"); + aStringSequence[23] = CREATE_OUSTRING ("logwidth"); + aStringSequence[24] = CREATE_OUSTRING ("logheight"); aStringSequence[25] = CREATE_OUSTRING ("(0)/60000.0"); aStringSequence[26] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[27] = CREATE_OUSTRING ("(5400000)/60000.0"); @@ -5058,15 +5058,15 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (9); - aStringSequence[0] = CREATE_OUSTRING ("width*2/5"); - aStringSequence[1] = CREATE_OUSTRING ("width*3/5"); - aStringSequence[2] = CREATE_OUSTRING ("width*4/5"); - aStringSequence[3] = CREATE_OUSTRING ("width*9/10"); - aStringSequence[4] = CREATE_OUSTRING ("width/2"); - aStringSequence[5] = CREATE_OUSTRING ("width/10"); - aStringSequence[6] = CREATE_OUSTRING ("height/2"); - aStringSequence[7] = CREATE_OUSTRING ("height"); - aStringSequence[8] = CREATE_OUSTRING ("width/5"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*2/5"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*3/5"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth*4/5"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*9/10"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/10"); + aStringSequence[6] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth/5"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -5207,17 +5207,17 @@ void CustomShapeProperties::initializePresetsMap4() { Sequence< OUString > aStringSequence (28); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width+0-?2 "); - aStringSequence[4] = CREATE_OUSTRING ("height+0-?2 "); + aStringSequence[3] = CREATE_OUSTRING ("logwidth+0-?2 "); + aStringSequence[4] = CREATE_OUSTRING ("logheight+0-?2 "); aStringSequence[5] = CREATE_OUSTRING ("?2 *29289/100000"); - aStringSequence[6] = CREATE_OUSTRING ("width+0-?5 "); - aStringSequence[7] = CREATE_OUSTRING ("height+0-?5 "); - aStringSequence[8] = CREATE_OUSTRING ("width/2"); - aStringSequence[9] = CREATE_OUSTRING ("height/2"); - aStringSequence[10] = CREATE_OUSTRING ("height"); - aStringSequence[11] = CREATE_OUSTRING ("width"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth+0-?5 "); + aStringSequence[7] = CREATE_OUSTRING ("logheight+0-?5 "); + aStringSequence[8] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[9] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[10] = CREATE_OUSTRING ("logheight"); + aStringSequence[11] = CREATE_OUSTRING ("logwidth"); aStringSequence[12] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[13] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[14] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -5874,31 +5874,31 @@ void CustomShapeProperties::initializePresetsMap4() { Sequence< OUString > aStringSequence (34); aStringSequence[0] = CREATE_OUSTRING ("if(-4653-$0 ,-4653,if(4653-$0 ,$0 ,4653))"); - aStringSequence[1] = CREATE_OUSTRING ("width*4969/21699"); - aStringSequence[2] = CREATE_OUSTRING ("width*6215/21600"); - aStringSequence[3] = CREATE_OUSTRING ("width*13135/21600"); - aStringSequence[4] = CREATE_OUSTRING ("width*16640/21600"); - aStringSequence[5] = CREATE_OUSTRING ("height*7570/21600"); - aStringSequence[6] = CREATE_OUSTRING ("height*16515/21600"); - aStringSequence[7] = CREATE_OUSTRING ("height*?0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*4969/21699"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth*6215/21600"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*13135/21600"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth*16640/21600"); + aStringSequence[5] = CREATE_OUSTRING ("logheight*7570/21600"); + aStringSequence[6] = CREATE_OUSTRING ("logheight*16515/21600"); + aStringSequence[7] = CREATE_OUSTRING ("logheight*?0 /100000"); aStringSequence[8] = CREATE_OUSTRING ("?6 +0-?7 "); aStringSequence[9] = CREATE_OUSTRING ("?6 +?7 -0"); - aStringSequence[10] = CREATE_OUSTRING ("height*?0 /50000"); + aStringSequence[10] = CREATE_OUSTRING ("logheight*?0 /50000"); aStringSequence[11] = CREATE_OUSTRING ("?9 +?10 -0"); - aStringSequence[12] = CREATE_OUSTRING ("width/2"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[13] = CREATE_OUSTRING ("?12 *cos(pi*(2700000)/10800000)"); - aStringSequence[14] = CREATE_OUSTRING ("height/2"); + aStringSequence[14] = CREATE_OUSTRING ("logheight/2"); aStringSequence[15] = CREATE_OUSTRING ("?14 *sin(pi*(2700000)/10800000)"); - aStringSequence[16] = CREATE_OUSTRING ("width/2"); + aStringSequence[16] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[17] = CREATE_OUSTRING ("?16 +0-?13 "); aStringSequence[18] = CREATE_OUSTRING ("?16 +?13 -0"); - aStringSequence[19] = CREATE_OUSTRING ("height/2"); + aStringSequence[19] = CREATE_OUSTRING ("logheight/2"); aStringSequence[20] = CREATE_OUSTRING ("?19 +0-?15 "); aStringSequence[21] = CREATE_OUSTRING ("?19 +?15 -0"); - aStringSequence[22] = CREATE_OUSTRING ("width*1125/21600"); - aStringSequence[23] = CREATE_OUSTRING ("height*1125/21600"); - aStringSequence[24] = CREATE_OUSTRING ("height"); - aStringSequence[25] = CREATE_OUSTRING ("width"); + aStringSequence[22] = CREATE_OUSTRING ("logwidth*1125/21600"); + aStringSequence[23] = CREATE_OUSTRING ("logheight*1125/21600"); + aStringSequence[24] = CREATE_OUSTRING ("logheight"); + aStringSequence[25] = CREATE_OUSTRING ("logwidth"); aStringSequence[26] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[27] = CREATE_OUSTRING ("(21600000)/60000.0"); aStringSequence[28] = CREATE_OUSTRING ("(10800000)/60000.0"); @@ -6368,10 +6368,10 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (4); - aStringSequence[0] = CREATE_OUSTRING ("width"); - aStringSequence[1] = CREATE_OUSTRING ("height/2"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); - aStringSequence[3] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth"); + aStringSequence[1] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -6517,37 +6517,37 @@ void CustomShapeProperties::initializePresetsMap4() Sequence< OUString > aStringSequence (33); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(20000-$0 ,$0 ,20000))"); aStringSequence[1] = CREATE_OUSTRING ("if(-10000-$1 ,-10000,if(10000-$1 ,$1 ,10000))"); - aStringSequence[2] = CREATE_OUSTRING ("height*?0 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*?0 /100000"); aStringSequence[3] = CREATE_OUSTRING ("?2 *10/3"); aStringSequence[4] = CREATE_OUSTRING ("?2 +0-?3 "); aStringSequence[5] = CREATE_OUSTRING ("?2 +?3 -0"); - aStringSequence[6] = CREATE_OUSTRING ("height+0-?2 "); + aStringSequence[6] = CREATE_OUSTRING ("logheight+0-?2 "); aStringSequence[7] = CREATE_OUSTRING ("?6 +0-?3 "); aStringSequence[8] = CREATE_OUSTRING ("?6 +?3 -0"); - aStringSequence[9] = CREATE_OUSTRING ("width*?1 /100000"); - aStringSequence[10] = CREATE_OUSTRING ("width*?1 /50000"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth*?1 /100000"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth*?1 /50000"); aStringSequence[11] = CREATE_OUSTRING ("abs(?9 )"); aStringSequence[12] = CREATE_OUSTRING ("if(?10 ,0,?10 )"); aStringSequence[13] = CREATE_OUSTRING ("0+0-?12 "); aStringSequence[14] = CREATE_OUSTRING ("if(?10 ,?10 ,0)"); - aStringSequence[15] = CREATE_OUSTRING ("width+0-?14 "); + aStringSequence[15] = CREATE_OUSTRING ("logwidth+0-?14 "); aStringSequence[16] = CREATE_OUSTRING ("(?12 +?15 )/3"); aStringSequence[17] = CREATE_OUSTRING ("?13 +?16 -0"); aStringSequence[18] = CREATE_OUSTRING ("(?17 +?15 )/2"); aStringSequence[19] = CREATE_OUSTRING ("0+?14 -0"); - aStringSequence[20] = CREATE_OUSTRING ("width+?12 -0"); + aStringSequence[20] = CREATE_OUSTRING ("logwidth+?12 -0"); aStringSequence[21] = CREATE_OUSTRING ("?19 +?16 -0"); aStringSequence[22] = CREATE_OUSTRING ("(?21 +?20 )/2"); - aStringSequence[23] = CREATE_OUSTRING ("width+0-?11 "); - aStringSequence[24] = CREATE_OUSTRING ("width/2"); + aStringSequence[23] = CREATE_OUSTRING ("logwidth+0-?11 "); + aStringSequence[24] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[25] = CREATE_OUSTRING ("?24 +?9 -0"); aStringSequence[26] = CREATE_OUSTRING ("?24 +0-?9 "); aStringSequence[27] = CREATE_OUSTRING ("max(?13 ,?19 )"); aStringSequence[28] = CREATE_OUSTRING ("min(?15 ,?20 )"); - aStringSequence[29] = CREATE_OUSTRING ("height*?0 /50000"); - aStringSequence[30] = CREATE_OUSTRING ("height+0-?29 "); - aStringSequence[31] = CREATE_OUSTRING ("height"); - aStringSequence[32] = CREATE_OUSTRING ("height/2"); + aStringSequence[29] = CREATE_OUSTRING ("logheight*?0 /50000"); + aStringSequence[30] = CREATE_OUSTRING ("logheight+0-?29 "); + aStringSequence[31] = CREATE_OUSTRING ("logheight"); + aStringSequence[32] = CREATE_OUSTRING ("logheight/2"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -6864,13 +6864,13 @@ void CustomShapeProperties::initializePresetsMap4() { Sequence< OUString > aStringSequence (32); aStringSequence[0] = CREATE_OUSTRING ("if(1-$0 ,1,if(75000-$0 ,$0 ,75000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[2] = CREATE_OUSTRING ("70000*width/?1 "); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[2] = CREATE_OUSTRING ("70000*logwidth/?1 "); aStringSequence[3] = CREATE_OUSTRING ("if(0-$1 ,0,if(?2 -$1 ,$1 ,?2 ))"); - aStringSequence[4] = CREATE_OUSTRING ("height*?0 /100000"); + aStringSequence[4] = CREATE_OUSTRING ("logheight*?0 /100000"); aStringSequence[5] = CREATE_OUSTRING ("?1 *?3 /100000"); - aStringSequence[6] = CREATE_OUSTRING ("width+0-?5 "); - aStringSequence[7] = CREATE_OUSTRING ("min(width,height)/56"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth+0-?5 "); + aStringSequence[7] = CREATE_OUSTRING ("min(logwidth,logheight)/56"); aStringSequence[8] = CREATE_OUSTRING ("0+?7 -0"); aStringSequence[9] = CREATE_OUSTRING ("5400000*1/14"); aStringSequence[10] = CREATE_OUSTRING ("?7 *tan(pi*(?9 )/10800000)"); @@ -6882,19 +6882,19 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[16] = CREATE_OUSTRING ("?13 +?7 -0"); aStringSequence[17] = CREATE_OUSTRING ("?16 +0-0"); aStringSequence[18] = CREATE_OUSTRING ("?17 *1/2"); - aStringSequence[19] = CREATE_OUSTRING ("height*1/20"); + aStringSequence[19] = CREATE_OUSTRING ("logheight*1/20"); aStringSequence[20] = CREATE_OUSTRING ("0+?18 -?19 "); - aStringSequence[21] = CREATE_OUSTRING ("height/6"); + aStringSequence[21] = CREATE_OUSTRING ("logheight/6"); aStringSequence[22] = CREATE_OUSTRING ("?21 *1/1"); aStringSequence[23] = CREATE_OUSTRING ("?21 +?22 -0"); - aStringSequence[24] = CREATE_OUSTRING ("width/6"); + aStringSequence[24] = CREATE_OUSTRING ("logwidth/6"); aStringSequence[25] = CREATE_OUSTRING ("?24 "); aStringSequence[26] = CREATE_OUSTRING ("?21 *1/2"); aStringSequence[27] = CREATE_OUSTRING ("?13 +?26 -0"); - aStringSequence[28] = CREATE_OUSTRING ("width/4"); + aStringSequence[28] = CREATE_OUSTRING ("logwidth/4"); aStringSequence[29] = CREATE_OUSTRING ("?28 "); - aStringSequence[30] = CREATE_OUSTRING ("height"); - aStringSequence[31] = CREATE_OUSTRING ("width"); + aStringSequence[30] = CREATE_OUSTRING ("logheight"); + aStringSequence[31] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -7220,18 +7220,18 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (28); - aStringSequence[0] = CREATE_OUSTRING ("width/2"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[1] = CREATE_OUSTRING ("?0 *cos(pi*(2700000)/10800000)"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 *sin(pi*(2700000)/10800000)"); - aStringSequence[4] = CREATE_OUSTRING ("width/2"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[5] = CREATE_OUSTRING ("?4 +0-?1 "); aStringSequence[6] = CREATE_OUSTRING ("?4 +?1 -0"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?3 "); aStringSequence[9] = CREATE_OUSTRING ("?7 +?3 -0"); - aStringSequence[10] = CREATE_OUSTRING ("height"); - aStringSequence[11] = CREATE_OUSTRING ("width"); + aStringSequence[10] = CREATE_OUSTRING ("logheight"); + aStringSequence[11] = CREATE_OUSTRING ("logwidth"); aStringSequence[12] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[13] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[14] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -7773,22 +7773,22 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (16); - aStringSequence[0] = CREATE_OUSTRING ("width*5022/21600"); - aStringSequence[1] = CREATE_OUSTRING ("width*8472/21600"); - aStringSequence[2] = CREATE_OUSTRING ("width*8757/21600"); - aStringSequence[3] = CREATE_OUSTRING ("width*10012/21600"); - aStringSequence[4] = CREATE_OUSTRING ("width*12860/21600"); - aStringSequence[5] = CREATE_OUSTRING ("width*13917/21600"); - aStringSequence[6] = CREATE_OUSTRING ("width*16577/21600"); - aStringSequence[7] = CREATE_OUSTRING ("height*3890/21600"); - aStringSequence[8] = CREATE_OUSTRING ("height*6080/21600"); - aStringSequence[9] = CREATE_OUSTRING ("height*7437/21600"); - aStringSequence[10] = CREATE_OUSTRING ("height*9705/21600"); - aStringSequence[11] = CREATE_OUSTRING ("height*12007/21600"); - aStringSequence[12] = CREATE_OUSTRING ("height*14277/21600"); - aStringSequence[13] = CREATE_OUSTRING ("height*14915/21600"); - aStringSequence[14] = CREATE_OUSTRING ("width"); - aStringSequence[15] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*5022/21600"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*8472/21600"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth*8757/21600"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*10012/21600"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth*12860/21600"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth*13917/21600"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth*16577/21600"); + aStringSequence[7] = CREATE_OUSTRING ("logheight*3890/21600"); + aStringSequence[8] = CREATE_OUSTRING ("logheight*6080/21600"); + aStringSequence[9] = CREATE_OUSTRING ("logheight*7437/21600"); + aStringSequence[10] = CREATE_OUSTRING ("logheight*9705/21600"); + aStringSequence[11] = CREATE_OUSTRING ("logheight*12007/21600"); + aStringSequence[12] = CREATE_OUSTRING ("logheight*14277/21600"); + aStringSequence[13] = CREATE_OUSTRING ("logheight*14915/21600"); + aStringSequence[14] = CREATE_OUSTRING ("logwidth"); + aStringSequence[15] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -8050,12 +8050,12 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (8); - aStringSequence[0] = CREATE_OUSTRING ("width*5/6"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); - aStringSequence[3] = CREATE_OUSTRING ("height"); - aStringSequence[4] = CREATE_OUSTRING ("width"); - aStringSequence[5] = CREATE_OUSTRING ("width/6"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*5/6"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/6"); aStringSequence[6] = CREATE_OUSTRING ("(16200000)/60000.0"); aStringSequence[7] = CREATE_OUSTRING ("(10800000)/60000.0"); aPropertyMap [PROP_Equations] <<= aStringSequence; @@ -8241,16 +8241,16 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (10); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[1] = CREATE_OUSTRING ("?0 *3/8"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +0-?1 "); aStringSequence[4] = CREATE_OUSTRING ("?2 +?1 -0"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?1 "); aStringSequence[7] = CREATE_OUSTRING ("?5 +?1 -0"); - aStringSequence[8] = CREATE_OUSTRING ("width"); - aStringSequence[9] = CREATE_OUSTRING ("height"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth"); + aStringSequence[9] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -8727,14 +8727,14 @@ void CustomShapeProperties::initializePresetsMap4() { Sequence< OUString > aStringSequence (9); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width+0-?2 "); - aStringSequence[4] = CREATE_OUSTRING ("height+0-?2 "); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); - aStringSequence[6] = CREATE_OUSTRING ("height/2"); - aStringSequence[7] = CREATE_OUSTRING ("height"); - aStringSequence[8] = CREATE_OUSTRING ("width"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth+0-?2 "); + aStringSequence[4] = CREATE_OUSTRING ("logheight+0-?2 "); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[6] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -9004,14 +9004,14 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (8); - aStringSequence[0] = CREATE_OUSTRING ("height*7/12"); - aStringSequence[1] = CREATE_OUSTRING ("width*7/12"); - aStringSequence[2] = CREATE_OUSTRING ("height*11/12"); - aStringSequence[3] = CREATE_OUSTRING ("height/2"); - aStringSequence[4] = CREATE_OUSTRING ("height"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); - aStringSequence[6] = CREATE_OUSTRING ("width"); - aStringSequence[7] = CREATE_OUSTRING ("width/12"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*7/12"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*7/12"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*11/12"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth/12"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -9129,19 +9129,19 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (21); - aStringSequence[0] = CREATE_OUSTRING ("width/2"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[1] = CREATE_OUSTRING ("?0 *cos(pi*(2700000)/10800000)"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 *sin(pi*(2700000)/10800000)"); - aStringSequence[4] = CREATE_OUSTRING ("width/2"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[5] = CREATE_OUSTRING ("?4 +0-?1 "); aStringSequence[6] = CREATE_OUSTRING ("?4 +?1 -0"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?3 "); aStringSequence[9] = CREATE_OUSTRING ("?7 +?3 -0"); - aStringSequence[10] = CREATE_OUSTRING ("(10800000*atan2(height,width))/pi"); - aStringSequence[11] = CREATE_OUSTRING ("height"); - aStringSequence[12] = CREATE_OUSTRING ("width"); + aStringSequence[10] = CREATE_OUSTRING ("(10800000*atan2(logheight,logwidth))/pi"); + aStringSequence[11] = CREATE_OUSTRING ("logheight"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth"); aStringSequence[13] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[14] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[15] = CREATE_OUSTRING ("(10800000)/60000.0"); @@ -9429,30 +9429,30 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (62); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*height/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logheight/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("if(0-$0 ,0,if(?2 -$0 ,$0 ,?2 ))"); aStringSequence[4] = CREATE_OUSTRING ("?0 *?3 /100000"); aStringSequence[5] = CREATE_OUSTRING ("?0 *?2 /100000"); aStringSequence[6] = CREATE_OUSTRING ("(?4 +?5 )/4"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?6 "); aStringSequence[9] = CREATE_OUSTRING ("?8 *2/1"); aStringSequence[10] = CREATE_OUSTRING ("?9 *?9 /1"); aStringSequence[11] = CREATE_OUSTRING ("?4 *?4 /1"); aStringSequence[12] = CREATE_OUSTRING ("?10 +0-?11 "); aStringSequence[13] = CREATE_OUSTRING ("sqrt(?12 )"); - aStringSequence[14] = CREATE_OUSTRING ("?13 *width/?9 "); + aStringSequence[14] = CREATE_OUSTRING ("?13 *logwidth/?9 "); aStringSequence[15] = CREATE_OUSTRING ("100000*?14 /?0 "); aStringSequence[16] = CREATE_OUSTRING ("if(0-$2 ,0,if(?15 -$2 ,$2 ,?15 ))"); aStringSequence[17] = CREATE_OUSTRING ("?0 *?16 /100000"); aStringSequence[18] = CREATE_OUSTRING ("?8 +?4 -0"); - aStringSequence[19] = CREATE_OUSTRING ("width*width/1"); + aStringSequence[19] = CREATE_OUSTRING ("logwidth*logwidth/1"); aStringSequence[20] = CREATE_OUSTRING ("?17 *?17 /1"); aStringSequence[21] = CREATE_OUSTRING ("?19 +0-?20 "); aStringSequence[22] = CREATE_OUSTRING ("sqrt(?21 )"); - aStringSequence[23] = CREATE_OUSTRING ("?22 *?8 /width"); + aStringSequence[23] = CREATE_OUSTRING ("?22 *?8 /logwidth"); aStringSequence[24] = CREATE_OUSTRING ("?8 +?23 -0"); aStringSequence[25] = CREATE_OUSTRING ("?18 +?23 -0"); aStringSequence[26] = CREATE_OUSTRING ("?5 +0-?4 "); @@ -9460,21 +9460,21 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[28] = CREATE_OUSTRING ("?24 +0-?27 "); aStringSequence[29] = CREATE_OUSTRING ("?25 +?27 -0"); aStringSequence[30] = CREATE_OUSTRING ("?5 *1/2"); - aStringSequence[31] = CREATE_OUSTRING ("height+0-?30 "); - aStringSequence[32] = CREATE_OUSTRING ("width+0-?17 "); + aStringSequence[31] = CREATE_OUSTRING ("logheight+0-?30 "); + aStringSequence[32] = CREATE_OUSTRING ("logwidth+0-?17 "); aStringSequence[33] = CREATE_OUSTRING ("(10800000*atan2(?23 ,?17 ))/pi"); aStringSequence[34] = CREATE_OUSTRING ("10800000+0-?33 "); aStringSequence[35] = CREATE_OUSTRING ("0+0-?33 "); - aStringSequence[36] = CREATE_OUSTRING ("width+0-?14 "); + aStringSequence[36] = CREATE_OUSTRING ("logwidth+0-?14 "); aStringSequence[37] = CREATE_OUSTRING ("(?8 +?18 )/2"); aStringSequence[38] = CREATE_OUSTRING ("?4 *1/2"); aStringSequence[39] = CREATE_OUSTRING ("(10800000*atan2(?38 ,?14 ))/pi"); aStringSequence[40] = CREATE_OUSTRING ("?39 +0-5400000"); aStringSequence[41] = CREATE_OUSTRING ("5400000+?39 -0"); aStringSequence[42] = CREATE_OUSTRING ("10800000+0-?39 "); - aStringSequence[43] = CREATE_OUSTRING ("width"); - aStringSequence[44] = CREATE_OUSTRING ("height"); - aStringSequence[45] = CREATE_OUSTRING ("width"); + aStringSequence[43] = CREATE_OUSTRING ("logwidth"); + aStringSequence[44] = CREATE_OUSTRING ("logheight"); + aStringSequence[45] = CREATE_OUSTRING ("logwidth"); aStringSequence[46] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[47] = CREATE_OUSTRING ("(?35 )/60000.0"); aStringSequence[48] = CREATE_OUSTRING ("(?34 )/60000.0"); @@ -10321,14 +10321,14 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("100000+0-?1 "); aStringSequence[4] = CREATE_OUSTRING ("if(0-$2 ,0,if(?3 -$2 ,$2 ,?3 ))"); - aStringSequence[5] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[5] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[6] = CREATE_OUSTRING ("?5 *?4 /100000"); aStringSequence[7] = CREATE_OUSTRING ("?5 *?0 /50000"); - aStringSequence[8] = CREATE_OUSTRING ("width+0-?7 "); - aStringSequence[9] = CREATE_OUSTRING ("height+0-?7 "); + aStringSequence[8] = CREATE_OUSTRING ("logwidth+0-?7 "); + aStringSequence[9] = CREATE_OUSTRING ("logheight+0-?7 "); aStringSequence[10] = CREATE_OUSTRING ("?5 *?0 /100000"); - aStringSequence[11] = CREATE_OUSTRING ("width+0-?10 "); - aStringSequence[12] = CREATE_OUSTRING ("height+0-?10 "); + aStringSequence[11] = CREATE_OUSTRING ("logwidth+0-?10 "); + aStringSequence[12] = CREATE_OUSTRING ("logheight+0-?10 "); aStringSequence[13] = CREATE_OUSTRING ("?5 *?2 /200000"); aStringSequence[14] = CREATE_OUSTRING ("?11 +0-?13 "); aStringSequence[15] = CREATE_OUSTRING ("?11 +?13 -0"); @@ -10337,8 +10337,8 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[18] = CREATE_OUSTRING ("?13 *?6 /?10 "); aStringSequence[19] = CREATE_OUSTRING ("(?6 +?15 )/2"); aStringSequence[20] = CREATE_OUSTRING ("(?6 +?17 )/2"); - aStringSequence[21] = CREATE_OUSTRING ("height"); - aStringSequence[22] = CREATE_OUSTRING ("width"); + aStringSequence[21] = CREATE_OUSTRING ("logheight"); + aStringSequence[22] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -10758,20 +10758,20 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (36); - aStringSequence[0] = CREATE_OUSTRING ("width*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("height*$1 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logheight*$1 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +?0 -0"); - aStringSequence[4] = CREATE_OUSTRING ("height/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight/2"); aStringSequence[5] = CREATE_OUSTRING ("?4 +?1 -0"); - aStringSequence[6] = CREATE_OUSTRING ("?0 *height/1"); - aStringSequence[7] = CREATE_OUSTRING ("?1 *width/1"); + aStringSequence[6] = CREATE_OUSTRING ("?0 *logheight/1"); + aStringSequence[7] = CREATE_OUSTRING ("?1 *logwidth/1"); aStringSequence[8] = CREATE_OUSTRING ("(10800000*atan2(?7 ,?6 ))/pi"); aStringSequence[9] = CREATE_OUSTRING ("?8 +660000-0"); aStringSequence[10] = CREATE_OUSTRING ("?8 +0-660000"); - aStringSequence[11] = CREATE_OUSTRING ("width/2"); + aStringSequence[11] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[12] = CREATE_OUSTRING ("?11 *cos(pi*(?9 )/10800000)"); - aStringSequence[13] = CREATE_OUSTRING ("height/2"); + aStringSequence[13] = CREATE_OUSTRING ("logheight/2"); aStringSequence[14] = CREATE_OUSTRING ("?13 *sin(pi*(?9 )/10800000)"); aStringSequence[15] = CREATE_OUSTRING ("?2 +?12 -0"); aStringSequence[16] = CREATE_OUSTRING ("?4 +?14 -0"); @@ -10790,8 +10790,8 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[29] = CREATE_OUSTRING ("?2 +?26 -0"); aStringSequence[30] = CREATE_OUSTRING ("?4 +0-?27 "); aStringSequence[31] = CREATE_OUSTRING ("?4 +?27 -0"); - aStringSequence[32] = CREATE_OUSTRING ("height"); - aStringSequence[33] = CREATE_OUSTRING ("width"); + aStringSequence[32] = CREATE_OUSTRING ("logheight"); + aStringSequence[33] = CREATE_OUSTRING ("logwidth"); aStringSequence[34] = CREATE_OUSTRING ("(?21 )/60000.0"); aStringSequence[35] = CREATE_OUSTRING ("(?25 )/60000.0"); aPropertyMap [PROP_Equations] <<= aStringSequence; @@ -11010,20 +11010,20 @@ void CustomShapeProperties::initializePresetsMap4() Sequence< OUString > aStringSequence (39); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(12500-$0 ,$0 ,12500))"); aStringSequence[1] = CREATE_OUSTRING ("if(-10000-$1 ,-10000,if(10000-$1 ,$1 ,10000))"); - aStringSequence[2] = CREATE_OUSTRING ("height*?0 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*?0 /100000"); aStringSequence[3] = CREATE_OUSTRING ("?2 *10/3"); aStringSequence[4] = CREATE_OUSTRING ("?2 +0-?3 "); aStringSequence[5] = CREATE_OUSTRING ("?2 +?3 -0"); - aStringSequence[6] = CREATE_OUSTRING ("height+0-?2 "); + aStringSequence[6] = CREATE_OUSTRING ("logheight+0-?2 "); aStringSequence[7] = CREATE_OUSTRING ("?6 +0-?3 "); aStringSequence[8] = CREATE_OUSTRING ("?6 +?3 -0"); - aStringSequence[9] = CREATE_OUSTRING ("width*?1 /100000"); - aStringSequence[10] = CREATE_OUSTRING ("width*?1 /50000"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth*?1 /100000"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth*?1 /50000"); aStringSequence[11] = CREATE_OUSTRING ("abs(?9 )"); aStringSequence[12] = CREATE_OUSTRING ("if(?10 ,0,?10 )"); aStringSequence[13] = CREATE_OUSTRING ("0+0-?12 "); aStringSequence[14] = CREATE_OUSTRING ("if(?10 ,?10 ,0)"); - aStringSequence[15] = CREATE_OUSTRING ("width+0-?14 "); + aStringSequence[15] = CREATE_OUSTRING ("logwidth+0-?14 "); aStringSequence[16] = CREATE_OUSTRING ("(?12 +?15 )/6"); aStringSequence[17] = CREATE_OUSTRING ("?13 +?16 -0"); aStringSequence[18] = CREATE_OUSTRING ("(?12 +?15 )/3"); @@ -11032,21 +11032,21 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[21] = CREATE_OUSTRING ("?20 +?16 -0"); aStringSequence[22] = CREATE_OUSTRING ("(?21 +?15 )/2"); aStringSequence[23] = CREATE_OUSTRING ("0+?14 -0"); - aStringSequence[24] = CREATE_OUSTRING ("width+?12 -0"); + aStringSequence[24] = CREATE_OUSTRING ("logwidth+?12 -0"); aStringSequence[25] = CREATE_OUSTRING ("?23 +?16 -0"); aStringSequence[26] = CREATE_OUSTRING ("?23 +?18 -0"); aStringSequence[27] = CREATE_OUSTRING ("(?23 +?24 )/2"); aStringSequence[28] = CREATE_OUSTRING ("?27 +?16 -0"); aStringSequence[29] = CREATE_OUSTRING ("(?28 +?24 )/2"); - aStringSequence[30] = CREATE_OUSTRING ("width+0-?11 "); - aStringSequence[31] = CREATE_OUSTRING ("width/2"); + aStringSequence[30] = CREATE_OUSTRING ("logwidth+0-?11 "); + aStringSequence[31] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[32] = CREATE_OUSTRING ("?31 +?9 -0"); aStringSequence[33] = CREATE_OUSTRING ("max(?13 ,?23 )"); aStringSequence[34] = CREATE_OUSTRING ("min(?15 ,?24 )"); - aStringSequence[35] = CREATE_OUSTRING ("height*?0 /50000"); - aStringSequence[36] = CREATE_OUSTRING ("height+0-?35 "); - aStringSequence[37] = CREATE_OUSTRING ("height"); - aStringSequence[38] = CREATE_OUSTRING ("height/2"); + aStringSequence[35] = CREATE_OUSTRING ("logheight*?0 /50000"); + aStringSequence[36] = CREATE_OUSTRING ("logheight+0-?35 "); + aStringSequence[37] = CREATE_OUSTRING ("logheight"); + aStringSequence[38] = CREATE_OUSTRING ("logheight/2"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -11482,14 +11482,14 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[1] = CREATE_OUSTRING ("?0 *2/1"); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("if(0-$2 ,0,if(50000-$2 ,$2 ,50000))"); - aStringSequence[4] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[4] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[5] = CREATE_OUSTRING ("?4 *?2 /100000"); aStringSequence[6] = CREATE_OUSTRING ("?4 *?0 /100000"); aStringSequence[7] = CREATE_OUSTRING ("?5 *1/2"); aStringSequence[8] = CREATE_OUSTRING ("?6 +0-?7 "); aStringSequence[9] = CREATE_OUSTRING ("?4 *?3 /100000"); - aStringSequence[10] = CREATE_OUSTRING ("width+0-?9 "); - aStringSequence[11] = CREATE_OUSTRING ("height+0-?8 "); + aStringSequence[10] = CREATE_OUSTRING ("logwidth+0-?9 "); + aStringSequence[11] = CREATE_OUSTRING ("logheight+0-?8 "); aStringSequence[12] = CREATE_OUSTRING ("min(?10 ,?11 )"); aStringSequence[13] = CREATE_OUSTRING ("100000*?12 /?4 "); aStringSequence[14] = CREATE_OUSTRING ("if(0-$3 ,0,if(?13 -$3 ,$3 ,?13 ))"); @@ -11497,13 +11497,13 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[16] = CREATE_OUSTRING ("?15 +0-?5 "); aStringSequence[17] = CREATE_OUSTRING ("max(?16 ,0)"); aStringSequence[18] = CREATE_OUSTRING ("?5 +?17 -0"); - aStringSequence[19] = CREATE_OUSTRING ("width+0-?9 "); + aStringSequence[19] = CREATE_OUSTRING ("logwidth+0-?9 "); aStringSequence[20] = CREATE_OUSTRING ("?8 +?5 -0"); aStringSequence[21] = CREATE_OUSTRING ("?20 +?8 -0"); aStringSequence[22] = CREATE_OUSTRING ("?8 +?15 -0"); aStringSequence[23] = CREATE_OUSTRING ("?20 +?17 -0"); - aStringSequence[24] = CREATE_OUSTRING ("height"); - aStringSequence[25] = CREATE_OUSTRING ("width"); + aStringSequence[24] = CREATE_OUSTRING ("logheight"); + aStringSequence[25] = CREATE_OUSTRING ("logwidth"); aStringSequence[26] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[27] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[28] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -12014,19 +12014,19 @@ void CustomShapeProperties::initializePresetsMap4() { Sequence< OUString > aStringSequence (36); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[2] = CREATE_OUSTRING ("?1 *$1 /100000"); aStringSequence[3] = CREATE_OUSTRING ("?2 *95106/100000"); aStringSequence[4] = CREATE_OUSTRING ("?2 *58779/100000"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?3 "); aStringSequence[7] = CREATE_OUSTRING ("?5 +0-?4 "); aStringSequence[8] = CREATE_OUSTRING ("?5 +?4 -0"); aStringSequence[9] = CREATE_OUSTRING ("?5 +?3 -0"); - aStringSequence[10] = CREATE_OUSTRING ("height/2"); + aStringSequence[10] = CREATE_OUSTRING ("logheight/2"); aStringSequence[11] = CREATE_OUSTRING ("?10 *80902/100000"); aStringSequence[12] = CREATE_OUSTRING ("?10 *30902/100000"); - aStringSequence[13] = CREATE_OUSTRING ("height/2"); + aStringSequence[13] = CREATE_OUSTRING ("logheight/2"); aStringSequence[14] = CREATE_OUSTRING ("?13 +0-?11 "); aStringSequence[15] = CREATE_OUSTRING ("?13 +0-?12 "); aStringSequence[16] = CREATE_OUSTRING ("?13 +?12 -0"); @@ -12048,7 +12048,7 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[32] = CREATE_OUSTRING ("?13 +?23 -0"); aStringSequence[33] = CREATE_OUSTRING ("?13 +?22 -0"); aStringSequence[34] = CREATE_OUSTRING ("?13 +0-?19 "); - aStringSequence[35] = CREATE_OUSTRING ("height"); + aStringSequence[35] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -12524,21 +12524,21 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (15); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("100000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("100000*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(100000-$0 ,$0 ,100000))"); aStringSequence[3] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[4] = CREATE_OUSTRING ("?0 *?3 /100000"); aStringSequence[5] = CREATE_OUSTRING ("0+?4 -0"); - aStringSequence[6] = CREATE_OUSTRING ("height*?2 /200000"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); + aStringSequence[6] = CREATE_OUSTRING ("logheight*?2 /200000"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?6 "); aStringSequence[9] = CREATE_OUSTRING ("?7 +?6 -0"); - aStringSequence[10] = CREATE_OUSTRING ("height/2"); + aStringSequence[10] = CREATE_OUSTRING ("logheight/2"); aStringSequence[11] = CREATE_OUSTRING ("?8 *?4 /?10 "); aStringSequence[12] = CREATE_OUSTRING ("?5 +0-?11 "); - aStringSequence[13] = CREATE_OUSTRING ("width"); - aStringSequence[14] = CREATE_OUSTRING ("height"); + aStringSequence[13] = CREATE_OUSTRING ("logwidth"); + aStringSequence[14] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -12828,30 +12828,30 @@ void CustomShapeProperties::initializePresetsMap4() } { Sequence< OUString > aStringSequence (63); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("if(0-$0 ,0,if(100000-$0 ,$0 ,100000))"); aStringSequence[4] = CREATE_OUSTRING ("?0 *?3 /100000"); aStringSequence[5] = CREATE_OUSTRING ("?0 *?2 /100000"); aStringSequence[6] = CREATE_OUSTRING ("(?4 +?5 )/4"); - aStringSequence[7] = CREATE_OUSTRING ("width/2"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?6 "); aStringSequence[9] = CREATE_OUSTRING ("?8 *2/1"); aStringSequence[10] = CREATE_OUSTRING ("?9 *?9 /1"); aStringSequence[11] = CREATE_OUSTRING ("?4 *?4 /1"); aStringSequence[12] = CREATE_OUSTRING ("?10 +0-?11 "); aStringSequence[13] = CREATE_OUSTRING ("sqrt(?12 )"); - aStringSequence[14] = CREATE_OUSTRING ("?13 *height/?9 "); + aStringSequence[14] = CREATE_OUSTRING ("?13 *logheight/?9 "); aStringSequence[15] = CREATE_OUSTRING ("100000*?14 /?0 "); aStringSequence[16] = CREATE_OUSTRING ("if(0-$2 ,0,if(?15 -$2 ,$2 ,?15 ))"); aStringSequence[17] = CREATE_OUSTRING ("?0 *$2 /100000"); aStringSequence[18] = CREATE_OUSTRING ("?8 +?4 -0"); - aStringSequence[19] = CREATE_OUSTRING ("height*height/1"); + aStringSequence[19] = CREATE_OUSTRING ("logheight*logheight/1"); aStringSequence[20] = CREATE_OUSTRING ("?17 *?17 /1"); aStringSequence[21] = CREATE_OUSTRING ("?19 +0-?20 "); aStringSequence[22] = CREATE_OUSTRING ("sqrt(?21 )"); - aStringSequence[23] = CREATE_OUSTRING ("?22 *?8 /height"); + aStringSequence[23] = CREATE_OUSTRING ("?22 *?8 /logheight"); aStringSequence[24] = CREATE_OUSTRING ("?8 +?23 -0"); aStringSequence[25] = CREATE_OUSTRING ("?18 +?23 -0"); aStringSequence[26] = CREATE_OUSTRING ("?5 +0-?4 "); @@ -12859,7 +12859,7 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[28] = CREATE_OUSTRING ("?24 +0-?27 "); aStringSequence[29] = CREATE_OUSTRING ("?25 +?27 -0"); aStringSequence[30] = CREATE_OUSTRING ("?5 *1/2"); - aStringSequence[31] = CREATE_OUSTRING ("width+0-?30 "); + aStringSequence[31] = CREATE_OUSTRING ("logwidth+0-?30 "); aStringSequence[32] = CREATE_OUSTRING ("0+?17 -0"); aStringSequence[33] = CREATE_OUSTRING ("(10800000*atan2(?23 ,?17 ))/pi"); aStringSequence[34] = CREATE_OUSTRING ("0+0-?33 "); @@ -12872,9 +12872,9 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[41] = CREATE_OUSTRING ("5400000+0-?33 "); aStringSequence[42] = CREATE_OUSTRING ("?33 +?38 -0"); aStringSequence[43] = CREATE_OUSTRING ("5400000+0-?38 "); - aStringSequence[44] = CREATE_OUSTRING ("width"); - aStringSequence[45] = CREATE_OUSTRING ("height"); - aStringSequence[46] = CREATE_OUSTRING ("height"); + aStringSequence[44] = CREATE_OUSTRING ("logwidth"); + aStringSequence[45] = CREATE_OUSTRING ("logheight"); + aStringSequence[46] = CREATE_OUSTRING ("logheight"); aStringSequence[47] = CREATE_OUSTRING ("(?41 )/60000.0"); aStringSequence[48] = CREATE_OUSTRING ("(?42 )/60000.0"); aStringSequence[49] = CREATE_OUSTRING ("(?43 )/60000.0"); @@ -13721,15 +13721,15 @@ void CustomShapeProperties::initializePresetsMap4() { Sequence< OUString > aStringSequence (10); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width+0-?2 "); + aStringSequence[3] = CREATE_OUSTRING ("logwidth+0-?2 "); aStringSequence[4] = CREATE_OUSTRING ("?2 *1/2"); - aStringSequence[5] = CREATE_OUSTRING ("(?3 +width)/2"); - aStringSequence[6] = CREATE_OUSTRING ("width"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); - aStringSequence[8] = CREATE_OUSTRING ("width/2"); - aStringSequence[9] = CREATE_OUSTRING ("height"); + aStringSequence[5] = CREATE_OUSTRING ("(?3 +logwidth)/2"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[9] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -13946,56 +13946,56 @@ void CustomShapeProperties::initializePresetsMap4() aStringSequence[4] = CREATE_OUSTRING ("?0 +0-?3 "); aStringSequence[5] = CREATE_OUSTRING ("max(0,?4 )"); aStringSequence[6] = CREATE_OUSTRING ("if(?5 -$2 ,?5 ,if(?0 -$2 ,$2 ,?0 ))"); - aStringSequence[7] = CREATE_OUSTRING ("width*?1 /200000"); - aStringSequence[8] = CREATE_OUSTRING ("width/2"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth*?1 /200000"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[9] = CREATE_OUSTRING ("?8 +0-?7 "); - aStringSequence[10] = CREATE_OUSTRING ("width/8"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth/8"); aStringSequence[11] = CREATE_OUSTRING ("?9 +?10 -0"); - aStringSequence[12] = CREATE_OUSTRING ("width+0-?11 "); - aStringSequence[13] = CREATE_OUSTRING ("width+0-?9 "); - aStringSequence[14] = CREATE_OUSTRING ("width+0-?10 "); - aStringSequence[15] = CREATE_OUSTRING ("height*?6 /100000"); - aStringSequence[16] = CREATE_OUSTRING ("4*?15 /width"); - aStringSequence[17] = CREATE_OUSTRING ("?11 *?11 /width"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth+0-?11 "); + aStringSequence[13] = CREATE_OUSTRING ("logwidth+0-?9 "); + aStringSequence[14] = CREATE_OUSTRING ("logwidth+0-?10 "); + aStringSequence[15] = CREATE_OUSTRING ("logheight*?6 /100000"); + aStringSequence[16] = CREATE_OUSTRING ("4*?15 /logwidth"); + aStringSequence[17] = CREATE_OUSTRING ("?11 *?11 /logwidth"); aStringSequence[18] = CREATE_OUSTRING ("?11 +0-?17 "); aStringSequence[19] = CREATE_OUSTRING ("?16 *?18 /1"); - aStringSequence[20] = CREATE_OUSTRING ("height+0-?19 "); + aStringSequence[20] = CREATE_OUSTRING ("logheight+0-?19 "); aStringSequence[21] = CREATE_OUSTRING ("?11 *1/2"); aStringSequence[22] = CREATE_OUSTRING ("?16 *?21 /1"); - aStringSequence[23] = CREATE_OUSTRING ("height+0-?22 "); - aStringSequence[24] = CREATE_OUSTRING ("width+0-?21 "); - aStringSequence[25] = CREATE_OUSTRING ("height*?0 /100000"); + aStringSequence[23] = CREATE_OUSTRING ("logheight+0-?22 "); + aStringSequence[24] = CREATE_OUSTRING ("logwidth+0-?21 "); + aStringSequence[25] = CREATE_OUSTRING ("logheight*?0 /100000"); aStringSequence[26] = CREATE_OUSTRING ("?17 +0-?15 "); - aStringSequence[27] = CREATE_OUSTRING ("?9 *?9 /width"); + aStringSequence[27] = CREATE_OUSTRING ("?9 *?9 /logwidth"); aStringSequence[28] = CREATE_OUSTRING ("?9 +0-?27 "); aStringSequence[29] = CREATE_OUSTRING ("?16 *?28 /1"); aStringSequence[30] = CREATE_OUSTRING ("?29 +?26 -0"); - aStringSequence[31] = CREATE_OUSTRING ("height+0-?30 "); + aStringSequence[31] = CREATE_OUSTRING ("logheight+0-?30 "); aStringSequence[32] = CREATE_OUSTRING ("?15 +?26 -?30 "); aStringSequence[33] = CREATE_OUSTRING ("?32 +?15 -0"); aStringSequence[34] = CREATE_OUSTRING ("?33 +?26 -0"); - aStringSequence[35] = CREATE_OUSTRING ("height+0-?34 "); - aStringSequence[36] = CREATE_OUSTRING ("height+0-?17 "); + aStringSequence[35] = CREATE_OUSTRING ("logheight+0-?34 "); + aStringSequence[36] = CREATE_OUSTRING ("logheight+0-?17 "); aStringSequence[37] = CREATE_OUSTRING ("?15 *14/16"); aStringSequence[38] = CREATE_OUSTRING ("(?37 +?36 )/2"); - aStringSequence[39] = CREATE_OUSTRING ("height+0-?38 "); + aStringSequence[39] = CREATE_OUSTRING ("logheight+0-?38 "); aStringSequence[40] = CREATE_OUSTRING ("?29 +?36 -0"); - aStringSequence[41] = CREATE_OUSTRING ("height+0-?40 "); + aStringSequence[41] = CREATE_OUSTRING ("logheight+0-?40 "); aStringSequence[42] = CREATE_OUSTRING ("?30 +?36 -0"); - aStringSequence[43] = CREATE_OUSTRING ("height+0-?42 "); + aStringSequence[43] = CREATE_OUSTRING ("logheight+0-?42 "); aStringSequence[44] = CREATE_OUSTRING ("?9 *1/2"); aStringSequence[45] = CREATE_OUSTRING ("?16 *?44 /1"); aStringSequence[46] = CREATE_OUSTRING ("?45 +?36 -0"); - aStringSequence[47] = CREATE_OUSTRING ("height+0-?46 "); - aStringSequence[48] = CREATE_OUSTRING ("width+0-?44 "); + aStringSequence[47] = CREATE_OUSTRING ("logheight+0-?46 "); + aStringSequence[48] = CREATE_OUSTRING ("logwidth+0-?44 "); aStringSequence[49] = CREATE_OUSTRING ("?34 +?36 -0"); - aStringSequence[50] = CREATE_OUSTRING ("height+0-?49 "); + aStringSequence[50] = CREATE_OUSTRING ("logheight+0-?49 "); aStringSequence[51] = CREATE_OUSTRING ("?19 +?26 -0"); - aStringSequence[52] = CREATE_OUSTRING ("height+0-?51 "); + aStringSequence[52] = CREATE_OUSTRING ("logheight+0-?51 "); aStringSequence[53] = CREATE_OUSTRING ("?17 +?17 -?51 "); - aStringSequence[54] = CREATE_OUSTRING ("height+0-?53 "); - aStringSequence[55] = CREATE_OUSTRING ("height"); - aStringSequence[56] = CREATE_OUSTRING ("width"); + aStringSequence[54] = CREATE_OUSTRING ("logheight+0-?53 "); + aStringSequence[55] = CREATE_OUSTRING ("logheight"); + aStringSequence[56] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -15492,19 +15492,19 @@ void CustomShapeProperties::initializePresetsMap4() { Sequence< OUString > aStringSequence (14); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width+0-?2 "); - aStringSequence[4] = CREATE_OUSTRING ("height+0-?2 "); - aStringSequence[5] = CREATE_OUSTRING ("width+0-height"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth+0-?2 "); + aStringSequence[4] = CREATE_OUSTRING ("logheight+0-?2 "); + aStringSequence[5] = CREATE_OUSTRING ("logwidth+0-logheight"); aStringSequence[6] = CREATE_OUSTRING ("if(?5 ,0,?2 )"); - aStringSequence[7] = CREATE_OUSTRING ("if(?5 ,width,?3 )"); + aStringSequence[7] = CREATE_OUSTRING ("if(?5 ,logwidth,?3 )"); aStringSequence[8] = CREATE_OUSTRING ("if(?5 ,?2 ,0)"); - aStringSequence[9] = CREATE_OUSTRING ("if(?5 ,?4 ,height)"); - aStringSequence[10] = CREATE_OUSTRING ("width/2"); - aStringSequence[11] = CREATE_OUSTRING ("height/2"); - aStringSequence[12] = CREATE_OUSTRING ("height"); - aStringSequence[13] = CREATE_OUSTRING ("width"); + aStringSequence[9] = CREATE_OUSTRING ("if(?5 ,?4 ,logheight)"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[11] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[12] = CREATE_OUSTRING ("logheight"); + aStringSequence[13] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { diff --git a/oox/source/drawingml/customshapepresets5.cxx b/oox/source/drawingml/customshapepresets5.cxx index 3dd62ee8ea74..a275df75882a 100644 --- a/oox/source/drawingml/customshapepresets5.cxx +++ b/oox/source/drawingml/customshapepresets5.cxx @@ -60,18 +60,18 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (12); - aStringSequence[0] = CREATE_OUSTRING ("height*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("width*$1 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("height*$2 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width*$3 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("height*$4 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("width*$5 /100000"); - aStringSequence[6] = CREATE_OUSTRING ("height*$6 /100000"); - aStringSequence[7] = CREATE_OUSTRING ("width*$7 /100000"); - aStringSequence[8] = CREATE_OUSTRING ("width"); - aStringSequence[9] = CREATE_OUSTRING ("height/2"); - aStringSequence[10] = CREATE_OUSTRING ("width/2"); - aStringSequence[11] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*$1 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*$2 /100000"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*$3 /100000"); + aStringSequence[4] = CREATE_OUSTRING ("logheight*$4 /100000"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth*$5 /100000"); + aStringSequence[6] = CREATE_OUSTRING ("logheight*$6 /100000"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth*$7 /100000"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth"); + aStringSequence[9] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[11] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -654,13 +654,13 @@ void CustomShapeProperties::initializePresetsMap5() aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("if(1-$2 ,1,if(21599999-$2 ,$2 ,21599999))"); aStringSequence[4] = CREATE_OUSTRING ("if(0-$3 ,0,if(21599999-$3 ,$3 ,21599999))"); - aStringSequence[5] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[5] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[6] = CREATE_OUSTRING ("?5 *?2 /100000"); aStringSequence[7] = CREATE_OUSTRING ("?5 *?0 /100000"); aStringSequence[8] = CREATE_OUSTRING ("?6 *1/2"); - aStringSequence[9] = CREATE_OUSTRING ("width/2"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[10] = CREATE_OUSTRING ("?9 +?8 -?7 "); - aStringSequence[11] = CREATE_OUSTRING ("height/2"); + aStringSequence[11] = CREATE_OUSTRING ("logheight/2"); aStringSequence[12] = CREATE_OUSTRING ("?11 +?8 -?7 "); aStringSequence[13] = CREATE_OUSTRING ("?10 +0-?6 "); aStringSequence[14] = CREATE_OUSTRING ("?12 +0-?6 "); @@ -670,9 +670,9 @@ void CustomShapeProperties::initializePresetsMap5() aStringSequence[18] = CREATE_OUSTRING ("?16 *cos(pi*(?3 )/10800000)"); aStringSequence[19] = CREATE_OUSTRING ("?15 *(cos(atan2(?17 ,?18 )))"); aStringSequence[20] = CREATE_OUSTRING ("?16 *(sin(atan2(?17 ,?18 )))"); - aStringSequence[21] = CREATE_OUSTRING ("width/2"); + aStringSequence[21] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[22] = CREATE_OUSTRING ("?21 +?19 -0"); - aStringSequence[23] = CREATE_OUSTRING ("height/2"); + aStringSequence[23] = CREATE_OUSTRING ("logheight/2"); aStringSequence[24] = CREATE_OUSTRING ("?23 +?20 -0"); aStringSequence[25] = CREATE_OUSTRING ("min(?13 ,?14 )"); aStringSequence[26] = CREATE_OUSTRING ("?19 *?19 /1"); @@ -1256,21 +1256,21 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (15); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("100000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("100000*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(100000-$0 ,$0 ,100000))"); aStringSequence[3] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[4] = CREATE_OUSTRING ("?0 *?3 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("width+0-?4 "); - aStringSequence[6] = CREATE_OUSTRING ("height*?2 /200000"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth+0-?4 "); + aStringSequence[6] = CREATE_OUSTRING ("logheight*?2 /200000"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?6 "); aStringSequence[9] = CREATE_OUSTRING ("?7 +?6 -0"); - aStringSequence[10] = CREATE_OUSTRING ("height/2"); + aStringSequence[10] = CREATE_OUSTRING ("logheight/2"); aStringSequence[11] = CREATE_OUSTRING ("?8 *?4 /?10 "); aStringSequence[12] = CREATE_OUSTRING ("?5 +?11 -0"); - aStringSequence[13] = CREATE_OUSTRING ("height"); - aStringSequence[14] = CREATE_OUSTRING ("width"); + aStringSequence[13] = CREATE_OUSTRING ("logheight"); + aStringSequence[14] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -1548,11 +1548,11 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (5); - aStringSequence[0] = CREATE_OUSTRING ("width/2"); - aStringSequence[1] = CREATE_OUSTRING ("height/2"); - aStringSequence[2] = CREATE_OUSTRING ("height"); - aStringSequence[3] = CREATE_OUSTRING ("width"); - aStringSequence[4] = CREATE_OUSTRING ("height/5"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[1] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth"); + aStringSequence[4] = CREATE_OUSTRING ("logheight/5"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -1716,22 +1716,22 @@ void CustomShapeProperties::initializePresetsMap5() Sequence< OUString > aStringSequence (18); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); aStringSequence[1] = CREATE_OUSTRING ("if(0-$1 ,0,if(50000-$1 ,$1 ,50000))"); - aStringSequence[2] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[2] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[3] = CREATE_OUSTRING ("?2 *?0 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("width+0-?3 "); - aStringSequence[5] = CREATE_OUSTRING ("height+0-?3 "); + aStringSequence[4] = CREATE_OUSTRING ("logwidth+0-?3 "); + aStringSequence[5] = CREATE_OUSTRING ("logheight+0-?3 "); aStringSequence[6] = CREATE_OUSTRING ("?2 *?1 /100000"); - aStringSequence[7] = CREATE_OUSTRING ("width+0-?6 "); - aStringSequence[8] = CREATE_OUSTRING ("height+0-?6 "); + aStringSequence[7] = CREATE_OUSTRING ("logwidth+0-?6 "); + aStringSequence[8] = CREATE_OUSTRING ("logheight+0-?6 "); aStringSequence[9] = CREATE_OUSTRING ("?3 +0-?6 "); aStringSequence[10] = CREATE_OUSTRING ("if(?9 ,?3 ,?6 )"); aStringSequence[11] = CREATE_OUSTRING ("?10 *1/2"); - aStringSequence[12] = CREATE_OUSTRING ("width+0-?11 "); - aStringSequence[13] = CREATE_OUSTRING ("height+0-?11 "); - aStringSequence[14] = CREATE_OUSTRING ("width"); - aStringSequence[15] = CREATE_OUSTRING ("height/2"); - aStringSequence[16] = CREATE_OUSTRING ("width/2"); - aStringSequence[17] = CREATE_OUSTRING ("height"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth+0-?11 "); + aStringSequence[13] = CREATE_OUSTRING ("logheight+0-?11 "); + aStringSequence[14] = CREATE_OUSTRING ("logwidth"); + aStringSequence[15] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[16] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[17] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -2032,20 +2032,20 @@ void CustomShapeProperties::initializePresetsMap5() { Sequence< OUString > aStringSequence (53); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(25000-$0 ,$0 ,25000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); aStringSequence[3] = CREATE_OUSTRING ("?2 *1/2"); aStringSequence[4] = CREATE_OUSTRING ("?2 *1/4"); aStringSequence[5] = CREATE_OUSTRING ("?2 +?3 -0"); aStringSequence[6] = CREATE_OUSTRING ("?2 +?2 -0"); - aStringSequence[7] = CREATE_OUSTRING ("width+0-?2 "); - aStringSequence[8] = CREATE_OUSTRING ("width+0-?3 "); + aStringSequence[7] = CREATE_OUSTRING ("logwidth+0-?2 "); + aStringSequence[8] = CREATE_OUSTRING ("logwidth+0-?3 "); aStringSequence[9] = CREATE_OUSTRING ("?7 +0-?3 "); - aStringSequence[10] = CREATE_OUSTRING ("height+0-?2 "); - aStringSequence[11] = CREATE_OUSTRING ("height+0-?3 "); - aStringSequence[12] = CREATE_OUSTRING ("width/2"); - aStringSequence[13] = CREATE_OUSTRING ("height/2"); - aStringSequence[14] = CREATE_OUSTRING ("height"); + aStringSequence[10] = CREATE_OUSTRING ("logheight+0-?2 "); + aStringSequence[11] = CREATE_OUSTRING ("logheight+0-?3 "); + aStringSequence[12] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[13] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[14] = CREATE_OUSTRING ("logheight"); aStringSequence[15] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[16] = CREATE_OUSTRING ("(-5400000)/60000.0"); aStringSequence[17] = CREATE_OUSTRING ("(5400000)/60000.0"); @@ -3566,11 +3566,11 @@ void CustomShapeProperties::initializePresetsMap5() { Sequence< OUString > aStringSequence (42); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[2] = CREATE_OUSTRING ("?1 *$1 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("height/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/2"); aStringSequence[4] = CREATE_OUSTRING ("?3 *$2 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("height/2"); + aStringSequence[5] = CREATE_OUSTRING ("logheight/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 *$2 /100000"); aStringSequence[7] = CREATE_OUSTRING ("?2 *97493/100000"); aStringSequence[8] = CREATE_OUSTRING ("?2 *78183/100000"); @@ -3578,7 +3578,7 @@ void CustomShapeProperties::initializePresetsMap5() aStringSequence[10] = CREATE_OUSTRING ("?4 *62349/100000"); aStringSequence[11] = CREATE_OUSTRING ("?4 *22252/100000"); aStringSequence[12] = CREATE_OUSTRING ("?4 *90097/100000"); - aStringSequence[13] = CREATE_OUSTRING ("width/2"); + aStringSequence[13] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[14] = CREATE_OUSTRING ("?13 +0-?7 "); aStringSequence[15] = CREATE_OUSTRING ("?13 +0-?8 "); aStringSequence[16] = CREATE_OUSTRING ("?13 +0-?9 "); @@ -4209,16 +4209,16 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (54); - aStringSequence[0] = CREATE_OUSTRING ("width*2977/21600"); - aStringSequence[1] = CREATE_OUSTRING ("height*3262/21600"); - aStringSequence[2] = CREATE_OUSTRING ("width*17087/21600"); - aStringSequence[3] = CREATE_OUSTRING ("height*17337/21600"); - aStringSequence[4] = CREATE_OUSTRING ("width*67/21600"); - aStringSequence[5] = CREATE_OUSTRING ("height*21577/21600"); - aStringSequence[6] = CREATE_OUSTRING ("width*21582/21600"); - aStringSequence[7] = CREATE_OUSTRING ("height*1235/21600"); - aStringSequence[8] = CREATE_OUSTRING ("height/2"); - aStringSequence[9] = CREATE_OUSTRING ("width/2"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*2977/21600"); + aStringSequence[1] = CREATE_OUSTRING ("logheight*3262/21600"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth*17087/21600"); + aStringSequence[3] = CREATE_OUSTRING ("logheight*17337/21600"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth*67/21600"); + aStringSequence[5] = CREATE_OUSTRING ("logheight*21577/21600"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth*21582/21600"); + aStringSequence[7] = CREATE_OUSTRING ("logheight*1235/21600"); + aStringSequence[8] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[10] = CREATE_OUSTRING ("(-11429249)/60000.0"); aStringSequence[11] = CREATE_OUSTRING ("(7426832)/60000.0"); aStringSequence[12] = CREATE_OUSTRING ("(-8646143)/60000.0"); @@ -5483,16 +5483,16 @@ void CustomShapeProperties::initializePresetsMap5() { Sequence< OUString > aStringSequence (11); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(100000-$0 ,$0 ,100000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("height+0-?2 "); + aStringSequence[3] = CREATE_OUSTRING ("logheight+0-?2 "); aStringSequence[4] = CREATE_OUSTRING ("?3 *1/2"); - aStringSequence[5] = CREATE_OUSTRING ("(?2 +height)/2"); - aStringSequence[6] = CREATE_OUSTRING ("width+0-?2 "); + aStringSequence[5] = CREATE_OUSTRING ("(?2 +logheight)/2"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth+0-?2 "); aStringSequence[7] = CREATE_OUSTRING ("?6 *1/2"); - aStringSequence[8] = CREATE_OUSTRING ("(?2 +width)/2"); - aStringSequence[9] = CREATE_OUSTRING ("height"); - aStringSequence[10] = CREATE_OUSTRING ("width"); + aStringSequence[8] = CREATE_OUSTRING ("(?2 +logwidth)/2"); + aStringSequence[9] = CREATE_OUSTRING ("logheight"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -6126,22 +6126,22 @@ void CustomShapeProperties::initializePresetsMap5() Sequence< OUString > aStringSequence (26); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); aStringSequence[1] = CREATE_OUSTRING ("if(0-$1 ,0,if(50000-$1 ,$1 ,50000))"); - aStringSequence[2] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[2] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[3] = CREATE_OUSTRING ("?2 *?0 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("height+0-?3 "); + aStringSequence[4] = CREATE_OUSTRING ("logheight+0-?3 "); aStringSequence[5] = CREATE_OUSTRING ("?2 *?1 /100000"); - aStringSequence[6] = CREATE_OUSTRING ("width+0-?5 "); - aStringSequence[7] = CREATE_OUSTRING ("height+0-?5 "); + aStringSequence[6] = CREATE_OUSTRING ("logwidth+0-?5 "); + aStringSequence[7] = CREATE_OUSTRING ("logheight+0-?5 "); aStringSequence[8] = CREATE_OUSTRING ("?3 *29289/100000"); aStringSequence[9] = CREATE_OUSTRING ("?5 *29289/100000"); aStringSequence[10] = CREATE_OUSTRING ("?8 +0-?9 "); aStringSequence[11] = CREATE_OUSTRING ("if(?10 ,?8 ,?9 )"); - aStringSequence[12] = CREATE_OUSTRING ("width+0-?11 "); - aStringSequence[13] = CREATE_OUSTRING ("height+0-?11 "); - aStringSequence[14] = CREATE_OUSTRING ("width"); - aStringSequence[15] = CREATE_OUSTRING ("height/2"); - aStringSequence[16] = CREATE_OUSTRING ("width/2"); - aStringSequence[17] = CREATE_OUSTRING ("height"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth+0-?11 "); + aStringSequence[13] = CREATE_OUSTRING ("logheight+0-?11 "); + aStringSequence[14] = CREATE_OUSTRING ("logwidth"); + aStringSequence[15] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[16] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[17] = CREATE_OUSTRING ("logheight"); aStringSequence[18] = CREATE_OUSTRING ("(16200000)/60000.0"); aStringSequence[19] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[20] = CREATE_OUSTRING ("(0)/60000.0"); @@ -6577,13 +6577,13 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (7); - aStringSequence[0] = CREATE_OUSTRING ("height*3675/21600"); - aStringSequence[1] = CREATE_OUSTRING ("height*20782/21600"); - aStringSequence[2] = CREATE_OUSTRING ("width*9298/21600"); - aStringSequence[3] = CREATE_OUSTRING ("width*12286/21600"); - aStringSequence[4] = CREATE_OUSTRING ("width*18595/21600"); - aStringSequence[5] = CREATE_OUSTRING ("height/2"); - aStringSequence[6] = CREATE_OUSTRING ("width"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*3675/21600"); + aStringSequence[1] = CREATE_OUSTRING ("logheight*20782/21600"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth*9298/21600"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*12286/21600"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth*18595/21600"); + aStringSequence[5] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -7925,20 +7925,20 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (14); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[1] = CREATE_OUSTRING ("?0 *3/8"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +0-?1 "); aStringSequence[4] = CREATE_OUSTRING ("?2 +?1 -0"); aStringSequence[5] = CREATE_OUSTRING ("?0 *9/32"); - aStringSequence[6] = CREATE_OUSTRING ("width/2"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[7] = CREATE_OUSTRING ("?6 +0-?5 "); aStringSequence[8] = CREATE_OUSTRING ("?6 +?5 -0"); aStringSequence[9] = CREATE_OUSTRING ("?0 *3/16"); aStringSequence[10] = CREATE_OUSTRING ("?8 +0-?9 "); aStringSequence[11] = CREATE_OUSTRING ("?3 +?9 -0"); - aStringSequence[12] = CREATE_OUSTRING ("width"); - aStringSequence[13] = CREATE_OUSTRING ("height"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth"); + aStringSequence[13] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -8680,14 +8680,14 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (12); - aStringSequence[0] = CREATE_OUSTRING ("width*1018/21600"); - aStringSequence[1] = CREATE_OUSTRING ("width*20582/21600"); - aStringSequence[2] = CREATE_OUSTRING ("height*3163/21600"); - aStringSequence[3] = CREATE_OUSTRING ("height*18437/21600"); - aStringSequence[4] = CREATE_OUSTRING ("width/2"); - aStringSequence[5] = CREATE_OUSTRING ("height/2"); - aStringSequence[6] = CREATE_OUSTRING ("height"); - aStringSequence[7] = CREATE_OUSTRING ("width"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*1018/21600"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*20582/21600"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*3163/21600"); + aStringSequence[3] = CREATE_OUSTRING ("logheight*18437/21600"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[5] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[6] = CREATE_OUSTRING ("logheight"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth"); aStringSequence[8] = CREATE_OUSTRING ("(16200000)/60000.0"); aStringSequence[9] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[10] = CREATE_OUSTRING ("(5400000)/60000.0"); @@ -8899,17 +8899,17 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (13); - aStringSequence[0] = CREATE_OUSTRING ("width/2"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[1] = CREATE_OUSTRING ("?0 *cos(pi*(2700000)/10800000)"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 *sin(pi*(2700000)/10800000)"); - aStringSequence[4] = CREATE_OUSTRING ("width/2"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[5] = CREATE_OUSTRING ("?4 +?1 -0"); - aStringSequence[6] = CREATE_OUSTRING ("height/2"); + aStringSequence[6] = CREATE_OUSTRING ("logheight/2"); aStringSequence[7] = CREATE_OUSTRING ("?6 +0-?3 "); aStringSequence[8] = CREATE_OUSTRING ("?6 +?3 -0"); - aStringSequence[9] = CREATE_OUSTRING ("height"); - aStringSequence[10] = CREATE_OUSTRING ("width"); + aStringSequence[9] = CREATE_OUSTRING ("logheight"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth"); aStringSequence[11] = CREATE_OUSTRING ("(16200000)/60000.0"); aStringSequence[12] = CREATE_OUSTRING ("(10800000)/60000.0"); aPropertyMap [PROP_Equations] <<= aStringSequence; @@ -9089,22 +9089,22 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (16); - aStringSequence[0] = CREATE_OUSTRING ("width*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("width*$2 /100000"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*$2 /100000"); aStringSequence[2] = CREATE_OUSTRING ("(?0 +?1 )/2"); aStringSequence[3] = CREATE_OUSTRING ("(0+?0 )/2"); aStringSequence[4] = CREATE_OUSTRING ("(?0 +?2 )/2"); aStringSequence[5] = CREATE_OUSTRING ("(?1 +?2 )/2"); - aStringSequence[6] = CREATE_OUSTRING ("(?1 +width)/2"); - aStringSequence[7] = CREATE_OUSTRING ("height*$1 /100000"); + aStringSequence[6] = CREATE_OUSTRING ("(?1 +logwidth)/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight*$1 /100000"); aStringSequence[8] = CREATE_OUSTRING ("(0+?7 )/2"); aStringSequence[9] = CREATE_OUSTRING ("(0+?8 )/2"); aStringSequence[10] = CREATE_OUSTRING ("(?8 +?7 )/2"); - aStringSequence[11] = CREATE_OUSTRING ("(height+?7 )/2"); + aStringSequence[11] = CREATE_OUSTRING ("(logheight+?7 )/2"); aStringSequence[12] = CREATE_OUSTRING ("(?11 +?7 )/2"); - aStringSequence[13] = CREATE_OUSTRING ("(?11 +height)/2"); - aStringSequence[14] = CREATE_OUSTRING ("width"); - aStringSequence[15] = CREATE_OUSTRING ("height"); + aStringSequence[13] = CREATE_OUSTRING ("(?11 +logheight)/2"); + aStringSequence[14] = CREATE_OUSTRING ("logwidth"); + aStringSequence[15] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -9539,20 +9539,20 @@ void CustomShapeProperties::initializePresetsMap5() { Sequence< OUString > aStringSequence (53); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(25000-$0 ,$0 ,25000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); aStringSequence[3] = CREATE_OUSTRING ("?2 *1/2"); aStringSequence[4] = CREATE_OUSTRING ("?2 *1/4"); aStringSequence[5] = CREATE_OUSTRING ("?2 +?3 -0"); aStringSequence[6] = CREATE_OUSTRING ("?2 +?2 -0"); - aStringSequence[7] = CREATE_OUSTRING ("height+0-?2 "); - aStringSequence[8] = CREATE_OUSTRING ("height+0-?3 "); + aStringSequence[7] = CREATE_OUSTRING ("logheight+0-?2 "); + aStringSequence[8] = CREATE_OUSTRING ("logheight+0-?3 "); aStringSequence[9] = CREATE_OUSTRING ("?7 +0-?3 "); - aStringSequence[10] = CREATE_OUSTRING ("width+0-?2 "); - aStringSequence[11] = CREATE_OUSTRING ("width+0-?3 "); - aStringSequence[12] = CREATE_OUSTRING ("width/2"); - aStringSequence[13] = CREATE_OUSTRING ("height/2"); - aStringSequence[14] = CREATE_OUSTRING ("width"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth+0-?2 "); + aStringSequence[11] = CREATE_OUSTRING ("logwidth+0-?3 "); + aStringSequence[12] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[13] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[14] = CREATE_OUSTRING ("logwidth"); aStringSequence[15] = CREATE_OUSTRING ("(0)/60000.0"); aStringSequence[16] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[17] = CREATE_OUSTRING ("(0)/60000.0"); @@ -11062,12 +11062,12 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (6); - aStringSequence[0] = CREATE_OUSTRING ("width*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("(?0 +width)/2"); - aStringSequence[2] = CREATE_OUSTRING ("height*$1 /100000"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("(?0 +logwidth)/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*$1 /100000"); aStringSequence[3] = CREATE_OUSTRING ("(0+?2 )/2"); - aStringSequence[4] = CREATE_OUSTRING ("width"); - aStringSequence[5] = CREATE_OUSTRING ("height"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth"); + aStringSequence[5] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -11334,13 +11334,13 @@ void CustomShapeProperties::initializePresetsMap5() aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("if(1-$2 ,1,if(21599999-$2 ,$2 ,21599999))"); aStringSequence[4] = CREATE_OUSTRING ("if(0-$3 ,0,if(21599999-$3 ,$3 ,21599999))"); - aStringSequence[5] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[5] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[6] = CREATE_OUSTRING ("?5 *?2 /100000"); aStringSequence[7] = CREATE_OUSTRING ("?5 *?0 /100000"); aStringSequence[8] = CREATE_OUSTRING ("?6 *1/2"); - aStringSequence[9] = CREATE_OUSTRING ("width/2"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[10] = CREATE_OUSTRING ("?9 +?8 -?7 "); - aStringSequence[11] = CREATE_OUSTRING ("height/2"); + aStringSequence[11] = CREATE_OUSTRING ("logheight/2"); aStringSequence[12] = CREATE_OUSTRING ("?11 +?8 -?7 "); aStringSequence[13] = CREATE_OUSTRING ("?10 +0-?6 "); aStringSequence[14] = CREATE_OUSTRING ("?12 +0-?6 "); @@ -11350,9 +11350,9 @@ void CustomShapeProperties::initializePresetsMap5() aStringSequence[18] = CREATE_OUSTRING ("?16 *cos(pi*(?3 )/10800000)"); aStringSequence[19] = CREATE_OUSTRING ("?15 *(cos(atan2(?17 ,?18 )))"); aStringSequence[20] = CREATE_OUSTRING ("?16 *(sin(atan2(?17 ,?18 )))"); - aStringSequence[21] = CREATE_OUSTRING ("width/2"); + aStringSequence[21] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[22] = CREATE_OUSTRING ("?21 +?19 -0"); - aStringSequence[23] = CREATE_OUSTRING ("height/2"); + aStringSequence[23] = CREATE_OUSTRING ("logheight/2"); aStringSequence[24] = CREATE_OUSTRING ("?23 +?20 -0"); aStringSequence[25] = CREATE_OUSTRING ("min(?13 ,?14 )"); aStringSequence[26] = CREATE_OUSTRING ("?19 *?19 /1"); @@ -12003,32 +12003,32 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (38); - aStringSequence[0] = CREATE_OUSTRING ("width*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("height*$1 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logheight*$1 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +?0 -0"); - aStringSequence[4] = CREATE_OUSTRING ("height/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight/2"); aStringSequence[5] = CREATE_OUSTRING ("?4 +?1 -0"); aStringSequence[6] = CREATE_OUSTRING ("?3 +0-?2 "); aStringSequence[7] = CREATE_OUSTRING ("?5 +0-?4 "); - aStringSequence[8] = CREATE_OUSTRING ("?0 *height/width"); + aStringSequence[8] = CREATE_OUSTRING ("?0 *logheight/logwidth"); aStringSequence[9] = CREATE_OUSTRING ("abs(?1 )"); aStringSequence[10] = CREATE_OUSTRING ("abs(?8 )"); aStringSequence[11] = CREATE_OUSTRING ("?9 +0-?10 "); aStringSequence[12] = CREATE_OUSTRING ("if(?0 ,7,2)"); aStringSequence[13] = CREATE_OUSTRING ("if(?0 ,10,5)"); - aStringSequence[14] = CREATE_OUSTRING ("width*?12 /12"); - aStringSequence[15] = CREATE_OUSTRING ("width*?13 /12"); + aStringSequence[14] = CREATE_OUSTRING ("logwidth*?12 /12"); + aStringSequence[15] = CREATE_OUSTRING ("logwidth*?13 /12"); aStringSequence[16] = CREATE_OUSTRING ("if(?1 ,7,2)"); aStringSequence[17] = CREATE_OUSTRING ("if(?1 ,10,5)"); - aStringSequence[18] = CREATE_OUSTRING ("height*?16 /12"); - aStringSequence[19] = CREATE_OUSTRING ("height*?17 /12"); + aStringSequence[18] = CREATE_OUSTRING ("logheight*?16 /12"); + aStringSequence[19] = CREATE_OUSTRING ("logheight*?17 /12"); aStringSequence[20] = CREATE_OUSTRING ("if(?0 ,0,?3 )"); aStringSequence[21] = CREATE_OUSTRING ("if(?11 ,0,?20 )"); aStringSequence[22] = CREATE_OUSTRING ("if(?1 ,?14 ,?3 )"); aStringSequence[23] = CREATE_OUSTRING ("if(?11 ,?22 ,?14 )"); - aStringSequence[24] = CREATE_OUSTRING ("if(?0 ,?3 ,width)"); - aStringSequence[25] = CREATE_OUSTRING ("if(?11 ,width,?24 )"); + aStringSequence[24] = CREATE_OUSTRING ("if(?0 ,?3 ,logwidth)"); + aStringSequence[25] = CREATE_OUSTRING ("if(?11 ,logwidth,?24 )"); aStringSequence[26] = CREATE_OUSTRING ("if(?1 ,?3 ,?14 )"); aStringSequence[27] = CREATE_OUSTRING ("if(?11 ,?26 ,?14 )"); aStringSequence[28] = CREATE_OUSTRING ("if(?0 ,?18 ,?5 )"); @@ -12037,10 +12037,10 @@ void CustomShapeProperties::initializePresetsMap5() aStringSequence[31] = CREATE_OUSTRING ("if(?11 ,?30 ,0)"); aStringSequence[32] = CREATE_OUSTRING ("if(?0 ,?5 ,?18 )"); aStringSequence[33] = CREATE_OUSTRING ("if(?11 ,?18 ,?32 )"); - aStringSequence[34] = CREATE_OUSTRING ("if(?1 ,?5 ,height)"); - aStringSequence[35] = CREATE_OUSTRING ("if(?11 ,?34 ,height)"); - aStringSequence[36] = CREATE_OUSTRING ("height"); - aStringSequence[37] = CREATE_OUSTRING ("width"); + aStringSequence[34] = CREATE_OUSTRING ("if(?1 ,?5 ,logheight)"); + aStringSequence[35] = CREATE_OUSTRING ("if(?11 ,?34 ,logheight)"); + aStringSequence[36] = CREATE_OUSTRING ("logheight"); + aStringSequence[37] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -12481,16 +12481,16 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (10); - aStringSequence[0] = CREATE_OUSTRING ("height*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("width*$1 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("height*$2 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width*$3 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("height*$4 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("width*$5 /100000"); - aStringSequence[6] = CREATE_OUSTRING ("width"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); - aStringSequence[8] = CREATE_OUSTRING ("width/2"); - aStringSequence[9] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*$1 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*$2 /100000"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*$3 /100000"); + aStringSequence[4] = CREATE_OUSTRING ("logheight*$4 /100000"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth*$5 /100000"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[9] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -12965,12 +12965,12 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (16); - aStringSequence[0] = CREATE_OUSTRING ("width*2/3"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); - aStringSequence[3] = CREATE_OUSTRING ("height"); - aStringSequence[4] = CREATE_OUSTRING ("width"); - aStringSequence[5] = CREATE_OUSTRING ("width/6"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*2/3"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/6"); aStringSequence[6] = CREATE_OUSTRING ("(16200000)/60000.0"); aStringSequence[7] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[8] = CREATE_OUSTRING ("(5400000)/60000.0"); @@ -13448,23 +13448,23 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (17); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("100000*height/?0 "); - aStringSequence[2] = CREATE_OUSTRING ("100000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("100000*logheight/?0 "); + aStringSequence[2] = CREATE_OUSTRING ("100000*logwidth/?0 "); aStringSequence[3] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); aStringSequence[4] = CREATE_OUSTRING ("if(0-$1 ,0,if(?2 -$1 ,$1 ,?2 ))"); aStringSequence[5] = CREATE_OUSTRING ("?0 *?4 /100000"); aStringSequence[6] = CREATE_OUSTRING ("?0 *?3 /100000"); - aStringSequence[7] = CREATE_OUSTRING ("height+0-?6 "); + aStringSequence[7] = CREATE_OUSTRING ("logheight+0-?6 "); aStringSequence[8] = CREATE_OUSTRING ("?5 *1/2"); - aStringSequence[9] = CREATE_OUSTRING ("(?7 +height)/2"); - aStringSequence[10] = CREATE_OUSTRING ("width+0-height"); + aStringSequence[9] = CREATE_OUSTRING ("(?7 +logheight)/2"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth+0-logheight"); aStringSequence[11] = CREATE_OUSTRING ("if(?10 ,?7 ,0)"); - aStringSequence[12] = CREATE_OUSTRING ("if(?10 ,width,?5 )"); - aStringSequence[13] = CREATE_OUSTRING ("width"); - aStringSequence[14] = CREATE_OUSTRING ("width/2"); - aStringSequence[15] = CREATE_OUSTRING ("height"); - aStringSequence[16] = CREATE_OUSTRING ("height/2"); + aStringSequence[12] = CREATE_OUSTRING ("if(?10 ,logwidth,?5 )"); + aStringSequence[13] = CREATE_OUSTRING ("logwidth"); + aStringSequence[14] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[15] = CREATE_OUSTRING ("logheight"); + aStringSequence[16] = CREATE_OUSTRING ("logheight/2"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -13748,16 +13748,16 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (10); - aStringSequence[0] = CREATE_OUSTRING ("height*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("width*$1 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("height*$2 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width*$3 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("height*$4 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("width*$5 /100000"); - aStringSequence[6] = CREATE_OUSTRING ("width"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); - aStringSequence[8] = CREATE_OUSTRING ("width/2"); - aStringSequence[9] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*$1 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*$2 /100000"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*$3 /100000"); + aStringSequence[4] = CREATE_OUSTRING ("logheight*$4 /100000"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth*$5 /100000"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[9] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -14171,22 +14171,22 @@ void CustomShapeProperties::initializePresetsMap5() { Sequence< OUString > aStringSequence (33); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width/2"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[4] = CREATE_OUSTRING ("?3 +0-?2 "); - aStringSequence[5] = CREATE_OUSTRING ("height/2"); + aStringSequence[5] = CREATE_OUSTRING ("logheight/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?2 "); aStringSequence[7] = CREATE_OUSTRING ("?3 *cos(pi*(2700000)/10800000)"); aStringSequence[8] = CREATE_OUSTRING ("?5 *sin(pi*(2700000)/10800000)"); - aStringSequence[9] = CREATE_OUSTRING ("width/2"); + aStringSequence[9] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[10] = CREATE_OUSTRING ("?9 +0-?7 "); aStringSequence[11] = CREATE_OUSTRING ("?9 +?7 -0"); - aStringSequence[12] = CREATE_OUSTRING ("height/2"); + aStringSequence[12] = CREATE_OUSTRING ("logheight/2"); aStringSequence[13] = CREATE_OUSTRING ("?12 +0-?8 "); aStringSequence[14] = CREATE_OUSTRING ("?12 +?8 -0"); - aStringSequence[15] = CREATE_OUSTRING ("height"); - aStringSequence[16] = CREATE_OUSTRING ("width"); + aStringSequence[15] = CREATE_OUSTRING ("logheight"); + aStringSequence[16] = CREATE_OUSTRING ("logwidth"); aStringSequence[17] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[18] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[19] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -14647,13 +14647,13 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (7); - aStringSequence[0] = CREATE_OUSTRING ("width*3/4"); - aStringSequence[1] = CREATE_OUSTRING ("height*3/4"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); - aStringSequence[3] = CREATE_OUSTRING ("height/2"); - aStringSequence[4] = CREATE_OUSTRING ("height"); - aStringSequence[5] = CREATE_OUSTRING ("width/4"); - aStringSequence[6] = CREATE_OUSTRING ("height/4"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4"); + aStringSequence[1] = CREATE_OUSTRING ("logheight*3/4"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/4"); + aStringSequence[6] = CREATE_OUSTRING ("logheight/4"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -14842,19 +14842,19 @@ void CustomShapeProperties::initializePresetsMap5() aStringSequence[2] = CREATE_OUSTRING ("?0 *2/1"); aStringSequence[3] = CREATE_OUSTRING ("100000+0-2"); aStringSequence[4] = CREATE_OUSTRING ("if(0-$2 ,0,if(?3 -$2 ,$2 ,?3 ))"); - aStringSequence[5] = CREATE_OUSTRING ("height*?0 /100000"); - aStringSequence[6] = CREATE_OUSTRING ("height*?4 /200000"); - aStringSequence[7] = CREATE_OUSTRING ("width*73490/200000"); - aStringSequence[8] = CREATE_OUSTRING ("width/2"); + aStringSequence[5] = CREATE_OUSTRING ("logheight*?0 /100000"); + aStringSequence[6] = CREATE_OUSTRING ("logheight*?4 /200000"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth*73490/200000"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[9] = CREATE_OUSTRING ("?8 +0-?7 "); aStringSequence[10] = CREATE_OUSTRING ("?8 +?7 -0"); - aStringSequence[11] = CREATE_OUSTRING ("height/2"); + aStringSequence[11] = CREATE_OUSTRING ("logheight/2"); aStringSequence[12] = CREATE_OUSTRING ("?11 +0-?6 "); aStringSequence[13] = CREATE_OUSTRING ("?11 +?6 -0"); aStringSequence[14] = CREATE_OUSTRING ("?12 +0-?5 "); aStringSequence[15] = CREATE_OUSTRING ("?13 +?5 -0"); aStringSequence[16] = CREATE_OUSTRING ("?1 +0-5400000"); - aStringSequence[17] = CREATE_OUSTRING ("height/2"); + aStringSequence[17] = CREATE_OUSTRING ("logheight/2"); aStringSequence[18] = CREATE_OUSTRING ("?17 *tan(pi*(?16 )/10800000)"); aStringSequence[19] = CREATE_OUSTRING ("sqrt(?18 *?18 +?17 *?17 +0*0)"); aStringSequence[20] = CREATE_OUSTRING ("?19 *?5 /?17 "); @@ -14885,17 +14885,17 @@ void CustomShapeProperties::initializePresetsMap5() aStringSequence[45] = CREATE_OUSTRING ("0+0-?44 "); aStringSequence[46] = CREATE_OUSTRING ("if(?16 ,?44 ,0)"); aStringSequence[47] = CREATE_OUSTRING ("if(?16 ,0,?45 )"); - aStringSequence[48] = CREATE_OUSTRING ("width+0-?42 "); - aStringSequence[49] = CREATE_OUSTRING ("width+0-?43 "); - aStringSequence[50] = CREATE_OUSTRING ("height+0-?46 "); - aStringSequence[51] = CREATE_OUSTRING ("height+0-?47 "); + aStringSequence[48] = CREATE_OUSTRING ("logwidth+0-?42 "); + aStringSequence[49] = CREATE_OUSTRING ("logwidth+0-?43 "); + aStringSequence[50] = CREATE_OUSTRING ("logheight+0-?46 "); + aStringSequence[51] = CREATE_OUSTRING ("logheight+0-?47 "); aStringSequence[52] = CREATE_OUSTRING ("(?42 +?43 )/2"); aStringSequence[53] = CREATE_OUSTRING ("(?49 +?48 )/2"); aStringSequence[54] = CREATE_OUSTRING ("(?46 +?47 )/2"); aStringSequence[55] = CREATE_OUSTRING ("(?14 +?12 )/2"); aStringSequence[56] = CREATE_OUSTRING ("(?13 +?15 )/2"); aStringSequence[57] = CREATE_OUSTRING ("(?51 +?50 )/2"); - aStringSequence[58] = CREATE_OUSTRING ("width"); + aStringSequence[58] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -15430,8 +15430,8 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (2); - aStringSequence[0] = CREATE_OUSTRING ("width"); - aStringSequence[1] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth"); + aStringSequence[1] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -15554,13 +15554,13 @@ void CustomShapeProperties::initializePresetsMap5() { Sequence< OUString > aStringSequence (34); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(51965-$0 ,$0 ,51965))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("(10800000*atan2(height,width))/pi"); + aStringSequence[3] = CREATE_OUSTRING ("(10800000*atan2(logheight,logwidth))/pi"); aStringSequence[4] = CREATE_OUSTRING ("1*sin(pi*(?3 )/10800000)"); aStringSequence[5] = CREATE_OUSTRING ("1*cos(pi*(?3 )/10800000)"); aStringSequence[6] = CREATE_OUSTRING ("1*tan(pi*(?3 )/10800000)"); - aStringSequence[7] = CREATE_OUSTRING ("sqrt(width*width+height*height+0*0)"); + aStringSequence[7] = CREATE_OUSTRING ("sqrt(logwidth*logwidth+logheight*logheight+0*0)"); aStringSequence[8] = CREATE_OUSTRING ("?7 *51965/100000"); aStringSequence[9] = CREATE_OUSTRING ("?7 +0-?8 "); aStringSequence[10] = CREATE_OUSTRING ("?5 *?9 /2"); @@ -15571,22 +15571,22 @@ void CustomShapeProperties::initializePresetsMap5() aStringSequence[15] = CREATE_OUSTRING ("?11 +?13 -0"); aStringSequence[16] = CREATE_OUSTRING ("?10 +?12 -0"); aStringSequence[17] = CREATE_OUSTRING ("?11 +0-?13 "); - aStringSequence[18] = CREATE_OUSTRING ("width/2"); + aStringSequence[18] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[19] = CREATE_OUSTRING ("?18 +0-?16 "); aStringSequence[20] = CREATE_OUSTRING ("?19 *?6 /1"); aStringSequence[21] = CREATE_OUSTRING ("?20 +?17 -0"); - aStringSequence[22] = CREATE_OUSTRING ("width+0-?16 "); - aStringSequence[23] = CREATE_OUSTRING ("width+0-?14 "); - aStringSequence[24] = CREATE_OUSTRING ("height/2"); + aStringSequence[22] = CREATE_OUSTRING ("logwidth+0-?16 "); + aStringSequence[23] = CREATE_OUSTRING ("logwidth+0-?14 "); + aStringSequence[24] = CREATE_OUSTRING ("logheight/2"); aStringSequence[25] = CREATE_OUSTRING ("?24 +0-?15 "); aStringSequence[26] = CREATE_OUSTRING ("?25 *1/?6 "); aStringSequence[27] = CREATE_OUSTRING ("?23 +0-?26 "); aStringSequence[28] = CREATE_OUSTRING ("?14 +?26 -0"); - aStringSequence[29] = CREATE_OUSTRING ("height+0-?15 "); - aStringSequence[30] = CREATE_OUSTRING ("height+0-?17 "); - aStringSequence[31] = CREATE_OUSTRING ("height+0-?21 "); - aStringSequence[32] = CREATE_OUSTRING ("width+0-?10 "); - aStringSequence[33] = CREATE_OUSTRING ("height+0-?11 "); + aStringSequence[29] = CREATE_OUSTRING ("logheight+0-?15 "); + aStringSequence[30] = CREATE_OUSTRING ("logheight+0-?17 "); + aStringSequence[31] = CREATE_OUSTRING ("logheight+0-?21 "); + aStringSequence[32] = CREATE_OUSTRING ("logwidth+0-?10 "); + aStringSequence[33] = CREATE_OUSTRING ("logheight+0-?11 "); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -15918,11 +15918,11 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (23); - aStringSequence[0] = CREATE_OUSTRING ("width/2"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[1] = CREATE_OUSTRING ("?0 *$0 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("height/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 *$1 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("height/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight/2"); aStringSequence[5] = CREATE_OUSTRING ("?4 *$1 /100000"); aStringSequence[6] = CREATE_OUSTRING ("?1 *97493/100000"); aStringSequence[7] = CREATE_OUSTRING ("?1 *78183/100000"); @@ -15930,7 +15930,7 @@ void CustomShapeProperties::initializePresetsMap5() aStringSequence[9] = CREATE_OUSTRING ("?3 *62349/100000"); aStringSequence[10] = CREATE_OUSTRING ("?3 *22252/100000"); aStringSequence[11] = CREATE_OUSTRING ("?3 *90097/100000"); - aStringSequence[12] = CREATE_OUSTRING ("width/2"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[13] = CREATE_OUSTRING ("?12 +0-?6 "); aStringSequence[14] = CREATE_OUSTRING ("?12 +0-?7 "); aStringSequence[15] = CREATE_OUSTRING ("?12 +0-?8 "); @@ -15940,7 +15940,7 @@ void CustomShapeProperties::initializePresetsMap5() aStringSequence[19] = CREATE_OUSTRING ("?5 +0-?9 "); aStringSequence[20] = CREATE_OUSTRING ("?5 +?10 -0"); aStringSequence[21] = CREATE_OUSTRING ("?5 +?11 -0"); - aStringSequence[22] = CREATE_OUSTRING ("height+0-?19 "); + aStringSequence[22] = CREATE_OUSTRING ("logheight+0-?19 "); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -16130,10 +16130,10 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (4); - aStringSequence[0] = CREATE_OUSTRING ("width/2"); - aStringSequence[1] = CREATE_OUSTRING ("height/2"); - aStringSequence[2] = CREATE_OUSTRING ("height"); - aStringSequence[3] = CREATE_OUSTRING ("width"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[1] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -16293,16 +16293,16 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (10); - aStringSequence[0] = CREATE_OUSTRING ("height*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("width*$1 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("height*$2 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width*$3 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("height*$4 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("width*$5 /100000"); - aStringSequence[6] = CREATE_OUSTRING ("width"); - aStringSequence[7] = CREATE_OUSTRING ("height/2"); - aStringSequence[8] = CREATE_OUSTRING ("width/2"); - aStringSequence[9] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*$1 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*$2 /100000"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*$3 /100000"); + aStringSequence[4] = CREATE_OUSTRING ("logheight*$4 /100000"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth*$5 /100000"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth"); + aStringSequence[7] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[9] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -16777,16 +16777,16 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (12); - aStringSequence[0] = CREATE_OUSTRING ("width*cos(pi*(13500000)/10800000)"); - aStringSequence[1] = CREATE_OUSTRING ("height*sin(pi*(13500000)/10800000)"); - aStringSequence[2] = CREATE_OUSTRING ("width+?0 -0"); - aStringSequence[3] = CREATE_OUSTRING ("height+?1 -0"); - aStringSequence[4] = CREATE_OUSTRING ("width"); - aStringSequence[5] = CREATE_OUSTRING ("height/2"); - aStringSequence[6] = CREATE_OUSTRING ("width/2"); - aStringSequence[7] = CREATE_OUSTRING ("height"); - aStringSequence[8] = CREATE_OUSTRING ("width"); - aStringSequence[9] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*cos(pi*(13500000)/10800000)"); + aStringSequence[1] = CREATE_OUSTRING ("logheight*sin(pi*(13500000)/10800000)"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth+?0 -0"); + aStringSequence[3] = CREATE_OUSTRING ("logheight+?1 -0"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth"); + aStringSequence[5] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth"); + aStringSequence[9] = CREATE_OUSTRING ("logheight"); aStringSequence[10] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[11] = CREATE_OUSTRING ("(5400000)/60000.0"); aPropertyMap [PROP_Equations] <<= aStringSequence; @@ -16946,29 +16946,29 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (23); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("?2 *2/1"); aStringSequence[4] = CREATE_OUSTRING ("if(0-$0 ,0,if(?3 -$0 ,$0 ,?3 ))"); - aStringSequence[5] = CREATE_OUSTRING ("100000*height/?0 "); + aStringSequence[5] = CREATE_OUSTRING ("100000*logheight/?0 "); aStringSequence[6] = CREATE_OUSTRING ("if(0-$2 ,0,if(?5 -$2 ,$2 ,?5 ))"); - aStringSequence[7] = CREATE_OUSTRING ("?6 *?0 /height"); + aStringSequence[7] = CREATE_OUSTRING ("?6 *?0 /logheight"); aStringSequence[8] = CREATE_OUSTRING ("100000+0-?7 "); aStringSequence[9] = CREATE_OUSTRING ("if(0-$3 ,0,if(?8 -$3 ,$3 ,?8 ))"); aStringSequence[10] = CREATE_OUSTRING ("?0 *?2 /100000"); aStringSequence[11] = CREATE_OUSTRING ("?0 *?4 /200000"); - aStringSequence[12] = CREATE_OUSTRING ("width/2"); + aStringSequence[12] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[13] = CREATE_OUSTRING ("?12 +0-?10 "); aStringSequence[14] = CREATE_OUSTRING ("?12 +0-?11 "); aStringSequence[15] = CREATE_OUSTRING ("?12 +?11 -0"); aStringSequence[16] = CREATE_OUSTRING ("?12 +?10 -0"); aStringSequence[17] = CREATE_OUSTRING ("?0 *?6 /100000"); - aStringSequence[18] = CREATE_OUSTRING ("height*?9 /100000"); - aStringSequence[19] = CREATE_OUSTRING ("height+0-?18 "); - aStringSequence[20] = CREATE_OUSTRING ("(?19 +height)/2"); - aStringSequence[21] = CREATE_OUSTRING ("width"); - aStringSequence[22] = CREATE_OUSTRING ("height"); + aStringSequence[18] = CREATE_OUSTRING ("logheight*?9 /100000"); + aStringSequence[19] = CREATE_OUSTRING ("logheight+0-?18 "); + aStringSequence[20] = CREATE_OUSTRING ("(?19 +logheight)/2"); + aStringSequence[21] = CREATE_OUSTRING ("logwidth"); + aStringSequence[22] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -17406,10 +17406,10 @@ void CustomShapeProperties::initializePresetsMap5() } { Sequence< OUString > aStringSequence (4); - aStringSequence[0] = CREATE_OUSTRING ("width/2"); - aStringSequence[1] = CREATE_OUSTRING ("height/2"); - aStringSequence[2] = CREATE_OUSTRING ("height"); - aStringSequence[3] = CREATE_OUSTRING ("width"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[1] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[2] = CREATE_OUSTRING ("logheight"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { diff --git a/oox/source/drawingml/customshapepresets6.cxx b/oox/source/drawingml/customshapepresets6.cxx index bdbdc4165a73..078ad6f68de1 100644 --- a/oox/source/drawingml/customshapepresets6.cxx +++ b/oox/source/drawingml/customshapepresets6.cxx @@ -41,17 +41,17 @@ void CustomShapeProperties::initializePresetsMap6() { Sequence< OUString > aStringSequence (32); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("width/2"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[2] = CREATE_OUSTRING ("?1 *$1 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("height/2"); + aStringSequence[3] = CREATE_OUSTRING ("logheight/2"); aStringSequence[4] = CREATE_OUSTRING ("?3 *$2 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("height/2"); + aStringSequence[5] = CREATE_OUSTRING ("logheight/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 *$2 /100000"); aStringSequence[7] = CREATE_OUSTRING ("?2 *cos(pi*(1080000)/10800000)"); aStringSequence[8] = CREATE_OUSTRING ("?2 *cos(pi*(18360000)/10800000)"); aStringSequence[9] = CREATE_OUSTRING ("?4 *sin(pi*(1080000)/10800000)"); aStringSequence[10] = CREATE_OUSTRING ("?4 *sin(pi*(18360000)/10800000)"); - aStringSequence[11] = CREATE_OUSTRING ("width/2"); + aStringSequence[11] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[12] = CREATE_OUSTRING ("?11 +0-?7 "); aStringSequence[13] = CREATE_OUSTRING ("?11 +0-?8 "); aStringSequence[14] = CREATE_OUSTRING ("?11 +?8 -0"); @@ -359,8 +359,8 @@ void CustomShapeProperties::initializePresetsMap6() } { Sequence< OUString > aStringSequence (2); - aStringSequence[0] = CREATE_OUSTRING ("height"); - aStringSequence[1] = CREATE_OUSTRING ("width"); + aStringSequence[0] = CREATE_OUSTRING ("logheight"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -454,8 +454,8 @@ void CustomShapeProperties::initializePresetsMap6() } { Sequence< OUString > aStringSequence (2); - aStringSequence[0] = CREATE_OUSTRING ("width"); - aStringSequence[1] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth"); + aStringSequence[1] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -563,25 +563,25 @@ void CustomShapeProperties::initializePresetsMap6() } { Sequence< OUString > aStringSequence (19); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("84375*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("84375*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(100000-$0 ,$0 ,100000))"); aStringSequence[3] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))"); aStringSequence[4] = CREATE_OUSTRING ("?0 *5/32"); aStringSequence[5] = CREATE_OUSTRING ("?0 *?3 /100000"); - aStringSequence[6] = CREATE_OUSTRING ("width+0-?5 "); - aStringSequence[7] = CREATE_OUSTRING ("height*?2 /200000"); - aStringSequence[8] = CREATE_OUSTRING ("height/2"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth+0-?5 "); + aStringSequence[7] = CREATE_OUSTRING ("logheight*?2 /200000"); + aStringSequence[8] = CREATE_OUSTRING ("logheight/2"); aStringSequence[9] = CREATE_OUSTRING ("?8 +0-?7 "); aStringSequence[10] = CREATE_OUSTRING ("?8 +?7 -0"); - aStringSequence[11] = CREATE_OUSTRING ("height/2"); + aStringSequence[11] = CREATE_OUSTRING ("logheight/2"); aStringSequence[12] = CREATE_OUSTRING ("?7 *?5 /?11 "); - aStringSequence[13] = CREATE_OUSTRING ("width+0-?12 "); - aStringSequence[14] = CREATE_OUSTRING ("height"); - aStringSequence[15] = CREATE_OUSTRING ("width"); - aStringSequence[16] = CREATE_OUSTRING ("min(width,height)/80"); - aStringSequence[17] = CREATE_OUSTRING ("min(width,height)/64"); - aStringSequence[18] = CREATE_OUSTRING ("min(width,height)/56"); + aStringSequence[13] = CREATE_OUSTRING ("logwidth+0-?12 "); + aStringSequence[14] = CREATE_OUSTRING ("logheight"); + aStringSequence[15] = CREATE_OUSTRING ("logwidth"); + aStringSequence[16] = CREATE_OUSTRING ("min(logwidth,logheight)/80"); + aStringSequence[17] = CREATE_OUSTRING ("min(logwidth,logheight)/64"); + aStringSequence[18] = CREATE_OUSTRING ("min(logwidth,logheight)/56"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -1071,18 +1071,18 @@ void CustomShapeProperties::initializePresetsMap6() } { Sequence< OUString > aStringSequence (12); - aStringSequence[0] = CREATE_OUSTRING ("height*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("width*$1 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("height*$2 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width*$3 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("height*$4 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("width*$5 /100000"); - aStringSequence[6] = CREATE_OUSTRING ("height*$6 /100000"); - aStringSequence[7] = CREATE_OUSTRING ("width*$7 /100000"); - aStringSequence[8] = CREATE_OUSTRING ("width"); - aStringSequence[9] = CREATE_OUSTRING ("height/2"); - aStringSequence[10] = CREATE_OUSTRING ("width/2"); - aStringSequence[11] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*$1 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*$2 /100000"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*$3 /100000"); + aStringSequence[4] = CREATE_OUSTRING ("logheight*$4 /100000"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth*$5 /100000"); + aStringSequence[6] = CREATE_OUSTRING ("logheight*$6 /100000"); + aStringSequence[7] = CREATE_OUSTRING ("logwidth*$7 /100000"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth"); + aStringSequence[9] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[10] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[11] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -1589,22 +1589,22 @@ void CustomShapeProperties::initializePresetsMap6() aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); aStringSequence[1] = CREATE_OUSTRING ("if(0-$1 ,0,if(50000-$1 ,$1 ,50000))"); aStringSequence[2] = CREATE_OUSTRING ("if(0-$2 ,0,if(50000-$2 ,$2 ,50000))"); - aStringSequence[3] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[3] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[4] = CREATE_OUSTRING ("?3 *?2 /100000"); aStringSequence[5] = CREATE_OUSTRING ("?3 *?1 /50000"); - aStringSequence[6] = CREATE_OUSTRING ("width+0-?5 "); + aStringSequence[6] = CREATE_OUSTRING ("logwidth+0-?5 "); aStringSequence[7] = CREATE_OUSTRING ("?3 *?1 /100000"); - aStringSequence[8] = CREATE_OUSTRING ("width+0-?7 "); + aStringSequence[8] = CREATE_OUSTRING ("logwidth+0-?7 "); aStringSequence[9] = CREATE_OUSTRING ("?3 *?0 /200000"); aStringSequence[10] = CREATE_OUSTRING ("?8 +0-?9 "); aStringSequence[11] = CREATE_OUSTRING ("?8 +?9 -0"); aStringSequence[12] = CREATE_OUSTRING ("?3 *?0 /100000"); - aStringSequence[13] = CREATE_OUSTRING ("height+0-?12 "); + aStringSequence[13] = CREATE_OUSTRING ("logheight+0-?12 "); aStringSequence[14] = CREATE_OUSTRING ("?11 *1/2"); - aStringSequence[15] = CREATE_OUSTRING ("(?13 +height)/2"); - aStringSequence[16] = CREATE_OUSTRING ("(?4 +height)/2"); - aStringSequence[17] = CREATE_OUSTRING ("height"); - aStringSequence[18] = CREATE_OUSTRING ("width"); + aStringSequence[15] = CREATE_OUSTRING ("(?13 +logheight)/2"); + aStringSequence[16] = CREATE_OUSTRING ("(?4 +logheight)/2"); + aStringSequence[17] = CREATE_OUSTRING ("logheight"); + aStringSequence[18] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -1967,13 +1967,13 @@ void CustomShapeProperties::initializePresetsMap6() { Sequence< OUString > aStringSequence (51); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); - aStringSequence[1] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[1] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[2] = CREATE_OUSTRING ("?1 *?0 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width/2"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[4] = CREATE_OUSTRING ("?3 +0-?2 "); - aStringSequence[5] = CREATE_OUSTRING ("height/2"); + aStringSequence[5] = CREATE_OUSTRING ("logheight/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?2 "); - aStringSequence[7] = CREATE_OUSTRING ("(10800000*atan2(height,width))/pi"); + aStringSequence[7] = CREATE_OUSTRING ("(10800000*atan2(logheight,logwidth))/pi"); aStringSequence[8] = CREATE_OUSTRING ("?6 *cos(pi*(?7 )/10800000)"); aStringSequence[9] = CREATE_OUSTRING ("?4 *sin(pi*(?7 )/10800000)"); aStringSequence[10] = CREATE_OUSTRING ("sqrt(?8 *?8 +?9 *?9 +0*0)"); @@ -1982,7 +1982,7 @@ void CustomShapeProperties::initializePresetsMap6() aStringSequence[13] = CREATE_OUSTRING ("(10800000*atan2(?12 ,?11 ))/pi"); aStringSequence[14] = CREATE_OUSTRING ("?13 *2/1"); aStringSequence[15] = CREATE_OUSTRING ("-10800000+2-0"); - aStringSequence[16] = CREATE_OUSTRING ("(10800000*atan2(height,width))/pi"); + aStringSequence[16] = CREATE_OUSTRING ("(10800000*atan2(logheight,logwidth))/pi"); aStringSequence[17] = CREATE_OUSTRING ("?16 +0-?13 "); aStringSequence[18] = CREATE_OUSTRING ("?17 +0-10800000"); aStringSequence[19] = CREATE_OUSTRING ("?6 *cos(pi*(?17 )/10800000)"); @@ -1991,9 +1991,9 @@ void CustomShapeProperties::initializePresetsMap6() aStringSequence[22] = CREATE_OUSTRING ("?4 *?6 /?21 "); aStringSequence[23] = CREATE_OUSTRING ("?22 *cos(pi*(?17 )/10800000)"); aStringSequence[24] = CREATE_OUSTRING ("?22 *sin(pi*(?17 )/10800000)"); - aStringSequence[25] = CREATE_OUSTRING ("width/2"); + aStringSequence[25] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[26] = CREATE_OUSTRING ("?25 +?23 -0"); - aStringSequence[27] = CREATE_OUSTRING ("height/2"); + aStringSequence[27] = CREATE_OUSTRING ("logheight/2"); aStringSequence[28] = CREATE_OUSTRING ("?27 +?24 -0"); aStringSequence[29] = CREATE_OUSTRING ("?25 +0-?23 "); aStringSequence[30] = CREATE_OUSTRING ("?27 +0-?24 "); @@ -2003,8 +2003,8 @@ void CustomShapeProperties::initializePresetsMap6() aStringSequence[34] = CREATE_OUSTRING ("?25 +?31 -0"); aStringSequence[35] = CREATE_OUSTRING ("?27 +0-?32 "); aStringSequence[36] = CREATE_OUSTRING ("?27 +?32 -0"); - aStringSequence[37] = CREATE_OUSTRING ("height"); - aStringSequence[38] = CREATE_OUSTRING ("width"); + aStringSequence[37] = CREATE_OUSTRING ("logheight"); + aStringSequence[38] = CREATE_OUSTRING ("logwidth"); aStringSequence[39] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[40] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[41] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -2429,22 +2429,22 @@ void CustomShapeProperties::initializePresetsMap6() } { Sequence< OUString > aStringSequence (16); - aStringSequence[0] = CREATE_OUSTRING ("min(width,height)"); - aStringSequence[1] = CREATE_OUSTRING ("50000*width/?0 "); + aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)"); + aStringSequence[1] = CREATE_OUSTRING ("50000*logwidth/?0 "); aStringSequence[2] = CREATE_OUSTRING ("if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))"); aStringSequence[3] = CREATE_OUSTRING ("?0 *?2 /200000"); aStringSequence[4] = CREATE_OUSTRING ("?0 *?2 /100000"); - aStringSequence[5] = CREATE_OUSTRING ("width+0-?4 "); - aStringSequence[6] = CREATE_OUSTRING ("width+0-?3 "); - aStringSequence[7] = CREATE_OUSTRING ("width/3"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth+0-?4 "); + aStringSequence[6] = CREATE_OUSTRING ("logwidth+0-?3 "); + aStringSequence[7] = CREATE_OUSTRING ("logwidth/3"); aStringSequence[8] = CREATE_OUSTRING ("?7 *?2 /?1 "); - aStringSequence[9] = CREATE_OUSTRING ("height/3"); + aStringSequence[9] = CREATE_OUSTRING ("logheight/3"); aStringSequence[10] = CREATE_OUSTRING ("?9 *?2 /?1 "); - aStringSequence[11] = CREATE_OUSTRING ("width+0-?8 "); - aStringSequence[12] = CREATE_OUSTRING ("width/2"); - aStringSequence[13] = CREATE_OUSTRING ("height/2"); - aStringSequence[14] = CREATE_OUSTRING ("height"); - aStringSequence[15] = CREATE_OUSTRING ("width"); + aStringSequence[11] = CREATE_OUSTRING ("logwidth+0-?8 "); + aStringSequence[12] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[13] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[14] = CREATE_OUSTRING ("logheight"); + aStringSequence[15] = CREATE_OUSTRING ("logwidth"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -2632,15 +2632,15 @@ void CustomShapeProperties::initializePresetsMap6() } { Sequence< OUString > aStringSequence (98); - aStringSequence[0] = CREATE_OUSTRING ("width*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("height*$1 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("width/2"); + aStringSequence[0] = CREATE_OUSTRING ("logwidth*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logheight*$1 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[3] = CREATE_OUSTRING ("?2 +?0 -0"); - aStringSequence[4] = CREATE_OUSTRING ("height/2"); + aStringSequence[4] = CREATE_OUSTRING ("logheight/2"); aStringSequence[5] = CREATE_OUSTRING ("?4 +?1 -0"); - aStringSequence[6] = CREATE_OUSTRING ("height/2"); + aStringSequence[6] = CREATE_OUSTRING ("logheight/2"); aStringSequence[7] = CREATE_OUSTRING ("?6 *(cos(atan2(?1 ,?0 )))"); - aStringSequence[8] = CREATE_OUSTRING ("width/2"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[9] = CREATE_OUSTRING ("?8 *(sin(atan2(?1 ,?0 )))"); aStringSequence[10] = CREATE_OUSTRING ("?8 *(cos(atan2(?9 ,?7 )))"); aStringSequence[11] = CREATE_OUSTRING ("?6 *(sin(atan2(?9 ,?7 )))"); @@ -2649,7 +2649,7 @@ void CustomShapeProperties::initializePresetsMap6() aStringSequence[14] = CREATE_OUSTRING ("?12 +0-?3 "); aStringSequence[15] = CREATE_OUSTRING ("?13 +0-?5 "); aStringSequence[16] = CREATE_OUSTRING ("sqrt(?14 *?14 +?15 *?15 +0*0)"); - aStringSequence[17] = CREATE_OUSTRING ("min(width,height)"); + aStringSequence[17] = CREATE_OUSTRING ("min(logwidth,logheight)"); aStringSequence[18] = CREATE_OUSTRING ("?17 *6600/21600"); aStringSequence[19] = CREATE_OUSTRING ("?16 +0-?18 "); aStringSequence[20] = CREATE_OUSTRING ("?19 *1/3"); @@ -2671,14 +2671,14 @@ void CustomShapeProperties::initializePresetsMap6() aStringSequence[36] = CREATE_OUSTRING ("?3 +?35 -0"); aStringSequence[37] = CREATE_OUSTRING ("?25 +?34 -0"); aStringSequence[38] = CREATE_OUSTRING ("?32 +?21 -0"); - aStringSequence[39] = CREATE_OUSTRING ("width*2977/21600"); - aStringSequence[40] = CREATE_OUSTRING ("height*3262/21600"); - aStringSequence[41] = CREATE_OUSTRING ("width*17087/21600"); - aStringSequence[42] = CREATE_OUSTRING ("height*17337/21600"); - aStringSequence[43] = CREATE_OUSTRING ("width*67/21600"); - aStringSequence[44] = CREATE_OUSTRING ("height*21577/21600"); - aStringSequence[45] = CREATE_OUSTRING ("width*21582/21600"); - aStringSequence[46] = CREATE_OUSTRING ("height*1235/21600"); + aStringSequence[39] = CREATE_OUSTRING ("logwidth*2977/21600"); + aStringSequence[40] = CREATE_OUSTRING ("logheight*3262/21600"); + aStringSequence[41] = CREATE_OUSTRING ("logwidth*17087/21600"); + aStringSequence[42] = CREATE_OUSTRING ("logheight*17337/21600"); + aStringSequence[43] = CREATE_OUSTRING ("logwidth*67/21600"); + aStringSequence[44] = CREATE_OUSTRING ("logheight*21577/21600"); + aStringSequence[45] = CREATE_OUSTRING ("logwidth*21582/21600"); + aStringSequence[46] = CREATE_OUSTRING ("logheight*1235/21600"); aStringSequence[47] = CREATE_OUSTRING ("(10800000*atan2(?1 ,?0 ))/pi"); aStringSequence[48] = CREATE_OUSTRING ("(-11429249)/60000.0"); aStringSequence[49] = CREATE_OUSTRING ("(7426832)/60000.0"); @@ -4260,14 +4260,14 @@ void CustomShapeProperties::initializePresetsMap6() } { Sequence< OUString > aStringSequence (8); - aStringSequence[0] = CREATE_OUSTRING ("height*$0 /100000"); - aStringSequence[1] = CREATE_OUSTRING ("width*$1 /100000"); - aStringSequence[2] = CREATE_OUSTRING ("height*$2 /100000"); - aStringSequence[3] = CREATE_OUSTRING ("width*$3 /100000"); - aStringSequence[4] = CREATE_OUSTRING ("width"); - aStringSequence[5] = CREATE_OUSTRING ("height/2"); - aStringSequence[6] = CREATE_OUSTRING ("width/2"); - aStringSequence[7] = CREATE_OUSTRING ("height"); + aStringSequence[0] = CREATE_OUSTRING ("logheight*$0 /100000"); + aStringSequence[1] = CREATE_OUSTRING ("logwidth*$1 /100000"); + aStringSequence[2] = CREATE_OUSTRING ("logheight*$2 /100000"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth*$3 /100000"); + aStringSequence[4] = CREATE_OUSTRING ("logwidth"); + aStringSequence[5] = CREATE_OUSTRING ("logheight/2"); + aStringSequence[6] = CREATE_OUSTRING ("logwidth/2"); + aStringSequence[7] = CREATE_OUSTRING ("logheight"); aPropertyMap [PROP_Equations] <<= aStringSequence; } { @@ -4603,27 +4603,27 @@ void CustomShapeProperties::initializePresetsMap6() Sequence< OUString > aStringSequence (56); aStringSequence[0] = CREATE_OUSTRING ("if(0-$0 ,0,if(33333-$0 ,$0 ,33333))"); aStringSequence[1] = CREATE_OUSTRING ("if(25000-$1 ,25000,if(75000-$1 ,$1 ,75000))"); - aStringSequence[2] = CREATE_OUSTRING ("width/8"); - aStringSequence[3] = CREATE_OUSTRING ("width+0-?2 "); - aStringSequence[4] = CREATE_OUSTRING ("width*?1 /200000"); - aStringSequence[5] = CREATE_OUSTRING ("width/2"); + aStringSequence[2] = CREATE_OUSTRING ("logwidth/8"); + aStringSequence[3] = CREATE_OUSTRING ("logwidth+0-?2 "); + aStringSequence[4] = CREATE_OUSTRING ("logwidth*?1 /200000"); + aStringSequence[5] = CREATE_OUSTRING ("logwidth/2"); aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?4 "); aStringSequence[7] = CREATE_OUSTRING ("?5 +?4 -0"); - aStringSequence[8] = CREATE_OUSTRING ("width/32"); + aStringSequence[8] = CREATE_OUSTRING ("logwidth/32"); aStringSequence[9] = CREATE_OUSTRING ("?6 +?8 -0"); aStringSequence[10] = CREATE_OUSTRING ("?7 +0-?8 "); aStringSequence[11] = CREATE_OUSTRING ("?6 +?2 -0"); aStringSequence[12] = CREATE_OUSTRING ("?7 +0-?2 "); aStringSequence[13] = CREATE_OUSTRING ("?11 +0-?8 "); aStringSequence[14] = CREATE_OUSTRING ("?12 +?8 -0"); - aStringSequence[15] = CREATE_OUSTRING ("height*?0 /200000"); - aStringSequence[16] = CREATE_OUSTRING ("height*?0 /100000"); - aStringSequence[17] = CREATE_OUSTRING ("height+0-?16 "); + aStringSequence[15] = CREATE_OUSTRING ("logheight*?0 /200000"); + aStringSequence[16] = CREATE_OUSTRING ("logheight*?0 /100000"); + aStringSequence[17] = CREATE_OUSTRING ("logheight+0-?16 "); aStringSequence[18] = CREATE_OUSTRING ("?17 *1/2"); - aStringSequence[19] = CREATE_OUSTRING ("height*?0 /400000"); - aStringSequence[20] = CREATE_OUSTRING ("height+0-?19 "); + aStringSequence[19] = CREATE_OUSTRING ("logheight*?0 /400000"); + aStringSequence[20] = CREATE_OUSTRING ("logheight+0-?19 "); aStringSequence[21] = CREATE_OUSTRING ("?16 +0-?19 "); - aStringSequence[22] = CREATE_OUSTRING ("height"); + aStringSequence[22] = CREATE_OUSTRING ("logheight"); aStringSequence[23] = CREATE_OUSTRING ("(16200000)/60000.0"); aStringSequence[24] = CREATE_OUSTRING ("(10800000)/60000.0"); aStringSequence[25] = CREATE_OUSTRING ("(16200000)/60000.0"); @@ -4632,7 +4632,7 @@ void CustomShapeProperties::initializePresetsMap6() aStringSequence[28] = CREATE_OUSTRING ("(-10800000)/60000.0"); aStringSequence[29] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[30] = CREATE_OUSTRING ("(10800000)/60000.0"); - aStringSequence[31] = CREATE_OUSTRING ("width"); + aStringSequence[31] = CREATE_OUSTRING ("logwidth"); aStringSequence[32] = CREATE_OUSTRING ("(0)/60000.0"); aStringSequence[33] = CREATE_OUSTRING ("(5400000)/60000.0"); aStringSequence[34] = CREATE_OUSTRING ("(5400000)/60000.0"); diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 2c9044479a69..a23bf19a8328 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -113,6 +113,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi OSL_TRACE("found property map for preset: %s (%d)", USS(getShapePresetTypeName()), mnShapePresetType); aPropertyMap = maPresetsMap[ mnShapePresetType ]; + aPropertyMap.dump(); } else { @@ -171,7 +172,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi } else if ( aGeoPropSeq[ i ].Name.equals( sType ) ) { - aGeoPropSeq[ i ].Value <<= getShapePresetTypeName(); + aGeoPropSeq[ i ].Value <<= CREATE_OUSTRING( "ooxml-CustomShape" ); } } } -- cgit