Use constants for ST_Border values

Change-Id: Ie0f83fd7111942912b0abd61473e654cc2f02360

4 files changed, 601 insertions, 400 deletions

diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx
index 920ec4e95fd0..2d147a51fad4 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -36,7 +36,208 @@ namespace writerfilter {
 namespace dmapper{
 namespace ConversionHelper{
 
-void MakeBorderLine( sal_Int32 nLineThickness,   sal_Int32 nLineType,
+/// Convert OOXML border style to WW8 that editeng can handle.
+sal_Int32 lcl_convertBorderStyleFromToken(sal_Int32 nOOXMLType)
+{
+    switch (nOOXMLType)
+    {
+        case NS_ooxml::LN_Value_ST_Border_nil: return 255;
+        case NS_ooxml::LN_Value_ST_Border_none: return 0;
+        case NS_ooxml::LN_Value_ST_Border_single: return 1;
+        case NS_ooxml::LN_Value_ST_Border_thick: return 2;
+        case NS_ooxml::LN_Value_ST_Border_double: return 3;
+        case NS_ooxml::LN_Value_ST_Border_dotted: return 6;
+        case NS_ooxml::LN_Value_ST_Border_dashed: return 7;
+        case NS_ooxml::LN_Value_ST_Border_dotDash: return 8;
+        case NS_ooxml::LN_Value_ST_Border_dotDotDash: return 9;
+        case NS_ooxml::LN_Value_ST_Border_triple: return 10;
+        case NS_ooxml::LN_Value_ST_Border_thinThickSmallGap: return 11;
+        case NS_ooxml::LN_Value_ST_Border_thickThinSmallGap: return 12;
+        case NS_ooxml::LN_Value_ST_Border_thinThickThinSmallGap: return 13;
+        case NS_ooxml::LN_Value_ST_Border_thinThickMediumGap: return 14;
+        case NS_ooxml::LN_Value_ST_Border_thickThinMediumGap: return 15;
+        case NS_ooxml::LN_Value_ST_Border_thinThickThinMediumGap: return 16;
+        case NS_ooxml::LN_Value_ST_Border_thinThickLargeGap: return 17;
+        case NS_ooxml::LN_Value_ST_Border_thickThinLargeGap: return 18;
+        case NS_ooxml::LN_Value_ST_Border_thinThickThinLargeGap: return 19;
+        case NS_ooxml::LN_Value_ST_Border_wave: return 20;
+        case NS_ooxml::LN_Value_ST_Border_doubleWave: return 21;
+        case NS_ooxml::LN_Value_ST_Border_dashSmallGap: return 22;
+        case NS_ooxml::LN_Value_ST_Border_dashDotStroked: return 23;
+        case NS_ooxml::LN_Value_ST_Border_threeDEmboss: return 24;
+        case NS_ooxml::LN_Value_ST_Border_threeDEngrave: return 25;
+        case NS_ooxml::LN_Value_ST_Border_outset: return 26;
+        case NS_ooxml::LN_Value_ST_Border_inset: return 27;
+        case NS_ooxml::LN_Value_ST_Border_apples: return 64;
+        case NS_ooxml::LN_Value_ST_Border_archedScallops: return 65;
+        case NS_ooxml::LN_Value_ST_Border_babyPacifier: return 66;
+        case NS_ooxml::LN_Value_ST_Border_babyRattle: return 67;
+        case NS_ooxml::LN_Value_ST_Border_balloons3Colors: return 68;
+        case NS_ooxml::LN_Value_ST_Border_balloonsHotAir: return 69;
+        case NS_ooxml::LN_Value_ST_Border_basicBlackDashes: return 70;
+        case NS_ooxml::LN_Value_ST_Border_basicBlackDots: return 71;
+        case NS_ooxml::LN_Value_ST_Border_basicBlackSquares: return 72;
+        case NS_ooxml::LN_Value_ST_Border_basicThinLines: return 73;
+        case NS_ooxml::LN_Value_ST_Border_basicWhiteDashes: return 74;
+        case NS_ooxml::LN_Value_ST_Border_basicWhiteDots: return 75;
+        case NS_ooxml::LN_Value_ST_Border_basicWhiteSquares: return 76;
+        case NS_ooxml::LN_Value_ST_Border_basicWideInline: return 77;
+        case NS_ooxml::LN_Value_ST_Border_basicWideMidline: return 78;
+        case NS_ooxml::LN_Value_ST_Border_basicWideOutline: return 79;
+        case NS_ooxml::LN_Value_ST_Border_bats: return 80;
+        case NS_ooxml::LN_Value_ST_Border_birds: return 81;
+        case NS_ooxml::LN_Value_ST_Border_birdsFlight: return 82;
+        case NS_ooxml::LN_Value_ST_Border_cabins: return 83;
+        case NS_ooxml::LN_Value_ST_Border_cakeSlice: return 84;
+        case NS_ooxml::LN_Value_ST_Border_candyCorn: return 85;
+        case NS_ooxml::LN_Value_ST_Border_celticKnotwork: return 86;
+        case NS_ooxml::LN_Value_ST_Border_certificateBanner: return 87;
+        case NS_ooxml::LN_Value_ST_Border_chainLink: return 88;
+        case NS_ooxml::LN_Value_ST_Border_champagneBottle: return 89;
+        case NS_ooxml::LN_Value_ST_Border_checkedBarBlack: return 90;
+        case NS_ooxml::LN_Value_ST_Border_checkedBarColor: return 91;
+        case NS_ooxml::LN_Value_ST_Border_checkered: return 92;
+        case NS_ooxml::LN_Value_ST_Border_christmasTree: return 93;
+        case NS_ooxml::LN_Value_ST_Border_circlesLines: return 94;
+        case NS_ooxml::LN_Value_ST_Border_circlesRectangles: return 95;
+        case NS_ooxml::LN_Value_ST_Border_classicalWave: return 96;
+        case NS_ooxml::LN_Value_ST_Border_clocks: return 97;
+        case NS_ooxml::LN_Value_ST_Border_compass: return 98;
+        case NS_ooxml::LN_Value_ST_Border_confetti: return 99;
+        case NS_ooxml::LN_Value_ST_Border_confettiGrays: return 100;
+        case NS_ooxml::LN_Value_ST_Border_confettiOutline: return 101;
+        case NS_ooxml::LN_Value_ST_Border_confettiStreamers: return 102;
+        case NS_ooxml::LN_Value_ST_Border_confettiWhite: return 103;
+        case NS_ooxml::LN_Value_ST_Border_cornerTriangles: return 104;
+        case NS_ooxml::LN_Value_ST_Border_couponCutoutDashes: return 105;
+        case NS_ooxml::LN_Value_ST_Border_couponCutoutDots: return 106;
+        case NS_ooxml::LN_Value_ST_Border_crazyMaze: return 107;
+        case NS_ooxml::LN_Value_ST_Border_creaturesButterfly: return 108;
+        case NS_ooxml::LN_Value_ST_Border_creaturesFish: return 109;
+        case NS_ooxml::LN_Value_ST_Border_creaturesInsects: return 110;
+        case NS_ooxml::LN_Value_ST_Border_creaturesLadyBug: return 111;
+        case NS_ooxml::LN_Value_ST_Border_crossStitch: return 112;
+        case NS_ooxml::LN_Value_ST_Border_cup: return 113;
+        case NS_ooxml::LN_Value_ST_Border_decoArch: return 114;
+        case NS_ooxml::LN_Value_ST_Border_decoArchColor: return 115;
+        case NS_ooxml::LN_Value_ST_Border_decoBlocks: return 116;
+        case NS_ooxml::LN_Value_ST_Border_diamondsGray: return 117;
+        case NS_ooxml::LN_Value_ST_Border_doubleD: return 118;
+        case NS_ooxml::LN_Value_ST_Border_doubleDiamonds: return 119;
+        case NS_ooxml::LN_Value_ST_Border_earth1: return 120;
+        case NS_ooxml::LN_Value_ST_Border_earth2: return 121;
+        case NS_ooxml::LN_Value_ST_Border_eclipsingSquares1: return 122;
+        case NS_ooxml::LN_Value_ST_Border_eclipsingSquares2: return 123;
+        case NS_ooxml::LN_Value_ST_Border_eggsBlack: return 124;
+        case NS_ooxml::LN_Value_ST_Border_fans: return 125;
+        case NS_ooxml::LN_Value_ST_Border_film: return 126;
+        case NS_ooxml::LN_Value_ST_Border_firecrackers: return 127;
+        case NS_ooxml::LN_Value_ST_Border_flowersBlockPrint: return 128;
+        case NS_ooxml::LN_Value_ST_Border_flowersDaisies: return 129;
+        case NS_ooxml::LN_Value_ST_Border_flowersModern1: return 130;
+        case NS_ooxml::LN_Value_ST_Border_flowersModern2: return 131;
+        case NS_ooxml::LN_Value_ST_Border_flowersPansy: return 132;
+        case NS_ooxml::LN_Value_ST_Border_flowersRedRose: return 133;
+        case NS_ooxml::LN_Value_ST_Border_flowersRoses: return 134;
+        case NS_ooxml::LN_Value_ST_Border_flowersTeacup: return 135;
+        case NS_ooxml::LN_Value_ST_Border_flowersTiny: return 136;
+        case NS_ooxml::LN_Value_ST_Border_gems: return 137;
+        case NS_ooxml::LN_Value_ST_Border_gingerbreadMan: return 138;
+        case NS_ooxml::LN_Value_ST_Border_gradient: return 139;
+        case NS_ooxml::LN_Value_ST_Border_handmade1: return 140;
+        case NS_ooxml::LN_Value_ST_Border_handmade2: return 141;
+        case NS_ooxml::LN_Value_ST_Border_heartBalloon: return 142;
+        case NS_ooxml::LN_Value_ST_Border_heartGray: return 143;
+        case NS_ooxml::LN_Value_ST_Border_hearts: return 144;
+        case NS_ooxml::LN_Value_ST_Border_heebieJeebies: return 145;
+        case NS_ooxml::LN_Value_ST_Border_holly: return 146;
+        case NS_ooxml::LN_Value_ST_Border_houseFunky: return 147;
+        case NS_ooxml::LN_Value_ST_Border_hypnotic: return 148;
+        case NS_ooxml::LN_Value_ST_Border_iceCreamCones: return 149;
+        case NS_ooxml::LN_Value_ST_Border_lightBulb: return 150;
+        case NS_ooxml::LN_Value_ST_Border_lightning1: return 151;
+        case NS_ooxml::LN_Value_ST_Border_lightning2: return 152;
+        case NS_ooxml::LN_Value_ST_Border_mapPins: return 153;
+        case NS_ooxml::LN_Value_ST_Border_mapleLeaf: return 154;
+        case NS_ooxml::LN_Value_ST_Border_mapleMuffins: return 155;
+        case NS_ooxml::LN_Value_ST_Border_marquee: return 156;
+        case NS_ooxml::LN_Value_ST_Border_marqueeToothed: return 157;
+        case NS_ooxml::LN_Value_ST_Border_moons: return 158;
+        case NS_ooxml::LN_Value_ST_Border_mosaic: return 159;
+        case NS_ooxml::LN_Value_ST_Border_musicNotes: return 160;
+        case NS_ooxml::LN_Value_ST_Border_northwest: return 161;
+        case NS_ooxml::LN_Value_ST_Border_ovals: return 162;
+        case NS_ooxml::LN_Value_ST_Border_packages: return 163;
+        case NS_ooxml::LN_Value_ST_Border_palmsBlack: return 164;
+        case NS_ooxml::LN_Value_ST_Border_palmsColor: return 165;
+        case NS_ooxml::LN_Value_ST_Border_paperClips: return 166;
+        case NS_ooxml::LN_Value_ST_Border_papyrus: return 167;
+        case NS_ooxml::LN_Value_ST_Border_partyFavor: return 168;
+        case NS_ooxml::LN_Value_ST_Border_partyGlass: return 169;
+        case NS_ooxml::LN_Value_ST_Border_pencils: return 170;
+        case NS_ooxml::LN_Value_ST_Border_people: return 171;
+        case NS_ooxml::LN_Value_ST_Border_peopleWaving: return 172;
+        case NS_ooxml::LN_Value_ST_Border_peopleHats: return 173;
+        case NS_ooxml::LN_Value_ST_Border_poinsettias: return 174;
+        case NS_ooxml::LN_Value_ST_Border_postageStamp: return 175;
+        case NS_ooxml::LN_Value_ST_Border_pumpkin1: return 176;
+        case NS_ooxml::LN_Value_ST_Border_pushPinNote2: return 177;
+        case NS_ooxml::LN_Value_ST_Border_pushPinNote1: return 178;
+        case NS_ooxml::LN_Value_ST_Border_pyramids: return 179;
+        case NS_ooxml::LN_Value_ST_Border_pyramidsAbove: return 180;
+        case NS_ooxml::LN_Value_ST_Border_quadrants: return 181;
+        case NS_ooxml::LN_Value_ST_Border_rings: return 182;
+        case NS_ooxml::LN_Value_ST_Border_safari: return 183;
+        case NS_ooxml::LN_Value_ST_Border_sawtooth: return 184;
+        case NS_ooxml::LN_Value_ST_Border_sawtoothGray: return 185;
+        case NS_ooxml::LN_Value_ST_Border_scaredCat: return 186;
+        case NS_ooxml::LN_Value_ST_Border_seattle: return 187;
+        case NS_ooxml::LN_Value_ST_Border_shadowedSquares: return 188;
+        case NS_ooxml::LN_Value_ST_Border_sharksTeeth: return 189;
+        case NS_ooxml::LN_Value_ST_Border_shorebirdTracks: return 190;
+        case NS_ooxml::LN_Value_ST_Border_skyrocket: return 191;
+        case NS_ooxml::LN_Value_ST_Border_snowflakeFancy: return 192;
+        case NS_ooxml::LN_Value_ST_Border_snowflakes: return 193;
+        case NS_ooxml::LN_Value_ST_Border_sombrero: return 194;
+        case NS_ooxml::LN_Value_ST_Border_southwest: return 195;
+        case NS_ooxml::LN_Value_ST_Border_stars: return 196;
+        case NS_ooxml::LN_Value_ST_Border_starsTop: return 197;
+        case NS_ooxml::LN_Value_ST_Border_stars3d: return 198;
+        case NS_ooxml::LN_Value_ST_Border_starsBlack: return 199;
+        case NS_ooxml::LN_Value_ST_Border_starsShadowed: return 200;
+        case NS_ooxml::LN_Value_ST_Border_sun: return 201;
+        case NS_ooxml::LN_Value_ST_Border_swirligig: return 202;
+        case NS_ooxml::LN_Value_ST_Border_tornPaper: return 203;
+        case NS_ooxml::LN_Value_ST_Border_tornPaperBlack: return 204;
+        case NS_ooxml::LN_Value_ST_Border_trees: return 205;
+        case NS_ooxml::LN_Value_ST_Border_triangleParty: return 206;
+        case NS_ooxml::LN_Value_ST_Border_triangles: return 207;
+        case NS_ooxml::LN_Value_ST_Border_tribal1: return 208;
+        case NS_ooxml::LN_Value_ST_Border_tribal2: return 209;
+        case NS_ooxml::LN_Value_ST_Border_tribal3: return 210;
+        case NS_ooxml::LN_Value_ST_Border_tribal4: return 211;
+        case NS_ooxml::LN_Value_ST_Border_tribal5: return 212;
+        case NS_ooxml::LN_Value_ST_Border_tribal6: return 213;
+        case NS_ooxml::LN_Value_ST_Border_twistedLines1: return 214;
+        case NS_ooxml::LN_Value_ST_Border_twistedLines2: return 215;
+        case NS_ooxml::LN_Value_ST_Border_vine: return 216;
+        case NS_ooxml::LN_Value_ST_Border_waveline: return 217;
+        case NS_ooxml::LN_Value_ST_Border_weavingAngles: return 218;
+        case NS_ooxml::LN_Value_ST_Border_weavingBraid: return 219;
+        case NS_ooxml::LN_Value_ST_Border_weavingRibbon: return 220;
+        case NS_ooxml::LN_Value_ST_Border_weavingStrips: return 221;
+        case NS_ooxml::LN_Value_ST_Border_whiteFlowers: return 222;
+        case NS_ooxml::LN_Value_ST_Border_woodwork: return 223;
+        case NS_ooxml::LN_Value_ST_Border_xIllusions: return 224;
+        case NS_ooxml::LN_Value_ST_Border_zanyTriangles: return 225;
+        case NS_ooxml::LN_Value_ST_Border_zigZag: return 226;
+        case NS_ooxml::LN_Value_ST_Border_zigZagStitch: return 227;
+        default: break;
+    }
+    return 0;
+}
+
+void MakeBorderLine( sal_Int32 nLineThickness,   sal_Int32 nLineToken,
                                             sal_Int32 nLineColor,
                                             table::BorderLine2& rToFill, bool bIsOOXML )
 {
@@ -55,6 +256,8 @@ void MakeBorderLine( sal_Int32 nLineThickness,   sal_Int32 nLineType,
     if(!bIsOOXML && sal::static_int_cast<sal_uInt32>(nLineColor) < SAL_N_ELEMENTS(aBorderDefColor))
         nLineColor = aBorderDefColor[nLineColor];
 
+    sal_Int32 nLineType = lcl_convertBorderStyleFromToken(nLineToken);
+
     // Map to our border types, we should use of one equal line
     // thickness, or one of smaller thickness. If too small we
     // can make the defecit up in additional white space or
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx
index 0f64482d5f10..e2c32ec6813b 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -53,197 +53,197 @@ OUString TDefTableHandler::getBorderTypeString(sal_Int32 nType)
 {
     switch (nType)
     {
-        case 255: return OUString("nil");
-        case 0: return OUString("none");
-        case 1: return OUString("single");
-        case 2: return OUString("thick");
-        case 3: return OUString("double");
-        case 6: return OUString("dotted");
-        case 7: return OUString("dashed");
-        case 8: return OUString("dotDash");
-        case 9: return OUString("dotDotDash");
-        case 10: return OUString("triple");
-        case 11: return OUString("thinThickSmallGap");
-        case 12: return OUString("thickThinSmallGap");
-        case 13: return OUString("thinThickThinSmallGap");
-        case 14: return OUString("thinThickMediumGap");
-        case 15: return OUString("thickThinMediumGap");
-        case 16: return OUString("thinThickThinMediumGap");
-        case 17: return OUString("thinThickLargeGap");
-        case 18: return OUString("thickThinLargeGap");
-        case 19: return OUString("thinThickThinLargeGap");
-        case 20: return OUString("wave");
-        case 21: return OUString("doubleWave");
-        case 22: return OUString("dashSmallGap");
-        case 23: return OUString("dashDotStroked");
-        case 24: return OUString("threeDEmboss");
-        case 25: return OUString("threeDEngrave");
-        case 26: return OUString("outset");
-        case 27: return OUString("inset");
-        case 64: return OUString("apples");
-        case 65: return OUString("archedScallops");
-        case 66: return OUString("babyPacifier");
-        case 67: return OUString("babyRattle");
-        case 68: return OUString("balloons3Colors");
-        case 69: return OUString("balloonsHotAir");
-        case 70: return OUString("basicBlackDashes");
-        case 71: return OUString("basicBlackDots");
-        case 72: return OUString("basicBlackSquares");
-        case 73: return OUString("basicThinLines");
-        case 74: return OUString("basicWhiteDashes");
-        case 75: return OUString("basicWhiteDots");
-        case 76: return OUString("basicWhiteSquares");
-        case 77: return OUString("basicWideInline");
-        case 78: return OUString("basicWideMidline");
-        case 79: return OUString("basicWideOutline");
-        case 80: return OUString("bats");
-        case 81: return OUString("birds");
-        case 82: return OUString("birdsFlight");
-        case 83: return OUString("cabins");
-        case 84: return OUString("cakeSlice");
-        case 85: return OUString("candyCorn");
-        case 86: return OUString("celticKnotwork");
-        case 87: return OUString("certificateBanner");
-        case 88: return OUString("chainLink");
-        case 89: return OUString("champagneBottle");
-        case 90: return OUString("checkedBarBlack");
-        case 91: return OUString("checkedBarColor");
-        case 92: return OUString("checkered");
-        case 93: return OUString("christmasTree");
-        case 94: return OUString("circlesLines");
-        case 95: return OUString("circlesRectangles");
-        case 96: return OUString("classicalWave");
-        case 97: return OUString("clocks");
-        case 98: return OUString("compass");
-        case 99: return OUString("confetti");
-        case 100: return OUString("confettiGrays");
-        case 101: return OUString("confettiOutline");
-        case 102: return OUString("confettiStreamers");
-        case 103: return OUString("confettiWhite");
-        case 104: return OUString("cornerTriangles");
-        case 105: return OUString("couponCutoutDashes");
-        case 106: return OUString("couponCutoutDots");
-        case 107: return OUString("crazyMaze");
-        case 108: return OUString("creaturesButterfly");
-        case 109: return OUString("creaturesFish");
-        case 110: return OUString("creaturesInsects");
-        case 111: return OUString("creaturesLadyBug");
-        case 112: return OUString("crossStitch");
-        case 113: return OUString("cup");
-        case 114: return OUString("decoArch");
-        case 115: return OUString("decoArchColor");
-        case 116: return OUString("decoBlocks");
-        case 117: return OUString("diamondsGray");
-        case 118: return OUString("doubleD");
-        case 119: return OUString("doubleDiamonds");
-        case 120: return OUString("earth1");
-        case 121: return OUString("earth2");
-        case 122: return OUString("eclipsingSquares1");
-        case 123: return OUString("eclipsingSquares2");
-        case 124: return OUString("eggsBlack");
-        case 125: return OUString("fans");
-        case 126: return OUString("film");
-        case 127: return OUString("firecrackers");
-        case 128: return OUString("flowersBlockPrint");
-        case 129: return OUString("flowersDaisies");
-        case 130: return OUString("flowersModern1");
-        case 131: return OUString("flowersModern2");
-        case 132: return OUString("flowersPansy");
-        case 133: return OUString("flowersRedRose");
-        case 134: return OUString("flowersRoses");
-        case 135: return OUString("flowersTeacup");
-        case 136: return OUString("flowersTiny");
-        case 137: return OUString("gems");
-        case 138: return OUString("gingerbreadMan");
-        case 139: return OUString("gradient");
-        case 140: return OUString("handmade1");
-        case 141: return OUString("handmade2");
-        case 142: return OUString("heartBalloon");
-        case 143: return OUString("heartGray");
-        case 144: return OUString("hearts");
-        case 145: return OUString("heebieJeebies");
-        case 146: return OUString("holly");
-        case 147: return OUString("houseFunky");
-        case 148: return OUString("hypnotic");
-        case 149: return OUString("iceCreamCones");
-        case 150: return OUString("lightBulb");
-        case 151: return OUString("lightning1");
-        case 152: return OUString("lightning2");
-        case 153: return OUString("mapPins");
-        case 154: return OUString("mapleLeaf");
-        case 155: return OUString("mapleMuffins");
-        case 156: return OUString("marquee");
-        case 157: return OUString("marqueeToothed");
-        case 158: return OUString("moons");
-        case 159: return OUString("mosaic");
-        case 160: return OUString("musicNotes");
-        case 161: return OUString("northwest");
-        case 162: return OUString("ovals");
-        case 163: return OUString("packages");
-        case 164: return OUString("palmsBlack");
-        case 165: return OUString("palmsColor");
-        case 166: return OUString("paperClips");
-        case 167: return OUString("papyrus");
-        case 168: return OUString("partyFavor");
-        case 169: return OUString("partyGlass");
-        case 170: return OUString("pencils");
-        case 171: return OUString("people");
-        case 172: return OUString("peopleWaving");
-        case 173: return OUString("peopleHats");
-        case 174: return OUString("poinsettias");
-        case 175: return OUString("postageStamp");
-        case 176: return OUString("pumpkin1");
-        case 177: return OUString("pushPinNote2");
-        case 178: return OUString("pushPinNote1");
-        case 179: return OUString("pyramids");
-        case 180: return OUString("pyramidsAbove");
-        case 181: return OUString("quadrants");
-        case 182: return OUString("rings");
-        case 183: return OUString("safari");
-        case 184: return OUString("sawtooth");
-        case 185: return OUString("sawtoothGray");
-        case 186: return OUString("scaredCat");
-        case 187: return OUString("seattle");
-        case 188: return OUString("shadowedSquares");
-        case 189: return OUString("sharksTeeth");
-        case 190: return OUString("shorebirdTracks");
-        case 191: return OUString("skyrocket");
-        case 192: return OUString("snowflakeFancy");
-        case 193: return OUString("snowflakes");
-        case 194: return OUString("sombrero");
-        case 195: return OUString("southwest");
-        case 196: return OUString("stars");
-        case 197: return OUString("starsTop");
-        case 198: return OUString("stars3d");
-        case 199: return OUString("starsBlack");
-        case 200: return OUString("starsShadowed");
-        case 201: return OUString("sun");
-        case 202: return OUString("swirligig");
-        case 203: return OUString("tornPaper");
-        case 204: return OUString("tornPaperBlack");
-        case 205: return OUString("trees");
-        case 206: return OUString("triangleParty");
-        case 207: return OUString("triangles");
-        case 208: return OUString("tribal1");
-        case 209: return OUString("tribal2");
-        case 210: return OUString("tribal3");
-        case 211: return OUString("tribal4");
-        case 212: return OUString("tribal5");
-        case 213: return OUString("tribal6");
-        case 214: return OUString("twistedLines1");
-        case 215: return OUString("twistedLines2");
-        case 216: return OUString("vine");
-        case 217: return OUString("waveline");
-        case 218: return OUString("weavingAngles");
-        case 219: return OUString("weavingBraid");
-        case 220: return OUString("weavingRibbon");
-        case 221: return OUString("weavingStrips");
-        case 222: return OUString("whiteFlowers");
-        case 223: return OUString("woodwork");
-        case 224: return OUString("xIllusions");
-        case 225: return OUString("zanyTriangles");
-        case 226: return OUString("zigZag");
-        case 227: return OUString("zigZagStitch");
+        case NS_ooxml::LN_Value_ST_Border_nil: return OUString("nil");
+        case NS_ooxml::LN_Value_ST_Border_none: return OUString("none");
+        case NS_ooxml::LN_Value_ST_Border_single: return OUString("single");
+        case NS_ooxml::LN_Value_ST_Border_thick: return OUString("thick");
+        case NS_ooxml::LN_Value_ST_Border_double: return OUString("double");
+        case NS_ooxml::LN_Value_ST_Border_dotted: return OUString("dotted");
+        case NS_ooxml::LN_Value_ST_Border_dashed: return OUString("dashed");
+        case NS_ooxml::LN_Value_ST_Border_dotDash: return OUString("dotDash");
+        case NS_ooxml::LN_Value_ST_Border_dotDotDash: return OUString("dotDotDash");
+        case NS_ooxml::LN_Value_ST_Border_triple: return OUString("triple");
+        case NS_ooxml::LN_Value_ST_Border_thinThickSmallGap: return OUString("thinThickSmallGap");
+        case NS_ooxml::LN_Value_ST_Border_thickThinSmallGap: return OUString("thickThinSmallGap");
+        case NS_ooxml::LN_Value_ST_Border_thinThickThinSmallGap: return OUString("thinThickThinSmallGap");
+        case NS_ooxml::LN_Value_ST_Border_thinThickMediumGap: return OUString("thinThickMediumGap");
+        case NS_ooxml::LN_Value_ST_Border_thickThinMediumGap: return OUString("thickThinMediumGap");
+        case NS_ooxml::LN_Value_ST_Border_thinThickThinMediumGap: return OUString("thinThickThinMediumGap");
+        case NS_ooxml::LN_Value_ST_Border_thinThickLargeGap: return OUString("thinThickLargeGap");
+        case NS_ooxml::LN_Value_ST_Border_thickThinLargeGap: return OUString("thickThinLargeGap");
+        case NS_ooxml::LN_Value_ST_Border_thinThickThinLargeGap: return OUString("thinThickThinLargeGap");
+        case NS_ooxml::LN_Value_ST_Border_wave: return OUString("wave");
+        case NS_ooxml::LN_Value_ST_Border_doubleWave: return OUString("doubleWave");
+        case NS_ooxml::LN_Value_ST_Border_dashSmallGap: return OUString("dashSmallGap");
+        case NS_ooxml::LN_Value_ST_Border_dashDotStroked: return OUString("dashDotStroked");
+        case NS_ooxml::LN_Value_ST_Border_threeDEmboss: return OUString("threeDEmboss");
+        case NS_ooxml::LN_Value_ST_Border_threeDEngrave: return OUString("threeDEngrave");
+        case NS_ooxml::LN_Value_ST_Border_outset: return OUString("outset");
+        case NS_ooxml::LN_Value_ST_Border_inset: return OUString("inset");
+        case NS_ooxml::LN_Value_ST_Border_apples: return OUString("apples");
+        case NS_ooxml::LN_Value_ST_Border_archedScallops: return OUString("archedScallops");
+        case NS_ooxml::LN_Value_ST_Border_babyPacifier: return OUString("babyPacifier");
+        case NS_ooxml::LN_Value_ST_Border_babyRattle: return OUString("babyRattle");
+        case NS_ooxml::LN_Value_ST_Border_balloons3Colors: return OUString("balloons3Colors");
+        case NS_ooxml::LN_Value_ST_Border_balloonsHotAir: return OUString("balloonsHotAir");
+        case NS_ooxml::LN_Value_ST_Border_basicBlackDashes: return OUString("basicBlackDashes");
+        case NS_ooxml::LN_Value_ST_Border_basicBlackDots: return OUString("basicBlackDots");
+        case NS_ooxml::LN_Value_ST_Border_basicBlackSquares: return OUString("basicBlackSquares");
+        case NS_ooxml::LN_Value_ST_Border_basicThinLines: return OUString("basicThinLines");
+        case NS_ooxml::LN_Value_ST_Border_basicWhiteDashes: return OUString("basicWhiteDashes");
+        case NS_ooxml::LN_Value_ST_Border_basicWhiteDots: return OUString("basicWhiteDots");
+        case NS_ooxml::LN_Value_ST_Border_basicWhiteSquares: return OUString("basicWhiteSquares");
+        case NS_ooxml::LN_Value_ST_Border_basicWideInline: return OUString("basicWideInline");
+        case NS_ooxml::LN_Value_ST_Border_basicWideMidline: return OUString("basicWideMidline");
+        case NS_ooxml::LN_Value_ST_Border_basicWideOutline: return OUString("basicWideOutline");
+        case NS_ooxml::LN_Value_ST_Border_bats: return OUString("bats");
+        case NS_ooxml::LN_Value_ST_Border_birds: return OUString("birds");
+        case NS_ooxml::LN_Value_ST_Border_birdsFlight: return OUString("birdsFlight");
+        case NS_ooxml::LN_Value_ST_Border_cabins: return OUString("cabins");
+        case NS_ooxml::LN_Value_ST_Border_cakeSlice: return OUString("cakeSlice");
+        case NS_ooxml::LN_Value_ST_Border_candyCorn: return OUString("candyCorn");
+        case NS_ooxml::LN_Value_ST_Border_celticKnotwork: return OUString("celticKnotwork");
+        case NS_ooxml::LN_Value_ST_Border_certificateBanner: return OUString("certificateBanner");
+        case NS_ooxml::LN_Value_ST_Border_chainLink: return OUString("chainLink");
+        case NS_ooxml::LN_Value_ST_Border_champagneBottle: return OUString("champagneBottle");
+        case NS_ooxml::LN_Value_ST_Border_checkedBarBlack: return OUString("checkedBarBlack");
+        case NS_ooxml::LN_Value_ST_Border_checkedBarColor: return OUString("checkedBarColor");
+        case NS_ooxml::LN_Value_ST_Border_checkered: return OUString("checkered");
+        case NS_ooxml::LN_Value_ST_Border_christmasTree: return OUString("christmasTree");
+        case NS_ooxml::LN_Value_ST_Border_circlesLines: return OUString("circlesLines");
+        case NS_ooxml::LN_Value_ST_Border_circlesRectangles: return OUString("circlesRectangles");
+        case NS_ooxml::LN_Value_ST_Border_classicalWave: return OUString("classicalWave");
+        case NS_ooxml::LN_Value_ST_Border_clocks: return OUString("clocks");
+        case NS_ooxml::LN_Value_ST_Border_compass: return OUString("compass");
+        case NS_ooxml::LN_Value_ST_Border_confetti: return OUString("confetti");
+        case NS_ooxml::LN_Value_ST_Border_confettiGrays: return OUString("confettiGrays");
+        case NS_ooxml::LN_Value_ST_Border_confettiOutline: return OUString("confettiOutline");
+        case NS_ooxml::LN_Value_ST_Border_confettiStreamers: return OUString("confettiStreamers");
+        case NS_ooxml::LN_Value_ST_Border_confettiWhite: return OUString("confettiWhite");
+        case NS_ooxml::LN_Value_ST_Border_cornerTriangles: return OUString("cornerTriangles");
+        case NS_ooxml::LN_Value_ST_Border_couponCutoutDashes: return OUString("couponCutoutDashes");
+        case NS_ooxml::LN_Value_ST_Border_couponCutoutDots: return OUString("couponCutoutDots");
+        case NS_ooxml::LN_Value_ST_Border_crazyMaze: return OUString("crazyMaze");
+        case NS_ooxml::LN_Value_ST_Border_creaturesButterfly: return OUString("creaturesButterfly");
+        case NS_ooxml::LN_Value_ST_Border_creaturesFish: return OUString("creaturesFish");
+        case NS_ooxml::LN_Value_ST_Border_creaturesInsects: return OUString("creaturesInsects");
+        case NS_ooxml::LN_Value_ST_Border_creaturesLadyBug: return OUString("creaturesLadyBug");
+        case NS_ooxml::LN_Value_ST_Border_crossStitch: return OUString("crossStitch");
+        case NS_ooxml::LN_Value_ST_Border_cup: return OUString("cup");
+        case NS_ooxml::LN_Value_ST_Border_decoArch: return OUString("decoArch");
+        case NS_ooxml::LN_Value_ST_Border_decoArchColor: return OUString("decoArchColor");
+        case NS_ooxml::LN_Value_ST_Border_decoBlocks: return OUString("decoBlocks");
+        case NS_ooxml::LN_Value_ST_Border_diamondsGray: return OUString("diamondsGray");
+        case NS_ooxml::LN_Value_ST_Border_doubleD: return OUString("doubleD");
+        case NS_ooxml::LN_Value_ST_Border_doubleDiamonds: return OUString("doubleDiamonds");
+        case NS_ooxml::LN_Value_ST_Border_earth1: return OUString("earth1");
+        case NS_ooxml::LN_Value_ST_Border_earth2: return OUString("earth2");
+        case NS_ooxml::LN_Value_ST_Border_eclipsingSquares1: return OUString("eclipsingSquares1");
+        case NS_ooxml::LN_Value_ST_Border_eclipsingSquares2: return OUString("eclipsingSquares2");
+        case NS_ooxml::LN_Value_ST_Border_eggsBlack: return OUString("eggsBlack");
+        case NS_ooxml::LN_Value_ST_Border_fans: return OUString("fans");
+        case NS_ooxml::LN_Value_ST_Border_film: return OUString("film");
+        case NS_ooxml::LN_Value_ST_Border_firecrackers: return OUString("firecrackers");
+        case NS_ooxml::LN_Value_ST_Border_flowersBlockPrint: return OUString("flowersBlockPrint");
+        case NS_ooxml::LN_Value_ST_Border_flowersDaisies: return OUString("flowersDaisies");
+        case NS_ooxml::LN_Value_ST_Border_flowersModern1: return OUString("flowersModern1");
+        case NS_ooxml::LN_Value_ST_Border_flowersModern2: return OUString("flowersModern2");
+        case NS_ooxml::LN_Value_ST_Border_flowersPansy: return OUString("flowersPansy");
+        case NS_ooxml::LN_Value_ST_Border_flowersRedRose: return OUString("flowersRedRose");
+        case NS_ooxml::LN_Value_ST_Border_flowersRoses: return OUString("flowersRoses");
+        case NS_ooxml::LN_Value_ST_Border_flowersTeacup: return OUString("flowersTeacup");
+        case NS_ooxml::LN_Value_ST_Border_flowersTiny: return OUString("flowersTiny");
+        case NS_ooxml::LN_Value_ST_Border_gems: return OUString("gems");
+        case NS_ooxml::LN_Value_ST_Border_gingerbreadMan: return OUString("gingerbreadMan");
+        case NS_ooxml::LN_Value_ST_Border_gradient: return OUString("gradient");
+        case NS_ooxml::LN_Value_ST_Border_handmade1: return OUString("handmade1");
+        case NS_ooxml::LN_Value_ST_Border_handmade2: return OUString("handmade2");
+        case NS_ooxml::LN_Value_ST_Border_heartBalloon: return OUString("heartBalloon");
+        case NS_ooxml::LN_Value_ST_Border_heartGray: return OUString("heartGray");
+        case NS_ooxml::LN_Value_ST_Border_hearts: return OUString("hearts");
+        case NS_ooxml::LN_Value_ST_Border_heebieJeebies: return OUString("heebieJeebies");
+        case NS_ooxml::LN_Value_ST_Border_holly: return OUString("holly");
+        case NS_ooxml::LN_Value_ST_Border_houseFunky: return OUString("houseFunky");
+        case NS_ooxml::LN_Value_ST_Border_hypnotic: return OUString("hypnotic");
+        case NS_ooxml::LN_Value_ST_Border_iceCreamCones: return OUString("iceCreamCones");
+        case NS_ooxml::LN_Value_ST_Border_lightBulb: return OUString("lightBulb");
+        case NS_ooxml::LN_Value_ST_Border_lightning1: return OUString("lightning1");
+        case NS_ooxml::LN_Value_ST_Border_lightning2: return OUString("lightning2");
+        case NS_ooxml::LN_Value_ST_Border_mapPins: return OUString("mapPins");
+        case NS_ooxml::LN_Value_ST_Border_mapleLeaf: return OUString("mapleLeaf");
+        case NS_ooxml::LN_Value_ST_Border_mapleMuffins: return OUString("mapleMuffins");
+        case NS_ooxml::LN_Value_ST_Border_marquee: return OUString("marquee");
+        case NS_ooxml::LN_Value_ST_Border_marqueeToothed: return OUString("marqueeToothed");
+        case NS_ooxml::LN_Value_ST_Border_moons: return OUString("moons");
+        case NS_ooxml::LN_Value_ST_Border_mosaic: return OUString("mosaic");
+        case NS_ooxml::LN_Value_ST_Border_musicNotes: return OUString("musicNotes");
+        case NS_ooxml::LN_Value_ST_Border_northwest: return OUString("northwest");
+        case NS_ooxml::LN_Value_ST_Border_ovals: return OUString("ovals");
+        case NS_ooxml::LN_Value_ST_Border_packages: return OUString("packages");
+        case NS_ooxml::LN_Value_ST_Border_palmsBlack: return OUString("palmsBlack");
+        case NS_ooxml::LN_Value_ST_Border_palmsColor: return OUString("palmsColor");
+        case NS_ooxml::LN_Value_ST_Border_paperClips: return OUString("paperClips");
+        case NS_ooxml::LN_Value_ST_Border_papyrus: return OUString("papyrus");
+        case NS_ooxml::LN_Value_ST_Border_partyFavor: return OUString("partyFavor");
+        case NS_ooxml::LN_Value_ST_Border_partyGlass: return OUString("partyGlass");
+        case NS_ooxml::LN_Value_ST_Border_pencils: return OUString("pencils");
+        case NS_ooxml::LN_Value_ST_Border_people: return OUString("people");
+        case NS_ooxml::LN_Value_ST_Border_peopleWaving: return OUString("peopleWaving");
+        case NS_ooxml::LN_Value_ST_Border_peopleHats: return OUString("peopleHats");
+        case NS_ooxml::LN_Value_ST_Border_poinsettias: return OUString("poinsettias");
+        case NS_ooxml::LN_Value_ST_Border_postageStamp: return OUString("postageStamp");
+        case NS_ooxml::LN_Value_ST_Border_pumpkin1: return OUString("pumpkin1");
+        case NS_ooxml::LN_Value_ST_Border_pushPinNote2: return OUString("pushPinNote2");
+        case NS_ooxml::LN_Value_ST_Border_pushPinNote1: return OUString("pushPinNote1");
+        case NS_ooxml::LN_Value_ST_Border_pyramids: return OUString("pyramids");
+        case NS_ooxml::LN_Value_ST_Border_pyramidsAbove: return OUString("pyramidsAbove");
+        case NS_ooxml::LN_Value_ST_Border_quadrants: return OUString("quadrants");
+        case NS_ooxml::LN_Value_ST_Border_rings: return OUString("rings");
+        case NS_ooxml::LN_Value_ST_Border_safari: return OUString("safari");
+        case NS_ooxml::LN_Value_ST_Border_sawtooth: return OUString("sawtooth");
+        case NS_ooxml::LN_Value_ST_Border_sawtoothGray: return OUString("sawtoothGray");
+        case NS_ooxml::LN_Value_ST_Border_scaredCat: return OUString("scaredCat");
+        case NS_ooxml::LN_Value_ST_Border_seattle: return OUString("seattle");
+        case NS_ooxml::LN_Value_ST_Border_shadowedSquares: return OUString("shadowedSquares");
+        case NS_ooxml::LN_Value_ST_Border_sharksTeeth: return OUString("sharksTeeth");
+        case NS_ooxml::LN_Value_ST_Border_shorebirdTracks: return OUString("shorebirdTracks");
+        case NS_ooxml::LN_Value_ST_Border_skyrocket: return OUString("skyrocket");
+        case NS_ooxml::LN_Value_ST_Border_snowflakeFancy: return OUString("snowflakeFancy");
+        case NS_ooxml::LN_Value_ST_Border_snowflakes: return OUString("snowflakes");
+        case NS_ooxml::LN_Value_ST_Border_sombrero: return OUString("sombrero");
+        case NS_ooxml::LN_Value_ST_Border_southwest: return OUString("southwest");
+        case NS_ooxml::LN_Value_ST_Border_stars: return OUString("stars");
+        case NS_ooxml::LN_Value_ST_Border_starsTop: return OUString("starsTop");
+        case NS_ooxml::LN_Value_ST_Border_stars3d: return OUString("stars3d");
+        case NS_ooxml::LN_Value_ST_Border_starsBlack: return OUString("starsBlack");
+        case NS_ooxml::LN_Value_ST_Border_starsShadowed: return OUString("starsShadowed");
+        case NS_ooxml::LN_Value_ST_Border_sun: return OUString("sun");
+        case NS_ooxml::LN_Value_ST_Border_swirligig: return OUString("swirligig");
+        case NS_ooxml::LN_Value_ST_Border_tornPaper: return OUString("tornPaper");
+        case NS_ooxml::LN_Value_ST_Border_tornPaperBlack: return OUString("tornPaperBlack");
+        case NS_ooxml::LN_Value_ST_Border_trees: return OUString("trees");
+        case NS_ooxml::LN_Value_ST_Border_triangleParty: return OUString("triangleParty");
+        case NS_ooxml::LN_Value_ST_Border_triangles: return OUString("triangles");
+        case NS_ooxml::LN_Value_ST_Border_tribal1: return OUString("tribal1");
+        case NS_ooxml::LN_Value_ST_Border_tribal2: return OUString("tribal2");
+        case NS_ooxml::LN_Value_ST_Border_tribal3: return OUString("tribal3");
+        case NS_ooxml::LN_Value_ST_Border_tribal4: return OUString("tribal4");
+        case NS_ooxml::LN_Value_ST_Border_tribal5: return OUString("tribal5");
+        case NS_ooxml::LN_Value_ST_Border_tribal6: return OUString("tribal6");
+        case NS_ooxml::LN_Value_ST_Border_twistedLines1: return OUString("twistedLines1");
+        case NS_ooxml::LN_Value_ST_Border_twistedLines2: return OUString("twistedLines2");
+        case NS_ooxml::LN_Value_ST_Border_vine: return OUString("vine");
+        case NS_ooxml::LN_Value_ST_Border_waveline: return OUString("waveline");
+        case NS_ooxml::LN_Value_ST_Border_weavingAngles: return OUString("weavingAngles");
+        case NS_ooxml::LN_Value_ST_Border_weavingBraid: return OUString("weavingBraid");
+        case NS_ooxml::LN_Value_ST_Border_weavingRibbon: return OUString("weavingRibbon");
+        case NS_ooxml::LN_Value_ST_Border_weavingStrips: return OUString("weavingStrips");
+        case NS_ooxml::LN_Value_ST_Border_whiteFlowers: return OUString("whiteFlowers");
+        case NS_ooxml::LN_Value_ST_Border_woodwork: return OUString("woodwork");
+        case NS_ooxml::LN_Value_ST_Border_xIllusions: return OUString("xIllusions");
+        case NS_ooxml::LN_Value_ST_Border_zanyTriangles: return OUString("zanyTriangles");
+        case NS_ooxml::LN_Value_ST_Border_zigZag: return OUString("zigZag");
+        case NS_ooxml::LN_Value_ST_Border_zigZagStitch: return OUString("zigZagStitch");
         default: break;
     }
     return OUString();
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index aaddd5e5e4a7..4d46edd9190d 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -16713,197 +16713,197 @@
       <attribute name="val" tokenid="ooxml:CT_TextEffect_val" action="setValue"/>
     </resource>
     <resource name="ST_Border" resource="List">
-      <value tokenid="255">nil</value>
-      <value tokenid="0">none</value>
-      <value tokenid="1">single</value>
-      <value tokenid="2">thick</value>
-      <value tokenid="3">double</value>
-      <value tokenid="6">dotted</value>
-      <value tokenid="7">dashed</value>
-      <value tokenid="8">dotDash</value>
-      <value tokenid="9">dotDotDash</value>
-      <value tokenid="10">triple</value>
-      <value tokenid="11">thinThickSmallGap</value>
-      <value tokenid="12">thickThinSmallGap</value>
-      <value tokenid="13">thinThickThinSmallGap</value>
-      <value tokenid="14">thinThickMediumGap</value>
-      <value tokenid="15">thickThinMediumGap</value>
-      <value tokenid="16">thinThickThinMediumGap</value>
-      <value tokenid="17">thinThickLargeGap</value>
-      <value tokenid="18">thickThinLargeGap</value>
-      <value tokenid="19">thinThickThinLargeGap</value>
-      <value tokenid="20">wave</value>
-      <value tokenid="21">doubleWave</value>
-      <value tokenid="22">dashSmallGap</value>
-      <value tokenid="23">dashDotStroked</value>
-      <value tokenid="24">threeDEmboss</value>
-      <value tokenid="25">threeDEngrave</value>
-      <value tokenid="26">outset</value>
-      <value tokenid="27">inset</value>
-      <value tokenid="64">apples</value>
-      <value tokenid="65">archedScallops</value>
-      <value tokenid="66">babyPacifier</value>
-      <value tokenid="67">babyRattle</value>
-      <value tokenid="68">balloons3Colors</value>
-      <value tokenid="69">balloonsHotAir</value>
-      <value tokenid="70">basicBlackDashes</value>
-      <value tokenid="71">basicBlackDots</value>
-      <value tokenid="72">basicBlackSquares</value>
-      <value tokenid="73">basicThinLines</value>
-      <value tokenid="74">basicWhiteDashes</value>
-      <value tokenid="75">basicWhiteDots</value>
-      <value tokenid="76">basicWhiteSquares</value>
-      <value tokenid="77">basicWideInline</value>
-      <value tokenid="78">basicWideMidline</value>
-      <value tokenid="79">basicWideOutline</value>
-      <value tokenid="80">bats</value>
-      <value tokenid="81">birds</value>
-      <value tokenid="82">birdsFlight</value>
-      <value tokenid="83">cabins</value>
-      <value tokenid="84">cakeSlice</value>
-      <value tokenid="85">candyCorn</value>
-      <value tokenid="86">celticKnotwork</value>
-      <value tokenid="87">certificateBanner</value>
-      <value tokenid="88">chainLink</value>
-      <value tokenid="89">champagneBottle</value>
-      <value tokenid="90">checkedBarBlack</value>
-      <value tokenid="91">checkedBarColor</value>
-      <value tokenid="92">checkered</value>
-      <value tokenid="93">christmasTree</value>
-      <value tokenid="94">circlesLines</value>
-      <value tokenid="95">circlesRectangles</value>
-      <value tokenid="96">classicalWave</value>
-      <value tokenid="97">clocks</value>
-      <value tokenid="98">compass</value>
-      <value tokenid="99">confetti</value>
-      <value tokenid="100">confettiGrays</value>
-      <value tokenid="101">confettiOutline</value>
-      <value tokenid="102">confettiStreamers</value>
-      <value tokenid="103">confettiWhite</value>
-      <value tokenid="104">cornerTriangles</value>
-      <value tokenid="105">couponCutoutDashes</value>
-      <value tokenid="106">couponCutoutDots</value>
-      <value tokenid="107">crazyMaze</value>
-      <value tokenid="108">creaturesButterfly</value>
-      <value tokenid="109">creaturesFish</value>
-      <value tokenid="110">creaturesInsects</value>
-      <value tokenid="111">creaturesLadyBug</value>
-      <value tokenid="112">crossStitch</value>
-      <value tokenid="113">cup</value>
-      <value tokenid="114">decoArch</value>
-      <value tokenid="115">decoArchColor</value>
-      <value tokenid="116">decoBlocks</value>
-      <value tokenid="117">diamondsGray</value>
-      <value tokenid="118">doubleD</value>
-      <value tokenid="119">doubleDiamonds</value>
-      <value tokenid="120">earth1</value>
-      <value tokenid="121">earth2</value>
-      <value tokenid="122">eclipsingSquares1</value>
-      <value tokenid="123">eclipsingSquares2</value>
-      <value tokenid="124">eggsBlack</value>
-      <value tokenid="125">fans</value>
-      <value tokenid="126">film</value>
-      <value tokenid="127">firecrackers</value>
-      <value tokenid="128">flowersBlockPrint</value>
-      <value tokenid="129">flowersDaisies</value>
-      <value tokenid="130">flowersModern1</value>
-      <value tokenid="131">flowersModern2</value>
-      <value tokenid="132">flowersPansy</value>
-      <value tokenid="133">flowersRedRose</value>
-      <value tokenid="134">flowersRoses</value>
-      <value tokenid="135">flowersTeacup</value>
-      <value tokenid="136">flowersTiny</value>
-      <value tokenid="137">gems</value>
-      <value tokenid="138">gingerbreadMan</value>
-      <value tokenid="139">gradient</value>
-      <value tokenid="140">handmade1</value>
-      <value tokenid="141">handmade2</value>
-      <value tokenid="142">heartBalloon</value>
-      <value tokenid="143">heartGray</value>
-      <value tokenid="144">hearts</value>
-      <value tokenid="145">heebieJeebies</value>
-      <value tokenid="146">holly</value>
-      <value tokenid="147">houseFunky</value>
-      <value tokenid="148">hypnotic</value>
-      <value tokenid="149">iceCreamCones</value>
-      <value tokenid="150">lightBulb</value>
-      <value tokenid="151">lightning1</value>
-      <value tokenid="152">lightning2</value>
-      <value tokenid="153">mapPins</value>
-      <value tokenid="154">mapleLeaf</value>
-      <value tokenid="155">mapleMuffins</value>
-      <value tokenid="156">marquee</value>
-      <value tokenid="157">marqueeToothed</value>
-      <value tokenid="158">moons</value>
-      <value tokenid="159">mosaic</value>
-      <value tokenid="160">musicNotes</value>
-      <value tokenid="161">northwest</value>
-      <value tokenid="162">ovals</value>
-      <value tokenid="163">packages</value>
-      <value tokenid="164">palmsBlack</value>
-      <value tokenid="165">palmsColor</value>
-      <value tokenid="166">paperClips</value>
-      <value tokenid="167">papyrus</value>
-      <value tokenid="168">partyFavor</value>
-      <value tokenid="169">partyGlass</value>
-      <value tokenid="170">pencils</value>
-      <value tokenid="171">people</value>
-      <value tokenid="172">peopleWaving</value>
-      <value tokenid="173">peopleHats</value>
-      <value tokenid="174">poinsettias</value>
-      <value tokenid="175">postageStamp</value>
-      <value tokenid="176">pumpkin1</value>
-      <value tokenid="177">pushPinNote2</value>
-      <value tokenid="178">pushPinNote1</value>
-      <value tokenid="179">pyramids</value>
-      <value tokenid="180">pyramidsAbove</value>
-      <value tokenid="181">quadrants</value>
-      <value tokenid="182">rings</value>
-      <value tokenid="183">safari</value>
-      <value tokenid="184">sawtooth</value>
-      <value tokenid="185">sawtoothGray</value>
-      <value tokenid="186">scaredCat</value>
-      <value tokenid="187">seattle</value>
-      <value tokenid="188">shadowedSquares</value>
-      <value tokenid="189">sharksTeeth</value>
-      <value tokenid="190">shorebirdTracks</value>
-      <value tokenid="191">skyrocket</value>
-      <value tokenid="192">snowflakeFancy</value>
-      <value tokenid="193">snowflakes</value>
-      <value tokenid="194">sombrero</value>
-      <value tokenid="195">southwest</value>
-      <value tokenid="196">stars</value>
-      <value tokenid="197">starsTop</value>
-      <value tokenid="198">stars3d</value>
-      <value tokenid="199">starsBlack</value>
-      <value tokenid="200">starsShadowed</value>
-      <value tokenid="201">sun</value>
-      <value tokenid="202">swirligig</value>
-      <value tokenid="203">tornPaper</value>
-      <value tokenid="204">tornPaperBlack</value>
-      <value tokenid="205">trees</value>
-      <value tokenid="206">triangleParty</value>
-      <value tokenid="207">triangles</value>
-      <value tokenid="208">tribal1</value>
-      <value tokenid="209">tribal2</value>
-      <value tokenid="210">tribal3</value>
-      <value tokenid="211">tribal4</value>
-      <value tokenid="212">tribal5</value>
-      <value tokenid="213">tribal6</value>
-      <value tokenid="214">twistedLines1</value>
-      <value tokenid="215">twistedLines2</value>
-      <value tokenid="216">vine</value>
-      <value tokenid="217">waveline</value>
-      <value tokenid="218">weavingAngles</value>
-      <value tokenid="219">weavingBraid</value>
-      <value tokenid="220">weavingRibbon</value>
-      <value tokenid="221">weavingStrips</value>
-      <value tokenid="222">whiteFlowers</value>
-      <value tokenid="223">woodwork</value>
-      <value tokenid="224">xIllusions</value>
-      <value tokenid="225">zanyTriangles</value>
-      <value tokenid="226">zigZag</value>
-      <value tokenid="227">zigZagStitch</value>
+      <value tokenid="ooxml:Value_ST_Border_nil">nil</value>
+      <value tokenid="ooxml:Value_ST_Border_none">none</value>
+      <value tokenid="ooxml:Value_ST_Border_single">single</value>
+      <value tokenid="ooxml:Value_ST_Border_thick">thick</value>
+      <value tokenid="ooxml:Value_ST_Border_double">double</value>
+      <value tokenid="ooxml:Value_ST_Border_dotted">dotted</value>
+      <value tokenid="ooxml:Value_ST_Border_dashed">dashed</value>
+      <value tokenid="ooxml:Value_ST_Border_dotDash">dotDash</value>
+      <value tokenid="ooxml:Value_ST_Border_dotDotDash">dotDotDash</value>
+      <value tokenid="ooxml:Value_ST_Border_triple">triple</value>
+      <value tokenid="ooxml:Value_ST_Border_thinThickSmallGap">thinThickSmallGap</value>
+      <value tokenid="ooxml:Value_ST_Border_thickThinSmallGap">thickThinSmallGap</value>
+      <value tokenid="ooxml:Value_ST_Border_thinThickThinSmallGap">thinThickThinSmallGap</value>
+      <value tokenid="ooxml:Value_ST_Border_thinThickMediumGap">thinThickMediumGap</value>
+      <value tokenid="ooxml:Value_ST_Border_thickThinMediumGap">thickThinMediumGap</value>
+      <value tokenid="ooxml:Value_ST_Border_thinThickThinMediumGap">thinThickThinMediumGap</value>
+      <value tokenid="ooxml:Value_ST_Border_thinThickLargeGap">thinThickLargeGap</value>
+      <value tokenid="ooxml:Value_ST_Border_thickThinLargeGap">thickThinLargeGap</value>
+      <value tokenid="ooxml:Value_ST_Border_thinThickThinLargeGap">thinThickThinLargeGap</value>
+      <value tokenid="ooxml:Value_ST_Border_wave">wave</value>
+      <value tokenid="ooxml:Value_ST_Border_doubleWave">doubleWave</value>
+      <value tokenid="ooxml:Value_ST_Border_dashSmallGap">dashSmallGap</value>
+      <value tokenid="ooxml:Value_ST_Border_dashDotStroked">dashDotStroked</value>
+      <value tokenid="ooxml:Value_ST_Border_threeDEmboss">threeDEmboss</value>
+      <value tokenid="ooxml:Value_ST_Border_threeDEngrave">threeDEngrave</value>
+      <value tokenid="ooxml:Value_ST_Border_outset">outset</value>
+      <value tokenid="ooxml:Value_ST_Border_inset">inset</value>
+      <value tokenid="ooxml:Value_ST_Border_apples">apples</value>
+      <value tokenid="ooxml:Value_ST_Border_archedScallops">archedScallops</value>
+      <value tokenid="ooxml:Value_ST_Border_babyPacifier">babyPacifier</value>
+      <value tokenid="ooxml:Value_ST_Border_babyRattle">babyRattle</value>
+      <value tokenid="ooxml:Value_ST_Border_balloons3Colors">balloons3Colors</value>
+      <value tokenid="ooxml:Value_ST_Border_balloonsHotAir">balloonsHotAir</value>
+      <value tokenid="ooxml:Value_ST_Border_basicBlackDashes">basicBlackDashes</value>
+      <value tokenid="ooxml:Value_ST_Border_basicBlackDots">basicBlackDots</value>
+      <value tokenid="ooxml:Value_ST_Border_basicBlackSquares">basicBlackSquares</value>
+      <value tokenid="ooxml:Value_ST_Border_basicThinLines">basicThinLines</value>
+      <value tokenid="ooxml:Value_ST_Border_basicWhiteDashes">basicWhiteDashes</value>
+      <value tokenid="ooxml:Value_ST_Border_basicWhiteDots">basicWhiteDots</value>
+      <value tokenid="ooxml:Value_ST_Border_basicWhiteSquares">basicWhiteSquares</value>
+      <value tokenid="ooxml:Value_ST_Border_basicWideInline">basicWideInline</value>
+      <value tokenid="ooxml:Value_ST_Border_basicWideMidline">basicWideMidline</value>
+      <value tokenid="ooxml:Value_ST_Border_basicWideOutline">basicWideOutline</value>
+      <value tokenid="ooxml:Value_ST_Border_bats">bats</value>
+      <value tokenid="ooxml:Value_ST_Border_birds">birds</value>
+      <value tokenid="ooxml:Value_ST_Border_birdsFlight">birdsFlight</value>
+      <value tokenid="ooxml:Value_ST_Border_cabins">cabins</value>
+      <value tokenid="ooxml:Value_ST_Border_cakeSlice">cakeSlice</value>
+      <value tokenid="ooxml:Value_ST_Border_candyCorn">candyCorn</value>
+      <value tokenid="ooxml:Value_ST_Border_celticKnotwork">celticKnotwork</value>
+      <value tokenid="ooxml:Value_ST_Border_certificateBanner">certificateBanner</value>
+      <value tokenid="ooxml:Value_ST_Border_chainLink">chainLink</value>
+      <value tokenid="ooxml:Value_ST_Border_champagneBottle">champagneBottle</value>
+      <value tokenid="ooxml:Value_ST_Border_checkedBarBlack">checkedBarBlack</value>
+      <value tokenid="ooxml:Value_ST_Border_checkedBarColor">checkedBarColor</value>
+      <value tokenid="ooxml:Value_ST_Border_checkered">checkered</value>
+      <value tokenid="ooxml:Value_ST_Border_christmasTree">christmasTree</value>
+      <value tokenid="ooxml:Value_ST_Border_circlesLines">circlesLines</value>
+      <value tokenid="ooxml:Value_ST_Border_circlesRectangles">circlesRectangles</value>
+      <value tokenid="ooxml:Value_ST_Border_classicalWave">classicalWave</value>
+      <value tokenid="ooxml:Value_ST_Border_clocks">clocks</value>
+      <value tokenid="ooxml:Value_ST_Border_compass">compass</value>
+      <value tokenid="ooxml:Value_ST_Border_confetti">confetti</value>
+      <value tokenid="ooxml:Value_ST_Border_confettiGrays">confettiGrays</value>
+      <value tokenid="ooxml:Value_ST_Border_confettiOutline">confettiOutline</value>
+      <value tokenid="ooxml:Value_ST_Border_confettiStreamers">confettiStreamers</value>
+      <value tokenid="ooxml:Value_ST_Border_confettiWhite">confettiWhite</value>
+      <value tokenid="ooxml:Value_ST_Border_cornerTriangles">cornerTriangles</value>
+      <value tokenid="ooxml:Value_ST_Border_couponCutoutDashes">couponCutoutDashes</value>
+      <value tokenid="ooxml:Value_ST_Border_couponCutoutDots">couponCutoutDots</value>
+      <value tokenid="ooxml:Value_ST_Border_crazyMaze">crazyMaze</value>
+      <value tokenid="ooxml:Value_ST_Border_creaturesButterfly">creaturesButterfly</value>
+      <value tokenid="ooxml:Value_ST_Border_creaturesFish">creaturesFish</value>
+      <value tokenid="ooxml:Value_ST_Border_creaturesInsects">creaturesInsects</value>
+      <value tokenid="ooxml:Value_ST_Border_creaturesLadyBug">creaturesLadyBug</value>
+      <value tokenid="ooxml:Value_ST_Border_crossStitch">crossStitch</value>
+      <value tokenid="ooxml:Value_ST_Border_cup">cup</value>
+      <value tokenid="ooxml:Value_ST_Border_decoArch">decoArch</value>
+      <value tokenid="ooxml:Value_ST_Border_decoArchColor">decoArchColor</value>
+      <value tokenid="ooxml:Value_ST_Border_decoBlocks">decoBlocks</value>
+      <value tokenid="ooxml:Value_ST_Border_diamondsGray">diamondsGray</value>
+      <value tokenid="ooxml:Value_ST_Border_doubleD">doubleD</value>
+      <value tokenid="ooxml:Value_ST_Border_doubleDiamonds">doubleDiamonds</value>
+      <value tokenid="ooxml:Value_ST_Border_earth1">earth1</value>
+      <value tokenid="ooxml:Value_ST_Border_earth2">earth2</value>
+      <value tokenid="ooxml:Value_ST_Border_eclipsingSquares1">eclipsingSquares1</value>
+      <value tokenid="ooxml:Value_ST_Border_eclipsingSquares2">eclipsingSquares2</value>
+      <value tokenid="ooxml:Value_ST_Border_eggsBlack">eggsBlack</value>
+      <value tokenid="ooxml:Value_ST_Border_fans">fans</value>
+      <value tokenid="ooxml:Value_ST_Border_film">film</value>
+      <value tokenid="ooxml:Value_ST_Border_firecrackers">firecrackers</value>
+      <value tokenid="ooxml:Value_ST_Border_flowersBlockPrint">flowersBlockPrint</value>
+      <value tokenid="ooxml:Value_ST_Border_flowersDaisies">flowersDaisies</value>
+      <value tokenid="ooxml:Value_ST_Border_flowersModern1">flowersModern1</value>
+      <value tokenid="ooxml:Value_ST_Border_flowersModern2">flowersModern2</value>
+      <value tokenid="ooxml:Value_ST_Border_flowersPansy">flowersPansy</value>
+      <value tokenid="ooxml:Value_ST_Border_flowersRedRose">flowersRedRose</value>
+      <value tokenid="ooxml:Value_ST_Border_flowersRoses">flowersRoses</value>
+      <value tokenid="ooxml:Value_ST_Border_flowersTeacup">flowersTeacup</value>
+      <value tokenid="ooxml:Value_ST_Border_flowersTiny">flowersTiny</value>
+      <value tokenid="ooxml:Value_ST_Border_gems">gems</value>
+      <value tokenid="ooxml:Value_ST_Border_gingerbreadMan">gingerbreadMan</value>
+      <value tokenid="ooxml:Value_ST_Border_gradient">gradient</value>
+      <value tokenid="ooxml:Value_ST_Border_handmade1">handmade1</value>
+      <value tokenid="ooxml:Value_ST_Border_handmade2">handmade2</value>
+      <value tokenid="ooxml:Value_ST_Border_heartBalloon">heartBalloon</value>
+      <value tokenid="ooxml:Value_ST_Border_heartGray">heartGray</value>
+      <value tokenid="ooxml:Value_ST_Border_hearts">hearts</value>
+      <value tokenid="ooxml:Value_ST_Border_heebieJeebies">heebieJeebies</value>
+      <value tokenid="ooxml:Value_ST_Border_holly">holly</value>
+      <value tokenid="ooxml:Value_ST_Border_houseFunky">houseFunky</value>
+      <value tokenid="ooxml:Value_ST_Border_hypnotic">hypnotic</value>
+      <value tokenid="ooxml:Value_ST_Border_iceCreamCones">iceCreamCones</value>
+      <value tokenid="ooxml:Value_ST_Border_lightBulb">lightBulb</value>
+      <value tokenid="ooxml:Value_ST_Border_lightning1">lightning1</value>
+      <value tokenid="ooxml:Value_ST_Border_lightning2">lightning2</value>
+      <value tokenid="ooxml:Value_ST_Border_mapPins">mapPins</value>
+      <value tokenid="ooxml:Value_ST_Border_mapleLeaf">mapleLeaf</value>
+      <value tokenid="ooxml:Value_ST_Border_mapleMuffins">mapleMuffins</value>
+      <value tokenid="ooxml:Value_ST_Border_marquee">marquee</value>
+      <value tokenid="ooxml:Value_ST_Border_marqueeToothed">marqueeToothed</value>
+      <value tokenid="ooxml:Value_ST_Border_moons">moons</value>
+      <value tokenid="ooxml:Value_ST_Border_mosaic">mosaic</value>
+      <value tokenid="ooxml:Value_ST_Border_musicNotes">musicNotes</value>
+      <value tokenid="ooxml:Value_ST_Border_northwest">northwest</value>
+      <value tokenid="ooxml:Value_ST_Border_ovals">ovals</value>
+      <value tokenid="ooxml:Value_ST_Border_packages">packages</value>
+      <value tokenid="ooxml:Value_ST_Border_palmsBlack">palmsBlack</value>
+      <value tokenid="ooxml:Value_ST_Border_palmsColor">palmsColor</value>
+      <value tokenid="ooxml:Value_ST_Border_paperClips">paperClips</value>
+      <value tokenid="ooxml:Value_ST_Border_papyrus">papyrus</value>
+      <value tokenid="ooxml:Value_ST_Border_partyFavor">partyFavor</value>
+      <value tokenid="ooxml:Value_ST_Border_partyGlass">partyGlass</value>
+      <value tokenid="ooxml:Value_ST_Border_pencils">pencils</value>
+      <value tokenid="ooxml:Value_ST_Border_people">people</value>
+      <value tokenid="ooxml:Value_ST_Border_peopleWaving">peopleWaving</value>
+      <value tokenid="ooxml:Value_ST_Border_peopleHats">peopleHats</value>
+      <value tokenid="ooxml:Value_ST_Border_poinsettias">poinsettias</value>
+      <value tokenid="ooxml:Value_ST_Border_postageStamp">postageStamp</value>
+      <value tokenid="ooxml:Value_ST_Border_pumpkin1">pumpkin1</value>
+      <value tokenid="ooxml:Value_ST_Border_pushPinNote2">pushPinNote2</value>
+      <value tokenid="ooxml:Value_ST_Border_pushPinNote1">pushPinNote1</value>
+      <value tokenid="ooxml:Value_ST_Border_pyramids">pyramids</value>
+      <value tokenid="ooxml:Value_ST_Border_pyramidsAbove">pyramidsAbove</value>
+      <value tokenid="ooxml:Value_ST_Border_quadrants">quadrants</value>
+      <value tokenid="ooxml:Value_ST_Border_rings">rings</value>
+      <value tokenid="ooxml:Value_ST_Border_safari">safari</value>
+      <value tokenid="ooxml:Value_ST_Border_sawtooth">sawtooth</value>
+      <value tokenid="ooxml:Value_ST_Border_sawtoothGray">sawtoothGray</value>
+      <value tokenid="ooxml:Value_ST_Border_scaredCat">scaredCat</value>
+      <value tokenid="ooxml:Value_ST_Border_seattle">seattle</value>
+      <value tokenid="ooxml:Value_ST_Border_shadowedSquares">shadowedSquares</value>
+      <value tokenid="ooxml:Value_ST_Border_sharksTeeth">sharksTeeth</value>
+      <value tokenid="ooxml:Value_ST_Border_shorebirdTracks">shorebirdTracks</value>
+      <value tokenid="ooxml:Value_ST_Border_skyrocket">skyrocket</value>
+      <value tokenid="ooxml:Value_ST_Border_snowflakeFancy">snowflakeFancy</value>
+      <value tokenid="ooxml:Value_ST_Border_snowflakes">snowflakes</value>
+      <value tokenid="ooxml:Value_ST_Border_sombrero">sombrero</value>
+      <value tokenid="ooxml:Value_ST_Border_southwest">southwest</value>
+      <value tokenid="ooxml:Value_ST_Border_stars">stars</value>
+      <value tokenid="ooxml:Value_ST_Border_starsTop">starsTop</value>
+      <value tokenid="ooxml:Value_ST_Border_stars3d">stars3d</value>
+      <value tokenid="ooxml:Value_ST_Border_starsBlack">starsBlack</value>
+      <value tokenid="ooxml:Value_ST_Border_starsShadowed">starsShadowed</value>
+      <value tokenid="ooxml:Value_ST_Border_sun">sun</value>
+      <value tokenid="ooxml:Value_ST_Border_swirligig">swirligig</value>
+      <value tokenid="ooxml:Value_ST_Border_tornPaper">tornPaper</value>
+      <value tokenid="ooxml:Value_ST_Border_tornPaperBlack">tornPaperBlack</value>
+      <value tokenid="ooxml:Value_ST_Border_trees">trees</value>
+      <value tokenid="ooxml:Value_ST_Border_triangleParty">triangleParty</value>
+      <value tokenid="ooxml:Value_ST_Border_triangles">triangles</value>
+      <value tokenid="ooxml:Value_ST_Border_tribal1">tribal1</value>
+      <value tokenid="ooxml:Value_ST_Border_tribal2">tribal2</value>
+      <value tokenid="ooxml:Value_ST_Border_tribal3">tribal3</value>
+      <value tokenid="ooxml:Value_ST_Border_tribal4">tribal4</value>
+      <value tokenid="ooxml:Value_ST_Border_tribal5">tribal5</value>
+      <value tokenid="ooxml:Value_ST_Border_tribal6">tribal6</value>
+      <value tokenid="ooxml:Value_ST_Border_twistedLines1">twistedLines1</value>
+      <value tokenid="ooxml:Value_ST_Border_twistedLines2">twistedLines2</value>
+      <value tokenid="ooxml:Value_ST_Border_vine">vine</value>
+      <value tokenid="ooxml:Value_ST_Border_waveline">waveline</value>
+      <value tokenid="ooxml:Value_ST_Border_weavingAngles">weavingAngles</value>
+      <value tokenid="ooxml:Value_ST_Border_weavingBraid">weavingBraid</value>
+      <value tokenid="ooxml:Value_ST_Border_weavingRibbon">weavingRibbon</value>
+      <value tokenid="ooxml:Value_ST_Border_weavingStrips">weavingStrips</value>
+      <value tokenid="ooxml:Value_ST_Border_whiteFlowers">whiteFlowers</value>
+      <value tokenid="ooxml:Value_ST_Border_woodwork">woodwork</value>
+      <value tokenid="ooxml:Value_ST_Border_xIllusions">xIllusions</value>
+      <value tokenid="ooxml:Value_ST_Border_zanyTriangles">zanyTriangles</value>
+      <value tokenid="ooxml:Value_ST_Border_zigZag">zigZag</value>
+      <value tokenid="ooxml:Value_ST_Border_zigZagStitch">zigZagStitch</value>
     </resource>
     <resource name="CT_Border" resource="Properties">
       <attribute name="val" tokenid="ooxml:CT_Border_val"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4ba46b3baf88..4daadae9200d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2572,52 +2572,50 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
             // brdrhair and brdrs are the same, brdrw will make a difference
             // map to values in ooxml/model.xml resource ST_Border
         case RTF_BRDRHAIR:
-            nParam = 5;
-            break;
         case RTF_BRDRS:
-            nParam = 1;
+            nParam = NS_ooxml::LN_Value_ST_Border_single;
             break;
         case RTF_BRDRDOT:
-            nParam = 6;
+            nParam = NS_ooxml::LN_Value_ST_Border_dotted;
             break;
         case RTF_BRDRDASH:
-            nParam = 7;
+            nParam = NS_ooxml::LN_Value_ST_Border_dashed;
             break;
         case RTF_BRDRDB:
-            nParam = 3;
+            nParam = NS_ooxml::LN_Value_ST_Border_double;
             break;
         case RTF_BRDRTNTHSG:
-            nParam = 11;
+            nParam = NS_ooxml::LN_Value_ST_Border_thinThickSmallGap;
             break;
         case RTF_BRDRTNTHMG:
-            nParam = 14;
+            nParam = NS_ooxml::LN_Value_ST_Border_thinThickMediumGap;
             break;
         case RTF_BRDRTNTHLG:
-            nParam = 17;
+            nParam = NS_ooxml::LN_Value_ST_Border_thinThickLargeGap;
             break;
         case RTF_BRDRTHTNSG:
-            nParam = 12;
+            nParam = NS_ooxml::LN_Value_ST_Border_thickThinSmallGap;
             break;
         case RTF_BRDRTHTNMG:
-            nParam = 15;
+            nParam = NS_ooxml::LN_Value_ST_Border_thickThinMediumGap;
             break;
         case RTF_BRDRTHTNLG:
-            nParam = 18;
+            nParam = NS_ooxml::LN_Value_ST_Border_thickThinLargeGap;
             break;
         case RTF_BRDREMBOSS:
-            nParam = 24;
+            nParam = NS_ooxml::LN_Value_ST_Border_threeDEmboss;
             break;
         case RTF_BRDRENGRAVE:
-            nParam = 25;
+            nParam = NS_ooxml::LN_Value_ST_Border_threeDEngrave;
             break;
         case RTF_BRDROUTSET:
-            nParam = 26;
+            nParam = NS_ooxml::LN_Value_ST_Border_outset;
             break;
         case RTF_BRDRINSET:
-            nParam = 27;
+            nParam = NS_ooxml::LN_Value_ST_Border_inset;
             break;
         case RTF_BRDRNONE:
-            nParam = 0;
+            nParam = NS_ooxml::LN_Value_ST_Border_none;
             break;
         default:
             break;