This commit is contained in:
Kathy Ruffing 2012-03-09 14:11:05 +00:00
parent 2f32c42a77
commit 42e70515c6

View File

@ -538,10 +538,20 @@ namespace VEPROMS.CSLA.Library
//PageStyle myPageStyle = myDocStyle.pagestyle; //PageStyle myPageStyle = myDocStyle.pagestyle;
ProcedureInfo proc = sect.MyProcedure; ProcedureInfo proc = sect.MyProcedure;
DocVersionInfo dvi = proc.ActiveParent as DocVersionInfo; DocVersionInfo dvi = proc.ActiveParent as DocVersionInfo;
ROFstInfo rofst = dvi.DocVersionAssociations[0].MyROFst; bool hasRos = false;
ROFSTLookup lookup = rofst.ROFSTLookup; ROFstInfo rofst = null;
string igPrefix = dvi.DocVersionConfig.RODefaults_graphicsprefix; ROFSTLookup lookup = null;
string spPrefix = dvi.DocVersionConfig.RODefaults_setpointprefix; string igPrefix = null;
string spPrefix = null;
if (dvi.DocVersionAssociationCount > 0)
{
hasRos = true;
rofst = dvi.DocVersionAssociations[0].MyROFst;
lookup = rofst.ROFSTLookup;
igPrefix = dvi.DocVersionConfig.RODefaults_graphicsprefix;
spPrefix = dvi.DocVersionConfig.RODefaults_setpointprefix;
}
// string AccPageID = string.Format("<{0}-{1}>", accPrefix, roch.appid); // string AccPageID = string.Format("<{0}-{1}>", accPrefix, roch.appid);
using (DSOFile myFile = new DSOFile(sect.MyContent.MyEntry.MyDocument)) using (DSOFile myFile = new DSOFile(sect.MyContent.MyEntry.MyDocument))
{ {
@ -565,7 +575,7 @@ namespace VEPROMS.CSLA.Library
} }
LBDocumentClass myDoc = MyApp.Documents.Open(myFile.FullName, false); LBDocumentClass myDoc = MyApp.Documents.Open(myFile.FullName, false);
AdjustMargins(myDocStyle, myDoc, true); AdjustMargins(myDocStyle, myDoc, true);
LBSelection selxy = FindXyPlot(); LBSelection selxy = hasRos ? FindXyPlot() : null;
while (selxy != null) while (selxy != null)
{ {
string xyplot = selxy.Text; string xyplot = selxy.Text;
@ -588,7 +598,7 @@ namespace VEPROMS.CSLA.Library
selxy.WholeStory(); selxy.WholeStory();
selxy = FindXyPlot(); selxy = FindXyPlot();
} }
LBSelection sel = FindRO(); LBSelection sel = hasRos ? FindRO() : null;
while (sel != null) while (sel != null)
{ {
string val = lookup.GetROValueByAccPagID(sel.Text, spPrefix, igPrefix); string val = lookup.GetROValueByAccPagID(sel.Text, spPrefix, igPrefix);