Skip to content

C
core
Kaydet (Commit) 33f2f512 authored tarafından Jan Holesovsky's avatar Jan Holesovsky
Dosyalara gözat
Seçenekler

Merge remote-tracking branch 'origin/integration/dev300_m106'

üst cd9c9307 66c4b436
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 37 deletions
reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
Dosyayı görüntüle @ 33f2f512
......@@ -49,21 +49,18 @@ JAVAFILES := AuthorFunction.java \
TitleFunctionDescription.java \
MetaDataFunctionCategory.java
# PROPERTYFILES := $(shell @$(FIND) . -name "*.properties")
PROPERTYFILES:=$(CLASSDIR)$/$(PACKAGE)$/category.properties \
COPYFILES := $(CLASSDIR)$/$(PACKAGE)$/category.properties \
$(CLASSDIR)$/$(PACKAGE)$/Title-Function.properties\
$(CLASSDIR)$/$(PACKAGE)$/category_en_US.properties \
$(CLASSDIR)$/$(PACKAGE)$/Author-Function.properties \
$(CLASSDIR)$/$(PACKAGE)$/Author-Function_en_US.properties \
$(CLASSDIR)$/$(PACKAGE)$/Title-Function_en_US.properties
L10NPROPERTYFILES = $(PROPERTYFILES)
ALLTAR : $(PROPERTYFILES)
ALLTAR : $(COPYFILES)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
.IF "$(WITH_LANG)"==""
$(CLASSDIR)/$(PACKAGE)/%.properties : %.properties
@@-$(MKDIRHIER) $(@:d)
$(COMMAND_ECHO)$(COPY) $< $@
.ENDIF
$(COPYFILES): $$(@:f)
+$(MKDIRHIER) $(CLASSDIR)$/$(PACKAGE)
+$(COPY) $< $@
reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
Dosyayı görüntüle @ 33f2f512
......@@ -29,6 +29,7 @@ package com.sun.star.report.pentaho.layoutprocessor;
import com.sun.star.report.OfficeToken;
import com.sun.star.report.pentaho.OfficeNamespaces;
import com.sun.star.report.pentaho.model.FormattedTextElement;
import java.math.BigDecimal;
import java.sql.Time;
......@@ -46,7 +47,6 @@ import org.jfree.report.flow.layoutprocessor.LayoutControllerUtil;
import org.pentaho.reporting.libraries.formula.util.HSSFDateUtil;
/**
* Creation-Date: 06.06.2007, 17:03:30
*
......@@ -125,31 +125,52 @@ public class FormatValueUtility
}
else if (value instanceof java.sql.Date)
{
if ( "float".equals(valueType))//@see http://qa.openoffice.org/issues/show_bug.cgi?id=108954
if ("float".equals(valueType))//@see http://qa.openoffice.org/issues/show_bug.cgi?id=108954
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE, HSSFDateUtil.getExcelDate((Date) value, false, 2).toString());
}
else
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "date-value", formatDate((Date) value));
}
}
else if (value instanceof Date)
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE_TYPE, "float");
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE, HSSFDateUtil.getExcelDate((Date) value, false, 2).toString());
}
else if (value instanceof BigDecimal)
{
if ("date".equals(valueType))
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "date-value", formatDate(HSSFDateUtil.getJavaDate((BigDecimal) value, false, 0)));
}
else
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE, String.valueOf(value));
}
}
else if (value instanceof Number)
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE, String.valueOf(value));
}
else if (value instanceof Boolean)
{
if (Boolean.TRUE.equals(value))
if ("float".equals(valueType))
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, BOOLEAN_VALUE, OfficeToken.TRUE);
float fvalue = Boolean.TRUE.equals(value) ? 1 : 0;
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE, String.valueOf(fvalue));
}
else
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, BOOLEAN_VALUE, OfficeToken.FALSE);
if (Boolean.TRUE.equals(value))
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, BOOLEAN_VALUE, OfficeToken.TRUE);
}
else
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, BOOLEAN_VALUE, OfficeToken.FALSE);
}
}
}
else if (value != null)
......@@ -165,12 +186,10 @@ public class FormatValueUtility
}
if (!"string".equals(valueType))
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE, String.valueOf(value));
}
else
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, STRING_VALUE, String.valueOf(value));
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE_TYPE, "string");
//variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE, String.valueOf(value));
}
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, STRING_VALUE, String.valueOf(value));
}
else
{
......
reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
Dosyayı görüntüle @ 33f2f512
......@@ -69,12 +69,12 @@ public class TableCellLayoutController extends SectionLayoutController
{
final AttributeMap attributeMap = new AttributeMap(super.computeAttributes(fc, element, target));
final String definedStyle = (String) attributeMap.getAttribute(OfficeNamespaces.TABLE_NS, OfficeToken.STYLE_NAME);
final String valueType = (String) attributeMap.getAttribute(OfficeNamespaces.OFFICE_NS, FormatValueUtility.VALUE_TYPE);
attributeMap.setAttribute(OfficeNamespaces.TABLE_NS, OfficeToken.STYLE_NAME, getDisplayStyleName((Section) element, definedStyle));
try
{
final DataFlags value = computeValue();
final DataFlags value = computeValue(attributeMap);
final String valueType = (String) attributeMap.getAttribute(OfficeNamespaces.OFFICE_NS, FormatValueUtility.VALUE_TYPE);
if (value != null)
{
FormatValueUtility.applyValueForCell(value.getValue(), attributeMap, valueType);
......@@ -100,7 +100,7 @@ public class TableCellLayoutController extends SectionLayoutController
return attributeMap;
}
private DataFlags computeValue() throws DataSourceException
private DataFlags computeValue(final AttributeMap attributeMap) throws DataSourceException
{
// Search for the first FormattedTextElement
final Section cell = (Section) getElement();
......@@ -115,6 +115,8 @@ public class TableCellLayoutController extends SectionLayoutController
final Object o = LayoutControllerUtil.evaluateExpression(getFlowController(), element, dc);
if (Boolean.FALSE.equals(o))
{
attributeMap.setAttribute(OfficeNamespaces.OFFICE_NS,
FormatValueUtility.VALUE_TYPE, "string");
return null;
}
}
......
sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
Dosyayı görüntüle @ 33f2f512
......@@ -35,6 +35,7 @@
#ifdef SYSTEM_ZLIB
#include "zlib.h"
#else
#define ZLIB_INTERNAL 1
#include <zlib/zlib.h>
#endif
......
swext/mediawiki/build.xml
Dosyayı görüntüle @ 33f2f512
......@@ -148,23 +148,23 @@
<target name="development-package" depends="jar, init">
<delete file="${dist}/${target}_develop.zip"/>
<zip destfile="${dist}/${target}_develop.zip">
<fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/>
<fileset dir="${out}/misc/${target}" includes="description.xml" casesensitive="yes"/>
<fileset dir="${out}/misc/${target}/registry/schema/org/openoffice/Office/Custom" includes="*.xcs" casesensitive="yes"/>
<fileset dir="${out}/misc/${target}/registry/data/org/openoffice/Office" includes="ProtocolHandler.xcu,Paths.xcu" casesensitive="yes"/>
<fileset dir="${out}/misc/${target}/merge/org/openoffice/Office/Custom" includes="*.xcu" casesensitive="yes"/>
<fileset dir="${out}/misc/${target}/merge/org/openoffice/Office" includes="*.xcu" excludes="**/ProtocolHandler.xcu,**/Paths.xcu" casesensitive="yes"/>
<zipfileset dir="${dist}" includes="${target}.jar" casesensitive="yes" filemode="664" dirmode="775"/>
<zipfileset dir="${out}/misc/${target}" includes="description.xml" casesensitive="yes" filemode="664" dirmode="775"/>
<zipfileset dir="${out}/misc/${target}/registry/schema/org/openoffice/Office/Custom" includes="*.xcs" casesensitive="yes" filemode="664" dirmode="775"/>
<zipfileset dir="${out}/misc/${target}/registry/data/org/openoffice/Office" includes="ProtocolHandler.xcu,Paths.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
<zipfileset dir="${out}/misc/${target}/merge/org/openoffice/Office/Custom" includes="*.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
<zipfileset dir="${out}/misc/${target}/merge/org/openoffice/Office" includes="*.xcu" excludes="**/ProtocolHandler.xcu,**/Paths.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
<!-- FIXME: currently the build xcu files can not be used since the tag containing x-default attribute is thrown away, issue 99378
<fileset dir="${out}/misc/${target}/merge/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/>
<fileset dir="${out}/misc/${target}/merge/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
-->
<fileset dir="src/registry/data/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/>
<zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
<zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
<zipfileset dir="${out}/misc/${target}/help" includes="component.txt" casesensitive="yes" prefix="help"/>
<zipfileset dir="${out}/misc/${target}_merge/help" includes="**/*.xhp" casesensitive="yes" prefix="help"/>
<zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
<zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
<zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/>
<zipfileset dir="src/registry/data/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
<zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl" filemode="664" dirmode="775"/>
<zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott" filemode="664" dirmode="775"/>
<zipfileset dir="${out}/misc/${target}/help" includes="component.txt" casesensitive="yes" prefix="help" filemode="664" dirmode="775"/>
<zipfileset dir="${out}/misc/${target}_merge/help" includes="**/*.xhp" casesensitive="yes" prefix="help" filemode="664" dirmode="775"/>
<zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor" filemode="664" dirmode="775"/>
<zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml" filemode="664" dirmode="775"/>
<zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license" filemode="664" dirmode="775"/>
</zip>
</target>
......
xpdf/makefile.mk
Dosyayı görüntüle @ 33f2f512
......@@ -73,6 +73,9 @@ CXXFLAGS:=-O2 $(ARCH_FLAGS)
.ELSE
CXXFLAGS:=-O $(ARCH_FLAGS)
.ENDIF
.IF "$(SYSBASE)" != ""
CXXFLAGS +:= -I$(SYSBASE)/usr/include
.END
LDFLAGS:=$(ARCH_FLAGS)
.EXPORT : CFLAGS CXXFLAGS LDFLAGS
.ENDIF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment