Commit Graph

58 Commits

Author SHA1 Message Date
66c4b436fc Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
	swext/mediawiki/build.xml
2011-04-22 15:08:10 +02:00
d36b7a5f86 masterfix DEV300: #i10000# added mkdir 2011-04-04 14:10:39 +02:00
55bed7a505 masterfix DEV300: #i10000# build fix 2011-04-04 13:05:38 +02:00
97cf2b8dd8 fix build with system jfreereport 2011-03-29 17:32:13 +02:00
761118f831 Merge commit 'ooo/DEV300_m103'
Conflicts:
	jfreereport/java/flute/makefile.mk
	jfreereport/java/libbase/makefile.mk
	jfreereport/java/libfonts/makefile.mk
	jfreereport/java/libformula/makefile.mk
	jfreereport/java/libloader/makefile.mk
	jfreereport/java/librepository/makefile.mk
	jfreereport/java/libserializer/makefile.mk
	jfreereport/java/libxml/makefile.mk
	jfreereport/java/sac/makefile.mk
	mysqlc/source/mysqlc_connection.cxx
	mysqlc/source/mysqlc_connection.hxx
	mysqlc/source/mysqlc_databasemetadata.cxx
	mysqlc/source/mysqlc_databasemetadata.hxx
	mysqlc/source/mysqlc_driver.cxx
	mysqlc/source/mysqlc_driver.hxx
	mysqlc/source/mysqlc_general.hxx
	mysqlc/source/mysqlc_preparedstatement.hxx
	mysqlc/source/mysqlc_resultsetmetadata.hxx
	mysqlc/source/mysqlc_statement.hxx
	sdext/source/minimizer/impoptimizer.cxx
	sdext/source/pdfimport/config/description.xml
	sdext/source/pdfimport/tree/drawtreevisiting.cxx
	sdext/source/presenter/PresenterWindowManager.cxx
	swext/prj/build.lst
2011-03-23 16:58:56 +01:00
6bd54fca68 Use more reliable SQL syntax
Give a derived table (subquery) an alias (name). From fdo#32960.

Signed-off-by: Tor Lillqvist <tlillqvist@novell.com>
2011-01-20 11:55:28 +02:00
1b46f8da57 dba34d: #i116463# fix string and NaN 2011-01-17 12:32:14 +01:00
1d112bec03 Automated merge with ssh://hg.services.openoffice.org/cws/dba34c 2011-01-10 14:23:31 +01:00
656c73c2e4 dba34c: #i108590# convert number to date 2011-01-07 08:37:24 +01:00
f70c36928c dba34b: merged DEV300m96 2011-01-05 10:07:18 +01:00
7917305402 CWS-TOOLING: integrate CWS srb1 2010-12-03 13:41:14 +01:00
bd10afb420 dba34b: localize properties 2010-11-24 10:12:13 +01:00
68b50b6d1d dba34b: localize properties 2010-11-24 09:58:37 +01:00
441418b2bf dba34b: #i115219# add missing style-name elements 2010-11-24 09:15:49 +01:00
2d24f7dc9b dba34b: #i114109# change creator in meta.xml 2010-11-04 13:10:42 +01:00
0d57cd758e dba34b: #i115145# catch numberformatexception when creating bigdecimal 2010-11-04 12:25:08 +01:00
542a0e91f4 Merge commit 'ooo/OOO330_m9'
Conflicts:
	swext/mediawiki/build.xml
	swext/prj/build.lst
