MAJ V4.4.3 (correction bug dans l'évaluation de l'attribut evalsautpage)
This commit is contained in:
parent
4c1d8ddc2c
commit
d66267e229
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -774,14 +774,18 @@ public class evaluationAttribut {
|
||||
styleStudent = styleStudent.retourneFirstEnfantsByName("style:paragraph-properties");
|
||||
if(styleStudent!=null) {
|
||||
if(styleStudent.getAttributs().get("fo:break-before")!=null) {
|
||||
if(styleStudent.getAttributs().get("fo:break-before")!="none") {
|
||||
typeSautStudent = styleStudent.getAttributs().get("fo:break-before");
|
||||
}
|
||||
}
|
||||
if(styleStudent.getAttributs().get("fo:break-after")!=null) {
|
||||
if(styleStudent.getAttributs().get("fo:break-after")!="none") {
|
||||
typeSautStudent = styleStudent.getAttributs().get("fo:break-after");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(sujet.getAttributs().get("text:style-name")!=null) {
|
||||
String styleName = sujet.getAttributs().get("text:style-name");
|
||||
@ -792,15 +796,19 @@ public class evaluationAttribut {
|
||||
styleSujet = styleSujet.retourneFirstEnfantsByName("style:paragraph-properties");
|
||||
if(styleSujet!=null) {
|
||||
if(styleSujet.getAttributs().get("fo:break-before")!=null) {
|
||||
if(styleSujet.getAttributs().get("fo:break-before")!="none") {
|
||||
typeSautSujet = styleSujet.getAttributs().get("fo:break-before");
|
||||
}
|
||||
}
|
||||
if(styleSujet.getAttributs().get("fo:break-after")!=null) {
|
||||
if(styleSujet.getAttributs().get("fo:break-after")!="none") {
|
||||
typeSautSujet = styleSujet.getAttributs().get("fo:break-after");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
typeSautSujet = evaluation.withoutCodeAndPointPourRechercheContenuExact(typeSautSujet);
|
||||
if(typeSautSujet.equals("auto")) typeSautSujet="page";
|
||||
if(typeSautStudent.equals("auto")) typeSautStudent="page";
|
||||
|
Loading…
x
Reference in New Issue
Block a user