Commit Graph

157 Commits

Author SHA1 Message Date
Oliver Bolte
1b4e30d7ec INTEGRATION: CWS fwkbugfix03 (1.23.16); FILE MERGED
2004/10/07 13:31:52 cd 1.23.16.1: #i35049# Support generic Add-On title for Add-on components
2004-11-17 11:52:37 +00:00
Oliver Bolte
48d4606909 INTEGRATION: CWS fwkbugfix03 (1.7.54); FILE MERGED
2004/09/24 13:45:37 cd 1.7.54.1: #i34600# Fix update problem with add-on configuration
2004-11-17 11:52:23 +00:00
Oliver Bolte
1b11442227 INTEGRATION: CWS fwkbugfix03 (1.6.104); FILE MERGED
2004/09/24 13:45:08 cd 1.6.104.1: #i34600# Fix wrong position of add-on help menu items
2004-11-17 11:52:08 +00:00
Oliver Bolte
2cf9513f8a INTEGRATION: CWS toolbars2 (1.3.36); FILE MERGED
2004/08/11 10:38:55 cd 1.3.36.2: #i32219# Status bar is now controlled by framework based layout manager
2004/08/05 15:26:51 cd 1.3.36.1: #i32219# New classes for framework based status bar
2004-09-09 16:09:13 +00:00
Kurt Zenker
380f8d4a8f INTEGRATION: CWS os35 (1.17.8); FILE MERGED
2004/07/16 13:56:37 dr 1.17.8.3: #i10000# merge error
2004/07/15 15:37:23 dr 1.17.8.2: RESYNC: (1.17-1.21); FILE MERGED
2004/07/12 16:16:34 cd 1.17.8.1: #i31348# New popup menu controller for recent file list
2004-08-02 12:15:46 +00:00
Jens-Heiner Rechtien
158d6ad96d INTEGRATION: CWS fwklhf01 (1.16.2); FILE MERGED
2004/06/28 13:03:57 as 1.16.2.2: RESYNC: (1.16-1.17); FILE MERGED
2004/06/23 09:21:46 lo 1.16.2.1: #i30017# clean up resource
2004-07-23 10:26:55 +00:00
Oliver Bolte
71bd72c77a #i10000# resolver merge problems 2004-07-07 10:51:41 +00:00
Oliver Bolte
d52f2c3949 INTEGRATION: CWS docking1 (1.2.4); FILE MERGED
2004/04/05 08:06:46 cd 1.2.4.1: #i24937# Programmatic control of toolbar items
2004-07-06 15:56:52 +00:00
Oliver Bolte
a161f5726c INTEGRATION: CWS docking1 (1.11.2); FILE MERGED
2004/07/06 10:08:39 cd 1.11.2.4: RESYNC manually
2004/06/01 10:55:36 cd 1.11.2.3: #i10000# Fixed merge problems
2004/05/31 04:19:21 cd 1.11.2.2: RESYNC: (1.11-1.12); FILE MERGED
2004/04/05 08:06:46 cd 1.11.2.1: #i24937# Programmatic control of toolbar items
2004-07-06 15:56:35 +00:00
Oliver Bolte
3a4eebfa70 INTEGRATION: CWS docking1 (1.5.108); FILE MERGED
2004/05/31 04:18:21 cd 1.5.108.2: RESYNC: (1.5-1.6); FILE MERGED
2004/04/21 06:57:22 cd 1.5.108.1: #i24937# Adapt addon implementation to support new toolbar concept
2004-07-06 15:56:18 +00:00
Hans-Joachim Lankenau
b6543fbfe5 #i10000# adopt to ISO codes 2004-06-30 09:22:18 +00:00
Hans-Joachim Lankenau
80fd2208a3 INTEGRATION: CWS mergebuild (1.8.30); FILE MERGED
2004/05/19 17:38:42 hjs 1.8.30.5: #i8252# fix resync problems
2004/05/18 17:31:01 hjs 1.8.30.4: RESYNC: (1.11-1.12); FILE MERGED
2004/04/21 06:21:24 hjs 1.8.30.3: RESYNC: (1.8-1.11); FILE MERGED
2003/11/11 19:18:02 ihi 1.8.30.2: en -> en-US
2003/11/10 16:45:28 ihi 1.8.30.1: #111234# Merge during build
2004-06-25 14:36:07 +00:00
Kurt Zenker
1bfa227a9d #i10000# fix last merge 2004-06-17 13:08:20 +00:00
Rüdiger Timm
289ca2e55d #i10000# Use standard location specification 2004-06-14 08:37:20 +00:00
Rüdiger Timm
c73b965aed #i10000# Set RESLIB1IMAGES for new image handling 2004-06-14 08:36:11 +00:00
Kurt Zenker
b48e8c7e75 conflict corrected 2004-06-11 17:47:55 +00:00
Kurt Zenker
61179b33bb INTEGRATION: CWS networker3 (1.11.28); FILE MERGED
2004/05/24 14:58:05 lo 1.11.28.1: #i26374# change license/splashscreen behaviour
2004-06-11 17:46:40 +00:00
Kurt Zenker
8e1aef3bfc INTEGRATION: CWS fwk02ea (1.11.26); FILE MERGED
2004/06/01 15:31:27 lo 1.11.26.1: #i29643# #i26375# licens dialog behavior + helpids
2004-06-10 15:18:31 +00:00
Rüdiger Timm
b57ce8a8e4 INTEGRATION: CWS bmpres01 (1.2.48); FILE MERGED
2004/02/16 15:18:24 ka 1.2.48.2: RESYNC: (1.2-1.3); FILE MERGED
2004/02/11 16:49:24 ka 1.2.48.1: #i22149#: added alpha mask support for Images/ImageLists
2004-05-21 11:36:33 +00:00
Rüdiger Timm
31eff4ed21 INTEGRATION: CWS bmpres01 (1.5.114); FILE MERGED
2004/02/18 10:36:46 ka 1.5.114.2: syntax
2004/02/18 09:51:09 ka 1.5.114.1: #i22149#: added support for alpha masks
2004-05-21 11:36:16 +00:00
Jens-Heiner Rechtien
7e003738f4 INTEGRATION: CWS fwkbugfix02 (1.11.6); FILE MERGED
2004/04/14 16:07:28 mav 1.11.6.1: #116355# Save copy as
2004-05-10 16:49:34 +00:00
Rüdiger Timm
e8e16df566 INTEGRATION: CWS binfilter (1.32.22); FILE MERGED
2004/04/19 09:46:25 aw 1.32.22.4: #110098#
Necessary adaptions to framework after resynching binfilter to SRC680m33
2004/04/05 12:46:19 aw 1.32.22.3: RESYNC: (1.34-1.35); FILE MERGED
2003/08/08 10:16:33 aw 1.32.22.2: RESYNC: (1.32-1.34); FILE MERGED
2003/07/18 12:22:49 aw 1.32.22.1: #110897#
See the task. All changes to avoid usage of getProcessServiceManager().
2004-05-03 12:20:22 +00:00
Oliver Bolte
9881348885 INTEGRATION: CWS fwkbugfix01 (1.10.6); FILE MERGED
2004/03/09 07:14:32 cd 1.10.6.1: #115843# Support placeholders ($1) and ($2) for outplace activation within menus
2004-03-17 11:18:36 +00:00
Kurt Zenker
6f0e747abc INTEGRATION: CWS layoutmanager (1.11.76); FILE MERGED
2004/02/19 18:58:59 cd 1.11.76.4: RESYNC: (1.11-1.12); FILE MERGED
2003/10/13 11:56:21 cd 1.11.76.3: #111899# Creation of layout manager moved to frame ctor to support standalone frames
2003/08/20 15:56:49 cd 1.11.76.2: 111899# Framework based user interface
2003/08/12 10:11:17 cd 1.11.76.1: #i12928# First parts of the new layout manager
2004-02-25 16:45:37 +00:00
Kurt Zenker
903fb87c30 INTEGRATION: CWS layoutmanager (1.1.2); FILE ADDED
2003/11/07 08:00:32 cd 1.1.2.2: #111899# Support static docking for toolbars
2003/08/20 15:56:49 cd 1.1.2.1: 111899# Framework based user interface
2004-02-25 16:45:23 +00:00
Kurt Zenker
7528cec4ca INTEGRATION: CWS layoutmanager (1.9.16); FILE MERGED
2004/02/03 15:29:36 cd 1.9.16.1: #i25017# Use resource for menu item inside popup menu controller
2004-02-25 16:45:12 +00:00
Kurt Zenker
42487a5949 INTEGRATION: CWS layoutmanager (1.34.26); FILE MERGED
2004/01/19 13:25:01 cd 1.34.26.2: #111899# include resource.h from inc/classes
2003/10/31 16:37:58 cd 1.34.26.1: #111899# Fixed some problems with OLE inplace editing
2004-02-25 16:44:45 +00:00
Kurt Zenker
33d8e23887 INTEGRATION: CWS layoutmanager (1.26.76); FILE MERGED
2004/02/19 18:58:18 cd 1.26.76.4: RESYNC: (1.27-1.28); FILE MERGED
2004/01/19 13:27:53 cd 1.26.76.3: #111899# Changed makefile.mk
2003/10/06 05:37:30 cd 1.26.76.2: RESYNC: (1.26-1.27); FILE MERGED
2003/08/20 15:56:48 cd 1.26.76.1: 111899# Framework based user interface
2004-02-25 16:44:17 +00:00
Kurt Zenker
90adac6f99 INTEGRATION: CWS layoutmanager (1.3.68); FILE MERGED
2004/02/02 09:58:00 as 1.3.68.1: #i19488# remove prop IsBackingMode at the frame instance
2004-02-25 16:44:02 +00:00
Kurt Zenker
814ae4799f INTEGRATION: CWS layoutmanager (1.4.60); FILE MERGED
2004/01/29 19:13:48 cd 1.4.60.2: RESYNC: (1.4-1.5); FILE MERGED
2004/01/28 16:25:46 cd 1.4.60.1: #111899# Adapt code for new index container implementation
2004-02-25 16:43:47 +00:00
Jens-Heiner Rechtien
f962cc2273 INTEGRATION: CWS geordi2q14 (1.3.76); FILE MERGED
2004/01/29 16:05:37 hr 1.3.76.1: #111934#: merge CWS ooo111fix2
2004-02-02 22:05:59 +00:00
Jens-Heiner Rechtien
6cea9972e8 INTEGRATION: CWS geordi2q14 (1.2.76); FILE MERGED
2004/01/29 16:05:34 hr 1.2.76.1: #111934#: merge CWS ooo111fix2
2004-02-02 22:05:43 +00:00
Kurt Zenker
cb1f77de9b INTEGRATION: CWS filtercfg (1.11.50); FILE MERGED
2003/08/21 11:14:23 as 1.11.50.1: #102620# remove code for ArgumentAnalyzer, Plugin ...; restructure include dirs; establish new shared loader source
2004-01-28 13:25:25 +00:00
Kurt Zenker
b4099c11ad INTEGRATION: CWS filtercfg (1.8.112); FILE MERGED
2003/08/21 11:14:22 as 1.8.112.1: #102620# remove code for ArgumentAnalyzer, Plugin ...; restructure include dirs; establish new shared loader source
2004-01-28 13:24:51 +00:00
Kurt Zenker
66e2d16370 INTEGRATION: CWS filtercfg (1.2.42); FILE MERGED
2003/09/08 08:11:28 as 1.2.42.2: #102620# replace some internal classes with external helper
2003/08/04 05:45:31 as 1.2.42.1: #102620# first step: remove filter/type cfg related services; remove obsolete plugin classes
2004-01-28 13:24:26 +00:00
Kurt Zenker
7eeb17b2a5 INTEGRATION: CWS filtercfg (1.26.50); FILE MERGED
2003/09/08 08:12:55 as 1.26.50.3: #102620# remove obsolete internal helper
2003/08/28 11:56:05 as 1.26.50.2: RESYNC: (1.26-1.27); FILE MERGED
2003/08/21 11:14:22 as 1.26.50.1: #102620# remove code for ArgumentAnalyzer, Plugin ...; restructure include dirs; establish new shared loader source
2004-01-28 13:24:01 +00:00
Vladimir Glazounov
0033b0843b INTEGRATION: CWS vclcleanup02 (1.10.104); FILE MERGED
2003/12/11 08:26:00 mt 1.10.104.1: #i23061# VCL cleanup, removed headers, methods and types...
2004-01-06 15:59:20 +00:00
Vladimir Glazounov
31b5fb007c INTEGRATION: CWS vclcleanup02 (1.4.96); FILE MERGED
2003/12/11 08:26:00 mt 1.4.96.1: #i23061# VCL cleanup, removed headers, methods and types...
2004-01-06 15:58:51 +00:00
Vladimir Glazounov
091162a4ea INTEGRATION: CWS geordi2q11 (1.8.60); FILE MERGED
2003/12/16 12:40:45 hr 1.8.60.1: #111934#: join CWS ooo111fix1
2003-12-17 17:37:20 +00:00
Rüdiger Timm
2c3d505dc1 #100000# Newline at end of file 2003-10-01 09:22:57 +00:00
Kurt Zenker
15d99c5ce9 INTEGRATION: CWS ause04 (1.26.58); FILE MERGED
2003/07/09 18:12:28 hjs 1.26.58.1: #108794# replace SRCFILES with SRC1FILES
2003-08-25 13:50:04 +00:00
Jens-Heiner Rechtien
f0a0e4fc13 INTEGRATION: CWS mergerc3 (1.7.4); FILE MERGED
2003/07/16 17:01:15 ihi 1.7.4.1: rc-3 merge all languages
2003-07-17 10:43:12 +00:00
Jens-Heiner Rechtien
9ee090f9ae INTEGRATION: CWS ooo11rc2 (1.2.128); FILE MERGED
2003/07/15 06:22:00 fa 1.2.128.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.

