diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:16:52 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:16:52 +0200 |
| commit | bc7a04d7fec4005b3ae81f7dc3f5002b62d279d2 (patch) | |
| tree | a7e85124431055d833e74ff2a4b4aa284a9a16ea /toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx | |
| parent | d36d42903c67d2fc1c66bb37f1e88119218357d4 (diff) | |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit 1ff6692a10dc652c305bcb490889079c14a28197 (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:27 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit 0d5aa08642520d2818e490fcf1b56fb7506b5fd1
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue Sep 14 17:21:03 2010 +0200
cjk-default-compatibility.diff: Don't expand spaces with manual breaks
i#54320
unotools/inc/unotools/compatibility.hxx | 2 +
unotools/source/config/compatibility.cxx | 40 ++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 0 deletions(-)
commit 5632c7456144b13f586a6b2a5708901768ef4e51
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue Sep 14 15:56:15 2010 +0200
fields-enable.diff: Activate fields changes
unotools/source/config/fltrcfg.cxx | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
commit 202340c5a166188adf961168816966136d907b5a
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue Sep 14 15:33:59 2010 +0200
metric-field-limits.diff: maximum values were wrong when changing unit
vcl/inc/vcl/field.hxx | 4 +++-
vcl/source/control/field.cxx | 15 +++++++++++++++
2 files changed, 18 insertions(+), 1 deletions(-)
commit e530d77937c1b21db1d0f4e7406343899c465ea3
Author: Florian Reuter <freuter@novell.com>
Date: Tue Sep 14 15:03:19 2010 +0200
svtools-svrtf-token-ignore-case.diff:
n#417814
svtools/source/svrtf/rtfkeywd.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit fe8cc3e5e63a98b863056c68f92f4bc967c7f3b9
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 14 11:47:36 2010 +0200
toolbar-decorations-vcl.diff: Improved toolbar popups.
tools/inc/tools/wintypes.hxx | 2 +
vcl/inc/vcl/brdwin.hxx | 3 +-
vcl/inc/vcl/floatwin.hxx | 3 +-
vcl/source/app/settings.cxx | 2 +-
vcl/source/window/brdwin.cxx | 46 ++++++++++++++++++++++++------
vcl/source/window/floatwin.cxx | 8 ++++-
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 6 ++-
vcl/unx/kde/salnativewidgets-kde.cxx | 9 ++++--
vcl/unx/kde4/KDESalFrame.cxx | 15 +++++----
9 files changed, 68 insertions(+), 26 deletions(-)
commit e95610564f098bfb5bb5942d8ae05290d423f28c
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 14 11:46:59 2010 +0200
toolbar-decorations-rsc.diff: Improved toolbar popups.
rsc/inc/rscdb.hxx | 1 +
rsc/inc/vclrsc.hxx | 5 +++++
rsc/source/parser/rscicpx.cxx | 1 +
rsc/source/parser/rscinit.cxx | 2 ++
4 files changed, 9 insertions(+), 0 deletions(-)
commit dfc0ee2aea3d17792513db8d12154b1d0087e585
Author: Florian Reuter <freuter@novell.com>
Date: Tue Sep 14 11:34:48 2010 +0200
vcl-bitmap2-negative-height.diff: Load bitmaps even when height is negative
n#228839
vcl/source/gdi/bitmap2.cxx | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
commit 79ceee2d88d777bf4872ca4b9f4a669b0dab9530
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 14 11:25:20 2010 +0200
vcl-better-fallback.diff: Try all when some of the plugins are not available
i#50857
vcl/unx/source/plugadapt/salplug.cxx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
commit 09078e71ad7b0f271fe39cd4a53528fbf8fecaff
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Tue Sep 14 13:27:42 2010 +0200
accept-underscores-in-hostnames.diff: Accept underscores in hostnames
n#182422
tools/source/fsys/urlobj.cxx | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
commit 194ef7b36700ebd9200c3be6746407743ab0f2c5
Author: Thorsten Behrens <tbehrens@novell.com>
Date: Tue Sep 14 13:12:18 2010 +0200
win32-vs2005-compat.diff: Fix build with Visual Studio 2005
vos/inc/vos/object.hxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 2c6930268e023ab0d74543168d754701fcce8112
Author: Thorsten Behrens <tbehrens@novell.com>
Date: Tue Sep 14 12:58:20 2010 +0200
win32-force-version-fix.diff: force WINVER when using non-std win api
canvas/source/cairo/cairo_win32_cairo.cxx | 2 ++
i18npool/source/isolang/inwnt.cxx | 2 ++
vcl/win/source/gdi/salprn.cxx | 2 ++
3 files changed, 6 insertions(+), 0 deletions(-)
commit b3593ab95757d5caee760d9dcc6faae2f593627b
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Tue Sep 14 12:10:19 2010 +0200
win32-dxsdk-200908.diff: Build also against DirectX SDK August 2009.
canvas/source/directx/dx_winstuff.hxx | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
commit 193232ca21162235981610c9af88e635e404f76d
Author: Amelia Wang <amwang@novell.com>
Date: Mon Sep 13 14:45:00 2010 +0200
cjk-character-units-fix-376788.diff: add a new character unit
i#376788
svtools/source/control/ruler.cxx | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
commit 9ff34bff63efe1d3f034feaec59d7e9ee5adf83b
Author: Amelia Wang <amwang@novell.com>
Date: Mon Sep 13 14:42:43 2010 +0200
cjk-character-units-rulers-sync-with-pggrid-fix.diff:
svtools/inc/ruler.hxx | 2 ++
svtools/source/control/ruler.cxx | 12 ++++++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
commit 80c912a380b819bc994e31b62ef81b4b0309bb17
Author: Amelia Wang <amwang@novell.com>
Date: Mon Sep 13 14:40:57 2010 +0200
cjk-character-units-ui.diff: add a new unit 'character unit'
rsc/inc/vclrsc.hxx | 2 +-
rsc/source/parser/rscibas.cxx | 3 +++
svl/inc/svl/poolitem.hxx | 2 +-
svtools/source/control/ruler.cxx | 8 ++++++--
tools/inc/tools/fldunit.hxx | 2 +-
vcl/source/control/field.cxx | 34 +++++++++++++++++++++-------------
vcl/source/src/units.src | 3 +++
7 files changed, 36 insertions(+), 18 deletions(-)
commit 6c0d47b27adc0e5f23dae84ef954b56636a68cb5
Author: Amelia Wang <amwang@novell.com>
Date: Mon Sep 13 14:37:51 2010 +0200
cjk-character-units-imp.diff: add a new unit 'character unit'
svtools/inc/ruler.hxx | 7 ++++++
svtools/source/control/ruler.cxx | 42 +++++++++++++++++++++++++++++++++++--
svtools/source/misc/unitconv.cxx | 3 ++
3 files changed, 49 insertions(+), 3 deletions(-)
commit 7f328a480a4522e45cbb5209136254dd80fdab4f
Merge: 1b9832b 4bf68ac
Author: Jan Holesovsky <kendy@suse.cz>
Date: Wed Sep 8 11:34:12 2010 +0200
Merge commit 'ooo/OOO330_m7'
commit 1b9832bae32bd13cbb94383c5937cd8a9a0192c3
Merge: eaeb786 06d2710
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 7 09:33:08 2010 +0200
Merge commit 'ooo/OOO330_m6'
commit 4bf68acd0615ec6b49945753104831bee9366df0 (tag: refs/tags/ooo/OOO330_m7)
Merge: 1f6f539 b0ffb9a
Author: Kurt Zenker <kz@openoffice.org>
Date: Fri Sep 3 14:39:55 2010 +0200
CWS-TOOLING: integrate CWS fs33a
commit b0ffb9a5006331750d8997020061f104ab7fb10c
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Fri Sep 3 14:50:14 2010 +0200
fs33a: revert the original fix for HideInactiveSelection support in the tree list box, causing too much regressions. Fix it by using SetWindowBits instead of SetStyle
svtools/source/contnr/svtreebx.cxx | 14 --------------
svtools/source/uno/treecontrolpeer.cxx | 6 +++---
2 files changed, 3 insertions(+), 17 deletions(-)
commit de2b714c3af13c57358fe3a1f38d1e5ad7a164e8
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Wed Sep 1 12:27:38 2010 +0200
fs33a: +i114247# sync WindowBits and Style
svtools/source/contnr/svtreebx.cxx | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
commit 1f6f539f3fa9add2db31059479f34409c7343628
Merge: 6a6bf7a 65913d3
Author: Kurt Zenker <kz@openoffice.org>
Date: Tue Aug 31 15:10:03 2010 +0200
CWS-TOOLING: integrate CWS impress197
commit 6a6bf7a0befd6216e847e557ceb80aec6639d15b
Author: Kurt Zenker <kz@openoffice.org>
Date: Tue Aug 31 12:21:23 2010 +0200
masterfix: #i114215# builderror in canvas/source/vcl fixed
canvas/source/vcl/canvashelper_texturefill.cxx | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit d4f79cfa71f641845ef3c0f51a47f4d1d9953ead
Author: Kurt Zenker <kz@openoffice.org>
Date: Mon Aug 30 20:20:51 2010 +0200
masterfix: #i114025# WaE fixes
vcl/source/gdi/gdimtf.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 06d271053f9a8bb44e209f0c1569f181fe838a41 (tag: refs/tags/ooo/OOO330_m6)
Author: obo <obo@openoffice.org>
Date: Fri Aug 27 11:31:33 2010 +0200
masterfix OOO330: #i10000# unknown -B option for Python (Windows)
l10ntools/scripts/xhtex | 9 ++++++++-
l10ntools/scripts/xtxex | 8 ++++++++
2 files changed, 16 insertions(+), 1 deletions(-)
commit 8ee844e7949ab8fa8b98b20b16b59c1fd87f4539
Merge: 0d77427 52cc37f
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu Aug 26 13:20:55 2010 +0200
CWS-TOOLING: integrate CWS ooo33gsl07
commit 0d77427a63dd2c4cec551a26a8e1039bcf9daaa2
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu Aug 26 13:17:12 2010 +0200
masterfix: #i10000# modify extract date and dummy fields for string database
l10ntools/java/jpropex/java/JPropEx.java | 7 +++++--
l10ntools/scripts/tool/sdf.py | 9 +++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
commit 24d67300bfbfb9e0b21d7fe9661203bee5486a0a
Merge: 7dead72 ad3a06b
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu Aug 26 13:07:19 2010 +0200
CWS-TOOLING: integrate CWS fwk152
commit 7dead7277caad9323d8ca703ec58f356ae20e0fd
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 19:09:27 2010 +0200
#i10000# set dummy fields to 0 for string DB
l10ntools/scripts/tool/sdf.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit b7b56d2ab9270e70a04c68cae8f048831c00579d
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 16:36:33 2010 +0200
#i10000# removed obsolete switch
l10ntools/scripts/localize.pl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 05e0725b9617c3bb1cb03f0df0141db4c4c2f16c
Merge: fc52053 e2060d4
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Wed Aug 25 16:07:39 2010 +0200
fs33a: merge after pulling OOO330.m5's changes
commit 9d61d166812c88dae5f6ecf953f6a6e543d8f734
Merge: c1d27f1 f92fa87
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 14:42:57 2010 +0200
CWS-TOOLING: integrate CWS ext004
commit c1d27f1fad023c97dea944edb147b47d5297d6dd
Merge: 7141fb6 cddb741
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 14:29:06 2010 +0200
CWS-TOOLING: integrate CWS ooo33gsl06
commit 7141fb62d8d2f1a682d160d48764527fbda263fe
Merge: 4c6e315 148e515
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 14:19:19 2010 +0200
CWS-TOOLING: integrate CWS sw33bf08
commit 4c6e3156a6d04b7d44ca56b57dc9d74b38bf2b7b
Merge: e2060d4 121b879
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 12:49:35 2010 +0200
CWS-TOOLING: integrate CWS mib18
commit 52cc37ff83da8356c6d3f65b9d04e015c1e55d6c
Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
Date: Tue Aug 24 14:49:48 2010 +0200
ooo33gsl07: #i110881# fix fullscreen mode with compiz and metacity ... again
vcl/unx/gtk/window/gtkframe.cxx | 64 +++++++++++++++++++++++++--------
vcl/unx/inc/plugins/gtk/gtkframe.hxx | 4 ++
2 files changed, 52 insertions(+), 16 deletions(-)
commit ec404a1834a06a0b066a384d40944efecd667421
Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
Date: Mon Aug 23 16:32:34 2010 +0200
ooo33gsl07: #i113253# use paper bin from user setup when appropriate
vcl/source/gdi/print3.cxx | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
commit fc52053c256f492bc92886c140a17b7a6635b043
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Mon Aug 23 15:18:37 2010 +0200
fs33a: expose the WB_HIDESELECTION but of the tree control at its UNO API
svtools/inc/svtools/svtreebx.hxx | 1 +
svtools/source/contnr/svtreebx.cxx | 9 +++++++++
svtools/source/uno/treecontrolpeer.cxx | 18 ++++++++++++++++++
toolkit/source/controls/tree/treecontrol.cxx | 1 +
4 files changed, 29 insertions(+), 0 deletions(-)
commit 75afc968ed3ae41a2d8a9ea996cbff75fdf9a68c
Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
Date: Mon Aug 23 14:38:35 2010 +0200
ooo33gsl07: #i110881# workaround compiz (mwm hints should have no effect whatsoever on fullscreen)
vcl/unx/source/app/wmadaptor.cxx | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
commit b1de5dcd138d4c1892f24eed96faf4e8bdce9635
Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
Date: Fri Aug 20 19:47:14 2010 +0200
ooo33gsl07: #i113898# catch a NULL ptr
vcl/unx/gtk/a11y/atkutil.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit f92fa871502a8adc1345ff6cdc8e42f9588ea4de
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Fri Aug 20 16:30:57 2010 +0200
ext004: just copy en-US file without modifications
l10ntools/scripts/tool/xtxex.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit e2060d42d0267729888d68448e668a7f9df83c3b
Author: Release Engineering <releng@openoffice.org>
Date: Fri Aug 20 13:13:16 2010 +0200
#i10000# supress bytecode generation
l10ntools/scripts/xhtex | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit d6559d76b04c867fba04c1399fa746dff23b2f18
Author: Release Engineering <releng@openoffice.org>
Date: Fri Aug 20 13:12:52 2010 +0200
#i10000# supress bytecode generation
l10ntools/scripts/xtxex | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 874476f2c3865a51561c40d9612ae60baf09fa9f
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Thu Aug 19 17:46:08 2010 +0200
fs33a: #i113988# properly retrieve standard images
svtools/source/graphic/provider.cxx | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
commit cddb741a6e756148bf1a6641aaa63b51d0ff7b55
Merge: d0fa316 d551942
Author: Herbert Duerr [hdu] <duerr@sun.com>
Date: Thu Aug 19 14:31:35 2010 +0200
fast-forward merging of heads
commit d551942e83dc6d401208445e50fa9fedfe6ee2d9
Author: Christian Lippka <christian.lippka@sun.com>
Date: Wed Aug 18 17:59:09 2010 +0200
#i113857# disable right mouse button to trigger a range selection
vcl/source/window/seleng.cxx | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
commit 5eb8c5eee80e82dcf8e7369463940ecab8d2d6c3 (tag: refs/tags/ooo/OOO330_m5)
Merge: 3f59a6a 6c56d7b
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 16:59:10 2010 +0200
CWS-TOOLING: integrate CWS txtl10n
commit 3f59a6af5940320b20e7ba86de74c75aaa379f72
Merge: e2ac629 e3e2a2c
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 14:15:04 2010 +0200
CWS-TOOLING: integrate CWS graphite04
commit e2ac629a815044ecb7f5e53dab5436c9792c6a6a
Merge: 92d15b0 44417ff
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 13:23:34 2010 +0200
CWS-TOOLING: integrate CWS ooo33gsl05
commit 92d15b0246d60a89a84970557cb04db98d2436c2
Merge: 0b1999e cc4d2e8
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 12:43:13 2010 +0200
CWS-TOOLING: integrate CWS mav56
commit 0b1999e55938fc466d6ab8c543857629273fad7c
Merge: c8dc8eb 8fc80ea
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 12:39:06 2010 +0200
CWS-TOOLING: integrate CWS fwk151
commit c8dc8eb8f62944c76f0c0ad9a5e7fba432742e94
Merge: d0fa316 bb902b6
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 12:00:05 2010 +0200
CWS-TOOLING: integrate CWS jl154
commit 148e51518f3876d02987548b1a5a53fd62808225
Author: Thomas Lange [tl] <tl@openoffice.org>
Date: Tue Aug 17 16:46:36 2010 +0200
cws sw33bf08: #i113584#, #i113587# transliteration fixed
.../source/transliteration/transliterationImpl.cxx | 1 -
.../transliteration/transliteration_body.cxx | 275 +++++++++-----------
2 files changed, 117 insertions(+), 159 deletions(-)
commit 6a421e2af3e030074ac25e29dd14e491e3aac21b
Merge: e95d209 d0fa316
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Fri Aug 13 12:04:35 2010 +0200
fs33a: merge after pulling OOO330.m4's change sets
commit 121b87931236e1f71623ad39f8edf9c88775fa77
Merge: c0d5723 d0fa316
Author: Daniel Rentz <dr@openoffice.org>
Date: Fri Aug 13 11:29:46 2010 +0200
mib18: rebase to OOO330m4
commit 44417ffdf0f2380173eea808d00cafa047b9ecdc
Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
Date: Fri Aug 13 11:25:17 2010 +0200
ooo33gsl05: fix a typo
vcl/inc/vcl/gdimtf.hxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit ce185aaab5a56e3fd00c0065e16dd79de5bc8abd
Author: Herbert Duerr [hdu] <duerr@sun.com>
Date: Fri Aug 13 09:07:29 2010 +0200
#i113776# avoid default adaptive subdivision for now
basegfx/source/polygon/b2dtrapezoid.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit bb902b67cf279b8b185200a9d83d7ba160ebfffb
Merge: 235a440 fff4be8
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date: Fri Aug 13 07:28:35 2010 +0200
jl154: Local merge
commit ad0a5ff9fa25c1f14677e92d6897c4301aac14c1
Merge: 4a1daa7 d0fa316
Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
Date: Thu Aug 12 16:23:40 2010 +0200
merge with OOO330m4
commit 4a1daa71ee512b8f2b4624c9a680f681d34317f5
Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
Date: Thu Aug 12 16:01:40 2010 +0200
ooo33gsl05: #i113025# fix GDIMetaFile handlng of MapMode MAP_PIXEL
vcl/inc/vcl/gdimtf.hxx | 2 +
vcl/source/gdi/gdimtf.cxx | 45 +++++++++++++++++++++++++++++++++++++++++++-
vcl/source/gdi/metaact.cxx | 2 +-
vcl/source/gdi/print3.cxx | 6 ++--
4 files changed, 50 insertions(+), 5 deletions(-)
commit 3cef44dceef901fee54734075d78165a8c88113c
Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
Date: Thu Aug 12 13:32:56 2010 +0200
ooo33gsl05: #i113821# ensure last page renders when aborting job
vcl/inc/vcl/print.hxx | 1 +
vcl/source/gdi/print3.cxx | 32 +++++++++++++++++++++++---------
2 files changed, 24 insertions(+), 9 deletions(-)
commit 881771a0b46600ce7fc537f8697e17d5187cc04c
Merge: 590cbc8 a728239
Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
Date: Thu Aug 12 13:10:39 2010 +0200
merge with ooo33gsl04
commit fff4be8b2ea3f89b77d65e8cb13389ff4466980a
Merge: 590cbc8 235a440
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date: Wed Aug 11 08:57:13 2010 +0200
jl154: Local merge
commit e95d2093942bd783336c08249f0cc8ebd29bdb2b
Merge: 67ceba0 590cbc8
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Tue Aug 10 14:53:21 2010 +0200
merging in latest changes from OOO330(m3)
commit 67ceba07198128db6b42cdfd3a8c878a2af4fdee
Merge: 19e6551 a90fcce
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Tue Aug 10 14:21:53 2010 +0200
merging in latest changes from CWS unoawt2
commit cc4d2e80d521077ccd0fb730a89f812b570d2fe6
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Tue Aug 10 11:05:20 2010 +0200
mav56: #163253# tread invalid path segments correctly
comphelper/inc/comphelper/storagehelper.hxx | 2 +
comphelper/source/misc/storagehelper.cxx | 31 +++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 0 deletions(-)
commit 65913d33daa99c701d289698201ba7884d475748
Author: sj <sj@openoffice.org>
Date: Mon Aug 9 14:11:58 2010 +0200
impress197: #163250# fixed string handling, improved polygon splitting
tools/source/generic/poly.cxx | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
commit e3e2a2ca3ed94c8088a2102c7b44ea5ef22d1d53
Author: Herbert Duerr [hdu] <duerr@sun.com>
Date: Mon Aug 9 12:27:56 2010 +0200
#i113731# fix compile warning on an pre-4.0-release gcc version
vcl/source/glyphs/graphite_layout.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit ad3a06b88f0256ed3ed270074132ba51956d95f5
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Mon Aug 9 10:47:38 2010 +0200
fwk152: #i108004# check the URLs correctly
unotools/inc/unotools/ucbhelper.hxx | 1 +
unotools/source/ucbhelper/ucbhelper.cxx | 49 +++++++++++++++++++++++++++++++
2 files changed, 50 insertions(+), 0 deletions(-)
commit c0d572366b519adde7e105174cec1944b243ba00
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Wed Aug 4 12:21:22 2010 +0200
mib18: #163185# avoid crash when document is closed and a modal dialog is active
toolkit/source/awt/vclxwindows.cxx | 10 +++++++++-
toolkit/source/helper/unowrapper.cxx | 15 ++++++++++-----
2 files changed, 19 insertions(+), 6 deletions(-)
commit 4da3b8789f65c01ee8b1aa610e6d7fe372e983b7
Author: Michael Stahl <mst@openoffice.org>
Date: Tue Aug 3 18:06:21 2010 +0200
sw33bf08: #i113623#: stgio.cxx: fix operator delete mismatch
sot/source/sdstor/stgio.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 235a4402d956c52a2f8e8f6bed82ab7eff9170fe
Merge: 977745f c3e26f8
Author: Joachim Lingner <jl@openoffice.org>
Date: Mon Aug 2 15:39:29 2010 +0200
jl154 merging with OOO330m2
commit 866fd517608220b892d215d12f1ea28e0a2f8ebc
Author: Herbert Duerr [hdu] <duerr@sun.com>
Date: Mon Aug 2 09:02:35 2010 +0200
#i113563# fix compile with system-graphite (thanks cmc)
vcl/source/glyphs/graphite_layout.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit da5fd52c6a206565fd671a5e0e03511b1519c926
Author: Herbert Duerr [hdu] <duerr@sun.com>
Date: Wed Jul 28 14:49:14 2010 +0200
#i113301# avoid problems with hyphenation within graphite ligature (thanks kstribley)
vcl/source/glyphs/graphite_layout.cxx | 67 +++++++++++++++++++++++++++-----
vcl/win/source/gdi/winlayout.cxx | 5 ++
2 files changed, 61 insertions(+), 11 deletions(-)
commit 8fc80ea840ec20632b3055ab72350b7bff6a3fde
Author: Carsten Driesner <cd@openoffice.org>
Date: Tue Jul 27 18:11:00 2010 +0200
fwk151: Fixed problems that configuration changes notifications were not correctly sent/processed
unotools/inc/unotools/configpathes.hxx | 6 +++++-
unotools/source/config/configpathes.cxx | 11 ++++++++---
2 files changed, 13 insertions(+), 4 deletions(-)
commit 2f0d8a0ab77dca9d133dd30d7aa197f9fd023eae
Merge: 0df00c1 c3e26f8
Author: Daniel Rentz <dr@openoffice.org>
Date: Tue Jul 27 18:05:46 2010 +0200
mib17: rebase to OOO330_m2
commit 0df00c17e14d1e01dbb483fa330591ba8c3a3229
Merge: 6e44518 476fcc6
Author: Daniel Rentz <dr@openoffice.org>
Date: Tue Jul 27 17:12:01 2010 +0200
mib17: rebase to DEV300_m84
commit 6c56d7b2470c3a0e3e1ce65d0608369c493e0f4b
Merge: aed54d0 c3e26f8
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue Jul 27 16:50:00 2010 +0200
merged OOO330 m2
commit aed54d08061d13bf20c60e024dddc8692576706a
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu Jul 22 17:53:11 2010 +0200
txtl10n: cleanup / remove all -QQ and quiet parts
l10ntools/inc/lngmerge.hxx | 2 +-
l10ntools/source/cfglex.l | 1 -
l10ntools/source/cfgmerge.cxx | 9 ---------
l10ntools/source/export.cxx | 11 -----------
l10ntools/source/helpex.cxx | 8 +-------
l10ntools/source/lngex.cxx | 10 +---------
l10ntools/source/lngmerge.cxx | 5 ++---
l10ntools/source/localize.cxx | 38 +++++++++-----------------------------
l10ntools/source/xrmmerge.cxx | 9 ---------
9 files changed, 14 insertions(+), 79 deletions(-)
commit 57fecfc6087e45bebe215610dc428c8b2df42ddb
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu Jul 22 17:13:19 2010 +0200
txtl10n: #i113008# #i113125# cleanup / removed unused lines
l10ntools/scripts/xhtex | 8 --------
l10ntools/scripts/xtxex | 8 --------
2 files changed, 0 insertions(+), 16 deletions(-)
commit a981050e5d79f9544115feb8d4d2803630ebb954
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu Jul 22 15:13:04 2010 +0200
txtl10n: removed obsolete dir
transex3/java/jpropex/build.xml | 169 ---------
transex3/java/jpropex/java/JPropEx.java | 400 ----------------------
transex3/java/jpropex/java/Main.java | 38 --
transex3/java/jpropex/java/NoLocalizeFilter.java | 55 ---
transex3/java/jpropex/java/OrderedHashMap.java | 96 ------
transex3/java/jpropex/java/SdfData.java | 108 ------
transex3/java/jpropex/java/SdfEntity.java | 254 --------------
transex3/java/jpropex/jpropex | 10 -
transex3/java/jpropex/jpropex.MF | 1 -
transex3/java/jpropex/makefile.mk | 36 --
10 files changed, 0 insertions(+), 1167 deletions(-)
commit b790123f00389348a627d0720c62489fbe9deacc
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu Jul 22 09:48:43 2010 +0200
txtl10n: #i113008# #i113125# don't die by empty sdf file
l10ntools/java/jpropex/java/SdfEntity.java | 39 ++++++++++++---------------
1 files changed, 17 insertions(+), 22 deletions(-)
commit 52488dc18e74dbcb2007d9beb362a81b1ed95aea
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Jul 21 19:07:24 2010 +0200
txtl10n: #i113008# #i113125# don't die by empty sdf file
l10ntools/java/jpropex/java/SdfEntity.java | 41 ++++++++++++++++-----------
1 files changed, 24 insertions(+), 17 deletions(-)
commit 2b8063c2d254a5bc479cfb5977524c5ec6ae386c
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue Jul 20 13:11:02 2010 +0200
txtl10n: #i113008# #i113125# rename .xht to .tree
l10ntools/source/localize.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 977745fd68d0af57f5e952fab5ab2ac97bc299b5
Merge: 5cffce3 ae63ab3
Author: Joachim Lingner <jl@openoffice.org>
Date: Fri Jul 16 15:45:18 2010 +0200
jl154 merging with OOO300_m1
commit f1f79409592755ff1d128b1e524531a385c37d82
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Jul 14 17:46:14 2010 +0200
txtl10n: #i113008# #i113125# skip on empty string
l10ntools/scripts/tool/xtxex.py | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
commit d3bf2074b6592f951b0ee0d2f9e0025ea3796cf6
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Jul 14 17:39:22 2010 +0200
txtl10n: #i113008# #i113125# skip on empty string
l10ntools/scripts/tool/xhtex.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
commit b421b9f1273771be01b8f3e2f68c4fbb45dbab1d
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Jul 14 17:08:59 2010 +0200
txtl10n: #i113008# #i113125# cleanup
l10ntools/scripts/tool/pseudo.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit ea8f71e491b9c9952660c2cf17ae23c301c85461
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Jul 14 17:06:23 2010 +0200
txtl10n: #i113008# #i113125# cleanup
l10ntools/scripts/tool/l10ntool.py | 3 +--
l10ntools/scripts/tool/xhtex.py | 8 ++++----
l10ntools/scripts/tool/xtxex.py | 8 ++++----
3 files changed, 9 insertions(+), 10 deletions(-)
commit cf25bd558226fdbb189c522d91baa779bed4e307
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Jul 14 17:00:39 2010 +0200
txtl10n: #i113008# #i113125# Python 2.3.x compatible
l10ntools/prj/d.lst | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 6b719dd847ae6ac148f2f20f56d4bffaf5a6dd86
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Jul 14 16:59:49 2010 +0200
txtl10n: #i113008# #i113125# Python 2.3.x compatible
l10ntools/scripts/tool/l10ntool.py | 20 +++-
l10ntools/scripts/tool/pseudo.py | 184 ++++++++++++++++++++++++++++++++++++
l10ntools/scripts/tool/sdf.py | 65 +------------
l10ntools/scripts/tool/xhtex.py | 1 +
4 files changed, 202 insertions(+), 68 deletions(-)
commit 4455cba6763a7502c29b0766d81852adc9a5fc88
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue Jul 13 18:00:06 2010 +0200
txtl10n: #i113008# #i113125# Support of help tree files and single txt files in the L10N process
l10ntools/scripts/const.py | 39 -------
l10ntools/scripts/l10ntool.py | 188 --------------------------------
l10ntools/scripts/sdf.py | 238 -----------------------------------------
l10ntools/scripts/xhtex | 47 ++++++++
l10ntools/scripts/xtxex.py | 107 ------------------
5 files changed, 47 insertions(+), 572 deletions(-)
commit e50721477707032c3e647b9ce5c536e014f2e253
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue Jul 13 17:58:25 2010 +0200
txtl10n: #i113008# #i113125# Support of help tree files and single txt files in the L10N process
l10ntools/scripts/tool/const.py | 39 ++++++
l10ntools/scripts/tool/l10ntool.py | 204 ++++++++++++++++++++++++++++++++
l10ntools/scripts/tool/sdf.py | 224 ++++++++++++++++++++++++++++++++++++
l10ntools/scripts/tool/xhtex.py | 133 +++++++++++++++++++++
l10ntools/scripts/tool/xtxex.py | 89 ++++++++++++++
5 files changed, 689 insertions(+), 0 deletions(-)
commit 1211f7ca6c60882421e02f9489c9b4e7d706a44c
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue Jul 13 17:56:32 2010 +0200
txtl10n: #i113008# #i113125# Support of help tree files and single txt files in the L10N process
l10ntools/prj/d.lst | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
commit e3c277fb2371dda6c5defa931d54275767e96a7a
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue Jul 13 17:42:44 2010 +0200
txtl10n: #113125# Support of help tree files in the L10N process
l10ntools/source/localize.cxx | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
commit 7aa4356766adb50238c1a0f626abeec888c4cd83
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Mon Jul 12 15:31:50 2010 +0200
txtl10n: #i113008# add support for xtx files (single text files)
l10ntools/scripts/l10ntool.py | 4 ++--
l10ntools/scripts/sdf.py | 2 --
l10ntools/scripts/xtxex.py | 29 ++++++++++++++++++++++-------
3 files changed, 24 insertions(+), 11 deletions(-)
commit dcc8cf442b3a1a7dd324369973bcdf6545ecd7f1
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Jul 7 15:36:02 2010 +0200
l10ntxt: #i113008# add support for xtx files (single text files)
l10ntools/prj/d.lst | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
commit 070c78d5022a960d001f5d9c76edcd7eec4ce334
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Jul 7 15:35:17 2010 +0200
l10ntxt: #i113008# add support for xtx files (single text files)
l10ntools/scripts/const.py | 39 +++++++
l10ntools/scripts/l10ntool.py | 188 ++++++++++++++++++++++++++++++++
l10ntools/scripts/sdf.py | 240 +++++++++++++++++++++++++++++++++++++++++
l10ntools/scripts/xtxex | 47 ++++++++
l10ntools/scripts/xtxex.py | 92 ++++++++++++++++
5 files changed, 606 insertions(+), 0 deletions(-)
commit 2a17cfbbea42287dda8161db3e21efd5537afda9
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Jul 7 15:30:32 2010 +0200
txtl10n: remove some noisy output / code cleanup
l10ntools/source/cfglex.l | 16 +---------------
l10ntools/source/cfgmerge.cxx | 6 ++----
l10ntools/source/export.cxx | 1 -
l10ntools/source/helpmerge.cxx | 11 -----------
l10ntools/source/lngex.cxx | 10 ----------
l10ntools/source/srclex.l | 6 ------
l10ntools/source/xrmlex.l | 5 -----
l10ntools/source/xrmmerge.cxx | 2 --
8 files changed, 3 insertions(+), 54 deletions(-)
commit 2860220263e5eaa63f1652b66e3e9146d1d64185
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Jul 7 15:29:56 2010 +0200
txtl10n: #i113008# add support for xtx files
l10ntools/source/localize.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 19e65515b76e2eb7795dda8a6e0c36b17f5e6b86
Merge: dfa29f1 8d265da
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Tue Jul 6 15:24:32 2010 +0200
Automated merge with ssh://hg@hg.services.openoffice.org/cws/unoawt2
commit a90fcced2402207e54ceda937736e094d2e67734
Author: Ocke Janssen [oj] <Ocke.Janssen@sun.com>
Date: Thu Jul 1 15:52:47 2010 +0200
unoawt2: do not inline methods of exported classes
toolkit/inc/toolkit/controls/unocontrols.hxx | 16 ++++++++++++----
toolkit/source/controls/unocontrols.cxx | 18 ++++++++++++++++++
2 files changed, 30 insertions(+), 4 deletions(-)
commit 5cffce31910b85b6938275193ff9165fb8f944d0
Author: sb <sb@openoffice.org>
Date: Thu Jul 1 13:01:22 2010 +0200
jl154: #i112673# ensure that client-facing PID remains the same across internal OOo restart on Mac OS X
comphelper/source/misc/officerestartmanager.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 573f844a558e1d14102c7dcf00668737e82e85fb
Author: Ocke Janssen [oj] <Ocke.Janssen@sun.com>
Date: Thu Jul 1 11:50:54 2010 +0200
unoawt2: add XItemList to combobox as well, the sma eas for listbox
toolkit/inc/toolkit/awt/vclxwindows.hxx | 24 ++--
toolkit/inc/toolkit/controls/unocontrols.hxx | 41 ++++-
toolkit/source/awt/vclxwindows.cxx | 128 +++++++++++++---
toolkit/source/controls/unocontrols.cxx | 209 ++++++++++++++++++++++----
4 files changed, 331 insertions(+), 71 deletions(-)
commit c2fe85a25059e99e02c5e54cf1fe4c09041cd9b3
Author: Ocke Janssen [oj] <Ocke.Janssen@sun.com>
Date: Thu Jul 1 11:46:35 2010 +0200
unoawt2: add missing GetEntryImage, same as listbox
vcl/inc/vcl/combobox.hxx | 1 +
vcl/source/control/combobox.cxx | 8 ++++++++
2 files changed, 9 insertions(+), 0 deletions(-)
commit 11c334fc51976347b71226f202c2d1201cdded97
Merge: d3021db 476fcc6
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jun 30 17:12:59 2010 +0200
jl154 merge with DEV300_m84
commit 8d265da55b6df02eed18a7c2eceec0094c2e8f87
Merge: c9bb3e5 4a52d01
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Sun Jun 20 00:48:29 2010 +0200
Automated merge with ssh://hg@hg.services.openoffice.org/cws/unoawt2
commit 6e44518b3394218d9415833349c1d0801fe76c5e
Merge: d0da065 b5b4748
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Fri Jun 18 14:32:18 2010 +0200
rebase to m83
commit 4a52d01c262a2c5c0f340b60263bb56574d3e125
Merge: a96adff 86da1c9
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Thu Jun 17 23:37:32 2010 +0200
fs33a: merged CWS unoawt2, implicit rebase to m83
commit a96adff9b7381a5df558f948f49acfd7570b93ce
Merge: f8df342 1b4b349
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Thu Jun 17 11:47:25 2010 +0200
fs33a: merge after pulling latest changes from DEV300 (m81)
commit f8df342df34322c089f504925fe1527143f6b2a3
Merge: 5920212 73c74cf
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Wed Jun 16 15:55:22 2010 +0200
Automated merge with ssh://hg@hg.services.openoffice.org/cws/fs33a
commit 73c74cf29420448e0b68634e45f2e3b19019fdf0
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Wed Jun 16 14:30:30 2010 +0200
fs33a: fixed VCLXFixedText::calcAdjustedSize to respect the given size
toolkit/source/awt/vclxwindows.cxx | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
commit 5920212c7e74cf50089974e1ded7f87757387720
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Wed Jun 16 09:53:37 2010 +0200
fs33a: fixed supportsService
toolkit/source/controls/unocontrol.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit bad03a3adc15827cf7879c30f7d97d906bcb2b47
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Sun May 2 13:19:38 2010 +0200
fs33a: compile errors on unxlngi6.pro / unxmacxi.pro
toolkit/source/awt/vclxwindows.cxx | 2 +-
toolkit/source/controls/unocontrols.cxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
commit 41bf2eaaae12bdf7ee318599a7c34a751b7b7f07
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Thu Apr 29 15:29:46 2010 +0200
fs33a: #i111238# [s|g]etUserData -> [s|g]etItemData
toolkit/inc/toolkit/controls/unocontrols.hxx | 4 ++--
toolkit/source/controls/unocontrols.cxx | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
commit cf2b1f10c0e7bbd9db8fe1b265a614ebb8b983ff
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Thu Apr 29 14:10:03 2010 +0200
fs33a: #i111238# now with UserData support
toolkit/inc/toolkit/controls/unocontrols.hxx | 2 +
toolkit/source/controls/unocontrols.cxx | 84 ++++++++++++++++++++------
2 files changed, 67 insertions(+), 19 deletions(-)
commit 57e2a2c59a923fbf6efaeb17adec076a7264e33d
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Thu Apr 29 10:05:04 2010 +0200
fs33a: #i111238# add support for images to AWT's ListBoxControl/Model
toolkit/inc/toolkit/awt/vclxwindows.hxx | 31 +-
toolkit/inc/toolkit/controls/roadmapcontrol.hxx | 6 -
toolkit/inc/toolkit/controls/unocontrol.hxx | 2 +-
toolkit/inc/toolkit/controls/unocontrolmodel.hxx | 1 -
toolkit/inc/toolkit/controls/unocontrols.hxx | 123 ++++--
toolkit/source/awt/vclxwindows.cxx | 136 +++++-
toolkit/source/controls/unocontrolmodel.cxx | 21 +-
toolkit/source/controls/unocontrols.cxx | 558 ++++++++++++++++++++--
vcl/inc/vcl/lstbox.hxx | 1 +
vcl/source/control/lstbox.cxx | 9 +
10 files changed, 759 insertions(+), 129 deletions(-)
Notes
split repo tag: libs-gui_OOO_BUILD_3_2_98_1
Diffstat (limited to 'toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx')
| -rw-r--r-- | toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx b/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx index c84a6e54d73b..585af217d5a7 100644 --- a/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx +++ b/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,17 +34,17 @@ // Helper class with Mutex and BroadcastHelper, because they must be // initialized before calling the OPropertySetHelper-CTOR -class MutexAndBroadcastHelper +class MutexAndBroadcastHelper { public: MutexAndBroadcastHelper() : BrdcstHelper( Mutex ) {} - - ::osl::Mutex Mutex; - ::cppu::OBroadcastHelper BrdcstHelper; - - ::osl::Mutex& GetMutex() { return Mutex; } - + + ::osl::Mutex Mutex; + ::cppu::OBroadcastHelper BrdcstHelper; + + ::osl::Mutex& GetMutex() { return Mutex; } + }; @@ -52,6 +52,6 @@ public: -#endif // _TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX +#endif // _TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX |