litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Writer2xhtml: Some work on lists and headings

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@62 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2010-05-09 13:40:00 +00:00
parent 54a7c265f2
commit d7f1b41599
18 changed files with 295 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

7
source/java/writer2latex/office/ListStyle.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2009 by Henrik Just
* Copyright: 2002-2010 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.2 (2009-04-27)
* Version 1.2 (2010-05-09)
*
*/
@ -58,7 +58,8 @@ public class ListStyle extends OfficeStyle {
}
public boolean isNumber(int i) {
return XMLString.TEXT_LIST_LEVEL_STYLE_NUMBER.equals(level[i].getName());
return XMLString.TEXT_LIST_LEVEL_STYLE_NUMBER.equals(level[i].getName()) ||
XMLString.TEXT_OUTLINE_LEVEL_STYLE.equals(level[i].getName());
}
public boolean isBullet(int i) {

6
source/java/writer2latex/office/OfficeReader.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.2 (2010-03-29)
* Version 1.2 (2010-05-09)
*
*/
@ -1022,7 +1022,7 @@ public class OfficeReader {
//collectMasterPage(getParStyle(node.getAttribute(XMLString.TEXT_STYLE_NAME)));
}
else if (sName.equals(XMLString.TEXT_H)) {
int nLevel = Misc.getPosInteger(node.getAttribute(XMLString.TEXT_LEVEL),1);
int nLevel = Misc.getPosInteger(node.getAttribute(XMLString.TEXT_OUTLINE_LEVEL),1);
StyleWithProperties style = getParStyle(node.getAttribute(XMLString.TEXT_STYLE_NAME));
//collectMasterPage(style);
if (1<=nLevel && nLevel<=10 && heading[nLevel]==null) {
@ -1030,7 +1030,7 @@ public class OfficeReader {
heading[nLevel] = getParStyle(style.getParentName());
}
else {
heading[nLevel] = null;
heading[nLevel] = style;
}
}
}

3
source/java/writer2latex/office/XMLString.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.2 (2010-02-19)
* Version 1.2 (2010-05-09)
*
*/
@ -250,6 +250,7 @@ public class XMLString {
public static final String TEXT_SEQUENCE_DECLS="text:sequence-decls";
public static final String TEXT_SEQUENCE_DECL="text:sequence-decl";
public static final String TEXT_OUTLINE_STYLE="text:outline-style";
public static final String TEXT_OUTLINE_LEVEL_STYLE="text:outline-level-style";
public static final String TEXT_LIST_STYLE="text:list-style";
public static final String TEXT_LIST_LEVEL_STYLE_NUMBER="text:list-level-style-number";
public static final String TEXT_LIST_LEVEL_STYLE_BULLET="text:list-level-style-bullet";