diff --git a/PROMS/VEPROMS User Interface/frmSectionProperties.cs b/PROMS/VEPROMS User Interface/frmSectionProperties.cs index 456c2c99..cd86e3c7 100644 --- a/PROMS/VEPROMS User Interface/frmSectionProperties.cs +++ b/PROMS/VEPROMS User Interface/frmSectionProperties.cs @@ -414,6 +414,12 @@ namespace VEPROMS // if changing format, check for valid type (see comment above) if (!myInit && pf != opf) { + if (newDocStyles.Count == 0) + { + string msg1 = string.Format("A Page Style for the type of section, {0}, is not available in the new format. You cannot do this operation.", _isStepSection? "Step Section": "Word Document"); + MessageBox.Show(msg1, "Cannot change to this format"); + return; + } if (oldSelIndx > newDocStyles.Count) { string msg = string.Format("The section type that is set is not available in the new format, it was reset to {0}. Verify that it is appropriate.", newDocStyles[0].Name); diff --git a/PROMS/fmtxml/FmtToXml.cs b/PROMS/fmtxml/FmtToXml.cs index 2adbef9d..e5f69649 100644 --- a/PROMS/fmtxml/FmtToXml.cs +++ b/PROMS/fmtxml/FmtToXml.cs @@ -485,7 +485,7 @@ namespace fmtxml { MyPath = path; fmtName = nm; - //if (!fmtName.ToUpper().StartsWith("NSP") && fmtName.ToUpper() != "BASE") return; + //if (!fmtName.ToUpper().StartsWith("RGESMPE") && fmtName.ToUpper() != "BASE") return; try { // get the default base & plant files to use when figuring out inheritance. @@ -520,7 +520,7 @@ namespace fmtxml } private float ColToPoints(float f, uint style) { - return 72 * (f / CvtFont.CvtFont.GetCPIs(style)); + return 72 * (f / CvtFont.CvtFont.GetCPISBadPICA12(style)); } private string GetAsciiStringUntilNull(BinaryReader br) { @@ -1155,6 +1155,7 @@ namespace fmtxml if (parFont.FontFamily == subFont.FontFamily) subFont.FontFamily = null; if (parFont.FontSize == subFont.FontSize) subFont.FontSize = null; if (parFont.FontStyle == subFont.FontStyle) subFont.FontStyle = null; + if (parFont.CPI == subFont.CPI) subFont.CPI = null; } } private void DoPSFontInherit(ref PageStyles pagstyles) diff --git a/PROMS/fmtxml/TranslateDoc.XSL b/PROMS/fmtxml/TranslateDoc.XSL index 2cae67bc..71d9b59f 100644 --- a/PROMS/fmtxml/TranslateDoc.XSL +++ b/PROMS/fmtxml/TranslateDoc.XSL @@ -81,6 +81,11 @@ + + + + + diff --git a/PROMS/fmtxml/TranslatePAG.XSL b/PROMS/fmtxml/TranslatePAG.XSL index ec722ec8..f58c1397 100644 --- a/PROMS/fmtxml/TranslatePAG.XSL +++ b/PROMS/fmtxml/TranslatePAG.XSL @@ -50,6 +50,11 @@ + + + + +