diff options
author | Felix Zhang <fezhang@suse.com> | 2012-05-29 18:15:52 +0800 |
---|---|---|
committer | Radek Doulik <rodo@novell.com> | 2012-08-17 16:28:12 +0200 |
commit | 866daf4f21662fa5852f5eccb04929c6c4fd7e0a (patch) | |
tree | a9385734edfcac769cec0a1c939358615a329117 /svx | |
parent | WaE: unused variable (diff) | |
download | core-866daf4f21662fa5852f5eccb04929c6c4fd7e0a.tar.gz core-866daf4f21662fa5852f5eccb04929c6c4fd7e0a.zip |
bnc#741480: adjusted display of Bracket/BracePair in ppt
Change-Id: Ia4bbce74e2c1a5f46e0b1a73940aeb2ce8fc6ab9
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeGeometry.cxx | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx index 4bc2cd389b53..87e7e911825b 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx @@ -3472,12 +3472,18 @@ static const SvxMSDffVertPair mso_sptBracketPairVert[] = // adj value 0 -> 10 { 0 MSO_I, 0 }, { 0, 1 MSO_I }, // left top alignment { 0, 2 MSO_I }, { 0 MSO_I, 21600 }, // left bottom " { 3 MSO_I, 21600 }, { 21600, 2 MSO_I }, // right bottom " - { 21600, 1 MSO_I }, { 3 MSO_I, 0 } // right top " + { 21600, 1 MSO_I }, { 3 MSO_I, 0 }, // right top " + { 0 MSO_I, 0 }, { 0, 1 MSO_I }, // filling area + { 0, 2 MSO_I }, { 0 MSO_I, 21600 }, + { 3 MSO_I, 21600 }, { 21600, 2 MSO_I }, + { 21600, 1 MSO_I }, { 3 MSO_I, 0 } }; static const sal_uInt16 mso_sptBracketPairSegm[] = { - 0x4000, 0xa701, 0x0001, 0xa801, 0x8000, - 0x4000, 0xa701, 0x0001, 0xa801, 0x8000 + 0x4000, 0xa701, 0x0001, 0xa801, 0xaa00, 0x8000, + 0x4000, 0xa701, 0x0001, 0xa801, 0xaa00, 0x8000, + 0x4000, 0xa701, 0x0001, 0xa801, 0x0001, // filling area + 0xa701, 0x0001, 0xa801, 0x6000, 0xab00, 0x8000 }; static const SvxMSDffCalculationData mso_sptBracketPairCalc[] = { @@ -3551,12 +3557,18 @@ static const SvxMSDffVertPair mso_sptBracePairVert[] = // adj value 0 -> 5400 { 4 MSO_I, 0 }, { 0 MSO_I, 1 MSO_I }, { 0 MSO_I, 6 MSO_I }, { 0 ,10800 }, // left bracket { 0 MSO_I, 7 MSO_I }, { 0 MSO_I, 2 MSO_I }, { 4 MSO_I, 21600 }, { 8 MSO_I, 21600 }, { 3 MSO_I, 2 MSO_I }, { 3 MSO_I, 7 MSO_I }, { 21600, 10800 }, // right bracket + { 3 MSO_I, 6 MSO_I }, { 3 MSO_I, 1 MSO_I }, { 8 MSO_I, 0 }, + { 4 MSO_I, 0 }, { 0 MSO_I, 1 MSO_I }, { 0 MSO_I, 6 MSO_I }, { 0 ,10800 }, // filling area + { 0 MSO_I, 7 MSO_I }, { 0 MSO_I, 2 MSO_I }, { 4 MSO_I, 21600 }, + { 8 MSO_I, 21600 }, { 3 MSO_I, 2 MSO_I }, { 3 MSO_I, 7 MSO_I }, { 21600, 10800 }, { 3 MSO_I, 6 MSO_I }, { 3 MSO_I, 1 MSO_I }, { 8 MSO_I, 0 } }; static const sal_uInt16 mso_sptBracePairSegm[] = { - 0x4000, 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0x8000, - 0x4000, 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0x8000 + 0x4000, 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0xaa00, 0x8000, + 0x4000, 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0xaa00, 0x8000, + 0x4000, 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0x0001, // filling area + 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0x6000, 0xab00, 0x8000 }; static const SvxMSDffCalculationData mso_sptBracePairCalc[] = { |