w2x: Make toolbar visible in Calc and update help files

git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@213 f0f2a975-2e09-46c8-9428-3b39399b9f3c

source/distro/changelog.txt

@@ -20,6 +20,7 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6
 [w2x] Added toolbar with four buttons: Publish directly to XHTML, publish directly to EPUB, edit EPUB metadata
   and edit custom configuration. Publishing directly implies that the file picker is not displayed. Instead
   the document will be exported to the same directory as the currently open document and with the same name.
+  The EPUB buttons are only visible in Writer, the other buttons are also visible in Calc.
   This feature bypasses the filter logic, which gives a significant performance gain for large documents.
 
 [all] Filter: Refactored filter code, the actual conversion has been separated from the XExportFilter implementation

source/java/org/openoffice/da/comp/w2lcommon/filter/UNOPublisher.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  *  
- *  Version 1.6 (2014-11-03)
+ *  Version 1.6 (2014-11-08)
  *  
  */
 package org.openoffice.da.comp.w2lcommon.filter;
@@ -176,7 +176,7 @@ public class UNOPublisher {
             msgBox.showMessage(sAppName,"Please save the document before publishing the file");
             return false;
         }
-        else if (!".odt".equals(Misc.getFileExtension(sDocumentUrl)) && !".fodt".equals(Misc.getFileExtension(sDocumentUrl))) {
+        else if (!".odt".equals(Misc.getFileExtension(sDocumentUrl)) && !".fodt".equals(Misc.getFileExtension(sDocumentUrl)) && !".ods".equals(Misc.getFileExtension(sDocumentUrl)) && !".fods".equals(Misc.getFileExtension(sDocumentUrl))) {
             MessageBox msgBox = new MessageBox(xContext, xFrame);
             msgBox.showMessage(sAppName,"Please save the document in OpenDocument format (.odt)");
             return false;        	        	
@@ -256,37 +256,35 @@ public class UNOPublisher {
     private boolean updateMediaProperties(TargetFormat format) {
     	prepareMediaProperties(format);
     	
-        try {
+    	String sDialogName = xModel.getURL().endsWith(".odt") || xModel.getURL().endsWith(".fodt") ?
-            // Display options dialog
+    			getDialogName(format) : getDialogNameCalc(format);
-            Object dialog = xContext.getServiceManager()
+    	if (sDialogName!=null) {
-                .createInstanceWithContext(getDialogName(format), xContext);
+	    	try {
-
+	            // Display options dialog
-            XPropertyAccess xPropertyAccess = (XPropertyAccess)
+	            Object dialog = xContext.getServiceManager()
-                UnoRuntime.queryInterface(XPropertyAccess.class, dialog);
+	                .createInstanceWithContext(sDialogName, xContext);
-            xPropertyAccess.setPropertyValues(mediaProps);
+	
-
+	            XPropertyAccess xPropertyAccess = (XPropertyAccess)
-            XExecutableDialog xDialog = (XExecutableDialog)
+	                UnoRuntime.queryInterface(XPropertyAccess.class, dialog);
-                UnoRuntime.queryInterface(XExecutableDialog.class, dialog);
+	            xPropertyAccess.setPropertyValues(mediaProps);
-            if (xDialog.execute()==ExecutableDialogResults.OK) {
+	
-                mediaProps = postProcessMediaProps(xPropertyAccess.getPropertyValues());
+	            XExecutableDialog xDialog = (XExecutableDialog)
-                
+	                UnoRuntime.queryInterface(XExecutableDialog.class, dialog);
-                return true;
+	            if (xDialog.execute()==ExecutableDialogResults.OK) {
-            }
+	                mediaProps = postProcessMediaProps(xPropertyAccess.getPropertyValues());
-            else {
+	                return true;
-                mediaProps = null;
+	            }
-                return false;
+	        }
-            }
+	        catch (com.sun.star.beans.UnknownPropertyException e) {
-        }
+	            // setPropertyValues will not fail..
-        catch (com.sun.star.beans.UnknownPropertyException e) {
+	        }
-            // setPropertyValues will not fail..
+	        catch (com.sun.star.uno.Exception e) {
-            mediaProps = null;
+	            // getServiceManager will not fail..
-            return false;
+	        }
-        }
+    	}
-        catch (com.sun.star.uno.Exception e) {
+    	// No dialog exists, or the dialog was cancelled
-            // getServiceManager will not fail..
+    	mediaProps = null;
-            mediaProps = null;
+    	return false;
-            return false;
-        }
     }
     
     private static String getTargetExtension(TargetFormat format) {
@@ -303,15 +301,27 @@ public class UNOPublisher {
       
     private static String getDialogName(TargetFormat format) {
     	switch (format) {
-    	case xhtml: return "org.openoffice.da.comp.writer2xhtml.XhtmlOptionsDialog";
+    	case xhtml: 
     	case xhtml11: return "org.openoffice.da.comp.writer2xhtml.XhtmlOptionsDialog";
-    	case xhtml_mathml: return "org.openoffice.da.comp.writer2xhtml.XhtmlOptionsDialogMath";
+    	case xhtml_mathml:
     	case html5: return "org.openoffice.da.comp.writer2xhtml.XhtmlOptionsDialogMath";
     	case epub: return "org.openoffice.da.comp.writer2xhtml.EpubOptionsDialog";
     	case latex: return "org.openoffice.da.comp.writer2latex.LaTeXOptionsDialog";
-    	default: return "";
+    	default: return null;
     	}
     }
+    
+    private static String getDialogNameCalc(TargetFormat format) {
+    	switch (format) {
+    	case xhtml: 
+    	case xhtml11: 
+    	case xhtml_mathml:
+    	case html5: return "org.openoffice.da.comp.writer2xhtml.XhtmlOptionsDialogCalc"; 
+    	case epub: 
+    	case latex:
+    	default: return null;
+    	}    	
+    }
       
     private static String getFilterName(TargetFormat format) {
     	switch (format) {

source/java/writer2latex/api/ConverterFactory.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.6 (2014-11-06)
+ *  Version 1.6 (2014-11-08)
  *
  */
  
@@ -33,7 +33,7 @@ public class ConverterFactory {
 
     // Version information
     private static final String VERSION = "1.5.1";
-    private static final String DATE = "2014-11-06";
+    private static final String DATE = "2014-11-08";
 	
     /** Return the Writer2LaTeX version in the form
      *  (major version).(minor version).(patch level)<br/>

source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/menu.xhp

@@ -2,7 +2,7 @@
 <helpdocument version="1.0">
 	<meta>
         <topic id="writer2latex-menu" indexer="include">
-            <title xml-lang="en-US">The LaTeX menu</title>
+            <title xml-lang="en-US">Menu and toolbar</title>
             <filename>org.openoffice.da.writer2latex.oxt/menu.xhp</filename>
         </topic>
     </meta>
@@ -14,7 +14,7 @@
         <paragraph role="heading" level="3" xml-lang="en-US"><link href="org.openoffice.da.writer2latex.oxt/export.xhp"
           name="Export LaTeX files">File - Export</link></paragraph>
 
-        <paragraph role="paragraph" xml-lang="en-US">Writer2xhtml adds two entries to the <emph>File - Export</emph> 
+        <paragraph role="paragraph" xml-lang="en-US">Writer2LaTeX adds two entries to the <emph>File - Export</emph> 
         menu in Writer</paragraph>
         <list type="unordered">
 			<listitem>
@@ -29,7 +29,8 @@
         
         <paragraph role="heading" level="2" xml-lang="en-US">Using the Writer2LaTeX toolbar</paragraph>
 
-        <paragraph role="paragraph" xml-lang="en-US">The Writer2LaTeX toolbar office the following commands.</paragraph>
+        <paragraph role="paragraph" xml-lang="en-US">Writer2LaTeX adds a toolbar in Writer,
+        providing the following commands.</paragraph>
 
         <paragraph role="heading" level="3" xml-lang="en-US">Insert BibTeX reference</paragraph>
 
@@ -57,7 +58,7 @@
         LaTeX, MakeIndex and BibTeX here</paragraph>
 		<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex:ViewLog" visibility="hidden">View log files created by LaTeX, MakeIndex and BibTeX</ahelp></paragraph>
 
-        <paragraph role="heading" level="3" xml-lang="en-US"><link href="org.openoffice.da.writer2latex.oxt/Configuration/Documentclass.xhp"
+        <paragraph role="heading" level="3" xml-lang="en-US"><link href="org.openoffice.da.writer2latex.oxt/Configuration/Introduction.xhp"
           name="Confguration">Edit custom format</link></paragraph>
 
 		<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2latex:EditCustomFormat" id="bm_editcustomformat"/>

source/oxt/writer2xhtml/Addons.xcu

@@ -6,7 +6,7 @@
 		<node oor:name="org.openoffice.da.writer2xhtml.OfficeToolBar" oor:op="replace">
       		<node oor:name="button1" oor:op="replace">
                 <prop oor:name="Context" oor:type="xs:string">
-                    <value>com.sun.star.text.TextDocument</value>
+                    <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value>
                 </prop>
                 <prop oor:name="Title" oor:type="xs:string">
                     <value xml:lang="en-US">Publish as XHTML</value>
@@ -60,7 +60,7 @@
       		</node>
       		<node oor:name="button4" oor:op="replace">
                 <prop oor:name="Context" oor:type="xs:string">
-                    <value>com.sun.star.text.TextDocument</value>
+                    <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value>
                 </prop>
                 <prop oor:name="Title" oor:type="xs:string">
                     <value xml:lang="en-US">Edit custom style</value>

source/oxt/writer2xhtml/META-INF/manifest.xml

@@ -17,6 +17,10 @@
      manifest:full-path="Office/UI/WriterWindowState.xcu"
      manifest:media-type="application/vnd.sun.star.configuration-data"/>
 
+    <manifest:file-entry
+     manifest:full-path="Office/UI/CalcWindowState.xcu"
+     manifest:media-type="application/vnd.sun.star.configuration-data"/>
+
     <manifest:file-entry
      manifest:full-path="writer2xhtml-filter.jar"
      manifest:media-type="application/vnd.sun.star.uno-component;type=Java"/>

source/oxt/writer2xhtml/Office/UI/CalcWindowState.xcu

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ oor:name="CalcWindowState"
+ oor:package="org.openoffice.Office.UI">
+	<node oor:name="UIElements">
+		<node oor:name="States">
+			<node oor:name="private:resource/toolbar/addon_org.openoffice.da.writer2xhtml.OfficeToolBar" oor:op="replace">
+				<prop oor:name="UIName" oor:type="xs:string">
+					<value>Writer2xhtml</value>
+				</prop>
+			</node>
+		</node>
+	</node>
+</oor:component-data>

source/oxt/writer2xhtml/help/en/help.tree

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?> 
 <tree_view version="17-apr-2010">
   <help_section application="writer2xhtml" id="w2x01" title="Writer2xhtml">
-      <!--<topic id="writer2xhtml/org.openoffice.da.writer2xhtml.oxt/general.xhp">General information</topic>-->
+      <topic id="writer2xhtml/org.openoffice.da.writer2xhtml.oxt/introduction.xhp">Introduction</topic>
+      <topic id="writer2xhtml/org.openoffice.da.writer2xhtml.oxt/menu.xhp">Menu and toolbar</topic>
       <topic id="writer2xhtml/org.openoffice.da.writer2xhtml.oxt/export.xhp">XHTML Export (Writer)</topic>
       <topic id="writer2xhtml/org.openoffice.da.writer2xhtml.oxt/export_calc.xhp">XHTML Export (Calc)</topic>
       <topic id="writer2xhtml/org.openoffice.da.writer2xhtml.oxt/epub_export.xhp">EPUB Export (Writer)</topic>

source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export_calc.xhp

@@ -12,7 +12,7 @@
         <paragraph role="paragraph" xml-lang="en-US">Exports the current document to XHTML format.</paragraph>
         <section id="howtoget" xml-lang="en-US">
         	Choose <emph>File - Export - XHTML 1.0 strict</emph><br/>
-        	or <emph>File - Export - XHTML 1.1</emph>
+        	or <emph>File - Export - XHTML 1.1</emph><br/>
         	or <emph>File - Export - HTML5</emph>
         </section>
         

source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/introduction.xhp

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+	<meta>
+        <topic id="writer2xhtml-introduction" indexer="include">
+            <title xml-lang="en-US">Introduction</title>
+            <filename>org.openoffice.da.writer2xhtml.oxt/introduction.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+        <paragraph role="heading" level="1" xml-lang="en-US">Introduction to Writer2xhtml</paragraph>
+        
+        <paragraph role="paragraph" xml-lang="en-US">The Writer2xhtml is a tool for publishing web content
+        and electronic books from %PRODUCTNAME Writer.
+        Using Writer2xhtml you will be able to author well-structured XHTML and EPUB documents using (almost)
+        the full power of %PRODUCTNAME Writer.</paragraph>
+        <paragraph role="paragraph" xml-lang="en-US">Writer2xhtml has two modes of operation</paragraph>
+        <list type="unordered">
+			<listitem>
+		        <paragraph role="paragraph" xml-lang="en-US">You can use Writer2xhtml as an export filter.
+		        It adds XHTML and EPUB formats to the <emph>File - Export</emph> 
+		        <link href="org.openoffice.da.writer2xhtml.oxt/menu.xhp" name="Applications">menu</link>.
+		        </paragraph>
+			</listitem>
+			<listitem>  
+		        <paragraph role="paragraph" xml-lang="en-US">You can publish directly to XHTML or EPUB
+		        and view the result using the provided
+		        <link href="org.openoffice.da.writer2xhtml.oxt/menu.xhp" name="Applications">toolbar</link>.
+		        </paragraph>
+			</listitem>
+        </list>
+    </body>
+</helpdocument>

source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/menu.xhp

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+	<meta>
+        <topic id="writer2xhtml-menu" indexer="include">
+            <title xml-lang="en-US">Menu and toolbar</title>
+            <filename>org.openoffice.da.writer2xhtml.oxt/menu.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+        <paragraph role="heading" level="1" xml-lang="en-US">Menu and toolbar</paragraph>
+
+        <paragraph role="heading" level="2" xml-lang="en-US">Using Writer2xhtml as an export filter</paragraph>
+
+        <paragraph role="heading" level="3" xml-lang="en-US">File - Export</paragraph>
+
+        <paragraph role="paragraph" xml-lang="en-US">Writer2xhtml adds a number of entries to the <emph>File - Export</emph> 
+        menu in Writer</paragraph>
+        <list type="unordered">
+			<listitem>
+		        <paragraph role="paragraph" xml-lang="en-US"><link href="org.openoffice.da.writer2xhtml.oxt/export.xhp"
+          name="Export XHTML or EPUB files">XHTML 1.0 strict [Writer2xhtml]</link></paragraph>
+			</listitem>
+			<listitem>
+		        <paragraph role="paragraph" xml-lang="en-US"><link href="org.openoffice.da.writer2xhtml.oxt/export.xhp"
+          name="Export XHTML or EPUB files">XHTML 1.1 [Writer2xhtml]</link></paragraph>
+			</listitem>
+			<listitem>
+		        <paragraph role="paragraph" xml-lang="en-US"><link href="org.openoffice.da.writer2xhtml.oxt/export.xhp"
+          name="Export XHTML or EPUB files">XHTML 1.1 + MathML 2.0 [Writer2xhtml]</link></paragraph>
+			</listitem>
+			<listitem>
+		        <paragraph role="paragraph" xml-lang="en-US"><link href="org.openoffice.da.writer2xhtml.oxt/export.xhp"
+          name="Export XHTML or EPUB files">HTML5 [Writer2xhtml]</link></paragraph>
+			</listitem>
+			<listitem>
+		        <paragraph role="paragraph" xml-lang="en-US"><link href="org.openoffice.da.writer2xhtml.oxt/epub_export.xhp"
+          name="Export XHTML or EPUB files">EPUB [Writer2xhtml]</link></paragraph>
+			</listitem>
+		</list>
+        
+        <paragraph role="paragraph" xml-lang="en-US">It further adds a number of entries to the <emph>File - Export</emph> 
+        menu in Calc</paragraph>
+        <list type="unordered">
+			<listitem>
+		        <paragraph role="paragraph" xml-lang="en-US"><link href="org.openoffice.da.writer2xhtml.oxt/export_calc.xhp"
+          name="Export XHTML or EPUB files">XHTML 1.0 strict [Writer2xhtml]</link></paragraph>
+			</listitem>
+			<listitem>
+		        <paragraph role="paragraph" xml-lang="en-US"><link href="org.openoffice.da.writer2xhtml.oxt/export_calc.xhp"
+          name="Export XHTML or EPUB files">XHTML 1.1 [Writer2xhtml]</link></paragraph>
+			</listitem>
+			<listitem>
+		        <paragraph role="paragraph" xml-lang="en-US"><link href="org.openoffice.da.writer2xhtml.oxt/export_calc.xhp"
+          name="Export XHTML or EPUB files">HTML5 [Writer2xhtml]</link></paragraph>
+			</listitem>
+		</list>
+
+        <paragraph role="heading" level="2" xml-lang="en-US">Using the Writer2xhtml toolbar</paragraph>
+
+        <paragraph role="paragraph" xml-lang="en-US">Writer2xhtml adds a toolbar in Writer and Calc,
+        providing the following commands.</paragraph>
+
+        <paragraph role="heading" level="3" xml-lang="en-US"><link href="org.openoffice.da.writer2xhtml.oxt/export.xhp"
+          name="Export XHTML files">Publish to XHTML</link></paragraph>
+
+		<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml:PublishAsXHTML" id="bm_processdocument"/>
+        <paragraph role="paragraph" xml-lang="en-US">Convert the document to a web page in XHTML format
+        and display the result in the default browser.</paragraph>
+
+		<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex:PublishAsXHTML" visibility="hidden">Publish the current document as an XHTML file</ahelp></paragraph>
+        
+        <paragraph role="heading" level="3" xml-lang="en-US"><link href="org.openoffice.da.writer2xhtml.oxt/epub_export.xhp"
+          name="Export EPUB files">Publish to EPUB (Writer only)</link></paragraph>
+
+		<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml:PublishAsEPUB" id="bm_processdocument"/>
+        <paragraph role="paragraph" xml-lang="en-US">Convert the document to and electronic book in EPUB format
+        and display the result in the default EPUB viewer.
+        </paragraph>
+        
+		<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex:PublishAsEPUB" visibility="hidden">Publish the current document as an EPUB file</ahelp></paragraph>
+
+        <paragraph role="heading" level="3" xml-lang="en-US"><link href="org.openoffice.da.writer2xhtml.oxt/epub_metadata.xhp"
+          name="EPUB document properties">Edit EPUB document properties (Writer only)</link></paragraph>
+
+		<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml:EditEPUBDocumentProperties" id="bm_editepubdocumentproperties"/>
+        <paragraph role="paragraph" xml-lang="en-US">Electronic books in EPUB format supports a complex set of
+        document properties. This function brings up a dialog to edit the properties.</paragraph>
+        
+		<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex:EditEPUBDocumentProperties" visibility="hidden">Edit the EPUB document properties of the current document</ahelp></paragraph>
+
+        <paragraph role="heading" level="3" xml-lang="en-US"><link href="org.openoffice.da.writer2xhtml.oxt/Configuration/Introduction.xhp"
+          name="Confguration">Edit custom style</link></paragraph>
+
+		<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml:EditCustomStyle" id="bm_editcustomstyle"/>
+        <paragraph role="paragraph" xml-lang="en-US">Edit the custom export style. This style is used if you select
+        <emph>Custom</emph> as style in the export dialog.</paragraph>
+	</body>
+</helpdocument>