wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity
293,397 Commits 5 Branches 0 Tags
10011d00a6566f095b463abaed51da86c3a1e1d3
Commit Graph

97 Commits

Author SHA1 Message Date
Matúš Kukan
b50137566f Remove component_getImplementationEnvironment 2011-07-12 16:45:29 +02: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
Thomas Arnhold
f03de39457 Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...) 2011-03-19 14:11:43 +01:00
Jan Holesovsky
ab416c033d Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-17 17:00:48 +01:00
Thomas Arnhold
7149c61435 Move OSL_ENSURE(0,...) to OSL_FAIL(...) 2011-03-12 14:19:28 +01:00
Norbert Thiebaud
e3ceb1d3d8 Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 
* commit 'ooo/DEV300_m101':
  sb138: #i116038# fresh implementation of binary URP bridge
  dba34b: #i106807# use mysql instead of adabas now
  sb126: #i112627# adapted SDK/DevGuide to configmgr re-write

Conflicts:
	odk/util/makefile.pmk
 2011-03-08 22:34:23 -06:00
Juergen Schmidt
e89e842175 jsc340: merge to dev300m101 2011-02-24 13:34:07 +01:00
Fridrich Štrba
1628005298 Trying to remove the stlport mention from the code 2011-02-09 16:20:25 +01:00
Juergen Schmidt
134b85e8f8 jsc340: i114609: support passive component registration 2011-02-01 18:08:59 +01:00
Takeshi Abe
91a0a53e0c Replace all occured, occurance etc. 2010-12-05 20:19:49 +00:00
Gert Faller
1d922012be RTL_CONSTASCII_USTRINGPARAM in sdk 2 2010-11-27 09:28:39 +01:00
Gert Faller
7ccc9aaef5 RTL_CONSTASCII_USTRINGPARAM in sdk 1 2010-11-27 09:10:56 +01:00
Ocke.Janssen
5afd753bff dba34b: #i106807# use mysql instead of adabas now 2010-11-04 14:56:15 +01:00
Caolán McNamara
8cad7d1947 add modelines to .hxx files as well 2010-10-27 13:05:40 +01:00
Sebastian Spaeth
e9a59da46a Add vim/emacs modelines to all source files 
Fixes #fdo30794
Based on bin/add-modelines script (originally posted in mail
1286706307.1871.1399280959@webmail.messagingengine.com)

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
 2010-10-13 10:58:04 +02: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
Juergen Schmidt
40487924f7 #i106627# extend and adapt env for VC9, building manifest, change macro 2009-11-05 14:21:50 +00:00
Rüdiger Timm
3eb1211ff3 INTEGRATION: CWS jsc21 (1.4.6); FILE MERGED 
2008/06/27 08:49:51 jsc 1.4.6.1: #i90032# adapt link flags and linking for MacOS
 2008-07-11 13:21:27 +00:00
Rüdiger Timm
f3e103598e INTEGRATION: CWS jsc21 (1.9.74); FILE MERGED 
2008/07/07 11:37:32 jsc 1.9.74.4: #i88797# adapted
2008/06/27 08:49:51 jsc 1.9.74.3: #i90032# adapt link flags and linking for MacOS
2008/06/20 08:11:11 jsc 1.9.74.2: #i88797# improve Makefile
2008/05/21 14:53:13 jsc 1.9.74.1: #i88797# adapted to new structure
 2008-07-11 13:21:12 +00:00
Rüdiger Timm
f660cfe2c1 INTEGRATION: CWS changefileheader (1.5.90); FILE MERGED 
2008/04/01 12:31:56 thb 1.5.90.1: #i85898# Stripping all external header guards
 2008-04-10 15:38:35 +00:00
Rüdiger Timm
bbc1619375 INTEGRATION: CWS changefileheader (1.5.98); FILE MERGED 
2008/04/01 12:31:55 thb 1.5.98.1: #i85898# Stripping all external header guards
 2008-04-10 15:38:16 +00:00
Rüdiger Timm
3d2b522219 INTEGRATION: CWS changefileheader (1.3.376); FILE MERGED 
2008/04/01 12:31:55 thb 1.3.376.1: #i85898# Stripping all external header guards
 2008-04-10 15:37:41 +00:00
Rüdiger Timm
1570f67354 INTEGRATION: CWS changefileheader (1.6.98); FILE MERGED 
2008/04/01 12:31:55 thb 1.6.98.1: #i85898# Stripping all external header guards
 2008-04-10 15:37:21 +00:00
