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

Java 5 + Writer4LaTeX + bugfixes

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@11 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2009-03-30 07:38:37 +00:00
parent be54e842f4
commit 9241a44f6c
83 changed files with 2373 additions and 631 deletions
Download patch file Download diff file Expand all files Collapse all files

4
source/java/org/openoffice/da/comp/w2lcommon/filter/ExportFilterBase.java
View file

@ -378,7 +378,7 @@ public abstract class ExportFilterBase implements
}
// Write out files
Iterator docEnum = dataOut.iterator();
Iterator<OutputFile> docEnum = dataOut.iterator();
// Remove the file name part of the url
String sNewURL = null;
@ -393,7 +393,7 @@ public abstract class ExportFilterBase implements
}
while (docEnum.hasNext() && sURL.startsWith("file:")) {
OutputFile docOut = (OutputFile)docEnum.next();
OutputFile docOut = docEnum.next();
if (dataOut.getMasterDocument()==docOut) {
// The master document is written to the XOutStream supplied

4
source/java/org/openoffice/da/comp/w2lcommon/filter/FilterDataParser.java
View file

@ -232,9 +232,9 @@ public class FilterDataParser {
}
// Read further configuration properties
Enumeration keys = props.keys();
Enumeration<String> keys = props.keys();
while (keys.hasMoreElements()) {
String sKey = (String) keys.nextElement();
String sKey = keys.nextElement();
if (!"ConfigURL".equals(sKey) && !"TemplateURL".equals(sKey) && !"AutoCreate".equals(sKey)) {
Object value = props.get(sKey);
if (AnyConverter.isString(value)) {

10
source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.0 (2009-03-08)
* Version 1.2 (2009-03-26)
*
*/
@ -58,14 +58,14 @@ import writer2latex.api.MIMETypes;
public class GraphicConverterImpl2 implements GraphicConverter {
private XComponentContext xComponentContext;
private Hashtable importFilter;
private Hashtable exportFilter;
private Hashtable<String,String> importFilter;
private Hashtable<String,String> exportFilter;
private EPSCleaner epsCleaner;
public GraphicConverterImpl2(XComponentContext xComponentContext) {
this.xComponentContext = xComponentContext;
importFilter = new Hashtable();
importFilter = new Hashtable<String,String>();
importFilter.put(MIMETypes.BMP, "BMP - MS Windows");
//importFilter.put(MIMETypes.EMF, "EMF - MS Windows Metafile");
importFilter.put(MIMETypes.EPS, "EPS - Encapsulated PostScript");
@ -76,7 +76,7 @@ public class GraphicConverterImpl2 implements GraphicConverter {
importFilter.put(MIMETypes.TIFF, "TIF - Tag Image File");
importFilter.put(MIMETypes.WMF, "WMF - MS Windows Metafile");
exportFilter = new Hashtable();
exportFilter = new Hashtable<String,String>();
exportFilter.put(MIMETypes.BMP,"draw_bmp_Export");
//exportFilter.put(MIMETypes.EMF,"draw_emf_Export");
exportFilter.put(MIMETypes.EPS,"draw_eps_Export");

4
source/java/org/openoffice/da/comp/w2lcommon/filter/OptionsDialogBase.java
View file

@ -87,7 +87,7 @@ public abstract class OptionsDialogBase extends DialogBase implements
this.xMSF = null; // must be set properly by subclass
mediaProps = null;
sConfigNames = null;
lockedOptions = new HashSet();
lockedOptions = new HashSet<String>();
}
//////////////////////////////////////////////////////////////////////////
@ -163,7 +163,7 @@ public abstract class OptionsDialogBase extends DialogBase implements
private String[] sConfigNames;
// Set of locked controls
private HashSet lockedOptions;
private HashSet<String> lockedOptions;
//////////////////////////////////////////////////////////////////////////

12
source/java/org/openoffice/da/comp/w2lcommon/helper/PropertyHelper.java
View file

@ -35,14 +35,14 @@ import com.sun.star.beans.PropertyValue;
*/
public class PropertyHelper {
private Hashtable data;
private Hashtable<String, Object> data;
public PropertyHelper() {
data = new Hashtable();
data = new Hashtable<String, Object>();
}
public PropertyHelper(PropertyValue[] props) {
data = new Hashtable();
data = new Hashtable<String, Object>();
int nLen = props.length;
for (int i=0; i<nLen; i++) {
data.put(props[i].Name,props[i].Value);
@ -57,7 +57,7 @@ public class PropertyHelper {
return data.get(sName);
}
public Enumeration keys() {
public Enumeration<String> keys() {
return data.keys();
}
@ -65,9 +65,9 @@ public class PropertyHelper {
int nSize = data.size();
PropertyValue[] props = new PropertyValue[nSize];
int i=0;
Enumeration keys = keys();
Enumeration<String> keys = keys();
while (keys.hasMoreElements()) {
String sKey = (String) keys.nextElement();
String sKey = keys.nextElement();
props[i] = new PropertyValue();
props[i].Name = sKey;
props[i++].Value = get(sKey);