Jan Holesovsky
e849c3f54d
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/sdk
2011-03-23 17:13:49 +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
Fridrich Štrba
3e5ddcfbba
Trying to remove NODEFAULTLIB on Windows
2011-03-22 11:11:01 +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
Petr Mladek
c7eab7eed6
Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1)
2011-03-08 15:31:14 +01:00
Ivo Hinkelmann
33e2b11638
CWS-TOOLING: integrate CWS jsc340
2011-03-07 16:31:11 +01:00
Juergen Schmidt
7de486ee0f
jsc340: i114609: no visibility compiler flag for jni lib
2011-03-03 14:28:00 +01:00
Julien Nabet
3b2efb2043
Remove "using namespace ::rtl"
2011-03-02 20:36:58 +01:00
Juergen Schmidt
7551b6e26d
jsc340: i114609: move generated component services rdb
2011-03-01 14:45:39 +01:00
Juergen Schmidt
8e8fc2abfa
jsc340: i114609: adapt examples to work with the URE and use the passive registration
2011-03-01 09:48:57 +01:00
Juergen Schmidt
471c9c37fe
jsc340: i114609: adapt examples to work with the URE and use the passive registration
2011-03-01 07:41:02 +01:00
Juergen Schmidt
01f92dfffd
jsc340: i114609: adapt examples to work with the URE and use the passive registration
2011-02-28 14:10:02 +01:00
Juergen Schmidt
e89e842175
jsc340: merge to dev300m101
2011-02-24 13:34:07 +01:00
Juergen Schmidt
6a500920e5
jsc340: fix problem with showing Java awt UI from the AppKit thread
2011-02-23 14:27:55 +01:00
Juergen Schmidt
4ef76a17ee
jsc340: i114609: support passive component registration
2011-02-23 13:37:36 +01:00
Juergen Schmidt
4bd94edc87
jsc340: i114609: support passive component registration
2011-02-22 16:34:11 +01:00
Juergen Schmidt
928af9414d
jsc340: i114609: support passive component registration
2011-02-22 16:13:49 +01:00
Release Engineering
1ae1f64e64
merged DEV300
2011-02-18 11:14:19 +01:00
Ivo Hinkelmann
db44f1dde6
CWS-TOOLING: integrate CWS sb138
2011-02-16 14:37:01 +01:00
Francois Tigeot
13b487277a
dragonfly stuff
2011-02-15 12:12:28 +00:00
Rene Engelhard
e5d74728e4
fix ODK settings.mk to only set STLPORTLIB if needed
...
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2011-02-11 22:42:48 +01:00
Alfonso Eusebio
b377dcbade
Remove obsolete Hyperlink Bar from sdk
...
Removed code related to hyperlink bar from sdk repo.
2011-02-11 19:05:25 +01:00
sb
fd45011bf6
sb138: merged in re/DEV300_next towards DEV300_m100
2011-02-11 11:00:41 +01:00
Fridrich Štrba
1628005298
Trying to remove the stlport mention from the code
2011-02-09 16:20:25 +01:00
Fridrich Štrba
0d2d8ba1a2
Make stlport only optional dependency of postprocess
2011-02-09 04:32:24 +01:00
Jan Holesovsky
9b81d7d125
Merge remote branch 'origin/libreoffice-3-3'
2011-02-08 00:20:51 +01:00
bjoern.michaelsen@canonical.com
25f550ca9f
static libraries need to get linked before dynamic ones for symbol lookup
...
Signed-off-by: bjoern.michaelsen@canonical.com <Bjoern Michaelsen>
2011-02-07 18:24:18 +01:00
Thomas Arnhold
7cc670555f
Remove dead code
2011-02-07 16:06:16 +01:00
Fridrich Štrba
1efeac6ea9
std::hash -> boost::hash
2011-02-06 15:23:06 +01:00
Fridrich Štrba
639825975e
move sdk repo to boost unordered containters
2011-02-05 21:56:00 +01:00
Joseph Powers
b3e9505cc1
Remove "Visual C++, 32-bit, version 5.0" and prior version of T2TypeClassMap
...
Fridrich Strba removed this support in his patches to change the class from
a std::hash to a boost::unordered_map.
2011-02-04 06:23:55 -08:00
Joseph Powers
dc19cced03
Fix a missed ::std::hash_map to boost::unordered_map typedef
...
I also added the mac build directory to the gitignore.
2011-02-03 21:21:59 -08:00
Fridrich Strba
1c93537c2c
slist -> list
2011-02-04 03:12:16 +01:00
Mathias Bauer
45b5cd9dea
CWS gnumake3: resync to m99
2011-02-03 15:53:56 +01:00
Ingrid Halama [iha]
8650396f92
chart52: merge with DEV300_m99
2011-02-03 12:49:56 +01:00
Thomas Arnhold
c7effb5f5d
Clean up makefiles
2011-02-02 11:51:53 +01:00
Juergen Schmidt
134b85e8f8
jsc340: i114609: support passive component registration
2011-02-01 18:08:59 +01:00
Thomas Arnhold
c467f8aca1
Clean up makefiles
2011-02-01 18:00:07 +01:00
Vladimir Glazunov
e10427dc4b
CWS-TOOLING: integrate CWS dba34b
2011-02-01 11:12:15 +01:00
Juergen Schmidt
1446346432
jsc340: extend proctype check for MacOS
2011-01-27 13:33:00 +01:00
sb
c1450f1ba3
sb138: #i116038# fresh implementation of binary URP bridge
2011-01-26 09:26:59 +01:00
Caolán McNamara
0657260d6f
WaE: gcc 4.6.0 various warnings
2011-01-25 10:31:53 +00:00
David Tardon
f5c7a1e496
WaE: uninitialized const
2011-01-25 08:27:35 +01:00
David Tardon
d191369480
WaE: remove unused variable
2011-01-25 08:06:09 +01:00
David Tardon
db53325931
WaE: reference cannot be declared mutable
2011-01-25 08:04:59 +01:00
Tor Lillqvist
a59a1ab681
Include the wntmscx build directories
2011-01-24 17:42:46 +02:00
Caolán McNamara
ee5b2715cd
WaE: gcc 4.6.0 various warnings
2011-01-24 10:41:31 +00:00