Rüdiger Timm
0525725dbe INTEGRATION: CWS changefileheader (1.5.98); FILE MERGED 
2008/04/01 12:31:54 thb 1.5.98.1: #i85898# Stripping all external header guards
 2008-04-10 15:30:40 +00:00
Rüdiger Timm
eee33fdfe4 INTEGRATION: CWS changefileheader (1.3.376); FILE MERGED 
2008/04/01 12:31:54 thb 1.3.376.1: #i85898# Stripping all external header guards
 2008-04-10 15:30:25 +00:00
Rüdiger Timm
bf4a91307d INTEGRATION: CWS changefileheader (1.5.188); FILE MERGED 
2008/03/31 15:52:46 rt 1.5.188.1: #i87441# Change license header to LPGL v3.
 2008-04-10 15:29:53 +00:00
Oliver Bolte
0151a3e4c4 INTEGRATION: CWS jsc17 (1.8.8); FILE MERGED 
2007/01/22 15:35:28 jsc 1.8.8.1: #i73750# change UNOPKG_EXT to UNOOXT_EXT
 2007-01-25 10:05:49 +00:00
Ivo Hinkelmann
0d033990ca INTEGRATION: CWS jsc15 (1.4.66); FILE MERGED 
2006/11/24 12:53:15 jsc 1.4.66.1: #i68136# adapt include
 2006-12-20 11:24:43 +00:00
Ivo Hinkelmann
b38cda588a INTEGRATION: CWS jsc15 (1.7.118); FILE MERGED 
2006/11/24 12:54:06 jsc 1.7.118.1: #i68136# insert manifest linking for VC8
 2006-12-20 11:24:29 +00:00
Kurt Zenker
826fce6c3d INTEGRATION: CWS jsc14 (1.4.14); FILE MERGED 
2006/10/25 08:52:25 jsc 1.4.14.1: #i70636# remove auto generated precompiled header include
 2006-11-06 14:02:21 +00:00
Kurt Zenker
758e7f44b9 INTEGRATION: CWS jsc14 (1.5.14); FILE MERGED 
2006/10/25 08:52:25 jsc 1.5.14.1: #i70636# remove auto generated precompiled header include
 2006-11-06 14:02:07 +00:00
Kurt Zenker
b33a4ce65c INTEGRATION: CWS jsc14 (1.4.14); FILE MERGED 
2006/10/25 08:52:24 jsc 1.4.14.1: #i70636# remove auto generated precompiled header include
 2006-11-06 14:00:59 +00:00
Oliver Bolte
44e06c2598 INTEGRATION: CWS pchfix02 (1.3.260); FILE MERGED 
2006/09/01 17:32:23 kaib 1.3.260.1: #i68856# Added header markers and pch files
 2006-09-16 23:12:38 +00:00
Oliver Bolte
d944061515 INTEGRATION: CWS pchfix02 (1.4.42); FILE MERGED 
2006/09/01 17:32:23 kaib 1.4.42.1: #i68856# Added header markers and pch files
 2006-09-16 23:12:09 +00:00
Oliver Bolte
551b445806 INTEGRATION: CWS pchfix02 (1.3.260); FILE MERGED 
2006/09/01 17:32:22 kaib 1.3.260.1: #i68856# Added header markers and pch files
 2006-09-16 23:11:54 +00:00
Oliver Bolte
e42c61023b INTEGRATION: CWS pchfix02 (1.4.42); FILE MERGED 
2006/09/01 17:32:22 kaib 1.4.42.1: #i68856# Added header markers and pch files
 2006-09-16 23:11:27 +00:00
Oliver Bolte
cf5bca7c9b INTEGRATION: CWS pchfix02 (1.3.260); FILE MERGED 
2006/09/01 17:32:21 kaib 1.3.260.1: #i68856# Added header markers and pch files
 2006-09-16 23:10:22 +00:00
Ivo Hinkelmann
31a7f24896 INTEGRATION: CWS jsc12 (1.6.84); FILE MERGED 
2006/07/31 08:00:25 oj 1.6.84.1: #i57664# fix for storable
 2006-08-01 15:32:39 +00:00
Vladimir Glazounov
29428366fa INTEGRATION: CWS jsc3 (1.3.222); FILE MERGED 
2006/02/28 09:18:21 jsc 1.3.222.1: #i60691# replace getCppuType with UnoType
 2006-03-15 08:26:12 +00:00
