Commit graph

4438 commits

Author SHA1 Message Date
Petr Mladek
29fcc3d4eb Version 3.4.1.1, tag libreoffice-3.4.1.1 (3.4.1-rc1) 2011-06-14 16:53:27 +02:00
Petr Mladek
3d2622ff9c Version 3.4.0.1, tag libreoffice-3.4.0.1 (3.4.0-rc1) 2011-05-17 19:55:37 +02:00
Petr Mladek
c65f6b009f Version 3.3.99.5, tag libreoffice-3.3.99.5 (3.4.0-beta5) 2011-05-10 20:01:44 +02:00
Petr Mladek
1328f7e093 Version 3.3.99.4, tag libreoffice-3.3.99.4 (3.4.0-beta4) 2011-05-03 20:01:38 +02:00
Petr Mladek
a9562cfd71 Version 3.3.99.3, tag libreoffice-3.3.99.3 (3.4.0-beta3) 2011-04-26 17:09:16 +02:00
Petr Mladek
5d050fe1f7 Version 3.3.99.2, tag libreoffice-3.3.99.2 (3.4.0-beta2) 2011-04-19 18:58:54 +02:00
Fridrich Štrba
abc64a1c4a Even more OOo -> LO changes (in comments now) 2011-04-13 11:06:58 +02:00
Fridrich Štrba
2b6ad8ed59 Some more OOo -> LO changes 2011-04-13 10:59:29 +02:00
Petr Mladek
aa49d9ea56 Version 3.3.99.1, tag libreoffice-3.3.99.1 (3.4.0-beta1) 2011-04-11 17:53:05 +02:00
Petr Mladek
65a9918180 Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
	odk/settings/settings.mk
2011-04-05 19:08:20 +02:00
Petr Mladek
5639308f4b Branch libreoffice-3-4
This is 'libreoffice-3-4' - the stable branch for the 3.4.x releases

    + only bug fixes are allowed
    + no approval needed during beta phase (two weeks after branch)
    + 1 approval needed during rc phase and for bugfix releases
    + 2 approvals with different/no affiliation needed for late features
    + regularly merged into master by a selected person when living

Please watch http://wiki.documentfoundation.org/ReleasePlan
and read announces on libreoffice@lists.freedesktop.org

If you want to build something cool, unstable, and risky, use master.
2011-04-01 15:13:16 +02:00
Francisco Saito
e8d177f301 drop bogus executable flag from idl/build/src and config files 2011-03-29 21:47:37 +01:00
Francisco Saito
ded2cf7b20 drop bogus executable flag from image files 2011-03-29 21:44:51 +01:00
Fridrich Štrba
a613c9ad5b Some OOo -> LO changes (hopeful nothing broke with them) 2011-03-24 09:40:09 +01:00
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