Removed spreedshet and presentation code

src/main/java/writer2latex/xhtml/Converter.java

@@ -281,7 +281,7 @@ public class Converter extends BasicConverter {
         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();
+        StyleWithProperties style = ofr.getDefaultParStyle();
         if (style!=null) {
         	// The only CTL language recognized currently is farsi
         	if ("fa".equals(style.getProperty(XMLString.STYLE_LANGUAGE_COMPLEX))) {
@@ -297,9 +297,8 @@ public class Converter extends BasicConverter {
 
         // Traverse the body
         Element body = ofr.getContent();
-        if (ofr.isSpreadsheet()) { tableParser.convertTableContent(body); }
+        
-        else if (ofr.isPresentation()) { drawParser.convertDrawContent(body); }
+        textParser.convertDocumentContent(body);
-        else { textParser.convertDocumentContent(body); }
 		
         // Set the title page and text page entries
         if (converterResult.getContent().isEmpty()) {
@@ -377,48 +376,7 @@ public class Converter extends BasicConverter {
         }
         
 		// Create headers & footers (if nodes are available)
-        if (ofr.isSpreadsheet()) {
+		if (outFileIndex > 0) {
-            for (int i=0; i<=outFileIndex; i++) {
-
-                XhtmlDocument doc = outFiles.get(i);
-                Document dom = doc.getContentDOM();
-                Element header = doc.getHeaderNode();
-                Element footer = doc.getFooterNode();
-                Element headerPar = dom.createElement("p");
-                Element footerPar = dom.createElement("p");
-                footerPar.setAttribute("style","clear:both"); // no floats may pass!
-
-                // Add uplink
-                if (config.getXhtmlUplink().length()>0) {
-                    Element a = dom.createElement("a");
-                    a.setAttribute("href",config.getXhtmlUplink());
-                    a.appendChild(dom.createTextNode(l10n.get(L10n.UP)));
-                    headerPar.appendChild(a);
-                    headerPar.appendChild(dom.createTextNode(" "));
-                    a = dom.createElement("a");
-                    a.setAttribute("href",config.getXhtmlUplink());
-                    a.appendChild(dom.createTextNode(l10n.get(L10n.UP)));
-                    footerPar.appendChild(a);
-                    footerPar.appendChild(dom.createTextNode(" "));
-                }
-                // Add links to all sheets:
-                int nSheets = tableParser.sheetNames.size();
-                for (int j=0; j<nSheets; j++) {
-                    if (config.xhtmlCalcSplit()) {
-                        addNavigationLink(dom,headerPar,tableParser.sheetNames.get(j),j);
-                        addNavigationLink(dom,footerPar,tableParser.sheetNames.get(j),j);
-                    }
-                    else {
-                        addInternalNavigationLink(dom,headerPar,tableParser.sheetNames.get(j),"tableheading"+j);
-                        addInternalNavigationLink(dom,footerPar,tableParser.sheetNames.get(j),"tableheading"+j);
-	                }
-                }
-                
-                if (header!=null) { header.appendChild(headerPar); }
-                if (footer!=null) { footer.appendChild(footerPar); }
-            }
-        }
-        else if (outFileIndex>0) {
 			for (int i = 0; i <= outFileIndex; i++) {
 				XhtmlDocument doc = outFiles.get(i);
 				Document dom = doc.getContentDOM();
@@ -427,10 +385,6 @@ public class Converter extends BasicConverter {
 				// Header links
 				Element header = doc.getHeaderNode();
 				if (header != null) {
-                    if (ofr.isPresentation()) {
-                        // Absolute placement in presentations (quick and dirty solution)
-                        header.setAttribute("style","position:absolute;top:0;left:0");
-                    }
 					if (config.getXhtmlUplink().length() > 0) {
 						Element a = dom.createElement("a");
 						a.setAttribute("href", config.getXhtmlUplink());
@@ -452,7 +406,7 @@ public class Converter extends BasicConverter {
 
 				// Footer links
 				Element footer = doc.getFooterNode();
-                if (footer!=null && !ofr.isPresentation()) {
+				if (footer != null) {
 					// No footer in presentations
 					if (config.getXhtmlUplink().length() > 0) {
 						Element a = dom.createElement("a");
@@ -473,8 +427,7 @@ public class Converter extends BasicConverter {
 					}
 				}
 			}
-        }
+		} else if (config.getXhtmlUplink().length() > 0) {
-        else if (config.getXhtmlUplink().length()>0) {
 			for (int i = 0; i <= outFileIndex; i++) {
 				XhtmlDocument doc = outFiles.get(i);
 				Document dom = doc.getContentDOM();
@@ -506,8 +459,7 @@ public class Converter extends BasicConverter {
 				CssDocument cssDoc = new CssDocument(EPUB_STYLESHEET);
 				cssDoc.read(styles.allStyleSelectors(false));
 				converterResult.addDocument(cssDoc);
-        	}
+			} else if (config.separateStylesheet()) { // XHTML
-        	else if (config.separateStylesheet()) { // XHTML
 				CssDocument cssDoc = new CssDocument(sTargetFileName + "-styles.css");
 				cssDoc.read(styles.allStyleSelectors(false));
 				converterResult.addDocument(cssDoc);
@@ -682,11 +634,10 @@ public class Converter extends BasicConverter {
 		}
 
   	private void applyWritingDirection() {
-			if (!ofr.isPresentation()) {
   		StyleInfo pageInfo = new StyleInfo();
   		styles.getPageSc().applyDefaultWritingDirection(pageInfo);
   		styles.getPageSc().writeStyle(pageInfo, htmlDoc.getContentNode());
-			}
+  
   	}
 
 		private void addHeadData() {

src/main/java/writer2latex/xhtml/content/DrawParser.java

@@ -116,8 +116,6 @@ public class DrawParser extends Parser {
     
     // Frames in spreadsheet documents are collected here
     private Vector<Element> frames = new Vector<Element>();
-    // This flag determines whether to collect frames or insert them immediately
-    private boolean bCollectFrames = false;
     
     // Large images (for full screen) in EPUB export are collected here
     private Vector<Element> fullscreenFrames = new Vector<Element>();
@@ -132,7 +130,6 @@ public class DrawParser extends Parser {
         if (formsIterator.hasNext() && config.getXhtmlSplitLevel()==0) {
             form = formsIterator.next();
         }
-        bCollectFrames = ofr.isSpreadsheet();
         bCollectFullscreenFrames = true;
         sScale = config.getXhtmlScaling();
         bConvertToPx = config.xhtmlConvertToPx();
@@ -291,13 +288,11 @@ public class DrawParser extends Parser {
     }
 	
     public void flushFrames(Element hnode) {
-        bCollectFrames = false;
         int nCount = frames.size();
         for (int i=0; i<nCount; i++) {
             handleDrawElement(frames.get(i),hnode,null,CENTERED);
         }
         frames.clear();
-        bCollectFrames = true;
     }
 	
     /** <p>Convert a draw element to xhtml. The presentation depends on the
@@ -320,10 +315,6 @@ public class DrawParser extends Parser {
      *  @param nMode identifies how the element should be presented 
      */
     public void handleDrawElement(Element onode, Element hnodeBlock, Element hnodeInline, int nMode) {
-        if (bCollectFrames) {
-            frames.add(onode);
-            return;
-        }
         String sName = onode.getNodeName();
         if (sName.equals(XMLString.DRAW_OBJECT)) {
             handleDrawObject(onode,hnodeBlock,hnodeInline,nMode);

src/main/java/writer2latex/xhtml/content/TableParser.java

@@ -168,11 +168,6 @@ public class TableParser extends Parser {
 
             // Create view (full table)
             TableRange range = new TableRange(tblr);
-            if (ofr.isSpreadsheet()) {
-                // skip trailing empty rows and columns
-                range.setLastRow(tblr.getMaxRowCount()-1);
-                range.setLastCol(tblr.getMaxColCount()-1);	
-            }
             range.setIncludeHidden(config.displayHiddenRowsCols());
             range.setIncludeFiltered(config.displayFilteredRowsCols());
             traverseTable(range.createTableView(),table);
@@ -377,8 +372,6 @@ public class TableParser extends Parser {
 
         //info.props.addValue("empty-cells","show"); use   instead...
 
-        if (ofr.isSpreadsheet()) { info.props.addProperty("white-space","nowrap"); }
-
         if (bIsSubTable) {
             // Should try to fill the cell; hence:
             info.props.addProperty("width","100%");
@@ -448,13 +441,6 @@ public class TableParser extends Parser {
                     info.props.addProperty("width",Calc.sub(getTableSc().colScale(sTotalWidth),sEdge));
                 }
             }
-
-            // Automatic horizontal alignment (calc only)
-            if (ofr.isSpreadsheet() && !"fix".equals(style.getProperty(XMLString.STYLE_TEXT_ALIGN_SOURCE))) {
-                // Strings go left, other types (float, time, date, percentage, currency, boolean) go right
-                // The default is string
-                info.props.addProperty("text-align", sValueType==null || "string".equals(sValueType) ? "left" : "right");
-            }
         }
 		
         if (!cell.hasChildNodes()) { // hack to handle empty cells even in msie

src/main/java/writer2latex/xhtml/content/TextParser.java

@@ -652,17 +652,13 @@ public class TextParser extends Parser {
         if (!displayHiddenText && style!=null && "none".equals(style.getProperty(TEXT_DISPLAY))) { return; }
         
         Element par;
-        if (ofr.isSpreadsheet()) { // attach inline text directly to parent (always a table cell)
+
-            par = (Element) hnode;
-        }
-        else {
     		// Hack because createParagraph doesn't work the way we need here :-(
     		Element temp = converter.createElement("temp");
     		par = createParagraph(temp, styleName);
     		prependAsapNode(par);
     		traverseFloats(onode, hnode, par);
     		hnode.appendChild(temp.getFirstChild());
-        }
 
         // Maybe add to toc
         tocParser.handleParagraph((Element)onode, par, sCurrentListLabel);

src/main/java/writer2latex/xhtml/style/CellStyleParser.java

@@ -100,7 +100,7 @@ public class CellStyleParser extends StyleWithPropertiesParser {
             // No value or "automatic" means, according to the spec,
             //"The application decide how to align the text."
             // We treat this case like OOo does:
-            props.addProperty("vertical-align", ofr.isSpreadsheet() ? "bottom" : "top");
+            props.addProperty("vertical-align", "top");
         }
     }
 

src/main/java/writer2latex/xhtml/style/PageStyleParser.java

@@ -127,11 +127,6 @@ public class PageStyleParser extends StyleParser {
         MasterPage masterPage = ofr.getMasterPage(sStyleName);
         if (masterPage!=null) {
             String sDisplayName = masterPage.getDisplayName();
-            if (ofr.isPresentation()) {
-                // Always generates class name
-            	styleNames.addName(sDisplayName);
-              info.sClass="masterpage"+styleNames.getName(sDisplayName);
-            }
         }
     }
 

src/main/java/writer2latex/xhtml/style/ParStyleParser.java

@@ -159,13 +159,6 @@ public class ParStyleParser extends StyleWithPropertiesParser {
             else if (s.equals("end")) { s="right"; }
             props.addProperty("text-align",s);
         }
-		
-        // Wrap (only in table cells, only in spreadsheets):
-        if (ofr.isSpreadsheet()) {
-            s = style.getProperty(XMLString.FO_WRAP_OPTION,bInherit);
-            if ("no-wrap".equals(s)) props.addProperty("white-space","nowrap");
-            else if ("wrap".equals(s)) props.addProperty("white-space","normal");
-        }
     }
 		
 

src/main/java/writer2latex/xhtml/style/Styles.java

@@ -219,9 +219,7 @@ public class Styles extends Parser {
     }
 	
     private StyleWithProperties getDefaultStyle() {
-        if (ofr.isSpreadsheet()) return ofr.getDefaultCellStyle();
+        return ofr.getDefaultParStyle();
-        else if (ofr.isPresentation()) return ofr.getDefaultFrameStyle();
-        else return ofr.getDefaultParStyle();
     }
 
 }