Commit Graph

46 Commits

Author SHA1 Message Date
38d2ea2b25 Missing import
Regression introduced with 64e85a4cc8259a7d80c781e6698a8f30e7e0151d "Java
cleanup, remove unused imports."

Change-Id: I843cf651e20d2dd410f481222aca5206e0166a30
2013-06-19 17:41:00 +02:00
587c59fbc9 Java cleanup, Convert Vector to ArrayList
Change-Id: I323a6625f93347e69f3114fc10cb04dc759a539f
2013-05-06 11:45:50 +02:00
6f17a2f66f Java cleanup, access static methods using correct syntax
Change-Id: I8443aef43d82de33ac7cb47d40cc5b544f7c9c87
2013-04-26 08:36:04 +02:00
64e85a4cc8 Java cleanup, remove unused imports
Change-Id: I697017f196a7f7e5684011ae23941e54051c45dd
2013-04-26 08:29:38 +02:00
5051209534 Adapt SDK to usage of msvcrtd for Windows --enable-dbgutil
* Re-use existing settings/dk.mk to tunnel ENABLE_DEBUG into the SDK.  Turns out
  this was explicitly included in ~all examples Makefiles, but only after
  settings.mk where it is now used, so include it in settings.mk now and dropped
  it from all the exmaples Makefiles.

* The old settings.mk was apparently confused with using /MT ("link with
  LIBCMT.LIB") on cl command line and /MD ("link with MSVCRT.LIB") on link
  command line (where it was ignored), and you apparently can't pass both
  together to cl, so I settled on /MD (resp. /MDd) now and dropped /MT (resp.
  /MTd).  No idea if that is exactly right, however.

* Introduced client-facing LIBO_SDK_LDFLAGS_STDLIBS that covers kernel32.lib and
  msvcrt.lib vs. msvcrtd.lib on Windows.  Adapted examples Makefiles and
  /ure/source/uretest/Makefile accordingly.  Some examples Makefiles
  additionally use msvcprt.lib, no idea whether that still needs to be
  addressed.

Change-Id: Ia8d9d177e415abfbaf6f9fa6239f0ef9998868be
2013-04-19 14:02:18 +02:00
14a2413530 Adapt SDK to -B removed from cppumaker/javamaker
Change-Id: Ida4d11e0f8dfea201e0456cc54aa7f5af093d2ad
2013-04-11 14:24:08 +02:00
693332c0b4 Fix SDK examples
Change-Id: I0a3153bc3fa8338a1a0865db2fbe65a56ae064a4
2012-12-11 18:06:03 +01:00
4c9e62c6e3 Java cleanup, convert ArrayList and Vector to use generics
Change-Id: Ic668b46872ee0bfd259ca335aed9d68fb545c3a4
2012-09-10 23:43:39 +02:00
6bf09ecf1d Java cleanup, remove unnecessary imports
I guess I missed some last time :-)