2010-10-06 13:35:21 +02:00
665e762b93 allow building against later pentaho libraries 2010-10-05 10:39:44 +01:00
18d1017ba0 dba3h: #i114111#: reportbuilder: do not use Double.toString() when writing the 2 column-width attribute, it may write an exponent, which is invalid.. 2010-08-30 11:33:41 +02:00
42af84d912 dba33h: #i114106# fix missing value-type 2010-08-30 11:31:28 +02:00
2d9f7d9a91 dba33h: #i114106# fix invalid root element for styles 2010-08-30 11:28:34 +02:00
2ba3b618be dba33h: #i114105# fix version number 2010-08-30 11:26:49 +02:00
2a44c3167e dba33h: #i112652#: reportbuilder: write XMLSchema-2 conformant NaN 2010-08-27 12:23:43 +02:00
9bd142499e dba33g: #i110535# add order with realname and table name 2010-07-08 16:14:22 +02:00
50fbc78991 dba33g: #i108954# handle value for string and date like value-type is defined 2010-07-08 15:27:58 +02:00
ec88ba28a7 dba33g: #i112620# add new namespace for chartooo 2010-07-07 12:40:38 +02:00
bdf82ea8ff srb1: change version 2010-06-22 16:52:33 +02:00
fe8e4404a5 srb1: merge from DEv300:m83 2010-06-22 11:27:46 +02:00
2ac38c25e7 jpropenable: #i112445# exclude this file from l10n process 2010-06-16 14:30:12 +02:00
69e934567c CWS-TOOLING: integrate CWS dba33f 2010-06-04 14:23:34 +02:00
4f7da73cd4 dba33f: merge with m76-branch 2010-04-16 13:55:24 +02:00
sb
b2124b5bf9 sb118: merged in re/DEV300_next towards DEV300_m76 2010-04-07 13:14:23 +02:00
62148803c7 autorecovery: merged changes from m74. Still need to find out how to re-do two patches (to module_hidden_ooo.scp and file_ooo.scp in scp2/source/ooo) which do not apply anymore. 2010-03-11 11:26:05 +01:00
sb
486c429d73 sb118: merged in DEV300_m72 2010-02-25 12:46:45 +01:00
c31dbdb732 dba33f: fix import order 2010-02-15 10:17:22 +01:00
4326ef06fe changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
sb
f321b0bed8 sb118: #i109112# re-purpose EXTRAJARFILES 2010-02-11 11:07:17 +01:00
b38d922de0 Automated merge with file:///net/so-cwsserv01/export/cws/hg_clean/ooo/DEV300 2010-02-09 15:32:51 +01:00
ed6a92553b dba33e: #i108092# set NAN when double value is NULL 2010-01-08 10:16:56 +01:00
1ddcd1caed dba33e: #i107472# correct class param for ConnectionTools 2010-01-08 09:23:27 +01:00
8aa99f59a4 check already quoted expression 2010-01-07 09:16:59 +01:00
675a3bc192 Automated merge with file:///net/so-cwsserv01/export/cws/hg_clean/ooo/DEV300 2009-12-10 08:13:01 +01:00
b940775418 dba33d: merge with DEV300_m67 2009-12-10 07:40:02 +01:00
21adfcda80 srb1: #i99049# use version include 2009-12-07 09:18:27 +01:00
96c967926e srb1: #i99049# add new lib from pentaho 2009-12-03 08:59:14 +01:00
510361e19b dba33d: #i104712# qurtal expression fixed 2009-11-25 10:12:45 +01:00
b5c8e3b615 dba33d: #i104949# show cell value when set field text nodes exits 2009-11-24 11:34:17 +01:00
78155803fd dba33d: #i102563# use rootURL to resolve the given URI and some refactoring 2009-11-19 09:03:57 +01:00
76e2cf337c #i99049# use vanilla sources 2009-11-11 10:32:44 +01:00
b23505498b CWS-TOOLING: integrate CWS dba32h
2009-10-12 12:21:44 +0200 msc  r276827 : remove warning for issue 102712 because the issue is fixed
2009-10-05 07:14:20 +0200 oj  r276658 : #105585# add missing dependency for OOO_UI
2009-10-02 12:50:19 +0200 fs  r276632 : #i105505#
If a model is created, and is a revenant of a previous incarnation, then ensure it is properly initialized.
In particular, in its ctor, set the state to "Initializing", not "Initialized", and then let the ModelImpl
call attachResource. This ensures that the model is initialized completely, including firing the necessary
events.
2009-10-02 12:46:12 +0200 fs  r276631 : #i105505# always do an attachResource at the newly loaded model, even if it (internally) was not really loaded, but only a revenant of a previous incarnation of this document
2009-10-01 13:09:07 +0200 fs  r276596 : do not rely on the name 'Standard' for the one and only form in a document
2009-10-01 12:35:56 +0200 fs  r276589 : #i105509# don't rely on default form component names, use indexes
2009-10-01 11:19:18 +0200 fs  r276584 : copying the fix for #i105082# into this CWS
2009-10-01 11:13:22 +0200 fs  r276583 : improved logs
2009-10-01 11:10:44 +0200 fs  r276581 : #i105505#
2009-10-01 08:07:57 +0200 fs  r276575 : manual merge of trunk, to allow cwslocalize to run
2009-09-30 22:48:30 +0200 fs  r276574 : removed that strange ONLOAD definition
2009-09-30 12:58:18 +0200 fs  r276553 : copy fix for #i105387# into this CWS, as the issue prevents us from finalizing the CWS
2009-09-30 12:56:45 +0200 fs  r276552 : copy fix for #i105387# into this CWS, as the issue prevents us from finalizing the CWS
2009-09-30 11:47:45 +0200 fs  r276549 : #i105235#
2009-09-29 12:27:40 +0200 fs  r276521 : #i105367#
2009-09-28 12:08:17 +0200 oj  r276485 : #i105371# export version in manifest.xml as well
2009-09-28 12:07:02 +0200 oj  r276484 : #i105371# export version in manifest.xml as well
2009-09-28 09:48:01 +0200 oj  r276481 : #i105366# init drivers when not empty
2009-09-25 14:31:27 +0200 fs  r276466 : CWS-TOOLING: rebase CWS dba32h to trunk@276429 (milestone: DEV300:m60)
2009-09-24 13:52:54 +0200 fs  r276422 : #i105234# do not zoom the control when they view information is still uninitialized (happens at least in Writer when opening a form document)
2009-09-24 11:42:03 +0200 fs  r276413 : #i105234# proper zoom handling for the nav bar
2009-09-24 11:41:40 +0200 fs  r276412 : #i105234# setZoom: care for precision errors caused by implicit conversion float->double
2009-09-23 12:21:22 +0200 oj  r276377 : remove dos lineends
2009-09-23 11:44:52 +0200 oj  r276376 : #i105216# load config on demand
2009-09-23 11:44:19 +0200 oj  r276375 : #i105216# load config on demand
2009-09-23 11:43:35 +0200 oj  r276374 : #i105216# load config on demand
2009-09-21 09:13:03 +0200 oj  r276307 : #i105158# use Thread support
2009-09-18 13:06:50 +0200 fs  r276277 : #i105147#
2009-09-18 11:48:23 +0200 oj  r276271 : #i105158# new method for thread safety
2009-09-18 10:42:56 +0200 fs  r276266 : CWS-TOOLING: rebase CWS dba32h to trunk@276192 (milestone: DEV300:m59)
2009-09-18 08:30:03 +0200 oj  r276263 : #i105016# load correct ldap so
2009-09-17 13:42:31 +0200 oj  r276240 : change count of check boxes
2009-09-17 13:32:59 +0200 oj  r276239 : revert false to true for currency
2009-09-17 09:14:46 +0200 oj  r276220 : #i104901# add patch for every issue
2009-09-17 09:10:29 +0200 oj  r276219 : #i104901# add patch for every issue
2009-09-11 13:47:49 +0200 oj  r276060 : #i104901# fix for indentity
2009-09-11 12:14:14 +0200 fs  r276056 : #i104594# allow to render controls without an SdrPageView
2009-09-11 11:49:31 +0200 fs  r276055 : CWS-TOOLING: rebase CWS dba32h to trunk@276043 (milestone: DEV300:m58)
2009-09-10 08:41:40 +0200 oj  r276021 : #i104911# export variable-set not for repeating sections
2009-10-14 18:48:09 +00:00