MAJ V4.5.0
This commit is contained in:
parent
c027ca1987
commit
88c298b2f0
@ -1,13 +1,13 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" path="src"/>
|
<classpathentry kind="src" path="src"/>
|
||||||
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-19">
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-19">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="module" value="true"/>
|
<attribute name="module" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry exported="true" kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/libs/cXML.jar" sourcepath="/cXML"/>
|
<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/libs/miglayout15-swing.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/libs/miglayout15-swing.jar"/>
|
<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/libs/zip4j-1.2.7.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/libs/zip4j-1.2.7.jar"/>
|
<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/libs/cXML.jar" sourcepath="/cXML"/>
|
||||||
<classpathentry kind="output" path="bin"/>
|
<classpathentry kind="output" path="bin"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
Binary file not shown.
Binary file not shown.
1
bin/.gitignore
vendored
1
bin/.gitignore
vendored
@ -1,2 +1 @@
|
|||||||
/resources/
|
|
||||||
/analyseWriter/
|
/analyseWriter/
|
||||||
|
BIN
libs/cXML.jar
BIN
libs/cXML.jar
Binary file not shown.
@ -13,9 +13,9 @@
|
|||||||
<attribute name="Class-Path" value="."/>
|
<attribute name="Class-Path" value="."/>
|
||||||
</manifest>
|
</manifest>
|
||||||
<fileset dir="${dir.jarfile}/bin"/>
|
<fileset dir="${dir.jarfile}/bin"/>
|
||||||
<zipfileset excludes="META-INF/*.SF" src="${dir.jarfile}/libs/cXML.jar"/>
|
|
||||||
<zipfileset excludes="META-INF/*.SF" src="${dir.jarfile}/libs/miglayout15-swing.jar"/>
|
<zipfileset excludes="META-INF/*.SF" src="${dir.jarfile}/libs/miglayout15-swing.jar"/>
|
||||||
<zipfileset excludes="META-INF/*.SF" src="${dir.jarfile}/libs/zip4j-1.2.7.jar"/>
|
<zipfileset excludes="META-INF/*.SF" src="${dir.jarfile}/libs/zip4j-1.2.7.jar"/>
|
||||||
|
<zipfileset excludes="META-INF/*.SF" src="${dir.jarfile}/libs/cXML.jar"/>
|
||||||
</jar>
|
</jar>
|
||||||
</target>
|
</target>
|
||||||
</project>
|
</project>
|
||||||
|
@ -20,14 +20,18 @@ public class fusionStyleTextSpan {
|
|||||||
node racineStyles = nod.racineDuNode().retourneFirstEnfantsByName("style:paragraph");
|
node racineStyles = nod.racineDuNode().retourneFirstEnfantsByName("style:paragraph");
|
||||||
|
|
||||||
node nodStyle = racineStyles.racineDuNode().retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nodNameStyle);
|
node nodStyle = racineStyles.racineDuNode().retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nodNameStyle);
|
||||||
|
if(nodStyle==null) return false;
|
||||||
node nodeNextStyle = racineStyles.racineDuNode().retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nodeNextNameStyle);
|
node nodeNextStyle = racineStyles.racineDuNode().retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nodeNextNameStyle);
|
||||||
|
if(nodeNextStyle==null) return false;
|
||||||
|
|
||||||
node nodStyle_text_properties = nodStyle.retourneFirstEnfantsByName("style:text-properties");
|
node nodStyle_text_properties = nodStyle.retourneFirstEnfantsByName("style:text-properties");
|
||||||
node nodeNextStyle_text_properties = nodeNextStyle.retourneFirstEnfantsByName("style:text-properties");
|
node nodeNextStyle_text_properties = nodeNextStyle.retourneFirstEnfantsByName("style:text-properties");
|
||||||
|
|
||||||
|
|
||||||
nodStyle_text_properties.getAttributs().remove("officeooo:rsid");
|
nodStyle_text_properties.getAttributs().remove("officeooo:rsid");
|
||||||
nodeNextStyle_text_properties.getAttributs().remove("officeooo:rsid");
|
nodeNextStyle_text_properties.getAttributs().remove("officeooo:rsid");
|
||||||
|
|
||||||
|
|
||||||
int H1 = nodStyle_text_properties.hashCode();
|
int H1 = nodStyle_text_properties.hashCode();
|
||||||
int H2 = nodeNextStyle_text_properties.hashCode();
|
int H2 = nodeNextStyle_text_properties.hashCode();
|
||||||
|
|
||||||
@ -35,8 +39,8 @@ public class fusionStyleTextSpan {
|
|||||||
for (String text : nodeNext.getContenu()) {
|
for (String text : nodeNext.getContenu()) {
|
||||||
String current = nod.getContenu().get(nod.getContenu().size()-1);
|
String current = nod.getContenu().get(nod.getContenu().size()-1);
|
||||||
nod.getContenu().set(nod.getContenu().size()-1, current + text);
|
nod.getContenu().set(nod.getContenu().size()-1, current + text);
|
||||||
nod.getParent().supprimeFirstNodeEnfant(nodeNext);
|
|
||||||
}
|
}
|
||||||
|
nod.getParent().supprimeFirstNodeEnfant(nodeNext);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user