http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16868

Dan
fa@ooo
2003-07-16 16:40:03 +00:00
Jens-Heiner Rechtien
593953062b INTEGRATION: CWS ooo11rc2 (1.1.128); FILE MERGED
2003/07/15 06:21:59 fa 1.1.128.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.

http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16868

Dan
fa@ooo
2003-07-16 16:39:54 +00:00
Jens-Heiner Rechtien
4fe430041a INTEGRATION: CWS rc2merge (1.6.10); FILE MERGED
2003/07/03 14:34:11 ihi 1.6.10.1: rc-2 merge all languages
2003-07-03 16:25:30 +00:00
Jens-Heiner Rechtien
ce0fd0e6b0 INTEGRATION: CWS vcl13 (1.7.46); FILE MERGED
2003/06/13 17:58:55 pl 1.7.46.1: #110062# DropTargetListener never called dropComplete
2003-06-30 13:25:36 +00:00
Vladimir Glazounov
1a1c95649d #100000# no drafts anymore 2003-06-20 15:09:12 +00:00
Jens-Heiner Rechtien
c5e976ffd3 INTEGRATION: CWS rcmerge (1.5.22); FILE MERGED
2003/06/12 11:11:07 gh 1.5.22.1: final Merge RC
2003-06-13 13:00:22 +00:00
Vladimir Glazounov
32e9c2c049 INTEGRATION: CWS fwk04 (1.3.24); FILE MERGED
2003/05/23 15:42:08 cd 1.3.24.1: #109787# Support references to external bitmap inside UserDefinedImages node
2003-05-28 12:29:22 +00:00
Vladimir Glazounov
d14733ac94 INTEGRATION: CWS os9 (1.32.8); FILE MERGED
2003/04/24 12:20:39 cd 1.32.8.1: #109103# A menu item handler must always be created. It doesn't depend on a menu item image!
2003-05-22 07:36:36 +00:00