strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dba34a: merged in CWS dba33i

Browse source
This commit is contained in:
Frank Schoenheit [fs] 2010-09-02 14:25:11 +02:00
commit 489c748fad
6 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
View file

@ -81,7 +81,15 @@ public class TableCellLayoutController extends SectionLayoutController
}
else if ( "float".equals(valueType))
{
attributeMap.setAttribute(OfficeNamespaces.OFFICE_NS, FormatValueUtility.VALUE, "1.#NAN");
attributeMap.setAttribute(OfficeNamespaces.OFFICE_NS,
FormatValueUtility.VALUE, "NaN");
}
// #i114108#: except on form elements, the only value-type that can
// occur without an accomanying value attribute is "string"
else if (!"string".equals(valueType))
{
attributeMap.setAttribute(OfficeNamespaces.OFFICE_NS,
FormatValueUtility.VALUE_TYPE, "string");
}
}
catch (Exception e)

7
reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
View file

@ -138,6 +138,10 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
public static final String VERTICAL_POS = "vertical-pos";
private static final String ZERO_CM = "0cm";
/** the verison of the ODF specification to which generated documents
* shall conform. */
public static final String ODF_VERSION = "1.2";
protected static class BufferState
{
@ -376,7 +380,8 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
rootAttributes.addNamespaceDeclaration("xsd", OfficeNamespaces.XSD_NS);
rootAttributes.addNamespaceDeclaration("xsi", OfficeNamespaces.XSI_NS);
rootAttributes.addNamespaceDeclaration("grddl", OfficeNamespaces.GRDDL_NS);
rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version", "1.2");
rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version",
ODF_VERSION);
this.rootXmlWriter.writeXmlDeclaration("UTF-8");
this.rootXmlWriter.writeTag(OfficeNamespaces.OFFICE_NS, "document-content", rootAttributes, XmlWriterSupport.OPEN);

9
reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
View file

@ -117,11 +117,11 @@ public class StylesWriter
{
globals
});
writeAutomaticStylesSection(new OfficeStylesCollection[]
writeCommonStylesSection(new OfficeStylesCollection[]
{
globals
});
writeCommonStylesSection(new OfficeStylesCollection[]
writeAutomaticStylesSection(new OfficeStylesCollection[]
{
globals
});
@ -374,11 +374,12 @@ public class StylesWriter
rootAttributes.addNamespaceDeclaration("xsd", OfficeNamespaces.XSD_NS);
rootAttributes.addNamespaceDeclaration("xsi", OfficeNamespaces.XSI_NS);
rootAttributes.addNamespaceDeclaration("grddl", OfficeNamespaces.GRDDL_NS);
rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version", "1.2");
rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version",
OfficeDocumentReportTarget.ODF_VERSION);
this.xmlWriter.writeXmlDeclaration("UTF-8");
this.xmlWriter.writeTag(OfficeNamespaces.OFFICE_NS,
"document-content", rootAttributes, XmlWriterSupport.OPEN);
"document-styles", rootAttributes, XmlWriterSupport.OPEN);
}
public void close()

4
reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
View file

@ -624,7 +624,9 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
final Section tableColumnProperties = new Section();
tableColumnProperties.setType("table-column-properties");
tableColumnProperties.setNamespace(style.getNamespace());
tableColumnProperties.setAttribute(style.getNamespace(), "column-width", columnWidth + getUnitsOfMeasure(null));
final String width = String.format("%f", columnWidth);
tableColumnProperties.setAttribute(style.getNamespace(),
"column-width", width + getUnitsOfMeasure(null));
style.addNode(tableColumnProperties);
final AttributeList myAttrList = new AttributeList();

3
reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
View file

@ -1269,7 +1269,8 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
rootAttributes.addNamespaceDeclaration("office", OfficeNamespaces.OFFICE_NS);
rootAttributes.addNamespaceDeclaration("config", OfficeNamespaces.CONFIG);
rootAttributes.addNamespaceDeclaration("ooo", OfficeNamespaces.OO2004_NS);
rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version", "1.0");
rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version",
OfficeDocumentReportTarget.ODF_VERSION);
final OutputStream outputStream = getOutputRepository().createOutputStream("settings.xml", "text/xml");
final XmlWriter xmlWriter = new XmlWriter(new OutputStreamWriter(outputStream, "UTF-8"), createTagDescription());
xmlWriter.setAlwaysAddNamespace(true);

2
reportbuilder/util/description.xml Executable file → Normal file
View file

@ -3,7 +3,7 @@
xmlns:d="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink">
<display-name>
<name lang="en-US">Oracle Report Builder</name>
<name lang="en-US">Report Builder</name>
<!-- <name lang="en-US">Oracle(TM) Report Builder</name> -->
</display-name>
<registration>