[Libreoffice-commits] .: 35 commits - reportbuilder/java sdext/source swext/mediawiki xpdf/makefile.mk
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri May 27 12:15:37 PDT 2011
reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk | 15 +--
reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java | 39 +++++++---
reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java | 8 +-
sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx | 1
swext/mediawiki/build.xml | 30 +++----
xpdf/makefile.mk | 3
6 files changed, 59 insertions(+), 37 deletions(-)
New commits:
commit 0f9a1a572fe35f47992f9a2baa54031d8396b459
Merge: ce398bb... 71a8bc6...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue May 24 15:03:17 2011 +0200
Merge remote-tracking branch 'origin/integration/dev300_m106'
commit 71a8bc6207269a0079d83d20fddb9038fb1db389
Merge: 2c5126e... 14551a3...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Apr 22 15:08:10 2011 +0200
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
swext/mediawiki/build.xml
diff --cc swext/mediawiki/build.xml
index 37e2c66,d39331e..94ce827
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@@ -148,23 -149,24 +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="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license" filemode="664" dirmode="775"/>
+ <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license" filemode="664" dirmode="775"/>
</zip>
</target>
commit 2c5126e34e64b1e184a36f950b58e91efd2de5cb
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 19 18:58:46 2011 +0200
Version 3.3.99.2, tag libreoffice-3.3.99.2 (3.4.0-beta2)
commit 1855be9ac34a970d0149dd57a384ff1b9eee7909
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Apr 11 17:52:53 2011 +0200
Version 3.3.99.1, tag libreoffice-3.3.99.1 (3.4.0-beta1)
commit 7a07bc72f0642dfa09be29ccc0e4c7970a6ce330
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Apr 8 16:54:49 2011 +0200
fix jfreereport build with ant-1.6.5
diff --git a/jfreereport/patches/common_build.patch b/jfreereport/patches/common_build.patch
index 3d5330b..7cdc7f8 100755
--- a/jfreereport/patches/common_build.patch
+++ b/jfreereport/patches/common_build.patch
@@ -1,5 +1,23 @@
--- misc/libloader-1.1.3/common_build.xml 2009-11-16 10:25:34.000000000 +0100
+++ misc/build/libloader-1.1.3/common_build.xml 2009-12-04 10:22:24.277647200 +0100
+@@ -261,7 +261,7 @@ TYPICAL TARGET SEQUENCE
+ <property name="project.revision" value="${Implementation-Version}" description="Sets the version number of the project based on the Implementation-Version found in the manifest file (if one is supplied and nothing is specified in the build.properties)" />
+ <fail message="A project revision number has not been determined!">
+ <condition>
+- <matches string="${project.revision}" pattern="\$\{.*\}" />
++ <contains string="${project.revision}" substring="\$\{" />
+ </condition>
+ </fail>
+
+@@ -270,7 +270,7 @@ TYPICAL TARGET SEQUENCE
+ <property name="impl.title" value="${Implementation-Title}" description="Sets the title of the project based on the Implementation-Title found in the manifest file (if one is supplied and nothing is specified in the build.properties)" />
+ <fail message="A project title has not been determined!">
+ <condition>
+- <matches string="${impl.title}" pattern="\$\{.*\}" />
++ <contains string="${impl.title}" substring="\$\{" />
+ </condition>
+ </fail>
+
@@ -497,7 +497,7 @@
Sets a property build.id to the either "development" or the svn revision
if in release mode
commit 14551a384ca5bde96224c98354152014aae1bed7
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Apr 4 14:10:39 2011 +0200
masterfix DEV300: #i10000# added mkdir
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
index 937114c..8694dec 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
@@ -61,5 +61,6 @@ ALLTAR : $(COPYFILES)
.INCLUDE : target.mk
$(COPYFILES): $$(@:f)
+ +$(MKDIRHIER) $(CLASSDIR)$/$(PACKAGE)
+$(COPY) $< $@
commit 6c6cc5084d5c9d37ac5c8aff53210898a2e4eff9
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Apr 4 13:05:38 2011 +0200
masterfix DEV300: #i10000# build fix
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
index 9ba0c02..937114c 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
@@ -49,21 +49,17 @@ 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)
+ +$(COPY) $< $@
+
commit 9691a815bd31dd9deb8f3ea0fd5868d5edfbbf94
Merge: 6666997... fe2f310...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Mar 29 19:12:02 2011 +0200
CWS-TOOLING: integrate CWS ause127
commit 66669970d13693b7f034dd98c9b88957c791000c
Merge: 9da84eb... d28d76f...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Mar 29 18:14:38 2011 +0200
CWS-TOOLING: integrate CWS rsvglibs
commit d28d76f255a7a40196a0f800584526bf36ffdaaa
Merge: 03aa288... eca4efa...
Author: ka <kai.ahrens at oracle.com>
Date: Tue Mar 29 02:04:27 2011 +0200
rsvglibs: rebased to DEV300_m104
commit 9da84ebb7ececacf3158eff7fb7dc2e77166d1f3
Merge: 03aa288... 0ff6390...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Mar 28 15:37:38 2011 +0200
CWS-TOOLING: integrate CWS dba34d
commit eca4efac48598d2cf56a488e979b3d56b3cdfc4d
Author: ka <kai.ahrens at oracle.com>
Date: Mon Mar 28 04:04:23 2011 +0200
rsvglibs: minor adjustments wrt. new/updated external libs
diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
index e0574c7..b61d80e 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
@@ -33,6 +33,7 @@
#ifdef SYSTEM_ZLIB
#include "zlib.h"
#else
+#define ZLIB_INTERNAL 1
#include <zlib/zlib.h>
#endif
commit fe2f31095c004548b2a751546a8f56c5fb46c9fa
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Wed Mar 23 10:19:59 2011 +0100
ause127: #i117518# fix directory access rights inside zip - thanks to mav
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
index 22f44e2..d39331e 100644
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@ -149,24 +149,24 @@
<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="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/>
- <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="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license" filemode="664" dirmode="775"/>
+ <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license" filemode="664" dirmode="775"/>
</zip>
</target>
commit 03aa2884227023d89843ac102dc10fe82ada29c8
Author: sb <sb at openoffice.org>
Date: Fri Mar 18 17:38:05 2011 +0100
masterfix from sb140: #i117458# on Solaris 11 against Solaris 10 baseline, make sure xpdf sees baseline headers
(transplanted from 5d89bbbf49f658c5a293b7a81ca1550f6cc8d3d9)
diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index 191eefd..3205582 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -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
commit ea06b726332419c28cc5e4d7895eb54ceb6cf8c6
Merge: dff4613... 3a8d9b1...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Mon Mar 21 17:02:20 2011 +0100
CWS-TOOLING: integrate CWS dba34c
commit 0ff639091d3d8c53cbcb92f533e9803430a1b036
Merge: 94217ab... dff4613...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Mar 14 10:01:15 2011 +0100
dba34d: pulled and merged DEV300.m102
commit 94217abf335fc0dfd6280593fa9d83c774b7fc59
Merge: 3a8d9b1... db1ceac...
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Thu Mar 10 11:12:57 2011 +0100
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34c
commit db1ceac870023d4532434bda0d8f690e4fca6a7b
Merge: b8ff7be... 3a8d9b1...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Tue Mar 8 09:56:56 2011 +0100
dba34d: pulled and merged latest changes from CWS dba34c
commit 3a8d9b1c77ecee0ddfac0a32acbabd6576e43993
Merge: 102638f... 6888724...
Author: Ocke Janssen <oj at openoffice.org>
Date: Fri Mar 4 07:53:39 2011 +0100
Automated merge with file:///d:\tools\master\ooo
commit b8ff7bee0fc0a65d9b9a4bffda9c5b286509331c
Merge: 6888724... 5bd8246...
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Tue Mar 1 08:33:49 2011 +0100
Automated merge with file:///cws/so-cwsserv03/dba34c/DEV300/ooo
commit 5bd82464019cfc0f68acca4d20b29f073fef7922
Merge: 6888724... 26967ba...
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Tue Feb 22 10:17:33 2011 +0100
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34c
commit 26967bab2bed846b0fe084368f2a30ed90df99e4
Merge: 40291e1... 6888724...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Tue Feb 15 10:31:10 2011 +0100
dba34d: pulled and merged CWS dba34c, thus implicitly rebasing to m100
commit 68887243f9c02249a3eadc71ec21be1b1ea256c5
Merge: 35ee818... 4e41f1d...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Feb 14 22:22:46 2011 +0100
dba34c: pulled and merged DEV300.m100
commit 35ee818eaba16fc3e98fc095e143ae61121dfdba
Merge: ef873bb... d9c23e5...
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Thu Feb 3 12:19:25 2011 +0100
merge from master
commit 40291e19d51b6c375bcfa25fedd8af3dc12a3dd7
Merge: ef873bb... 43cb57d...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Jan 31 14:44:20 2011 +0100
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34c
commit ef873bb0e3e52ccccaa8dae5279ef981dbd77d19
Merge: ebbb961... ac758b4...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Jan 31 13:14:17 2011 +0100
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34b
commit 43cb57d0df9f62aaf84386a6058c5126732c7b19
Merge: ac758b4... 8b4af78...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Fri Jan 28 10:59:03 2011 +0100
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34c
commit ac758b4979c4c13acb9ca06164741a7d3c537939
Merge: ebbb961... 50e25f1...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Fri Jan 28 10:30:40 2011 +0100
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34b
commit 8b4af78660e0f213adac99e496f25098bd01f9bf
Merge: 50e25f1... a500ea9...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Jan 24 12:45:51 2011 +0100
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34c
commit 50e25f18ee5bcf014217e296afa5ac108a1be9d6
Merge: ebbb961... ed540ee...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Jan 24 10:24:36 2011 +0100
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34b
commit a500ea98b8e7b0be6869411de6b277034b9de17d
Author: Ocke.Janssen <Ocke.Janssen at oracle.com>
Date: Mon Jan 17 12:32:14 2011 +0100
dba34d: #i116463# fix string and NaN
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
index 773d49f..70f4304 100755
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -143,7 +143,7 @@ public class FormatValueUtility
{
if ("date".equals(valueType))
{
- variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "date-value", formatDate(HSSFDateUtil.getJavaDate((BigDecimal)value, false, 0)));
+ variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "date-value", formatDate(HSSFDateUtil.getJavaDate((BigDecimal) value, false, 0)));
}
else
{
@@ -156,13 +156,21 @@ public class FormatValueUtility
}
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)
@@ -178,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
{
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
index 3ce77c6..859d274 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -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;
}
}
commit ed540ee5d70204285395116b11c492b32e82b708
Merge: 8d37e6e... 8d98f6b...
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Mon Jan 10 14:23:31 2011 +0100
Automated merge with ssh://hg.services.openoffice.org/cws/dba34c
commit 8d37e6e431ab69b4ca0bd2e443520a30f77b1816
Merge: cfa2232... e1b6a44...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Fri Jan 7 14:29:08 2011 +0100
dba34c: merge
commit e1b6a44e4d16ed6a97f4459c604fa36f31ab79b5
Merge: cfa2232... ebbb961...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Fri Jan 7 13:50:28 2011 +0100
dba34c: pulled/merged latest changes from CWS dba34b
commit 8d98f6b42c5f02dcf4db82c7ea6e07e7ed7a837c
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Fri Jan 7 08:37:24 2011 +0100
dba34c: #i108590# convert number to date
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
index 57e8585..773d49f 100755
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -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,18 +125,31 @@ 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));
More information about the Libreoffice-commits
mailing list