svx/source/customshapes/EnhancedCustomShapeGeometry.cxx | 1874 +++++++-------- svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx | 4 svx/source/dialog/dlgctl3d.cxx | 2 svx/source/dialog/framelinkarray.cxx | 4 svx/source/dialog/frmsel.cxx | 2 svx/source/dialog/hdft.cxx | 6 svx/source/dialog/rubydialog.cxx | 10 svx/source/dialog/svxbmpnumvalueset.cxx | 2 svx/source/dialog/svxruler.cxx | 2 svx/source/fmcomp/gridctrl.cxx | 4 svx/source/form/fmshimp.cxx | 10 svx/source/form/formcontrolfactory.cxx | 2 svx/source/svdraw/presetooxhandleadjustmentrelations.cxx | 2 svx/source/svdraw/svdglue.cxx | 2 svx/source/svdraw/svdpage.cxx | 2 svx/source/table/tablelayouter.cxx | 2 svx/source/table/tablertfexporter.cxx | 2 svx/source/tbxctrls/colrctrl.cxx | 4 svx/source/tbxctrls/extrusioncontrols.cxx | 24 svx/source/tbxctrls/fontworkgallery.cxx | 6 svx/source/tbxctrls/linectrl.cxx | 2 svx/source/tbxctrls/tbunosearchcontrollers.cxx | 16 svx/source/unodialogs/textconversiondlgs/services.cxx | 2 svx/source/unodraw/unoshap2.cxx | 2 svx/source/xml/xmleohlp.cxx | 4 svx/source/xoutdev/xattr.cxx | 2 svx/source/xoutdev/xtable.cxx | 2 27 files changed, 998 insertions(+), 998 deletions(-)
New commits: commit 13c4a795aa42250a31977068a3fbb2dc5162e443 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Thu Jul 2 08:11:54 2020 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Thu Jul 2 09:23:04 2020 +0200 Upcoming improved loplugin:staticanonymous -> redundantstatic: svx Change-Id: I6f4b927f9c869925825cc83cc36f0494d06c8faa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97698 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx index c0d81e213951..7539bfd8015e 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx @@ -25,80 +25,80 @@ #include <svx/EnhancedCustomShapeGeometry.hxx> #include <com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp> -static const sal_Int32 MIN_INT32 = std::numeric_limits<sal_Int32>::min(); +const sal_Int32 MIN_INT32 = std::numeric_limits<sal_Int32>::min(); -static const sal_Int32 mso_sptDefault1400[] = +const sal_Int32 mso_sptDefault1400[] = { 1, 1400 }; -static const sal_Int32 mso_sptDefault1800[] = +const sal_Int32 mso_sptDefault1800[] = { 1, 1800 }; -static const sal_Int32 mso_sptDefault2500[] = +const sal_Int32 mso_sptDefault2500[] = { 1, 2500 }; -static const sal_Int32 mso_sptDefault2700[] = +const sal_Int32 mso_sptDefault2700[] = { 1, 2700 }; -static const sal_Int32 mso_sptDefault3600[] = +const sal_Int32 mso_sptDefault3600[] = { 1, 3600 }; -static const sal_Int32 mso_sptDefault3700[] = +const sal_Int32 mso_sptDefault3700[] = { 1, 3700 }; -static const sal_Int32 mso_sptDefault5400[] = +const sal_Int32 mso_sptDefault5400[] = { 1, 5400 }; -static const sal_Int32 mso_sptDefault7200[] = +const sal_Int32 mso_sptDefault7200[] = { 1, 7200 }; -static const sal_Int32 mso_sptDefault8100[] = +const sal_Int32 mso_sptDefault8100[] = { 1, 8100 }; -static const sal_Int32 mso_sptDefault9600[] = +const sal_Int32 mso_sptDefault9600[] = { 1, 9600 }; -static const sal_Int32 mso_sptDefault10800[] = +const sal_Int32 mso_sptDefault10800[] = { 1, 10800 }; -static const sal_Int32 mso_sptDefault12000[] = +const sal_Int32 mso_sptDefault12000[] = { 1, 12000 }; -static const sal_Int32 mso_sptDefault13500[] = +const sal_Int32 mso_sptDefault13500[] = { 1, 13500 }; -static const sal_Int32 mso_sptDefault16200[] = +const sal_Int32 mso_sptDefault16200[] = { 1, 16200 }; -static const sal_Int32 mso_sptDefault16200and5400[] = +const sal_Int32 mso_sptDefault16200and5400[] = { 2, 16200, 5400 }; -static const SvxMSDffVertPair mso_sptArcVert[] = +const SvxMSDffVertPair mso_sptArcVert[] = { { 0, 0 }, { 21600, 21600 }, { 3 MSO_I, 1 MSO_I }, { 7 MSO_I, 5 MSO_I }, { 10800, 10800 }, { 0, 0 }, { 21600, 21600 }, { 3 MSO_I, 1 MSO_I }, { 7 MSO_I, 5 MSO_I } }; -static const sal_uInt16 mso_sptArcSegm[] = +const sal_uInt16 mso_sptArcSegm[] = { 0xa604, 0xab00, 0x0001, 0x6001, 0x8000, 0xa604, 0xaa00, 0x8000 }; -static const SvxMSDffCalculationData mso_sptArcCalc[] = +const SvxMSDffCalculationData mso_sptArcCalc[] = { { 0x4009, { 10800, DFF_Prop_adjustValue, 0 } }, { 0x2000, { 0x400, 10800, 0 } }, @@ -109,22 +109,22 @@ static const SvxMSDffCalculationData mso_sptArcCalc[] = { 0x400a, { 10800, DFF_Prop_adjust2Value, 0 } }, { 0x2000, { 0x406, 10800, 0 } } }; -static const sal_Int32 mso_sptArcDefault[] = +const sal_Int32 mso_sptArcDefault[] = { 2, 270, 0 }; -static const SvxMSDffVertPair mso_sptStandardGluePoints[] = +const SvxMSDffVertPair mso_sptStandardGluePoints[] = { { 10800, 0 }, { 0, 10800 }, { 10800, 21600 }, { 21600, 10800 } }; -static const SvxMSDffHandle mso_sptArcHandle[] = +const SvxMSDffHandle mso_sptArcHandle[] = { { SvxMSDffHandleFlags::POLAR | SvxMSDffHandleFlags::RADIUS_RANGE, 10800, 0x100, 10800, 10800, 10800, 10800, MIN_INT32, 0x7fffffff }, { SvxMSDffHandleFlags::POLAR | SvxMSDffHandleFlags::RADIUS_RANGE, 10800, 0x101, 10800, 10800, 10800, 10800, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoArc = +const mso_CustomShape msoArc = { const_cast<SvxMSDffVertPair*>(mso_sptArcVert), SAL_N_ELEMENTS( mso_sptArcVert ), const_cast<sal_uInt16*>(mso_sptArcSegm), sizeof( mso_sptArcSegm ) >> 1, @@ -137,11 +137,11 @@ static const mso_CustomShape msoArc = const_cast<SvxMSDffHandle*>(mso_sptArcHandle), SAL_N_ELEMENTS( mso_sptArcHandle ) // handles }; -static const SvxMSDffVertPair mso_sptTextSimpleVert[] = +const SvxMSDffVertPair mso_sptTextSimpleVert[] = { { 0, 0 }, { 21600, 0 }, { 21600, 21600 }, { 0, 21600 }, { 0, 0 } }; -static const mso_CustomShape msoTextSimple = +const mso_CustomShape msoTextSimple = { const_cast<SvxMSDffVertPair*>(mso_sptTextSimpleVert), SAL_N_ELEMENTS( mso_sptTextSimpleVert ), nullptr, 0, @@ -154,11 +154,11 @@ static const mso_CustomShape msoTextSimple = nullptr, 0 // handles }; -static const SvxMSDffVertPair mso_sptRectangleVert[] = +const SvxMSDffVertPair mso_sptRectangleVert[] = { { 0, 0 }, { 21600, 0 }, { 21600, 21600 }, { 0, 21600 }, { 0, 0 } }; -static const mso_CustomShape msoRectangle = +const mso_CustomShape msoRectangle = { const_cast<SvxMSDffVertPair*>(mso_sptRectangleVert), SAL_N_ELEMENTS( mso_sptRectangleVert ), nullptr, 0, @@ -171,16 +171,16 @@ static const mso_CustomShape msoRectangle = nullptr, 0 // handles }; -static const SvxMSDffVertPair mso_sptRoundRectangleVert[] = // adj value 0 -> 10800 +const SvxMSDffVertPair mso_sptRoundRectangleVert[] = // adj value 0 -> 10800 { { 7 MSO_I, 0 }, { 0, 8 MSO_I }, { 0, 9 MSO_I }, { 7 MSO_I, 21600 }, { 10 MSO_I, 21600 }, { 21600, 9 MSO_I }, { 21600, 8 MSO_I }, { 10 MSO_I, 0 } }; -static const sal_uInt16 mso_sptRoundRectangleSegm[] = +const sal_uInt16 mso_sptRoundRectangleSegm[] = { 0x4000, 0xa701, 0x0001, 0xa801, 0x0001, 0xa701, 0x0001, 0xa801, 0x6000, 0x8000 }; -static const SvxMSDffCalculationData mso_sptRoundRectangleCalc[] = +const SvxMSDffCalculationData mso_sptRoundRectangleCalc[] = { { 0x000e, { 0, 45, 0 } }, { 0x6009, { DFF_Prop_adjustValue, 0x400, 0 } }, @@ -194,16 +194,16 @@ static const SvxMSDffCalculationData mso_sptRoundRectangleCalc[] = { 0xa000, { DFF_Prop_geoBottom, 0, DFF_Prop_adjustValue } }, { 0xa000, { DFF_Prop_geoRight, 0, DFF_Prop_adjustValue } } }; -static const SvxMSDffTextRectangles mso_sptRoundRectangleTextRect[] = +const SvxMSDffTextRectangles mso_sptRoundRectangleTextRect[] = { { { 3 MSO_I, 4 MSO_I }, { 5 MSO_I, 6 MSO_I } } }; -static const SvxMSDffHandle mso_sptRoundRectangleHandle[] = +const SvxMSDffHandle mso_sptRoundRectangleHandle[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::SWITCHED, 0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoRoundRectangle = +const mso_CustomShape msoRoundRectangle = { const_cast<SvxMSDffVertPair*>(mso_sptRoundRectangleVert), SAL_N_ELEMENTS( mso_sptRoundRectangleVert ), const_cast<sal_uInt16*>(mso_sptRoundRectangleSegm), sizeof( mso_sptRoundRectangleSegm ) >> 1, @@ -216,19 +216,19 @@ static const mso_CustomShape msoRoundRectangle = const_cast<SvxMSDffHandle*>(mso_sptRoundRectangleHandle), SAL_N_ELEMENTS( mso_sptRoundRectangleHandle ) // handles }; -static const SvxMSDffVertPair mso_sptRightTriangleVert[] = +const SvxMSDffVertPair mso_sptRightTriangleVert[] = { { 0, 0 }, { 21600, 21600 }, { 0, 21600 }, { 0, 0 } }; -static const SvxMSDffTextRectangles mso_sptRightTriangleTextRect[] = +const SvxMSDffTextRectangles mso_sptRightTriangleTextRect[] = { { { 1900, 12700 }, { 12700, 19700 } } }; -static const SvxMSDffVertPair mso_sptRightTriangleGluePoints[] = +const SvxMSDffVertPair mso_sptRightTriangleGluePoints[] = { { 0, 0 }, { 0, 10800 }, { 0, 21600 }, { 10800, 21600 }, { 21600, 21600 }, { 10800, 10800 } }; -static const mso_CustomShape msoRightTriangle = +const mso_CustomShape msoRightTriangle = { const_cast<SvxMSDffVertPair*>(mso_sptRightTriangleVert), SAL_N_ELEMENTS( mso_sptRightTriangleVert ), nullptr, 0, @@ -241,23 +241,23 @@ static const mso_CustomShape msoRightTriangle = nullptr, 0 // handles }; -static const SvxMSDffVertPair mso_sptEllipseVert[] = +const SvxMSDffVertPair mso_sptEllipseVert[] = { { 10800, 10800 }, { 10800, 10800 }, { 0, 360 } }; -static const sal_uInt16 mso_sptEllipseSegm[] = +const sal_uInt16 mso_sptEllipseSegm[] = { 0xa203, 0x6000, 0x8000 }; -static const SvxMSDffTextRectangles mso_sptEllipseTextRect[] = +const SvxMSDffTextRectangles mso_sptEllipseTextRect[] = { { { 3163, 3163 }, { 18437, 18437 } } }; -static const SvxMSDffVertPair mso_sptEllipseGluePoints[] = +const SvxMSDffVertPair mso_sptEllipseGluePoints[] = { { 10800, 0 }, { 3163, 3163 }, { 0, 10800 }, { 3163, 18437 }, { 10800, 21600 }, { 18437, 18437 }, { 21600, 10800 }, { 18437, 3163 } }; -static const mso_CustomShape msoEllipse = +const mso_CustomShape msoEllipse = { const_cast<SvxMSDffVertPair*>(mso_sptEllipseVert), SAL_N_ELEMENTS( mso_sptEllipseVert ), const_cast<sal_uInt16*>(mso_sptEllipseSegm), sizeof( mso_sptEllipseSegm ) >> 1, @@ -270,15 +270,15 @@ static const mso_CustomShape msoEllipse = nullptr, 0 // handles }; -static const SvxMSDffVertPair mso_sptParallelogramVert[] = // adjustment1 : 0 - 21600 +const SvxMSDffVertPair mso_sptParallelogramVert[] = // adjustment1 : 0 - 21600 { { 0 MSO_I, 0 }, { 21600, 0 }, { 1 MSO_I, 21600 }, { 0, 21600 } }; -static const sal_uInt16 mso_sptParallelogramSegm[] = +const sal_uInt16 mso_sptParallelogramSegm[] = { 0x4000, 0x0003, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptParallelogramCalc[] = +const SvxMSDffCalculationData mso_sptParallelogramCalc[] = { { 0x4000, { 0, DFF_Prop_adjustValue, 0 } }, { 0x8000, { 0, 21600, DFF_Prop_adjustValue } }, @@ -295,20 +295,20 @@ static const SvxMSDffCalculationData mso_sptParallelogramCalc[] = { 0x8001, { 21600, 10800, 0x400 } }, { 0x8000, { 21600, 0, 0x40c } } }; -static const SvxMSDffTextRectangles mso_sptParallelogramTextRect[] = +const SvxMSDffTextRectangles mso_sptParallelogramTextRect[] = { { { 3 MSO_I, 3 MSO_I }, { 4 MSO_I, 4 MSO_I } } }; -static const SvxMSDffVertPair mso_sptParallelogramGluePoints[] = +const SvxMSDffVertPair mso_sptParallelogramGluePoints[] = { { 6 MSO_I, 0 }, { 10800, 8 MSO_I }, { 11 MSO_I, 10800 }, { 9 MSO_I, 21600 }, { 10800, 10 MSO_I }, { 5 MSO_I, 10800 } }; -static const SvxMSDffHandle mso_sptParallelogramHandle[] = +const SvxMSDffHandle mso_sptParallelogramHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x100, 0, 10800, 10800, 0, 21600, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoParallelogram = +const mso_CustomShape msoParallelogram = { const_cast<SvxMSDffVertPair*>(mso_sptParallelogramVert), SAL_N_ELEMENTS( mso_sptParallelogramVert ), const_cast<sal_uInt16*>(mso_sptParallelogramSegm), sizeof( mso_sptParallelogramSegm ) >> 1, @@ -321,15 +321,15 @@ static const mso_CustomShape msoParallelogram = const_cast<SvxMSDffHandle*>(mso_sptParallelogramHandle), SAL_N_ELEMENTS( mso_sptParallelogramHandle ) // handles }; -static const SvxMSDffVertPair mso_sptDiamondVert[] = +const SvxMSDffVertPair mso_sptDiamondVert[] = { { 10800, 0 }, { 21600, 10800 }, { 10800, 21600 }, { 0, 10800 }, { 10800, 0 } }; -static const SvxMSDffTextRectangles mso_sptDiamondTextRect[] = +const SvxMSDffTextRectangles mso_sptDiamondTextRect[] = { { { 5400, 5400 }, { 16200, 16200 } } }; -static const mso_CustomShape msoDiamond = +const mso_CustomShape msoDiamond = { const_cast<SvxMSDffVertPair*>(mso_sptDiamondVert), SAL_N_ELEMENTS( mso_sptDiamondVert ), nullptr, 0, @@ -342,15 +342,15 @@ static const mso_CustomShape msoDiamond = nullptr, 0 // handles }; -static const SvxMSDffVertPair mso_sptTrapezoidVert[] = // adjustment1 : 0 - 10800 +const SvxMSDffVertPair mso_sptTrapezoidVert[] = // adjustment1 : 0 - 10800 { { 0, 0 }, { 21600, 0 }, {0 MSO_I, 21600 }, { 1 MSO_I, 21600 } }; -static const sal_uInt16 mso_sptTrapezoidSegm[] = +const sal_uInt16 mso_sptTrapezoidSegm[] = { 0x4000, 0x0003, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptTrapezoidCalc[] = +const SvxMSDffCalculationData mso_sptTrapezoidCalc[] = { { 0x8000, { 21600, 0, DFF_Prop_adjustValue } }, { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, @@ -360,20 +360,20 @@ static const SvxMSDffCalculationData mso_sptTrapezoidCalc[] = { 0x2001, { DFF_Prop_adjustValue, 1, 2 } }, { 0x8000, { 21600, 0, 0x405 } } }; -static const SvxMSDffTextRectangles mso_sptTrapezoidTextRect[] = +const SvxMSDffTextRectangles mso_sptTrapezoidTextRect[] = { { { 3 MSO_I, 3 MSO_I }, { 4 MSO_I, 4 MSO_I } } }; -static const SvxMSDffVertPair mso_sptTrapezoidGluePoints[] = +const SvxMSDffVertPair mso_sptTrapezoidGluePoints[] = { { 6 MSO_I, 10800 }, { 10800, 21600 }, { 5 MSO_I, 10800 }, { 10800, 0 } }; -static const SvxMSDffHandle mso_sptTrapezoidHandle[] = +const SvxMSDffHandle mso_sptTrapezoidHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x100, 1, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoTrapezoid = +const mso_CustomShape msoTrapezoid = { const_cast<SvxMSDffVertPair*>(mso_sptTrapezoidVert), SAL_N_ELEMENTS( mso_sptTrapezoidVert ), const_cast<sal_uInt16*>(mso_sptTrapezoidSegm), sizeof( mso_sptTrapezoidSegm ) >> 1, @@ -430,16 +430,16 @@ static const mso_CustomShape msoTrapezoid = */ -static const SvxMSDffVertPair mso_sptOctagonVert[] = // adjustment1 : 0 - 10800 +const SvxMSDffVertPair mso_sptOctagonVert[] = // adjustment1 : 0 - 10800 { { 0 MSO_I, 0 }, { 2 MSO_I, 0 }, { 21600, 1 MSO_I }, { 21600, 3 MSO_I }, { 2 MSO_I, 21600 }, { 0 MSO_I, 21600 }, { 0, 3 MSO_I }, { 0, 1 MSO_I } }; -static const sal_uInt16 mso_sptOctagonSegm[] = +const sal_uInt16 mso_sptOctagonSegm[] = { 0x4000, 0x0007, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptOctagonCalc[] = +const SvxMSDffCalculationData mso_sptOctagonCalc[] = { { 0x6000, { DFF_Prop_geoLeft, DFF_Prop_adjustValue, 0 } }, { 0x6000, { DFF_Prop_geoTop, DFF_Prop_adjustValue, 0 } }, @@ -451,20 +451,20 @@ static const SvxMSDffCalculationData mso_sptOctagonCalc[] = { 0xa000, { DFF_Prop_geoRight, 0, 0x404 } }, { 0xa000, { DFF_Prop_geoBottom, 0, 0x404 } } }; -static const sal_Int32 mso_sptOctagonDefault[] = +const sal_Int32 mso_sptOctagonDefault[] = { 1, static_cast<sal_Int32>((21600 - ((M_SQRT2-1)*21600)) / 2) }; -static const SvxMSDffTextRectangles mso_sptOctagonTextRect[] = +const SvxMSDffTextRectangles mso_sptOctagonTextRect[] = { { { 5 MSO_I, 6 MSO_I }, { 7 MSO_I, 8 MSO_I } } }; -static const SvxMSDffHandle mso_sptOctagonHandle[] = +const SvxMSDffHandle mso_sptOctagonHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoOctagon = +const mso_CustomShape msoOctagon = { const_cast<SvxMSDffVertPair*>(mso_sptOctagonVert), SAL_N_ELEMENTS( mso_sptOctagonVert ), const_cast<sal_uInt16*>(mso_sptOctagonSegm), sizeof( mso_sptOctagonSegm ) >> 1, @@ -477,15 +477,15 @@ static const mso_CustomShape msoOctagon = const_cast<SvxMSDffHandle*>(mso_sptOctagonHandle), SAL_N_ELEMENTS( mso_sptOctagonHandle ) // handles }; -static const SvxMSDffVertPair mso_sptIsocelesTriangleVert[] = // adjustment1 : 0 - 21600 +const SvxMSDffVertPair mso_sptIsocelesTriangleVert[] = // adjustment1 : 0 - 21600 { { 0 MSO_I, 0 }, { 21600, 21600 }, { 0, 21600 } }; -static const sal_uInt16 mso_sptIsocelesTriangleSegm[] = +const sal_uInt16 mso_sptIsocelesTriangleSegm[] = { 0x4000, 0x0002, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptIsocelesTriangleCalc[] = +const SvxMSDffCalculationData mso_sptIsocelesTriangleCalc[] = { { 0x4000, { 0, DFF_Prop_adjustValue, 0 } }, { 0x2001, { DFF_Prop_adjustValue, 1, 2 } }, @@ -496,21 +496,21 @@ static const SvxMSDffCalculationData mso_sptIsocelesTriangleCalc[] = { 0x2001, { 0x405, 1, 2 } }, { 0x8000, { 21600, 0, 0x406 } } }; -static const SvxMSDffTextRectangles mso_sptIsocelesTriangleTextRect[] = +const SvxMSDffTextRectangles mso_sptIsocelesTriangleTextRect[] = { { { 1 MSO_I, 10800 }, { 2 MSO_I, 18000 } }, { { 3 MSO_I, 7200 }, { 4 MSO_I, 21600 } } }; -static const SvxMSDffVertPair mso_sptIsocelesTriangleGluePoints[] = +const SvxMSDffVertPair mso_sptIsocelesTriangleGluePoints[] = { { 0 MSO_I, 0 }, { 1 MSO_I, 10800 }, { 0, 21600 }, { 10800, 21600 }, { 21600, 21600 }, { 7 MSO_I, 10800 } }; -static const SvxMSDffHandle mso_sptIsocelesTriangleHandle[] = +const SvxMSDffHandle mso_sptIsocelesTriangleHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x100, 0, 10800, 10800, 0, 21600, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoIsocelesTriangle = +const mso_CustomShape msoIsocelesTriangle = { const_cast<SvxMSDffVertPair*>(mso_sptIsocelesTriangleVert), SAL_N_ELEMENTS( mso_sptIsocelesTriangleVert ), const_cast<sal_uInt16*>(mso_sptIsocelesTriangleSegm), sizeof( mso_sptIsocelesTriangleSegm ) >> 1, @@ -523,16 +523,16 @@ static const mso_CustomShape msoIsocelesTriangle = const_cast<SvxMSDffHandle*>(mso_sptIsocelesTriangleHandle), SAL_N_ELEMENTS( mso_sptIsocelesTriangleHandle ) // handles }; -static const SvxMSDffVertPair mso_sptHexagonVert[] = // adjustment1 : 0 - 10800 +const SvxMSDffVertPair mso_sptHexagonVert[] = // adjustment1 : 0 - 10800 { { 0 MSO_I, 0 }, { 1 MSO_I, 0 }, { 21600, 10800 }, { 1 MSO_I, 21600 }, { 0 MSO_I, 21600 }, { 0, 10800 } }; -static const sal_uInt16 mso_sptHexagonSegm[] = +const sal_uInt16 mso_sptHexagonSegm[] = { 0x4000, 0x0005, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptHexagonCalc[] = +const SvxMSDffCalculationData mso_sptHexagonCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x8000, { 21600, 0, DFF_Prop_adjustValue } }, @@ -540,16 +540,16 @@ static const SvxMSDffCalculationData mso_sptHexagonCalc[] = { 0x2000, { 0x402, 1700, 0 } }, { 0x8000, { 21600, 0, 0x403 } } }; -static const SvxMSDffTextRectangles mso_sptHexagonTextRect[] = +const SvxMSDffTextRectangles mso_sptHexagonTextRect[] = { { { 3 MSO_I, 3 MSO_I }, { 4 MSO_I, 4 MSO_I } } }; -static const SvxMSDffHandle mso_sptHexagonHandle[] = +const SvxMSDffHandle mso_sptHexagonHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoHexagon = +const mso_CustomShape msoHexagon = { const_cast<SvxMSDffVertPair*>(mso_sptHexagonVert), SAL_N_ELEMENTS( mso_sptHexagonVert ), const_cast<sal_uInt16*>(mso_sptHexagonSegm), sizeof( mso_sptHexagonSegm ) >> 1, @@ -562,21 +562,21 @@ static const mso_CustomShape msoHexagon = const_cast<SvxMSDffHandle*>(mso_sptHexagonHandle), SAL_N_ELEMENTS( mso_sptHexagonHandle ) // handles }; -static const SvxMSDffVertPair mso_sptPentagonVert[] = +const SvxMSDffVertPair mso_sptPentagonVert[] = { { 10800, 0 }, { 0, 8260 }, { 4230, 21600 }, { 17370, 21600 }, { 21600, 8260 }, { 10800, 0 } }; -static const SvxMSDffTextRectangles mso_sptPentagonTextRect[] = +const SvxMSDffTextRectangles mso_sptPentagonTextRect[] = { { { 4230, 5080 }, { 17370, 21600 } } }; -static const SvxMSDffVertPair mso_sptPentagonGluePoints[] = +const SvxMSDffVertPair mso_sptPentagonGluePoints[] = { { 10800, 0 }, { 0, 8260 }, { 4230, 21600 }, { 10800, 21600 }, { 17370, 21600 }, { 21600, 8260 } }; -static const mso_CustomShape msoPentagon = +const mso_CustomShape msoPentagon = { const_cast<SvxMSDffVertPair*>(mso_sptPentagonVert), SAL_N_ELEMENTS( mso_sptPentagonVert ), nullptr, 0, @@ -589,29 +589,29 @@ static const mso_CustomShape msoPentagon = nullptr, 0 // handles }; -static const SvxMSDffVertPair mso_sptPlusVert[] = // adjustment1 : 0 - 10800 +const SvxMSDffVertPair mso_sptPlusVert[] = // adjustment1 : 0 - 10800 { { 1 MSO_I, 0 }, { 2 MSO_I, 0 }, { 2 MSO_I, 1 MSO_I }, { 21600, 1 MSO_I }, { 21600, 3 MSO_I }, { 2 MSO_I, 3 MSO_I }, { 2 MSO_I, 21600 }, { 1 MSO_I, 21600 }, { 1 MSO_I, 3 MSO_I }, { 0, 3 MSO_I }, { 0, 1 MSO_I }, { 1 MSO_I, 1 MSO_I }, { 1 MSO_I, 0 } }; -static const SvxMSDffCalculationData mso_sptPlusCalc[] = +const SvxMSDffCalculationData mso_sptPlusCalc[] = { { 0x2001, { DFF_Prop_adjustValue, 10799, 10800 } }, { 0x2000, { 0x400, 0, 0 } }, { 0xa000, { DFF_Prop_geoRight, 0, 0x400 } }, { 0xa000, { DFF_Prop_geoBottom, 0, 0x400 } } }; -static const SvxMSDffTextRectangles mso_sptPlusTextRect[] = +const SvxMSDffTextRectangles mso_sptPlusTextRect[] = { { { 1 MSO_I, 1 MSO_I }, { 2 MSO_I, 3 MSO_I } } }; -static const SvxMSDffHandle mso_sptPlusHandle[] = +const SvxMSDffHandle mso_sptPlusHandle[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::SWITCHED, 0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoPlus = +const mso_CustomShape msoPlus = { const_cast<SvxMSDffVertPair*>(mso_sptPlusVert), SAL_N_ELEMENTS( mso_sptPlusVert ), nullptr, 0, @@ -624,7 +624,7 @@ static const mso_CustomShape msoPlus = const_cast<SvxMSDffHandle*>(mso_sptPlusHandle), SAL_N_ELEMENTS( mso_sptPlusHandle ) // handles }; -static const SvxMSDffVertPair mso_sptCanVert[] = // adjustment1 : 0 - 10800 +const SvxMSDffVertPair mso_sptCanVert[] = // adjustment1 : 0 - 10800 { { 44, 0 }, { 20, 0 }, { 0, 2 MSO_I }, { 0, 0 MSO_I }, // ccp @@ -639,12 +639,12 @@ static const SvxMSDffVertPair mso_sptCanVert[] = // adjustment1 : 0 - 108 { 68, 6 MSO_I },{ 88, 5 MSO_I }, { 88, 0 MSO_I }, // ccp { 88, 2 MSO_I },{ 68, 0 }, { 44, 0 } // ccp }; -static const sal_uInt16 mso_sptCanSegm[] = +const sal_uInt16 mso_sptCanSegm[] = { 0x4000, 0x2001, 0x0001, 0x2002, 0x0001, 0x2001, 0x6001, 0x8000, 0x4000, 0x2004, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptCanCalc[] = +const SvxMSDffCalculationData mso_sptCanCalc[] = { { 0x2001, { DFF_Prop_adjustValue, 2, 4 } }, // 1/4 { 0x2001, { 0x0400, 6, 11 } }, @@ -655,20 +655,20 @@ static const SvxMSDffCalculationData mso_sptCanCalc[] = { 0x2001, { DFF_Prop_adjustValue, 2, 2 } }, { 0x0000, { 44, 0, 0 } } }; -static const SvxMSDffTextRectangles mso_sptCanTextRect[] = +const SvxMSDffTextRectangles mso_sptCanTextRect[] = { { { 0, 6 MSO_I }, { 88, 3 MSO_I } } }; -static const SvxMSDffVertPair mso_sptCanGluePoints[] = +const SvxMSDffVertPair mso_sptCanGluePoints[] = { { 44, 6 MSO_I }, { 44, 0 }, { 0, 10800 }, { 44, 21600 }, { 88, 10800 } }; -static const SvxMSDffHandle mso_sptCanHandle[] = +const SvxMSDffHandle mso_sptCanHandle[] = { { SvxMSDffHandleFlags::RANGE, 7 + 3, 0x100, 44, 10800, MIN_INT32, 0x7fffffff, 0, 10800 } }; -static const mso_CustomShape msoCan = +const mso_CustomShape msoCan = { const_cast<SvxMSDffVertPair*>(mso_sptCanVert), SAL_N_ELEMENTS( mso_sptCanVert ), const_cast<sal_uInt16*>(mso_sptCanSegm), sizeof( mso_sptCanSegm ) >> 1, @@ -681,16 +681,16 @@ static const mso_CustomShape msoCan = const_cast<SvxMSDffHandle*>(mso_sptCanHandle), SAL_N_ELEMENTS( mso_sptCanHandle ) // handles }; -static const SvxMSDffVertPair mso_sptArrowVert[] = // adjustment1: x 0 - 21600 +const SvxMSDffVertPair mso_sptArrowVert[] = // adjustment1: x 0 - 21600 { // adjustment2: y 0 - 10800 { 0, 0 MSO_I }, { 1 MSO_I, 0 MSO_I }, { 1 MSO_I, 0 }, { 21600, 10800 }, { 1 MSO_I, 21600 }, { 1 MSO_I, 2 MSO_I }, { 0, 2 MSO_I } }; -static const sal_uInt16 mso_sptArrowSegm[] = +const sal_uInt16 mso_sptArrowSegm[] = { 0x4000, 0x0006, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptArrowCalc[] = +const SvxMSDffCalculationData mso_sptArrowCalc[] = { { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, @@ -701,16 +701,16 @@ static const SvxMSDffCalculationData mso_sptArrowCalc[] = { 0x6001, { 0x401, 0x400, 10800 } }, { 0xa000, { 0x401, 0, 0x406 } } }; -static const SvxMSDffTextRectangles mso_sptArrowTextRect[] = +const SvxMSDffTextRectangles mso_sptArrowTextRect[] = { { { 0, 0 MSO_I }, { 5 MSO_I, 2 MSO_I } } }; -static const SvxMSDffHandle mso_sptArrowHandle[] = +const SvxMSDffHandle mso_sptArrowHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x100, 0x101, 10800, 10800, 0, 21600, 0, 10800 } }; -static const mso_CustomShape msoArrow = +const mso_CustomShape msoArrow = { const_cast<SvxMSDffVertPair*>(mso_sptArrowVert), SAL_N_ELEMENTS( mso_sptArrowVert ), const_cast<sal_uInt16*>(mso_sptArrowSegm), sizeof( mso_sptArrowSegm ) >> 1, @@ -723,29 +723,29 @@ static const mso_CustomShape msoArrow = const_cast<SvxMSDffHandle*>(mso_sptArrowHandle), SAL_N_ELEMENTS( mso_sptArrowHandle ) // handles }; -static const SvxMSDffVertPair mso_sptLeftArrowVert[] = // adjustment1: x 0 - 21600 +const SvxMSDffVertPair mso_sptLeftArrowVert[] = // adjustment1: x 0 - 21600 { // adjustment2: y 0 - 10800 { 21600, 0 MSO_I }, { 1 MSO_I, 0 MSO_I }, { 1 MSO_I, 0 }, { 0, 10800 }, { 1 MSO_I, 21600 }, { 1 MSO_I, 2 MSO_I }, { 21600, 2 MSO_I } }; -static const sal_uInt16 mso_sptLeftArrowSegm[] = +const sal_uInt16 mso_sptLeftArrowSegm[] = { 0x4000, 0x0006, 0x6001, 0x8000 }; -static const sal_Int32 mso_sptLeftArrowDefault[] = +const sal_Int32 mso_sptLeftArrowDefault[] = { 2, 5400, 5400 }; -static const SvxMSDffTextRectangles mso_sptLeftArrowTextRect[] = +const SvxMSDffTextRectangles mso_sptLeftArrowTextRect[] = { { { 7 MSO_I, 0 MSO_I }, { 21600, 2 MSO_I } } }; -static const SvxMSDffHandle mso_sptLeftArrowHandle[] = +const SvxMSDffHandle mso_sptLeftArrowHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x100, 0x101, 10800, 10800, 0, 21600, 0, 10800 } }; -static const mso_CustomShape msoLeftArrow = +const mso_CustomShape msoLeftArrow = { const_cast<SvxMSDffVertPair*>(mso_sptLeftArrowVert), SAL_N_ELEMENTS( mso_sptLeftArrowVert ), const_cast<sal_uInt16*>(mso_sptLeftArrowSegm), sizeof( mso_sptLeftArrowSegm ) >> 1, @@ -758,25 +758,25 @@ static const mso_CustomShape msoLeftArrow = const_cast<SvxMSDffHandle*>(mso_sptLeftArrowHandle), SAL_N_ELEMENTS( mso_sptLeftArrowHandle ) // handles }; -static const SvxMSDffVertPair mso_sptDownArrowVert[] = // adjustment1: x 0 - 21600 +const SvxMSDffVertPair mso_sptDownArrowVert[] = // adjustment1: x 0 - 21600 { // adjustment2: y 0 - 10800 { 0 MSO_I, 0 }, { 0 MSO_I, 1 MSO_I }, { 0, 1 MSO_I }, { 10800, 21600 }, { 21600, 1 MSO_I }, { 2 MSO_I, 1 MSO_I }, { 2 MSO_I, 0 } }; -static const sal_uInt16 mso_sptDownArrowSegm[] = +const sal_uInt16 mso_sptDownArrowSegm[] = { 0x4000, 0x0006, 0x6001, 0x8000 }; -static const SvxMSDffTextRectangles mso_sptDownArrowTextRect[] = +const SvxMSDffTextRectangles mso_sptDownArrowTextRect[] = { { { 0 MSO_I, 0 }, { 2 MSO_I, 5 MSO_I } } }; -static const SvxMSDffHandle mso_sptDownArrowHandle[] = +const SvxMSDffHandle mso_sptDownArrowHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x101, 0x100, 10800, 10800, 0, 10800, 0, 21600 } }; -static const mso_CustomShape msoDownArrow = +const mso_CustomShape msoDownArrow = { const_cast<SvxMSDffVertPair*>(mso_sptDownArrowVert), SAL_N_ELEMENTS( mso_sptDownArrowVert ), const_cast<sal_uInt16*>(mso_sptDownArrowSegm), sizeof( mso_sptDownArrowSegm ) >> 1, @@ -789,29 +789,29 @@ static const mso_CustomShape msoDownArrow = const_cast<SvxMSDffHandle*>(mso_sptDownArrowHandle), SAL_N_ELEMENTS( mso_sptDownArrowHandle ) // handles }; -static const SvxMSDffVertPair mso_sptUpArrowVert[] = // adjustment1: x 0 - 21600 +const SvxMSDffVertPair mso_sptUpArrowVert[] = // adjustment1: x 0 - 21600 { // adjustment2: y 0 - 10800 { 0 MSO_I, 21600 }, { 0 MSO_I, 1 MSO_I }, { 0, 1 MSO_I }, { 10800, 0 }, { 21600, 1 MSO_I }, { 2 MSO_I, 1 MSO_I }, { 2 MSO_I, 21600 } }; -static const sal_uInt16 mso_sptUpArrowSegm[] = +const sal_uInt16 mso_sptUpArrowSegm[] = { 0x4000, 0x0006, 0x6001, 0x8000 }; -static const sal_Int32 mso_sptUpArrowDefault[] = +const sal_Int32 mso_sptUpArrowDefault[] = { 2, 5400, 5400 }; -static const SvxMSDffTextRectangles mso_sptUpArrowTextRect[] = +const SvxMSDffTextRectangles mso_sptUpArrowTextRect[] = { { { 0 MSO_I, 7 MSO_I }, { 2 MSO_I, 21600 } } }; -static const SvxMSDffHandle mso_sptUpArrowHandle[] = +const SvxMSDffHandle mso_sptUpArrowHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x101, 0x100, 10800, 10800, 0, 10800, 0, 21600 } }; -static const mso_CustomShape msoUpArrow = +const mso_CustomShape msoUpArrow = { const_cast<SvxMSDffVertPair*>(mso_sptUpArrowVert), SAL_N_ELEMENTS( mso_sptUpArrowVert ), const_cast<sal_uInt16*>(mso_sptUpArrowSegm), sizeof( mso_sptUpArrowSegm ) >> 1, @@ -824,17 +824,17 @@ static const mso_CustomShape msoUpArrow = const_cast<SvxMSDffHandle*>(mso_sptUpArrowHandle), SAL_N_ELEMENTS( mso_sptUpArrowHandle ) // handles }; -static const SvxMSDffVertPair mso_sptLeftRightArrowVert[] = // adjustment1: x 0 - 10800 +const SvxMSDffVertPair mso_sptLeftRightArrowVert[] = // adjustment1: x 0 - 10800 { // adjustment2: y 0 - 10800 { 0, 10800 }, { 0 MSO_I, 0 }, { 0 MSO_I, 1 MSO_I }, { 2 MSO_I, 1 MSO_I }, { 2 MSO_I, 0 }, { 21600, 10800 }, { 2 MSO_I, 21600 }, { 2 MSO_I, 3 MSO_I }, { 0 MSO_I, 3 MSO_I }, { 0 MSO_I, 21600 } }; -static const sal_uInt16 mso_sptLeftRightArrowSegm[] = +const sal_uInt16 mso_sptLeftRightArrowSegm[] = { 0x4000, 0x0009, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptDoubleArrowCalc[] = +const SvxMSDffCalculationData mso_sptDoubleArrowCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, @@ -847,20 +847,20 @@ static const SvxMSDffCalculationData mso_sptDoubleArrowCalc[] = { 0x6001, { DFF_Prop_adjust2Value, 0x407, 10800 } }, { 0x8000, { 21600, 0, 0x408 } } }; -static const sal_Int32 mso_sptLeftRightArrowDefault[] = +const sal_Int32 mso_sptLeftRightArrowDefault[] = { 2, 4300, 5400 }; -static const SvxMSDffTextRectangles mso_sptLeftRightArrowTextRect[] = +const SvxMSDffTextRectangles mso_sptLeftRightArrowTextRect[] = { { { 5 MSO_I, 1 MSO_I }, { 6 MSO_I, 3 MSO_I } } }; -static const SvxMSDffHandle mso_sptLeftRightArrowHandle[] = +const SvxMSDffHandle mso_sptLeftRightArrowHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x100, 0x101, 10800, 10800, 0, 10800, 0, 10800 } }; -static const mso_CustomShape msoLeftRightArrow = +const mso_CustomShape msoLeftRightArrow = { const_cast<SvxMSDffVertPair*>(mso_sptLeftRightArrowVert), SAL_N_ELEMENTS( mso_sptLeftRightArrowVert ), const_cast<sal_uInt16*>(mso_sptLeftRightArrowSegm), sizeof( mso_sptLeftRightArrowSegm ) >> 1, @@ -873,30 +873,30 @@ static const mso_CustomShape msoLeftRightArrow = const_cast<SvxMSDffHandle*>(mso_sptLeftRightArrowHandle), SAL_N_ELEMENTS( mso_sptLeftRightArrowHandle ) // handles }; -static const SvxMSDffVertPair mso_sptUpDownArrowVert[] = // adjustment1: x 0 - 10800 +const SvxMSDffVertPair mso_sptUpDownArrowVert[] = // adjustment1: x 0 - 10800 { // adjustment2: y 0 - 10800 { 0, 1 MSO_I }, { 10800, 0 }, { 21600, 1 MSO_I }, { 2 MSO_I, 1 MSO_I }, { 2 MSO_I, 3 MSO_I }, { 21600, 3 MSO_I }, { 10800, 21600 }, { 0, 3 MSO_I }, { 0 MSO_I, 3 MSO_I }, { 0 MSO_I, 1 MSO_I } }; -static const sal_uInt16 mso_sptUpDownArrowSegm[] = +const sal_uInt16 mso_sptUpDownArrowSegm[] = { 0x4000, 0x0009, 0x6001, 0x8000 }; -static const sal_Int32 mso_sptUpDownArrowDefault[] = +const sal_Int32 mso_sptUpDownArrowDefault[] = { 2, 5400, 4300 }; -static const SvxMSDffTextRectangles mso_sptUpDownArrowTextRect[] = +const SvxMSDffTextRectangles mso_sptUpDownArrowTextRect[] = { { { 0 MSO_I, 8 MSO_I }, { 2 MSO_I, 9 MSO_I } } }; -static const SvxMSDffHandle mso_sptUpDownArrowHandle[] = +const SvxMSDffHandle mso_sptUpDownArrowHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x100, 0x101, 10800, 10800, 0, 10800, 0, 10800 } }; -static const mso_CustomShape msoUpDownArrow = +const mso_CustomShape msoUpDownArrow = { const_cast<SvxMSDffVertPair*>(mso_sptUpDownArrowVert), SAL_N_ELEMENTS( mso_sptUpDownArrowVert ), const_cast<sal_uInt16*>(mso_sptUpDownArrowSegm), sizeof( mso_sptUpDownArrowSegm ) >> 1, @@ -909,7 +909,7 @@ static const mso_CustomShape msoUpDownArrow = const_cast<SvxMSDffHandle*>(mso_sptUpDownArrowHandle), SAL_N_ELEMENTS( mso_sptUpDownArrowHandle ) // handles }; -static const SvxMSDffVertPair mso_sptQuadArrowVert[] = // adjustment1: x 0 - 10800, adjustment2: x 0 - 10800 +const SvxMSDffVertPair mso_sptQuadArrowVert[] = // adjustment1: x 0 - 10800, adjustment2: x 0 - 10800 { // adjustment3: y 0 - 10800 { 0, 10800 }, { 0 MSO_I, 1 MSO_I }, { 0 MSO_I, 2 MSO_I }, { 2 MSO_I, 2 MSO_I }, { 2 MSO_I, 0 MSO_I }, { 1 MSO_I, 0 MSO_I }, { 10800, 0 }, { 3 MSO_I, 0 MSO_I }, @@ -918,11 +918,11 @@ static const SvxMSDffVertPair mso_sptQuadArrowVert[] = // adjustment1: x 0 - 10 { 4 MSO_I, 5 MSO_I }, { 3 MSO_I, 5 MSO_I }, { 10800, 21600 }, { 1 MSO_I, 5 MSO_I }, { 2 MSO_I, 5 MSO_I }, { 2 MSO_I, 4 MSO_I }, { 0 MSO_I, 4 MSO_I }, { 0 MSO_I, 3 MSO_I } }; -static const sal_uInt16 mso_sptQuadArrowSegm[] = +const sal_uInt16 mso_sptQuadArrowSegm[] = { 0x4000, 0x0017, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptQuadArrowCalc[] = +const SvxMSDffCalculationData mso_sptQuadArrowCalc[] = { { 0x2000, { DFF_Prop_adjust3Value, 0, 0 } }, { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, @@ -931,22 +931,22 @@ static const SvxMSDffCalculationData mso_sptQuadArrowCalc[] = { 0x8000, { 21600, 0, DFF_Prop_adjust2Value } }, { 0x8000, { 21600, 0, DFF_Prop_adjust3Value } } }; -static const sal_Int32 mso_sptQuadArrowDefault[] = +const sal_Int32 mso_sptQuadArrowDefault[] = { 3, 6500, 8600, 4300 }; -static const SvxMSDffTextRectangles mso_sptQuadArrowTextRect[] = // todo +const SvxMSDffTextRectangles mso_sptQuadArrowTextRect[] = // todo { { { 0, 0 }, { 21600, 21600 } } }; -static const SvxMSDffHandle mso_sptQuadArrowHandle[] = +const SvxMSDffHandle mso_sptQuadArrowHandle[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL | SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL, 0x101, 0x102, 10800, 10800, 0x100, 10800, 0, 0x100 }, { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL | SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL, 0x100, 0, 10800, 10800, 0x102, 0x101, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoQuadArrow = +const mso_CustomShape msoQuadArrow = { const_cast<SvxMSDffVertPair*>(mso_sptQuadArrowVert), SAL_N_ELEMENTS( mso_sptQuadArrowVert ), const_cast<sal_uInt16*>(mso_sptQuadArrowSegm), sizeof( mso_sptQuadArrowSegm ) >> 1, @@ -959,7 +959,7 @@ static const mso_CustomShape msoQuadArrow = const_cast<SvxMSDffHandle*>(mso_sptQuadArrowHandle), SAL_N_ELEMENTS( mso_sptQuadArrowHandle ) // handles }; -static const SvxMSDffVertPair mso_sptLeftRightUpArrowVert[] = // adjustment1: x 0 - 10800, adjustment2: x 0 - 10800 +const SvxMSDffVertPair mso_sptLeftRightUpArrowVert[] = // adjustment1: x 0 - 10800, adjustment2: x 0 - 10800 { // adjustment3: y 0 - 21600 { 10800, 0 }, { 3 MSO_I, 2 MSO_I }, { 4 MSO_I, 2 MSO_I }, { 4 MSO_I, 1 MSO_I }, { 5 MSO_I, 1 MSO_I }, { 5 MSO_I, 0 MSO_I }, { 21600, 10800 }, { 5 MSO_I, 3 MSO_I }, @@ -967,11 +967,11 @@ static const SvxMSDffVertPair mso_sptLeftRightUpArrowVert[] = // adjustment1: { 2 MSO_I, 0 MSO_I }, { 2 MSO_I, 1 MSO_I }, { 1 MSO_I, 1 MSO_I }, { 1 MSO_I, 2 MSO_I }, { 0 MSO_I, 2 MSO_I } }; -static const sal_uInt16 mso_sptLeftRightUpArrowSegm[] = +const sal_uInt16 mso_sptLeftRightUpArrowSegm[] = { 0x4000, 0x0010, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptLeftRightUpArrowCalc[] = +const SvxMSDffCalculationData mso_sptLeftRightUpArrowCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, // 0 { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, // 1 @@ -980,22 +980,22 @@ static const SvxMSDffCalculationData mso_sptLeftRightUpArrowCalc[] = { 0x8000, { 21600, 0, DFF_Prop_adjust2Value } }, // 4 { 0x8000, { 21600, 0, 0x0402 } } // 5 }; -static const sal_Int32 mso_sptLeftRightUpArrowDefault[] = +const sal_Int32 mso_sptLeftRightUpArrowDefault[] = { 3, 6500, 8600, 6200 }; -static const SvxMSDffTextRectangles mso_sptLeftRightUpArrowTextRect[] = // todo +const SvxMSDffTextRectangles mso_sptLeftRightUpArrowTextRect[] = // todo { { { 0, 0 }, { 21600, 21600 } } }; -static const SvxMSDffHandle mso_sptLeftRightUpArrowHandle[] = +const SvxMSDffHandle mso_sptLeftRightUpArrowHandle[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL | SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL, 0x101, 0x102, 10800, 10800, 0x100, 10800, 0, 0x100 }, { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL | SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL, 0x100, 0, 10800, 10800, 0x102, 0x101, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoLeftRightUpArrow = +const mso_CustomShape msoLeftRightUpArrow = { const_cast<SvxMSDffVertPair*>(mso_sptLeftRightUpArrowVert), SAL_N_ELEMENTS( mso_sptLeftRightUpArrowVert ), const_cast<sal_uInt16*>(mso_sptLeftRightUpArrowSegm), sizeof( mso_sptLeftRightUpArrowSegm ) >> 1, @@ -1008,17 +1008,17 @@ static const mso_CustomShape msoLeftRightUpArrow = const_cast<SvxMSDffHandle*>(mso_sptLeftRightUpArrowHandle), SAL_N_ELEMENTS( mso_sptLeftRightUpArrowHandle ) // handles }; -static const SvxMSDffVertPair mso_sptBentArrowVert[] = // adjustment1 : x 12427 - 21600 +const SvxMSDffVertPair mso_sptBentArrowVert[] = // adjustment1 : x 12427 - 21600 { // adjustment2 : y 0 - 6079 { 0, 21600 }, { 0, 12160 }, { 12427, 1 MSO_I }, { 0 MSO_I, 1 MSO_I }, { 0 MSO_I, 0 }, { 21600, 6079 }, { 0 MSO_I, 12158 }, { 0 MSO_I, 2 MSO_I }, { 12427, 2 MSO_I }, { 4 MSO_I, 12160 }, { 4 MSO_I, 21600 } }; -static const sal_uInt16 mso_sptBentArrowSegm[] = +const sal_uInt16 mso_sptBentArrowSegm[] = { 0x4000, 0x0001, 0xa801, 0x0006, 0xa701, 0x0001, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptBentArrowCalc[] = +const SvxMSDffCalculationData mso_sptBentArrowCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, @@ -1026,20 +1026,20 @@ static const SvxMSDffCalculationData mso_sptBentArrowCalc[] = { 0x8000, { 6079, 0, DFF_Prop_adjust2Value } }, { 0x2001, { 0x0403, 2, 1 } } }; -static const sal_Int32 mso_sptBentArrowDefault[] = +const sal_Int32 mso_sptBentArrowDefault[] = { 2, 15100, 2900 }; -static const SvxMSDffTextRectangles mso_sptBentArrowTextRect[] = // todo +const SvxMSDffTextRectangles mso_sptBentArrowTextRect[] = // todo { { { 0, 0 }, { 21600, 21600 } } }; -static const SvxMSDffHandle mso_sptBentArrowHandle[] = +const SvxMSDffHandle mso_sptBentArrowHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x100, 0x101, 10800, 10800, 12427, 21600, 0, 6079 } }; -static const mso_CustomShape msoBentArrow = +const mso_CustomShape msoBentArrow = { const_cast<SvxMSDffVertPair*>(mso_sptBentArrowVert), SAL_N_ELEMENTS( mso_sptBentArrowVert ), const_cast<sal_uInt16*>(mso_sptBentArrowSegm), sizeof( mso_sptBentArrowSegm ) >> 1, @@ -1052,7 +1052,7 @@ static const mso_CustomShape msoBentArrow = const_cast<SvxMSDffHandle*>(mso_sptBentArrowHandle), SAL_N_ELEMENTS( mso_sptBentArrowHandle ) // handles }; -static const SvxMSDffVertPair mso_sptUturnArrowVert[] = +const SvxMSDffVertPair mso_sptUturnArrowVert[] = { { 0, 21600 }, { 0, 8550 }, // pp { 0, 3540 }, { 4370, 0 }, { 9270, 0 }, // ccp @@ -1062,15 +1062,15 @@ static const SvxMSDffVertPair mso_sptUturnArrowVert[] = { 7770, 5850 }, { 6040, 6410 }, { 6110, 8520 }, // ccp { 6110, 21600 } }; -static const sal_uInt16 mso_sptUturnArrowSegm[] = +const sal_uInt16 mso_sptUturnArrowSegm[] = { 0x4000, 0x0001, 0x2002, 0x0004, 0x2002, 0x0001, 0x6000, 0x8000 }; -static const SvxMSDffTextRectangles mso_sptUturnArrowTextRect[] = +const SvxMSDffTextRectangles mso_sptUturnArrowTextRect[] = { { { 0, 8280 }, { 6110, 21600 } } }; -static const mso_CustomShape msoUturnArrow = +const mso_CustomShape msoUturnArrow = { const_cast<SvxMSDffVertPair*>(mso_sptUturnArrowVert), SAL_N_ELEMENTS( mso_sptUturnArrowVert ), const_cast<sal_uInt16*>(mso_sptUturnArrowSegm), sizeof( mso_sptUturnArrowSegm ) >> 1, @@ -1083,17 +1083,17 @@ static const mso_CustomShape msoUturnArrow = nullptr, 0 // handles }; -static const SvxMSDffVertPair mso_sptLeftUpArrowVert[] = // adjustment1 : x 0 - 21600, adjustment2 : x 0 - 21600 +const SvxMSDffVertPair mso_sptLeftUpArrowVert[] = // adjustment1 : x 0 - 21600, adjustment2 : x 0 - 21600 { // adjustment3 : y 0 - 21600 { 0, 5 MSO_I }, { 2 MSO_I, 0 MSO_I }, { 2 MSO_I, 7 MSO_I }, { 7 MSO_I, 7 MSO_I }, { 7 MSO_I, 2 MSO_I }, { 0 MSO_I, 2 MSO_I }, { 5 MSO_I, 0 }, { 21600, 2 MSO_I }, { 1 MSO_I, 2 MSO_I }, { 1 MSO_I, 1 MSO_I }, { 2 MSO_I, 1 MSO_I }, { 2 MSO_I, 21600 } }; -static const sal_uInt16 mso_sptLeftUpArrowSegm[] = +const sal_uInt16 mso_sptLeftUpArrowSegm[] = { 0x4000, 0x000b, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptLeftUpArrowCalc[] = +const SvxMSDffCalculationData mso_sptLeftUpArrowCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, // 0 { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, // 1 @@ -1106,23 +1106,23 @@ static const SvxMSDffCalculationData mso_sptLeftUpArrowCalc[] = { 0x8000, { 21600, 0, 0x406 } }, // 8 { 0xa000, { 0x408, 0, 0x406 } } // 9 }; -static const sal_Int32 mso_sptLeftUpArrowDefault[] = +const sal_Int32 mso_sptLeftUpArrowDefault[] = { 3, 9340, 18500, 6200 }; -static const SvxMSDffTextRectangles mso_sptLeftUpArrowTextRect[] = +const SvxMSDffTextRectangles mso_sptLeftUpArrowTextRect[] = { { { 2 MSO_I, 7 MSO_I }, { 1 MSO_I, 1 MSO_I } }, { { 7 MSO_I, 2 MSO_I }, { 1 MSO_I, 1 MSO_I } } }; -static const SvxMSDffHandle mso_sptLeftUpArrowHandle[] = +const SvxMSDffHandle mso_sptLeftUpArrowHandle[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL | SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL, 0x101, 0x102, 10800, 10800, 3 + 5, 21600, 0, 0x100 }, { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL | SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL, 0x100, 0, 10800, 10800, 0x102, 3 + 9, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoLeftUpArrow = +const mso_CustomShape msoLeftUpArrow = { const_cast<SvxMSDffVertPair*>(mso_sptLeftUpArrowVert), SAL_N_ELEMENTS( mso_sptLeftUpArrowVert ), const_cast<sal_uInt16*>(mso_sptLeftUpArrowSegm), sizeof( mso_sptLeftUpArrowSegm ) >> 1, @@ -1135,17 +1135,17 @@ static const mso_CustomShape msoLeftUpArrow = const_cast<SvxMSDffHandle*>(mso_sptLeftUpArrowHandle), SAL_N_ELEMENTS( mso_sptLeftUpArrowHandle ) // handles }; -static const SvxMSDffVertPair mso_sptBentUpArrowVert[] = // adjustment1 : x 0 - 21600, adjustment2 : x 0 - 21600 +const SvxMSDffVertPair mso_sptBentUpArrowVert[] = // adjustment1 : x 0 - 21600, adjustment2 : x 0 - 21600 { // adjustment3 : y 0 - 21600 { 0, 8 MSO_I }, { 7 MSO_I, 8 MSO_I }, { 7 MSO_I, 2 MSO_I }, { 0 MSO_I, 2 MSO_I }, { 5 MSO_I, 0 }, { 21600, 2 MSO_I }, { 1 MSO_I, 2 MSO_I }, { 1 MSO_I, 21600 }, { 0, 21600 } }; -static const sal_uInt16 mso_sptBentUpArrowSegm[] = +const sal_uInt16 mso_sptBentUpArrowSegm[] = { 0x4000, 0x0008, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptBentUpArrowCalc[] = +const SvxMSDffCalculationData mso_sptBentUpArrowCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, // 0 { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, // 1 @@ -1159,23 +1159,23 @@ static const SvxMSDffCalculationData mso_sptBentUpArrowCalc[] = { 0x8000, { 21600, 0, 0x406 } }, // 9 { 0xa000, { 0x409, 0, 0x406 } } // a }; -static const sal_Int32 mso_sptBentUpArrowDefault[] = +const sal_Int32 mso_sptBentUpArrowDefault[] = { 3, 9340, 18500, 7200 }; -static const SvxMSDffTextRectangles mso_sptBentUpArrowTextRect[] = +const SvxMSDffTextRectangles mso_sptBentUpArrowTextRect[] = { { { 2 MSO_I, 7 MSO_I }, { 1 MSO_I, 1 MSO_I } }, { { 7 MSO_I, 2 MSO_I }, { 1 MSO_I, 1 MSO_I } } }; -static const SvxMSDffHandle mso_sptBentUpArrowHandle[] = +const SvxMSDffHandle mso_sptBentUpArrowHandle[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL | SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL, 0x101, 0x102, 10800, 10800, 3 + 5, 21600, 0, 0x100 }, { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL | SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL, 0x100, 0, 10800, 10800, 0x102, 3 + 10, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoBentUpArrow = +const mso_CustomShape msoBentUpArrow = { const_cast<SvxMSDffVertPair*>(mso_sptBentUpArrowVert), SAL_N_ELEMENTS( mso_sptBentUpArrowVert ), const_cast<sal_uInt16*>(mso_sptBentUpArrowSegm), sizeof( mso_sptBentUpArrowSegm ) >> 1, @@ -1188,7 +1188,7 @@ static const mso_CustomShape msoBentUpArrow = const_cast<SvxMSDffHandle*>(mso_sptBentUpArrowHandle), SAL_N_ELEMENTS( mso_sptBentUpArrowHandle ) }; -static const SvxMSDffVertPair mso_sptCurvedRightVert[] = +const SvxMSDffVertPair mso_sptCurvedRightVert[] = { { 0, 0 }, { 23 MSO_I, 3 MSO_I }, { 22 MSO_I, 0 }, { 0, 4 MSO_I }, { 0, 15 MSO_I }, { 23 MSO_I, 1 MSO_I }, { 0, 7 MSO_I }, { 2 MSO_I, 13 MSO_I }, { 2 MSO_I, 14 MSO_I }, { 22 MSO_I, 8 MSO_I }, { 2 MSO_I, 12 MSO_I }, @@ -1197,7 +1197,7 @@ static const SvxMSDffVertPair mso_sptCurvedRightVert[] = { 0, 0 }, { 23 MSO_I, 3 MSO_I }, { 0, 4 MSO_I }, { 26 MSO_I, 17 MSO_I }, { 0, 15 MSO_I }, { 23 MSO_I, 1 MSO_I }, { 26 MSO_I, 17 MSO_I }, { 22 MSO_I, 15 MSO_I } }; -static const sal_uInt16 mso_sptCurvedRightSegm[] = +const sal_uInt16 mso_sptCurvedRightSegm[] = { 0xa408, 0x0003, @@ -1210,7 +1210,7 @@ static const sal_uInt16 mso_sptCurvedRightSegm[] = 0x6000, 0x8000 }; -static const SvxMSDffCalculationData mso_sptCurvedRightCalc[] = +const SvxMSDffCalculationData mso_sptCurvedRightCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, @@ -1262,19 +1262,19 @@ static const SvxMSDffCalculationData mso_sptCurvedRightCalc[] = { 0x0001, { 21600, 2195, 16384 } }, { 0x0001, { 21600, 14189, 16384 } } }; -static const sal_Int32 mso_sptCurvedRightDefault[] = +const sal_Int32 mso_sptCurvedRightDefault[] = { 3, 12960, 19440, 14400 }; -static const SvxMSDffTextRectangles mso_sptCurvedRightTextRect[] = +const SvxMSDffTextRectangles mso_sptCurvedRightTextRect[] = { { { 47 MSO_I, 45 MSO_I }, { 48 MSO_I, 46 MSO_I } } }; -static const SvxMSDffVertPair mso_sptCurvedRightGluePoints[] = +const SvxMSDffVertPair mso_sptCurvedRightGluePoints[] = { { 0, 17 MSO_I }, { 2 MSO_I, 14 MSO_I }, { 22 MSO_I, 8 MSO_I }, { 2 MSO_I, 12 MSO_I }, { 22 MSO_I, 16 MSO_I } }; -static const SvxMSDffHandle mso_sptCurvedRightHandles[] = +const SvxMSDffHandle mso_sptCurvedRightHandles[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_Y_MIN_IS_SPECIAL | SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL, 21600, 0x100, 10800, 10800, 0, 10800, 3 + 40, 3 + 29 }, @@ -1283,7 +1283,7 @@ static const SvxMSDffHandle mso_sptCurvedRightHandles[] = { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL | SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL, 0x102, 21600, 10800, 10800, 3 + 44, 3 + 22, 3375, 21600 } }; -static const mso_CustomShape msoCurvedRightArrow = +const mso_CustomShape msoCurvedRightArrow = { const_cast<SvxMSDffVertPair*>(mso_sptCurvedRightVert), SAL_N_ELEMENTS( mso_sptCurvedRightVert ), const_cast<sal_uInt16*>(mso_sptCurvedRightSegm), sizeof( mso_sptCurvedRightSegm ) >> 1, @@ -1296,7 +1296,7 @@ static const mso_CustomShape msoCurvedRightArrow = const_cast<SvxMSDffHandle*>(mso_sptCurvedRightHandles), SAL_N_ELEMENTS( mso_sptCurvedRightHandles ) }; -static const SvxMSDffVertPair mso_sptCurvedDownVert[] = +const SvxMSDffVertPair mso_sptCurvedDownVert[] = { { 0, 0 }, { 3 MSO_I, 23 MSO_I }, { 0, 22 MSO_I }, { 4 MSO_I, 0 }, { 15 MSO_I, 0 }, { 1 MSO_I, 23 MSO_I }, { 7 MSO_I, 0 }, { 13 MSO_I, 2 MSO_I }, @@ -1307,7 +1307,7 @@ static const SvxMSDffVertPair mso_sptCurvedDownVert[] = { 0, 0 }, { 3 MSO_I, 23 MSO_I }, { 4 MSO_I, 0 }, { 17 MSO_I, 26 MSO_I }, { 15 MSO_I, 0 }, { 1 MSO_I, 23 MSO_I }, { 17 MSO_I, 26 MSO_I }, { 15 MSO_I, 22 MSO_I } }; -static const sal_uInt16 mso_sptCurvedDownSegm[] = +const sal_uInt16 mso_sptCurvedDownSegm[] = { 0xa608, 0x0003, @@ -1320,15 +1320,15 @@ static const sal_uInt16 mso_sptCurvedDownSegm[] = 0x6000, 0x8000 }; -static const SvxMSDffTextRectangles mso_sptCurvedDownTextRect[] = +const SvxMSDffTextRectangles mso_sptCurvedDownTextRect[] = { { { 45 MSO_I, 47 MSO_I }, { 46 MSO_I, 48 MSO_I } } }; -static const SvxMSDffVertPair mso_sptCurvedDownGluePoints[] = +const SvxMSDffVertPair mso_sptCurvedDownGluePoints[] = { { 17 MSO_I, 0 }, { 16 MSO_I, 22 MSO_I }, { 12 MSO_I, 2 MSO_I }, { 8 MSO_I, 22 MSO_I }, { 14 MSO_I, 2 MSO_I } }; -static const SvxMSDffHandle mso_sptCurvedDownHandles[] = +const SvxMSDffHandle mso_sptCurvedDownHandles[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL | SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL, 0x100, 21600, 10800, 10800, 3 + 40, 3 + 29, 0, 10800 }, @@ -1338,7 +1338,7 @@ static const SvxMSDffHandle mso_sptCurvedDownHandles[] = 21600, 0x102, 10800, 10800, 3375, 21600, 3 + 44, 3 + 22 } }; -static const mso_CustomShape msoCurvedDownArrow = +const mso_CustomShape msoCurvedDownArrow = { const_cast<SvxMSDffVertPair*>(mso_sptCurvedDownVert), SAL_N_ELEMENTS( mso_sptCurvedDownVert ), const_cast<sal_uInt16*>(mso_sptCurvedDownSegm), sizeof( mso_sptCurvedDownSegm ) >> 1, @@ -1351,7 +1351,7 @@ static const mso_CustomShape msoCurvedDownArrow = const_cast<SvxMSDffHandle*>(mso_sptCurvedDownHandles), SAL_N_ELEMENTS( mso_sptCurvedDownHandles ) }; -static const SvxMSDffVertPair mso_sptCurvedUpVert[] = +const SvxMSDffVertPair mso_sptCurvedUpVert[] = { { 0, 22 MSO_I }, { 3 MSO_I, 21 MSO_I }, { 0, 0 }, { 4 MSO_I, 21 MSO_I }, { 14 MSO_I, 22 MSO_I }, { 1 MSO_I, 21 MSO_I }, { 7 MSO_I, 21 MSO_I }, @@ -1362,7 +1362,7 @@ static const SvxMSDffVertPair mso_sptCurvedUpVert[] = { 14 MSO_I, 22 MSO_I }, { 1 MSO_I, 21 MSO_I }, { 7 MSO_I, 21 MSO_I }, { 16 MSO_I, 24 MSO_I }, { 14 MSO_I, 22 MSO_I }, { 1 MSO_I, 21 MSO_I }, { 16 MSO_I, 24 MSO_I }, { 14 MSO_I, 0 } }; -static const sal_uInt16 mso_sptCurvedUpSegm[] = +const sal_uInt16 mso_sptCurvedUpSegm[] = { 0xa408, 0x0003, @@ -1375,7 +1375,7 @@ static const sal_uInt16 mso_sptCurvedUpSegm[] = 0x6000, 0x8000 }; -static const SvxMSDffCalculationData mso_sptCurvedUpCalc[] = +const SvxMSDffCalculationData mso_sptCurvedUpCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, @@ -1423,19 +1423,19 @@ static const SvxMSDffCalculationData mso_sptCurvedUpCalc[] = { 0x0001, { 21600, 2195, 16384 } }, { 0x0001, { 21600, 14189, 16384 } } }; -static const sal_Int32 mso_sptCurvedUpDefault[] = +const sal_Int32 mso_sptCurvedUpDefault[] = { 3, 12960, 19440, 7200 }; -static const SvxMSDffTextRectangles mso_sptCurvedUpTextRect[] = +const SvxMSDffTextRectangles mso_sptCurvedUpTextRect[] = { { { 41 MSO_I, 43 MSO_I }, { 42 MSO_I, 44 MSO_I } } }; -static const SvxMSDffVertPair mso_sptCurvedUpGluePoints[] = +const SvxMSDffVertPair mso_sptCurvedUpGluePoints[] = { { 8 MSO_I, 0 }, { 11 MSO_I, 2 MSO_I }, { 15 MSO_I, 0 }, { 16 MSO_I, 21 MSO_I }, { 13 MSO_I, 2 MSO_I } }; -static const SvxMSDffHandle mso_sptCurvedUpHandles[] = +const SvxMSDffHandle mso_sptCurvedUpHandles[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL | SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL, 0x100, 0, 10800, 10800, 3 + 37, 3 + 27, 0, 10800 }, @@ -1444,7 +1444,7 @@ static const SvxMSDffHandle mso_sptCurvedUpHandles[] = { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL, 21600, 0x102, 10800, 10800, 3375, 21600, 0, 3 + 40 } }; -static const mso_CustomShape msoCurvedUpArrow = +const mso_CustomShape msoCurvedUpArrow = { const_cast<SvxMSDffVertPair*>(mso_sptCurvedUpVert), SAL_N_ELEMENTS( mso_sptCurvedUpVert ), const_cast<sal_uInt16*>(mso_sptCurvedUpSegm), sizeof( mso_sptCurvedUpSegm ) >> 1, @@ -1457,7 +1457,7 @@ static const mso_CustomShape msoCurvedUpArrow = const_cast<SvxMSDffHandle*>(mso_sptCurvedUpHandles), SAL_N_ELEMENTS( mso_sptCurvedUpHandles ) }; -static const SvxMSDffVertPair mso_sptCurvedLeftVert[] = +const SvxMSDffVertPair mso_sptCurvedLeftVert[] = { { 22 MSO_I, 0 }, { 21 MSO_I, 3 MSO_I }, { 0, 0 }, { 21 MSO_I, 4 MSO_I }, { 22 MSO_I, 14 MSO_I }, { 21 MSO_I, 1 MSO_I }, { 21 MSO_I, 7 MSO_I }, { 2 MSO_I, 12 MSO_I }, @@ -1468,7 +1468,7 @@ static const SvxMSDffVertPair mso_sptCurvedLeftVert[] = { 22 MSO_I, 14 MSO_I }, { 21 MSO_I, 1 MSO_I }, { 21 MSO_I, 7 MSO_I }, { 24 MSO_I, 16 MSO_I }, { 22 MSO_I, 14 MSO_I }, { 21 MSO_I, 1 MSO_I }, { 24 MSO_I, 16 MSO_I }, { 0, 14 MSO_I } }; -static const sal_uInt16 mso_sptCurvedLeftSegm[] = +const sal_uInt16 mso_sptCurvedLeftSegm[] = { 0xa608, 0x0003, @@ -1480,15 +1480,15 @@ static const sal_uInt16 mso_sptCurvedLeftSegm[] = 0x6000, 0x8000 }; -static const SvxMSDffTextRectangles mso_sptCurvedLeftTextRect[] = +const SvxMSDffTextRectangles mso_sptCurvedLeftTextRect[] = { { { 43 MSO_I, 41 MSO_I }, { 44 MSO_I, 42 MSO_I } } }; -static const SvxMSDffVertPair mso_sptCurvedLeftGluePoints[] = +const SvxMSDffVertPair mso_sptCurvedLeftGluePoints[] = { { 0, 15 MSO_I }, { 2 MSO_I, 11 MSO_I }, { 0, 8 MSO_I }, { 2 MSO_I, 13 MSO_I }, { 21 MSO_I, 16 MSO_I } }; -static const SvxMSDffHandle mso_sptCurvedLeftHandles[] = +const SvxMSDffHandle mso_sptCurvedLeftHandles[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_Y_MIN_IS_SPECIAL | SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL, 0, 0x100, 10800, 10800, 0, 10800, 3 + 37, 3 + 27 }, @@ -1497,7 +1497,7 @@ static const SvxMSDffHandle mso_sptCurvedLeftHandles[] = { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL, 0x102, 21600, 10800, 10800, 0, 3 + 40, 3375, 21600 } }; -static const mso_CustomShape msoCurvedLeftArrow = +const mso_CustomShape msoCurvedLeftArrow = { const_cast<SvxMSDffVertPair*>(mso_sptCurvedLeftVert), SAL_N_ELEMENTS( mso_sptCurvedLeftVert ), const_cast<sal_uInt16*>(mso_sptCurvedLeftSegm), sizeof( mso_sptCurvedLeftSegm ) >> 1, @@ -1510,20 +1510,20 @@ static const mso_CustomShape msoCurvedLeftArrow = const_cast<SvxMSDffHandle*>(mso_sptCurvedLeftHandles), SAL_N_ELEMENTS( mso_sptCurvedLeftHandles ) }; -static const SvxMSDffVertPair mso_sptStripedRightArrowVert[] = // adjustment1 : x 3375 - 21600 +const SvxMSDffVertPair mso_sptStripedRightArrowVert[] = // adjustment1 : x 3375 - 21600 { // adjustment2 : y 0 - 10800 { 3375, 0 MSO_I }, { 1 MSO_I, 0 MSO_I }, { 1 MSO_I, 0 }, { 21600, 10800 }, { 1 MSO_I, 21600 }, { 1 MSO_I, 2 MSO_I }, { 3375, 2 MSO_I }, { 0, 0 MSO_I }, { 675, 0 MSO_I }, { 675, 2 MSO_I }, { 0, 2 MSO_I }, { 1350, 0 MSO_I }, { 2700, 0 MSO_I }, { 2700, 2 MSO_I }, { 1350, 2 MSO_I } }; -static const sal_uInt16 mso_sptStripedRightArrowSegm[] = +const sal_uInt16 mso_sptStripedRightArrowSegm[] = { 0x4000, 0x0006, 0x6001, 0x8000, 0x4000, 0x0003, 0x6001, 0x8000, 0x4000, 0x0003, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptStripedRightArrowCalc[] = +const SvxMSDffCalculationData mso_sptStripedRightArrowCalc[] = { { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, @@ -1532,16 +1532,16 @@ static const SvxMSDffCalculationData mso_sptStripedRightArrowCalc[] = { 0x6001, { 0x403, 0x400, 10800 } }, { 0x6000, { 0x401, 0x404, 0 } } }; -static const SvxMSDffTextRectangles mso_sptStripedRightArrowTextRect[] = +const SvxMSDffTextRectangles mso_sptStripedRightArrowTextRect[] = { { { 3375, 0 MSO_I }, { 5 MSO_I, 2 MSO_I } } }; -static const SvxMSDffHandle mso_sptStripedRightArrowHandle[] = +const SvxMSDffHandle mso_sptStripedRightArrowHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x100, 0x101, 10800, 10800, 3375, 21600, 0, 10800 } }; -static const mso_CustomShape msoStripedRightArrow = +const mso_CustomShape msoStripedRightArrow = { const_cast<SvxMSDffVertPair*>(mso_sptStripedRightArrowVert), SAL_N_ELEMENTS( mso_sptStripedRightArrowVert ), const_cast<sal_uInt16*>(mso_sptStripedRightArrowSegm), sizeof( mso_sptStripedRightArrowSegm ) >> 1, @@ -1554,12 +1554,12 @@ static const mso_CustomShape msoStripedRightArrow = const_cast<SvxMSDffHandle*>(mso_sptStripedRightArrowHandle), SAL_N_ELEMENTS( mso_sptStripedRightArrowHandle ) }; -static const SvxMSDffVertPair mso_sptNotchedRightArrowVert[] = // adjustment1 : x 0 - 21600 (default 16200) +const SvxMSDffVertPair mso_sptNotchedRightArrowVert[] = // adjustment1 : x 0 - 21600 (default 16200) { // adjustment2 : y 0 - 10800 (default 5400) { 0, 1 MSO_I }, { 0 MSO_I, 1 MSO_I }, { 0 MSO_I, 0 }, { 21600, 10800 }, { 0 MSO_I, 21600 }, { 0 MSO_I, 2 MSO_I }, { 0, 2 MSO_I }, { 5 MSO_I, 10800 }, { 0, 1 MSO_I } }; -static const SvxMSDffCalculationData mso_sptNotchedRightArrowCalc[] = +const SvxMSDffCalculationData mso_sptNotchedRightArrowCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, @@ -1569,16 +1569,16 @@ static const SvxMSDffCalculationData mso_sptNotchedRightArrowCalc[] = { 0x6001, { 0x403, 0x404, 10800 } }, { 0x8000, { 21600, 0, 0x405 }} }; -static const SvxMSDffTextRectangles mso_sptNotchedRightArrowTextRect[] = // todo +const SvxMSDffTextRectangles mso_sptNotchedRightArrowTextRect[] = // todo { { { 5 MSO_I, 1 MSO_I }, { 6 MSO_I, 2 MSO_I } } }; -static const SvxMSDffHandle mso_sptNotchedRightArrowHandle[] = +const SvxMSDffHandle mso_sptNotchedRightArrowHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x100, 0x101, 10800, 10800, 0, 21600, 0, 10800 } }; -static const mso_CustomShape msoNotchedRightArrow = +const mso_CustomShape msoNotchedRightArrow = { const_cast<SvxMSDffVertPair*>(mso_sptNotchedRightArrowVert), SAL_N_ELEMENTS( mso_sptNotchedRightArrowVert ), nullptr, 0, @@ -1591,33 +1591,33 @@ static const mso_CustomShape msoNotchedRightArrow = const_cast<SvxMSDffHandle*>(mso_sptNotchedRightArrowHandle), SAL_N_ELEMENTS( mso_sptNotchedRightArrowHandle ) }; -static const SvxMSDffVertPair mso_sptHomePlateVert[] = // adjustment1 : x 0 - 21600 +const SvxMSDffVertPair mso_sptHomePlateVert[] = // adjustment1 : x 0 - 21600 { { 0, 0 }, { 0 MSO_I, 0 }, { 21600, 10800 }, { 0 MSO_I, 21600 }, { 0, 21600 } }; -static const sal_uInt16 mso_sptHomePlateSegm[] = +const sal_uInt16 mso_sptHomePlateSegm[] = { 0x4000, 0x0004, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptHomePlateCalc[] = +const SvxMSDffCalculationData mso_sptHomePlateCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } } }; -static const sal_Int32 mso_sptHomePlateDefault[] = +const sal_Int32 mso_sptHomePlateDefault[] = { 1, 16200 }; -static const SvxMSDffTextRectangles mso_sptHomePlateTextRect[] = // todo +const SvxMSDffTextRectangles mso_sptHomePlateTextRect[] = // todo { { { 0, 0 }, { 21600, 21600 } } }; -static const SvxMSDffHandle mso_sptHomePlateHandle[] = +const SvxMSDffHandle mso_sptHomePlateHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x100, 0, 10800, 10800, 0, 21600, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoHomePlate = +const mso_CustomShape msoHomePlate = { const_cast<SvxMSDffVertPair*>(mso_sptHomePlateVert), SAL_N_ELEMENTS( mso_sptHomePlateVert ), const_cast<sal_uInt16*>(mso_sptHomePlateSegm), sizeof( mso_sptHomePlateSegm ) >> 1, @@ -1630,34 +1630,34 @@ static const mso_CustomShape msoHomePlate = const_cast<SvxMSDffHandle*>(mso_sptHomePlateHandle), SAL_N_ELEMENTS( mso_sptHomePlateHandle ) }; -static const SvxMSDffVertPair mso_sptChevronVert[] = // adjustment1 : x 0 - 21600 +const SvxMSDffVertPair mso_sptChevronVert[] = // adjustment1 : x 0 - 21600 { { 0, 0 }, { 0 MSO_I, 0 }, { 21600, 10800 }, { 0 MSO_I, 21600 }, { 0, 21600 }, { 1 MSO_I, 10800 } }; -static const sal_uInt16 mso_sptChevronSegm[] = +const sal_uInt16 mso_sptChevronSegm[] = { 0x4000, 0x0005, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptChevronCalc[] = +const SvxMSDffCalculationData mso_sptChevronCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x8000, { 21600, 0, 0x0400 } } }; -static const sal_Int32 mso_sptChevronDefault[] = +const sal_Int32 mso_sptChevronDefault[] = { 1, 16200 }; -static const SvxMSDffTextRectangles mso_sptChevronTextRect[] = // todo +const SvxMSDffTextRectangles mso_sptChevronTextRect[] = // todo { { { 0, 0 }, { 21600, 21600 } } }; -static const SvxMSDffHandle mso_sptChevronHandle[] = +const SvxMSDffHandle mso_sptChevronHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x100, 0, 10800, 10800, 0, 21600, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoChevron = +const mso_CustomShape msoChevron = { const_cast<SvxMSDffVertPair*>(mso_sptChevronVert), SAL_N_ELEMENTS( mso_sptChevronVert ), const_cast<sal_uInt16*>(mso_sptChevronSegm), sizeof( mso_sptChevronSegm ) >> 1, @@ -1670,17 +1670,17 @@ static const mso_CustomShape msoChevron = const_cast<SvxMSDffHandle*>(mso_sptChevronHandle), SAL_N_ELEMENTS( mso_sptChevronHandle ) }; -static const SvxMSDffVertPair mso_sptRightArrowCalloutVert[] = // adjustment1 : x 0 - 21000 +const SvxMSDffVertPair mso_sptRightArrowCalloutVert[] = // adjustment1 : x 0 - 21000 { // adjustment2 : y 0 - 10800 { 0, 0 }, { 0 MSO_I, 0 }, { 0 MSO_I, 3 MSO_I }, { 2 MSO_I, 3 MSO_I }, { 2 MSO_I, 1 MSO_I }, { 21600, 10800 }, { 2 MSO_I, 4 MSO_I }, { 2 MSO_I, 5 MSO_I }, { 0 MSO_I, 5 MSO_I }, { 0 MSO_I, 21600 }, { 0, 21600 } }; -static const sal_uInt16 mso_sptRightArrowCalloutSegm[] = +const sal_uInt16 mso_sptRightArrowCalloutSegm[] = { 0x4000, 0x000a, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptRightArrowCalloutCalc[] = +const SvxMSDffCalculationData mso_sptRightArrowCalloutCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, @@ -1689,15 +1689,15 @@ static const SvxMSDffCalculationData mso_sptRightArrowCalloutCalc[] = { 0x8000, { 21600, 0, 0x0401 } }, { 0x8000, { 21600, 0, 0x0403 } } }; -static const sal_Int32 mso_sptRightArrowCalloutDefault[] = +const sal_Int32 mso_sptRightArrowCalloutDefault[] = { 4, 14400, 5400, 18000, 8100 }; -static const SvxMSDffTextRectangles mso_sptRightArrowCalloutTextRect[] = +const SvxMSDffTextRectangles mso_sptRightArrowCalloutTextRect[] = { { { 0, 0 }, { 0 MSO_I, 21600 } } }; -static const SvxMSDffHandle mso_sptRightArrowCalloutHandle[] = +const SvxMSDffHandle mso_sptRightArrowCalloutHandle[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL, 0x100, 0, 10800, 10800, 0, 0x102, MIN_INT32, 0x7fffffff }, @@ -1706,7 +1706,7 @@ static const SvxMSDffHandle mso_sptRightArrowCalloutHandle[] = { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL, 1, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 0x103 } }; -static const mso_CustomShape msoRightArrowCallout = +const mso_CustomShape msoRightArrowCallout = { const_cast<SvxMSDffVertPair*>(mso_sptRightArrowCalloutVert), SAL_N_ELEMENTS( mso_sptRightArrowCalloutVert ), const_cast<sal_uInt16*>(mso_sptRightArrowCalloutSegm), sizeof( mso_sptRightArrowCalloutSegm ) >> 1, @@ -1719,17 +1719,17 @@ static const mso_CustomShape msoRightArrowCallout = const_cast<SvxMSDffHandle*>(mso_sptRightArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptRightArrowCalloutHandle ) }; -static const SvxMSDffVertPair mso_sptLeftArrowCalloutVert[] = // adjustment1 : x 0 - 21600, adjustment2 : y 0 - 10800 +const SvxMSDffVertPair mso_sptLeftArrowCalloutVert[] = // adjustment1 : x 0 - 21600, adjustment2 : y 0 - 10800 { // adjustment3 : x 0 - 21600, adjustment4 : y 0 - 10800 { 0 MSO_I, 0 }, { 21600, 0 }, { 21600, 21600 }, { 0 MSO_I, 21600 }, { 0 MSO_I, 5 MSO_I }, { 2 MSO_I, 5 MSO_I }, { 2 MSO_I, 4 MSO_I }, { 0, 10800 }, { 2 MSO_I, 1 MSO_I }, { 2 MSO_I, 3 MSO_I }, { 0 MSO_I, 3 MSO_I } }; -static const sal_uInt16 mso_sptLeftArrowCalloutSegm[] = +const sal_uInt16 mso_sptLeftArrowCalloutSegm[] = { 0x4000, 0x000a, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptLeftArrowCalloutCalc[] = +const SvxMSDffCalculationData mso_sptLeftArrowCalloutCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, @@ -1738,15 +1738,15 @@ static const SvxMSDffCalculationData mso_sptLeftArrowCalloutCalc[] = { 0x8000, { 21600, 0, 0x0401 } }, { 0x8000, { 21600, 0, 0x0403 } } }; -static const sal_Int32 mso_sptLeftArrowCalloutDefault[] = +const sal_Int32 mso_sptLeftArrowCalloutDefault[] = { 4, 7200, 5400, 3600, 8100 }; -static const SvxMSDffTextRectangles mso_sptLeftArrowCalloutTextRect[] = +const SvxMSDffTextRectangles mso_sptLeftArrowCalloutTextRect[] = { { { 0 MSO_I, 0 }, { 21600, 21600 } } }; -static const SvxMSDffHandle mso_sptLeftArrowCalloutHandle[] = +const SvxMSDffHandle mso_sptLeftArrowCalloutHandle[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL, 0x100, 0, 10800, 10800, 0x102, 21600, MIN_INT32, 0x7fffffff }, @@ -1755,7 +1755,7 @@ static const SvxMSDffHandle mso_sptLeftArrowCalloutHandle[] = { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL, 0, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 0x103 } }; -static const mso_CustomShape msoLeftArrowCallout = +const mso_CustomShape msoLeftArrowCallout = { const_cast<SvxMSDffVertPair*>(mso_sptLeftArrowCalloutVert), SAL_N_ELEMENTS( mso_sptLeftArrowCalloutVert ), const_cast<sal_uInt16*>(mso_sptLeftArrowCalloutSegm), sizeof( mso_sptLeftArrowCalloutSegm ) >> 1, @@ -1768,17 +1768,17 @@ static const mso_CustomShape msoLeftArrowCallout = const_cast<SvxMSDffHandle*>(mso_sptLeftArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptLeftArrowCalloutHandle ) }; -static const SvxMSDffVertPair mso_sptUpArrowCalloutVert[] = +const SvxMSDffVertPair mso_sptUpArrowCalloutVert[] = { { 21600, 0 MSO_I }, { 21600, 21600 }, { 0, 21600 }, { 0, 0 MSO_I }, { 3 MSO_I, 0 MSO_I }, { 3 MSO_I, 2 MSO_I }, { 1 MSO_I, 2 MSO_I }, { 10800, 0 }, { 4 MSO_I, 2 MSO_I }, { 5 MSO_I, 2 MSO_I }, { 5 MSO_I, 0 MSO_I } }; -static const sal_uInt16 mso_sptUpArrowCalloutSegm[] = +const sal_uInt16 mso_sptUpArrowCalloutSegm[] = { 0x4000, 0x000a, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptUpArrowCalloutCalc[] = +const SvxMSDffCalculationData mso_sptUpArrowCalloutCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, @@ -1787,15 +1787,15 @@ static const SvxMSDffCalculationData mso_sptUpArrowCalloutCalc[] = { 0x8000, { 21600, 0, 0x0401 } }, { 0x8000, { 21600, 0, 0x0403 } } }; -static const sal_Int32 mso_sptUpArrowCalloutDefault[] = +const sal_Int32 mso_sptUpArrowCalloutDefault[] = { 4, 7200, 5400, 3600, 8100 }; -static const SvxMSDffTextRectangles mso_sptUpArrowCalloutTextRect[] = +const SvxMSDffTextRectangles mso_sptUpArrowCalloutTextRect[] = { { { 0, 0 MSO_I }, { 21600, 21600 } } }; -static const SvxMSDffHandle mso_sptUpArrowCalloutHandle[] = +const SvxMSDffHandle mso_sptUpArrowCalloutHandle[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_Y_MIN_IS_SPECIAL, 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0x102, 21600 }, @@ -1804,7 +1804,7 @@ static const SvxMSDffHandle mso_sptUpArrowCalloutHandle[] = { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL, 0x101, 0, 10800, 10800, 0, 0x103, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoUpArrowCallout = +const mso_CustomShape msoUpArrowCallout = { const_cast<SvxMSDffVertPair*>(mso_sptUpArrowCalloutVert), SAL_N_ELEMENTS( mso_sptUpArrowCalloutVert ), const_cast<sal_uInt16*>(mso_sptUpArrowCalloutSegm), sizeof( mso_sptUpArrowCalloutSegm ) >> 1, @@ -1817,17 +1817,17 @@ static const mso_CustomShape msoUpArrowCallout = const_cast<SvxMSDffHandle*>(mso_sptUpArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptUpArrowCalloutHandle ) }; -static const SvxMSDffVertPair mso_sptDownArrowCalloutVert[] = +const SvxMSDffVertPair mso_sptDownArrowCalloutVert[] = { { 0, 0 MSO_I }, { 0, 0 }, { 21600, 0 }, { 21600, 0 MSO_I }, { 5 MSO_I, 0 MSO_I }, { 5 MSO_I, 2 MSO_I }, { 4 MSO_I, 2 MSO_I }, { 10800, 21600 }, { 1 MSO_I, 2 MSO_I }, { 3 MSO_I, 2 MSO_I }, { 3 MSO_I, 0 MSO_I } }; -static const sal_uInt16 mso_sptDownArrowCalloutSegm[] = +const sal_uInt16 mso_sptDownArrowCalloutSegm[] = { 0x4000, 0x000a, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptDownArrowCalloutCalc[] = +const SvxMSDffCalculationData mso_sptDownArrowCalloutCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, @@ -1836,15 +1836,15 @@ static const SvxMSDffCalculationData mso_sptDownArrowCalloutCalc[] = { 0x8000, { 21600, 0, 0x0401 } }, { 0x8000, { 21600, 0, 0x0403 } } }; -static const sal_Int32 mso_sptDownArrowCalloutDefault[] = +const sal_Int32 mso_sptDownArrowCalloutDefault[] = { 4, 14400, 5400, 18000, 8100 }; -static const SvxMSDffTextRectangles mso_sptDownArrowCalloutTextRect[] = +const SvxMSDffTextRectangles mso_sptDownArrowCalloutTextRect[] = { { { 0, 0 }, { 21600, 0 MSO_I } } }; -static const SvxMSDffHandle mso_sptDownArrowCalloutHandle[] = +const SvxMSDffHandle mso_sptDownArrowCalloutHandle[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL, 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 0x102 }, @@ -1853,7 +1853,7 @@ static const SvxMSDffHandle mso_sptDownArrowCalloutHandle[] = { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL, 0x101, 1, 10800, 10800, 0, 0x103, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoDownArrowCallout = +const mso_CustomShape msoDownArrowCallout = { const_cast<SvxMSDffVertPair*>(mso_sptDownArrowCalloutVert), SAL_N_ELEMENTS( mso_sptDownArrowCalloutVert ), const_cast<sal_uInt16*>(mso_sptDownArrowCalloutSegm), sizeof( mso_sptDownArrowCalloutSegm ) >> 1, @@ -1866,7 +1866,7 @@ static const mso_CustomShape msoDownArrowCallout = const_cast<SvxMSDffHandle*>(mso_sptDownArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptDownArrowCalloutHandle ) }; -static const SvxMSDffVertPair mso_sptLeftRightArrowCalloutVert[] = +const SvxMSDffVertPair mso_sptLeftRightArrowCalloutVert[] = { { 0 MSO_I, 0 }, { 4 MSO_I, 0 }, { 4 MSO_I, 3 MSO_I }, { 6 MSO_I, 3 MSO_I }, { 6 MSO_I, 1 MSO_I }, { 21600, 10800 }, { 6 MSO_I, 5 MSO_I }, { 6 MSO_I, 7 MSO_I }, @@ -1874,11 +1874,11 @@ static const SvxMSDffVertPair mso_sptLeftRightArrowCalloutVert[] = { 2 MSO_I, 7 MSO_I }, { 2 MSO_I, 5 MSO_I }, { 0, 10800 }, { 2 MSO_I, 1 MSO_I }, { 2 MSO_I, 3 MSO_I }, { 0 MSO_I, 3 MSO_I } }; -static const sal_uInt16 mso_sptLeftRightArrowCalloutSegm[] = +const sal_uInt16 mso_sptLeftRightArrowCalloutSegm[] = { 0x4000, 0x0011, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptLeftRightArrowCalloutCalc[] = +const SvxMSDffCalculationData mso_sptLeftRightArrowCalloutCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, @@ -1889,15 +1889,15 @@ static const SvxMSDffCalculationData mso_sptLeftRightArrowCalloutCalc[] = { 0x8000, { 21600, 0, 0x0402 } }, { 0x8000, { 21600, 0, 0x0403 } } }; -static const sal_Int32 mso_sptLeftRightArrowCalloutDefault[] = +const sal_Int32 mso_sptLeftRightArrowCalloutDefault[] = { 4, 5400, 5500, 2700, 8100 }; -static const SvxMSDffTextRectangles mso_sptLeftRightArrowCalloutTextRect[] = +const SvxMSDffTextRectangles mso_sptLeftRightArrowCalloutTextRect[] = { { { 0 MSO_I, 0 }, { 4 MSO_I, 21600 } } }; -static const SvxMSDffHandle mso_sptLeftRightArrowCalloutHandle[] = +const SvxMSDffHandle mso_sptLeftRightArrowCalloutHandle[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL, 0x100, 0, 10800, 10800, 0x102, 10800, MIN_INT32, 0x7fffffff }, @@ -1906,7 +1906,7 @@ static const SvxMSDffHandle mso_sptLeftRightArrowCalloutHandle[] = { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL, 0, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 0x103 } }; -static const mso_CustomShape msoLeftRightArrowCallout = +const mso_CustomShape msoLeftRightArrowCallout = { const_cast<SvxMSDffVertPair*>(mso_sptLeftRightArrowCalloutVert), SAL_N_ELEMENTS( mso_sptLeftRightArrowCalloutVert ), const_cast<sal_uInt16*>(mso_sptLeftRightArrowCalloutSegm), sizeof( mso_sptLeftRightArrowCalloutSegm ) >> 1, @@ -1919,7 +1919,7 @@ static const mso_CustomShape msoLeftRightArrowCallout = const_cast<SvxMSDffHandle*>(mso_sptLeftRightArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptLeftRightArrowCalloutHandle ) }; -static const SvxMSDffVertPair mso_sptUpDownArrowCalloutVert[] = +const SvxMSDffVertPair mso_sptUpDownArrowCalloutVert[] = { { 0, 0 MSO_I }, { 0, 4 MSO_I }, { 3 MSO_I, 4 MSO_I }, { 3 MSO_I, 6 MSO_I }, { 1 MSO_I, 6 MSO_I }, { 10800, 21600 }, { 5 MSO_I, 6 MSO_I }, { 7 MSO_I, 6 MSO_I }, @@ -1927,11 +1927,11 @@ static const SvxMSDffVertPair mso_sptUpDownArrowCalloutVert[] = { 7 MSO_I, 2 MSO_I }, { 5 MSO_I, 2 MSO_I }, { 10800, 0 }, { 1 MSO_I, 2 MSO_I }, { 3 MSO_I, 2 MSO_I }, { 3 MSO_I, 0 MSO_I } }; -static const sal_uInt16 mso_sptUpDownArrowCalloutSegm[] = +const sal_uInt16 mso_sptUpDownArrowCalloutSegm[] = { 0x4000, 0x0011, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptUpDownArrowCalloutCalc[] = +const SvxMSDffCalculationData mso_sptUpDownArrowCalloutCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, @@ -1942,15 +1942,15 @@ static const SvxMSDffCalculationData mso_sptUpDownArrowCalloutCalc[] = { 0x8000, { 21600, 0, 0x0402 } }, { 0x8000, { 21600, 0, 0x0403 } } }; -static const sal_Int32 mso_sptUpDownArrowCalloutDefault[] = +const sal_Int32 mso_sptUpDownArrowCalloutDefault[] = { 4, 5400, 5500, 2700, 8100 }; -static const SvxMSDffTextRectangles mso_sptUpDownArrowCalloutTextRect[] = +const SvxMSDffTextRectangles mso_sptUpDownArrowCalloutTextRect[] = { { { 0, 0 MSO_I }, { 21600, 4 MSO_I } } }; -static const SvxMSDffHandle mso_sptUpDownArrowCalloutHandle[] = +const SvxMSDffHandle mso_sptUpDownArrowCalloutHandle[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_Y_MIN_IS_SPECIAL, 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0x102, 10800 }, @@ -1959,7 +1959,7 @@ static const SvxMSDffHandle mso_sptUpDownArrowCalloutHandle[] = { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL, 0x101, 0, 10800, 10800, 0, 0x103, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoUpDownArrowCallout = +const mso_CustomShape msoUpDownArrowCallout = { const_cast<SvxMSDffVertPair*>(mso_sptUpDownArrowCalloutVert), SAL_N_ELEMENTS( mso_sptUpDownArrowCalloutVert ), const_cast<sal_uInt16*>(mso_sptUpDownArrowCalloutSegm), sizeof( mso_sptUpDownArrowCalloutSegm ) >> 1, @@ -1972,7 +1972,7 @@ static const mso_CustomShape msoUpDownArrowCallout = const_cast<SvxMSDffHandle*>(mso_sptUpDownArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptUpDownArrowCalloutHandle ) }; -static const SvxMSDffVertPair mso_sptQuadArrowCalloutVert[] = +const SvxMSDffVertPair mso_sptQuadArrowCalloutVert[] = { { 0 MSO_I, 0 MSO_I }, { 3 MSO_I, 0 MSO_I }, { 3 MSO_I, 2 MSO_I }, { 1 MSO_I, 2 MSO_I }, { 10800, 0 }, { 5 MSO_I, 2 MSO_I }, { 7 MSO_I, 2 MSO_I }, { 7 MSO_I, 0 MSO_I }, @@ -1983,11 +1983,11 @@ static const SvxMSDffVertPair mso_sptQuadArrowCalloutVert[] = { 0 MSO_I, 4 MSO_I }, { 0 MSO_I, 7 MSO_I }, { 2 MSO_I, 7 MSO_I }, { 2 MSO_I, 5 MSO_I }, { 0, 10800 }, { 2 MSO_I, 1 MSO_I }, { 2 MSO_I, 3 MSO_I }, { 0 MSO_I, 3 MSO_I } }; -static const sal_uInt16 mso_sptQuadArrowCalloutSegm[] = +const sal_uInt16 mso_sptQuadArrowCalloutSegm[] = { 0x4000, 0x001f, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptQuadArrowCalloutCalc[] = +const SvxMSDffCalculationData mso_sptQuadArrowCalloutCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x2000, { DFF_Prop_adjust2Value, 0, 0 } }, @@ -1998,15 +1998,15 @@ static const SvxMSDffCalculationData mso_sptQuadArrowCalloutCalc[] = { 0x8000, { 21600, 0, 0x0402 } }, { 0x8000, { 21600, 0, 0x0403 } } }; -static const sal_Int32 mso_sptQuadArrowCalloutDefault[] = +const sal_Int32 mso_sptQuadArrowCalloutDefault[] = { 4, 5400, 8100, 2700, 9400 }; -static const SvxMSDffTextRectangles mso_sptQuadArrowCalloutTextRect[] = +const SvxMSDffTextRectangles mso_sptQuadArrowCalloutTextRect[] = { { { 0 MSO_I, 0 MSO_I }, { 4 MSO_I, 4 MSO_I } } }; -static const SvxMSDffHandle mso_sptQuadArrowCalloutHandle[] = +const SvxMSDffHandle mso_sptQuadArrowCalloutHandle[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_Y_MIN_IS_SPECIAL | SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL, 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0x102, 0x101 }, @@ -2015,7 +2015,7 @@ static const SvxMSDffHandle mso_sptQuadArrowCalloutHandle[] = { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL | SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL, 0x103, 0x102, 10800, 10800, 0x101, 10800, 0, 0x100 } }; -static const mso_CustomShape msoQuadArrowCallout = +const mso_CustomShape msoQuadArrowCallout = { const_cast<SvxMSDffVertPair*>(mso_sptQuadArrowCalloutVert), SAL_N_ELEMENTS( mso_sptQuadArrowCalloutVert ), const_cast<sal_uInt16*>(mso_sptQuadArrowCalloutSegm), sizeof( mso_sptQuadArrowCalloutSegm ) >> 1, @@ -2028,7 +2028,7 @@ static const mso_CustomShape msoQuadArrowCallout = const_cast<SvxMSDffHandle*>(mso_sptQuadArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptQuadArrowCalloutHandle ) }; -static const SvxMSDffVertPair mso_sptCircularArrowVert[] = +const SvxMSDffVertPair mso_sptCircularArrowVert[] = { { 0x03 MSO_I, 0x03 MSO_I }, { 0x14 MSO_I, 0x14 MSO_I }, @@ -2041,11 +2041,11 @@ static const SvxMSDffVertPair mso_sptCircularArrowVert[] = { 0x2F MSO_I, 0x2E MSO_I }, { 0x1D MSO_I, 0x1C MSO_I } }; -static const sal_uInt16 mso_sptCircularArrowSegm[] = +const sal_uInt16 mso_sptCircularArrowSegm[] = { 0xa404, 0xa504, 0x0003, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptCircularArrowCalc[] = +const SvxMSDffCalculationData mso_sptCircularArrowCalc[] = { { 0x2000, { 0x0147, 0x0000, 0x0000 } }, { 0x2000, { 0x0148, 0x0000, 0x0000 } }, @@ -2096,22 +2096,22 @@ static const SvxMSDffCalculationData mso_sptCircularArrowCalc[] = { 0x6000, { 0x041C, 0x042B, 0x0000 } }, { 0x6000, { 0x041D, 0x042D, 0x0000 } } }; -static const sal_Int32 mso_sptCircularArrowDefault[] = +const sal_Int32 mso_sptCircularArrowDefault[] = { 3, 180, 0, 5500 }; -static const SvxMSDffTextRectangles mso_sptCircularArrowTextRect[] = // todo +const SvxMSDffTextRectangles mso_sptCircularArrowTextRect[] = // todo { { { 0, 0 }, { 21600, 21600 } } }; -static const SvxMSDffHandle mso_sptCircularArrowHandle[] = +const SvxMSDffHandle mso_sptCircularArrowHandle[] = { { SvxMSDffHandleFlags::POLAR | SvxMSDffHandleFlags::RADIUS_RANGE, 10800, 0x100, 10800, 10800, 10800, 10800, -0x7f4c0000, 0x00b40000 }, { SvxMSDffHandleFlags::POLAR | SvxMSDffHandleFlags::RADIUS_RANGE, 0x102, 0x101, 10800, 10800, 0, 10800, -0x7f4c0000, 0x00b40000 } }; -static const mso_CustomShape msoCircularArrow = +const mso_CustomShape msoCircularArrow = { const_cast<SvxMSDffVertPair*>(mso_sptCircularArrowVert), SAL_N_ELEMENTS( mso_sptCircularArrowVert ), const_cast<sal_uInt16*>(mso_sptCircularArrowSegm), sizeof( mso_sptCircularArrowSegm ) >> 1, @@ -2124,19 +2124,19 @@ static const mso_CustomShape msoCircularArrow = const_cast<SvxMSDffHandle*>(mso_sptCircularArrowHandle), SAL_N_ELEMENTS( mso_sptCircularArrowHandle ) // handles }; -static const SvxMSDffVertPair mso_sptCubeVert[] = +const SvxMSDffVertPair mso_sptCubeVert[] = { { 0, 12 MSO_I }, { 0, 1 MSO_I }, { 2 MSO_I, 0 }, { 11 MSO_I, 0 }, { 11 MSO_I, 3 MSO_I }, { 4 MSO_I, 12 MSO_I }, { 0, 1 MSO_I }, { 2 MSO_I, 0 }, { 11 MSO_I, 0 }, { 4 MSO_I, 1 MSO_I }, { 4 MSO_I, 12 MSO_I }, { 4 MSO_I, 1 MSO_I }, { 11 MSO_I, 0 }, { 11 MSO_I, 3 MSO_I } }; -static const sal_uInt16 mso_sptCubeSegm[] = +const sal_uInt16 mso_sptCubeSegm[] = { 0x4000, 0x0005, 0x6001, 0x8000, 0x4000, 0x0003, 0x6001, 0x8000, 0x4000, 0x0003, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptCubeCalc[] = +const SvxMSDffCalculationData mso_sptCubeCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x6000, { DFF_Prop_geoTop, 0x400, 0 } }, @@ -2152,20 +2152,20 @@ static const SvxMSDffCalculationData mso_sptCubeCalc[] = { 0x2000, { DFF_Prop_geoRight, 0, 0 } }, // 11 { 0x2000, { DFF_Prop_geoBottom, 0, 0 } } // 12 }; -static const SvxMSDffTextRectangles mso_sptCubeTextRect[] = +const SvxMSDffTextRectangles mso_sptCubeTextRect[] = { { { 0, 1 MSO_I }, { 4 MSO_I, 12 MSO_I } } }; -static const SvxMSDffHandle mso_sptCubeHandle[] = +const SvxMSDffHandle mso_sptCubeHandle[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::SWITCHED, 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 21600 } }; -static const SvxMSDffVertPair mso_sptCubeGluePoints[] = +const SvxMSDffVertPair mso_sptCubeGluePoints[] = { { 7 MSO_I, 0 }, { 6 MSO_I, 1 MSO_I }, { 0, 10 MSO_I }, { 6 MSO_I, 21600 }, { 4 MSO_I, 10 MSO_I }, { 21600, 9 MSO_I } }; -static const mso_CustomShape msoCube = +const mso_CustomShape msoCube = { const_cast<SvxMSDffVertPair*>(mso_sptCubeVert), SAL_N_ELEMENTS( mso_sptCubeVert ), const_cast<sal_uInt16*>(mso_sptCubeSegm), sizeof( mso_sptCubeSegm ) >> 1, @@ -2178,7 +2178,7 @@ static const mso_CustomShape msoCube = const_cast<SvxMSDffHandle*>(mso_sptCubeHandle), SAL_N_ELEMENTS( mso_sptCubeHandle ) }; -static const SvxMSDffVertPair mso_sptBevelVert[] = +const SvxMSDffVertPair mso_sptBevelVert[] = { { 0, 0 }, { 21600, 0 }, { 21600, 21600 }, { 0, 21600 }, { 0, 0 }, { 21600, 0 }, { 1 MSO_I, 0 MSO_I }, { 0 MSO_I, 0 MSO_I }, @@ -2186,7 +2186,7 @@ static const SvxMSDffVertPair mso_sptBevelVert[] = { 21600, 21600 }, { 0, 21600 }, { 0 MSO_I, 2 MSO_I }, { 1 MSO_I, 2 MSO_I }, { 0, 21600 }, { 0, 0 }, { 0 MSO_I, 0 MSO_I }, { 0 MSO_I, 2 MSO_I } }; -static const sal_uInt16 mso_sptBevelSegm[] = +const sal_uInt16 mso_sptBevelSegm[] = { 0x4000, 0x0003, 0x6001, 0x8000, 0x4000, 0x0003, 0x6001, 0x8000, @@ -2194,23 +2194,23 @@ static const sal_uInt16 mso_sptBevelSegm[] = 0x4000, 0x0003, 0x6001, 0x8000, 0x4000, 0x0003, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptBevelCalc[] = +const SvxMSDffCalculationData mso_sptBevelCalc[] = { { 0x2001, { DFF_Prop_adjustValue, 21599, 21600 } }, { 0xa000, { DFF_Prop_geoRight, 0, 0x400 } }, { 0xa000, { DFF_Prop_geoBottom, 0, 0x400 } } }; -static const SvxMSDffTextRectangles mso_sptBevelTextRect[] = +const SvxMSDffTextRectangles mso_sptBevelTextRect[] = { { { 0 MSO_I, 0 MSO_I }, { 1 MSO_I, 2 MSO_I } } }; -static const SvxMSDffHandle mso_sptBevelHandle[] = +const SvxMSDffHandle mso_sptBevelHandle[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::SWITCHED, 0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoBevel = +const mso_CustomShape msoBevel = { const_cast<SvxMSDffVertPair*>(mso_sptBevelVert), SAL_N_ELEMENTS( mso_sptBevelVert ), const_cast<sal_uInt16*>(mso_sptBevelSegm), sizeof( mso_sptBevelSegm ) >> 1, @@ -2223,18 +2223,18 @@ static const mso_CustomShape msoBevel = const_cast<SvxMSDffHandle*>(mso_sptBevelHandle), SAL_N_ELEMENTS( mso_sptBevelHandle ) }; -static const SvxMSDffVertPair mso_sptFoldedCornerVert[] = // adjustment1 : x 10800 - 21600 +const SvxMSDffVertPair mso_sptFoldedCornerVert[] = // adjustment1 : x 10800 - 21600 { { 0, 0 }, { 21600, 0 }, { 21600, 0 MSO_I }, { 0 MSO_I, 21600 }, { 0, 21600 }, { 0 MSO_I, 21600 }, { 3 MSO_I, 0 MSO_I }, { 8 MSO_I, 9 MSO_I }, { 10 MSO_I, 11 MSO_I }, { 21600, 0 MSO_I } }; -static const sal_uInt16 mso_sptFoldedCornerSegm[] = +const sal_uInt16 mso_sptFoldedCornerSegm[] = { 0x4000, 0x0004, 0x6001, 0x8000, 0x4000, 0x0001, 0x2001, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptFoldedCornerCalc[] = +const SvxMSDffCalculationData mso_sptFoldedCornerCalc[] = { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x8000, { 21600, 0, 0x400 } }, @@ -2249,20 +2249,20 @@ static const SvxMSDffCalculationData mso_sptFoldedCornerCalc[] = { 0x8000, { 21600, 0, 0x404 } }, { 0x6000, { 0x400, 0x407, 0 } } }; -static const sal_Int32 mso_sptFoldedCornerDefault[] = +const sal_Int32 mso_sptFoldedCornerDefault[] = { 1, 18900 }; -static const SvxMSDffTextRectangles mso_sptFoldedCornerTextRect[] = +const SvxMSDffTextRectangles mso_sptFoldedCornerTextRect[] = { { { 0, 0 }, { 21600, 11 MSO_I } } }; -static const SvxMSDffHandle mso_sptFoldedCornerHandle[] = +const SvxMSDffHandle mso_sptFoldedCornerHandle[] = { { SvxMSDffHandleFlags::RANGE, 0x100, 1, 10800, 10800, 10800, 21600, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoFoldedCorner = +const mso_CustomShape msoFoldedCorner = { const_cast<SvxMSDffVertPair*>(mso_sptFoldedCornerVert), SAL_N_ELEMENTS( mso_sptFoldedCornerVert ), const_cast<sal_uInt16*>(mso_sptFoldedCornerSegm), sizeof( mso_sptFoldedCornerSegm ) >> 1, @@ -2275,7 +2275,7 @@ static const mso_CustomShape msoFoldedCorner = const_cast<SvxMSDffHandle*>(mso_sptFoldedCornerHandle), SAL_N_ELEMENTS( mso_sptFoldedCornerHandle ) }; -static const SvxMSDffVertPair mso_sptActionButtonBlankVert[] = +const SvxMSDffVertPair mso_sptActionButtonBlankVert[] = { { 0, 0 }, { 21600, 0 }, { 21600, 21600 }, { 0, 21600 }, { 0, 0 }, { 21600, 0 }, { 1 MSO_I, 0 MSO_I }, { 0 MSO_I, 0 MSO_I }, @@ -2283,7 +2283,7 @@ static const SvxMSDffVertPair mso_sptActionButtonBlankVert[] = { 21600, 21600 }, { 0, 21600 }, { 0 MSO_I, 2 MSO_I }, { 1 MSO_I, 2 MSO_I }, { 0, 21600 }, { 0, 0 }, { 0 MSO_I, 0 MSO_I }, { 0 MSO_I, 2 MSO_I } }; -static const sal_uInt16 mso_sptActionButtonBlankSegm[] = +const sal_uInt16 mso_sptActionButtonBlankSegm[] = { 0x4000, 0x0003, 0x6001, 0x8000, 0x4000, 0x0003, 0x6001, 0x8000, @@ -2291,22 +2291,22 @@ static const sal_uInt16 mso_sptActionButtonBlankSegm[] = 0x4000, 0x0003, 0x6001, 0x8000, 0x4000, 0x0003, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptActionButtonBlankCalc[] = +const SvxMSDffCalculationData mso_sptActionButtonBlankCalc[] = { { 0x2001, { DFF_Prop_adjustValue, 21599, 21600 } }, { 0xa000, { DFF_Prop_geoRight, 0, 0x400 } }, { 0xa000, { DFF_Prop_geoBottom, 0, 0x400 } } }; -static const SvxMSDffTextRectangles mso_sptActionButtonBlankTextRect[] = +const SvxMSDffTextRectangles mso_sptActionButtonBlankTextRect[] = { { { 0 MSO_I, 0 MSO_I }, { 1 MSO_I, 2 MSO_I } } }; -static const SvxMSDffHandle mso_sptButtonHandle[] = +const SvxMSDffHandle mso_sptButtonHandle[] = { { SvxMSDffHandleFlags::RANGE | SvxMSDffHandleFlags::SWITCHED, 0x100, 0, 10800, 10800, 0, 5400, MIN_INT32, 0x7fffffff } }; -static const mso_CustomShape msoActionButtonBlank = +const mso_CustomShape msoActionButtonBlank = { const_cast<SvxMSDffVertPair*>(mso_sptActionButtonBlankVert), SAL_N_ELEMENTS( mso_sptActionButtonBlankVert ), const_cast<sal_uInt16*>(mso_sptActionButtonBlankSegm), sizeof( mso_sptActionButtonBlankSegm ) >> 1, @@ -2319,11 +2319,11 @@ static const mso_CustomShape msoActionButtonBlank = const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; -static const SvxMSDffTextRectangles mso_sptActionButtonTextRect[] = +const SvxMSDffTextRectangles mso_sptActionButtonTextRect[] = { { { 1 MSO_I, 2 MSO_I }, { 3 MSO_I, 4 MSO_I } } }; -static const SvxMSDffVertPair mso_sptActionButtonHomeVert[] = +const SvxMSDffVertPair mso_sptActionButtonHomeVert[] = { { 0, 0 }, { 21600, 0 }, { 21600, 21600 }, { 0, 21600 }, { 0, 0 }, { 21600, 0 }, { 3 MSO_I, 2 MSO_I }, { 1 MSO_I, 2 MSO_I }, @@ -2341,7 +2341,7 @@ static const SvxMSDffVertPair mso_sptActionButtonHomeVert[] = { 0x18 MSO_I, 8 MSO_I }, { 0x1c MSO_I, 8 MSO_I }, { 0x1c MSO_I, 0x1a MSO_I }, { 0x20 MSO_I, 0x1a MSO_I } }; -static const sal_uInt16 mso_sptActionButtonHomeSegm[] = +const sal_uInt16 mso_sptActionButtonHomeSegm[] = { 0x4000, 0x0003, 0x6001, 0x8000, 0x4000, 0x0003, 0x6001, 0x8000, @@ -2352,7 +2352,7 @@ static const sal_uInt16 mso_sptActionButtonHomeSegm[] = 0x4000, 0x0003, 0x6001, 0x8000, 0x4000, 0x0007, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptActionButtonHomeCalc[] = // adj value 0 - 5400 +const SvxMSDffCalculationData mso_sptActionButtonHomeCalc[] = // adj value 0 - 5400 { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x6000, { DFF_Prop_geoLeft, DFF_Prop_adjustValue, 0 } }, @@ -2394,7 +2394,7 @@ static const SvxMSDffCalculationData mso_sptActionButtonHomeCalc[] = // adj v { 0x6000, { 0x0423, 0x0408, 0 } } // 24 }; -static const mso_CustomShape msoActionButtonHome = +const mso_CustomShape msoActionButtonHome = { const_cast<SvxMSDffVertPair*>(mso_sptActionButtonHomeVert), SAL_N_ELEMENTS( mso_sptActionButtonHomeVert ), const_cast<sal_uInt16*>(mso_sptActionButtonHomeSegm), sizeof( mso_sptActionButtonHomeSegm ) >> 1, @@ -2407,7 +2407,7 @@ static const mso_CustomShape msoActionButtonHome = const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; -static const SvxMSDffVertPair mso_sptActionButtonHelpVert[] = +const SvxMSDffVertPair mso_sptActionButtonHelpVert[] = { { 0, 0 }, { 21600, 0 }, { 21600, 21600 }, { 0, 21600 }, { 0, 0 }, { 21600, 0 }, { 3 MSO_I, 2 MSO_I }, { 1 MSO_I, 2 MSO_I }, @@ -2427,7 +2427,7 @@ static const SvxMSDffVertPair mso_sptActionButtonHelpVert[] = { 7 MSO_I, 0x3c MSO_I }, { 0x34 MSO_I, 8 MSO_I }, { 0x34 MSO_I, 0x16 MSO_I }, // ccp { 0x34 MSO_I, 0x14 MSO_I } }; -static const sal_uInt16 mso_sptActionButtonHelpSegm[] = +const sal_uInt16 mso_sptActionButtonHelpSegm[] = { 0x4000, 0x0003, 0x6001, 0x8000, 0x4000, 0x0003, 0x6001, 0x8000, @@ -2437,7 +2437,7 @@ static const sal_uInt16 mso_sptActionButtonHelpSegm[] = 0x4000, 0xa704, 0x6000, 0x8000, 0x4000, 0x0001, 0x2004, 0x0001, 0x2004, 0x0001, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptActionButtonHelpCalc[] = // adj value 0 - 5400 +const SvxMSDffCalculationData mso_sptActionButtonHelpCalc[] = // adj value 0 - 5400 { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x6000, { DFF_Prop_geoLeft, DFF_Prop_adjustValue, 0 } }, @@ -2504,7 +2504,7 @@ static const SvxMSDffCalculationData mso_sptActionButtonHelpCalc[] = // adj v { 0x4001, { 6290, 0x0406, 1 } }, // 3d { 0x6000, { 0x043d, 0x0408, 0 } } // 3e }; -static const mso_CustomShape msoActionButtonHelp = +const mso_CustomShape msoActionButtonHelp = { const_cast<SvxMSDffVertPair*>(mso_sptActionButtonHelpVert), SAL_N_ELEMENTS( mso_sptActionButtonHelpVert ), const_cast<sal_uInt16*>(mso_sptActionButtonHelpSegm), sizeof( mso_sptActionButtonHelpSegm ) >> 1, @@ -2517,7 +2517,7 @@ static const mso_CustomShape msoActionButtonHelp = const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; -static const SvxMSDffVertPair mso_sptActionButtonInformationVert[] = +const SvxMSDffVertPair mso_sptActionButtonInformationVert[] = { { 0, 0 }, { 21600, 0 }, { 21600, 21600 }, { 0, 21600 }, { 0, 0 }, { 21600, 0 }, { 3 MSO_I, 2 MSO_I }, { 1 MSO_I, 2 MSO_I }, @@ -2530,7 +2530,7 @@ static const SvxMSDffVertPair mso_sptActionButtonInformationVert[] = { 0x22 MSO_I, 0x24 MSO_I }, { 0x1a MSO_I, 0x24 MSO_I }, { 0x1a MSO_I, 0x20 MSO_I }, { 0x26 MSO_I, 0x20 MSO_I }, { 0x26 MSO_I, 0x28 MSO_I }, { 0x1a MSO_I, 0x28 MSO_I } }; -static const sal_uInt16 mso_sptActionButtonInformationSegm[] = +const sal_uInt16 mso_sptActionButtonInformationSegm[] = { 0x4000, 0x0003, 0x6001, 0x8000, 0x4000, 0x0003, 0x6001, 0x8000, @@ -2541,7 +2541,7 @@ static const sal_uInt16 mso_sptActionButtonInformationSegm[] = 0x4000, 0xa704, 0x6000, 0x8000, 0x4000, 0x0009, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptActionButtonInformationCalc[] = // adj value 0 - 5400 +const SvxMSDffCalculationData mso_sptActionButtonInformationCalc[] = // adj value 0 - 5400 { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x6000, { DFF_Prop_geoLeft, DFF_Prop_adjustValue, 0 } }, @@ -2592,7 +2592,7 @@ static const SvxMSDffCalculationData mso_sptActionButtonInformationCalc[] = // a { 0x6000, { 0x0429, 0x0408, 0 } }, // 2a }; -static const mso_CustomShape msoActionButtonInformation = +const mso_CustomShape msoActionButtonInformation = { const_cast<SvxMSDffVertPair*>(mso_sptActionButtonInformationVert), SAL_N_ELEMENTS( mso_sptActionButtonInformationVert ), const_cast<sal_uInt16*>(mso_sptActionButtonInformationSegm), sizeof( mso_sptActionButtonInformationSegm ) >> 1, @@ -2605,7 +2605,7 @@ static const mso_CustomShape msoActionButtonInformation = const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; -static const SvxMSDffVertPair mso_sptActionButtonBackPreviousVert[] = +const SvxMSDffVertPair mso_sptActionButtonBackPreviousVert[] = { { 0, 0 }, { 21600, 0 }, { 21600, 21600 }, { 0, 21600 }, { 0, 0 }, { 21600, 0 }, { 3 MSO_I, 2 MSO_I }, { 1 MSO_I, 2 MSO_I }, @@ -2615,7 +2615,7 @@ static const SvxMSDffVertPair mso_sptActionButtonBackPreviousVert[] = { 0xa MSO_I, 8 MSO_I }, { 0xe MSO_I, 0xc MSO_I }, { 0xe MSO_I, 0x10 MSO_I } }; -static const sal_uInt16 mso_sptActionButtonForwardBackSegm[] = +const sal_uInt16 mso_sptActionButtonForwardBackSegm[] = { 0x4000, 0x0003, 0x6001, 0x8000, 0x4000, 0x0003, 0x6001, 0x8000, @@ -2624,7 +2624,7 @@ static const sal_uInt16 mso_sptActionButtonForwardBackSegm[] = 0x4000, 0x0003, 0x6001, 0x8000, 0x4000, 0x0002, 0x6001, 0x8000 }; -static const SvxMSDffCalculationData mso_sptActionButtonForwardBackCalc[] = // adj value 0 - 5400 +const SvxMSDffCalculationData mso_sptActionButtonForwardBackCalc[] = // adj value 0 - 5400 { { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, { 0x6000, { DFF_Prop_geoLeft, DFF_Prop_adjustValue, 0 } }, @@ -2645,7 +2645,7 @@ static const SvxMSDffCalculationData mso_sptActionButtonForwardBackCalc[] = // a { 0x4001, { 8050, 0x0406, 1 } }, // f { 0x6000, { 0x040f, 0x0408, 0 } } // 10 }; -static const mso_CustomShape msoActionButtonBackPrevious = +const mso_CustomShape msoActionButtonBackPrevious = { const_cast<SvxMSDffVertPair*>(mso_sptActionButtonBackPreviousVert), SAL_N_ELEMENTS( mso_sptActionButtonBackPreviousVert ), const_cast<sal_uInt16*>(mso_sptActionButtonForwardBackSegm), sizeof( mso_sptActionButtonForwardBackSegm ) >> 1, @@ -2658,7 +2658,7 @@ static const mso_CustomShape msoActionButtonBackPrevious = const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; -static const SvxMSDffVertPair mso_sptActionButtonForwardNextVert[] = +const SvxMSDffVertPair mso_sptActionButtonForwardNextVert[] = { { 0, 0 }, { 21600, 0 }, { 21600, 21600 }, { 0, 21600 }, { 0, 0 }, { 21600, 0 }, { 3 MSO_I, 2 MSO_I }, { 1 MSO_I, 2 MSO_I }, @@ -2668,7 +2668,7 @@ static const SvxMSDffVertPair mso_sptActionButtonForwardNextVert[] = { 0xa MSO_I, 0xc MSO_I }, { 0xe MSO_I, 8 MSO_I }, { 0xa MSO_I, 0x10 MSO_I } }; -static const mso_CustomShape msoActionButtonForwardNext = +const mso_CustomShape msoActionButtonForwardNext = { const_cast<SvxMSDffVertPair*>(mso_sptActionButtonForwardNextVert), SAL_N_ELEMENTS( mso_sptActionButtonForwardNextVert ), const_cast<sal_uInt16*>(mso_sptActionButtonForwardBackSegm), sizeof( mso_sptActionButtonForwardBackSegm ) >> 1, @@ -2681,7 +2681,7 @@ static const mso_CustomShape msoActionButtonForwardNext = const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; -static const SvxMSDffVertPair mso_sptActionButtonBeginningVert[] = +const SvxMSDffVertPair mso_sptActionButtonBeginningVert[] = { { 0, 0 }, { 21600, 0 }, { 21600, 21600 }, { 0, 21600 }, { 0, 0 }, { 21600, 0 }, { 3 MSO_I, 2 MSO_I }, { 1 MSO_I, 2 MSO_I }, @@ -2692,7 +2692,7 @@ static const SvxMSDffVertPair mso_sptActionButtonBeginningVert[] = ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits