diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:05:45 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:05:45 +0200 |
| commit | b6224ecfd043aad64d2224945db3fafb4f0a4064 (patch) | |
| tree | 273dae3224e0c19fb05209abc612b27803a79cec /accessibility/source | |
| parent | 78f7536260ca5edbf32f31d12a1642cf4b3da234 (diff) | |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit 797de40c4bb63a0f72a282f14e4704993a872c02 (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:24 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit 47bf9a3750fbccb561961a623b766b901fc3a024
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Wed Sep 15 08:43:41 2010 +0200
Commit missing files in setup_native/source/win32/customactions/sellang/
.../source/win32/customactions/sellang/exports.dxp | 1 +
.../source/win32/customactions/sellang/makefile.mk | 79 +++++
.../source/win32/customactions/sellang/sellang.cxx | 347 ++++++++++++++++++++
3 files changed, 427 insertions(+), 0 deletions(-)
commit 0b7ae4e620a78e2b9732f51d4f8dbcf6dff23461
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
cui/source/options/optgdlg.cxx | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
commit 0a6fc538714579edc7c613140ee60c44749c58ff
Author: Kalman Szalai - KAMI <kamihir@freemail.hu>
Date: Tue Sep 14 16:44:59 2010 +0200
premium-splitted-language-packages.diff: Language dependent definitions.
.../source/packinfo/packinfo_office_lang.txt | 104 ++++++++++++++++++++
1 files changed, 104 insertions(+), 0 deletions(-)
commit fc04f6fdba6a3e3a1ac3457cd8c84887447a30ae
Author: Kalman Szalai - KAMI <kamihir@freemail.hu>
Date: Tue Sep 14 16:41:16 2010 +0200
extensions_packinfo.diff: extension integration, setup_native part.
.../source/packinfo/packinfo_extensions.txt | 258 ++++++++++++++++++++
1 files changed, 258 insertions(+), 0 deletions(-)
commit 403e72fe876d9131a3759d49ba3cdff3a5b9454a
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue Sep 14 15:33:58 2010 +0200
metric-field-limits.diff: maximum values were wrong when changing unit
cui/source/tabpages/numpages.cxx | 23 -----------------------
1 files changed, 0 insertions(+), 23 deletions(-)
commit de753a15fecd0bf6b80feda4766b0d586e199b07
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Tue Sep 14 14:51:52 2010 +0200
win32-multi-lang-installer.diff: Multi-language installer stuff
i#66062, i#88638, i#88639
setup_native/prj/build.lst | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit cbab5dec38efe13dd50455a1a9e50caeb8a6949e
Author: Thorsten Behrens <tbehrens@novell.com>
Date: Tue Sep 14 13:11:23 2010 +0200
win32-vs2005-compat.diff: Fix build with Visual Studio 2005
.../source/win32/customactions/rebase/rebase.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit b41159c14ec698e01b43a545e6b93419d0206d5d
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
cui/source/tabpages/paragrph.cxx | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
commit 38d7e2c79e4207d8138a1740e077bf0e83c80856
Author: Amelia Wang <amwang@novell.com>
Date: Mon Sep 13 14:37:50 2010 +0200
cjk-character-units-imp.diff: add a new unit 'character unit'
cui/source/tabpages/paragrph.cxx | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
commit ecd9e9d1a068915607ed0b4cc97e573839c9fe47
Merge: 5145c71 e8b8fec
Author: Jan Holesovsky <kendy@suse.cz>
Date: Wed Sep 8 11:34:02 2010 +0200
Merge commit 'ooo/OOO330_m7'
commit 5145c719bf38b11435c5562b1ef336ecb59b64ae
Merge: b14bcef b221612
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 7 09:33:01 2010 +0200
Merge commit 'ooo/OOO330_m6'
commit e8b8fec48b3ad2464b6ce6744e419190efeb45b3 (tag: refs/tags/ooo/OOO330_m7)
Merge: b221612 86d169e
Author: Kurt Zenker <kz@openoffice.org>
Date: Fri Sep 3 14:31:58 2010 +0200
CWS-TOOLING: integrate CWS fwk155
commit 86d169e89f39d3ddb7bac7f50d2adb1bb7e7d087
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Tue Aug 31 09:17:25 2010 +0200
fwk155: #i107615# integrate the patch from CD
cui/source/customize/cfg.cxx | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
commit b221612dc355d7c219819db42207437eb4fe5fe5 (tag: refs/tags/ooo/OOO330_m6)
Merge: 4f48476 622fdb6
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu Aug 26 13:20:55 2010 +0200
CWS-TOOLING: integrate CWS ooo33gsl07
commit 4f48476894efff2739e6e25b7b2633d41904a252
Merge: 5f4ef9b 09e35e8
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 14:19:19 2010 +0200
CWS-TOOLING: integrate CWS sw33bf08
commit 5f4ef9be8671cf2940b83ea83d6ad5315126bd83
Merge: ae0c345 4fd95ed
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 12:49:35 2010 +0200
CWS-TOOLING: integrate CWS mib18
commit 622fdb67821d299bd8314cd9196e85c5d3d2ce84
Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
Date: Tue Aug 24 11:00:05 2010 +0200
ooo33gsl07: #i114002# add missing license headers
extensions/source/plugin/unx/npnapi.cxx | 31 +++++++++++++++++++++++++------
extensions/source/plugin/unx/nppapi.cxx | 31 +++++++++++++++++++++++++------
2 files changed, 50 insertions(+), 12 deletions(-)
commit 09e35e845fc8941c56e54597ce679b258b97ba1c
Author: Thomas Lange [tl] <tl@openoffice.org>
Date: Wed Aug 18 13:53:28 2010 +0200
cws sw33bf08: #i113867# removing en-US dictionaries from Ukrainian language pack
.../source/packinfo/spellchecker_selection.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 825fb51589a6f29bedae00ee817edfc958597abc
Author: Thomas Lange [tl] <tl@openoffice.org>
Date: Wed Aug 18 13:50:02 2010 +0200
cws sw33bf08: #i113867# removing en-US dictionaries from Ukrainian language pack
.../source/packinfo/spellchecker_selection.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit ae0c34553de6ecabbc6420979a99829c11e472fa (tag: refs/tags/ooo/OOO330_m5)
Merge: 19c39d8 d5b054d
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 13:32:26 2010 +0200
CWS-TOOLING: integrate CWS native324
commit 19c39d8ca1d55ac1cd3349a319669ffd0bee7f18
Merge: ad50c65 e56c03d
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 12:00:05 2010 +0200
CWS-TOOLING: integrate CWS jl154
commit d5b054dc43970313df80e253c78a424841a4eed4
Author: Ingo Schmidt <is@openoffice.org>
Date: Mon Aug 16 12:53:36 2010 +0200
native324 #i113835# preparing rpm installation on debian systems
.../openoffice/setup/Installer/LinuxInstaller.java | 130 +++++++++++---------
1 files changed, 72 insertions(+), 58 deletions(-)
commit 4fd95ed4edd92cff6667f6d237b9430d52ee5265
Merge: 329c134 ad50c65
Author: Daniel Rentz <dr@openoffice.org>
Date: Fri Aug 13 11:29:46 2010 +0200
mib18: rebase to OOO330m4
commit 9edf45e4490cbf5965cba1b7b80b5c20fab0f5bb
Author: Ingo Schmidt <is@openoffice.org>
Date: Fri Aug 13 11:15:11 2010 +0200
native324 #i113835# preparing rpm installation on debian systems
.../org/openoffice/setup/InstallData.java | 18 ++
.../openoffice/setup/Installer/LinuxInstaller.java | 182 +++++++++++++-------
.../setup/InstallerHelper/LinuxHelper.java | 21 +++
setup_native/scripts/install_linux.sh | 16 ++-
4 files changed, 172 insertions(+), 65 deletions(-)
commit e56c03da11bea148347bc37cd317af862f083d32
Merge: 64623c6 bd8d6fa
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date: Fri Aug 13 07:28:35 2010 +0200
jl154: Local merge
commit bd8d6faa1fdb424a68e50b4ce0dd3f2f72796e78
Merge: 92cc5ae 64623c6
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date: Wed Aug 11 08:57:13 2010 +0200
jl154: Local merge
commit 329c134bc2d01d41a2ab41cbe5a856b764dcf409
Author: Andreas Bregas <ab@openoffice.org>
Date: Fri Aug 6 09:35:51 2010 +0200
mib18: #163121# Declare Rework
basctl/source/basicide/baside2.cxx | 2 +-
basctl/source/basicide/basobj2.cxx | 18 ++++++++++++++----
basctl/source/basicide/macrodlg.cxx | 16 ++++++++++------
3 files changed, 25 insertions(+), 11 deletions(-)
commit 64623c655d414eac4c0e2b266bee913a5456043a
Merge: 28d217b c42035a
Author: Joachim Lingner <jl@openoffice.org>
Date: Mon Aug 2 15:39:29 2010 +0200
jl154 merging with OOO330m2
commit 28d217bc56c559e2439d39fdaa406380f32c9412
Author: Joachim Lingner <jl@openoffice.org>
Date: Thu Jul 29 16:18:26 2010 +0200
jl154 #i162868# Copying from prereg/bundled to user/extensions/bundled failed because of file access right of temporary files in the registry data. The scripts run now chmod after unopkg sync
.../source/packinfo/shellscripts_extensions.txt | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
commit 6512191685b0f43b0938b44ee95b063de7463387
Author: Ingo Schmidt <is@openoffice.org>
Date: Fri Jul 23 18:25:10 2010 +0200
jl154 #162868# solaris postinstall script
.../source/packinfo/shellscripts_extensions.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 859ab84fcc0707bd6c895517325f1985e9d91d8c
Author: Ingo Schmidt <is@openoffice.org>
Date: Fri Jul 23 10:37:24 2010 +0200
jl154 #162868# bundled folder in prereg folder
setup_native/scripts/admin.pl | 2 +-
.../source/packinfo/shellscripts_extensions.txt | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
commit ee943cf4436ff8adbd9440211c39a5c27768369a
Author: Ingo Schmidt <is@openoffice.org>
Date: Thu Jul 22 17:43:35 2010 +0200
jl154 #162868# unopkg in shell script with several quotes
setup_native/scripts/admin.pl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 6ef1482d39a33925b245d245fe6127b4744d0dfd
Author: Ingo Schmidt <is@openoffice.org>
Date: Thu Jul 22 17:26:25 2010 +0200
jl154 #162868# unopkg in shell script with several quotes
.../source/packinfo/shellscripts_extensions.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit afd1eb5b6c81f59342bd8ee7a1b96429289d98dc
Merge: a1e6245 e234443
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date: Thu Jul 22 10:44:04 2010 +0200
jl154: Local branch merge
commit e234443c641e4bc2f5d89b031bbb30f2d560cb95
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jul 21 14:15:34 2010 +0200
jl154 #i162868# changed RemoveExtensions custom action (windows) to delete brand/share/prereg/bundled
.../shellextensions/registerextensions.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 62729bf5d94eb74bb1ff410cc543d8ffcf4f4bdc
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jul 21 13:29:14 2010 +0200
jl154 #i162868# unopkg sync removes share/prereg/bundled, changing registerExtensions
.../shellextensions/registerextensions.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit c803ad8da4a88de0689afee5728f0407ff7d791f
Author: Ingo Schmidt <is@openoffice.org>
Date: Wed Jul 21 12:04:31 2010 +0200
jl154 #162868# new share/prereg folder
setup_native/scripts/admin.pl | 30 +++++++++----------
.../source/packinfo/shellscripts_extensions.txt | 16 +++++-----
2 files changed, 22 insertions(+), 24 deletions(-)
commit a1e6245b5e0a359f1f7e707a263ed1e45dd82067
Merge: 3a7ba2a ffa0e25
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date: Mon Jul 19 14:42:46 2010 +0200
jl154: Local merge
commit ffa0e25150cabfc67705e3fc10cc02952b325966
Author: Ingo Schmidt <is@openoffice.org>
Date: Mon Jul 19 14:23:27 2010 +0200
jl154 #162868# guarantee existence of extensions folder
setup_native/source/packinfo/package.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 3a7ba2ab93b4ec058d92064e7657497d9cbd4794
Merge: 8246234 f6b4bfd
Author: Joachim Lingner <jl@openoffice.org>
Date: Fri Jul 16 15:45:18 2010 +0200
jl154 merging with OOO300_m1
commit 8246234a96c80f2dcb29126cf8f9e96597aa3e16
Author: Joachim Lingner <jl@openoffice.org>
Date: Fri Jul 16 11:52:44 2010 +0200
jl154 #162868# removing the package.txt from the extensions folder. Extensions folder will be created in a different way than installing a dummy file
setup_native/source/packinfo/package.txt | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
commit b8e2cf46d6a073c7fbcd51494a92d6da33181622
Author: Joachim Lingner <jl@openoffice.org>
Date: Thu Jul 15 17:22:01 2010 +0200
jl154 #162868# remove basis/presets/bundled/bundled.ini, and create always share/extensions folder
setup_native/source/packinfo/package.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 757f1ada9215c698c650eba559e05a70322848b7
Author: Joachim Lingner <jl@openoffice.org>
Date: Thu Jul 15 16:28:33 2010 +0200
jl154 #162868# remove basis/presets/bundled/bundled.ini, and create always share/extensions folder
setup_native/scripts/admin.pl | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
commit 0809a24f900b5cf43a70d1f3ab11c681e1906692
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jul 14 15:17:57 2010 +0200
jl154 #162868# removing registration data folder if the last extension was removed
.../shellextensions/registerextensions.cxx | 56 ++++++++++----------
1 files changed, 28 insertions(+), 28 deletions(-)
commit f4230d177ad95e04566dc95859491308b606fdc1
Author: Ingo Schmidt <is@openoffice.org>
Date: Wed Jul 14 11:10:14 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
.../customactions/shellextensions/exports.dxp | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
commit 5e9dc05754c042aae338c22f91e35d6d19780be7
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jul 14 09:23:58 2010 +0200
jl154 #162868# windows custom action for running unopkg sync
.../win32/customactions/languagepacks/exports.dxp | 3 +-
.../source/win32/customactions/patch/exports.dxp | 2 +
.../source/win32/customactions/patch/makefile.mk | 1 +
.../shellextensions/registerextensions.cxx | 200 +++-----------------
4 files changed, 31 insertions(+), 175 deletions(-)
commit f423a7a32a7f0c9dc4740d21b3bfda2504eccd56
Author: Ingo Schmidt <is@openoffice.org>
Date: Tue Jul 13 18:57:19 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
setup_native/scripts/admin.pl | 7 +
setup_native/source/packinfo/packinfo_office.txt | 33 +++++
.../source/packinfo/shellscripts_extensions.txt | 129 +++-----------------
3 files changed, 56 insertions(+), 113 deletions(-)
commit 698b3cb962af8618f3e884ccdf9b9edf1df3b97f
Author: Ingo Schmidt <is@openoffice.org>
Date: Mon Jul 12 18:24:42 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
.../win32/customactions/languagepacks/exports.dxp | 3 +++
.../win32/customactions/languagepacks/makefile.mk | 1 +
.../customactions/shellextensions/exports.dxp | 3 +++
.../customactions/shellextensions/makefile.mk | 1 +
4 files changed, 8 insertions(+), 0 deletions(-)
commit 929f5169397c101ec9fff3fb535376df3de09e2e
Author: Ingo Schmidt <is@openoffice.org>
Date: Mon Jul 12 18:02:39 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
setup_native/scripts/admin.pl | 120 ++++++++++++++++++++++++++++++-----------
1 files changed, 88 insertions(+), 32 deletions(-)
commit b5c165ca38d0f3c8417540a6f185462eb11904f6
Author: Ingo Schmidt <is@openoffice.org>
Date: Mon Jul 12 16:20:39 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
setup_native/scripts/admin.pl | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
commit a5c95fbe4b239c7be2ba0569922bab29d0c21ad3
Merge: 1fad720 c04b382
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jun 30 17:12:59 2010 +0200
jl154 merge with DEV300_m84
Notes
split repo tag: components_OOO_BUILD_3_2_98_1
Diffstat (limited to 'accessibility/source')
69 files changed, 431 insertions, 431 deletions
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index 677c15513d7a..2112c5900f9c 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.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 @@ -59,17 +59,17 @@ public: /** The data table child. */ Reference< ::com::sun::star::accessibility::XAccessible > mxTable; - AccessibleBrowseBoxTable* m_pTable; + AccessibleBrowseBoxTable* m_pTable; /** The header bar for rows ("handle column"). */ Reference< - ::com::sun::star::accessibility::XAccessible > mxRowHeaderBar; - AccessibleBrowseBoxHeaderBar* m_pRowHeaderBar; + ::com::sun::star::accessibility::XAccessible > mxRowHeaderBar; + AccessibleBrowseBoxHeaderBar* m_pRowHeaderBar; /** The header bar for columns (first row of the table). */ Reference< - ::com::sun::star::accessibility::XAccessible > mxColumnHeaderBar; - AccessibleBrowseBoxHeaderBar* m_pColumnHeaderBar; + ::com::sun::star::accessibility::XAccessible > mxColumnHeaderBar; + AccessibleBrowseBoxHeaderBar* m_pColumnHeaderBar; }; // Ctor/Dtor/disposing -------------------------------------------------------- @@ -108,9 +108,9 @@ void SAL_CALL AccessibleBrowseBox::disposing() { ::osl::MutexGuard aGuard( getOslMutex() ); - m_pImpl->m_pTable = NULL; - m_pImpl->m_pColumnHeaderBar = NULL; - m_pImpl->m_pRowHeaderBar = NULL; + m_pImpl->m_pTable = NULL; + m_pImpl->m_pColumnHeaderBar = NULL; + m_pImpl->m_pRowHeaderBar = NULL; m_pImpl->m_aCreator = Reference< XAccessible >(); Reference< XAccessible > xTable = m_pImpl->mxTable; @@ -289,7 +289,7 @@ AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType ) if ( BBTYPE_COLUMNHEADERBAR == eObjType) m_pImpl->m_pColumnHeaderBar = pHeaderBar; else - m_pImpl->m_pRowHeaderBar = pHeaderBar; + m_pImpl->m_pRowHeaderBar = pHeaderBar; *pxMember = pHeaderBar; } @@ -333,7 +333,7 @@ void AccessibleBrowseBox::commitTableEvent(sal_Int16 _nEventId,const Any& _rNewV } } // ----------------------------------------------------------------------------- -void AccessibleBrowseBox::commitHeaderBarEvent( sal_Int16 _nEventId, +void AccessibleBrowseBox::commitHeaderBarEvent( sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue,sal_Bool _bColumnHeaderBar) { diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index f8b43ecdced2..81c8421fc30f 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.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/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx index 560878b544f3..2492e9174982 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.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 @@ -120,7 +120,7 @@ namespace accessibility aValue <<= (sal_Int32) 2; else aValue <<= (sal_Int32) 1; - + return aValue; } @@ -130,7 +130,7 @@ namespace accessibility { Any aValue; aValue <<= (sal_Int32) 0; - + return aValue; } // ----------------------------------------------------------------------------- diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index e801a6cf2c20..d4282841515b 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.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/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx index 9e9f63ec72c8..f2c381a84fa2 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.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/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx index 00a095a104d7..a383b02b1480 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTable.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/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx index 7a7aed644f5c..d31e5c73833f 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.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/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx index fe79593e5613..c2cb6f6610a5 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.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/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index f0aa406b62bf..fe639bd391f3 100755 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.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 @@ -60,17 +60,17 @@ public: /** The data table child. */ Reference< ::com::sun::star::accessibility::XAccessible > m_xTable; - AccessibleGridControlTable* m_pTable; + AccessibleGridControlTable* m_pTable; /** The header bar for rows. */ Reference< - ::com::sun::star::accessibility::XAccessible > m_xRowHeaderBar; - AccessibleGridControlHeader* m_pRowHeaderBar; + ::com::sun::star::accessibility::XAccessible > m_xRowHeaderBar; + AccessibleGridControlHeader* m_pRowHeaderBar; /** The header bar for columns (first row of the table). */ Reference< - ::com::sun::star::accessibility::XAccessible > m_xColumnHeaderBar; - AccessibleGridControlHeader* m_pColumnHeaderBar; + ::com::sun::star::accessibility::XAccessible > m_xColumnHeaderBar; + AccessibleGridControlHeader* m_pColumnHeaderBar; }; DBG_NAME( AccessibleGridControl ) @@ -94,9 +94,9 @@ void SAL_CALL AccessibleGridControl::disposing() { ::osl::MutexGuard aGuard( getOslMutex() ); - m_pImpl->m_pTable = NULL; - m_pImpl->m_pColumnHeaderBar = NULL; - m_pImpl->m_pRowHeaderBar = NULL; + m_pImpl->m_pTable = NULL; + m_pImpl->m_pColumnHeaderBar = NULL; + m_pImpl->m_pRowHeaderBar = NULL; m_pImpl->m_aCreator = Reference< XAccessible >(); Reference< XAccessible > xTable = m_pImpl->m_xTable; @@ -282,7 +282,7 @@ AccessibleGridControl::implGetHeaderBar( AccessibleTableControlObjType eObjType if ( TCTYPE_COLUMNHEADERBAR == eObjType) m_pImpl->m_pColumnHeaderBar = pHeaderBar; else - m_pImpl->m_pRowHeaderBar = pHeaderBar; + m_pImpl->m_pRowHeaderBar = pHeaderBar; *pxMember = pHeaderBar; } diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index ea81bd350426..36dce407650d 100755 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.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/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index 1870eebc8e3e..22358d7b86dc 100755 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.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/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index 485c57c40ae1..48f885213984 100755 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.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/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index 461e776f1392..d743475be01f 100755 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.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 @@ -55,7 +55,7 @@ DBG_NAME( AccessibleGridControlTable ) AccessibleGridControlTable::AccessibleGridControlTable( const Reference< XAccessible >& rxParent, - IAccessibleTable& rTable, + IAccessibleTable& rTable, AccessibleTableControlObjType _eType) : AccessibleGridControlTableBase( rxParent, rTable, _eType ) { diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index f6d1147ad309..83039718bb09 100755 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.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/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index 43b9400e9050..792b7df1fdba 100755 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.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 @@ -120,7 +120,7 @@ namespace accessibility AccessibleGridControlTableCell::AccessibleGridControlTableCell(const Reference<XAccessible >& _rxParent, IAccessibleTable& _rTable, sal_Int32 _nRowPos, - sal_uInt16 _nColPos, + sal_uInt16 _nColPos, AccessibleTableControlObjType eObjType) :AccessibleGridControlCell( _rxParent, _rTable, _nRowPos, _nColPos, eObjType ) { diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx index 6976b221a8b5..5e25d91fce93 100755 --- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx @@ -1,6 +1,6 @@ /************************************************************************* * 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 @@ -366,17 +366,17 @@ namespace accessibility { DBG_UNHANDLED_EXCEPTION(); } - + return NULL; } - + //------------------------------------------------------------------------------------------------------------------ void SAL_CALL AccessibleToolPanelDeck::grabFocus( ) throw (RuntimeException) { MethodGuard aGuard( *m_pImpl ); m_pImpl->m_pPanelDeck->GrabFocus(); } - + //------------------------------------------------------------------------------------------------------------------ void SAL_CALL AccessibleToolPanelDeck::disposing() { diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx index 7e97e3714172..3f5d9791882c 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx @@ -1,6 +1,6 @@ /************************************************************************* * 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/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx index 0cdfd8480457..070a5ebc25ae 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx @@ -1,6 +1,6 @@ /************************************************************************* * 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 @@ -294,41 +294,41 @@ namespace accessibility { return 0; } - + //-------------------------------------------------------------------- Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { (void)i; throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); } - + //-------------------------------------------------------------------- Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleParent( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); return m_pImpl->getAccessibleParent(); } - + //-------------------------------------------------------------------- sal_Int16 SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRole( ) throw (RuntimeException) { return AccessibleRole::PAGE_TAB; } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleDescription( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); return m_pImpl->getPanelDisplayName(); } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleName( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); return m_pImpl->getPanelDisplayName(); } - + //-------------------------------------------------------------------- Reference< XAccessibleRelationSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRelationSet( ) throw (RuntimeException) { @@ -336,7 +336,7 @@ namespace accessibility ::utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper; return pRelationSet; } - + //-------------------------------------------------------------------- Reference< XAccessibleStateSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleStateSet( ) throw (RuntimeException) { @@ -377,14 +377,14 @@ namespace accessibility (void)i_rLocation; return NULL; } - + //-------------------------------------------------------------------- void SAL_CALL AccessibleToolPanelDeckTabBarItem::grabFocus( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); m_pImpl->getTabBar()->FocusPanelItem( m_pImpl->getItemPos() ); } - + //-------------------------------------------------------------------- ::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getForeground( ) throw (RuntimeException) { @@ -392,7 +392,7 @@ namespace accessibility Reference< XAccessibleComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_SET_THROW ); return xParentComponent->getForeground(); } - + //-------------------------------------------------------------------- ::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getBackground( ) throw (RuntimeException) { @@ -400,7 +400,7 @@ namespace accessibility Reference< XAccessibleComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_SET_THROW ); return xParentComponent->getBackground(); } - + //-------------------------------------------------------------------- Reference< XFont > SAL_CALL AccessibleToolPanelDeckTabBarItem::getFont( ) throw (RuntimeException) { @@ -410,7 +410,7 @@ namespace accessibility // a different font ... return xParentComponent->getFont(); } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getTitledBorderText( ) throw (RuntimeException) { @@ -418,7 +418,7 @@ namespace accessibility // no support return ::rtl::OUString(); } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getToolTipText( ) throw (RuntimeException) { @@ -442,7 +442,7 @@ namespace accessibility aItemScreenRect.GetHeight() ); } - + //-------------------------------------------------------------------- void SAL_CALL AccessibleToolPanelDeckTabBarItem::disposing() { diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx index 1c7aca77e603..8825bfe0906d 100644 --- a/accessibility/source/extended/accessiblebrowseboxcell.cxx +++ b/accessibility/source/extended/accessiblebrowseboxcell.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 @@ -86,7 +86,7 @@ namespace accessibility } // ................................................................................. -} // namespace accessibility +} // namespace accessibility // ................................................................................. diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index 5f5472d04050..d767d2ad68a1 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.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 @@ -69,7 +69,7 @@ namespace accessibility { if ( !rBHelper.bDisposed ) { - acquire(); // to prevent duplicate dtor calls + acquire(); // to prevent duplicate dtor calls dispose(); } @@ -122,7 +122,7 @@ namespace accessibility } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleDescription() throw ( RuntimeException ) + ::rtl::OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleDescription() throw ( RuntimeException ) { SolarMethodGuard aGuard( *this ); return m_xInnerContext->getAccessibleDescription(); @@ -148,7 +148,7 @@ namespace accessibility } // ----------------------------------------------------------------------------- - Reference< XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet() throw ( RuntimeException ) + Reference< XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet() throw ( RuntimeException ) { SolarMethodGuard aGuard( *this ); return OAccessibleContextWrapperHelper::getAccessibleRelationSet( ); diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 397161fd6ac0..96664fa827ec 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.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 @@ -58,7 +58,7 @@ namespace accessibility AccessibleIconChoiceCtrl::AccessibleIconChoiceCtrl( SvtIconChoiceCtrl& _rIconCtrl, const Reference< XAccessible >& _xParent ) : VCLXAccessibleComponent( _rIconCtrl.GetWindowPeer() ), - m_xParent ( _xParent ) + m_xParent ( _xParent ) { DBG_CTOR( AccessibleIconChoiceCtrl, NULL ); } diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 19e809bcc6ea..e0c570acb9ce 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.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 @@ -48,8 +48,8 @@ #include <comphelper/accessibleeventnotifier.hxx> #define ACCESSIBLE_ACTION_COUNT 1 -#define AID_EXPAND 0 -#define AID_COLLAPSE 1 +#define AID_EXPAND 0 +#define AID_COLLAPSE 1 namespace { @@ -90,12 +90,12 @@ namespace accessibility ULONG _nPos, const Reference< XAccessible >& _xParent ) : - AccessibleIconChoiceCtrlEntry_BASE ( m_aMutex ), + AccessibleIconChoiceCtrlEntry_BASE ( m_aMutex ), - m_pIconCtrl ( &_rIconCtrl ), - m_nIndex ( _nPos ), + m_pIconCtrl ( &_rIconCtrl ), + m_nIndex ( _nPos ), m_nClientId ( 0 ), - m_xParent ( _xParent ) + m_xParent ( _xParent ) { osl_incrementInterlockedCount( &m_refCount ); @@ -451,7 +451,7 @@ throw(RuntimeException) // do nothing, because no focus for each item } // ----------------------------------------------------------------------------- - sal_Int32 AccessibleIconChoiceCtrlEntry::getForeground( ) throw (RuntimeException) + sal_Int32 AccessibleIconChoiceCtrlEntry::getForeground( ) throw (RuntimeException) { ALBSolarGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -543,7 +543,7 @@ throw(RuntimeException) ::osl::MutexGuard aGuard( m_aMutex ); String sText = getText(); - if ( ( 0 > nStartIndex ) || ( sText.Len() <= nStartIndex ) + if ( ( 0 > nStartIndex ) || ( sText.Len() <= nStartIndex ) || ( 0 > nEndIndex ) || ( sText.Len() <= nEndIndex ) ) throw IndexOutOfBoundsException(); diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index 0468cce97d94..087fedafb88f 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.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 @@ -82,7 +82,7 @@ namespace accessibility // ----------------------------------------------------------------------------- SvTreeListBox* AccessibleListBox::getListBox() const { - return static_cast< SvTreeListBox* >( const_cast<AccessibleListBox*>(this)->GetWindow() ); + return static_cast< SvTreeListBox* >( const_cast<AccessibleListBox*>(this)->GetWindow() ); } // ----------------------------------------------------------------------------- void AccessibleListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 5ce10cbc81b3..57d72b95f652 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.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 @@ -49,7 +49,7 @@ #include <comphelper/accessibleeventnotifier.hxx> #include <toolkit/helper/vclunohelper.hxx> -#define ACCESSIBLE_ACTION_COUNT 1 +#define ACCESSIBLE_ACTION_COUNT 1 namespace { @@ -90,11 +90,11 @@ namespace accessibility SvLBoxEntry* _pEntry, const Reference< XAccessible >& _xParent ) : - AccessibleListBoxEntry_BASE ( m_aMutex ), + AccessibleListBoxEntry_BASE ( m_aMutex ), ListBoxAccessibleBase( _rListBox ), m_nClientId ( 0 ), - m_aParent ( _xParent ) + m_aParent ( _xParent ) { DBG_CTOR( AccessibleListBoxEntry, NULL ); @@ -357,13 +357,13 @@ namespace accessibility { DBG_ASSERT( m_aEntryPath.size(), "AccessibleListBoxEntry::getAccessibleParent: invalid path!" ); if ( 1 == m_aEntryPath.size() ) - { // we're a top level entry + { // we're a top level entry // -> our parent is the tree listbox itself if ( getListBox() ) xParent = getListBox()->GetAccessible( ); } else - { // we have a entry as parent -> get it's accessible + { // we have a entry as parent -> get it's accessible // shorten our access path by one ::std::deque< sal_Int32 > aParentPath( m_aEntryPath ); @@ -523,7 +523,7 @@ namespace accessibility // do nothing, because no focus for each item } // ----------------------------------------------------------------------------- - sal_Int32 AccessibleListBoxEntry::getForeground( ) throw (RuntimeException) + sal_Int32 AccessibleListBoxEntry::getForeground( ) throw (RuntimeException) { ALBSolarGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -613,7 +613,7 @@ namespace accessibility EnsureIsAlive(); String sText = getText(); - if ( ( 0 > nStartIndex ) || ( sText.Len() <= nStartIndex ) + if ( ( 0 > nStartIndex ) || ( sText.Len() <= nStartIndex ) || ( 0 > nEndIndex ) || ( sText.Len() <= nEndIndex ) ) throw IndexOutOfBoundsException(); diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index fc1fb578bd21..e3e405f8b230 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.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 @@ -55,9 +55,9 @@ namespace accessibility DBG_NAME( AccessibleTabBar ) - // ---------------------------------------------------- - // class AccessibleTabBar - // ---------------------------------------------------- + // ---------------------------------------------------- + // class AccessibleTabBar + // ---------------------------------------------------- AccessibleTabBar::AccessibleTabBar( TabBar* pTabBar ) :AccessibleTabBarBase( pTabBar ) @@ -114,13 +114,13 @@ namespace accessibility case VCLEVENT_WINDOW_SHOW: { aNewValue <<= AccessibleStateType::SHOWING; - NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); + NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; case VCLEVENT_WINDOW_HIDE: { aOldValue <<= AccessibleStateType::SHOWING; - NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); + NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; default: @@ -159,7 +159,7 @@ namespace accessibility } // ----------------------------------------------------------------------------- - // OCommonAccessibleComponent + // OCommonAccessibleComponent // ----------------------------------------------------------------------------- awt::Rectangle AccessibleTabBar::implGetBounds() throw (RuntimeException) @@ -344,7 +344,7 @@ namespace accessibility // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBar::getAccessibleDescription( ) throw (RuntimeException) + ::rtl::OUString AccessibleTabBar::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -422,8 +422,8 @@ namespace accessibility { Reference< XAccessible > xAcc = getAccessibleChild( i ); if ( xAcc.is() ) - { - Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY ); + { + Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY ); if ( xComp.is() ) { Rectangle aRect = VCLRectangle( xComp->getBounds() ); @@ -452,7 +452,7 @@ namespace accessibility // ----------------------------------------------------------------------------- - sal_Int32 AccessibleTabBar::getForeground( ) throw (RuntimeException) + sal_Int32 AccessibleTabBar::getForeground( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -550,5 +550,5 @@ namespace accessibility // ----------------------------------------------------------------------------- //......................................................................... -} // namespace accessibility +} // namespace accessibility //......................................................................... diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx index 5c26185f6b03..c908508a4a69 100644 --- a/accessibility/source/extended/accessibletabbarbase.cxx +++ b/accessibility/source/extended/accessibletabbarbase.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/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index 32dfb591a3ad..725c786d72a2 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.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 @@ -58,8 +58,8 @@ namespace accessibility ,m_nPageId( nPageId ) ,m_xParent( rxParent ) { - m_bEnabled = IsEnabled(); - m_bShowing = IsShowing(); + m_bEnabled = IsEnabled(); + m_bShowing = IsShowing(); m_bSelected = IsSelected(); if ( m_pTabBar ) @@ -81,7 +81,7 @@ namespace accessibility sal_Bool bEnabled = sal_False; if ( m_pTabBar ) bEnabled = m_pTabBar->IsPageEnabled( m_nPageId ); - + return bEnabled; } @@ -201,12 +201,12 @@ namespace accessibility } // ----------------------------------------------------------------------------- - // OCommonAccessibleComponent + // OCommonAccessibleComponent // ----------------------------------------------------------------------------- awt::Rectangle AccessibleTabBarPage::implGetBounds() throw (RuntimeException) { - awt::Rectangle aBounds; + awt::Rectangle aBounds; if ( m_pTabBar ) { // get bounding rectangle relative to the AccessibleTabBar @@ -216,7 +216,7 @@ namespace accessibility Reference< XAccessible > xParent = getAccessibleParent(); if ( xParent.is() ) { - Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), UNO_QUERY ); + Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), UNO_QUERY ); if ( xParentComponent.is() ) { awt::Point aParentLoc = xParentComponent->getLocation(); @@ -351,7 +351,7 @@ namespace accessibility // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBarPage::getAccessibleDescription( ) throw (RuntimeException) + ::rtl::OUString AccessibleTabBarPage::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -368,7 +368,7 @@ namespace accessibility { OExternalLockGuard aGuard( this ); - return m_sPageText; + return m_sPageText; } // ----------------------------------------------------------------------------- @@ -432,7 +432,7 @@ namespace accessibility // ----------------------------------------------------------------------------- - sal_Int32 AccessibleTabBarPage::getForeground( ) throw (RuntimeException) + sal_Int32 AccessibleTabBarPage::getForeground( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -442,7 +442,7 @@ namespace accessibility { Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY ); if ( xParentComp.is() ) - nColor = xParentComp->getForeground(); + nColor = xParentComp->getForeground(); } return nColor; @@ -460,7 +460,7 @@ namespace accessibility { Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY ); if ( xParentComp.is() ) - nColor = xParentComp->getBackground(); + nColor = xParentComp->getBackground(); } return nColor; @@ -480,7 +480,7 @@ namespace accessibility { Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY ); if ( xParentComp.is() ) - xFont = xParentComp->getFont(); + xFont = xParentComp->getFont(); } return xFont; @@ -492,7 +492,7 @@ namespace accessibility { OExternalLockGuard aGuard( this ); - return m_sPageText; + return m_sPageText; } // ----------------------------------------------------------------------------- @@ -507,5 +507,5 @@ namespace accessibility // ----------------------------------------------------------------------------- //......................................................................... -} // namespace accessibility +} // namespace accessibility //......................................................................... diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index 51c86003b0c2..6f5c447c950a 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.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 @@ -533,7 +533,7 @@ namespace accessibility // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBarPageList::getAccessibleDescription( ) throw (RuntimeException) + ::rtl::OUString AccessibleTabBarPageList::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -630,7 +630,7 @@ namespace accessibility // ----------------------------------------------------------------------------- - sal_Int32 AccessibleTabBarPageList::getForeground( ) throw (RuntimeException) + sal_Int32 AccessibleTabBarPageList::getForeground( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -801,5 +801,5 @@ namespace accessibility // ----------------------------------------------------------------------------- //......................................................................... -} // namespace accessibility +} // namespace accessibility //......................................................................... diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx index aed68e55e482..6a1f3a11791e 100644 --- a/accessibility/source/extended/accessibletablistbox.cxx +++ b/accessibility/source/extended/accessibletablistbox.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/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index 59408a31fe84..dd1adec3edc7 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.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 @@ -66,7 +66,7 @@ namespace accessibility AccessibleBrowseBoxTable( rxParent, rBox ), - m_pTabListBox ( &rBox ) + m_pTabListBox ( &rBox ) { DBG_CTOR( AccessibleTabListBoxTable, NULL ); diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx index 8600003c2bff..fbdb0d370dea 100644 --- a/accessibility/source/extended/listboxaccessible.cxx +++ b/accessibility/source/extended/listboxaccessible.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 @@ -99,5 +99,5 @@ namespace accessibility } //........................................................................ -} // namespace accessibility +} // namespace accessibility //........................................................................ diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 8af1b240343e..49dd197f9731 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.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 @@ -110,7 +110,7 @@ ParagraphImpl::numberChanged(bool bIncremented) } void ParagraphImpl::textChanged() -{ +{ ::rtl::OUString aParagraphText = implGetText(); ::css::uno::Any aOldValue, aNewValue; if ( implInitTextChangedEvent( m_aParagraphText, aParagraphText, aOldValue, aNewValue ) ) @@ -596,45 +596,45 @@ ParagraphImpl::getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< : return m_xDocument->retrieveRunAttributes( this, Index, RequestedAttributes ); } -// virtual -::sal_Int32 SAL_CALL ParagraphImpl::getLineNumberAtIndex( ::sal_Int32 nIndex ) - throw (::css::lang::IndexOutOfBoundsException, +// virtual +::sal_Int32 SAL_CALL ParagraphImpl::getLineNumberAtIndex( ::sal_Int32 nIndex ) + throw (::css::lang::IndexOutOfBoundsException, ::css::uno::RuntimeException) { checkDisposed(); - + ::sal_Int32 nLineNo = -1; - ::css::i18n::Boundary aBoundary = + ::css::i18n::Boundary aBoundary = m_xDocument->retrieveParagraphLineBoundary( this, nIndex, &nLineNo ); - + return nLineNo; } - -// virtual -::css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineNumber( ::sal_Int32 nLineNo ) + +// virtual +::css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineNumber( ::sal_Int32 nLineNo ) throw (::css::lang::IndexOutOfBoundsException, ::css::uno::RuntimeException) { checkDisposed(); - - ::css::i18n::Boundary aBoundary = + + ::css::i18n::Boundary aBoundary = m_xDocument->retrieveParagraphBoundaryOfLine( this, nLineNo ); - + return ::css::accessibility::TextSegment( getTextRange(aBoundary.startPos, aBoundary.endPos), aBoundary.startPos, aBoundary.endPos); } // virtual -::css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineWithCaret( ) +::css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineWithCaret( ) throw (::css::uno::RuntimeException) { checkDisposed(); - + sal_Int32 nLineNo = getNumberOfLineWithCaret(); - + try { - return ( nLineNo >= 0 ) ? - getTextAtLineNumber( nLineNo ) : + return ( nLineNo >= 0 ) ? + getTextAtLineNumber( nLineNo ) : ::css::accessibility::TextSegment(); } catch (const ::css::lang::IndexOutOfBoundsException&) { throw ::css::uno::RuntimeException( @@ -645,9 +645,9 @@ ParagraphImpl::getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< : static_cast< ::css::uno::XWeak * >( this ) ); } } - + // virtual -::sal_Int32 SAL_CALL ParagraphImpl::getNumberOfLineWithCaret( ) +::sal_Int32 SAL_CALL ParagraphImpl::getNumberOfLineWithCaret( ) throw (::css::uno::RuntimeException) { checkDisposed(); @@ -738,7 +738,7 @@ void ParagraphImpl::implGetSelection(::sal_Int32 & rStartIndex, } // virtual -void ParagraphImpl::implGetParagraphBoundary( ::css::i18n::Boundary& rBoundary, +void ParagraphImpl::implGetParagraphBoundary( ::css::i18n::Boundary& rBoundary, ::sal_Int32 nIndex ) { ::rtl::OUString sText( implGetText() ); @@ -765,7 +765,7 @@ void ParagraphImpl::implGetLineBoundary( ::css::i18n::Boundary& rBoundary, if ( implIsValidIndex( nIndex, nLength ) || nIndex == nLength ) { - ::css::i18n::Boundary aBoundary = + ::css::i18n::Boundary aBoundary = m_xDocument->retrieveParagraphLineBoundary( this, nIndex ); rBoundary.startPos = aBoundary.startPos; rBoundary.endPos = aBoundary.endPos; @@ -917,8 +917,8 @@ void Document::retrieveParagraphSelection(ParagraphImpl const * pParagraph, if ( nNumber >= aMinPaM.GetPara() && nNumber <= aMaxPaM.GetPara() ) { - *pBegin = nNumber > aMinPaM.GetPara() - ? 0 + *pBegin = nNumber > aMinPaM.GetPara() + ? 0 : static_cast< ::sal_Int32 >( aMinPaM.GetIndex() ); // XXX numeric overflow *pEnd = nNumber < aMaxPaM.GetPara() @@ -927,7 +927,7 @@ void Document::retrieveParagraphSelection(ParagraphImpl const * pParagraph, // XXX numeric overflow (3x) if ( aStartPaM > aEndPaM ) - ::std::swap( *pBegin, *pEnd ); + ::std::swap( *pBegin, *pEnd ); } else { @@ -944,7 +944,7 @@ void Document::retrieveParagraphSelection(ParagraphImpl const * pParagraph, Paragraphs::size_type nNumber = pParagraph->getNumber(); TextPaM aEndPaM( rSelection.GetEnd() ); - return aEndPaM.GetPara() == nNumber + return aEndPaM.GetPara() == nNumber ? static_cast< ::sal_Int32 >(aEndPaM.GetIndex()) : -1; } @@ -1315,7 +1315,7 @@ Document::retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph, ::USHORT nLineCount = m_rEngine.GetLineCount( nNumber ); for ( ::USHORT nLine = 0; nLine < nLineCount; ++nLine ) { - ::sal_Int32 nLineLength = static_cast< ::sal_Int32 >( + ::sal_Int32 nLineLength = static_cast< ::sal_Int32 >( m_rEngine.GetLineLen( nNumber, nLine ) ); nLineStart = nLineEnd; nLineEnd += nLineLength; @@ -1356,12 +1356,12 @@ Document::retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph, ::sal_Int32 nLineEnd = 0; for ( ::USHORT nLine = 0; nLine <= nLineNo; ++nLine ) { - ::sal_Int32 nLineLength = static_cast< ::sal_Int32 >( + ::sal_Int32 nLineLength = static_cast< ::sal_Int32 >( m_rEngine.GetLineLen( nNumber, nLine ) ); nLineStart = nLineEnd; nLineEnd += nLineLength; } - + aBoundary.startPos = nLineStart; aBoundary.endPos = nLineEnd; } @@ -1377,7 +1377,7 @@ sal_Int32 Document::retrieveParagraphLineWithCursor( ParagraphImpl const * pPara Paragraphs::size_type nNumber = pParagraph->getNumber(); TextPaM aEndPaM( rSelection.GetEnd() ); - return aEndPaM.GetPara() == nNumber + return aEndPaM.GetPara() == nNumber ? m_rView.GetLineNumberOfCursorInSelection() : -1; } @@ -1418,7 +1418,7 @@ void Document::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) case VCLEVENT_WINDOW_GETFOCUS: case VCLEVENT_WINDOW_LOSEFOCUS: { - // #107179# if our parent is a compound control (e.g. MultiLineEdit), + // #107179# if our parent is a compound control (e.g. MultiLineEdit), // suppress the window focus events here if ( !m_bCompoundControlChild ) VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent ); diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 7279b5e2ff60..df71877f1891 100755 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.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 @@ -391,7 +391,7 @@ inline bool hasFloatingChild(Window *pWindow) { xContext = new FloatingWindowAccessible( _pXWindow ); } - else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) ) + else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) ) { PopupMenuFloatingWindow* pChild = dynamic_cast<PopupMenuFloatingWindow*>( pWindow->GetAccessibleChildWindow(0)); @@ -404,7 +404,7 @@ inline bool hasFloatingChild(Window *pWindow) } else xContext = new FloatingWindowAccessible( _pXWindow ); - } + } else if ( ( nType == WINDOW_HELPTEXTWINDOW ) || ( nType == WINDOW_FIXEDLINE ) ) { xContext = (accessibility::XAccessibleContext*) new VCLXAccessibleFixedText( _pXWindow ); diff --git a/accessibility/source/helper/accessiblestrings.src b/accessibility/source/helper/accessiblestrings.src index ee7f77f9b502..34f3b381b5f0 100644 --- a/accessibility/source/helper/accessiblestrings.src +++ b/accessibility/source/helper/accessiblestrings.src @@ -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/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx index 41647837df4e..8f61a5246a56 100644 --- a/accessibility/source/helper/accresmgr.cxx +++ b/accessibility/source/helper/accresmgr.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/accessibility/source/helper/characterattributeshelper.cxx b/accessibility/source/helper/characterattributeshelper.cxx index 6444925dfbac..9570183a0c23 100644 --- a/accessibility/source/helper/characterattributeshelper.cxx +++ b/accessibility/source/helper/characterattributeshelper.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/accessibility/source/inc/floatingwindowaccessible.hxx b/accessibility/source/inc/floatingwindowaccessible.hxx index 2d5e0e603f5a..477cd351721c 100644 --- a/accessibility/source/inc/floatingwindowaccessible.hxx +++ b/accessibility/source/inc/floatingwindowaccessible.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,7 +37,7 @@ class FloatingWindowAccessible : public VCLXAccessibleComponent public: FloatingWindowAccessible( VCLXWindow* pWindow ); virtual ~FloatingWindowAccessible(); - + virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ); }; diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx index cb1f425b08cf..6cd2f40f0f22 100644 --- a/accessibility/source/standard/accessiblemenubasecomponent.cxx +++ b/accessibility/source/standard/accessiblemenubasecomponent.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 @@ -393,8 +393,8 @@ Reference< XAccessible > OAccessibleMenuBaseComponent::GetChildAt( const awt::Po { Reference< XAccessible > xAcc = getAccessibleChild( i ); if ( xAcc.is() ) - { - Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY ); + { + Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY ); if ( xComp.is() ) { Rectangle aRect = VCLRectangle( xComp->getBounds() ); diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx index 05ba722a9453..23a7e44df313 100644 --- a/accessibility/source/standard/accessiblemenucomponent.cxx +++ b/accessibility/source/standard/accessiblemenucomponent.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 @@ -112,7 +112,7 @@ void OAccessibleMenuComponent::FillAccessibleStateSet( utl::AccessibleStateSetHe } // ----------------------------------------------------------------------------- -// OCommonAccessibleComponent +// OCommonAccessibleComponent // ----------------------------------------------------------------------------- awt::Rectangle OAccessibleMenuComponent::implGetBounds() throw (RuntimeException) @@ -132,7 +132,7 @@ awt::Rectangle OAccessibleMenuComponent::implGetBounds() throw (RuntimeException Reference< XAccessible > xParent = getAccessibleParent(); if ( xParent.is() ) { - Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), UNO_QUERY ); + Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), UNO_QUERY ); if ( xParentComponent.is() ) { awt::Point aParentScreenLoc = xParentComponent->getLocationOnScreen(); @@ -168,7 +168,7 @@ sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() throw (RuntimeExce { OExternalLockGuard aGuard( this ); - return GetChildCount(); + return GetChildCount(); } // ----------------------------------------------------------------------------- @@ -216,7 +216,7 @@ sal_Int16 OAccessibleMenuComponent::getAccessibleRole( ) throw (RuntimeExceptio // ----------------------------------------------------------------------------- -::rtl::OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeException) +::rtl::OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -285,7 +285,7 @@ awt::Point OAccessibleMenuComponent::getLocationOnScreen( ) throw (RuntimeExcep if ( pWindow ) { Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL ); - aPos = AWTPoint( aRect.TopLeft() ); + aPos = AWTPoint( aRect.TopLeft() ); } } @@ -308,7 +308,7 @@ void OAccessibleMenuComponent::grabFocus( ) throw (RuntimeException) // ----------------------------------------------------------------------------- -sal_Int32 OAccessibleMenuComponent::getForeground( ) throw (RuntimeException) +sal_Int32 OAccessibleMenuComponent::getForeground( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -391,13 +391,13 @@ void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) th // ----------------------------------------------------------------------------- sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) -{ +{ OExternalLockGuard aGuard( this ); if ( nChildIndex < 0 || nChildIndex >= GetChildCount() ) throw IndexOutOfBoundsException(); - return IsChildSelected( nChildIndex ); + return IsChildSelected( nChildIndex ); } // ----------------------------------------------------------------------------- @@ -425,7 +425,7 @@ sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount( ) throw (R sal_Int32 nRet = 0; for ( sal_Int32 i = 0, nCount = GetChildCount(); i < nCount; i++ ) - { + { if ( IsChildSelected( i ) ) ++nRet; } @@ -445,7 +445,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( s Reference< XAccessible > xChild; for ( sal_Int32 i = 0, j = 0, nCount = GetChildCount(); i < nCount; i++ ) - { + { if ( IsChildSelected( i ) && ( j++ == nSelectedChildIndex ) ) { xChild = GetChild( i ); diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index 6bc7f59b75d9..d29ee35d3b08 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.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 @@ -110,9 +110,9 @@ sal_Bool OAccessibleMenuItemComponent::IsVisible() void OAccessibleMenuItemComponent::Select() { // open the parent menu - Reference< XAccessible > xParent( getAccessibleParent() ); + Reference< XAccessible > xParent( getAccessibleParent() ); if ( xParent.is() ) - { + { OAccessibleMenuBaseComponent* pComp = static_cast< OAccessibleMenuBaseComponent* >( xParent.get() ); if ( pComp && pComp->getAccessibleRole() == AccessibleRole::MENU && !pComp->IsPopupMenuOpen() ) pComp->Click(); @@ -136,9 +136,9 @@ void OAccessibleMenuItemComponent::DeSelect() void OAccessibleMenuItemComponent::Click() { // open the parent menu - Reference< XAccessible > xParent( getAccessibleParent() ); + Reference< XAccessible > xParent( getAccessibleParent() ); if ( xParent.is() ) - { + { OAccessibleMenuBaseComponent* pComp = static_cast< OAccessibleMenuBaseComponent* >( xParent.get() ); if ( pComp && pComp->getAccessibleRole() == AccessibleRole::MENU && !pComp->IsPopupMenuOpen() ) pComp->Click(); @@ -146,7 +146,7 @@ void OAccessibleMenuItemComponent::Click() // click the menu item if ( m_pParent ) - { + { Window* pWindow = m_pParent->GetWindow(); if ( pWindow ) { @@ -182,8 +182,8 @@ void OAccessibleMenuItemComponent::Click() // ----------------------------------------------------------------------------- void OAccessibleMenuItemComponent::SetItemPos( sal_uInt16 nItemPos ) -{ - m_nItemPos = nItemPos; +{ + m_nItemPos = nItemPos; } // ----------------------------------------------------------------------------- @@ -260,7 +260,7 @@ void OAccessibleMenuItemComponent::FillAccessibleStateSet( utl::AccessibleStateS } // ----------------------------------------------------------------------------- -// OCommonAccessibleComponent +// OCommonAccessibleComponent // ----------------------------------------------------------------------------- awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() throw (RuntimeException) @@ -283,7 +283,7 @@ awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() throw (RuntimeExcep Reference< XAccessible > xParent = getAccessibleParent(); if ( xParent.is() ) { - Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), UNO_QUERY ); + Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), UNO_QUERY ); if ( xParentComponent.is() ) { awt::Point aParentScreenLoc = xParentComponent->getLocationOnScreen(); @@ -364,13 +364,13 @@ sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole( ) throw (RuntimeExce // ----------------------------------------------------------------------------- -::rtl::OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (RuntimeException) +::rtl::OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); ::rtl::OUString sDescription; if ( m_pParent ) - sDescription = m_pParent->GetHelpText( m_pParent->GetItemId( m_nItemPos ) ); + sDescription = m_pParent->GetHelpText( m_pParent->GetItemId( m_nItemPos ) ); return sDescription; } @@ -424,7 +424,7 @@ void OAccessibleMenuItemComponent::grabFocus( ) throw (RuntimeException) // ----------------------------------------------------------------------------- -sal_Int32 OAccessibleMenuItemComponent::getForeground( ) throw (RuntimeException) +sal_Int32 OAccessibleMenuItemComponent::getForeground( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -434,7 +434,7 @@ sal_Int32 OAccessibleMenuItemComponent::getForeground( ) throw (RuntimeExceptio { Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY ); if ( xParentComp.is() ) - nColor = xParentComp->getForeground(); + nColor = xParentComp->getForeground(); } return nColor; @@ -452,7 +452,7 @@ sal_Int32 OAccessibleMenuItemComponent::getBackground( ) throw (RuntimeExceptio { Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY ); if ( xParentComp.is() ) - nColor = xParentComp->getBackground(); + nColor = xParentComp->getBackground(); } return nColor; @@ -472,7 +472,7 @@ Reference< awt::XFont > OAccessibleMenuItemComponent::getFont( ) throw (Runtime { Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY ); if ( xParentComp.is() ) - xFont = xParentComp->getFont(); + xFont = xParentComp->getFont(); } return xFont; @@ -495,7 +495,7 @@ Reference< awt::XFont > OAccessibleMenuItemComponent::getFont( ) throw (Runtime ::rtl::OUString sRet; if ( m_pParent ) - sRet = m_pParent->GetTipHelpText( m_pParent->GetItemId( m_nItemPos ) ); + sRet = m_pParent->GetTipHelpText( m_pParent->GetItemId( m_nItemPos ) ); return sRet; } diff --git a/accessibility/source/standard/floatingwindowaccessible.cxx b/accessibility/source/standard/floatingwindowaccessible.cxx index 5286bfd387ba..ce86c3efce06 100644 --- a/accessibility/source/standard/floatingwindowaccessible.cxx +++ b/accessibility/source/standard/floatingwindowaccessible.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/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 784588938bb8..de6eac80aa2d 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.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/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index 690babdf5c41..33091d69a173 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.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 @@ -225,7 +225,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyB if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); - + OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper(); Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper; @@ -295,7 +295,7 @@ sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (Runt pButton->SetPressed( (BOOL) nValue ); bReturn = sal_True; } - + return bReturn; } @@ -307,7 +307,7 @@ Any VCLXAccessibleButton::getMaximumValue( ) throw (RuntimeException) Any aValue; aValue <<= (sal_Int32) 1; - + return aValue; } @@ -319,7 +319,7 @@ Any VCLXAccessibleButton::getMinimumValue( ) throw (RuntimeException) Any aValue; aValue <<= (sal_Int32) 0; - + return aValue; } diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index 18a7be8bf810..0d6ddccfc596 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.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 @@ -198,7 +198,7 @@ sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( ) throw (RuntimeExce { OExternalLockGuard aGuard( this ); - return 1; + return 1; } // ----------------------------------------------------------------------------- @@ -253,7 +253,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKe if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); - + OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper(); Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper; @@ -297,7 +297,7 @@ Any VCLXAccessibleCheckBox::getCurrentValue( ) throw (RuntimeException) VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() ); if ( pVCLXCheckBox ) aValue <<= (sal_Int32) pVCLXCheckBox->getState(); - + return aValue; } @@ -311,7 +311,7 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (Ru VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() ); if ( pVCLXCheckBox ) - { + { sal_Int32 nValue = 0, nValueMin = 0, nValueMax = 0; OSL_VERIFY( aNumber >>= nValue ); OSL_VERIFY( getMinimumValue() >>= nValueMin ); @@ -325,7 +325,7 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (Ru pVCLXCheckBox->setState( (sal_Int16) nValue ); bReturn = sal_True; } - + return bReturn; } @@ -342,7 +342,7 @@ Any VCLXAccessibleCheckBox::getMaximumValue( ) throw (RuntimeException) aValue <<= (sal_Int32) 2; else aValue <<= (sal_Int32) 1; - + return aValue; } @@ -354,7 +354,7 @@ Any VCLXAccessibleCheckBox::getMinimumValue( ) throw (RuntimeException) Any aValue; aValue <<= (sal_Int32) 0; - + return aValue; } diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx index 9ac9a13591e1..d300e71f7b9a 100644 --- a/accessibility/source/standard/vclxaccessiblecombobox.cxx +++ b/accessibility/source/standard/vclxaccessiblecombobox.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 @@ -59,7 +59,7 @@ VCLXAccessibleComboBox::~VCLXAccessibleComboBox (void) bool VCLXAccessibleComboBox::IsValid (void) const { return static_cast<ComboBox*>(GetWindow()) != NULL; - + } @@ -75,7 +75,7 @@ void VCLXAccessibleComboBox::ProcessWindowEvent (const VclWindowEvent& rVclWindo //===== XServiceInfo ======================================================== -::rtl::OUString VCLXAccessibleComboBox::getImplementationName (void) +::rtl::OUString VCLXAccessibleComboBox::getImplementationName (void) throw (RuntimeException) { return ::rtl::OUString::createFromAscii ("com.sun.star.comp.toolkit.AccessibleComboBox"); @@ -84,7 +84,7 @@ void VCLXAccessibleComboBox::ProcessWindowEvent (const VclWindowEvent& rVclWindo -Sequence< ::rtl::OUString > VCLXAccessibleComboBox::getSupportedServiceNames (void) +Sequence< ::rtl::OUString > VCLXAccessibleComboBox::getSupportedServiceNames (void) throw (RuntimeException) { Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames(); diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx index f396ff422947..b2fa558d8574 100644 --- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.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 @@ -56,7 +56,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; -VCLXAccessibleDropDownComboBox::VCLXAccessibleDropDownComboBox (VCLXWindow* pVCLWindow) +VCLXAccessibleDropDownComboBox::VCLXAccessibleDropDownComboBox (VCLXWindow* pVCLWindow) : VCLXAccessibleBox (pVCLWindow, VCLXAccessibleBox::COMBOBOX, true) { } @@ -73,7 +73,7 @@ VCLXAccessibleDropDownComboBox::~VCLXAccessibleDropDownComboBox (void) bool VCLXAccessibleDropDownComboBox::IsValid (void) const { return static_cast<ComboBox*>(GetWindow()) != NULL; - + } @@ -86,7 +86,7 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& r case VCLEVENT_DROPDOWN_OPEN: case VCLEVENT_DROPDOWN_CLOSE: { - /* // child count changed + /* // child count changed Any aOldValue, aNewValue; // get the listbox child Reference< XAccessible > xChild; @@ -121,7 +121,7 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& r //===== XServiceInfo ======================================================== -::rtl::OUString VCLXAccessibleDropDownComboBox::getImplementationName() +::rtl::OUString VCLXAccessibleDropDownComboBox::getImplementationName() throw (RuntimeException) { return ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleDropDownComboBox"); @@ -130,7 +130,7 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& r -Sequence< ::rtl::OUString > VCLXAccessibleDropDownComboBox::getSupportedServiceNames (void) +Sequence< ::rtl::OUString > VCLXAccessibleDropDownComboBox::getSupportedServiceNames (void) throw (RuntimeException) { Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames(); diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx index 4d08d40245fb..e2c3e5c2238a 100644 --- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.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 @@ -55,7 +55,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; -VCLXAccessibleDropDownListBox::VCLXAccessibleDropDownListBox (VCLXWindow* pVCLWindow) +VCLXAccessibleDropDownListBox::VCLXAccessibleDropDownListBox (VCLXWindow* pVCLWindow) : VCLXAccessibleBox (pVCLWindow, VCLXAccessibleBox::LISTBOX, true) { } @@ -73,7 +73,7 @@ VCLXAccessibleDropDownListBox::~VCLXAccessibleDropDownListBox() bool VCLXAccessibleDropDownListBox::IsValid (void) const { return static_cast<ListBox*>(GetWindow()) != NULL; - + } @@ -89,7 +89,7 @@ void VCLXAccessibleDropDownListBox::ProcessWindowEvent( const VclWindowEvent& rV //===== XServiceInfo ======================================================== -::rtl::OUString VCLXAccessibleDropDownListBox::getImplementationName() +::rtl::OUString VCLXAccessibleDropDownListBox::getImplementationName() throw (RuntimeException) { return ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleDropDownListBox"); @@ -98,7 +98,7 @@ void VCLXAccessibleDropDownListBox::ProcessWindowEvent( const VclWindowEvent& rV -Sequence< ::rtl::OUString > VCLXAccessibleDropDownListBox::getSupportedServiceNames (void) +Sequence< ::rtl::OUString > VCLXAccessibleDropDownListBox::getSupportedServiceNames (void) throw (RuntimeException) { Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames(); diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index 07378c0ea42f..6114891a3838 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.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 @@ -92,10 +92,10 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve { sal_Int32 nOldCaretPosition = m_nCaretPosition; sal_Int32 nOldSelectionStart = m_nSelectionStart; - + m_nCaretPosition = getCaretPosition(); m_nSelectionStart = getSelectionStart(); - + Window* pWindow = GetWindow(); if ( pWindow && pWindow->HasChildPathFocus() ) { @@ -106,7 +106,7 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve aNewValue <<= (sal_Int32) m_nCaretPosition; NotifyAccessibleEvent( AccessibleEventId::CARET_CHANGED, aOldValue, aNewValue ); } - + // #i104470# VCL only has SELECTION_CHANGED, but UAA distinguishes between SELECTION_CHANGED and CARET_CHANGED sal_Bool bHasSelection = ( m_nSelectionStart != m_nCaretPosition ); sal_Bool bHadSelection = ( nOldSelectionStart != nOldCaretPosition ); @@ -114,7 +114,7 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve { NotifyAccessibleEvent( AccessibleEventId::TEXT_SELECTION_CHANGED, Any(), Any() ); } - + } } break; @@ -602,7 +602,7 @@ sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEn if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) ) throw IndexOutOfBoundsException(); - return sal_False; // attributes cannot be set for an edit + return sal_False; // attributes cannot be set for an edit } // ----------------------------------------------------------------------------- diff --git a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx index 90218e629669..63dcdf1c5854 100644 --- a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedhyperlink.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/accessibility/source/standard/vclxaccessiblefixedtext.cxx b/accessibility/source/standard/vclxaccessiblefixedtext.cxx index ca89fa0417ab..771f20222fb5 100644 --- a/accessibility/source/standard/vclxaccessiblefixedtext.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedtext.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/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 6d287a02f0e9..68fd2b57ed68 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.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 @@ -61,14 +61,14 @@ namespace VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType, const Reference< XAccessible >& _xParent) - : VCLXAccessibleComponent (pVCLWindow), - m_aBoxType (aBoxType), - m_nVisibleLineCount (0), - m_nIndexInParent (DEFAULT_INDEX_IN_PARENT), - m_nLastTopEntry ( 0 ), - m_nLastSelectedPos ( LISTBOX_ENTRY_NOTFOUND ), - m_bDisableProcessEvent ( false ), - m_bVisible ( true ), + : VCLXAccessibleComponent (pVCLWindow), + m_aBoxType (aBoxType), + m_nVisibleLineCount (0), + m_nIndexInParent (DEFAULT_INDEX_IN_PARENT), + m_nLastTopEntry ( 0 ), + m_nLastSelectedPos ( LISTBOX_ENTRY_NOTFOUND ), + m_bDisableProcessEvent ( false ), + m_bVisible ( true ), m_xParent ( _xParent ) { // Because combo boxes and list boxes have the no common interface for @@ -125,9 +125,9 @@ void SAL_CALL VCLXAccessibleList::disposing (void) void VCLXAccessibleList::clearItems() { -// ListItems::iterator aEnd = m_aAccessibleChildren.end(); -// for (ListItems::iterator aIter = m_aAccessibleChildren.begin(); aIter != aEnd; ++aIter) -// ::comphelper::disposeComponent(*aIter); +// ListItems::iterator aEnd = m_aAccessibleChildren.end(); +// for (ListItems::iterator aIter = m_aAccessibleChildren.begin(); aIter != aEnd; ++aIter) +// ::comphelper::disposeComponent(*aIter); // Clear the list itself and delete all the rest. ListItems().swap(m_aAccessibleChildren); // clear and minimize @@ -140,8 +140,8 @@ void VCLXAccessibleList::FillAccessibleStateSet (utl::AccessibleStateSetHelper& VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet ); // check if our list should be visible - if ( m_pListBoxHelper - && (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN + if ( m_pListBoxHelper + && (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN && !m_pListBoxHelper->IsInDropDown() ) { rStateSet.RemoveState (AccessibleStateType::VISIBLE); @@ -188,7 +188,7 @@ void VCLXAccessibleList::notifyVisibleStates(sal_Bool _bSetNew ) sal_Bool bVisible = ( nPos>=nTopEntry && nPos<( nTopEntry + m_nVisibleLineCount ) ); pItem->SetVisible( m_bVisible && bVisible ); } - + } } // ----------------------------------------------------------------------------- @@ -243,7 +243,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent); if ( m_pListBoxHelper ) { - uno::Any aOldValue, + uno::Any aOldValue, aNewValue; USHORT nPos = m_pListBoxHelper->GetSelectEntryPos(); if ( nPos == LISTBOX_ENTRY_NOTFOUND ) @@ -251,7 +251,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve if ( nPos != LISTBOX_ENTRY_NOTFOUND ) aNewValue <<= CreateChild(nPos); - NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, + NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldValue, aNewValue ); } @@ -321,7 +321,7 @@ Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i) { ListItems::iterator aIter = m_aAccessibleChildren.begin() + nPos; ::std::mem_fun_t<bool, VCLXAccessibleListItem> aTemp(&VCLXAccessibleListItem::IncrementIndexInParent); - adjustEntriesIndexInParent( aIter, aTemp); + adjustEntriesIndexInParent( aIter, aTemp); } else { @@ -366,7 +366,7 @@ void VCLXAccessibleList::HandleChangedItemList (bool bItemInserted, sal_Int32 nI { ListItems::iterator aIter = m_aAccessibleChildren.erase(m_aAccessibleChildren.begin()+nIndex); ::std::mem_fun_t<bool, VCLXAccessibleListItem> aTemp(&VCLXAccessibleListItem::DecrementIndexInParent); - adjustEntriesIndexInParent( aIter, aTemp ); + adjustEntriesIndexInParent( aIter, aTemp ); } } } @@ -529,7 +529,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleList::getSupportedServiceNames (void) void VCLXAccessibleList::UpdateVisibleLineCount() { - if ( m_pListBoxHelper ) + if ( m_pListBoxHelper ) { if ( (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN ) m_nVisibleLineCount = m_pListBoxHelper->GetDisplayLineCount(); @@ -794,7 +794,7 @@ void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedCh awt::Rectangle VCLXAccessibleList::implGetBounds() throw (uno::RuntimeException) { awt::Rectangle aBounds ( 0, 0, 0, 0 ); - if ( m_pListBoxHelper + if ( m_pListBoxHelper && (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN ) { if ( m_pListBoxHelper->IsInDropDown() ) @@ -829,7 +829,7 @@ awt::Point VCLXAccessibleList::getLocationOnScreen( ) throw (uno::RuntimeExcept ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); awt::Point aPos; - if ( m_pListBoxHelper + if ( m_pListBoxHelper && (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN ) { if ( m_pListBoxHelper->IsInDropDown() ) diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx index 7645d2067c1a..35edd51bcaad 100644 --- a/accessibility/source/standard/vclxaccessiblelistbox.cxx +++ b/accessibility/source/standard/vclxaccessiblelistbox.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 @@ -71,7 +71,7 @@ VCLXAccessibleListBox::~VCLXAccessibleListBox (void) bool VCLXAccessibleListBox::IsValid (void) const { return static_cast<ListBox*>(GetWindow()) != NULL; - + } @@ -87,7 +87,7 @@ void VCLXAccessibleListBox::ProcessWindowEvent (const VclWindowEvent& rVclWindow //===== XServiceInfo ======================================================== -::rtl::OUString VCLXAccessibleListBox::getImplementationName (void) +::rtl::OUString VCLXAccessibleListBox::getImplementationName (void) throw (RuntimeException) { return ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleListBox"); @@ -96,7 +96,7 @@ void VCLXAccessibleListBox::ProcessWindowEvent (const VclWindowEvent& rVclWindow -Sequence< ::rtl::OUString > VCLXAccessibleListBox::getSupportedServiceNames (void) +Sequence< ::rtl::OUString > VCLXAccessibleListBox::getSupportedServiceNames (void) throw (RuntimeException) { Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames(); diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index 56bcf14f1980..245108615de2 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.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 @@ -74,14 +74,14 @@ DBG_NAME(VCLXAccessibleListItem) // ----------------------------------------------------------------------------- VCLXAccessibleListItem::VCLXAccessibleListItem( ::accessibility::IComboListBoxHelper* _pListBoxHelper, sal_Int32 _nIndexInParent, const Reference< XAccessible >& _xParent ) : - VCLXAccessibleListItem_BASE ( m_aMutex ), + VCLXAccessibleListItem_BASE ( m_aMutex ), m_nIndexInParent( _nIndexInParent ), - m_bSelected ( sal_False ), - m_bVisible ( sal_False ), + m_bSelected ( sal_False ), + m_bVisible ( sal_False ), m_nClientId ( 0 ), m_pListBoxHelper( _pListBoxHelper ), - m_xParent ( _xParent ) + m_xParent ( _xParent ) { DBG_CTOR( VCLXAccessibleListItem, NULL ); @@ -209,10 +209,10 @@ void SAL_CALL VCLXAccessibleListItem::disposing() ::osl::MutexGuard aGuard( m_aMutex ); VCLXAccessibleListItem_BASE::disposing(); - m_sEntryText = ::rtl::OUString(); - m_pListBoxHelper = NULL; - m_xParent = NULL; - m_xParentContext = NULL; + m_sEntryText = ::rtl::OUString(); + m_pListBoxHelper = NULL; + m_xParent = NULL; + m_xParentContext = NULL; nId = m_nClientId; m_nClientId = 0; @@ -287,7 +287,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleIndexInParent( ) throw sal_Int16 SAL_CALL VCLXAccessibleListItem::getAccessibleRole( ) throw (RuntimeException) { return AccessibleRole::LIST_ITEM; - // return AccessibleRole::LABEL; + // return AccessibleRole::LABEL; } // ----------------------------------------------------------------------------- ::rtl::OUString SAL_CALL VCLXAccessibleListItem::getAccessibleDescription( ) throw (RuntimeException) diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx index f7e77f3fb8e2..8d4013342c09 100644 --- a/accessibility/source/standard/vclxaccessiblemenu.cxx +++ b/accessibility/source/standard/vclxaccessiblemenu.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 @@ -123,7 +123,7 @@ sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount( ) throw (RuntimeExceptio { OExternalLockGuard aGuard( this ); - return GetChildCount(); + return GetChildCount(); } // ----------------------------------------------------------------------------- @@ -175,13 +175,13 @@ void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) throw (I // ----------------------------------------------------------------------------- sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) -{ +{ OExternalLockGuard aGuard( this ); if ( nChildIndex < 0 || nChildIndex >= GetChildCount() ) throw IndexOutOfBoundsException(); - return IsChildSelected( nChildIndex ); + return IsChildSelected( nChildIndex ); } // ----------------------------------------------------------------------------- @@ -209,7 +209,7 @@ sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount( ) throw (Runtime sal_Int32 nRet = 0; for ( sal_Int32 i = 0, nCount = GetChildCount(); i < nCount; i++ ) - { + { if ( IsChildSelected( i ) ) ++nRet; } @@ -229,7 +229,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int Reference< XAccessible > xChild; for ( sal_Int32 i = 0, j = 0, nCount = GetChildCount(); i < nCount; i++ ) - { + { if ( IsChildSelected( i ) && ( j++ == nSelectedChildIndex ) ) { xChild = GetChild( i ); diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx index 825e5990e783..2ea369bbfcfc 100644 --- a/accessibility/source/standard/vclxaccessiblemenubar.cxx +++ b/accessibility/source/standard/vclxaccessiblemenubar.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/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index 7332386e4303..b859aa7d7955 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.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 @@ -80,14 +80,14 @@ sal_Bool VCLXAccessibleMenuItem::IsFocused() } // ----------------------------------------------------------------------------- - + sal_Bool VCLXAccessibleMenuItem::IsSelected() { return IsHighlighted(); } // ----------------------------------------------------------------------------- - + sal_Bool VCLXAccessibleMenuItem::IsChecked() { sal_Bool bChecked = sal_False; @@ -103,7 +103,7 @@ sal_Bool VCLXAccessibleMenuItem::IsChecked() } // ----------------------------------------------------------------------------- - + sal_Bool VCLXAccessibleMenuItem::IsHighlighted() { sal_Bool bHighlighted = sal_False; @@ -228,8 +228,8 @@ sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) throw (Ind sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getCharacter( nIndex ); + + return OCommonAccessibleText::getCharacter( nIndex ); } // ----------------------------------------------------------------------------- @@ -281,7 +281,7 @@ sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - return OCommonAccessibleText::getCharacterCount(); + return OCommonAccessibleText::getCharacterCount(); } // ----------------------------------------------------------------------------- @@ -310,8 +310,8 @@ sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) th ::rtl::OUString VCLXAccessibleMenuItem::getSelectedText() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getSelectedText(); + + return OCommonAccessibleText::getSelectedText(); } // ----------------------------------------------------------------------------- @@ -319,7 +319,7 @@ sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) th sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getSelectionStart(); } @@ -328,8 +328,8 @@ sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException) sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getSelectionEnd(); + + return OCommonAccessibleText::getSelectionEnd(); } // ----------------------------------------------------------------------------- @@ -349,7 +349,7 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 ::rtl::OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getText(); } @@ -358,8 +358,8 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 ::rtl::OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); + + return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } // ----------------------------------------------------------------------------- @@ -367,7 +367,7 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 ::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType ); } @@ -376,7 +376,7 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 ::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType ); } @@ -385,7 +385,7 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 ::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType ); } @@ -399,7 +399,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd if ( m_pParent ) { - Window* pWindow = m_pParent->GetWindow(); + Window* pWindow = m_pParent->GetWindow(); if ( pWindow ) { Reference< datatransfer::clipboard::XClipboard > xClipboard = pWindow->GetClipboard(); @@ -414,7 +414,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY ); if( xFlushableClipboard.is() ) xFlushableClipboard->flushClipboard(); - + Application::AcquireSolarMutex( nRef ); bReturn = sal_True; @@ -433,7 +433,7 @@ sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( ) throw (RuntimeExce { OExternalLockGuard aGuard( this ); - return 1; + return 1; } // ----------------------------------------------------------------------------- @@ -470,7 +470,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKe if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); - + OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper(); Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper; @@ -509,7 +509,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKe { Reference< XAccessibleKeyBinding > xKeyB( xAction->getAccessibleActionKeyBinding( 0 ) ); if ( xKeyB.is() && xKeyB->getAccessibleKeyBindingCount() > 1 ) - aSeq = xKeyB->getAccessibleKeyBinding( 1 ); + aSeq = xKeyB->getAccessibleKeyBinding( 1 ); } } } @@ -588,7 +588,7 @@ Any VCLXAccessibleMenuItem::getMaximumValue( ) throw (RuntimeException) Any aValue; aValue <<= (sal_Int32) 1; - + return aValue; } @@ -600,7 +600,7 @@ Any VCLXAccessibleMenuItem::getMinimumValue( ) throw (RuntimeException) Any aValue; aValue <<= (sal_Int32) 0; - + return aValue; } diff --git a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx index 07c8c0f2a3d4..735a57e2d30f 100644 --- a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuseparator.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/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx index 328e015c60e5..d7c6a8c2e96e 100644 --- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx +++ b/accessibility/source/standard/vclxaccessiblepopupmenu.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 @@ -55,7 +55,7 @@ VCLXAccessiblePopupMenu::~VCLXAccessiblePopupMenu() // ----------------------------------------------------------------------------- sal_Bool VCLXAccessiblePopupMenu::IsFocused() -{ +{ return !IsChildHighlighted(); } diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index 76940967fcce..c03bff6b53da 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.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 @@ -174,7 +174,7 @@ sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( ) throw (RuntimeE { OExternalLockGuard aGuard( this ); - return 1; + return 1; } // ----------------------------------------------------------------------------- @@ -213,7 +213,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActio if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); - + OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper(); Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper; @@ -257,7 +257,7 @@ Any VCLXAccessibleRadioButton::getCurrentValue( ) throw (RuntimeException) VCLXRadioButton* pVCLXRadioButton = static_cast< VCLXRadioButton* >( GetVCLXWindow() ); if ( pVCLXRadioButton ) aValue <<= (sal_Int32) pVCLXRadioButton->getState(); - + return aValue; } @@ -283,7 +283,7 @@ sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw pVCLXRadioButton->setState( (sal_Bool) nValue ); bReturn = sal_True; } - + return bReturn; } @@ -295,7 +295,7 @@ Any VCLXAccessibleRadioButton::getMaximumValue( ) throw (RuntimeException) Any aValue; aValue <<= (sal_Int32) 1; - + return aValue; } @@ -307,7 +307,7 @@ Any VCLXAccessibleRadioButton::getMinimumValue( ) throw (RuntimeException) Any aValue; aValue <<= (sal_Int32) 0; - + return aValue; } diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx index 9bd9cf45f94b..7ae057f594df 100644 --- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx +++ b/accessibility/source/standard/vclxaccessiblescrollbar.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 @@ -118,7 +118,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleScrollBar, VCLXAccessibleCompone ::rtl::OUString VCLXAccessibleScrollBar::getImplementationName() throw (RuntimeException) { - return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleScrollBar" ); + return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleScrollBar" ); } // ----------------------------------------------------------------------------- @@ -157,11 +157,11 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw ScrollType eScrollType; switch ( nIndex ) { - case 0: eScrollType = SCROLL_LINEUP; break; - case 1: eScrollType = SCROLL_LINEDOWN; break; - case 2: eScrollType = SCROLL_PAGEUP; break; - case 3: eScrollType = SCROLL_PAGEDOWN; break; - default: eScrollType = SCROLL_DONTKNOW; break; + case 0: eScrollType = SCROLL_LINEUP; break; + case 1: eScrollType = SCROLL_LINEDOWN; break; + case 2: eScrollType = SCROLL_PAGEUP; break; + case 3: eScrollType = SCROLL_PAGEDOWN; break; + default: eScrollType = SCROLL_DONTKNOW; break; } if ( pScrollBar->DoScrollAction( eScrollType ) ) bReturn = sal_True; @@ -183,11 +183,11 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw switch ( nIndex ) { - case 0: sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_DECLINE ) ); break; - case 1: sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_INCLINE ) ); break; - case 2: sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_DECBLOCK ) ); break; - case 3: sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_INCBLOCK ) ); break; - default: break; + case 0: sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_DECLINE ) ); break; + case 1: sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_INCLINE ) ); break; + case 2: sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_DECBLOCK ) ); break; + case 3: sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_INCBLOCK ) ); break; + default: break; } return sDescription; @@ -202,7 +202,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionK if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); - return Reference< XAccessibleKeyBinding >(); + return Reference< XAccessibleKeyBinding >(); } // ----------------------------------------------------------------------------- @@ -261,7 +261,7 @@ Any VCLXAccessibleScrollBar::getMaximumValue( ) throw (RuntimeException) VCLXScrollBar* pVCLXScrollBar = static_cast< VCLXScrollBar* >( GetVCLXWindow() ); if ( pVCLXScrollBar ) aValue <<= (sal_Int32) pVCLXScrollBar->getMaximum(); - + return aValue; } @@ -273,7 +273,7 @@ Any VCLXAccessibleScrollBar::getMinimumValue( ) throw (RuntimeException) Any aValue; aValue <<= (sal_Int32) 0; - + return aValue; } diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx index 5dd35a699b27..ba2b7a5e7e69 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbar.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 @@ -41,9 +41,9 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; -// ---------------------------------------------------- -// class VCLXAccessibleStatusBar -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXAccessibleStatusBar +// ---------------------------------------------------- VCLXAccessibleStatusBar::VCLXAccessibleStatusBar( VCLXWindow* pVCLXWindow ) :VCLXAccessibleComponent( pVCLXWindow ) @@ -167,7 +167,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind switch ( rVclWindowEvent.GetId() ) { case VCLEVENT_STATUSBAR_ITEMADDED: - { + { if ( m_pStatusBar ) { sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData(); @@ -205,7 +205,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind break; case VCLEVENT_STATUSBAR_SHOWITEM: case VCLEVENT_STATUSBAR_HIDEITEM: - { + { if ( m_pStatusBar ) { sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData(); @@ -216,28 +216,28 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind break; case VCLEVENT_STATUSBAR_SHOWALLITEMS: case VCLEVENT_STATUSBAR_HIDEALLITEMS: - { + { for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i ) UpdateShowing( i, rVclWindowEvent.GetId() == VCLEVENT_STATUSBAR_SHOWALLITEMS ); } break; case VCLEVENT_STATUSBAR_NAMECHANGED: - { + { if ( m_pStatusBar ) { sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData(); sal_uInt16 nItemPos = m_pStatusBar->GetItemPos( nItemId ); - UpdateItemName( nItemPos ); + UpdateItemName( nItemPos ); } } break; case VCLEVENT_STATUSBAR_DRAWITEM: - { + { if ( m_pStatusBar ) { sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData(); sal_uInt16 nItemPos = m_pStatusBar->GetItemPos( nItemId ); - UpdateItemText( nItemPos ); + UpdateItemText( nItemPos ); } } break; @@ -254,7 +254,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind if ( xComponent.is() ) xComponent->dispose(); } - m_aAccessibleChildren.clear(); + m_aAccessibleChildren.clear(); } VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent ); @@ -284,7 +284,7 @@ void VCLXAccessibleStatusBar::disposing() if ( xComponent.is() ) xComponent->dispose(); } - m_aAccessibleChildren.clear(); + m_aAccessibleChildren.clear(); } } @@ -314,7 +314,7 @@ sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() throw (RuntimeExcep { OExternalLockGuard aGuard( this ); - return m_aAccessibleChildren.size(); + return m_aAccessibleChildren.size(); } // ----------------------------------------------------------------------------- diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index c3badc50bdbf..147f4251bfd7 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.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 @@ -69,7 +69,7 @@ VCLXAccessibleStatusBarItem::VCLXAccessibleStatusBarItem( StatusBar* pStatusBar, m_sItemName = GetItemName(); m_sItemText = GetItemText(); - m_bShowing = IsShowing(); + m_bShowing = IsShowing(); } // ----------------------------------------------------------------------------- @@ -175,12 +175,12 @@ void VCLXAccessibleStatusBarItem::FillAccessibleStateSet( utl::AccessibleStateSe } // ----------------------------------------------------------------------------- -// OCommonAccessibleComponent +// OCommonAccessibleComponent // ----------------------------------------------------------------------------- awt::Rectangle VCLXAccessibleStatusBarItem::implGetBounds() throw (RuntimeException) { - awt::Rectangle aBounds( 0, 0, 0, 0 ); + awt::Rectangle aBounds( 0, 0, 0, 0 ); if ( m_pStatusBar ) aBounds = AWTRectangle( m_pStatusBar->GetItemRect( m_nItemId ) ); @@ -339,13 +339,13 @@ sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole( ) throw (RuntimeExcep // ----------------------------------------------------------------------------- -::rtl::OUString VCLXAccessibleStatusBarItem::getAccessibleDescription( ) throw (RuntimeException) +::rtl::OUString VCLXAccessibleStatusBarItem::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); ::rtl::OUString sDescription; if ( m_pStatusBar ) - sDescription = m_pStatusBar->GetHelpText( m_nItemId ); + sDescription = m_pStatusBar->GetHelpText( m_nItemId ); return sDescription; } @@ -420,7 +420,7 @@ void VCLXAccessibleStatusBarItem::grabFocus( ) throw (RuntimeException) // ----------------------------------------------------------------------------- -sal_Int32 VCLXAccessibleStatusBarItem::getForeground( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleStatusBarItem::getForeground( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -430,7 +430,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getForeground( ) throw (RuntimeExceptio { Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY ); if ( xParentComp.is() ) - nColor = xParentComp->getForeground(); + nColor = xParentComp->getForeground(); } return nColor; @@ -448,7 +448,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getBackground( ) throw (RuntimeException { Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY ); if ( xParentComp.is() ) - nColor = xParentComp->getBackground(); + nColor = xParentComp->getBackground(); } return nColor; @@ -468,7 +468,7 @@ Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont( ) throw (RuntimeE { Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY ); if ( xParentComp.is() ) - xFont = xParentComp->getFont(); + xFont = xParentComp->getFont(); } return xFont; @@ -616,7 +616,7 @@ sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY ); if( xFlushableClipboard.is() ) xFlushableClipboard->flushClipboard(); - + Application::AcquireSolarMutex( nRef ); bReturn = sal_True; diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx index ac6aca77dda0..b9965dfd31b1 100644 --- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx +++ b/accessibility/source/standard/vclxaccessibletabcontrol.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 @@ -46,9 +46,9 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; -// ---------------------------------------------------- -// class VCLXAccessibleTabControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXAccessibleTabControl +// ---------------------------------------------------- VCLXAccessibleTabControl::VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow ) :VCLXAccessibleComponent( pVCLXWindow ) @@ -261,7 +261,7 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin if ( xComponent.is() ) xComponent->dispose(); } - m_aAccessibleChildren.clear(); + m_aAccessibleChildren.clear(); } VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent ); @@ -344,7 +344,7 @@ void VCLXAccessibleTabControl::disposing() if ( xComponent.is() ) xComponent->dispose(); } - m_aAccessibleChildren.clear(); + m_aAccessibleChildren.clear(); } } @@ -374,7 +374,7 @@ sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() throw (RuntimeExce { OExternalLockGuard aGuard( this ); - return m_aAccessibleChildren.size(); + return m_aAccessibleChildren.size(); } // ----------------------------------------------------------------------------- @@ -439,7 +439,7 @@ void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) th // ----------------------------------------------------------------------------- sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) -{ +{ OExternalLockGuard aGuard( this ); if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() ) @@ -489,7 +489,7 @@ Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( s Reference< XAccessible > xChild; for ( sal_Int32 i = 0, j = 0, nCount = getAccessibleChildCount(); i < nCount; i++ ) - { + { if ( isAccessibleChildSelected( i ) && ( j++ == nSelectedChildIndex ) ) { xChild = getAccessibleChild( i ); diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index 6b871fced829..514199184a78 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.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 @@ -66,7 +66,7 @@ VCLXAccessibleTabPage::VCLXAccessibleTabPage( TabControl* pTabControl, sal_uInt1 ,m_nPageId( nPageId ) { m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() ); - m_bFocused = IsFocused(); + m_bFocused = IsFocused(); m_bSelected = IsSelected(); m_sPageText = GetPageText(); } @@ -174,14 +174,14 @@ void VCLXAccessibleTabPage::Update( bool bNew ) Reference< XAccessible > xChild( pTabPage->GetAccessible( bNew ) ); if ( xChild.is() ) { - Any aOldValue, aNewValue; + Any aOldValue, aNewValue; if ( bNew ) aNewValue <<= xChild; else aOldValue <<= xChild; NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue, aNewValue ); } - } + } } } @@ -208,12 +208,12 @@ void VCLXAccessibleTabPage::FillAccessibleStateSet( utl::AccessibleStateSetHelpe } // ----------------------------------------------------------------------------- -// OCommonAccessibleComponent +// OCommonAccessibleComponent // ----------------------------------------------------------------------------- awt::Rectangle VCLXAccessibleTabPage::implGetBounds() throw (RuntimeException) { - awt::Rectangle aBounds( 0, 0, 0, 0 ); + awt::Rectangle aBounds( 0, 0, 0, 0 ); if ( m_pTabControl ) aBounds = AWTRectangle( m_pTabControl->GetTabBounds( m_nPageId ) ); @@ -387,7 +387,7 @@ sal_Int16 VCLXAccessibleTabPage::getAccessibleRole( ) throw (RuntimeException) // ----------------------------------------------------------------------------- -::rtl::OUString VCLXAccessibleTabPage::getAccessibleDescription( ) throw (RuntimeException) +::rtl::OUString VCLXAccessibleTabPage::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -461,8 +461,8 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt: { Reference< XAccessible > xAcc = getAccessibleChild( i ); if ( xAcc.is() ) - { - Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY ); + { + Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY ); if ( xComp.is() ) { Rectangle aRect = VCLRectangle( xComp->getBounds() ); @@ -494,7 +494,7 @@ void VCLXAccessibleTabPage::grabFocus( ) throw (RuntimeException) // ----------------------------------------------------------------------------- -sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -504,7 +504,7 @@ sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException) { Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY ); if ( xParentComp.is() ) - nColor = xParentComp->getForeground(); + nColor = xParentComp->getForeground(); } return nColor; @@ -522,7 +522,7 @@ sal_Int32 VCLXAccessibleTabPage::getBackground( ) throw (RuntimeException) { Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY ); if ( xParentComp.is() ) - nColor = xParentComp->getBackground(); + nColor = xParentComp->getBackground(); } return nColor; @@ -542,7 +542,7 @@ Reference< awt::XFont > VCLXAccessibleTabPage::getFont( ) throw (RuntimeExcepti { Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY ); if ( xParentComp.is() ) - xFont = xParentComp->getFont(); + xFont = xParentComp->getFont(); } return xFont; @@ -689,7 +689,7 @@ sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY ); if( xFlushableClipboard.is() ) xFlushableClipboard->flushClipboard(); - + Application::AcquireSolarMutex( nRef ); bReturn = sal_True; diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx index 93fc1b3da2ff..593978dd48ce 100644 --- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx +++ b/accessibility/source/standard/vclxaccessibletabpagewindow.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 @@ -39,9 +39,9 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; -// ---------------------------------------------------- -// class VCLXAccessibleTabPageWindow -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXAccessibleTabPageWindow +// ---------------------------------------------------- VCLXAccessibleTabPageWindow::VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindow ) :VCLXAccessibleComponent( pVCLXWindow ) @@ -73,12 +73,12 @@ VCLXAccessibleTabPageWindow::~VCLXAccessibleTabPageWindow() } // ----------------------------------------------------------------------------- -// OCommonAccessibleComponent +// OCommonAccessibleComponent // ----------------------------------------------------------------------------- awt::Rectangle VCLXAccessibleTabPageWindow::implGetBounds() throw (RuntimeException) { - awt::Rectangle aBounds( 0, 0, 0, 0 ); + awt::Rectangle aBounds( 0, 0, 0, 0 ); if ( m_pTabControl ) { diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx index c6bbaddf6426..91235c0aa5b9 100644 --- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx +++ b/accessibility/source/standard/vclxaccessibletextcomponent.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 @@ -53,9 +53,9 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; -// ---------------------------------------------------- -// class VCLXAccessibleTextComponent -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXAccessibleTextComponent +// ---------------------------------------------------- VCLXAccessibleTextComponent::VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindow ) :VCLXAccessibleComponent( pVCLXWindow ) @@ -175,8 +175,8 @@ sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) throw sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getCharacter( nIndex ); + + return OCommonAccessibleText::getCharacter( nIndex ); } // ----------------------------------------------------------------------------- @@ -225,8 +225,8 @@ awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getCharacterCount(); + + return OCommonAccessibleText::getCharacterCount(); } // ----------------------------------------------------------------------------- @@ -248,8 +248,8 @@ sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint ::rtl::OUString VCLXAccessibleTextComponent::getSelectedText() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getSelectedText(); + + return OCommonAccessibleText::getSelectedText(); } // ----------------------------------------------------------------------------- @@ -257,7 +257,7 @@ sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getSelectionStart(); } @@ -266,8 +266,8 @@ sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeExcepti sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getSelectionEnd(); + + return OCommonAccessibleText::getSelectionEnd(); } // ----------------------------------------------------------------------------- @@ -287,7 +287,7 @@ sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_I ::rtl::OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getText(); } @@ -296,8 +296,8 @@ sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_I ::rtl::OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); + + return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } // ----------------------------------------------------------------------------- @@ -305,7 +305,7 @@ sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_I ::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType ); } @@ -314,7 +314,7 @@ sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_I ::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType ); } @@ -323,7 +323,7 @@ sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_I ::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType ); } @@ -349,7 +349,7 @@ sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY ); if( xFlushableClipboard.is() ) xFlushableClipboard->flushClipboard(); - + Application::AcquireSolarMutex( nRef ); bReturn = sal_True; diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx index e77d203d443a..2590a1d44cf7 100644 --- a/accessibility/source/standard/vclxaccessibletextfield.cxx +++ b/accessibility/source/standard/vclxaccessibletextfield.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/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index ce796af77ab4..ed0dce9b807b 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.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 @@ -69,7 +69,7 @@ namespace _rxORB, _rxInnerAccessibleContext, _rxOwningAccessible, - _rxParentAccessible ) + _rxParentAccessible ) ,m_nIndexInParent(_nIndexInParent) { } @@ -86,8 +86,8 @@ namespace // ========================================================================= // = OToolBoxWindowItem // ========================================================================= - typedef ::cppu::ImplHelper1 < XUnoTunnel - > OToolBoxWindowItem_Base; + typedef ::cppu::ImplHelper1 < XUnoTunnel + > OToolBoxWindowItem_Base; /** XAccessible implementation for a toolbox item which is represented by a VCL Window */ @@ -99,10 +99,10 @@ namespace sal_Int32 m_nIndexInParent; public: - inline sal_Int32 getIndexInParent() const { return m_nIndexInParent; } - inline void setIndexInParent( sal_Int32 _nNewIndex ) { m_nIndexInParent = _nNewIndex; } + inline sal_Int32 getIndexInParent() const { return m_nIndexInParent; } + inline void setIndexInParent( sal_Int32 _nNewIndex ) { m_nIndexInParent = _nNewIndex; } - static sal_Bool isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation = NULL ); + static sal_Bool isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation = NULL ); public: OToolBoxWindowItem(sal_Int32 _nIndexInParent, @@ -177,8 +177,8 @@ namespace //-------------------------------------------------------------------- sal_Int64 SAL_CALL OToolBoxWindowItem::getSomething( const Sequence< sal_Int8 >& _rId ) throw (RuntimeException) { - if ( ( 16 == _rId.getLength() ) - && ( 0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(), _rId.getConstArray(), 16 ) ) + if ( ( 16 == _rId.getLength() ) + && ( 0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(), _rId.getConstArray(), 16 ) ) ) return reinterpret_cast< sal_Int64>( this ); @@ -213,7 +213,7 @@ VCLXAccessibleToolBoxItem* VCLXAccessibleToolBox::GetItem_Impl( sal_Int32 _nPos, ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find( _nPos ); // returns only toolbox buttons, not windows if ( aIter != m_aAccessibleChildren.end() && !aIter->second.is()) - pItem = static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() ); + pItem = static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() ); } return pItem; @@ -368,7 +368,7 @@ void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, sal_Bool _bItemAdd if ( pToolBox ) { if ( !_bItemAdded ) - { // the item was removed + { // the item was removed // -> destroy the old item ToolBoxItemsMap::iterator aItemPos = m_aAccessibleChildren.find( _nPos ); if ( m_aAccessibleChildren.end() != aItemPos ) diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index 7580d1a3ae2c..6f9f51b72287 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.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 @@ -72,12 +72,12 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In AccessibleTextHelper_BASE( new VCLExternalSolarLock() ), - m_pToolBox ( _pToolBox ), + m_pToolBox ( _pToolBox ), m_nIndexInParent( _nPos ), - m_nRole ( AccessibleRole::PUSH_BUTTON ), - m_nItemId ( 0 ), - m_bHasFocus ( sal_False ), - m_bIsChecked ( sal_False ), + m_nRole ( AccessibleRole::PUSH_BUTTON ), + m_nItemId ( 0 ), + m_bHasFocus ( sal_False ), + m_bIsChecked ( sal_False ), m_bIndeterminate( false ) { @@ -97,12 +97,12 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In { ToolBoxItemBits nBits = m_pToolBox->GetItemBits( m_nItemId ); if (( nBits & TIB_DROPDOWN ) == TIB_DROPDOWN) - m_nRole = AccessibleRole::BUTTON_DROPDOWN; + m_nRole = AccessibleRole::BUTTON_DROPDOWN; else if (( ( nBits & TIB_CHECKABLE ) == TIB_CHECKABLE ) || ( ( nBits & TIB_AUTOCHECK ) == TIB_AUTOCHECK ) ) - m_nRole = AccessibleRole::TOGGLE_BUTTON; + m_nRole = AccessibleRole::TOGGLE_BUTTON; else if ( m_pToolBox->GetItemWindow( m_nItemId ) ) - m_nRole = AccessibleRole::PANEL; + m_nRole = AccessibleRole::PANEL; break; } @@ -139,15 +139,15 @@ VCLXAccessibleToolBoxItem::~VCLXAccessibleToolBoxItem() sRet = m_pToolBox->GetItemText( m_nItemId ); //OJ #108243# we only read the name of the toolboxitem // -// Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId ); -// if ( pItemWindow && pItemWindow->GetAccessible().is() && -// pItemWindow->GetAccessible()->getAccessibleContext().is() ) -// { -// ::rtl::OUString sWinText = pItemWindow->GetAccessible()->getAccessibleContext()->getAccessibleName(); -// if ( ( sRet.getLength() > 0 ) && ( sWinText.getLength() > 0 ) ) -// sRet += String( RTL_CONSTASCII_USTRINGPARAM( " " ) ); -// sRet += sWinText; -// } +// Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId ); +// if ( pItemWindow && pItemWindow->GetAccessible().is() && +// pItemWindow->GetAccessible()->getAccessibleContext().is() ) +// { +// ::rtl::OUString sWinText = pItemWindow->GetAccessible()->getAccessibleContext()->getAccessibleName(); +// if ( ( sRet.getLength() > 0 ) && ( sWinText.getLength() > 0 ) ) +// sRet += String( RTL_CONSTASCII_USTRINGPARAM( " " ) ); +// sRet += sWinText; +// } } return sRet; } @@ -552,11 +552,11 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleAtPoin void SAL_CALL VCLXAccessibleToolBoxItem::grabFocus( ) throw (RuntimeException) { Reference< XAccessible > xParent(getAccessibleParent()); - + if( xParent.is() ) { Reference< XAccessibleSelection > rxAccessibleSelection(xParent->getAccessibleContext(), UNO_QUERY); - + if ( rxAccessibleSelection.is() ) { rxAccessibleSelection -> selectAccessibleChild ( getAccessibleIndexInParent() ); @@ -588,7 +588,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground( ) throw (RuntimeEx // ----------------------------------------------------------------------------- // XAccessibleExtendedComponent // ----------------------------------------------------------------------------- -Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont( ) throw (RuntimeException) +Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont( ) throw (RuntimeException) { return uno::Reference< awt::XFont >(); } |