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 /i18npool/inc | |
| 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 'i18npool/inc')
56 files changed, 699 insertions, 699 deletions
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx index ad49d9f13027..ddf478f82c12 100644 --- a/i18npool/inc/breakiteratorImpl.hxx +++ b/i18npool/inc/breakiteratorImpl.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 @@ -44,9 +44,9 @@ namespace com { namespace sun { namespace star { namespace i18n { -// ---------------------------------------------------- -// class BreakIterator -// ---------------------------------------------------- +// ---------------------------------------------------- +// class BreakIterator +// ---------------------------------------------------- class BreakIteratorImpl : public cppu::WeakImplHelper2 < XBreakIterator, @@ -58,61 +58,61 @@ public: BreakIteratorImpl(); ~BreakIteratorImpl(); - virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, + virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString& Text, sal_Int32 nStartPos, + const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, + virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString& Text, sal_Int32 nStartPos, + const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException); - virtual Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException); - virtual Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException); - virtual Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos, - const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) + virtual Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos, + const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isBeginWord( const rtl::OUString& Text, sal_Int32 nPos, + virtual sal_Bool SAL_CALL isBeginWord( const rtl::OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isEndWord( const rtl::OUString& Text, sal_Int32 nPos, + virtual sal_Bool SAL_CALL isEndWord( const rtl::OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getWordType( const rtl::OUString& Text, sal_Int32 nPos, + virtual sal_Int16 SAL_CALL getWordType( const rtl::OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException); - virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, - const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) + virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos, + const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, + const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getScriptType( const rtl::OUString& Text, sal_Int32 nPos ) + virtual sal_Int16 SAL_CALL getScriptType( const rtl::OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL beginOfScript( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL beginOfScript( const rtl::OUString& Text, sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL endOfScript( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL endOfScript( const rtl::OUString& Text, sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL previousScript( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL previousScript( const rtl::OUString& Text, sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL nextScript( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL nextScript( const rtl::OUString& Text, sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL beginOfCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL beginOfCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL endOfCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL endOfCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL previousCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL previousCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL nextCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL nextCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException); //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx index e94dd7cd0534..300f117da0fa 100644 --- a/i18npool/inc/breakiterator_cjk.hxx +++ b/i18npool/inc/breakiterator_cjk.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 @@ -31,9 +31,9 @@ #include <xdictionary.hxx> namespace com { namespace sun { namespace star { namespace i18n { -// ---------------------------------------------------- -// class BreakIterator_CJK -// ---------------------------------------------------- +// ---------------------------------------------------- +// class BreakIterator_CJK +// ---------------------------------------------------- class BreakIterator_CJK : public BreakIterator_Unicode { public: @@ -48,9 +48,9 @@ public: Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) throw(com::sun::star::uno::RuntimeException); - LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, - const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) + LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos, + const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, + const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) throw(com::sun::star::uno::RuntimeException); protected: diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx index 17661614ab7b..2a7b0d2f8e7e 100644 --- a/i18npool/inc/breakiterator_ctl.hxx +++ b/i18npool/inc/breakiterator_ctl.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 @@ -32,9 +32,9 @@ namespace com { namespace sun { namespace star { namespace i18n { -// ---------------------------------------------------- -// class BreakIterator_CTL -// ---------------------------------------------------- +// ---------------------------------------------------- +// class BreakIterator_CTL +// ---------------------------------------------------- class BreakIterator_CTL : public BreakIterator_Unicode { public: @@ -46,19 +46,19 @@ public: virtual sal_Int32 SAL_CALL nextCharacters(const rtl::OUString& text, sal_Int32 start, const lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count, sal_Int32& nDone) throw(com::sun::star::uno::RuntimeException); - virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, - const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) + virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos, + const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, + const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) throw(com::sun::star::uno::RuntimeException); protected: rtl::OUString cachedText; // for cell index sal_Int32* nextCellIndex; sal_Int32* previousCellIndex; sal_Int32 cellIndexSize; - + virtual void SAL_CALL makeIndex(const rtl::OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException); }; -} } } } +} } } } #endif diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx index cba8bd2440de..b3a2ce321df9 100644 --- a/i18npool/inc/breakiterator_th.hxx +++ b/i18npool/inc/breakiterator_th.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 @@ -30,9 +30,9 @@ namespace com { namespace sun { namespace star { namespace i18n { -// ---------------------------------------------------- -// class BreakIterator_th -// ---------------------------------------------------- +// ---------------------------------------------------- +// class BreakIterator_th +// ---------------------------------------------------- class BreakIterator_th : public BreakIterator_CTL { public: @@ -43,6 +43,6 @@ protected: void SAL_CALL makeIndex(const rtl::OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException); }; -} } } } +} } } } #endif // _I18N_BREAKITERATOR_TH_HXX_ diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx index 53600c0cb3ae..3e9e23f1aaa1 100644 --- a/i18npool/inc/breakiterator_unicode.hxx +++ b/i18npool/inc/breakiterator_unicode.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 @@ -38,45 +38,45 @@ namespace com { namespace sun { namespace star { namespace i18n { #define LOAD_SENTENCE_BREAKITERATOR 2 #define LOAD_LINE_BREAKITERATOR 3 -// ---------------------------------------------------- -// class BreakIterator_Unicode -// ---------------------------------------------------- +// ---------------------------------------------------- +// class BreakIterator_Unicode +// ---------------------------------------------------- class BreakIterator_Unicode : public BreakIteratorImpl { public: BreakIterator_Unicode(); ~BreakIterator_Unicode(); - virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, + virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString& Text, sal_Int32 nStartPos, + const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, + virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString& Text, sal_Int32 nStartPos, + const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException); - virtual Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException); - virtual Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException); - virtual Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos, - const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) + virtual Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos, + const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException); - virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, - const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) + virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos, + const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, + const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) throw(com::sun::star::uno::RuntimeException); //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); protected: @@ -86,17 +86,17 @@ protected: struct BI_Data { UnicodeString aICUText; icu::BreakIterator *aBreakIterator; - + BI_Data() : aICUText(), aBreakIterator(NULL) {} - } character, word, sentence, line, *icuBI; + } character, word, sentence, line, *icuBI; com::sun::star::lang::Locale aLocale; sal_Int16 aBreakType, aWordType; - void SAL_CALL loadICUBreakIterator(const com::sun::star::lang::Locale& rLocale, + void SAL_CALL loadICUBreakIterator(const com::sun::star::lang::Locale& rLocale, sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const rtl::OUString& rText) throw(com::sun::star::uno::RuntimeException); }; -} } } } +} } } } #endif diff --git a/i18npool/inc/bullet.h b/i18npool/inc/bullet.h index 6a0b945d2de0..ce76cedebfd6 100644 --- a/i18npool/inc/bullet.h +++ b/i18npool/inc/bullet.h @@ -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 @@ -28,226 +28,226 @@ namespace com { namespace sun { namespace star { namespace i18n { static sal_Unicode table_AIUFullWidth_ja_JP[] = { - 0x30A2, // KATAKANA LETTER A - 0x30A4, // KATAKANA LETTER I - 0x30A6, // KATAKANA LETTER U - 0x30A8, // KATAKANA LETTER E - 0x30AA, // KATAKANA LETTER O - 0x30AB, // KATAKANA LETTER KA - 0x30AD, // KATAKANA LETTER KI - 0x30AF, // KATAKANA LETTER KU - 0x30B1, // KATAKANA LETTER KE - 0x30B3, // KATAKANA LETTER KO - 0x30B5, // KATAKANA LETTER SA - 0x30B7, // KATAKANA LETTER SI - 0x30B9, // KATAKANA LETTER SU - 0x30BB, // KATAKANA LETTER SE - 0x30BD, // KATAKANA LETTER SO - 0x30BF, // KATAKANA LETTER TA - 0x30C1, // KATAKANA LETTER TI - 0x30C4, // KATAKANA LETTER TU - 0x30C6, // KATAKANA LETTER TE - 0x30C8, // KATAKANA LETTER TO - 0x30CA, // KATAKANA LETTER NA - 0x30CB, // KATAKANA LETTER NI - 0x30CC, // KATAKANA LETTER NU - 0x30CD, // KATAKANA LETTER NE - 0x30CE, // KATAKANA LETTER NO - 0x30CF, // KATAKANA LETTER HA - 0x30D2, // KATAKANA LETTER HI - 0x30D5, // KATAKANA LETTER HU - 0x30D8, // KATAKANA LETTER HE - 0x30DB, // KATAKANA LETTER HO - 0x30DE, // KATAKANA LETTER MA - 0x30DF, // KATAKANA LETTER MI - 0x30E0, // KATAKANA LETTER MU - 0x30E1, // KATAKANA LETTER ME - 0x30E2, // KATAKANA LETTER MO - 0x30E4, // KATAKANA LETTER YA - 0x30E6, // KATAKANA LETTER YU - 0x30E8, // KATAKANA LETTER YO - 0x30E9, // KATAKANA LETTER RA - 0x30EA, // KATAKANA LETTER RI - 0x30EB, // KATAKANA LETTER RU - 0x30EC, // KATAKANA LETTER RE - 0x30ED, // KATAKANA LETTER RO - 0x30EF, // KATAKANA LETTER WA - 0x30F2, // KATAKANA LETTER WO - 0x30F3 // KATAKANA LETTER N + 0x30A2, // KATAKANA LETTER A + 0x30A4, // KATAKANA LETTER I + 0x30A6, // KATAKANA LETTER U + 0x30A8, // KATAKANA LETTER E + 0x30AA, // KATAKANA LETTER O + 0x30AB, // KATAKANA LETTER KA + 0x30AD, // KATAKANA LETTER KI + 0x30AF, // KATAKANA LETTER KU + 0x30B1, // KATAKANA LETTER KE + 0x30B3, // KATAKANA LETTER KO + 0x30B5, // KATAKANA LETTER SA + 0x30B7, // KATAKANA LETTER SI + 0x30B9, // KATAKANA LETTER SU + 0x30BB, // KATAKANA LETTER SE + 0x30BD, // KATAKANA LETTER SO + 0x30BF, // KATAKANA LETTER TA + 0x30C1, // KATAKANA LETTER TI + 0x30C4, // KATAKANA LETTER TU + 0x30C6, // KATAKANA LETTER TE + 0x30C8, // KATAKANA LETTER TO + 0x30CA, // KATAKANA LETTER NA + 0x30CB, // KATAKANA LETTER NI + 0x30CC, // KATAKANA LETTER NU + 0x30CD, // KATAKANA LETTER NE + 0x30CE, // KATAKANA LETTER NO + 0x30CF, // KATAKANA LETTER HA + 0x30D2, // KATAKANA LETTER HI + 0x30D5, // KATAKANA LETTER HU + 0x30D8, // KATAKANA LETTER HE + 0x30DB, // KATAKANA LETTER HO + 0x30DE, // KATAKANA LETTER MA + 0x30DF, // KATAKANA LETTER MI + 0x30E0, // KATAKANA LETTER MU + 0x30E1, // KATAKANA LETTER ME + 0x30E2, // KATAKANA LETTER MO + 0x30E4, // KATAKANA LETTER YA + 0x30E6, // KATAKANA LETTER YU + 0x30E8, // KATAKANA LETTER YO + 0x30E9, // KATAKANA LETTER RA + 0x30EA, // KATAKANA LETTER RI + 0x30EB, // KATAKANA LETTER RU + 0x30EC, // KATAKANA LETTER RE + 0x30ED, // KATAKANA LETTER RO + 0x30EF, // KATAKANA LETTER WA + 0x30F2, // KATAKANA LETTER WO + 0x30F3 // KATAKANA LETTER N }; static sal_Unicode table_AIUHalfWidth_ja_JP[] = { - 0xFF71, // HALFWIDTH KATAKANA LETTER A - 0xFF72, // HALFWIDTH KATAKANA LETTER I - 0xFF73, // HALFWIDTH KATAKANA LETTER U - 0xFF74, // HALFWIDTH KATAKANA LETTER E - 0xFF75, // HALFWIDTH KATAKANA LETTER O - 0xFF76, // HALFWIDTH KATAKANA LETTER KA - 0xFF77, // HALFWIDTH KATAKANA LETTER KI - 0xFF78, // HALFWIDTH KATAKANA LETTER KU - 0xFF79, // HALFWIDTH KATAKANA LETTER KE - 0xFF7A, // HALFWIDTH KATAKANA LETTER KO - 0xFF7B, // HALFWIDTH KATAKANA LETTER SA - 0xFF7C, // HALFWIDTH KATAKANA LETTER SI - 0xFF7D, // HALFWIDTH KATAKANA LETTER SU - 0xFF7E, // HALFWIDTH KATAKANA LETTER SE - 0xFF7F, // HALFWIDTH KATAKANA LETTER SO - 0xFF80, // HALFWIDTH KATAKANA LETTER TA - 0xFF81, // HALFWIDTH KATAKANA LETTER TI - 0xFF82, // HALFWIDTH KATAKANA LETTER TU - 0xFF83, // HALFWIDTH KATAKANA LETTER TE - 0xFF84, // HALFWIDTH KATAKANA LETTER TO - 0xFF85, // HALFWIDTH KATAKANA LETTER NA - 0xFF86, // HALFWIDTH KATAKANA LETTER NI - 0xFF87, // HALFWIDTH KATAKANA LETTER NU - 0xFF88, // HALFWIDTH KATAKANA LETTER NE - 0xFF89, // HALFWIDTH KATAKANA LETTER NO - 0xFF8A, // HALFWIDTH KATAKANA LETTER HA - 0xFF8B, // HALFWIDTH KATAKANA LETTER HI - 0xFF8C, // HALFWIDTH KATAKANA LETTER HU - 0xFF8D, // HALFWIDTH KATAKANA LETTER HE - 0xFF8E, // HALFWIDTH KATAKANA LETTER HO - 0xFF8F, // HALFWIDTH KATAKANA LETTER MA - 0xFF90, // HALFWIDTH KATAKANA LETTER MI - 0xFF91, // HALFWIDTH KATAKANA LETTER MU - 0xFF92, // HALFWIDTH KATAKANA LETTER ME - 0xFF93, // HALFWIDTH KATAKANA LETTER MO - 0xFF94, // HALFWIDTH KATAKANA LETTER YA - 0xFF95, // HALFWIDTH KATAKANA LETTER YU - 0xFF96, // HALFWIDTH KATAKANA LETTER YO - 0xFF97, // HALFWIDTH KATAKANA LETTER RA - 0xFF98, // HALFWIDTH KATAKANA LETTER RI - 0xFF99, // HALFWIDTH KATAKANA LETTER RU - 0xFF9A, // HALFWIDTH KATAKANA LETTER RE - 0xFF9B, // HALFWIDTH KATAKANA LETTER RO - 0xFF9C, // HALFWIDTH KATAKANA LETTER WA - 0xFF66, // HALFWIDTH KATAKANA LETTER WO - 0xFF9D // HALFWIDTH KATAKANA LETTER N + 0xFF71, // HALFWIDTH KATAKANA LETTER A + 0xFF72, // HALFWIDTH KATAKANA LETTER I + 0xFF73, // HALFWIDTH KATAKANA LETTER U + 0xFF74, // HALFWIDTH KATAKANA LETTER E + 0xFF75, // HALFWIDTH KATAKANA LETTER O + 0xFF76, // HALFWIDTH KATAKANA LETTER KA + 0xFF77, // HALFWIDTH KATAKANA LETTER KI + 0xFF78, // HALFWIDTH KATAKANA LETTER KU + 0xFF79, // HALFWIDTH KATAKANA LETTER KE + 0xFF7A, // HALFWIDTH KATAKANA LETTER KO + 0xFF7B, // HALFWIDTH KATAKANA LETTER SA + 0xFF7C, // HALFWIDTH KATAKANA LETTER SI + 0xFF7D, // HALFWIDTH KATAKANA LETTER SU + 0xFF7E, // HALFWIDTH KATAKANA LETTER SE + 0xFF7F, // HALFWIDTH KATAKANA LETTER SO + 0xFF80, // HALFWIDTH KATAKANA LETTER TA + 0xFF81, // HALFWIDTH KATAKANA LETTER TI + 0xFF82, // HALFWIDTH KATAKANA LETTER TU + 0xFF83, // HALFWIDTH KATAKANA LETTER TE + 0xFF84, // HALFWIDTH KATAKANA LETTER TO + 0xFF85, // HALFWIDTH KATAKANA LETTER NA + 0xFF86, // HALFWIDTH KATAKANA LETTER NI + 0xFF87, // HALFWIDTH KATAKANA LETTER NU + 0xFF88, // HALFWIDTH KATAKANA LETTER NE + 0xFF89, // HALFWIDTH KATAKANA LETTER NO + 0xFF8A, // HALFWIDTH KATAKANA LETTER HA + 0xFF8B, // HALFWIDTH KATAKANA LETTER HI + 0xFF8C, // HALFWIDTH KATAKANA LETTER HU + 0xFF8D, // HALFWIDTH KATAKANA LETTER HE + 0xFF8E, // HALFWIDTH KATAKANA LETTER HO + 0xFF8F, // HALFWIDTH KATAKANA LETTER MA + 0xFF90, // HALFWIDTH KATAKANA LETTER MI + 0xFF91, // HALFWIDTH KATAKANA LETTER MU + 0xFF92, // HALFWIDTH KATAKANA LETTER ME + 0xFF93, // HALFWIDTH KATAKANA LETTER MO + 0xFF94, // HALFWIDTH KATAKANA LETTER YA + 0xFF95, // HALFWIDTH KATAKANA LETTER YU + 0xFF96, // HALFWIDTH KATAKANA LETTER YO + 0xFF97, // HALFWIDTH KATAKANA LETTER RA + 0xFF98, // HALFWIDTH KATAKANA LETTER RI + 0xFF99, // HALFWIDTH KATAKANA LETTER RU + 0xFF9A, // HALFWIDTH KATAKANA LETTER RE + 0xFF9B, // HALFWIDTH KATAKANA LETTER RO + 0xFF9C, // HALFWIDTH KATAKANA LETTER WA + 0xFF66, // HALFWIDTH KATAKANA LETTER WO + 0xFF9D // HALFWIDTH KATAKANA LETTER N }; static sal_Unicode table_IROHAFullWidth_ja_JP[] = { - 0x30A4, // KATAKANA LETTER I - 0x30ED, // KATAKANA LETTER RO - 0x30CF, // KATAKANA LETTER HA - 0x30CB, // KATAKANA LETTER NI - 0x30DB, // KATAKANA LETTER HO - 0x30D8, // KATAKANA LETTER HE - 0x30C8, // KATAKANA LETTER TO - 0x30C1, // KATAKANA LETTER TI - 0x30EA, // KATAKANA LETTER RI - 0x30CC, // KATAKANA LETTER NU - 0x30EB, // KATAKANA LETTER RU - 0x30F2, // KATAKANA LETTER WO - 0x30EF, // KATAKANA LETTER WA - 0x30AB, // KATAKANA LETTER KA - 0x30E8, // KATAKANA LETTER YO - 0x30BF, // KATAKANA LETTER TA - 0x30EC, // KATAKANA LETTER RE - 0x30BD, // KATAKANA LETTER SO - 0x30C4, // KATAKANA LETTER TU - 0x30CD, // KATAKANA LETTER NE - 0x30CA, // KATAKANA LETTER NA - 0x30E9, // KATAKANA LETTER RA - 0x30E0, // KATAKANA LETTER MU - 0x30A6, // KATAKANA LETTER U - 0x30F0, // KATAKANA LETTER WI - 0x30CE, // KATAKANA LETTER NO - 0x30AA, // KATAKANA LETTER O - 0x30AF, // KATAKANA LETTER KU - 0x30E4, // KATAKANA LETTER YA - 0x30DE, // KATAKANA LETTER MA - 0x30B1, // KATAKANA LETTER KE - 0x30D5, // KATAKANA LETTER HU - 0x30B3, // KATAKANA LETTER KO - 0x30A8, // KATAKANA LETTER E - 0x30C6, // KATAKANA LETTER TE - 0x30A2, // KATAKANA LETTER A - 0x30B5, // KATAKANA LETTER SA - 0x30AD, // KATAKANA LETTER KI - 0x30E6, // KATAKANA LETTER YU - 0x30E1, // KATAKANA LETTER ME - 0x30DF, // KATAKANA LETTER MI - 0x30B7, // KATAKANA LETTER SI - 0x30F1, // KATAKANA LETTER WE - 0x30D2, // KATAKANA LETTER HI - 0x30E2, // KATAKANA LETTER MO - 0x30BB, // KATAKANA LETTER SE - 0x30B9, // KATAKANA LETTER SU - 0x30F3 // KATAKANA LETTER N + 0x30A4, // KATAKANA LETTER I + 0x30ED, // KATAKANA LETTER RO + 0x30CF, // KATAKANA LETTER HA + 0x30CB, // KATAKANA LETTER NI + 0x30DB, // KATAKANA LETTER HO + 0x30D8, // KATAKANA LETTER HE + 0x30C8, // KATAKANA LETTER TO + 0x30C1, // KATAKANA LETTER TI + 0x30EA, // KATAKANA LETTER RI + 0x30CC, // KATAKANA LETTER NU + 0x30EB, // KATAKANA LETTER RU + 0x30F2, // KATAKANA LETTER WO + 0x30EF, // KATAKANA LETTER WA + 0x30AB, // KATAKANA LETTER KA + 0x30E8, // KATAKANA LETTER YO + 0x30BF, // KATAKANA LETTER TA + 0x30EC, // KATAKANA LETTER RE + 0x30BD, // KATAKANA LETTER SO + 0x30C4, // KATAKANA LETTER TU + 0x30CD, // KATAKANA LETTER NE + 0x30CA, // KATAKANA LETTER NA + 0x30E9, // KATAKANA LETTER RA + 0x30E0, // KATAKANA LETTER MU + 0x30A6, // KATAKANA LETTER U + 0x30F0, // KATAKANA LETTER WI + 0x30CE, // KATAKANA LETTER NO + 0x30AA, // KATAKANA LETTER O + 0x30AF, // KATAKANA LETTER KU + 0x30E4, // KATAKANA LETTER YA + 0x30DE, // KATAKANA LETTER MA + 0x30B1, // KATAKANA LETTER KE + 0x30D5, // KATAKANA LETTER HU + 0x30B3, // KATAKANA LETTER KO + 0x30A8, // KATAKANA LETTER E + 0x30C6, // KATAKANA LETTER TE + 0x30A2, // KATAKANA LETTER A + 0x30B5, // KATAKANA LETTER SA + 0x30AD, // KATAKANA LETTER KI + 0x30E6, // KATAKANA LETTER YU + 0x30E1, // KATAKANA LETTER ME + 0x30DF, // KATAKANA LETTER MI + 0x30B7, // KATAKANA LETTER SI + 0x30F1, // KATAKANA LETTER WE + 0x30D2, // KATAKANA LETTER HI + 0x30E2, // KATAKANA LETTER MO + 0x30BB, // KATAKANA LETTER SE + 0x30B9, // KATAKANA LETTER SU + 0x30F3 // KATAKANA LETTER N }; static sal_Unicode table_IROHAHalfWidth_ja_JP[] = { - 0xFF72, // HALFWIDTH KATAKANA LETTER I - 0xFF9B, // HALFWIDTH KATAKANA LETTER RO - 0xFF8A, // HALFWIDTH KATAKANA LETTER HA - 0xFF86, // HALFWIDTH KATAKANA LETTER NI - 0xFF8E, // HALFWIDTH KATAKANA LETTER HO - 0xFF8D, // HALFWIDTH KATAKANA LETTER HE - 0xFF84, // HALFWIDTH KATAKANA LETTER TO - 0xFF81, // HALFWIDTH KATAKANA LETTER TI - 0xFF98, // HALFWIDTH KATAKANA LETTER RI - 0xFF87, // HALFWIDTH KATAKANA LETTER NU - 0xFF99, // HALFWIDTH KATAKANA LETTER RU - 0xFF66, // HALFWIDTH KATAKANA LETTER WO - 0xFF9C, // HALFWIDTH KATAKANA LETTER WA - 0xFF76, // HALFWIDTH KATAKANA LETTER KA - 0xFF96, // HALFWIDTH KATAKANA LETTER YO - 0xFF80, // HALFWIDTH KATAKANA LETTER TA - 0xFF9A, // HALFWIDTH KATAKANA LETTER RE - 0xFF7F, // HALFWIDTH KATAKANA LETTER SO - 0xFF82, // HALFWIDTH KATAKANA LETTER TU - 0xFF88, // HALFWIDTH KATAKANA LETTER NE - 0xFF85, // HALFWIDTH KATAKANA LETTER NA - 0xFF97, // HALFWIDTH KATAKANA LETTER RA - 0xFF91, // HALFWIDTH KATAKANA LETTER MU - 0xFF73, // HALFWIDTH KATAKANA LETTER U - 0x30F0, // KATAKANA LETTER WI - 0xFF89, // HALFWIDTH KATAKANA LETTER NO - 0xFF75, // HALFWIDTH KATAKANA LETTER O - 0xFF78, // HALFWIDTH KATAKANA LETTER KU - 0xFF94, // HALFWIDTH KATAKANA LETTER YA - 0xFF8F, // HALFWIDTH KATAKANA LETTER MA - 0xFF79, // HALFWIDTH KATAKANA LETTER KE - 0xFF8C, // HALFWIDTH KATAKANA LETTER HU - 0xFF7A, // HALFWIDTH KATAKANA LETTER KO - 0xFF74, // HALFWIDTH KATAKANA LETTER E - 0xFF83, // HALFWIDTH KATAKANA LETTER TE - 0xFF71, // HALFWIDTH KATAKANA LETTER A - 0xFF7B, // HALFWIDTH KATAKANA LETTER SA - 0xFF77, // HALFWIDTH KATAKANA LETTER KI - 0xFF95, // HALFWIDTH KATAKANA LETTER YU - 0xFF92, // HALFWIDTH KATAKANA LETTER ME - 0xFF90, // HALFWIDTH KATAKANA LETTER MI - 0xFF7C, // HALFWIDTH KATAKANA LETTER SI - 0x30F1, // KATAKANA LETTER WE - 0xFF8B, // HALFWIDTH KATAKANA LETTER HI - 0xFF93, // HALFWIDTH KATAKANA LETTER MO - 0xFF7E, // HALFWIDTH KATAKANA LETTER SE - 0xFF7D, // HALFWIDTH KATAKANA LETTER SU - 0xFF9D // HALFWIDTH KATAKANA LETTER N + 0xFF72, // HALFWIDTH KATAKANA LETTER I + 0xFF9B, // HALFWIDTH KATAKANA LETTER RO + 0xFF8A, // HALFWIDTH KATAKANA LETTER HA + 0xFF86, // HALFWIDTH KATAKANA LETTER NI + 0xFF8E, // HALFWIDTH KATAKANA LETTER HO + 0xFF8D, // HALFWIDTH KATAKANA LETTER HE + 0xFF84, // HALFWIDTH KATAKANA LETTER TO + 0xFF81, // HALFWIDTH KATAKANA LETTER TI + 0xFF98, // HALFWIDTH KATAKANA LETTER RI + 0xFF87, // HALFWIDTH KATAKANA LETTER NU + 0xFF99, // HALFWIDTH KATAKANA LETTER RU + 0xFF66, // HALFWIDTH KATAKANA LETTER WO + 0xFF9C, // HALFWIDTH KATAKANA LETTER WA + 0xFF76, // HALFWIDTH KATAKANA LETTER KA + 0xFF96, // HALFWIDTH KATAKANA LETTER YO + 0xFF80, // HALFWIDTH KATAKANA LETTER TA + 0xFF9A, // HALFWIDTH KATAKANA LETTER RE + 0xFF7F, // HALFWIDTH KATAKANA LETTER SO + 0xFF82, // HALFWIDTH KATAKANA LETTER TU + 0xFF88, // HALFWIDTH KATAKANA LETTER NE + 0xFF85, // HALFWIDTH KATAKANA LETTER NA + 0xFF97, // HALFWIDTH KATAKANA LETTER RA + 0xFF91, // HALFWIDTH KATAKANA LETTER MU + 0xFF73, // HALFWIDTH KATAKANA LETTER U + 0x30F0, // KATAKANA LETTER WI + 0xFF89, // HALFWIDTH KATAKANA LETTER NO + 0xFF75, // HALFWIDTH KATAKANA LETTER O + 0xFF78, // HALFWIDTH KATAKANA LETTER KU + 0xFF94, // HALFWIDTH KATAKANA LETTER YA + 0xFF8F, // HALFWIDTH KATAKANA LETTER MA + 0xFF79, // HALFWIDTH KATAKANA LETTER KE + 0xFF8C, // HALFWIDTH KATAKANA LETTER HU + 0xFF7A, // HALFWIDTH KATAKANA LETTER KO + 0xFF74, // HALFWIDTH KATAKANA LETTER E + 0xFF83, // HALFWIDTH KATAKANA LETTER TE + 0xFF71, // HALFWIDTH KATAKANA LETTER A + 0xFF7B, // HALFWIDTH KATAKANA LETTER SA + 0xFF77, // HALFWIDTH KATAKANA LETTER KI + 0xFF95, // HALFWIDTH KATAKANA LETTER YU + 0xFF92, // HALFWIDTH KATAKANA LETTER ME + 0xFF90, // HALFWIDTH KATAKANA LETTER MI + 0xFF7C, // HALFWIDTH KATAKANA LETTER SI + 0x30F1, // KATAKANA LETTER WE + 0xFF8B, // HALFWIDTH KATAKANA LETTER HI + 0xFF93, // HALFWIDTH KATAKANA LETTER MO + 0xFF7E, // HALFWIDTH KATAKANA LETTER SE + 0xFF7D, // HALFWIDTH KATAKANA LETTER SU + 0xFF9D // HALFWIDTH KATAKANA LETTER N }; static sal_Unicode table_CircledNumber[] = { - 0x2460, // CIRCLED DIGIT ONE - 0x2461, // CIRCLED DIGIT TWO - 0x2462, // CIRCLED DIGIT THREE - 0x2463, // CIRCLED DIGIT FOUR - 0x2464, // CIRCLED DIGIT FIVE - 0x2465, // CIRCLED DIGIT SIX - 0x2466, // CIRCLED DIGIT SEVEN - 0x2467, // CIRCLED DIGIT EIGHT - 0x2468, // CIRCLED DIGIT NINE - 0x2469, // CIRCLED NUMBER TEN - 0x246A, // CIRCLED NUMBER ELEVEN - 0x246B, // CIRCLED NUMBER TWELVE - 0x246C, // CIRCLED NUMBER THIRTEEN - 0x246D, // CIRCLED NUMBER FOURTEEN - 0x246E, // CIRCLED NUMBER FIFTEEN - 0x246F, // CIRCLED NUMBER SIXTEEN - 0x2470, // CIRCLED NUMBER SEVENTEEN - 0x2471, // CIRCLED NUMBER EIGHTEEN - 0x2472, // CIRCLED NUMBER NINETEEN - 0x2473 // CIRCLED NUMBER TWENTY + 0x2460, // CIRCLED DIGIT ONE + 0x2461, // CIRCLED DIGIT TWO + 0x2462, // CIRCLED DIGIT THREE + 0x2463, // CIRCLED DIGIT FOUR + 0x2464, // CIRCLED DIGIT FIVE + 0x2465, // CIRCLED DIGIT SIX + 0x2466, // CIRCLED DIGIT SEVEN + 0x2467, // CIRCLED DIGIT EIGHT + 0x2468, // CIRCLED DIGIT NINE + 0x2469, // CIRCLED NUMBER TEN + 0x246A, // CIRCLED NUMBER ELEVEN + 0x246B, // CIRCLED NUMBER TWELVE + 0x246C, // CIRCLED NUMBER THIRTEEN + 0x246D, // CIRCLED NUMBER FOURTEEN + 0x246E, // CIRCLED NUMBER FIFTEEN + 0x246F, // CIRCLED NUMBER SIXTEEN + 0x2470, // CIRCLED NUMBER SEVENTEEN + 0x2471, // CIRCLED NUMBER EIGHTEEN + 0x2472, // CIRCLED NUMBER NINETEEN + 0x2473 // CIRCLED NUMBER TWENTY }; static sal_Unicode table_HangulJamo_ko[] = { diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx index 8ba8d6caec34..50b195f14fed 100644 --- a/i18npool/inc/calendarImpl.hxx +++ b/i18npool/inc/calendarImpl.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 @@ -35,14 +35,14 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <vector> -// ---------------------------------------------------- -// class CalendarImpl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class CalendarImpl +// ---------------------------------------------------- namespace com { namespace sun { namespace star { namespace i18n { class CalendarImpl : public cppu::WeakImplHelper2 -< +< com::sun::star::i18n::XExtendedCalendar, com::sun::star::lang::XServiceInfo > @@ -91,7 +91,7 @@ public: private: struct lookupTableItem { - lookupTableItem(const rtl::OUString& _uniqueID, com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedCalendar >& _xCalendar) : + lookupTableItem(const rtl::OUString& _uniqueID, com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedCalendar >& _xCalendar) : uniqueID(_uniqueID), xCalendar(_xCalendar) {} rtl::OUString uniqueID; com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedCalendar > xCalendar; diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index 2d32c7a75348..2d7a15344789 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.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 @@ -32,9 +32,9 @@ #include "warnings_guard_unicode_calendar.h" -// ---------------------------------------------------- -// class Calendar_gregorian -// ---------------------------------------------------- +// ---------------------------------------------------- +// class Calendar_gregorian +// ---------------------------------------------------- namespace com { namespace sun { namespace star { namespace i18n { @@ -124,9 +124,9 @@ private: bool getCombinedOffset( sal_Int32 & o_nOffset, sal_Int16 nParentFieldIndex, sal_Int16 nChildFieldIndex ) const; }; -// ---------------------------------------------------- -// class Calendar_hanja -// ---------------------------------------------------- +// ---------------------------------------------------- +// class Calendar_hanja +// ---------------------------------------------------- class Calendar_hanja : public Calendar_gregorian { public: @@ -136,9 +136,9 @@ public: virtual rtl::OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException); }; -// ---------------------------------------------------- -// class Calendar_gengou -// ---------------------------------------------------- +// ---------------------------------------------------- +// class Calendar_gengou +// ---------------------------------------------------- class Calendar_gengou : public Calendar_gregorian { public: @@ -146,9 +146,9 @@ public: Calendar_gengou(); }; -// ---------------------------------------------------- -// class Calendar_ROC -// ---------------------------------------------------- +// ---------------------------------------------------- +// class Calendar_ROC +// ---------------------------------------------------- class Calendar_ROC : public Calendar_gregorian { public: @@ -156,9 +156,9 @@ public: Calendar_ROC(); }; -// ---------------------------------------------------- -// class Calendar_buddhist -// ---------------------------------------------------- +// ---------------------------------------------------- +// class Calendar_buddhist +// ---------------------------------------------------- class Calendar_buddhist : public Calendar_gregorian { public: diff --git a/i18npool/inc/calendar_hijri.hxx b/i18npool/inc/calendar_hijri.hxx index d9f4be232671..1f5d56f9390a 100644 --- a/i18npool/inc/calendar_hijri.hxx +++ b/i18npool/inc/calendar_hijri.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 @@ -30,9 +30,9 @@ #include "calendar_gregorian.hxx" -// ---------------------------------------------------- -// class Calendar_hijri -// ---------------------------------------------------- +// ---------------------------------------------------- +// class Calendar_hijri +// ---------------------------------------------------- namespace com { namespace sun { namespace star { namespace i18n { @@ -53,7 +53,7 @@ protected: // Synodic Period (mean time between 2 successive new moon: 29d, 12 hr, 44min, 3sec static const double SynPeriod; - static const double SynMonth; // Solar days in a year/SynPeriod + static const double SynMonth; // Solar days in a year/SynPeriod // Julian day on Jan 1, 1900 static const double jd1900; @@ -63,11 +63,11 @@ protected: static const sal_Int32 GregRef; // Local time (Saudi Arabia) - static const double SA_TimeZone; // Time Zone + static const double SA_TimeZone; // Time Zone // Period between 1.30pm - 6:30pm static const double EveningPeriod; - + // "Leap" years static const sal_Int32 LeapYear[]; diff --git a/i18npool/inc/calendar_jewish.hxx b/i18npool/inc/calendar_jewish.hxx index 23e207389bc0..90018152fdb7 100644 --- a/i18npool/inc/calendar_jewish.hxx +++ b/i18npool/inc/calendar_jewish.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 @@ -29,9 +29,9 @@ #include "calendar_gregorian.hxx" -// ---------------------------------------------------- -// class Calendar_jewish -// ---------------------------------------------------- +// ---------------------------------------------------- +// class Calendar_jewish +// ---------------------------------------------------- namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/inc/cclass_cjk.hxx b/i18npool/inc/cclass_cjk.hxx index 9619d5f7d39c..3de3d03dd071 100644 --- a/i18npool/inc/cclass_cjk.hxx +++ b/i18npool/inc/cclass_cjk.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 @@ -31,17 +31,17 @@ namespace com { namespace sun { namespace star { namespace i18n { -#define MAXLEN 31 // Define max length for CJK number +#define MAXLEN 31 // Define max length for CJK number -#define ZERO 0x0030 // Define unicode zero -#define ONE 0x0031 // Define unicode one +#define ZERO 0x0030 // Define unicode zero +#define ONE 0x0031 // Define unicode one class cclass_CJK : public cclass_Unicode { public: cclass_CJK( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF ); ~cclass_CJK(); i18n::ParseResult SAL_CALL parsePredefinedToken( - sal_Int32 nTokenType, + sal_Int32 nTokenType, const rtl::OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, @@ -55,8 +55,8 @@ protected: sal_Int32 size; rtl::OUString number; sal_Unicode *text; - sal_Int32 textPos; - + sal_Int32 textPos; + sal_Unicode *Upper; sal_Unicode *Base; sal_Unicode *Plus; @@ -90,6 +90,6 @@ CCLASS_CJK(cclass_ko) #endif #undef CCLASS_CJK -} } } } +} } } } #endif diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx index 60f28748b584..7f94d90d7295 100644 --- a/i18npool/inc/cclass_unicode.hxx +++ b/i18npool/inc/cclass_unicode.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 @@ -47,26 +47,26 @@ public: cclass_Unicode(com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > xSMgr ); ~cclass_Unicode(); - virtual rtl::OUString SAL_CALL toUpper( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount, + virtual rtl::OUString SAL_CALL toUpper( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL toLower( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount, + virtual rtl::OUString SAL_CALL toLower( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL toTitle( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount, + virtual rtl::OUString SAL_CALL toTitle( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getType( const rtl::OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getCharacterDirection( const rtl::OUString& Text, sal_Int32 nPos ) + virtual sal_Int16 SAL_CALL getCharacterDirection( const rtl::OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getScript( const rtl::OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getCharacterType( const rtl::OUString& text, sal_Int32 nPos, + virtual sal_Int32 SAL_CALL getCharacterType( const rtl::OUString& text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getStringType( const rtl::OUString& text, sal_Int32 nPos, sal_Int32 nCount, + virtual sal_Int32 SAL_CALL getStringType( const rtl::OUString& text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual ParseResult SAL_CALL parseAnyToken( const rtl::OUString& Text, sal_Int32 nPos, - const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const rtl::OUString& userDefinedCharactersStart, + virtual ParseResult SAL_CALL parseAnyToken( const rtl::OUString& Text, sal_Int32 nPos, + const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const rtl::OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, const rtl::OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException); - virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const rtl::OUString& Text, - sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, - const rtl::OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, + virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const rtl::OUString& Text, + sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, + const rtl::OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, const rtl::OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException); //XServiceInfo @@ -97,51 +97,51 @@ private: ssStop }; - static const sal_uInt8 nDefCnt; - static const UPT_FLAG_TYPE pDefaultParserTable[]; - static const sal_Int32 pParseTokensType[]; + static const sal_uInt8 nDefCnt; + static const UPT_FLAG_TYPE pDefaultParserTable[]; + static const sal_Int32 pParseTokensType[]; /// Flag values of table. - static const UPT_FLAG_TYPE TOKEN_ILLEGAL; - static const UPT_FLAG_TYPE TOKEN_CHAR; - static const UPT_FLAG_TYPE TOKEN_CHAR_BOOL; - static const UPT_FLAG_TYPE TOKEN_CHAR_WORD; - static const UPT_FLAG_TYPE TOKEN_CHAR_VALUE; - static const UPT_FLAG_TYPE TOKEN_CHAR_STRING; - static const UPT_FLAG_TYPE TOKEN_CHAR_DONTCARE; - static const UPT_FLAG_TYPE TOKEN_BOOL; - static const UPT_FLAG_TYPE TOKEN_WORD; - static const UPT_FLAG_TYPE TOKEN_WORD_SEP; - static const UPT_FLAG_TYPE TOKEN_VALUE; - static const UPT_FLAG_TYPE TOKEN_VALUE_SEP; - static const UPT_FLAG_TYPE TOKEN_VALUE_EXP; - static const UPT_FLAG_TYPE TOKEN_VALUE_SIGN; - static const UPT_FLAG_TYPE TOKEN_VALUE_EXP_VALUE; - static const UPT_FLAG_TYPE TOKEN_VALUE_DIGIT; - static const UPT_FLAG_TYPE TOKEN_NAME_SEP; - static const UPT_FLAG_TYPE TOKEN_STRING_SEP; - static const UPT_FLAG_TYPE TOKEN_EXCLUDED; + static const UPT_FLAG_TYPE TOKEN_ILLEGAL; + static const UPT_FLAG_TYPE TOKEN_CHAR; + static const UPT_FLAG_TYPE TOKEN_CHAR_BOOL; + static const UPT_FLAG_TYPE TOKEN_CHAR_WORD; + static const UPT_FLAG_TYPE TOKEN_CHAR_VALUE; + static const UPT_FLAG_TYPE TOKEN_CHAR_STRING; + static const UPT_FLAG_TYPE TOKEN_CHAR_DONTCARE; + static const UPT_FLAG_TYPE TOKEN_BOOL; + static const UPT_FLAG_TYPE TOKEN_WORD; + static const UPT_FLAG_TYPE TOKEN_WORD_SEP; + static const UPT_FLAG_TYPE TOKEN_VALUE; + static const UPT_FLAG_TYPE TOKEN_VALUE_SEP; + static const UPT_FLAG_TYPE TOKEN_VALUE_EXP; + static const UPT_FLAG_TYPE TOKEN_VALUE_SIGN; + static const UPT_FLAG_TYPE TOKEN_VALUE_EXP_VALUE; + static const UPT_FLAG_TYPE TOKEN_VALUE_DIGIT; + static const UPT_FLAG_TYPE TOKEN_NAME_SEP; + static const UPT_FLAG_TYPE TOKEN_STRING_SEP; + static const UPT_FLAG_TYPE TOKEN_EXCLUDED; /// If and where c occurs in pStr - static const sal_Unicode* StrChr( const sal_Unicode* pStr, sal_Unicode c ); + static const sal_Unicode* StrChr( const sal_Unicode* pStr, sal_Unicode c ); com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > xMSF; /// used for parser only - com::sun::star::lang::Locale aParserLocale; + com::sun::star::lang::Locale aParserLocale; com::sun::star::uno::Reference < XLocaleData > xLocaleData; com::sun::star::uno::Reference < com::sun::star::i18n::XNativeNumberSupplier > xNatNumSup; rtl::OUString aStartChars; rtl::OUString aContChars; - UPT_FLAG_TYPE* pTable; - UPT_FLAG_TYPE* pStart; - UPT_FLAG_TYPE* pCont; - sal_Int32 nStartTypes; - sal_Int32 nContTypes; - ScanState eState; - sal_Unicode cGroupSep; - sal_Unicode cDecimalSep; + UPT_FLAG_TYPE* pTable; + UPT_FLAG_TYPE* pStart; + UPT_FLAG_TYPE* pCont; + sal_Int32 nStartTypes; + sal_Int32 nContTypes; + ScanState eState; + sal_Unicode cGroupSep; + sal_Unicode cDecimalSep; /// Get corresponding KParseTokens flag for a character sal_Int32 getParseTokensType( const sal_Unicode* aStr, sal_Int32 nPos ); @@ -183,6 +183,6 @@ private: }; -} } } } +} } } } #endif diff --git a/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx index e47fbd184c26..cd5ff7551b17 100644 --- a/i18npool/inc/chaptercollator.hxx +++ b/i18npool/inc/chaptercollator.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 @@ -53,7 +53,7 @@ public: virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); private : - // CharacterClassification Implementation + // CharacterClassification Implementation com::sun::star::uno::Reference< XCharacterClassification > cclass; }; diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx index 0292507a379a..73cf4da6b7d2 100644 --- a/i18npool/inc/characterclassificationImpl.hxx +++ b/i18npool/inc/characterclassificationImpl.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 @@ -46,36 +46,36 @@ public: CharacterClassificationImpl( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF ); virtual ~CharacterClassificationImpl(); - virtual rtl::OUString SAL_CALL toUpper( const rtl::OUString& Text, - sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) + virtual rtl::OUString SAL_CALL toUpper( const rtl::OUString& Text, + sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL toLower( const rtl::OUString& Text, + virtual rtl::OUString SAL_CALL toLower( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL toTitle( const rtl::OUString& Text, sal_Int32 nPos, - sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) + virtual rtl::OUString SAL_CALL toTitle( const rtl::OUString& Text, sal_Int32 nPos, + sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getType( const rtl::OUString& Text, sal_Int32 nPos ) + virtual sal_Int16 SAL_CALL getType( const rtl::OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getCharacterDirection( const rtl::OUString& Text, sal_Int32 nPos ) + virtual sal_Int16 SAL_CALL getCharacterDirection( const rtl::OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getScript( const rtl::OUString& Text, sal_Int32 nPos ) + virtual sal_Int16 SAL_CALL getScript( const rtl::OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getCharacterType( const rtl::OUString& text, sal_Int32 nPos, - const com::sun::star::lang::Locale& rLocale ) + virtual sal_Int32 SAL_CALL getCharacterType( const rtl::OUString& text, sal_Int32 nPos, + const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getStringType( const rtl::OUString& text, sal_Int32 nPos, - sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) + virtual sal_Int32 SAL_CALL getStringType( const rtl::OUString& text, sal_Int32 nPos, + sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); virtual ParseResult SAL_CALL parseAnyToken( const rtl::OUString& Text, sal_Int32 nPos, - const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, - const rtl::OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, - const rtl::OUString& userDefinedCharactersCont ) + const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, + const rtl::OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, + const rtl::OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException); - virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, - const rtl::OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, - sal_Int32 nStartCharFlags, const rtl::OUString& userDefinedCharactersStart, - sal_Int32 nContCharFlags, const rtl::OUString& userDefinedCharactersCont ) + virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, + const rtl::OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, + sal_Int32 nStartCharFlags, const rtl::OUString& userDefinedCharactersStart, + sal_Int32 nContCharFlags, const rtl::OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException); //XServiceInfo @@ -88,15 +88,15 @@ public: private: struct lookupTableItem { - lookupTableItem(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rName, - com::sun::star::uno::Reference < XCharacterClassification >& rxCI) : + lookupTableItem(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rName, + com::sun::star::uno::Reference < XCharacterClassification >& rxCI) : aLocale(rLocale), aName(rName), xCI(rxCI) {}; com::sun::star::lang::Locale aLocale; rtl::OUString aName; com::sun::star::uno::Reference < XCharacterClassification > xCI; sal_Bool SAL_CALL equals(const com::sun::star::lang::Locale& rLocale) { - return aLocale.Language == rLocale.Language && - aLocale.Country == rLocale.Country && + return aLocale.Language == rLocale.Language && + aLocale.Country == rLocale.Country && aLocale.Variant == rLocale.Variant; }; }; diff --git a/i18npool/inc/chartonum.hxx b/i18npool/inc/chartonum.hxx index 5f2e8fdd55e5..d65ed525ad9b 100644 --- a/i18npool/inc/chartonum.hxx +++ b/i18npool/inc/chartonum.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 @@ -57,5 +57,5 @@ TRANSLITERATION_CHARTONUM(_th) #undef TRANSLITERATION_CHARTONUM } } } } - + #endif // _L10N_TRANSLITERATION_CHARTONUM_HXX_ diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx index 7e4192553183..6e801db4b913 100644 --- a/i18npool/inc/collatorImpl.hxx +++ b/i18npool/inc/collatorImpl.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 @@ -62,7 +62,7 @@ public: virtual sal_Int32 SAL_CALL compareString( const rtl::OUString& s1, const rtl::OUString& s2) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale& rLocale, sal_Int32 collatorOptions) + virtual sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale& rLocale, sal_Int32 collatorOptions) throw(com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL loadCollatorAlgorithm( const rtl::OUString& impl, const lang::Locale& rLocale, @@ -90,7 +90,7 @@ private : rtl::OUString algorithm; rtl::OUString service; com::sun::star::uno::Reference < XCollator > xC; - lookupTableItem(const lang::Locale& rLocale, const rtl::OUString& _algorithm, const rtl::OUString& _service, + lookupTableItem(const lang::Locale& rLocale, const rtl::OUString& _algorithm, const rtl::OUString& _service, com::sun::star::uno::Reference < XCollator >& _xC) : aLocale(rLocale), algorithm(_algorithm), service(_service), xC(_xC) {} sal_Bool SAL_CALL equals(const lang::Locale& rLocale, const rtl::OUString& _algorithm) { return aLocale.Language == rLocale.Language && @@ -107,7 +107,7 @@ private : // lang::Locale Data com::sun::star::uno::Reference < XLocaleData > localedata; - sal_Bool SAL_CALL createCollator(const lang::Locale& rLocale, const rtl::OUString& serviceName, + sal_Bool SAL_CALL createCollator(const lang::Locale& rLocale, const rtl::OUString& serviceName, const rtl::OUString& rSortAlgorithm) throw(com::sun::star::uno::RuntimeException); void SAL_CALL loadCachedCollator(const lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm) throw(com::sun::star::uno::RuntimeException); diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx index 312f41cb1793..59f7f91384b4 100644 --- a/i18npool/inc/collator_unicode.hxx +++ b/i18npool/inc/collator_unicode.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 @@ -59,7 +59,7 @@ public: // following 4 methods are implemented in collatorImpl. - sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale&, sal_Int32) + sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale&, sal_Int32) throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();} void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const rtl::OUString&, const lang::Locale&, const com::sun::star::uno::Sequence< sal_Int32 >&) throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();} diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx index 1d9a319ac12c..55cc82aede9c 100644 --- a/i18npool/inc/defaultnumberingprovider.hxx +++ b/i18npool/inc/defaultnumberingprovider.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 diff --git a/i18npool/inc/i18npool/i18npooldllapi.h b/i18npool/inc/i18npool/i18npooldllapi.h index 581352ef3fa2..8b7e08336b69 100644 --- a/i18npool/inc/i18npool/i18npooldllapi.h +++ b/i18npool/inc/i18npool/i18npooldllapi.h @@ -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 @@ -27,15 +27,15 @@ #ifndef INCLUDED_I18NPOOL_I18NPOOLDLLAPI_H #define INCLUDED_I18NPOOL_I18NPOOLDLLAPI_H - + #include "sal/types.h" - + #if defined(I18NPOOL_DLLIMPLEMENTATION) #define I18NPOOL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else #define I18NPOOL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define I18NPOOL_DLLPRIVATE SAL_DLLPRIVATE - + #endif /* INCLUDED_I18NPOOL_I18NPOOLDLLAPI_H */ diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h index 52e4e51d7a41..fd6a08afa033 100644 --- a/i18npool/inc/i18npool/lang.h +++ b/i18npool/inc/i18npool/lang.h @@ -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 @@ -64,7 +64,7 @@ Language Identifier Constants and Strings http://msdn2.microsoft.com/en-us/library/ms776294.aspx - Hey, yet another list, maybe this one will not move around? It seems to be + Hey, yet another list, maybe this one will not move around? It seems to be quite complete.. Language Identifier Constants and Strings (Windows) http://msdn.microsoft.com/en-us/library/dd318693(VS.85).aspx diff --git a/i18npool/inc/i18npool/mslangid.hxx b/i18npool/inc/i18npool/mslangid.hxx index 61f526a7f370..03350e1042a1 100644 --- a/i18npool/inc/i18npool/mslangid.hxx +++ b/i18npool/inc/i18npool/mslangid.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 diff --git a/i18npool/inc/i18npool/paper.hxx b/i18npool/inc/i18npool/paper.hxx index 76aebbe473d5..e8c0119b8953 100644 --- a/i18npool/inc/i18npool/paper.hxx +++ b/i18npool/inc/i18npool/paper.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 diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx index 11395cce8bf6..c8d99be98bc4 100644 --- a/i18npool/inc/indexentrysupplier.hxx +++ b/i18npool/inc/indexentrysupplier.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 @@ -33,10 +33,10 @@ namespace com { namespace sun { namespace star { namespace i18n { -// ---------------------------------------------------- -// class IndexEntrySupplier -// ---------------------------------------------------- -class IndexEntrySupplier : public cppu::WeakImplHelper2 +// ---------------------------------------------------- +// class IndexEntrySupplier +// ---------------------------------------------------- +class IndexEntrySupplier : public cppu::WeakImplHelper2 < com::sun::star::i18n::XExtendedIndexEntrySupplier, com::sun::star::lang::XServiceInfo @@ -46,50 +46,50 @@ public: IndexEntrySupplier( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF ); // Methods - virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList() + virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList() throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAlgorithmList( + virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAlgorithmList( const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL loadAlgorithm( + virtual sal_Bool SAL_CALL loadAlgorithm( const com::sun::star::lang::Locale& rLocale, - const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions ) + const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL usePhoneticEntry( - const com::sun::star::lang::Locale& rLocale ) + const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); virtual rtl::OUString SAL_CALL getPhoneticCandidate( const rtl::OUString& IndexEntry, - const com::sun::star::lang::Locale& rLocale ) + const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry, - const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) + const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1, const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, - const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2, + const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2, const com::sun::star::lang::Locale& rLocale2 ) throw (com::sun::star::uno::RuntimeException); virtual rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& IndexEntry, - const com::sun::star::lang::Locale& rLocale, const rtl::OUString& SortAlgorithm ) + const com::sun::star::lang::Locale& rLocale, const rtl::OUString& SortAlgorithm ) throw (com::sun::star::uno::RuntimeException); virtual rtl::OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages, - const com::sun::star::lang::Locale& rLocale ) + const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); private: @@ -105,6 +105,6 @@ protected: rtl::OUString aSortAlgorithm; }; -} } } } +} } } } #endif diff --git a/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx index 42ab05eda04d..0619f7286e25 100644 --- a/i18npool/inc/indexentrysupplier_asian.hxx +++ b/i18npool/inc/indexentrysupplier_asian.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 @@ -33,33 +33,33 @@ namespace com { namespace sun { namespace star { namespace i18n { -// ---------------------------------------------------- -// class IndexEntrySupplier_asian -// ---------------------------------------------------- +// ---------------------------------------------------- +// class IndexEntrySupplier_asian +// ---------------------------------------------------- class IndexEntrySupplier_asian : public IndexEntrySupplier_Common { public: IndexEntrySupplier_asian( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF ); ~IndexEntrySupplier_asian(); - rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry, - const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rAlgorithm ) + rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry, + const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rAlgorithm ) throw (com::sun::star::uno::RuntimeException); - rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& rIndexEntry, - const rtl::OUString& rPhoneticEntry, const com::sun::star::lang::Locale& rLocale) + rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& rIndexEntry, + const rtl::OUString& rPhoneticEntry, const com::sun::star::lang::Locale& rLocale) throw (com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL compareIndexEntry( - const rtl::OUString& rIndexEntry1, const rtl::OUString& rPhoneticEntry1, + const rtl::OUString& rIndexEntry1, const rtl::OUString& rPhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, - const rtl::OUString& rIndexEntry2, const rtl::OUString& rPhoneticEntry2, + const rtl::OUString& rIndexEntry2, const rtl::OUString& rPhoneticEntry2, const com::sun::star::lang::Locale& rLocale2 ) throw (com::sun::star::uno::RuntimeException); rtl::OUString SAL_CALL getPhoneticCandidate( const rtl::OUString& rIndexEntry, - const com::sun::star::lang::Locale& rLocale ) + const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); private: oslModule hModule; }; -} } } } +} } } } #endif diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx index eae97f019237..0562d63c79e9 100644 --- a/i18npool/inc/indexentrysupplier_common.hxx +++ b/i18npool/inc/indexentrysupplier_common.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 @@ -35,11 +35,11 @@ namespace com { namespace sun { namespace star { namespace i18n { -// ---------------------------------------------------- -// class IndexEntrySupplier_Common -// ---------------------------------------------------- +// ---------------------------------------------------- +// class IndexEntrySupplier_Common +// ---------------------------------------------------- -class IndexEntrySupplier_Common : public cppu::WeakImplHelper2 +class IndexEntrySupplier_Common : public cppu::WeakImplHelper2 < com::sun::star::i18n::XExtendedIndexEntrySupplier, com::sun::star::lang::XServiceInfo @@ -49,33 +49,33 @@ public: IndexEntrySupplier_Common( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF ); ~IndexEntrySupplier_Common(); - virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList() + virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList() throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAlgorithmList( + virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAlgorithmList( const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL usePhoneticEntry( - const com::sun::star::lang::Locale& rLocale ) + const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); virtual rtl::OUString SAL_CALL getPhoneticCandidate( const rtl::OUString& IndexEntry, - const com::sun::star::lang::Locale& rLocale ) + const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL loadAlgorithm( + virtual sal_Bool SAL_CALL loadAlgorithm( const com::sun::star::lang::Locale& rLocale, - const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions ) + const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException); virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry, - const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) + const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1, const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, - const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2, + const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2, const com::sun::star::lang::Locale& rLocale2 ) throw (com::sun::star::uno::RuntimeException); @@ -84,15 +84,15 @@ public: throw (com::sun::star::uno::RuntimeException); virtual rtl::OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages, - const com::sun::star::lang::Locale& rLocale ) + const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); protected: @@ -100,7 +100,7 @@ protected: sal_Bool usePhonetic; CollatorImpl *collator; const rtl::OUString& SAL_CALL getEntry( const rtl::OUString& IndexEntry, - const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) + const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); com::sun::star::lang::Locale aLocale; rtl::OUString aAlgorithm; diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx index eae78f5c576d..8a99625e83cb 100644 --- a/i18npool/inc/indexentrysupplier_default.hxx +++ b/i18npool/inc/indexentrysupplier_default.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 @@ -33,26 +33,26 @@ namespace com { namespace sun { namespace star { namespace i18n { class Index; -// ---------------------------------------------------- -// class IndexEntrySupplier_Unicode -// ---------------------------------------------------- +// ---------------------------------------------------- +// class IndexEntrySupplier_Unicode +// ---------------------------------------------------- class IndexEntrySupplier_Unicode : public IndexEntrySupplier_Common { public: IndexEntrySupplier_Unicode( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF ); ~IndexEntrySupplier_Unicode(); - virtual sal_Bool SAL_CALL loadAlgorithm( + virtual sal_Bool SAL_CALL loadAlgorithm( const com::sun::star::lang::Locale& rLocale, - const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions ) + const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException); virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry, - const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) + const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1, const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, - const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2, + const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2, const com::sun::star::lang::Locale& rLocale2 ) throw (com::sun::star::uno::RuntimeException); @@ -86,7 +86,7 @@ public: #define MAX_KEYS 0xff #define MAX_TABLES 20 -class Index +class Index { public: Index(const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF); diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx index 3b5faa823153..9f8cc7dee644 100644 --- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx +++ b/i18npool/inc/indexentrysupplier_ja_phonetic.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 @@ -32,9 +32,9 @@ namespace com { namespace sun { namespace star { namespace i18n { -// ---------------------------------------------------- -// class IndexEntrySupplier_ja_phonetic -// ---------------------------------------------------- +// ---------------------------------------------------- +// class IndexEntrySupplier_ja_phonetic +// ---------------------------------------------------- class IndexEntrySupplier_ja_phonetic : public IndexEntrySupplier_Common { public: @@ -71,5 +71,5 @@ INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_first_by_consonant ) INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_last_by_syllable ) INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_last_by_consonant ) -} } } } +} } } } #endif diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx index 84d1b4938d1b..1be2af078478 100644 --- a/i18npool/inc/inputsequencechecker.hxx +++ b/i18npool/inc/inputsequencechecker.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 @@ -37,9 +37,9 @@ namespace com { namespace sun { namespace star { namespace i18n { -// ---------------------------------------------------- -// class InputSequenceCheckerImpl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class InputSequenceCheckerImpl +// ---------------------------------------------------- class InputSequenceCheckerImpl : public cppu::WeakImplHelper2 < com::sun::star::i18n::XExtendedInputSequenceChecker, @@ -59,7 +59,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); @@ -85,6 +85,6 @@ private : sal_Char* SAL_CALL getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar); }; -} } } } +} } } } #endif // _I18N_BREAKITERATOR_HXX_ diff --git a/i18npool/inc/inputsequencechecker_hi.hxx b/i18npool/inc/inputsequencechecker_hi.hxx index 4f0e4a7e2cb6..1bcdf18b54ab 100644 --- a/i18npool/inc/inputsequencechecker_hi.hxx +++ b/i18npool/inc/inputsequencechecker_hi.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 @@ -29,14 +29,14 @@ #include <inputsequencechecker.hxx> -namespace com { -namespace sun { -namespace star { +namespace com { +namespace sun { +namespace star { namespace i18n { -// ---------------------------------------------------- -// class InputSequenceChecker_hi -// ---------------------------------------------------- +// ---------------------------------------------------- +// class InputSequenceChecker_hi +// ---------------------------------------------------- class InputSequenceChecker_hi : public InputSequenceCheckerImpl { public: @@ -50,6 +50,6 @@ public: sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException); }; -} } } } +} } } } #endif diff --git a/i18npool/inc/inputsequencechecker_th.hxx b/i18npool/inc/inputsequencechecker_th.hxx index 979740626682..1f1872393c84 100644 --- a/i18npool/inc/inputsequencechecker_th.hxx +++ b/i18npool/inc/inputsequencechecker_th.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 @@ -31,9 +31,9 @@ namespace com { namespace sun { namespace star { namespace i18n { -// ---------------------------------------------------- -// class InputSequenceChecker_th -// ---------------------------------------------------- +// ---------------------------------------------------- +// class InputSequenceChecker_th +// ---------------------------------------------------- class InputSequenceChecker_th : public InputSequenceCheckerImpl { public: @@ -47,6 +47,6 @@ public: sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException); }; -} } } } +} } } } #endif // _I18N_BREAKITERATOR_HXX_ diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index 327d0f5bd55b..d65ba6a420b5 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.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 diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx index 9054f0b67851..cacebd8888cf 100644 --- a/i18npool/inc/nativenumbersupplier.hxx +++ b/i18npool/inc/nativenumbersupplier.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 @@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star { namespace i18n { // ---------------------------------------------------- // class NativeNumberSupplier // ---------------------------------------------------- -class NativeNumberSupplier : public cppu::WeakImplHelper2 +class NativeNumberSupplier : public cppu::WeakImplHelper2 < com::sun::star::i18n::XNativeNumberSupplier, com::sun::star::lang::XServiceInfo @@ -52,24 +52,24 @@ public: const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isValidNatNum( const ::com::sun::star::lang::Locale& aLocale, + virtual sal_Bool SAL_CALL isValidNatNum( const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::i18n::NativeNumberXmlAttributes SAL_CALL convertToXmlAttributes( - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) + const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL convertFromXmlAttributes( + virtual sal_Int16 SAL_CALL convertFromXmlAttributes( const ::com::sun::star::i18n::NativeNumberXmlAttributes& aAttr ) throw (::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); // following methods are not for XNativeNumberSupplier, they are for calling from transliterations @@ -86,6 +86,6 @@ private: sal_Bool useOffset; }; -} } } } +} } } } #endif diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx index eeefba3a7c27..04c126067781 100644 --- a/i18npool/inc/numberformatcode.hxx +++ b/i18npool/inc/numberformatcode.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 diff --git a/i18npool/inc/numtochar.hxx b/i18npool/inc/numtochar.hxx index 8c8f307d9c1d..27e83c3e5445 100644 --- a/i18npool/inc/numtochar.hxx +++ b/i18npool/inc/numtochar.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 @@ -58,5 +58,5 @@ TRANSLITERATION_NUMTOCHAR(Halfwidth) #undef TRANSLITERATION_NUMTOCHAR } } } } - + #endif // _L10N_TRANSLITERATION_NUMTOCHAR_HXX_ diff --git a/i18npool/inc/numtotext_cjk.hxx b/i18npool/inc/numtotext_cjk.hxx index 9d266af17774..98654192a7db 100644 --- a/i18npool/inc/numtotext_cjk.hxx +++ b/i18npool/inc/numtotext_cjk.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 diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx index 4be7bbe74ff3..e91b5eceaf62 100644 --- a/i18npool/inc/ordinalsuffix.hxx +++ b/i18npool/inc/ordinalsuffix.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,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace i18n { class OrdinalSuffix : public cppu::WeakImplHelper2 -< +< XOrdinalSuffix, com::sun::star::lang::XServiceInfo > diff --git a/i18npool/inc/pch/precompiled_i18npool.cxx b/i18npool/inc/pch/precompiled_i18npool.cxx index 5abba95233d3..52d75a1eb97c 100644 --- a/i18npool/inc/pch/precompiled_i18npool.cxx +++ b/i18npool/inc/pch/precompiled_i18npool.cxx @@ -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 diff --git a/i18npool/inc/pch/precompiled_i18npool.hxx b/i18npool/inc/pch/precompiled_i18npool.hxx index dd53267e0b0d..b738f21a7379 100644 --- a/i18npool/inc/pch/precompiled_i18npool.hxx +++ b/i18npool/inc/pch/precompiled_i18npool.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 diff --git a/i18npool/inc/scripttypedetector.hxx b/i18npool/inc/scripttypedetector.hxx index 3ae841a4175b..04e0c7c7e430 100644 --- a/i18npool/inc/scripttypedetector.hxx +++ b/i18npool/inc/scripttypedetector.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 @@ -32,9 +32,9 @@ #include <com/sun/star/i18n/XScriptTypeDetector.hpp> #include <cppuhelper/implbase2.hxx> // helper for implementations -// ---------------------------------------------------- -// class ScriptTypeDetector -// ---------------------------------------------------- +// ---------------------------------------------------- +// class ScriptTypeDetector +// ---------------------------------------------------- class ScriptTypeDetector : public cppu::WeakImplHelper2 < ::com::sun::star::i18n::XScriptTypeDetector, diff --git a/i18npool/inc/servicename.hxx b/i18npool/inc/servicename.hxx index 605a9e2e5390..a56319f19640 100644 --- a/i18npool/inc/servicename.hxx +++ b/i18npool/inc/servicename.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 @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -/* +/* Service Name com.sun.star.i18n.Transliteration ... dispatching UNO object and generic methods com.sun.star.i18n.Transliteration.u2l ... upper to lower @@ -43,12 +43,12 @@ Implementation Name com.sun.star.i18n.Transliteration.u2l com.sun.star.i18n.Transliteration.l2u com.sun.star.i18n.Transliteration.caseignore - For these there services above, + For these there services above, com.sun.star.i18n.Transliteration.ja_JP ^^^^^ Locale name - + For com.sun.star.i18n.l10n.Transliteration service, com.sun.star.i18n.Transliteration.HALFWIDTH_FULLWIDTH, com.sun.star.i18n.Transliteration.FULLWIDTH_HALFWIDTH, @@ -59,7 +59,7 @@ Implementation Name ... These objects above can be used in every Locale context. -*/ +*/ #ifndef _I18N_SERVICENAME_HXX_ @@ -67,20 +67,20 @@ Implementation Name -#define TRLT_SERVICELNAME "com.sun.star.i18n.Transliteration" -#define TRLT_SERVICELNAME_PREFIX TRLT_SERVICELNAME "." -#define TRLT_SERVICELNAME_U2L TRLT_SERVICELNAME_PREFIX "u2l" -#define TRLT_SERVICELNAME_L2U TRLT_SERVICELNAME_PREFIX "l2u" -#define TRLT_SERVICELNAME_CASEIGNORE TRLT_SERVICELNAME_PREFIX "caseignore" -#define TRLT_SERVICELNAME_L10N TRLT_SERVICELNAME_PREFIX "l10n" +#define TRLT_SERVICELNAME "com.sun.star.i18n.Transliteration" +#define TRLT_SERVICELNAME_PREFIX TRLT_SERVICELNAME "." +#define TRLT_SERVICELNAME_U2L TRLT_SERVICELNAME_PREFIX "u2l" +#define TRLT_SERVICELNAME_L2U TRLT_SERVICELNAME_PREFIX "l2u" +#define TRLT_SERVICELNAME_CASEIGNORE TRLT_SERVICELNAME_PREFIX "caseignore" +#define TRLT_SERVICELNAME_L10N TRLT_SERVICELNAME_PREFIX "l10n" -#define TRLT_IMPLNAME "com.sun.star.i18n.Transliteration" -#define TRLT_IMPLNAME_PREFIX_LEN 34 -#define TRLT_IMPLNAME_PREFIX "com.sun.star.i18n.Transliteration." -// 1...5...901...5...901...5...901..4 --> 34 +#define TRLT_IMPLNAME "com.sun.star.i18n.Transliteration" +#define TRLT_IMPLNAME_PREFIX_LEN 34 +#define TRLT_IMPLNAME_PREFIX "com.sun.star.i18n.Transliteration." +// 1...5...901...5...901...5...901..4 --> 34 -#define TRLT_IMPLNAME_L10N TRLT_IMPLNAME_PREFIX "l10n" -#define TRLT_IMPLNAME_FH TRLT_IMPLNAME_PREFIX "FULLWIDTH_HALFWIDTH" // for test -#define TRLT_IMPLNAME_Ja_JP TRLT_IMPLNAME_PREFIX "ja_JP" +#define TRLT_IMPLNAME_L10N TRLT_IMPLNAME_PREFIX "l10n" +#define TRLT_IMPLNAME_FH TRLT_IMPLNAME_PREFIX "FULLWIDTH_HALFWIDTH" // for test +#define TRLT_IMPLNAME_Ja_JP TRLT_IMPLNAME_PREFIX "ja_JP" #endif diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx index e1452606d28f..17528aba766b 100644 --- a/i18npool/inc/textToPronounce_zh.hxx +++ b/i18npool/inc/textToPronounce_zh.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 @@ -38,7 +38,7 @@ protected: oslModule hModule; sal_uInt16 **idx; const sal_Unicode* SAL_CALL getPronounce(const sal_Unicode ch); - + public: TextToPronounce_zh(const sal_Char* func_name); ~TextToPronounce_zh(); @@ -53,12 +53,12 @@ public: equals( const rtl::OUString & str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32 & nMatch1, const rtl::OUString & str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32 & nMatch2) throw (com::sun::star::uno::RuntimeException); - rtl::OUString SAL_CALL - transliterateChar2String( sal_Unicode inChar) + rtl::OUString SAL_CALL + transliterateChar2String( sal_Unicode inChar) throw(com::sun::star::uno::RuntimeException); - sal_Unicode SAL_CALL - transliterateChar2Char( sal_Unicode inChar) + sal_Unicode SAL_CALL + transliterateChar2Char( sal_Unicode inChar) throw(com::sun::star::uno::RuntimeException, com::sun::star::i18n::MultipleCharsOutputException); }; diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx index 9cdc8a9b75e2..140d17edc27f 100644 --- a/i18npool/inc/textconversion.hxx +++ b/i18npool/inc/textconversion.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 @@ -50,42 +50,42 @@ public: TextConversion(); ~TextConversion(); // Methods - virtual com::sun::star::i18n::TextConversionResult SAL_CALL - getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, - sal_Int32 nTextConversionOptions ) + virtual com::sun::star::i18n::TextConversionResult SAL_CALL + getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ) = 0; - virtual rtl::OUString SAL_CALL - getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, - sal_Int32 nTextConversionOptions ) + virtual rtl::OUString SAL_CALL + getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ) = 0; - virtual rtl::OUString SAL_CALL - getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, - sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) + virtual rtl::OUString SAL_CALL + getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ) = 0; - virtual sal_Bool SAL_CALL + virtual sal_Bool SAL_CALL interactiveConversion(const ::com::sun::star::lang::Locale& aLocale, - sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) + sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ) = 0; //XServiceInfo - rtl::OUString SAL_CALL - getImplementationName() + rtl::OUString SAL_CALL + getImplementationName() throw( com::sun::star::uno::RuntimeException ); - sal_Bool SAL_CALL - supportsService(const rtl::OUString& ServiceName) + sal_Bool SAL_CALL + supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); protected : @@ -110,31 +110,31 @@ public: TextConversion_ko( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF ); // Methods - com::sun::star::i18n::TextConversionResult SAL_CALL - getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, - sal_Int32 nTextConversionOptions ) + com::sun::star::i18n::TextConversionResult SAL_CALL + getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); - rtl::OUString SAL_CALL - getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, - sal_Int32 nTextConversionOptions ) + rtl::OUString SAL_CALL + getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); - rtl::OUString SAL_CALL - getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, - sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) + rtl::OUString SAL_CALL + getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); - sal_Bool SAL_CALL + sal_Bool SAL_CALL interactiveConversion(const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, - sal_Int32 nTextConversionOptions ) + sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); @@ -146,7 +146,7 @@ private : com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionaryList > xCDL; sal_Int32 maxLeftLength; sal_Int32 maxRightLength; - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getCharConversions(const rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toHanja); }; @@ -166,38 +166,38 @@ public: TextConversion_zh( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF ); // Methods - com::sun::star::i18n::TextConversionResult SAL_CALL - getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, - sal_Int32 nTextConversionOptions ) + com::sun::star::i18n::TextConversionResult SAL_CALL + getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); - rtl::OUString SAL_CALL - getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, - sal_Int32 nTextConversionOptions ) + rtl::OUString SAL_CALL + getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); - rtl::OUString SAL_CALL - getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, - sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) + rtl::OUString SAL_CALL + getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); - sal_Bool SAL_CALL + sal_Bool SAL_CALL interactiveConversion(const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, - sal_Int32 nTextConversionOptions ) + sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); private : // user defined dictionary list com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionaryList > xCDL; - rtl::OUString SAL_CALL getWordConversion(const ::rtl::OUString& aText, + rtl::OUString SAL_CALL getWordConversion(const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toSChinese, sal_Int32 nConversionOptions, com::sun::star::uno::Sequence <sal_Int32>& offset); rtl:: OUString SAL_CALL getCharConversion(const rtl:: OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toSChinese, sal_Int32 nConversionOptions); com::sun::star::lang::Locale aLocale; diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx index cd7a15778a78..03312e26cac2 100644 --- a/i18npool/inc/textconversionImpl.hxx +++ b/i18npool/inc/textconversionImpl.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,9 +34,9 @@ namespace com { namespace sun { namespace star { namespace i18n { -// ---------------------------------------------------- -// class TextConversion -// ---------------------------------------------------- +// ---------------------------------------------------- +// class TextConversion +// ---------------------------------------------------- class TextConversionImpl : public cppu::WeakImplHelper2 < com::sun::star::i18n::XExtendedTextConversion, @@ -47,42 +47,42 @@ public: TextConversionImpl( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF ) : xMSF(rxMSF) {}; // Methods - com::sun::star::i18n::TextConversionResult SAL_CALL - getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, - sal_Int32 nTextConversionOptions ) + com::sun::star::i18n::TextConversionResult SAL_CALL + getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); - rtl::OUString SAL_CALL - getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, - sal_Int32 nTextConversionOptions ) + rtl::OUString SAL_CALL + getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); - rtl::OUString SAL_CALL - getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, - sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) + rtl::OUString SAL_CALL + getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); - sal_Bool SAL_CALL + sal_Bool SAL_CALL interactiveConversion( const ::com::sun::star::lang::Locale& aLocale, - sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) + sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); //XServiceInfo - rtl::OUString SAL_CALL - getImplementationName() + rtl::OUString SAL_CALL + getImplementationName() throw( com::sun::star::uno::RuntimeException ); - sal_Bool SAL_CALL - supportsService(const rtl::OUString& ServiceName) + sal_Bool SAL_CALL + supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); private : diff --git a/i18npool/inc/texttonum.hxx b/i18npool/inc/texttonum.hxx index c9018f69a334..e5fd295d7ee3 100644 --- a/i18npool/inc/texttonum.hxx +++ b/i18npool/inc/texttonum.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 diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx index a50d7cd4e98e..1dd26afeb514 100644 --- a/i18npool/inc/transliterationImpl.hxx +++ b/i18npool/inc/transliterationImpl.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 @@ -64,13 +64,13 @@ public: throw(com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL loadModuleNew( const com::sun::star::uno::Sequence< TransliterationModulesNew >& modName, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL loadModuleByImplName( const rtl::OUString& implName, + virtual void SAL_CALL loadModuleByImplName( const rtl::OUString& implName, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); virtual void SAL_CALL loadModulesByImplNames(const com::sun::star::uno::Sequence< rtl::OUString >& modNamelist, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getAvailableModules( - const com::sun::star::lang::Locale& rLocale, sal_Int16 sType ) + virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getAvailableModules( + const com::sun::star::lang::Locale& rLocale, sal_Int16 sType ) throw(com::sun::star::uno::RuntimeException); virtual rtl::OUString SAL_CALL transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, @@ -84,21 +84,21 @@ public: throw(com::sun::star::uno::RuntimeException) ; virtual rtl::OUString SAL_CALL transliterateChar2String( sal_Unicode inChar ) throw(com::sun::star::uno::RuntimeException) ; - virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar ) + virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar ) throw(com::sun::star::i18n::MultipleCharsOutputException, com::sun::star::uno::RuntimeException) ; /* virtual void SAL_CALL createCascadeInstance( const com::sun::star::uno::Sequence< rtl::OUString >& modNamelist, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ; - virtual rtl::OUString SAL_CALL folding_reverse( const rtl::OUString& inStr, sal_Int32 startPos, + virtual rtl::OUString SAL_CALL folding_reverse( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) throw(com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL transliterateMatch( const rtl::OUString& content, sal_Int32 pos1, sal_Int32 nCount1, - const rtl::OUString& pattern, sal_Int32 pos2, sal_Int32 nCount2 ) + const rtl::OUString& pattern, sal_Int32 pos2, sal_Int32 nCount2 ) throw(com::sun::star::uno::RuntimeException); */ - virtual sal_Bool SAL_CALL equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, - sal_Int32& nMatch1, const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) + virtual sal_Bool SAL_CALL equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, + sal_Int32& nMatch1, const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 ) throw(com::sun::star::uno::RuntimeException) ; @@ -134,13 +134,13 @@ private: }; static TransBody lastTransBody; - virtual sal_Bool SAL_CALL loadModuleByName( const rtl::OUString& implName, - com::sun::star::uno::Reference<com::sun::star::i18n::XExtendedTransliteration> & body, const com::sun::star::lang::Locale& rLocale) + virtual sal_Bool SAL_CALL loadModuleByName( const rtl::OUString& implName, + com::sun::star::uno::Reference<com::sun::star::i18n::XExtendedTransliteration> & body, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); void clear(); - void loadBody( ::rtl::OUString &implName, + void loadBody( ::rtl::OUString &implName, ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XExtendedTransliteration >& body ) throw (::com::sun::star::uno::RuntimeException); diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx index 68201ca5901c..a3044fc06a1d 100644 --- a/i18npool/inc/transliteration_Ignore.hxx +++ b/i18npool/inc/transliteration_Ignore.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 @@ -50,30 +50,30 @@ public: // This method is shared. sal_Bool SAL_CALL - equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, + equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) throw(com::sun::star::uno::RuntimeException); // This method is implemented in sub class if needed. Otherwise, the method implemented in this class will be used. - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL - transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 ) + com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 ) throw(com::sun::star::uno::RuntimeException); // Methods which are shared. sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException); - - rtl::OUString SAL_CALL - transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) + + rtl::OUString SAL_CALL + transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Unicode SAL_CALL - transliterateChar2Char( sal_Unicode inChar) + virtual sal_Unicode SAL_CALL + transliterateChar2Char( sal_Unicode inChar) throw(com::sun::star::uno::RuntimeException, com::sun::star::i18n::MultipleCharsOutputException); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL - transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2, XTransliteration& t1, XTransliteration& t2 ) + com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2, XTransliteration& t1, XTransliteration& t2 ) throw(com::sun::star::uno::RuntimeException); protected: diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx index 76ffd3661a8a..97319b0541d3 100644 --- a/i18npool/inc/transliteration_Numeric.hxx +++ b/i18npool/inc/transliteration_Numeric.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 @@ -44,7 +44,7 @@ public: // Methods which are shared. virtual sal_Int16 SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException); - + virtual ::rtl::OUString SAL_CALL folding( const ::rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(::com::sun::star::uno::RuntimeException); @@ -53,7 +53,7 @@ public: equals( const ::rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const ::rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL transliterateRange( const ::rtl::OUString& str1, const ::rtl::OUString& str2 ) throw(::com::sun::star::uno::RuntimeException); protected: @@ -62,9 +62,9 @@ protected: sal_Unicode* table; sal_Bool recycleSymbol; private: - rtl::OUString SAL_CALL + rtl::OUString SAL_CALL transliterateBullet( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - com::sun::star::uno::Sequence< sal_Int32 >& offset ) + com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException); }; diff --git a/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx index dbe37a1ebe05..d0bee5114f0e 100644 --- a/i18npool/inc/transliteration_OneToOne.hxx +++ b/i18npool/inc/transliteration_OneToOne.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 @@ -37,29 +37,29 @@ typedef sal_Unicode (*TransFunc)(const sal_Unicode); class transliteration_OneToOne : public transliteration_commonclass { public: - rtl::OUString SAL_CALL - transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) + rtl::OUString SAL_CALL + transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException); - sal_Unicode SAL_CALL + sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar) - throw(com::sun::star::uno::RuntimeException, + throw(com::sun::star::uno::RuntimeException, com::sun::star::i18n::MultipleCharsOutputException); // Methods which are shared. sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException); - + rtl::OUString SAL_CALL folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL - equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, + equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) throw(com::sun::star::uno::RuntimeException); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL - transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 ) + com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 ) throw(com::sun::star::uno::RuntimeException); protected: diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx index 3d474a0a53dc..010388a96d4b 100644 --- a/i18npool/inc/transliteration_body.hxx +++ b/i18npool/inc/transliteration_body.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 @@ -56,7 +56,7 @@ public: com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL equals( - const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, + const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) throw(com::sun::star::uno::RuntimeException); diff --git a/i18npool/inc/transliteration_caseignore.hxx b/i18npool/inc/transliteration_caseignore.hxx index 493a01c46f18..4016922fb4d8 100644 --- a/i18npool/inc/transliteration_caseignore.hxx +++ b/i18npool/inc/transliteration_caseignore.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 @@ -44,7 +44,7 @@ public: throw(com::sun::star::uno::RuntimeException); com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL transliterateRange( - const rtl::OUString& str1, const rtl::OUString& str2 ) + const rtl::OUString& str1, const rtl::OUString& str2 ) throw(com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL equals( @@ -65,9 +65,9 @@ public: protected: TransliterationModules moduleLoaded; private: - sal_Int32 SAL_CALL compare( - const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, - const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) + sal_Int32 SAL_CALL compare( + const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, + const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) throw(com::sun::star::uno::RuntimeException); }; diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx index 57de252f1721..4ef8692dec26 100644 --- a/i18npool/inc/transliteration_commonclass.hxx +++ b/i18npool/inc/transliteration_commonclass.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 @@ -95,12 +95,12 @@ public: transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 ) throw(com::sun::star::uno::RuntimeException) = 0; - virtual sal_Int32 SAL_CALL - compareSubstring( const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1, const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) + virtual sal_Int32 SAL_CALL + compareSubstring( const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1, const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL - compareString( const rtl::OUString& s1, const rtl::OUString& s2) + virtual sal_Int32 SAL_CALL + compareString( const rtl::OUString& s1, const rtl::OUString& s2) throw(com::sun::star::uno::RuntimeException); //XServiceInfo diff --git a/i18npool/inc/warnings_guard_unicode_brkiter.h b/i18npool/inc/warnings_guard_unicode_brkiter.h index 50ede3b3bab9..3d29ad88fffc 100644 --- a/i18npool/inc/warnings_guard_unicode_brkiter.h +++ b/i18npool/inc/warnings_guard_unicode_brkiter.h @@ -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 diff --git a/i18npool/inc/warnings_guard_unicode_calendar.h b/i18npool/inc/warnings_guard_unicode_calendar.h index 8ea632da2bc5..ab68bc5f96f8 100644 --- a/i18npool/inc/warnings_guard_unicode_calendar.h +++ b/i18npool/inc/warnings_guard_unicode_calendar.h @@ -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 diff --git a/i18npool/inc/warnings_guard_unicode_tblcoll.h b/i18npool/inc/warnings_guard_unicode_tblcoll.h index 4c4b80e58324..1bf4bd575e8b 100644 --- a/i18npool/inc/warnings_guard_unicode_tblcoll.h +++ b/i18npool/inc/warnings_guard_unicode_tblcoll.h @@ -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 diff --git a/i18npool/inc/wtt.h b/i18npool/inc/wtt.h index a299f38093ba..77d544dc6061 100644 --- a/i18npool/inc/wtt.h +++ b/i18npool/inc/wtt.h @@ -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 @@ -33,42 +33,42 @@ namespace com { namespace sun { namespace star { namespace i18n { * Thai character type definition. */ -#define CT_CTRL 0 // Control character -#define CT_NON 1 // Non-composible -#define CT_CONS 2 // Consonant -#define CT_LV 3 // Leading vowel -#define CT_FV1 4 // Following vowel -#define CT_FV2 5 // Following vowel -#define CT_FV3 6 -#define CT_BV1 7 // Below vowel -#define CT_BV2 8 -#define CT_BD 9 // Below diacritic -#define CT_TONE 10 // Tone -#define CT_AD1 11 // Above diacritic -#define CT_AD2 12 -#define CT_AD3 13 -#define CT_AV1 14 // Above vowel -#define CT_AV2 15 -#define CT_AV3 16 +#define CT_CTRL 0 // Control character +#define CT_NON 1 // Non-composible +#define CT_CONS 2 // Consonant +#define CT_LV 3 // Leading vowel +#define CT_FV1 4 // Following vowel +#define CT_FV2 5 // Following vowel +#define CT_FV3 6 +#define CT_BV1 7 // Below vowel +#define CT_BV2 8 +#define CT_BD 9 // Below diacritic +#define CT_TONE 10 // Tone +#define CT_AD1 11 // Above diacritic +#define CT_AD2 12 +#define CT_AD3 13 +#define CT_AV1 14 // Above vowel +#define CT_AV2 15 +#define CT_AV3 16 -#define MAX_CT 17 +#define MAX_CT 17 -static const sal_uInt16 thaiCT[128] = { // Thai character type - CT_NON, CT_CONS, CT_CONS, CT_CONS, CT_CONS,CT_CONS, CT_CONS, CT_CONS, //0E00 +static const sal_uInt16 thaiCT[128] = { // Thai character type + CT_NON, CT_CONS, CT_CONS, CT_CONS, CT_CONS,CT_CONS, CT_CONS, CT_CONS, //0E00 CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, - CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, //0E10 + CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, //0E10 CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, - CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_FV3, CT_CONS, CT_FV3, CT_CONS, //0E20 + CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_FV3, CT_CONS, CT_FV3, CT_CONS, //0E20 CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_NON, - CT_FV1, CT_AV2, CT_FV1, CT_FV1, CT_AV1, CT_AV3, CT_AV2, CT_AV3, //0E30 + CT_FV1, CT_AV2, CT_FV1, CT_FV1, CT_AV1, CT_AV3, CT_AV2, CT_AV3, //0E30 CT_BV1, CT_BV2, CT_BD, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, - CT_LV, CT_LV, CT_LV, CT_LV, CT_LV, CT_FV2, CT_NON, CT_AD2, //0E40 + CT_LV, CT_LV, CT_LV, CT_LV, CT_LV, CT_FV2, CT_NON, CT_AD2, //0E40 CT_TONE, CT_TONE, CT_TONE, CT_TONE, CT_AD1, CT_AD1, CT_AD3, CT_NON, - CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, //0E50 + CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, //0E50 CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_CTRL }; #define getCharType(x) ((x >= 0x0E00 && x < 0x0E60) ? thaiCT[x - 0x0E00] : CT_NON) -} } } } +} } } } #endif // _I18N_WTT_H_ diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx index 99a52b6ea1b0..68662dbcb0ec 100644 --- a/i18npool/inc/xdictionary.hxx +++ b/i18npool/inc/xdictionary.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 @@ -37,15 +37,15 @@ namespace com { namespace sun { namespace star { namespace i18n { // Whether to use cell boundary code, currently unused but prepared. #define USE_CELL_BOUNDARY_CODE 0 -#define CACHE_MAX 32 // max cache structure number -#define DEFAULT_SIZE 256 // for boundary size, to avoid alloc and release memory +#define CACHE_MAX 32 // max cache structure number +#define DEFAULT_SIZE 256 // for boundary size, to avoid alloc and release memory // cache structure. struct WordBreakCache { - sal_Int32 length; // contents length saved here. - sal_Unicode *contents; // seperated segment contents. - sal_Int32* wordboundary; // word boundaries in segments. - sal_Int32 size; // size of wordboundary + sal_Int32 length; // contents length saved here. + sal_Unicode *contents; // seperated segment contents. + sal_Int32* wordboundary; // word boundaries in segments. + sal_Int32 size; // size of wordboundary WordBreakCache(); sal_Bool equals(const sal_Unicode *str, Boundary& boundary); // checking cached string |