Commit Graph

38 Commits

Author SHA1 Message Date
Michael Meeks
bdc909b07d re-base on ALv2 code. 2012-06-19 18:00:37 +01:00
Jan Holesovsky
11cdc4ccc4 Merge commit 'ooo/DEV300_m103'
Conflicts:
	odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
	odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
	odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
	odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
	odk/examples/cpp/complextoolbarcontrols/exports.cxx
	odk/examples/cpp/counter/countermain.cxx
	odk/examples/cpp/remoteclient/remoteclient.cxx
	odk/settings/settings.mk
2011-03-23 16:59:36 +01:00
Nikolai Pretzell
e279d0d774 #115368# Force since tag format. 2010-11-17 19:19:29 +01:00
Caolán McNamara
8cad7d1947 add modelines to .hxx files as well 2010-10-27 13:05:40 +01:00
Jens-Heiner Rechtien
1296914c84 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
Rüdiger Timm
fe46d21581 INTEGRATION: CWS changefileheader (1.3.80); FILE MERGED
2008/03/28 16:02:55 rt 1.3.80.1: #i87441# Change license header to LPGL v3.
2008-04-10 14:58:03 +00:00
Rüdiger Timm
30aff25881 INTEGRATION: CWS changefileheader (1.3.26); FILE MERGED
2008/03/28 16:02:55 rt 1.3.26.1: #i87441# Change license header to LPGL v3.
2008-04-10 14:57:46 +00:00
Rüdiger Timm
443ac8d700 INTEGRATION: CWS changefileheader (1.4.22); FILE MERGED
2008/03/28 16:02:55 rt 1.4.22.1: #i87441# Change license header to LPGL v3.
2008-04-10 14:57:32 +00:00
Rüdiger Timm
854f2573f5 INTEGRATION: CWS changefileheader (1.3.22); FILE MERGED
2008/03/28 16:02:55 rt 1.3.22.1: #i87441# Change license header to LPGL v3.
2008-04-10 14:57:17 +00:00
Rüdiger Timm
37a9f5e6c8 INTEGRATION: CWS changefileheader (1.4.80); FILE MERGED
2008/03/28 16:02:54 rt 1.4.80.1: #i87441# Change license header to LPGL v3.
2008-04-10 14:56:45 +00:00
Rüdiger Timm
cc17f38b3e INTEGRATION: CWS changefileheader (1.2.80); FILE MERGED
2008/03/28 16:02:54 rt 1.2.80.1: #i87441# Change license header to LPGL v3.
2008-04-10 14:56:28 +00:00
Rüdiger Timm
e9ae81856c INTEGRATION: CWS changefileheader (1.8.22); FILE MERGED
2008/03/28 16:02:54 rt 1.8.22.1: #i87441# Change license header to LPGL v3.
2008-04-10 14:56:13 +00:00
Rüdiger Timm
5f76552f80 INTEGRATION: CWS changefileheader (1.3.22); FILE MERGED
2008/03/28 16:02:54 rt 1.3.22.1: #i87441# Change license header to LPGL v3.
2008-04-10 14:55:51 +00:00
Rüdiger Timm
0a751b3f08 INTEGRATION: CWS changefileheader (1.3.80); FILE MERGED
2008/03/28 16:02:54 rt 1.3.80.1: #i87441# Change license header to LPGL v3.
2008-04-10 14:55:33 +00:00
Jens-Heiner Rechtien
3913a01763 INTEGRATION: CWS adc18 (1.3.56); FILE MERGED
2007/10/19 10:37:32 np 1.3.56.1: #i81775#
2007-11-02 16:13:18 +00:00
Jens-Heiner Rechtien
a617f106a6 INTEGRATION: CWS adc18 (1.2.56); FILE MERGED
2007/10/19 10:37:32 np 1.2.56.1: #i81775#
2007-11-02 16:12:59 +00:00
Jens-Heiner Rechtien
17a0486a08 INTEGRATION: CWS adc18 (1.3.2); FILE MERGED
2007/10/19 10:37:32 np 1.3.2.1: #i81775#
2007-11-02 16:12:43 +00:00
Jens-Heiner Rechtien
2a603f288f INTEGRATION: CWS adc18 (1.7.2); FILE MERGED
2007/10/18 15:23:21 np 1.7.2.1: #i81775#
2007-11-02 16:12:26 +00:00
Jens-Heiner Rechtien
81071b3715 INTEGRATION: CWS adc18 (1.2.56); FILE MERGED
2007/10/19 10:37:32 np 1.2.56.2: #i81775#
2007/10/18 15:23:21 np 1.2.56.1: #i81775#
2007-11-02 16:12:06 +00:00
Vladimir Glazounov
d47fb9c2b0 INTEGRATION: CWS adc17 (1.2.50); FILE MERGED
2007/08/10 10:37:10 np 1.2.50.1: #i23626 correct spacing in autodoc output#
2007-09-18 13:27:00 +00:00
Vladimir Glazounov
6b5a4706fb INTEGRATION: CWS adc17 (1.6.2); FILE MERGED
2007/08/10 10:37:10 np 1.6.2.1: #i23626 correct spacing in autodoc output#
2007-09-18 13:26:32 +00:00
Jens-Heiner Rechtien
686a593e7c INTEGRATION: CWS adc16 (1.5.48); FILE MERGED
2007/07/27 11:13:41 np 1.5.48.1: #i80054#
2007-07-31 15:09:44 +00:00
Rüdiger Timm
845b94ec1f INTEGRATION: CWS ooo19126 (1.2.16); FILE MERGED
2005/09/05 13:12:38 rt 1.2.16.1: #i54170# Change license header: remove SISSL
2005-09-07 17:58:48 +00:00
Rüdiger Timm
b259220fff INTEGRATION: CWS ooo19126 (1.1.1.1.146); FILE MERGED
2005/09/05 13:12:38 rt 1.1.1.1.146.1: #i54170# Change license header: remove SISSL
2005-09-07 17:58:11 +00:00
Rüdiger Timm
03f5b9d1a1 INTEGRATION: CWS ooo19126 (1.2.146); FILE MERGED
2005/09/05 13:12:37 rt 1.2.146.1: #i54170# Change license header: remove SISSL
2005-09-07 17:57:56 +00:00
Rüdiger Timm
e9e57c4d8d INTEGRATION: CWS ooo19126 (1.1.1.1.146); FILE MERGED
2005/09/05 13:12:37 rt 1.1.1.1.146.1: #i54170# Change license header: remove SISSL
2005-09-07 17:57:40 +00:00
Rüdiger Timm
d8131651cd INTEGRATION: CWS ooo19126 (1.3.102); FILE MERGED
2005/09/05 13:12:37 rt 1.3.102.1: #i54170# Change license header: remove SISSL
2005-09-07 17:57:07 +00:00
Rüdiger Timm
85bdcd1b77 INTEGRATION: CWS ooo19126 (1.1.1.1.146); FILE MERGED
2005/09/05 13:12:36 rt 1.1.1.1.146.1: #i54170# Change license header: remove SISSL
2005-09-07 17:56:50 +00:00
Rüdiger Timm
8064b2993e INTEGRATION: CWS ooo19126 (1.4.14); FILE MERGED
2005/09/05 13:12:36 rt 1.4.14.1: #i54170# Change license header: remove SISSL
2005-09-07 17:56:34 +00:00
Rüdiger Timm
17d8d4fb23 INTEGRATION: CWS ooo19126 (1.1.1.1.146); FILE MERGED
2005/09/05 13:12:35 rt 1.1.1.1.146.1: #i54170# Change license header: remove SISSL
2005-09-07 17:56:18 +00:00
Rüdiger Timm
f99e163887 INTEGRATION: CWS ooo19126 (1.2.146); FILE MERGED
2005/09/05 13:12:34 rt 1.2.146.1: #i54170# Change license header: remove SISSL
2005-09-07 17:55:56 +00:00
Oliver Bolte
130dd61832 INTEGRATION: CWS adc10 (1.1.1.1.132); FILE MERGED
2005/01/12 13:14:31 np 1.1.1.1.132.1: #i31025# Convenient error log file.
2005-01-27 10:30:10 +00:00
Oliver Bolte
922e1dea77 INTEGRATION: CWS adc10 (1.3.8); FILE MERGED
2005/01/12 13:14:31 np 1.3.8.1: #i31025# Convenient error log file.
2005-01-27 10:29:56 +00:00
Rüdiger Timm
f649e44cd5 INTEGRATION: CWS adc8 (1.2.54); FILE MERGED
2004/07/02 14:44:37 np 1.2.54.1: #i30967#
2004-07-12 14:43:37 +00:00
Vladimir Glazounov
929a9be144 INTEGRATION: CWS sdk02 (1.2.46); FILE MERGED
2003/05/26 16:42:19 np 1.2.46.1: #108925# Enable tag @since and text for tag @deprecated.
2003-06-10 10:35:43 +00:00
Vladimir Glazounov
8b2e6184ed INTEGRATION: CWS sdk02 (1.1.1.1.46); FILE MERGED
2003/05/26 16:42:19 np 1.1.1.1.46.1: #108925# Enable tag @since and text for tag @deprecated.
2003-06-10 10:35:31 +00:00
Nikolai Pretzell
83e726c6a5 #98964#, New layout for Autodoc-IDL-docu and some fixes for gcc 2002-05-14 08:02:21 +00:00
Nikolai Pretzell
d566f38f8a Moving Autodoc to OpenOffice.org, module autodoc: sourcecode repository and documentation generator 2002-03-08 13:45:36 +00:00