Commit graph

84 commits

Author SHA1 Message Date
Oliver Bolte
32c1fbf5ec INTEGRATION: CWS custommeta (1.29.74); FILE MERGED
2008/01/25 14:19:27 mst 1.29.74.1: - sfx2/inc/sfx2/{frmhtmlw.hxx,sfxhtml.hxx},
  sfx2/source/appl/{appbas.cxx,appcfg.cxx,appmain.cxx,appserv.cxx},
  sfx2/source/bastyp/{fltfnc.cxx,frmhtml.cxx}, sfx2/source/config/evntconf.cxx,
  sfx2/source/doc/new.cxx, sfx2/source/doc/oleprops.cxx:
  + remove unneeded includes and assorted detritus
2008-02-26 14:07:07 +00:00
Jens-Heiner Rechtien
3fb19121b4 INTEGRATION: CWS vgbugs07 (1.28.150); FILE MERGED
2007/06/04 13:34:44 vg 1.28.150.1: #i76605# Remove -I .../inc/module hack introduced by hedaburemove01
2007-06-27 22:05:07 +00:00
Jens-Heiner Rechtien
a843411c56 INTEGRATION: CWS vgbugs07 (1.45.42); FILE MERGED
2007/06/04 13:34:44 vg 1.45.42.1: #i76605# Remove -I .../inc/module hack introduced by hedaburemove01
2007-06-27 22:04:54 +00:00
Jens-Heiner Rechtien
b9e3e6dca2 INTEGRATION: CWS vgbugs07 (1.6.344); FILE MERGED
2007/06/04 13:34:43 vg 1.6.344.1: #i76605# Remove -I .../inc/module hack introduced by hedaburemove01
2007-06-27 22:04:41 +00:00
Ivo Hinkelmann
72815362ca INTEGRATION: CWS mergede01 (1.44.212); FILE MERGED
2007/03/20 14:51:22 ihi 1.44.212.1: #i72301# Remove German
2007-04-19 16:07:51 +00:00
Rüdiger Timm
ec366e074d INTEGRATION: CWS swfwknoassert (1.27.22); FILE MERGED
2006/11/03 17:14:01 mba 1.27.22.1: #i70509#: superfluous assertion removed
2006-12-04 07:17:25 +00:00
Oliver Bolte
0862ab04c6 INTEGRATION: CWS pchfix02 (1.26.88); FILE MERGED
2006/09/01 17:38:29 kaib 1.26.88.1: #i68856# Added header markers and pch files
2006-09-17 15:25:36 +00:00
Jens-Heiner Rechtien
d0bd56eba0 INTEGRATION: CWS warnings01 (1.24.64); FILE MERGED
2006/05/23 21:44:59 sb 1.24.64.3: RESYNC: (1.24-1.25); FILE MERGED
2005/11/28 16:13:58 cd 1.24.64.2: #i55991# Remove warnings
2005/11/09 12:03:20 cd 1.24.64.1: #i55991# Make code warning free for gcc
2006-06-19 21:15:55 +00:00
Jens-Heiner Rechtien
3842e7af50 INTEGRATION: CWS warnings01 (1.42.56); FILE MERGED
2006/05/23 21:44:06 sb 1.42.56.2: RESYNC: (1.42-1.43); FILE MERGED
2005/11/09 12:03:19 cd 1.42.56.1: #i55991# Make code warning free for gcc
2006-06-19 21:15:42 +00:00
Vladimir Glazounov
302a00f404 INTEGRATION: CWS ause043 (1.8.60); FILE MERGED
2005/11/02 17:32:25 hjs 1.8.60.1: #i56702# not local generation
2006-05-24 13:31:52 +00:00
Rüdiger Timm
27e96af013 INTEGRATION: CWS sfxcleanup (1.24.156); FILE MERGED
2006/02/26 18:26:25 mba 1.24.156.1: #132394#: remove superfluous code
2006-05-02 15:26:49 +00:00
Rüdiger Timm
e6e531588c INTEGRATION: CWS sfxcleanup (1.42.152); FILE MERGED
2006/03/29 18:50:25 mba 1.42.152.3: #132394#: remove superfluous code
2006/02/26 18:26:25 mba 1.42.152.2: #132394#: remove superfluous code
2006/02/26 17:15:18 mba 1.42.152.1: #132394#: remove superfluous code
2006-05-02 15:26:32 +00:00
Rüdiger Timm
29a112bcc8 INTEGRATION: CWS sfxcleanup (1.5.158); FILE MERGED
2006/02/26 18:26:25 mba 1.5.158.2: #132394#: remove superfluous code
2006/02/26 17:15:18 mba 1.5.158.1: #132394#: remove superfluous code
2006-05-02 15:26:19 +00:00
Jens-Heiner Rechtien
4460ebfb48 INTEGRATION: CWS encup (1.40.390); FILE MERGED
2005/04/29 16:07:29 ihi 1.40.390.1: #i40603# German strings now UTF8 encoded
2005-09-23 14:22:48 +00:00
Rüdiger Timm
b4f0898707 INTEGRATION: CWS ooo19126 (1.7.270); FILE MERGED
2005/09/05 15:22:29 rt 1.7.270.1: #i54170# Change license header: remove SISSL
2005-09-07 17:02:40 +00:00
Rüdiger Timm
ba10f26a7d INTEGRATION: CWS ooo19126 (1.23.132); FILE MERGED
2005/09/05 15:22:28 rt 1.23.132.1: #i54170# Change license header: remove SISSL
2005-09-07 17:01:53 +00:00
Rüdiger Timm
ef207e02a8 INTEGRATION: CWS ooo19126 (1.40.510); FILE MERGED
2005/09/05 15:22:28 rt 1.40.510.1: #i54170# Change license header: remove SISSL
2005-09-07 17:01:35 +00:00
Rüdiger Timm
c9de30e9fd INTEGRATION: CWS ooo19126 (1.4.1060); FILE MERGED
2005/09/05 15:22:27 rt 1.4.1060.1: #i54170# Change license header: remove SISSL
2005-09-07 17:01:10 +00:00
Oliver Bolte
c64d54f55a INTEGRATION: CWS visibility03 (1.22.96); FILE MERGED
2005/03/26 16:25:36 mhu 1.22.96.1: #i45006# subst includes svtools/sbx with basic/sbx
2005-04-13 11:38:35 +00:00
Kurt Zenker
25164239d1 INTEGRATION: CWS fwkbugfix04 (1.5.316); FILE MERGED
2004/12/06 17:55:13 mba 1.5.316.1: #i38334#: get rid of all code based on SfxConfigManager
2005-01-18 15:06:59 +00:00
Kurt Zenker
861e9095d3 INTEGRATION: CWS fwkbugfix04 (1.21.120); FILE MERGED
2004/12/06 17:55:12 mba 1.21.120.1: #i38334#: get rid of all code based on SfxConfigManager
2005-01-18 15:06:27 +00:00
Rüdiger Timm
46cc83ffbc INTEGRATION: CWS sb25 (1.5.286); FILE MERGED
2004/11/12 17:03:43 sb 1.5.286.1: #i37077# Reduce number of exported symbols of sfx dynamic library.
2005-01-11 13:57:00 +00:00
Kurt Zenker
eb0d6807c0 INTEGRATION: CWS mav09 (1.17.24); FILE MERGED
2004/09/16 23:49:19 mav 1.17.24.5: RESYNC: (1.19-1.20); FILE MERGED
2004/07/02 08:39:32 mba 1.17.24.4: #i27773#: some TODOs
2004/05/17 16:05:18 mav 1.17.24.3: RESYNC: (1.18-1.19); FILE MERGED
2004/04/29 21:16:50 mav 1.17.24.2: RESYNC: (1.17-1.18); FILE MERGED
2004/04/14 11:33:10 mba 1.17.24.1: #i27773#: use new storage API
2004-10-04 19:48:45 +00:00
Rüdiger Timm
19263ecffa INTEGRATION: CWS ooo20040704 (1.19.60); FILE MERGED
2004/06/28 13:52:14 waratah 1.19.60.1: Initialise some potentially unitialised values
reorder declarations to match defintion
wrap pragma not defined for gcc
2004-09-08 14:38:24 +00:00
Hans-Joachim Lankenau
a2f676df9b INTEGRATION: CWS mergebuild (1.38.54); FILE MERGED
2004/04/20 20:46:51 hjs 1.38.54.2: RESYNC: (1.38-1.39); FILE MERGED
2003/11/10 17:54:54 ihi 1.38.54.1: #111234# Merge during build
2004-06-26 16:42:40 +00:00
Rüdiger Timm
dde53266b4 INTEGRATION: CWS binfilter (1.15.18); FILE MERGED
2004/04/05 13:14:44 aw 1.15.18.4: RESYNC: (1.17-1.18); FILE MERGED
2004/02/05 13:56:48 aw 1.15.18.3: RESYNC: (1.16-1.17); FILE MERGED
2003/08/08 12:45:42 aw 1.15.18.2: RESYNC: (1.15-1.16); FILE MERGED
2003/07/18 12:24:19 aw 1.15.18.1: #110897#
Changes necessary to support the changes for framework, see task description.
2004-05-03 12:54:13 +00:00
Jens-Heiner Rechtien
38996137f5 #i10000#: for scope 2004-03-11 16:27:41 +00:00
Jens-Heiner Rechtien
996514ae4c INTEGRATION: CWS dialogdiet (1.4.40); FILE MERGED
2003/12/04 08:25:06 mba 1.4.40.1: #i22972#: move misccfg to svtools
2004-02-03 18:55:28 +00:00
Vladimir Glazounov
3a73309519 INTEGRATION: CWS vclcleanup02 (1.16.158); FILE MERGED
2003/12/11 09:08:27 mt 1.16.158.1: #i23061# VCL cleanup, removed headers, methods and types...
2004-01-06 15:25:10 +00:00
Vladimir Glazounov
4fb156dbc8 INTEGRATION: CWS geordi2q11 (1.38.132); FILE MERGED
2003/12/16 16:02:36 hr 1.38.132.1: #111934#: join CWS ooo111fix1
2003-12-17 13:43:50 +00:00
Kurt Zenker
493cd3f448 INTEGRATION: CWS ause04 (1.3.224); FILE MERGED
2003/07/11 10:02:43 hjs 1.3.224.1: #108794# replace SRCFILES with SRC1FILES
2003-08-25 14:28:27 +00:00
Jens-Heiner Rechtien
03285491cf INTEGRATION: CWS mergerc3 (1.37.8); FILE MERGED
2003/07/16 17:10:09 ihi 1.37.8.1: rc-3 merge all languages
2003-07-17 12:15:54 +00:00
Jens-Heiner Rechtien
f67e672c2f INTEGRATION: CWS rc2merge (1.36.16); FILE MERGED
2003/07/03 14:42:53 ihi 1.36.16.1: rc-2 merge all languages
2003-07-03 17:11:46 +00:00
Jens-Heiner Rechtien
733d484819 INTEGRATION: CWS rcmerge (1.35.32); FILE MERGED
2003/06/12 11:06:31 gh 1.35.32.1: final Merge RC
2003-06-13 13:13:26 +00:00
Vladimir Glazounov
943d2689ca INTEGRATION: CWS fwk03 (1.15.32); FILE MERGED
2003/05/20 14:54:56 mba 1.15.32.1: #109739#: event processing always uses Notification
2003-05-26 07:28:45 +00:00
Jens-Heiner Rechtien
914df64670 INTEGRATION: CWS mergem8 (1.31.4.4.2.2.36); FILE MERGED
2003/04/29 08:36:43 gh 1.31.4.4.2.2.36.2: final merge for Beta2
2003/04/14 15:11:59 gh 1.31.4.4.2.2.36.1: merging all languages
2003-04-29 16:53:18 +00:00
Jens-Heiner Rechtien
4a60a4fa26 INTEGRATION: CWS fwk01 (1.13.8.4.14); FILE MERGED
2003/03/19 14:38:02 mba 1.13.8.4.14.1: #108257#: special treatment for DOCEVENTCONFIG
2003-04-04 16:35:21 +00:00
Jens-Heiner Rechtien
5be98eba1f MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-27 10:29:38 +00:00
Jörg Budischewski
13a50a0b42 #103263# replaced obsolete applicat.rdb with types.rdb 2002-10-01 10:30:50 +00:00
Kurt Zenker
362bcb3f32 Merge SRC641: 05.09.02 - 19:01:04 2002-09-05 16:04:33 +00:00
Mathias Bauer
a7887176c7 #100496#: DocEventConfig does not have a Configmanager 2002-06-19 16:13:20 +00:00
Mathias Bauer
5868e406c6 #97446#: changing event config didn't set modified flag 2002-03-11 16:53:29 +00:00
Kurt Zenker
d4b46f0caf Merge SRC641: 22.01.02 - 22:15:12 2002-01-22 20:19:34 +00:00
Kurt Zenker
5938f4c949 Merge SRC641: 16.01.02 - 22:20:35 2002-01-16 20:25:38 +00:00
Kurt Zenker
ec4d271be7 Merge SRC641: 14.01.02 - 22:14:52 2002-01-14 20:18:51 +00:00
Kurt Zenker
4258d1f6cd Merge SRC641: 07.01.02 - 16:03:32 2002-01-07 14:07:50 +00:00
Kurt Zenker
b3addfbc80 Merge SRC641: 14.12.01 - 18:48:38 2001-12-14 16:51:10 +00:00
Kurt Zenker
1b5e5f34a6 Merge SRC641: 13.12.01 - 22:11:49 2001-12-13 20:13:49 +00:00
Mathias Bauer
d803240f4d #95867#: confirmation for basic macros 2001-12-12 14:29:08 +00:00
Oliver Bolte
2278f38300 Merge SRC641: 10.12.01 - 22:15:09 2001-12-10 21:16:48 +00:00