diff --git a/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html b/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html index 40d93750107940f01106262712f63cf1e04fa574..60f8e3fd15e0e5f9acfae971a6f55c0f55137579 100644 --- a/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html +++ b/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html @@ -127,7 +127,7 @@

- +

 

@@ -154,7 +154,7 @@
-
+
diff --git a/o2web/source/x_component_process_Xform/widget/OOXML.js b/o2web/source/x_component_process_Xform/widget/OOXML.js index 375eb7ad759929a597c20694cee124018d3884b0..3eb9be688341fdeebdbe2be69de238311e09ddcc 100644 --- a/o2web/source/x_component_process_Xform/widget/OOXML.js +++ b/o2web/source/x_component_process_Xform/widget/OOXML.js @@ -1498,43 +1498,19 @@ o2.xApplication.process.Xform.widget.OOXML.WordprocessingML = o2.OOXML.WML = new this.insertSiblings(oo_wsp, [oo_cNvCnPr, oo_spPr, oo_style, oo_bodyPr], "beforeend"); - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // - + var w = hr.style.width; + if (w && o2.typeOf(w)==="string"){ + var u = w.substring(w.length-1, w.length); + if (u==="%"){ + w = w.toFloat()*1000; + var oo_sizeRelH = this.createEl(oo_doc, "sizeRelH", "wp14"); + this.setAttrs(oo_sizeRelH, {"relativeFrom": "margin"}, false); + var oo_pctWidth = this.createEl(oo_doc, "pctWidth", "wp14"); + oo_pctWidth.appendChild(oo_doc.createTextNode(w)); + oo_sizeRelH.appendChild(oo_pctWidth); + oo_anchor.appendChild(oo_sizeRelH); + } + } oo_p.appendChild(oo_run); },