Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Kathy Ruffing 2012-04-03 16:18:04 +00:00
parent a02a253b7f
commit 143f927cc6
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PROMS/VEPROMS User Interface/frmSectionProperties.cs
View File

@ -414,6 +414,12 @@ namespace VEPROMS
// if changing format, check for valid type (see comment above) // if changing format, check for valid type (see comment above)
if (!myInit && pf != opf) 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) 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); 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);

5
PROMS/fmtxml/FmtToXml.cs
View File

@ -485,7 +485,7 @@ namespace fmtxml
{ {
MyPath = path; MyPath = path;
fmtName = nm; fmtName = nm;
//if (!fmtName.ToUpper().StartsWith("NSP") && fmtName.ToUpper() != "BASE") return; //if (!fmtName.ToUpper().StartsWith("RGESMPE") && fmtName.ToUpper() != "BASE") return;
try try
{ {
// get the default base & plant files to use when figuring out inheritance. // 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) 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) private string GetAsciiStringUntilNull(BinaryReader br)
{ {
@ -1155,6 +1155,7 @@ namespace fmtxml
if (parFont.FontFamily == subFont.FontFamily) subFont.FontFamily = null; if (parFont.FontFamily == subFont.FontFamily) subFont.FontFamily = null;
if (parFont.FontSize == subFont.FontSize) subFont.FontSize = null; if (parFont.FontSize == subFont.FontSize) subFont.FontSize = null;
if (parFont.FontStyle == subFont.FontStyle) subFont.FontStyle = null; if (parFont.FontStyle == subFont.FontStyle) subFont.FontStyle = null;
if (parFont.CPI == subFont.CPI) subFont.CPI = null;
} }
} }
private void DoPSFontInherit(ref PageStyles pagstyles) private void DoPSFontInherit(ref PageStyles pagstyles)

5
PROMS/fmtxml/TranslateDoc.XSL
View File

@ -81,6 +81,11 @@
<xsl:value-of select="FontStyle"/> <xsl:value-of select="FontStyle"/>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:if test="CPI">
<xsl:attribute name="CPI">
<xsl:value-of select="CPI"/>
</xsl:attribute>
</xsl:if>
</Font> </Font>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>

5
PROMS/fmtxml/TranslatePAG.XSL
View File

@ -50,6 +50,11 @@
<xsl:value-of select="./FontStyle"/> <xsl:value-of select="./FontStyle"/>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:if test="string-length(./CPI)">
<xsl:attribute name="CPI">
<xsl:value-of select="./CPI"/>
</xsl:attribute>
</xsl:if>
</Font> </Font>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>