MAJ
This commit is contained in:
parent
b49d2d670c
commit
5243e94cd6
1
bin/.gitignore
vendored
1
bin/.gitignore
vendored
@ -2,3 +2,4 @@
|
||||
/fenetres/
|
||||
/nodeAC/
|
||||
/outils/
|
||||
/AnalyseCalc/
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -2183,6 +2183,8 @@ public class Classeur2 {
|
||||
if(c.getAttributs().get("RepetitionColumn")!=null) propertiesCell.put("RepetitionColumn",c.getAttributs().get("RepetitionColumn"));
|
||||
|
||||
if(c.getAttributs().get("contenuCell")!=null) propertiesCell.put("contenuCell",c.getAttributs().get("contenuCell"));
|
||||
if(c.getAttributs().get("commentaire")!=null) propertiesCell.put("commentaire",c.getAttributs().get("contenuCell"));
|
||||
|
||||
if(c.getAttributs().get("xlink:type")!=null) propertiesCell.put("xlink:type",c.getAttributs().get("xlink:type"));
|
||||
if(c.getAttributs().get("xlink:ref")!=null) propertiesCell.put("xlink:ref",c.getAttributs().get("xlink:ref"));
|
||||
if(c.getAttributs().get("LargeurColonne")!=null) propertiesCell.put("LargeurColonne",c.getAttributs().get("LargeurColonne"));
|
||||
@ -2244,13 +2246,19 @@ public class Classeur2 {
|
||||
if(LargeurColonne!=null) if(!LargeurColonne.isEmpty()) propertiesCell.put("LargeurColonne",LargeurColonne);
|
||||
}
|
||||
|
||||
nodeAC c = cel.retourneFirstEnfantsByName("text:p");
|
||||
if(c!=null) {
|
||||
propertiesCell.put("contenuCell", c.retourneLesContenusEnfants(""));
|
||||
c = c.retourneFirstEnfantsByName("text:a");
|
||||
if(c!=null) {
|
||||
propertiesCell.put("TypeLien", c.getAttributs().get("xlink:type"));
|
||||
propertiesCell.put("Lien", c.getAttributs().get("xlink:ref"));
|
||||
ArrayList<nodeAC> c = cel.retourneListEnfantsByName("text:p");
|
||||
if(c.size()>0) {
|
||||
for(int i = 0 ; i < c.size();i++) {
|
||||
if(!c.get(i).chemin().contains("office:annotation")) {
|
||||
propertiesCell.put("contenuCell", c.get(i).retourneLesContenusEnfants(""));
|
||||
nodeAC ta = c.get(i).retourneFirstEnfantsByName("text:a");
|
||||
if(ta!=null) {
|
||||
propertiesCell.put("TypeLien", ta.getAttributs().get("xlink:type"));
|
||||
propertiesCell.put("Lien", ta.getAttributs().get("xlink:ref"));
|
||||
}
|
||||
}else {
|
||||
propertiesCell.put("commentaire", c.get(i).retourneLesContenusEnfants(""));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -2309,9 +2317,9 @@ public class Classeur2 {
|
||||
}
|
||||
|
||||
// graphique ancrer à la cellule
|
||||
c = cel.retourneFirstEnfantsByName("draw:frame");
|
||||
if(c!=null) {
|
||||
Graph = new graphic(c, nod, indexStudent);
|
||||
nodeAC g = cel.retourneFirstEnfantsByName("draw:frame");
|
||||
if(g!=null) {
|
||||
Graph = new graphic(g, nod, indexStudent);
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user