Kurt Zenker
3b1aadb861 INTEGRATION: CWS jsc5 (1.5.56); FILE MERGED 
2006/02/02 14:36:31 jsc 1.5.56.1: #i61438# remove warning
 2006-02-03 16:14:37 +00:00
Rüdiger Timm
14dee7dc8a INTEGRATION: CWS ooo19126 (1.4.30); FILE MERGED 
2005/09/05 13:51:49 rt 1.4.30.1: #i54170# Change license header: remove SISSL
 2005-09-07 19:05:38 +00:00
Rüdiger Timm
ac80ee6b3d INTEGRATION: CWS sdkbugfix02 (1.5.10); FILE MERGED 
2005/03/03 15:41:54 jsc 1.5.10.1: #41142# replace make with internal MAKE variable
 2005-03-29 11:10:04 +00:00
Kurt Zenker
6c2c8c6736 INTEGRATION: CWS sdkbugfix01 (1.6.6); FILE MERGED 
2005/02/17 12:55:53 jsc 1.6.6.1: #i42941# correct typo
 2005-03-01 11:08:41 +00:00
Rüdiger Timm
f41c3694cf INTEGRATION: CWS sdksample (1.5.4); FILE MERGED 
2005/01/28 14:15:22 jsc 1.5.4.8: #i29308# prepare path for del command (windows only)
2004/10/29 07:33:45 jsc 1.5.4.7: #i29308# cleanup
2004/10/25 12:58:50 jsc 1.5.4.6: #i29308# minimize exported symbols
2004/10/22 14:19:16 jsc 1.5.4.5: #i29308# replace DKREGISTRYNAME with OFFICE_TYPE_LIBRARY
2004/10/22 10:00:12 jsc 1.5.4.4: #i35871# adapt for Java 5.0
2004/10/08 13:58:40 jsc 1.5.4.3: #i29308# insert package manifest
2004/08/24 15:04:22 jsc 1.5.4.2: #i29308# use of new UNO package extension
2004/06/17 11:08:55 jsc 1.5.4.1: #i29308# clean library
 2005-01-31 15:20:44 +00:00
Rüdiger Timm
8fd9661f14 INTEGRATION: CWS sdksample (1.3.62); FILE MERGED 
2004/10/25 12:58:50 jsc 1.3.62.1: #i29308# minimize exported symbols
 2005-01-31 15:20:28 +00:00
Rüdiger Timm
19c27dc621 INTEGRATION: CWS sdksample (1.4.40); FILE MERGED 
2004/08/06 14:36:59 jsc 1.4.40.2: #i29308# use System.err for error output
2004/06/09 13:14:29 jsc 1.4.40.1: #i29308# use of new UNO bootstrap feature
 2005-01-31 15:20:14 +00:00
Rüdiger Timm
a91c1051dc INTEGRATION: CWS sdksample (1.4.4); FILE MERGED 
2005/01/28 14:15:22 jsc 1.4.4.6: #i29308# prepare path for del command (windows only)
2004/10/29 07:33:44 jsc 1.4.4.5: #i29308# cleanup
2004/07/30 14:30:03 jsc 1.4.4.4: #i29308# use quotes for unopath option
2004/07/30 08:36:25 jsc 1.4.4.3: #i29308# adjust ECHOLINE for windows
2004/07/29 12:22:45 jsc 1.4.4.2: #i29308# insert ECHOLINE macro to dump an empty line in manifest files
2004/06/09 13:14:28 jsc 1.4.4.1: #i29308# use of new UNO bootstrap feature
 2005-01-31 15:19:45 +00:00
Rüdiger Timm
06b7b70b88 INTEGRATION: CWS sdksample (1.4.40); FILE MERGED 
2004/10/04 13:48:13 jsc 1.4.40.3: RESYNC: (1.4-1.5); FILE MERGED
2004/08/06 14:36:58 jsc 1.4.40.2: #i29308# use System.err for error output
2004/06/09 13:14:28 jsc 1.4.40.1: #i29308# use of new UNO bootstrap feature
 2005-01-31 15:19:30 +00:00
Rüdiger Timm
1113d6cb35 INTEGRATION: CWS insight02 (1.3.142); FILE MERGED 
2004/08/11 12:32:55 oj 1.3.142.1: #i30023# correct example and add main method
 2004-09-09 08:56:23 +00:00
Rüdiger Timm
9b6fc96c57 INTEGRATION: CWS insight02 (1.4.54); FILE MERGED 
2004/08/11 12:32:55 oj 1.4.54.1: #i30023# correct example and add main method
 2004-09-09 08:56:12 +00:00