Commit graph

8284 commits

Author SHA1 Message Date
Rüdiger Timm
cb2c34b61e INTEGRATION: CWS dba24d (1.27.180); FILE MERGED
2007/11/06 09:19:38 oj 1.27.180.1: #i51965# use scale for update
2008-01-30 07:28:50 +00:00
Rüdiger Timm
971948b61e INTEGRATION: CWS dba24d (1.67.136); FILE MERGED
2007/12/01 13:38:58 fs 1.67.136.2: RESYNC: (1.67-1.68); FILE MERGED
2007/11/06 09:19:38 oj 1.67.136.1: #i51965# use scale for update
2008-01-30 07:28:36 +00:00
Rüdiger Timm
77cefcd0b4 INTEGRATION: CWS dba24d (1.9.170); FILE MERGED
2007/12/04 09:24:08 oj 1.9.170.1: #i81644# add new common var to block elementInserted events
2008-01-30 07:28:22 +00:00
Rüdiger Timm
cd06f21d65 INTEGRATION: CWS dba24d (1.19.220); FILE MERGED
2007/11/06 09:19:38 oj 1.19.220.1: #i51965# use scale for update
2008-01-30 07:28:09 +00:00
Rüdiger Timm
5afffde566 INTEGRATION: CWS dba24d (1.43.170); FILE MERGED
2008/01/14 06:04:28 oj 1.43.170.2: compile error
2007/11/06 09:19:38 oj 1.43.170.1: #i51965# use scale for update
2008-01-30 07:27:56 +00:00
Rüdiger Timm
fbee093c95 INTEGRATION: CWS dba24d (1.19.170); FILE MERGED
2007/11/06 09:19:38 oj 1.19.170.1: #i51965# use scale for update
2008-01-30 07:27:43 +00:00
Rüdiger Timm
8245f7c87b INTEGRATION: CWS dba24d (1.2.28); FILE MERGED
2007/11/21 07:47:26 fs 1.2.28.1: silence some NetBeans 6 warnings
2008-01-30 07:27:29 +00:00
Rüdiger Timm
317a102fa0 INTEGRATION: CWS dba24d (1.5.212); FILE MERGED
2007/11/21 12:12:47 fs 1.5.212.2: #i82233# new test case: testDisjunctiveNormalForm
2007/11/21 07:47:26 fs 1.5.212.1: silence some NetBeans 6 warnings
2008-01-30 07:27:15 +00:00
Rüdiger Timm
f3ddd04819 INTEGRATION: CWS dba24d (1.8.70); FILE MERGED
2007/11/21 07:47:26 fs 1.8.70.1: silence some NetBeans 6 warnings
2008-01-30 07:27:03 +00:00
Rüdiger Timm
8981875f97 INTEGRATION: CWS dba24d (1.3.106); FILE MERGED
2007/11/21 08:12:46 fs 1.3.106.2: silence some NetBeans 6 warnings
2007/11/21 08:12:16 fs 1.3.106.1: copying changes from CWS dba24c herein (premature resync)
2008-01-30 07:26:47 +00:00
Rüdiger Timm
fc08f1b774 INTEGRATION: CWS dba24d (1.3.70); FILE MERGED
2007/11/21 08:12:16 fs 1.3.70.2: copying changes from CWS dba24c herein (premature resync)
2007/11/21 07:47:26 fs 1.3.70.1: silence some NetBeans 6 warnings
2008-01-30 07:26:33 +00:00
Rüdiger Timm
174e7d76fc INTEGRATION: CWS dba24d (1.3.156); FILE MERGED
2007/11/21 07:47:26 fs 1.3.156.1: silence some NetBeans 6 warnings
2008-01-30 07:26:21 +00:00
Rüdiger Timm
65b4f462da INTEGRATION: CWS dba24d (1.2.70); FILE MERGED
2007/11/18 12:46:55 fs 1.2.70.1: removed useless access modifier
2008-01-30 07:25:47 +00:00
Rüdiger Timm
d85caabbf2 INTEGRATION: CWS cmcfixes40 (1.6.14); FILE MERGED
2008/01/08 09:20:58 cmc 1.6.14.1: #i85071 add BOOST prefix
2008-01-30 06:28:20 +00:00
Rüdiger Timm
0600629465 INTEGRATION: CWS oj30 (1.88.46); FILE MERGED
2008/01/10 14:19:02 oj 1.88.46.1: #i85085# add std
2008-01-29 16:13:13 +00:00
Rüdiger Timm
70ba998e2d INTEGRATION: CWS oj30 (1.26.132); FILE MERGED
2008/01/10 14:19:02 oj 1.26.132.1: #i85085# add std
2008-01-29 16:12:56 +00:00
Rüdiger Timm
7366c799ee INTEGRATION: CWS oj30 (1.32.46); FILE MERGED
2008/01/10 14:19:01 oj 1.32.46.1: #i85085# add std
2008-01-29 16:12:41 +00:00
Rüdiger Timm
3132e6660b INTEGRATION: CWS oj30 (1.14.114); FILE MERGED
2008/01/10 14:19:01 oj 1.14.114.1: #i85085# add std
2008-01-29 16:12:22 +00:00
Rüdiger Timm
16c4b72019 INTEGRATION: CWS fwk80_SRC680 (1.16.12); FILE MERGED
2008/01/24 07:52:13 pb 1.16.12.2: RESYNC: (1.16-1.16.18.2); FILE MERGED
2008/01/02 12:19:06 mav 1.16.12.1: #i84941# use the MediaDescriptor only to handle the macro execution
2008-01-29 14:18:19 +00:00
Rüdiger Timm
88e53e905f INTEGRATION: CWS fwk80_SRC680 (1.21.12); FILE MERGED
2008/01/24 07:52:10 pb 1.21.12.2: RESYNC: (1.21-1.21.18.2); FILE MERGED
2008/01/02 12:19:06 mav 1.21.12.1: #i84941# use the MediaDescriptor only to handle the macro execution
2008-01-29 14:17:59 +00:00
Rüdiger Timm
b08258a658 INTEGRATION: CWS pentaho2_SRC680 (1.3.74); FILE MERGED
2008/01/21 09:00:25 oj 1.3.74.1: #i79173# #i78502# import changes from pentaho1
2008-01-29 13:35:11 +00:00
Rüdiger Timm
145952f458 INTEGRATION: CWS pentaho2_SRC680 (1.3.74); FILE MERGED
2008/01/21 09:00:24 oj 1.3.74.1: #i79173# #i78502# import changes from pentaho1
2008-01-29 13:34:57 +00:00
Rüdiger Timm
143ed52d11 INTEGRATION: CWS pentaho2_SRC680 (1.2.82); FILE MERGED
2008/01/21 09:00:24 oj 1.2.82.1: #i79173# #i78502# import changes from pentaho1
2008-01-29 13:34:32 +00:00
Rüdiger Timm
6eec32cf5c INTEGRATION: CWS pentaho2_SRC680 (1.1.4); FILE ADDED
2008/01/21 09:00:24 oj 1.1.4.2: #i79173# #i78502# import changes from pentaho1
2008/01/15 13:46:50 oj 1.1.4.1: file OfficePageSectionLayoutController.java was added on branch cws_ooh680_pentaho2 on 2008-01-21 09:00:24 +0000
2008-01-29 13:34:01 +00:00
Rüdiger Timm
0b2eeec302 INTEGRATION: CWS reportdesign02 (1.47.22); FILE MERGED
2007/12/20 11:49:14 oj 1.47.22.4: merge conflicts resolved
2007/12/20 07:51:04 oj 1.47.22.3: RESYNC: (1.47-1.50); FILE MERGED
2007/11/07 12:14:20 oj 1.47.22.2: #i78387# new menu entry for saveas for reports
2007/10/26 11:05:05 oj 1.47.22.1: #i82914# check report engine service name
2008-01-29 13:29:14 +00:00
Rüdiger Timm
394776c6b7 INTEGRATION: CWS reportdesign02 (1.8.12); FILE MERGED
2008/01/08 13:39:27 oj 1.8.12.4: wrong define name
2008/01/07 14:20:23 oj 1.8.12.3: merge cws pentaho1 into reportdesign02 to avoid blocking
2007/12/20 07:48:35 oj 1.8.12.2: RESYNC: (1.8-1.10); FILE MERGED
2007/10/26 10:42:11 oj 1.8.12.1: #i82914# add configuration entry
2008-01-29 13:16:16 +00:00
Rüdiger Timm
5464c49562 INTEGRATION: CWS reportdesign02 (1.25.24); FILE MERGED
2007/10/26 11:05:06 oj 1.25.24.1: #i82914# check report engine service name
2008-01-29 13:07:23 +00:00
Rüdiger Timm
9c8c1f641a INTEGRATION: CWS reportdesign02 (1.28.24); FILE MERGED
2007/11/07 12:14:21 oj 1.28.24.1: #i78387# new menu entry for saveas for reports
2008-01-29 13:07:10 +00:00
Rüdiger Timm
add1473666 INTEGRATION: CWS reportdesign02 (1.47.16); FILE MERGED
2007/12/20 08:29:32 oj 1.47.16.3: #i82914# check report engine service name
2007/12/20 07:51:10 oj 1.47.16.2: RESYNC: (1.47-1.50); FILE MERGED
2007/10/26 11:05:06 oj 1.47.16.1: #i82914# check report engine service name
2008-01-29 13:07:00 +00:00
Rüdiger Timm
24ef551441 INTEGRATION: CWS reportdesign02 (1.8.166); FILE MERGED
2007/11/07 12:14:20 oj 1.8.166.1: #i78387# new menu entry for saveas for reports
2008-01-29 13:06:47 +00:00
Rüdiger Timm
47fb5627db INTEGRATION: CWS reportdesign02 (1.23.24); FILE MERGED
2007/12/20 11:49:14 oj 1.23.24.3: merge conflicts resolved
2007/12/20 07:51:07 oj 1.23.24.2: RESYNC: (1.23-1.24); FILE MERGED
2007/11/07 12:14:20 oj 1.23.24.1: #i78387# new menu entry for saveas for reports
2008-01-29 13:06:27 +00:00
Rüdiger Timm
b06a98a66a INTEGRATION: CWS reportdesign02 (1.3.18); FILE MERGED
2008/01/15 11:52:19 oj 1.3.18.2: change help ids
2008/01/15 11:48:45 oj 1.3.18.1: change helpid names
2008-01-29 12:53:06 +00:00
Rüdiger Timm
0c84b1b6ab INTEGRATION: CWS reportdesign02 (1.3.36); FILE MERGED
2007/10/26 12:31:37 oj 1.3.36.1: #i77919# use of SplitWindow
2008-01-29 12:52:46 +00:00
Rüdiger Timm
3ce58b55aa INTEGRATION: CWS reportdesign02 (1.5.36); FILE MERGED
2007/11/28 15:19:29 lla 1.5.36.2: #i80260# with pressed ctrl key it isn't possible to move the object out of the section.
2007/11/26 06:24:44 lla 1.5.36.1: #i80260# drag n drop, lines over all sections, no ctrl key need to move obj in different section
2008-01-29 12:52:33 +00:00
Rüdiger Timm
30f7479370 INTEGRATION: CWS reportdesign02 (1.5.10); FILE MERGED
2008/01/15 11:50:21 oj 1.5.10.7: change helpid names
2007/12/20 07:48:32 oj 1.5.10.6: RESYNC: (1.5-1.6); FILE MERGED
2007/11/28 15:19:29 lla 1.5.10.5: #i80260# with pressed ctrl key it isn't possible to move the object out of the section.
2007/11/26 06:24:44 lla 1.5.10.4: #i80260# drag n drop, lines over all sections, no ctrl key need to move obj in different section
2007/11/08 13:06:04 oj 1.5.10.3: #i77063# some adjustments to the splitter
2007/10/30 06:56:29 oj 1.5.10.2: #i78939# change pos and size when control is outside page
2007/10/26 12:31:37 oj 1.5.10.1: #i77919# use of SplitWindow
2008-01-29 12:52:21 +00:00
Rüdiger Timm
de8b9c39b9 INTEGRATION: CWS reportdesign02 (1.4.18); FILE MERGED
2008/01/15 11:50:21 oj 1.4.18.1: change helpid names
2008-01-29 12:52:06 +00:00
Rüdiger Timm
8966f8ccf4 INTEGRATION: CWS reportdesign02 (1.4.36); FILE MERGED
2007/10/29 11:41:19 oj 1.4.36.1: #i77919# enable view to draw only left and right border
2008-01-29 12:51:43 +00:00
Rüdiger Timm
0887bc70b1 INTEGRATION: CWS reportdesign02 (1.4.36); FILE MERGED
2007/10/26 12:31:37 oj 1.4.36.1: #i77919# use of SplitWindow
2008-01-29 12:51:31 +00:00
Rüdiger Timm
5df417ebda INTEGRATION: CWS reportdesign02 (1.3.36); FILE MERGED
2008/01/15 11:50:21 oj 1.3.36.3: change helpid names
2007/12/20 07:48:29 oj 1.3.36.2: RESYNC: (1.3-1.4); FILE MERGED
2007/10/26 12:31:37 oj 1.3.36.1: #i77919# use of SplitWindow
2008-01-29 12:51:20 +00:00
Rüdiger Timm
2f1e50b76b INTEGRATION: CWS reportdesign02 (1.5.18); FILE MERGED
2007/12/20 07:48:26 oj 1.5.18.3: RESYNC: (1.5-1.6); FILE MERGED
2007/11/26 06:24:44 lla 1.5.18.2: #i80260# drag n drop, lines over all sections, no ctrl key need to move obj in different section
2007/10/30 06:56:29 oj 1.5.18.1: #i78939# change pos and size when control is outside page
2008-01-29 12:51:09 +00:00
Rüdiger Timm
eafd77e5c5 INTEGRATION: CWS reportdesign02 (1.4.36); FILE MERGED
2007/12/20 07:48:23 oj 1.4.36.5: RESYNC: (1.4-1.6); FILE MERGED
2007/11/07 08:55:03 oj 1.4.36.4: #i77751# remove dosave
2007/11/05 13:07:28 oj 1.4.36.3: #i83316 new drawbar
2007/10/30 06:56:29 oj 1.4.36.2: #i78939# change pos and size when control is outside page
2007/10/26 11:26:00 oj 1.4.36.1: #i77086# enable execute button ony when at least one field exists
2008-01-29 12:50:57 +00:00
Rüdiger Timm
783e44113a INTEGRATION: CWS reportdesign02 (1.2.44); FILE MERGED
2008/01/15 11:50:21 oj 1.2.44.2: change helpid names
2007/11/08 13:06:04 oj 1.2.44.1: #i77063# some adjustments to the splitter
2008-01-29 12:50:43 +00:00
Rüdiger Timm
e088885605 INTEGRATION: CWS reportdesign02 (1.3.36); FILE MERGED
2008/01/15 11:50:21 oj 1.3.36.2: change helpid names
2007/10/26 12:31:37 oj 1.3.36.1: #i77919# use of SplitWindow
2008-01-29 12:50:32 +00:00
Rüdiger Timm
0919af9fb6 INTEGRATION: CWS reportdesign02 (1.2.44); FILE MERGED
2007/12/20 07:47:47 oj 1.2.44.2: merge change
2007/10/30 06:56:28 oj 1.2.44.1: #i78939# change pos and size when control is outside page
2008-01-29 12:50:20 +00:00
Rüdiger Timm
bb2d5b2110 INTEGRATION: CWS reportdesign02 (1.4.18); FILE MERGED
2008/01/15 11:50:31 oj 1.4.18.1: change helpid names
2008-01-29 12:50:04 +00:00
Rüdiger Timm
69e3a45750 INTEGRATION: CWS reportdesign02 (1.5.18); FILE MERGED
2008/01/15 11:50:31 oj 1.5.18.1: change helpid names
2008-01-29 12:49:52 +00:00
Rüdiger Timm
16e71d09bc INTEGRATION: CWS reportdesign02 (1.2.44); FILE MERGED
2008/01/15 11:50:30 oj 1.2.44.1: change helpid names
2008-01-29 12:49:41 +00:00
Rüdiger Timm
d8f9462bd3 INTEGRATION: CWS reportdesign02 (1.4.36); FILE MERGED
2007/11/26 06:24:44 lla 1.4.36.1: #i80260# drag n drop, lines over all sections, no ctrl key need to move obj in different section
2008-01-29 12:49:17 +00:00
Rüdiger Timm
ae5248b9a9 INTEGRATION: CWS reportdesign02 (1.4.36); FILE MERGED
2007/11/28 15:19:29 lla 1.4.36.2: #i80260# with pressed ctrl key it isn't possible to move the object out of the section.
2007/11/26 06:24:44 lla 1.4.36.1: #i80260# drag n drop, lines over all sections, no ctrl key need to move obj in different section
2008-01-29 12:49:05 +00:00
Rüdiger Timm
17b06f3b3d INTEGRATION: CWS reportdesign02 (1.2.44); FILE MERGED
2007/10/30 06:56:28 oj 1.2.44.1: #i78939# change pos and size when control is outside page
2008-01-29 12:48:54 +00:00