Java 5 + Writer4LaTeX + bugfixes
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@11 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
parent
be54e842f4
commit
9241a44f6c
83 changed files with 2373 additions and 631 deletions
|
@ -94,7 +94,7 @@ public class DrawConverter extends ConverterHelper {
|
|||
private boolean bOriginalImageSize;
|
||||
|
||||
// Frames in spreadsheet documents are collected here
|
||||
private Vector frames = new Vector();
|
||||
private Vector<Element> frames = new Vector<Element>();
|
||||
// This flag determines wether to collect frames or insert them immediately
|
||||
private boolean bCollectFrames = false;
|
||||
|
||||
|
@ -102,9 +102,9 @@ public class DrawConverter extends ConverterHelper {
|
|||
super(ofr,config,converter);
|
||||
// We can only handle one form; pick an arbitrary one.
|
||||
// Also we cannot split a form over several files.
|
||||
Iterator formsIterator = ofr.getForms().getFormsIterator();
|
||||
Iterator<FormReader> formsIterator = ofr.getForms().getFormsIterator();
|
||||
if (formsIterator.hasNext() && config.getXhtmlSplitLevel()==0) {
|
||||
form = (FormReader) formsIterator.next();
|
||||
form = formsIterator.next();
|
||||
}
|
||||
bCollectFrames = ofr.isSpreadsheet();
|
||||
sScale = config.getXhtmlScaling();
|
||||
|
@ -222,7 +222,7 @@ public class DrawConverter extends ConverterHelper {
|
|||
bCollectFrames = false;
|
||||
int nCount = frames.size();
|
||||
for (int i=0; i<nCount; i++) {
|
||||
handleDrawElement((Element) frames.get(i),hnode,null,CENTERED);
|
||||
handleDrawElement(frames.get(i),hnode,null,CENTERED);
|
||||
}
|
||||
frames.clear();
|
||||
bCollectFrames = true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue