This commit is contained in:
2012-11-08 17:05:45 +00:00
parent 3795a3063d
commit daec29dc9a
3 changed files with 19 additions and 39 deletions

View File

@@ -1964,55 +1964,22 @@ namespace VEPROMS.CSLA.Library
_ActiveSection = value;
}
}
private bool _DidFirstPageDocStyle = false;
public bool DidFirstPageDocStyle
{
get { return _DidFirstPageDocStyle; }
set
{
if (!_DidFirstPageDocStyle)
{
_DidFirstPageDocStyle = value;
_MyDocStyle = null;
}
}
}
private DocStyle _MyDocStyle;
private DocStyle _MyDocStyleOtherThanFirstPage;
public DocStyle MyDocStyle
{
get
{
ItemInfo prevSection = (ActiveSection != null) ? ActiveSection.MyPrevious : null;
if (_MyDocStyle == null && ActiveSection != null)
//if ((_MyDocStyle == null && ActiveSection != null) ||
// (!_DidFirstPageDocStyle &&
// _MyDocStyle.IsStepSection &&
// prevSection != null &&
// ((SectionConfig)ActiveSection.MyConfig).Section_Pagination == SectionConfig.SectionPagination.Continuous))
{
int typ = (int)ActiveSection.MyContent.Type;
int subtyp = typ % 10000;
_MyDocStyle = ActiveFormat.PlantFormat.DocStyles.DocStyleList[subtyp];
if (((_MyDocStyle.StructureStyle.Where & E_DocStyleUse.UseOnFirstPage) != 0) && _DidFirstPageDocStyle)
{
if (_MyDocStyleOtherThanFirstPage == null)
{
foreach (DocStyle ds in ActiveFormat.PlantFormat.DocStyles.DocStyleList)
{
if ((ds.StructureStyle.Where & E_DocStyleUse.UseOnAllButFirstPage) != 0)
{
_MyDocStyleOtherThanFirstPage = ds;
break;
}
}
}
}
}
if (_MyDocStyleOtherThanFirstPage == null)
return _MyDocStyle;
else
return _MyDocStyleOtherThanFirstPage;
return _MyDocStyle;
}
set
{
_MyDocStyle = value;
}
}
private FormatInfo _ActiveFormat = null;