Change-Id: I164a8baa07850f783b8cdf2e7f3eeaac53a3d29b
2012-09-10 23:43:38 +02:00
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
928af9414d jsc340: i114609: support passive component registration 2011-02-22 16:13:49 +01:00
134b85e8f8 jsc340: i114609: support passive component registration 2011-02-01 18:08:59 +01:00
91a0a53e0c Replace all occured, occurance etc. 2010-12-05 20:19:49 +00:00
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
6df63a0fa7 CWS-TOOLING: integrate CWS sdk31fix_DEV300
2009-04-03 15:43:49 +0200 jsc  r270492 : correct classpath
2009-04-02 16:27:49 +0200 jsc  r270416 : fix typo in run target and classpath
2009-04-02 16:27:14 +0200 jsc  r270415 : remove Inspector example, change docu to link into the wiki on the related project page
2009-04-01 14:07:33 +0200 jsc  r270327 : #i100723# add Uno-Type-Path to jar manifest
2009-04-01 11:57:53 +0200 jsc  r270315 : #i100723# add Uno-Type-Path to jar manifest
2009-04-01 11:47:59 +0200 jsc  r270314 : #i100723# add Uno-Type-Path to jar manifest
2009-04-01 09:33:10 +0200 jsc  r270304 : #i100723# add Uno-Type-Path to jar manifest
2009-04-01 09:30:39 +0200 jsc  r270303 : #i100723# add Uno-Type-Path to jar manifest
2009-04-01 09:29:19 +0200 jsc  r270301 : #i100712# change header image version number
2009-04-22 12:39:28 +00:00
8313cf4f21 INTEGRATION: CWS jsc21 (1.4.208); FILE MERGED
2008/02/13 13:47:27 jsc 1.4.208.1: #i72964# cleanup header guards
2008-07-11 13:32:23 +00:00
8e007a870b INTEGRATION: CWS jsc21 (1.2.208); FILE MERGED
2008/02/13 13:47:27 jsc 1.2.208.1: #i72964# cleanup header guards
2008-07-11 13:31:41 +00:00
13475862a5 INTEGRATION: CWS jsc21 (1.20.74); FILE MERGED
2008/05/23 11:49:23 jsc 1.20.74.1: #i88797# change OFFICE_TYPE_LIBRARY to URE_TYPES and OFFICE_TYPES
2008-07-11 13:31:23 +00:00
1f76e7dd36 INTEGRATION: CWS jsc17 (1.19.124); FILE MERGED
2007/01/22 15:35:33 jsc 1.19.124.1: #i73750# change UNOPKG_EXT to UNOOXT_EXT
2007-01-25 10:10:01 +00:00
c822fa8596 INTEGRATION: CWS sdkbugfix02 (1.18.10); FILE MERGED
2005/03/03 15:42:10 jsc 1.18.10.1: #41142# replace make with internal MAKE variable
2005-03-29 11:18:41 +00:00
565bd4d3bb INTEGRATION: CWS sdksample (1.3.124); FILE MERGED
2004/06/25 15:48:06 jsc 1.3.124.4: #i29308# use of new UNO features
2004/06/04 15:16:17 jsc 1.3.124.3: #i29308# prevent double includes
2004/06/04 14:36:00 jsc 1.3.124.2: #i29308# added again
2004/06/04 10:45:27 jsc 1.3.124.1: #i29308# removed
2005-01-31 16:20:52 +00:00
0153640ce3 INTEGRATION: CWS sdksample (1.1.2); FILE ADDED
2005/01/12 15:26:59 jsc 1.1.2.1: #i39890# change to new OpenDocument format
2005-01-31 16:20:01 +00:00
e4e136ce9b INTEGRATION: CWS sdksample (1.8.56); FILE MERGED
2004/08/05 15:28:42 jsc 1.8.56.3: #i29308# use System.err for error output
2004/06/25 15:48:05 jsc 1.8.56.2: #i29308# use of new UNO features
2004/06/04 10:46:12 jsc 1.8.56.1: #i29308# improved
2005-01-31 16:19:47 +00:00
8448e770f0 INTEGRATION: CWS sdksample (1.1.2); FILE ADDED
2004/06/25 15:48:04 jsc 1.1.2.4: #i29308# use of new UNO features
2004/06/04 15:16:17 jsc 1.1.2.3: #i29308# prevent double includes
2004/06/04 14:39:57 jsc 1.1.2.2: #i29308# IDL tyeps in separate files
2004/06/04 11:14:08 jsc 1.1.2.1: #i29308# new
2005-01-31 16:19:29 +00:00
1abb13c8dc INTEGRATION: CWS sdksample (1.17.4); FILE MERGED
2005/01/28 17:19:13 jsc 1.17.4.12: #i29308# prepare path for del command (windows only)
2005/01/12 15:18:00 jsc 1.17.4.11: #i39890# change to new OpenDocument format
2004/11/11 10:33:57 jsc 1.17.4.10: #i29308# adapted
2004/10/29 07:33:56 jsc 1.17.4.9: #i29308# cleanup
2004/10/27 11:34:30 jsc 1.17.4.8: #i29308# change laoding of sample documents
2004/10/22 13:05:56 jsc 1.17.4.7: #i35871# adapt for Java 5.0
2004/10/22 11:57:53 jsc 1.17.4.6: #i35871# adapt for Java 5.0
2004/10/08 13:58:46 jsc 1.17.4.5: #i29308# insert package manifest
2004/08/24 15:04:27 jsc 1.17.4.4: #i29308# use of new UNO package extension
2004/06/25 15:48:04 jsc 1.17.4.3: #i29308# use of new UNO features
2004/06/04 14:39:56 jsc 1.17.4.2: #i29308# IDL tyeps in separate files
2004/06/04 10:46:11 jsc 1.17.4.1: #i29308# improved
2005-01-31 16:18:57 +00:00
71e14f3228 INTEGRATION: CWS sdk13 (1.16.94); FILE MERGED
2004/05/05 09:31:47 jsc 1.16.94.1: #116658# merge cinnabar changes
2004-05-18 12:32:49 +00:00
dfcd4ccac4 INTEGRATION: CWS sdk08 (1.7.30); FILE MERGED
2003/10/10 16:27:04 jsc 1.7.30.2: #110287# adopt date string to US language format
2003/10/08 14:31:12 jsc 1.7.30.1: #110287# change language for date fields
2003-10-20 12:14:13 +00:00
fa004defc1 INTEGRATION: CWS sdk06 (1.15.2); FILE MERGED
2003/07/03 14:54:22 jsc 1.15.2.1: #110588# insert subst command to correct slashes for Windows < XP
2003-07-09 09:42:39 +00:00
da260165c8 INTEGRATION: CWS sdk04 (1.2.50); FILE MERGED
2003/06/24 11:22:05 jsc 1.2.50.1: #110313# insert source license header
2003-06-30 15:01:53 +00:00
883ef91586 INTEGRATION: CWS sdk04 (1.6.20); FILE MERGED
2003/06/24 11:22:04 jsc 1.6.20.1: #110313# insert source license header
2003-06-30 15:01:40 +00:00
a75dceebce INTEGRATION: CWS sdk04 (1.14.6); FILE MERGED
2003/06/24 11:22:02 jsc 1.14.6.1: #110313# insert source license header
2003-06-30 15:01:14 +00:00
6bef716cc1 INTEGRATION: CWS sdk02 (1.13.6); FILE MERGED
2003/05/14 11:46:15 jsc 1.13.6.1: #109045# insert JAVAC_FLAGS option
2003-06-10 09:48:04 +00:00
1f76c268a1 INTEGRATION: CWS uno3 (1.5.10); FILE MERGED
2003/04/17 09:51:40 jsc 1.5.10.1: #108996# remove merged cells and extend docu
2003-04-24 13:06:41 +00:00
d3dd17d971 INTEGRATION: CWS sdk01 (1.9.4.1.6); FILE MERGED
2003/04/10 11:39:29 jsc 1.9.4.1.6.2: #108799# use new naming convention for uno components
2003/03/13 09:05:30 jsc 1.9.4.1.6.1: #108153# improve usability
2003-04-17 08:52:30 +00:00
62c63d3402 MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-26 12:40:54 +00:00
d720cc6c45 #107931# synch with OOO_STABLE_1 2003-02-28 16:41:28 +00:00
3b906d275d #99053# new build env 2002-12-19 21:54:08 +00:00
f49575a860 #99053# did some improvements 2002-08-21 10:44:11 +00:00
2b27c9648f #99053# change classpath settings 2002-07-01 10:17:45 +00:00
c31e83a937 #99053# change auto deployment variable 2002-05-28 10:07:10 +00:00
8516500bf7 #99053# change CLASSPATH 2002-05-08 15:32:12 +00:00
ca9eb0a061 #87796# Introduced component context. 2001-12-13 12:23:59 +00:00
06f5dd48c6 #87796# changes for spaces in pathes 2001-10-31 10:55:29 +00:00
f1b567ea58 Corrected name for function call WORKDAY. 2001-09-24 12:31:22 +00:00
1efb6f63df #87796# change for new settings.mk 2001-09-21 14:03:05 +00:00
2e2b262e69 Added new Java example. 2001-09-18 14:13:37 +00:00