Compatibility with LO4.1 and AOO4
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@189 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust
parent
d2b20d20c9
commit
71721c39e1
4 changed files with 128 additions and 9 deletions
|
|
@ -2,6 +2,9 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6
|
|||
|
||||
---------- version 1.5.1 ----------
|
||||
|
||||
[w2x] Bugfix: The date field in the EPUB Metadata dialog did not work in LO 4.1 and newer. This was due to and API
|
||||
change in LO (long replaced by com.sun.star.util.Date), and is now fixed.
|
||||
|
||||
[all] Implementation detail: Replaced Robert Harder's base 64 class with javax.xml.bind.DatatypeConverter
|
||||
|
||||
[w2x] Style maps for paragraphs and headings now support the attributes before and after. These define fixed texts
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
* MA 02111-1307 USA
|
||||
*
|
||||
* Copyright: 2002-2011 by Henrik Just
|
||||
* Copyright: 2002-2014 by Henrik Just
|
||||
*
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* Version 1.2 (2011-03-03)
|
||||
* Version 1.6 (2014-10-27)
|
||||
*
|
||||
*/
|
||||
|
||||
|
|
@ -32,6 +32,7 @@ import com.sun.star.awt.XControlModel;
|
|||
import com.sun.star.awt.XDialog;
|
||||
import com.sun.star.beans.XPropertySet;
|
||||
import com.sun.star.uno.UnoRuntime;
|
||||
import com.sun.star.util.Date;
|
||||
|
||||
|
||||
/** This class provides some convenient methods to access a uno dialog
|
||||
|
|
@ -279,7 +280,20 @@ public class DialogAccess {
|
|||
public int getDateFieldValue(String sControlName) {
|
||||
XPropertySet xPropertySet = getControlProperties(sControlName);
|
||||
try {
|
||||
return ((Integer) xPropertySet.getPropertyValue("Date")).intValue();
|
||||
Object dateObject = xPropertySet.getPropertyValue("Date");
|
||||
if (dateObject instanceof Date) {
|
||||
// Since LO 4.1
|
||||
Date date = (Date) dateObject;
|
||||
return 10000*date.Year+100*date.Month+date.Day;
|
||||
}
|
||||
else if (dateObject instanceof Integer) {
|
||||
// AOO and older versions of LO
|
||||
return ((Integer) dateObject).intValue();
|
||||
}
|
||||
else {
|
||||
// The date field does not have a value
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
catch (Exception e) {
|
||||
// Will fail if the control does not exist or is not a date field
|
||||
|
|
@ -289,12 +303,22 @@ public class DialogAccess {
|
|||
|
||||
public void setDateFieldValue(String sControlName, int nValue) {
|
||||
XPropertySet xPropertySet = getControlProperties(sControlName);
|
||||
try {
|
||||
xPropertySet.setPropertyValue("Date", nValue);
|
||||
}
|
||||
catch (Exception e) {
|
||||
// Will fail if the control does not exist or is not a date field
|
||||
}
|
||||
Date date = new Date();
|
||||
date.Year = (short) (nValue/10000);
|
||||
date.Month = (short) ((nValue%10000)/100);
|
||||
date.Day = (short) (nValue%100);
|
||||
|
||||
// TODO: Use reflection to identify the correct type of the property
|
||||
try {
|
||||
// Since LO 4.1
|
||||
xPropertySet.setPropertyValue("Date", date);
|
||||
} catch (Exception e) {
|
||||
// AOO and older versions of LO
|
||||
try {
|
||||
xPropertySet.setPropertyValue("Date", nValue);
|
||||
} catch (Exception e1) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public int getNumericFieldValue(String sControlName) {
|
||||
|
|
|
|||
88
source/oxt/writer2xhtml/AddonsAOO4.xcu
Normal file
88
source/oxt/writer2xhtml/AddonsAOO4.xcu
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
<?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="Addons" oor:package="org.openoffice.Office">
|
||||
<!-- Defines the menus and toolbars provided by Writer2xhtml -->
|
||||
<node oor:name="AddonUI">
|
||||
<node oor:name="OfficeToolBar">
|
||||
<node oor:name="org.openoffice.da.writer2xhtml.OfficeToolBar.AOO4" oor:op="replace">
|
||||
<prop oor:name="Title" oor:type="xs:string">
|
||||
<value xml:lang="en-US">Writer2xhtml</value>
|
||||
</prop>
|
||||
<node oor:name="ToolBarItems">
|
||||
<node oor:name="button1" oor:op="replace">
|
||||
<prop oor:name="Context" oor:type="xs:string">
|
||||
<value>com.sun.star.text.TextDocument</value>
|
||||
</prop>
|
||||
<prop oor:name="Title" oor:type="xs:string">
|
||||
<value xml:lang="en-US">Publish as XHTML</value>
|
||||
<value xml:lang="da">Publicer som XHTML</value>
|
||||
</prop>
|
||||
<prop oor:name="Target" oor:type="xs:string">
|
||||
<value>_self</value>
|
||||
</prop>
|
||||
<prop oor:name="URL" oor:type="xs:string">
|
||||
<value>org.openoffice.da.writer2xhtml:PublishAsXHTML</value>
|
||||
</prop>
|
||||
<prop oor:name="ImageIdentifier" oor:type="xs:string">
|
||||
<value>%origin%/icons/html5</value>
|
||||
</prop>
|
||||
</node>
|
||||
<node oor:name="button2" oor:op="replace">
|
||||
<prop oor:name="Context" oor:type="xs:string">
|
||||
<value>com.sun.star.text.TextDocument</value>
|
||||
</prop>
|
||||
<prop oor:name="Title" oor:type="xs:string">
|
||||
<value xml:lang="en-US">Publish as EPUB</value>
|
||||
<value xml:lang="da">Publicer som EPUB</value>
|
||||
</prop>
|
||||
<prop oor:name="Target" oor:type="xs:string">
|
||||
<value>_self</value>
|
||||
</prop>
|
||||
<prop oor:name="URL" oor:type="xs:string">
|
||||
<value>org.openoffice.da.writer2xhtml:PublishAsEPUB</value>
|
||||
</prop>
|
||||
<prop oor:name="ImageIdentifier" oor:type="xs:string">
|
||||
<value>%origin%/icons/epub</value>
|
||||
</prop>
|
||||
</node>
|
||||
<node oor:name="button3" oor:op="replace">
|
||||
<prop oor:name="Context" oor:type="xs:string">
|
||||
<value>com.sun.star.text.TextDocument</value>
|
||||
</prop>
|
||||
<prop oor:name="Title" oor:type="xs:string">
|
||||
<value xml:lang="en-US">Edit EPUB document properties</value>
|
||||
<value xml:lang="da">Rediger EPUB-dokumentegenskaber</value>
|
||||
</prop>
|
||||
<prop oor:name="Target" oor:type="xs:string">
|
||||
<value>_self</value>
|
||||
</prop>
|
||||
<prop oor:name="URL" oor:type="xs:string">
|
||||
<value>org.openoffice.da.writer2xhtml:EditEPUBDocumentProperties</value>
|
||||
</prop>
|
||||
<prop oor:name="ImageIdentifier" oor:type="xs:string">
|
||||
<value>%origin%/icons/metadata</value>
|
||||
</prop>
|
||||
</node>
|
||||
<node oor:name="button4" oor:op="replace">
|
||||
<prop oor:name="Context" oor:type="xs:string">
|
||||
<value>com.sun.star.text.TextDocument</value>
|
||||
</prop>
|
||||
<prop oor:name="Title" oor:type="xs:string">
|
||||
<value xml:lang="en-US">Edit custom style</value>
|
||||
<value xml:lang="da">Rediger brugerdefineret typografi</value>
|
||||
</prop>
|
||||
<prop oor:name="Target" oor:type="xs:string">
|
||||
<value>_self</value>
|
||||
</prop>
|
||||
<prop oor:name="URL" oor:type="xs:string">
|
||||
<value>.uno:OptionsTreeDialog?OptionsPageURL:string=%origin%/W2XDialogs2/General.xdl</value>
|
||||
</prop>
|
||||
<prop oor:name="ImageIdentifier" oor:type="xs:string">
|
||||
<value>%origin%/icons/customh</value>
|
||||
</prop>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
||||
</oor:component-data>
|
||||
|
|
@ -9,6 +9,10 @@
|
|||
manifest:full-path="Addons.xcu"
|
||||
manifest:media-type="application/vnd.sun.star.configuration-data"/>
|
||||
|
||||
<manifest:file-entry
|
||||
manifest:full-path="AddonsAOO4.xcu"
|
||||
manifest:media-type="application/vnd.sun.star.configuration-data"/>
|
||||
|
||||
<manifest:file-entry
|
||||
manifest:full-path="Office/UI/WriterWindowState.xcu"
|
||||
manifest:media-type="application/vnd.sun.star.configuration-data"/>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue