This class converts an OpenDocument file to an XHTML(+MathML) or EPUB document.
@@ -84,11 +84,11 @@ public class Converter extends BasicConverter { private L10n l10n; // The helpers - private StyleParser styleCv; - private TextParser textCv; - private TableParser tableCv; - private DrawParser drawCv; - private MathParser mathCv; + private Styles styles; + private TextParser textParser; + private TableParser tableParser; + private DrawParser drawParser; + private MathParser mathParser; // The template private XhtmlDocument template = null; @@ -189,15 +189,15 @@ public class Converter extends BasicConverter { return contentWidth.size()==1; } - public StyleParser getStyleCv() { return styleCv; } + public Styles getStylesParser() { return styles; } - public TextParser getTextCv() { return textCv; } + public TextParser getTextParser() { return textParser; } - public TableParser getTableCv() { return tableCv; } + public TableParser getTableParser() { return tableParser; } - public DrawParser getDrawCv() { return drawCv; } + public DrawParser getDrawParser() { return drawParser; } - public MathParser getMathCv() { return mathCv; } + public MathParser getMathParser() { return mathParser; } public int getType() { return nType; } @@ -276,11 +276,11 @@ public class Converter extends BasicConverter { imageConverter.setDefaultVectorFormat(MIMETypes.SVG); } - styleCv = new StyleParser(ofr,config,this,nType); - textCv = new TextParser(ofr,config,this); - tableCv = new TableParser(ofr,config,this); - drawCv = new DrawParser(ofr,config,this); - mathCv = new MathParser(ofr,config,this,nType!=XhtmlDocument.XHTML10 && nType!=XhtmlDocument.XHTML11); + styles = new Styles(ofr,config,this,nType); + textParser = new TextParser(ofr,config,this); + tableParser = new TableParser(ofr,config,this); + drawParser = new DrawParser(ofr,config,this); + mathParser = new MathParser(ofr,config,this,nType!=XhtmlDocument.XHTML10 && nType!=XhtmlDocument.XHTML11); // Set locale to document language StyleWithProperties style = ofr.isSpreadsheet() ? ofr.getDefaultCellStyle() : ofr.getDefaultParStyle(); @@ -295,13 +295,13 @@ public class Converter extends BasicConverter { } // Set the main content width - pushContentWidth(getStyleCv().getPageSc().getTextWidth()); + pushContentWidth(getStylesParser().getPageSc().getTextWidth()); // Traverse the body Element body = ofr.getContent(); - if (ofr.isSpreadsheet()) { tableCv.convertTableContent(body); } - else if (ofr.isPresentation()) { drawCv.convertDrawContent(body); } - else { textCv.convertTextContent(body); } + if (ofr.isSpreadsheet()) { tableParser.convertTableContent(body); } + else if (ofr.isPresentation()) { drawParser.convertDrawContent(body); } + else { textParser.convertTextContent(body); } // Set the title page and text page entries if (converterResult.getContent().isEmpty()) { @@ -351,9 +351,9 @@ public class Converter extends BasicConverter { for (int i=0; i<=outFileIndex; i++) { Element head = outFiles.get(i).getHeadNode(); if (head!=null) { - Node styles = styleCv.getStyleSelectors(outFiles.get(i).getContentDOM()); - if (styles!=null) { - head.appendChild(styles); + Node styleNode = styles.getStylesNode(outFiles.get(i).getContentDOM()); + if (styleNode!=null) { + head.appendChild(styleNode); } } } @@ -402,15 +402,15 @@ public class Converter extends BasicConverter { footerPar.appendChild(dom.createTextNode(" ")); } // Add links to all sheets: - int nSheets = tableCv.sheetNames.size(); + int nSheets = tableParser.sheetNames.size(); for (int j=0; jListStyleConverter
* @param ofr an OfficeReader to read style information from
@@ -52,7 +52,7 @@ public class ListStyleFamilyParser extends StyleFamilyParser {
* @param converter the main Converter class
* @param nType the type of xhtml to use
*/
- public ListStyleFamilyParser(OfficeReader ofr, XhtmlConfig config, Converter converter, int nType) {
+ public ListStyleParser(OfficeReader ofr, XhtmlConfig config, Converter converter, int nType) {
super(ofr,config,converter,nType);
this.styleMap = config.getXListStyleMap();
this.bConvertStyles = config.xhtmlFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlFormatting()==XhtmlConfig.IGNORE_HARD;
@@ -90,49 +90,47 @@ public class ListStyleFamilyParser extends StyleFamilyParser {
/** Convert style information for used styles
* @param sIndent a String of spaces to add before each line */ - public String getStyleSelectors(String sIndent) { - if (bConvertStyles) { - StringBuilder buf = new StringBuilder(); - EnumerationConvert style information for used styles
* @param sIndent a String of spaces to add before each line */ - public String getStyleSelectors(String sIndent) { + public String getStyleSelectors() { if (bConvertStyles) { StringBuilder buf = new StringBuilder(); - buf.append(super.getStyleSelectors(sIndent)); + buf.append(super.getStyleSelectors()); EnumerationThis is an abstract base class to convert an OpenDocument style family to - * CSS2 styles.
- */ -public abstract class StyleFamilyParser extends Parser { - - // Translation of OpenDocument style names to CSS class names - protected ExportNameCollection styleNames = new ExportNameCollection(true); - - // Style map to use - protected XhtmlStyleMap styleMap; - - // Should we convert styles resp. hard formatting? - protected boolean bConvertStyles = true; - protected boolean bConvertHard = true; - - // The type of xhtml document - protected int nType; - - // Scaling and unit transformation to use - private String sScale; - private String sColScale; - private boolean bConvertToPx; - - /** Create a newStyleConverterHelper
- * @param ofr an OfficeReader to read style information from
- * @param config the configuration to use
- * @param converter the main Converter class
- * @param nType the type of xhtml to use
- */
- public StyleFamilyParser(OfficeReader ofr, XhtmlConfig config, Converter converter, int nType) {
- super(ofr,config,converter);
- this.nType = nType;
- sScale = config.getXhtmlScaling();
- sColScale = config.getXhtmlColumnScaling();
- bConvertToPx = config.xhtmlConvertToPx();
- }
-
- public String scale(String s) {
- if (bConvertToPx) {
- return Calc.length2px(Calc.multiply(sScale,s));
- }
- else {
- return Calc.length2rem(Calc.multiply(sScale,s));
- }
- }
-
- public String colScale(String s) {
- return scale(Calc.multiply(sColScale,s));
- }
-
- /** Apply the writing direction (ltr or rtl) attribute from a style
- * @param style the OpenDocument style to use
- * @param info the StyleInfo object to add information to
- */
- protected static void applyDirection(StyleWithProperties style, StyleInfo info) {
- String sDir = style.getProperty(XMLString.STYLE_WRITING_MODE);
- if ("lr-tb".equals(sDir)) { info.sDir="ltr"; }
- else if ("rl-tb".equals(sDir)) { info.sDir="rtl"; }
- }
-
- /** Apply language+country from a style
- * @param style the OpenDocument style to use
- * @param info the StyleInfo object to add information to
- */
- protected static void applyLang(StyleWithProperties style, StyleInfo info) {
- String sLang = style.getProperty(XMLString.FO_LANGUAGE);
- String sCountry = style.getProperty(XMLString.FO_COUNTRY);
- if (sLang!=null) {
- if (sCountry==null || sCountry.equals("none")) { info.sLang = sLang; }
- else { info.sLang = sLang+"-"+sCountry; }
- }
- }
-
- /** Get the OpenDocument style family associated with this
- * StyleConverterHelper
- * @return the style family
- */
- public abstract OfficeStyleFamily getStyles();
-
- /** Convert style information for used styles
- * @param sIndent a String of spaces to add before each line - */ - public abstract String getStyleSelectors(String sIndent); - -} diff --git a/src/main/java/writer2latex/xhtml/style/StyleParser.java b/src/main/java/writer2latex/xhtml/style/StyleParser.java index 7ccf724..71f9cdc 100644 --- a/src/main/java/writer2latex/xhtml/style/StyleParser.java +++ b/src/main/java/writer2latex/xhtml/style/StyleParser.java @@ -1,6 +1,6 @@ /************************************************************************ * - * StyleConverter.java + * StyleConverterHelper.java * * Copyright: 2002-2015 by Henrik Just * @@ -19,207 +19,110 @@ * You should have received a copy of the GNU General Public License * along with Writer2LaTeX. If not, seeThis is an abstract base class to convert an OpenDocument style family to + * CSS2 styles.
*/ -public class StyleParser extends Parser { +public abstract class StyleParser extends Parser { - // Helpers for text styles - private TextStyleParser textSc; - private ParStyleParser parSc; - private HeadingStyleParser headingSc; - private ListStyleFamilyParser listSc; - private SectionStyleParser sectionSc; - - // Helpers for table styles - private TableStyleParser tableSc; - private RowStyleParser rowSc; - private CellStyleParser cellSc; - - // Helpers for drawing styles - private FrameStyleParser frameSc; - private PresentationStyleParser presentationSc; + // Translation of OpenDocument style names to CSS class names + protected ExportNameCollection styleNames = new ExportNameCollection(true); - // Helper for page styles - private PageStyleParser pageSc; - - /** Create a newStyleConverter
- *
- * @param ofr the office reader used to access the source document
- * @param config the configuration to use
- * @param converter the main converter
- * @param nType the XHTML type
+ // Style map to use
+ protected XhtmlStyleMap styleMap;
+
+ // Should we convert styles resp. hard formatting?
+ protected boolean bConvertStyles = true;
+ protected boolean bConvertHard = true;
+
+ // The type of xhtml document
+ protected int nType;
+ private boolean prettyPrint = true;
+ String indent = null;
+ // Scaling and unit transformation to use
+ private String sScale;
+ private String sColScale;
+ private boolean bConvertToPx;
+
+ /** Create a new StyleConverterHelper
+ * @param ofr an OfficeReader to read style information from
+ * @param config the configuration to use
+ * @param converter the main Converter class
+ * @param nType the type of xhtml to use
*/
public StyleParser(OfficeReader ofr, XhtmlConfig config, Converter converter, int nType) {
super(ofr,config,converter);
- // Create the helpers
- textSc = new TextStyleParser(ofr,config,converter,nType);
- parSc = new ParStyleParser(ofr,config,converter,nType);
- headingSc = new HeadingStyleParser(ofr,config,converter,nType);
- listSc = new ListStyleFamilyParser(ofr,config,converter,nType);
- sectionSc = new SectionStyleParser(ofr,config,converter,nType);
- tableSc = new TableStyleParser(ofr,config,converter,nType);
- rowSc = new RowStyleParser(ofr,config,converter,nType);
- cellSc = new CellStyleParser(ofr,config,converter,nType);
- frameSc = new FrameStyleParser(ofr,config,converter,nType);
- presentationSc = new PresentationStyleParser(ofr,config,converter,nType);
- pageSc = new PageStyleParser(ofr,config,converter,nType);
+ this.nType = nType;
+ this.prettyPrint = config.prettyPrint();
+ this.indent = prettyPrint ? " " : "";
+ sScale = config.getXhtmlScaling();
+ sColScale = config.getXhtmlColumnScaling();
+ bConvertToPx = config.xhtmlConvertToPx();
}
-
- // Accessor methods for helpers: We need to override the style helper accessors
-
- public TextStyleParser getTextSc() { return textSc; }
- public ParStyleParser getParSc() { return parSc; }
-
- public HeadingStyleParser getHeadingSc() { return headingSc; }
-
- public ListStyleFamilyParser getListSc() { return listSc; }
-
- public SectionStyleParser getSectionSc() { return sectionSc; }
-
- public TableStyleParser getTableSc() { return tableSc; }
-
- public RowStyleParser getRowSc() { return rowSc; }
-
- public CellStyleParser getCellSc() { return cellSc; }
-
- public FrameStyleParser getFrameSc() { return frameSc; }
-
- public PresentationStyleParser getPresentationSc() { return presentationSc; }
-
- public PageStyleParser getPageSc() { return pageSc; }
-
- /** Apply the default language of the source document on an XHTML element
- *
- * @param node the XHTML element
- */
- public void applyDefaultLanguage(Element node) {
- StyleWithProperties style = getDefaultStyle();
- if (style!=null) {
- StyleInfo info = new StyleInfo();
- StyleFamilyParser.applyLang(style,info);
- applyStyle(info,node);
- }
- }
-
- /** Export style information as a string of plain CSS code
- *
- * @param bIndent true if the CSS code should be indented
- * @return the CSS code
- */
- public String allStyleSelectors(boolean bIndent) {
- String sIndent = bIndent ? " " : "";
- StringBuilder buf = new StringBuilder();
-
- exportDefaultStyle(buf,sIndent);
-
- // Export declarations from helpers
- // For OpenDocument documents created with OOo only some will generate content:
- // Text documents: text, par, list, frame
- // Spreadsheet documents: cell
- // Presentation documents: frame, presentation, page
- buf.append(textSc.getStyleSelectors(sIndent));
- buf.append(parSc.getStyleSelectors(sIndent));
- buf.append(headingSc.getStyleSelectors(sIndent));
- buf.append(listSc.getStyleSelectors(sIndent));
- buf.append(sectionSc.getStyleSelectors(sIndent));
- buf.append(cellSc.getStyleSelectors(sIndent));
- buf.append(tableSc.getStyleSelectors(sIndent));
- buf.append(rowSc.getStyleSelectors(sIndent));
- buf.append(frameSc.getStyleSelectors(sIndent));
- buf.append(presentationSc.getStyleSelectors(sIndent));
- buf.append(pageSc.getStyleSelectors(sIndent));
- return buf.toString();
- }
-
- /** Export style information as an XHTML style element
- *
- * @param htmlDOM the XHTML DOM to which the generated element belongs
- * @return the style element
- */
- public Node getStyleSelectors(Document htmlDOM) {
- String styleSelectors = allStyleSelectors(config.prettyPrint());
-
- // Create node
- if (styleSelectors.length()>0) {
- Element styleElement = htmlDOM.createElement("style");
- styleElement.setAttribute("media","all");
- styleElement.setAttribute("type","text/css");
- styleElement.appendChild(htmlDOM.createTextNode(config.prettyPrint() ? "\n" : " "));
- styleElement.appendChild(htmlDOM.createTextNode(styleSelectors));
- if (config.prettyPrint()) { styleElement.appendChild(htmlDOM.createTextNode(" ")); }
- return styleElement;
+ public String scale(String s) {
+ if (bConvertToPx) {
+ return Calc.length2px(Calc.multiply(sScale,s));
}
else {
- return null;
- }
- }
-
- // Private helper methods
-
- private void exportDefaultStyle(StringBuilder buf, String sIndent) {
- // Export default style
- if (config.xhtmlCustomStylesheet().length()==0 &&
- (config.xhtmlFormatting()==XhtmlConfig.CONVERT_ALL ||
- config.xhtmlFormatting()==XhtmlConfig.IGNORE_HARD)) {
- CSVList props = new CSVList(";");
-
- // Default paragraph/cell/frame style is applied to the body element
- StyleWithProperties defaultStyle = getDefaultStyle();
- if (defaultStyle!=null) {
- // text properties only!
- getTextSc().cssTextCommon(defaultStyle,props,true);
- if (config.useDefaultFont() && config.defaultFontName().length()>0) {
- props.addValue("font-family", "'"+config.defaultFontName()+"'");
- }
- }
-
- // For text documents (XHTML only), also set maximum width
- if (ofr.isText() && !converter.isOPS()) {
- String sMaxWidth = config.getMaxWidth().trim();
- if (sMaxWidth.length()>0) {
- props.addValue("max-width", sMaxWidth);
- props.addValue("margin-left","auto");
- props.addValue("margin-right","auto");
- }
- }
-
- // Apply properties to body
- if (!props.isEmpty()) {
- buf.append(sIndent);
- buf.append("body {");
- buf.append(props.toString());
- buf.append("}");
- buf.append(config.prettyPrint() ? "\n" : " ");
- }
+ return Calc.length2rem(Calc.multiply(sScale,s));
}
}
- private StyleWithProperties getDefaultStyle() {
- if (ofr.isSpreadsheet()) return ofr.getDefaultCellStyle();
- else if (ofr.isPresentation()) return ofr.getDefaultFrameStyle();
- else return ofr.getDefaultParStyle();
+ public String colScale(String s) {
+ return scale(Calc.multiply(sColScale,s));
+ }
+
+ /** Apply the writing direction (ltr or rtl) attribute from a style
+ * @param style the OpenDocument style to use
+ * @param info the StyleInfo object to add information to
+ */
+ protected static void applyDirection(StyleWithProperties style, StyleInfo info) {
+ String sDir = style.getProperty(XMLString.STYLE_WRITING_MODE);
+ if ("lr-tb".equals(sDir)) { info.sDir="ltr"; }
+ else if ("rl-tb".equals(sDir)) { info.sDir="rtl"; }
}
-}
\ No newline at end of file
+ /** Apply language+country from a style
+ * @param style the OpenDocument style to use
+ * @param info the StyleInfo object to add information to
+ */
+ protected static void applyLang(StyleWithProperties style, StyleInfo info) {
+ String sLang = style.getProperty(XMLString.FO_LANGUAGE);
+ String sCountry = style.getProperty(XMLString.FO_COUNTRY);
+ if (sLang!=null) {
+ if (sCountry==null || sCountry.equals("none")) { info.sLang = sLang; }
+ else { info.sLang = sLang+"-"+sCountry; }
+ }
+ }
+
+ /** Get the OpenDocument style family associated with this
+ * StyleConverterHelper
+ * @return the style family
+ */
+ public abstract OfficeStyleFamily getStyles();
+
+ /** Convert style information for used styles
+ * @param sIndent a String of spaces to add before each line + */ + public abstract String getStyleSelectors(); + +} diff --git a/src/main/java/writer2latex/xhtml/style/StyleWithPropertiesParser.java b/src/main/java/writer2latex/xhtml/style/StyleWithPropertiesParser.java index 8b96fc0..947276c 100644 --- a/src/main/java/writer2latex/xhtml/style/StyleWithPropertiesParser.java +++ b/src/main/java/writer2latex/xhtml/style/StyleWithPropertiesParser.java @@ -41,8 +41,7 @@ import writer2latex.xhtml.XhtmlStyleMapItem; *This is an abstract class to convert an OpenDocument style family
* represented by StyleWithProperties to CSS2 styles.
StyleWithPropertiesConverterHelper
* @param ofr an OfficeReader to read style information from
@@ -95,7 +94,7 @@ public abstract class StyleWithPropertiesParser
/** Convert style information for used styles
* @param sIndent a String of spaces to add before each line
*/
- public String getStyleSelectors(String sIndent) {
+ public String getStyleSelectors() {
if (bConvertStyles) {
StringBuilder buf = new StringBuilder();
EnumerationStyleConverter
+ *
+ * @param ofr the office reader used to access the source document
+ * @param config the configuration to use
+ * @param converter the main converter
+ * @param nType the XHTML type
+ */
+ public Styles(OfficeReader ofr, XhtmlConfig config, Converter converter, int nType) {
+ super(ofr,config,converter);
+ // Create the helpers
+ textStyleParser = new TextStyleParser(ofr,config,converter,nType);
+ parStyleParser = new ParStyleParser(ofr,config,converter,nType);
+ headingStyleParser = new HeadingStyleParser(ofr,config,converter,nType);
+ listStyleParser = new ListStyleParser(ofr,config,converter,nType);
+ sectionStyleParser = new SectionStyleParser(ofr,config,converter,nType);
+ tableStyleParser = new TableStyleParser(ofr,config,converter,nType);
+ rowStyleParser = new RowStyleParser(ofr,config,converter,nType);
+ cellStyleParser = new CellStyleParser(ofr,config,converter,nType);
+ frameStyleParser = new FrameStyleParser(ofr,config,converter,nType);
+ presentationStyleParser = new PresentationStyleParser(ofr,config,converter,nType);
+ pageStyleParser = new PageStyleParser(ofr,config,converter,nType);
+ }
+
+ // Accessor methods for helpers: We need to override the style helper accessors
+
+ public TextStyleParser getTextSc() { return textStyleParser; }
+
+ public ParStyleParser getParSc() { return parStyleParser; }
+
+ public HeadingStyleParser getHeadingSc() { return headingStyleParser; }
+
+ public ListStyleParser getListSc() { return listStyleParser; }
+
+ public SectionStyleParser getSectionSc() { return sectionStyleParser; }
+
+ public TableStyleParser getTableSc() { return tableStyleParser; }
+
+ public RowStyleParser getRowSc() { return rowStyleParser; }
+
+ public CellStyleParser getCellSc() { return cellStyleParser; }
+
+ public FrameStyleParser getFrameSc() { return frameStyleParser; }
+
+ public PresentationStyleParser getPresentationSc() { return presentationStyleParser; }
+
+ public PageStyleParser getPageSc() { return pageStyleParser; }
+
+ /** Apply the default language of the source document on an XHTML element
+ *
+ * @param node the XHTML element
+ */
+ public void applyDefaultLanguage(Element node) {
+ StyleWithProperties style = getDefaultStyle();
+ if (style!=null) {
+ StyleInfo info = new StyleInfo();
+ StyleParser.applyLang(style,info);
+ applyStyle(info,node);
+ }
+ }
+
+ /** Export style information as a string of plain CSS code
+ *
+ * @param bIndent true if the CSS code should be indented
+ * @return the CSS code
+ */
+ public String allStyleSelectors(boolean bIndent) {
+ String sIndent = bIndent ? " " : "";
+ StringBuilder buf = new StringBuilder();
+
+ exportDefaultStyle(buf,sIndent);
+
+ // Export declarations from helpers
+ // For OpenDocument documents created with OOo only some will generate content:
+ // Text documents: text, par, list, frame
+ // Spreadsheet documents: cell
+ // Presentation documents: frame, presentation, page
+ buf.append(textStyleParser.getStyleSelectors());
+ buf.append(parStyleParser.getStyleSelectors());
+ buf.append(headingStyleParser.getStyleSelectors());
+ buf.append(listStyleParser.getStyleSelectors());
+ buf.append(sectionStyleParser.getStyleSelectors());
+ buf.append(cellStyleParser.getStyleSelectors());
+ buf.append(tableStyleParser.getStyleSelectors());
+ buf.append(rowStyleParser.getStyleSelectors());
+ buf.append(frameStyleParser.getStyleSelectors());
+ buf.append(presentationStyleParser.getStyleSelectors());
+ buf.append(pageStyleParser.getStyleSelectors());
+ return buf.toString();
+ }
+
+ /** Export style information as an XHTML style element
+ *
+ * @param htmlDOM the XHTML DOM to which the generated element belongs
+ * @return the style element
+ */
+ public Node getStylesNode(Document htmlDOM) {
+ String styleSelectors = allStyleSelectors(config.prettyPrint());
+
+ // Create node
+ if (styleSelectors.length()>0) {
+ Element styleElement = htmlDOM.createElement("style");
+ styleElement.setAttribute("media","all");
+ styleElement.setAttribute("type","text/css");
+ styleElement.appendChild(htmlDOM.createTextNode(config.prettyPrint() ? "\n" : " "));
+ styleElement.appendChild(htmlDOM.createTextNode(styleSelectors));
+ if (config.prettyPrint()) { styleElement.appendChild(htmlDOM.createTextNode(" ")); }
+ return styleElement;
+ }
+ else {
+ return null;
+ }
+ }
+
+ // Private helper methods
+
+ private void exportDefaultStyle(StringBuilder buf, String sIndent) {
+ // Export default style
+ if (config.xhtmlCustomStylesheet().length()==0 &&
+ (config.xhtmlFormatting()==XhtmlConfig.CONVERT_ALL ||
+ config.xhtmlFormatting()==XhtmlConfig.IGNORE_HARD)) {
+ CSVList props = new CSVList(";");
+
+ // Default paragraph/cell/frame style is applied to the body element
+ StyleWithProperties defaultStyle = getDefaultStyle();
+ if (defaultStyle!=null) {
+ // text properties only!
+ getTextSc().cssTextCommon(defaultStyle,props,true);
+ if (config.useDefaultFont() && config.defaultFontName().length()>0) {
+ props.addValue("font-family", "'"+config.defaultFontName()+"'");
+ }
+ }
+
+ // For text documents (XHTML only), also set maximum width
+ if (ofr.isText() && !converter.isOPS()) {
+ String sMaxWidth = config.getMaxWidth().trim();
+ if (sMaxWidth.length()>0) {
+ props.addValue("max-width", sMaxWidth);
+ props.addValue("margin-left","auto");
+ props.addValue("margin-right","auto");
+ }
+ }
+
+ // Apply properties to body
+ if (!props.isEmpty()) {
+ buf.append(sIndent);
+ buf.append("body {");
+ buf.append(props.toString());
+ buf.append("}");
+ buf.append(config.prettyPrint() ? "\n" : " ");
+ }
+ }
+ }
+
+ private StyleWithProperties getDefaultStyle() {
+ if (ofr.isSpreadsheet()) return ofr.getDefaultCellStyle();
+ else if (ofr.isPresentation()) return ofr.getDefaultFrameStyle();
+ else return ofr.getDefaultParStyle();
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/writer2latex/xhtml/style/TextStyleParser.java b/src/main/java/writer2latex/xhtml/style/TextStyleParser.java
index f004805..5f7850b 100644
--- a/src/main/java/writer2latex/xhtml/style/TextStyleParser.java
+++ b/src/main/java/writer2latex/xhtml/style/TextStyleParser.java
@@ -153,8 +153,8 @@ public class TextStyleParser extends StyleWithPropertiesParser {
* @param sIndent a String of spaces to add before each line
*/
StringBuilder buf = new StringBuilder();
- public String getStyleSelectors(String sIndent) {
- buf.append(super.getStyleSelectors(sIndent));
+ public String getStyleSelectors() {
+ buf.append(super.getStyleSelectors());
if (bConvertStyles) {
// Export anchor styles
// Default is always the styles "Internet link" and "Visited Internet Link"(?)
@@ -164,7 +164,7 @@ public class TextStyleParser extends StyleWithPropertiesParser {
CSVList props = new CSVList(";");
cssText(defaultLinkStyle,props,true);
cssHyperlink(defaultLinkStyle,props);
- buf.append(sIndent);
+ buf.append(indent);
buf.append("a:link {");
buf.append(props.toString());
buf.append("}\n");
@@ -176,7 +176,7 @@ public class TextStyleParser extends StyleWithPropertiesParser {
CSVList props = new CSVList(";");
cssText(defaultLinkStyle,props,true);
cssHyperlink(defaultLinkStyle,props);
- buf.append(sIndent);
+ buf.append(indent);
buf.append("a:visited {");
buf.append(props.toString());
buf.append("}\n");
@@ -195,7 +195,7 @@ public class TextStyleParser extends StyleWithPropertiesParser {
CSVList props = new CSVList(";");
cssText(style,props,true);
cssHyperlink(style,props);
- buf.append(sIndent);
+ buf.append(indent);
buf.append("a.");
buf.append(sExportName);
buf.append(":link {");
@@ -208,7 +208,7 @@ public class TextStyleParser extends StyleWithPropertiesParser {
CSVList props = new CSVList(";");
cssText(style,props,true);
cssHyperlink(style,props);
- buf.append(sIndent);
+ buf.append(indent);
buf.append("a.");
buf.append(sExportName);
buf.append(":visited {");