Jens-Heiner Rechtien
11f43e9f25
INTEGRATION: CWS rpt23fix01 (1.29.4); FILE MERGED
...
2007/07/16 07:11:41 lla 1.29.4.1: #i77897# add comments
2007-08-02 13:26:15 +00:00
Jens-Heiner Rechtien
c82e67cf69
INTEGRATION: CWS rpt23fix01 (1.23.4); FILE MERGED
...
2007/07/16 07:10:56 lla 1.23.4.1: #i77897# helptext little bit smaller
2007-08-02 13:26:03 +00:00
Jens-Heiner Rechtien
dfa844f08a
INTEGRATION: CWS rpt23fix01 (1.42.2); FILE MERGED
...
2007/07/31 19:20:04 oj 1.42.2.3: reverse issue #i78940#
2007/07/31 19:01:40 oj 1.42.2.2: reverse issue #i78940#
2007/07/11 11:34:01 oj 1.42.2.1: #i78940# ask for ext when not present
2007-08-02 13:25:50 +00:00
Jens-Heiner Rechtien
04a2b7010b
INTEGRATION: CWS rpt23fix01 (1.21.4); FILE MERGED
...
2007/07/16 12:10:00 oj 1.21.4.1: #i77411# set parent frame at embeded object
2007-08-02 13:25:38 +00:00
Jens-Heiner Rechtien
5a2ab6ee0f
INTEGRATION: CWS rpt23fix01 (1.43.4); FILE MERGED
...
2007/07/16 12:10:00 oj 1.43.4.1: #i77411# set parent frame at embeded object
2007-08-02 13:25:26 +00:00
Jens-Heiner Rechtien
eee3916d86
INTEGRATION: CWS rpt23fix01 (1.3.4); FILE MERGED
...
2007/07/12 13:46:14 lla 1.3.4.2: #i79080# fix problem which opens the Help Agent on the wrong frame
2007/07/11 12:03:56 lla 1.3.4.1: #i779080# help agent
2007-08-02 13:25:13 +00:00
Jens-Heiner Rechtien
9e6b87a8bf
INTEGRATION: CWS dba23c (1.189.10); FILE MERGED
...
2007/07/19 06:07:14 fs 1.189.10.1: proper assertion type (else product builds with debug info won't build)
2007-07-31 13:01:45 +00:00
Jens-Heiner Rechtien
7b4ca434f3
INTEGRATION: CWS dba23c (1.99.12); FILE MERGED
...
2007/07/19 06:06:44 fs 1.99.12.1: during #i79679#: signature of CreateFmSearchDialog changed
2007-07-31 13:01:29 +00:00
Jens-Heiner Rechtien
b97fb0c560
INTEGRATION: CWS dba23c (1.18.114); FILE MERGED
...
2007/07/18 09:41:12 fs 1.18.114.2: assertion for the case just fixed
2007/07/18 06:32:04 oj 1.18.114.1: #147849# check bookmark a little bit more
2007-07-31 13:01:15 +00:00
Hans-Joachim Lankenau
c03d9ff9f1
#i10000# build what gets packed
2007-07-27 09:16:27 +00:00
Rüdiger Timm
b6f190beb0
INTEGRATION: CWS complextest1 (1.5.42); FILE MERGED
...
2007/06/28 16:24:35 cn 1.5.42.2: #i78349# fix bug in makefile
2007/06/28 15:58:50 cn 1.5.42.1: #i78349# fix bug in makefile
2007-07-24 12:18:17 +00:00
Rüdiger Timm
994f2d0b07
INTEGRATION: CWS complextest1 (1.9.42); FILE MERGED
...
2007/07/16 10:57:38 sg 1.9.42.1: #i78662#fixed makefile bug
2007-07-24 12:18:05 +00:00
Rüdiger Timm
930708b426
INTEGRATION: CWS dba23b (1.1.2); FILE ADDED
...
2007/07/04 10:31:58 fs 1.1.2.1: Windows executable to call SQLManageDataSources, to workaround the Windows bug described in issue #i78733#
2007-07-24 11:11:10 +00:00
Rüdiger Timm
fcee184695
INTEGRATION: CWS dba23b (1.1.2); FILE ADDED
...
2007/07/04 10:32:09 fs 1.1.2.1: Windows executable to call SQLManageDataSources, to workaround the Windows bug described in issue #i78733#
2007-07-24 11:10:50 +00:00
Rüdiger Timm
17fcd6712b
INTEGRATION: CWS dba23b (1.6.100); FILE MERGED
...
2007/07/09 18:57:25 fs 1.6.100.1: implInitialize: don't call base class if already handled
2007-07-24 11:10:39 +00:00
Rüdiger Timm
c1bd83edee
INTEGRATION: CWS dba23b (1.11.100); FILE MERGED
...
2007/07/11 11:54:08 fs 1.11.100.2: RESYNC: (1.11-1.12); FILE MERGED
2007/07/08 20:35:13 fs 1.11.100.1: during #i65812#: context details not used
2007-07-24 11:10:26 +00:00
Rüdiger Timm
35311e414f
INTEGRATION: CWS dba23b (1.31.88); FILE MERGED
...
2007/07/11 11:54:04 fs 1.31.88.2: RESYNC: (1.31-1.32); FILE MERGED
2007/06/14 19:46:06 fs 1.31.88.1: #i78459# submitted by mox@openoffice.org: remove dead code related to ancient Mac OS System 9 port
2007-07-24 11:10:12 +00:00
Rüdiger Timm
ef4776458c
INTEGRATION: CWS dba23b (1.68.14); FILE MERGED
...
2007/06/28 09:04:04 fs 1.68.14.1: #i78362# don't register the data source browser as controller for all opened database connections
2007-07-24 11:09:55 +00:00
Rüdiger Timm
2e71587d23
INTEGRATION: CWS dba23b (1.5.282); FILE MERGED
...
2007/07/08 20:34:47 fs 1.5.282.1: during #i65812#: context details not used
2007-07-24 11:09:40 +00:00
Rüdiger Timm
d6d7b6151d
INTEGRATION: CWS dba23b (1.18.88); FILE MERGED
...
2007/07/11 11:54:01 fs 1.18.88.2: RESYNC: (1.18-1.19); FILE MERGED
2007/06/14 19:46:06 fs 1.18.88.1: #i78459# submitted by mox@openoffice.org: remove dead code related to ancient Mac OS System 9 port
2007-07-24 11:09:26 +00:00
Rüdiger Timm
50fdc70805
INTEGRATION: CWS dba23b (1.6.152); FILE MERGED
...
2007/07/04 10:33:35 fs 1.6.152.1: #i78733# managing data sources now done by an external process
2007-07-24 11:09:02 +00:00
Rüdiger Timm
a2264948f1
INTEGRATION: CWS dba23b (1.17.88); FILE MERGED
...
2007/07/04 11:57:16 fs 1.17.88.2: #i10000#
2007/07/04 10:33:35 fs 1.17.88.1: #i78733# managing data sources now done by an external process
2007-07-24 11:08:47 +00:00
Rüdiger Timm
16aa7613d4
INTEGRATION: CWS dba23b (1.43.22); FILE MERGED
...
2007/07/04 10:33:16 fs 1.43.22.1: #i78733# removed dead string
2007-07-24 11:08:32 +00:00
Rüdiger Timm
877d77abf7
INTEGRATION: CWS dba23b (1.6.282); FILE MERGED
...
2007/07/04 11:48:28 fs 1.6.282.2: #i10000#
2007/07/04 10:34:29 fs 1.6.282.1: #i78733# managing data sources now done by an external process
2007-07-24 11:08:19 +00:00
Rüdiger Timm
0bd810bfa1
INTEGRATION: CWS dba23b (1.3.282); FILE MERGED
...
2007/07/04 10:33:16 fs 1.3.282.1: #i78733# removed dead string
2007-07-24 11:08:05 +00:00
Rüdiger Timm
4998a1b782
INTEGRATION: CWS dba23b (1.19.14); FILE MERGED
...
2007/07/11 11:53:25 fs 1.19.14.3: RESYNC: (1.19-1.20); FILE MERGED
2007/07/04 11:48:28 fs 1.19.14.2: #i10000#
2007/07/04 10:34:29 fs 1.19.14.1: #i78733# managing data sources now done by an external process
2007-07-24 11:07:51 +00:00
Rüdiger Timm
1f0a615efa
INTEGRATION: CWS dba23b (1.186.12); FILE MERGED
...
2007/07/11 11:53:22 fs 1.186.12.4: RESYNC: (1.186-1.189); FILE MERGED
2007/07/08 20:36:18 fs 1.186.12.3: during #i65812#: context details not used
2007/06/28 09:04:03 fs 1.186.12.2: #i78362# don't register the data source browser as controller for all opened database connections
2007/06/11 20:00:38 fs 1.186.12.1: #i76857# allow to disable 'Edit database file' context menu entry by configuration option
2007-07-24 11:07:37 +00:00
Rüdiger Timm
464d62ed55
INTEGRATION: CWS dba23b (1.76.10); FILE MERGED
...
2007/07/11 20:15:59 fs 1.76.10.3: #i10000#
2007/07/11 11:53:17 fs 1.76.10.2: RESYNC: (1.76-1.78); FILE MERGED
2007/07/08 20:36:15 fs 1.76.10.1: during #i65812#: context details not used
2007-07-24 11:07:21 +00:00
Rüdiger Timm
ef0c14b045
INTEGRATION: CWS dba23b (1.76.12); FILE MERGED
...
2007/07/11 11:53:14 fs 1.76.12.2: RESYNC: (1.76-1.77); FILE MERGED
2007/06/28 09:04:03 fs 1.76.12.1: #i78362# don't register the data source browser as controller for all opened database connections
2007-07-24 11:07:07 +00:00
Rüdiger Timm
ff0ffec719
INTEGRATION: CWS dba23b (1.17.90); FILE MERGED
...
2007/07/11 11:53:11 fs 1.17.90.2: RESYNC: (1.17-1.18); FILE MERGED
2007/06/28 09:04:03 fs 1.17.90.1: #i78362# don't register the data source browser as controller for all opened database connections
2007-07-24 11:06:54 +00:00
Rüdiger Timm
f28076a0f2
INTEGRATION: CWS dba23b (1.24.58); FILE MERGED
...
2007/07/11 11:53:07 fs 1.24.58.2: RESYNC: (1.24-1.26); FILE MERGED
2007/07/09 18:47:37 fs 1.24.58.1: openDialog: only needed parameters
2007-07-24 11:06:39 +00:00
Rüdiger Timm
3e3ba37638
INTEGRATION: CWS dba23b (1.21.12); FILE MERGED
...
2007/07/08 20:36:31 fs 1.21.12.1: during #i65812#: context details not used
2007-07-24 11:06:24 +00:00
Rüdiger Timm
a831377440
INTEGRATION: CWS dba23b (1.6.102); FILE MERGED
...
2007/07/07 19:16:38 fs 1.6.102.1: diagnostics
2007-07-24 11:06:10 +00:00
Rüdiger Timm
3d5930fd07
INTEGRATION: CWS dba23b (1.8.102); FILE MERGED
...
2007/07/07 19:16:38 fs 1.8.102.1: diagnostics
2007-07-24 11:05:57 +00:00
Rüdiger Timm
534bafad8b
INTEGRATION: CWS dba23b (1.42.12); FILE MERGED
...
2007/07/11 11:53:04 fs 1.42.12.2: RESYNC: (1.42-1.43); FILE MERGED
2007/06/21 11:48:46 fs 1.42.12.1: some DBG_UNHANDLED_EXCEPTION
2007-07-24 11:05:15 +00:00
Rüdiger Timm
91c0797487
INTEGRATION: CWS dba23b (1.72.102); FILE MERGED
...
2007/07/07 19:24:15 fs 1.72.102.1: #i78593# when obtaining the Info property value from the Settings, copy all values which are removeable, and the non-default ones which are removeable
2007-07-24 11:05:01 +00:00
Rüdiger Timm
da9da84a28
INTEGRATION: CWS dba23b (1.12.22); FILE MERGED
...
2007/06/28 09:02:47 fs 1.12.22.1: #i78362# controllers and current controller now maintained by the DatabaseDocument, not by the ModelImpl (since they're an XModel aspect)
2007-07-24 11:04:48 +00:00
Rüdiger Timm
814d7928ef
INTEGRATION: CWS dba23b (1.32.20); FILE MERGED
...
2007/07/07 20:21:50 fs 1.32.20.2: during #i78593#: don't re-create the Settings property bag when it's not necessary
2007/06/28 09:02:47 fs 1.32.20.1: #i78362# controllers and current controller now maintained by the DatabaseDocument, not by the ModelImpl (since they're an XModel aspect)
2007-07-24 11:04:32 +00:00
Rüdiger Timm
b42a30bd91
INTEGRATION: CWS dba23b (1.14.66); FILE MERGED
...
2007/07/07 20:21:09 fs 1.14.66.3: during #i78593#: don't re-create the Settings property bag when it's not necessary
2007/06/28 09:02:47 fs 1.14.66.2: #i78362# controllers and current controller now maintained by the DatabaseDocument, not by the ModelImpl (since they're an XModel aspect)
2007/06/12 13:17:53 fs 1.14.66.1: removed declaration of non-existent methods
2007-07-24 11:04:18 +00:00
Rüdiger Timm
100c35bdf0
INTEGRATION: CWS dba23b (1.18.60); FILE MERGED
...
2007/07/08 19:36:17 fs 1.18.60.4: #i78987# +FormsCheckRequiredFields
2007/07/07 20:21:08 fs 1.18.60.3: during #i78593#: don't re-create the Settings property bag when it's not necessary
2007/07/07 19:25:04 fs 1.18.60.2: #i78593# add MAYBEDEFAULT attribute when adding the defaults to the Settings property bag
2007/06/28 09:02:47 fs 1.18.60.1: #i78362# controllers and current controller now maintained by the DatabaseDocument, not by the ModelImpl (since they're an XModel aspect)
2007-07-24 11:04:04 +00:00
Rüdiger Timm
fb2a8c9866
INTEGRATION: CWS dba23b (1.92.14); FILE MERGED
...
2007/07/02 20:07:12 fs 1.92.14.1: #i78410# fix getBinaryStream so there's no recursion
2007-07-24 11:03:50 +00:00
Rüdiger Timm
d2fed243df
INTEGRATION: CWS dba23b (1.11.74); FILE MERGED
...
2007/07/04 13:35:17 fs 1.11.74.2: #i10000#
2007/07/04 10:32:23 fs 1.11.74.1: #i78733# build dbaccess/win32/source/odbcconfig
2007-07-24 11:03:35 +00:00
Rüdiger Timm
d69b8442bd
INTEGRATION: CWS dba23b (1.3.6); FILE MERGED
...
2007/07/11 20:08:37 fs 1.3.6.1: #i10000# re-merge the changes done before the file moved on HEAD
2007-07-24 11:03:20 +00:00
Oliver Bolte
221426e24e
INTEGRATION: CWS basemodelrefactoring (1.21.24); FILE MERGED
...
2007/05/29 20:17:12 mba 1.21.24.3: RESYNC: (1.22-1.23); FILE MERGED
2007/05/08 23:21:02 mba 1.21.24.2: RESYNC: (1.21-1.22); FILE MERGED
2007/04/16 21:48:30 mba 1.21.24.1: #i26672#: parameter changed
2007-07-17 12:21:33 +00:00
Rüdiger Timm
43729c2b57
#i79375# Avoid warning ('directValue' may be used uninitialized in this function). Patch by pjanik.
2007-07-09 07:44:32 +00:00
Rüdiger Timm
692111189c
INTEGRATION: CWS oj14 (1.1.2); FILE ADDED
...
2006/01/03 08:57:09 oj 1.1.2.1: makefile ext
2007-07-06 07:46:53 +00:00
Rüdiger Timm
4e9321b0e9
INTEGRATION: CWS oj14 (1.25.8); FILE MERGED
...
2007/06/23 21:23:18 fs 1.25.8.7: RESYNC: (1.29-1.30); FILE MERGED
2007/04/18 12:11:12 oj 1.25.8.6: RESYNC: (1.28-1.29); FILE MERGED
2007/04/05 08:05:16 lla 1.25.8.5: #146843#
2007/02/20 15:53:10 oj 1.25.8.4: RESYNC: (1.27-1.28); FILE MERGED
2006/11/07 09:59:06 oj 1.25.8.3: RESYNC: (1.26-1.27); FILE MERGED
2006/07/04 08:28:17 oj 1.25.8.2: RESYNC: (1.25-1.26); FILE MERGED
2006/01/03 08:07:52 oj 1.25.8.1: export controller class
2007-07-06 07:46:44 +00:00
Rüdiger Timm
b42cf30932
INTEGRATION: CWS oj14 (1.6.130); FILE MERGED
...
2007/06/04 19:03:14 oj 1.6.130.5: RESYNC: (1.10-1.11); FILE MERGED
2006/12/18 16:25:45 oj 1.6.130.4: RESYNC: (1.9-1.10); FILE MERGED
2006/11/07 09:55:49 oj 1.6.130.3: RESYNC: (1.8-1.9); FILE MERGED
2006/07/04 08:27:23 oj 1.6.130.2: RESYNC: (1.6-1.8); FILE MERGED
2006/01/03 08:07:52 oj 1.6.130.1: export controller class
2007-07-06 07:46:29 +00:00
Rüdiger Timm
be36e5c86b
INTEGRATION: CWS oj14 (1.4.8); FILE MERGED
...
2006/04/25 13:03:21 oj 1.4.8.3: new include
2006/03/20 07:49:02 oj 1.4.8.2: use of module client helper
2006/01/03 07:49:30 oj 1.4.8.1: changed module client
2007-07-06 07:45:52 +00:00
Rüdiger Timm
ef1984ee8f
INTEGRATION: CWS oj14 (1.10.8); FILE MERGED
...
2006/11/07 09:54:14 oj 1.10.8.2: RESYNC: (1.10-1.11); FILE MERGED
2006/01/03 07:49:30 oj 1.10.8.1: changed module client
2007-07-06 07:45:25 +00:00