This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 09e0ec1 Fixed mixed style (space/tabs) in indentation
09e0ec1 is described below
commit 09e0ec108203d80bb720b1c852d370aa4016535e
Author: mseidel <[email protected]>
AuthorDate: Sun Aug 29 00:20:20 2021 +0200
Fixed mixed style (space/tabs) in indentation
(cherry picked from commit 154667709de12a9d1edbfc113ef193f0e43b3b3b)
---
.../source/standard/floatingwindowaccessible.cxx | 33 ++---
.../source/standard/vclxaccessiblebutton.cxx | 124 ++++++++---------
.../source/standard/vclxaccessiblecombobox.cxx | 26 ++--
.../standard/vclxaccessibledropdowncombobox.cxx | 30 ++---
.../standard/vclxaccessibledropdownlistbox.cxx | 28 ++--
.../standard/vclxaccessiblefixedhyperlink.cxx | 15 +--
.../source/standard/vclxaccessiblefixedtext.cxx | 10 +-
.../source/standard/vclxaccessiblelistbox.cxx | 26 ++--
.../source/standard/vclxaccessiblelistitem.cxx | 98 +++++++-------
.../source/standard/vclxaccessiblemenu.cxx | 45 +++----
.../source/standard/vclxaccessiblemenubar.cxx | 20 +--
.../standard/vclxaccessiblemenuseparator.cxx | 8 +-
.../source/standard/vclxaccessiblepopupmenu.cxx | 14 +-
.../source/standard/vclxaccessibleradiobutton.cxx | 144 ++++++++++----------
.../source/standard/vclxaccessiblescrollbar.cxx | 47 ++++---
.../source/standard/vclxaccessiblestatusbar.cxx | 84 ++++++------
.../source/standard/vclxaccessibletabcontrol.cxx | 150 ++++++++++-----------
.../standard/vclxaccessibletabpagewindow.cxx | 98 +++++++-------
.../source/standard/vclxaccessibletextfield.cxx | 38 +++---
19 files changed, 518 insertions(+), 520 deletions(-)
diff --git a/main/accessibility/source/standard/floatingwindowaccessible.cxx
b/main/accessibility/source/standard/floatingwindowaccessible.cxx
index cd319fc..b25fdad 100644
--- a/main/accessibility/source/standard/floatingwindowaccessible.cxx
+++ b/main/accessibility/source/standard/floatingwindowaccessible.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_accessibility.hxx"
@@ -38,7 +39,7 @@ namespace AccessibleRelationType =
::com::sun::star::accessibility::AccessibleRe
//-------------------------------------------------------------------
FloatingWindowAccessible::FloatingWindowAccessible(VCLXWindow* pWindow) :
- VCLXAccessibleComponent(pWindow)
+ VCLXAccessibleComponent(pWindow)
{
}
@@ -52,15 +53,15 @@ FloatingWindowAccessible::~FloatingWindowAccessible()
void
FloatingWindowAccessible::FillAccessibleRelationSet(utl::AccessibleRelationSetHelper&
rRelationSet)
{
- Window* pWindow = GetWindow();
- if ( pWindow )
- {
- Window* pParentWindow = pWindow->GetParent();
- if( pParentWindow )
- {
- uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
- aSequence[0] = pParentWindow->GetAccessible();
- rRelationSet.AddRelation( AccessibleRelation(
AccessibleRelationType::SUB_WINDOW_OF, aSequence ) );
- }
- }
+ Window* pWindow = GetWindow();
+ if ( pWindow )
+ {
+ Window* pParentWindow = pWindow->GetParent();
+ if( pParentWindow )
+ {
+ uno::Sequence< uno::Reference< uno::XInterface > >
aSequence(1);
+ aSequence[0] = pParentWindow->GetAccessible();
+ rRelationSet.AddRelation( AccessibleRelation(
AccessibleRelationType::SUB_WINDOW_OF, aSequence ) );
+ }
+ }
}
diff --git a/main/accessibility/source/standard/vclxaccessiblebutton.cxx
b/main/accessibility/source/standard/vclxaccessiblebutton.cxx
index ffaf0e3..6b1bef0 100644
--- a/main/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/main/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -66,10 +66,10 @@ VCLXAccessibleButton::~VCLXAccessibleButton()
void VCLXAccessibleButton::ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent )
{
- switch ( rVclWindowEvent.GetId() )
- {
+ switch ( rVclWindowEvent.GetId() )
+ {
case VCLEVENT_PUSHBUTTON_TOGGLE:
- {
+ {
Any aOldValue;
Any aNewValue;
@@ -79,12 +79,12 @@ void VCLXAccessibleButton::ProcessWindowEvent( const
VclWindowEvent& rVclWindowE
else
aOldValue <<= AccessibleStateType::CHECKED;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
- }
- break;
+ NotifyAccessibleEvent(
AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+ }
+ break;
default:
VCLXAccessibleTextComponent::ProcessWindowEvent(
rVclWindowEvent );
- }
+ }
}
//
-----------------------------------------------------------------------------
@@ -96,22 +96,22 @@ void VCLXAccessibleButton::FillAccessibleStateSet(
utl::AccessibleStateSetHelper
PushButton* pButton = (PushButton*) GetWindow();
if ( pButton )
{
- rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+ rStateSet.AddState( AccessibleStateType::FOCUSABLE );
if ( pButton->GetState() == STATE_CHECK )
- rStateSet.AddState( AccessibleStateType::CHECKED );
+ rStateSet.AddState( AccessibleStateType::CHECKED );
if ( pButton->IsPressed() )
- rStateSet.AddState( AccessibleStateType::PRESSED );
+ rStateSet.AddState( AccessibleStateType::PRESSED );
- // IA2 CWS: If the button has a poppup menu,it should has the state
EXPANDABLE
- if( pButton->GetType() == WINDOW_MENUBUTTON )
- {
- rStateSet.AddState( AccessibleStateType::EXPANDABLE );
- }
+ // IA2 CWS: If the button has a poppup menu,it should has the
state EXPANDABLE
+ if( pButton->GetType() == WINDOW_MENUBUTTON )
+ {
+ rStateSet.AddState( AccessibleStateType::EXPANDABLE );
+ }
if( pButton->GetStyle() & WB_DEFBUTTON )
{
- rStateSet.AddState( AccessibleStateType::DEFAULT );
+ rStateSet.AddState( AccessibleStateType::DEFAULT );
}
}
}
@@ -156,9 +156,9 @@ Sequence< ::rtl::OUString >
VCLXAccessibleButton::getSupportedServiceNames() thr
::rtl::OUString aName( VCLXAccessibleTextComponent::getAccessibleName()
);
- // IA2 CWS: Removed special handling for browse/more buttons.
- // Comment was "the '...' or '<<' or '>>' should be kepted per
the requirements from AT"
- // MT: We did introduce this special handling by intention.
+ // IA2 CWS: Removed special handling for browse/more buttons.
+ // Comment was "the '...' or '<<' or '>>' should be kept per
the requirements from AT"
+ // MT: We did introduce this special handling by intention.
// As the original text is still what you get via XAccessibleText,
// I think for the accessible name the stuff below is correct.
@@ -169,7 +169,7 @@ Sequence< ::rtl::OUString >
VCLXAccessibleButton::getSupportedServiceNames() thr
if ( nLength == 3 )
{
// it's a browse button
- aName = ::rtl::OUString( TK_RES_STRING(
RID_STR_ACC_NAME_BROWSEBUTTON ) );
+ aName = ::rtl::OUString( TK_RES_STRING(
RID_STR_ACC_NAME_BROWSEBUTTON ) );
}
else
{
@@ -209,7 +209,7 @@ sal_Bool VCLXAccessibleButton::doAccessibleAction (
sal_Int32 nIndex ) throw (In
OExternalLockGuard aGuard( this );
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
- throw IndexOutOfBoundsException();
+ throw IndexOutOfBoundsException();
PushButton* pButton = (PushButton*) GetWindow();
if ( pButton )
@@ -225,7 +225,7 @@ sal_Bool VCLXAccessibleButton::doAccessibleAction (
sal_Int32 nIndex ) throw (In
OExternalLockGuard aGuard( this );
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
- throw IndexOutOfBoundsException();
+ throw IndexOutOfBoundsException();
return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
}
@@ -234,39 +234,39 @@ sal_Bool VCLXAccessibleButton::doAccessibleAction (
sal_Int32 nIndex ) throw (In
Reference< XAccessibleKeyBinding >
VCLXAccessibleButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw
(IndexOutOfBoundsException, RuntimeException)
{
- OExternalLockGuard aGuard( this );
-
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
- throw IndexOutOfBoundsException();
-
- OAccessibleKeyBindingHelper* pKeyBindingHelper = new
OAccessibleKeyBindingHelper();
- Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
-
- Window* pWindow = GetWindow();
- if ( pWindow )
- {
- KeyEvent aKeyEvent = pWindow->GetActivationKey();
- KeyCode aKeyCode = aKeyEvent.GetKeyCode();
- if ( aKeyCode.GetCode() != 0 )
- {
- awt::KeyStroke aKeyStroke;
- aKeyStroke.Modifiers = 0;
- if ( aKeyCode.IsShift() )
- aKeyStroke.Modifiers |= awt::KeyModifier::SHIFT;
- if ( aKeyCode.IsMod1() )
- aKeyStroke.Modifiers |= awt::KeyModifier::MOD1;
- if ( aKeyCode.IsMod2() )
- aKeyStroke.Modifiers |= awt::KeyModifier::MOD2;
- if ( aKeyCode.IsMod3() )
- aKeyStroke.Modifiers |= awt::KeyModifier::MOD3;
- aKeyStroke.KeyCode = aKeyCode.GetCode();
- aKeyStroke.KeyChar = aKeyEvent.GetCharCode();
- aKeyStroke.KeyFunc = static_cast< sal_Int16 >(
aKeyCode.GetFunction() );
- pKeyBindingHelper->AddKeyBinding( aKeyStroke );
- }
- }
-
- return xKeyBinding;
+ OExternalLockGuard aGuard( this );
+
+ if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ throw IndexOutOfBoundsException();
+
+ OAccessibleKeyBindingHelper* pKeyBindingHelper = new
OAccessibleKeyBindingHelper();
+ Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
+
+ Window* pWindow = GetWindow();
+ if ( pWindow )
+ {
+ KeyEvent aKeyEvent = pWindow->GetActivationKey();
+ KeyCode aKeyCode = aKeyEvent.GetKeyCode();
+ if ( aKeyCode.GetCode() != 0 )
+ {
+ awt::KeyStroke aKeyStroke;
+ aKeyStroke.Modifiers = 0;
+ if ( aKeyCode.IsShift() )
+ aKeyStroke.Modifiers |= awt::KeyModifier::SHIFT;
+ if ( aKeyCode.IsMod1() )
+ aKeyStroke.Modifiers |= awt::KeyModifier::MOD1;
+ if ( aKeyCode.IsMod2() )
+ aKeyStroke.Modifiers |= awt::KeyModifier::MOD2;
+ if ( aKeyCode.IsMod3() )
+ aKeyStroke.Modifiers |= awt::KeyModifier::MOD3;
+ aKeyStroke.KeyCode = aKeyCode.GetCode();
+ aKeyStroke.KeyChar = aKeyEvent.GetCharCode();
+ aKeyStroke.KeyFunc = static_cast< sal_Int16 >(
aKeyCode.GetFunction() );
+ pKeyBindingHelper->AddKeyBinding( aKeyStroke );
+ }
+ }
+
+ return xKeyBinding;
}
//
-----------------------------------------------------------------------------
@@ -308,7 +308,7 @@ sal_Bool VCLXAccessibleButton::setCurrentValue( const Any&
aNumber ) throw (Runt
pButton->SetPressed( (sal_Bool) nValue );
bReturn = sal_True;
}
-
+
return bReturn;
}
@@ -320,7 +320,7 @@ Any VCLXAccessibleButton::getMaximumValue( ) throw
(RuntimeException)
Any aValue;
aValue <<= (sal_Int32) 1;
-
+
return aValue;
}
@@ -332,7 +332,7 @@ Any VCLXAccessibleButton::getMinimumValue( ) throw
(RuntimeException)
Any aValue;
aValue <<= (sal_Int32) 0;
-
+
return aValue;
}
diff --git a/main/accessibility/source/standard/vclxaccessiblecombobox.cxx
b/main/accessibility/source/standard/vclxaccessiblecombobox.cxx
index dacab0c..cc1630c 100644
--- a/main/accessibility/source/standard/vclxaccessiblecombobox.cxx
+++ b/main/accessibility/source/standard/vclxaccessiblecombobox.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::accessibility;
VCLXAccessibleComboBox::VCLXAccessibleComboBox (VCLXWindow* pVCLWindow)
- : VCLXAccessibleBox (pVCLWindow, VCLXAccessibleBox::COMBOBOX, false)
+ : VCLXAccessibleBox (pVCLWindow, VCLXAccessibleBox::COMBOBOX, false)
{
}
@@ -54,8 +54,8 @@ VCLXAccessibleComboBox::~VCLXAccessibleComboBox (void)
bool VCLXAccessibleComboBox::IsValid (void) const
{
- return static_cast<ComboBox*>(GetWindow()) != NULL;
-
+ return static_cast<ComboBox*>(GetWindow()) != NULL;
+
}
@@ -63,7 +63,7 @@ bool VCLXAccessibleComboBox::IsValid (void) const
void VCLXAccessibleComboBox::ProcessWindowEvent (const VclWindowEvent&
rVclWindowEvent)
{
- VCLXAccessibleBox::ProcessWindowEvent( rVclWindowEvent );
+ VCLXAccessibleBox::ProcessWindowEvent( rVclWindowEvent );
}
@@ -71,8 +71,8 @@ void VCLXAccessibleComboBox::ProcessWindowEvent (const
VclWindowEvent& rVclWindo
//===== XServiceInfo ========================================================
-::rtl::OUString VCLXAccessibleComboBox::getImplementationName (void)
- throw (RuntimeException)
+::rtl::OUString VCLXAccessibleComboBox::getImplementationName (void)
+ throw (RuntimeException)
{
return ::rtl::OUString::createFromAscii
("com.sun.star.comp.toolkit.AccessibleComboBox");
}
@@ -80,13 +80,13 @@ void VCLXAccessibleComboBox::ProcessWindowEvent (const
VclWindowEvent& rVclWindo
-Sequence< ::rtl::OUString > VCLXAccessibleComboBox::getSupportedServiceNames
(void)
- throw (RuntimeException)
+Sequence< ::rtl::OUString > VCLXAccessibleComboBox::getSupportedServiceNames
(void)
+ throw (RuntimeException)
{
Sequence< ::rtl::OUString > aNames =
VCLXAccessibleBox::getSupportedServiceNames();
sal_Int32 nLength = aNames.getLength();
aNames.realloc( nLength + 1 );
aNames[nLength] = ::rtl::OUString::createFromAscii(
- "com.sun.star.accessibility.AccessibleComboBox" );
+ "com.sun.star.accessibility.AccessibleComboBox" );
return aNames;
}
diff --git
a/main/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
b/main/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
index 190e757..aaec12b 100644
--- a/main/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
+++ b/main/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -52,8 +52,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::accessibility;
-VCLXAccessibleDropDownComboBox::VCLXAccessibleDropDownComboBox (VCLXWindow*
pVCLWindow)
- : VCLXAccessibleBox (pVCLWindow, VCLXAccessibleBox::COMBOBOX, true)
+VCLXAccessibleDropDownComboBox::VCLXAccessibleDropDownComboBox (VCLXWindow*
pVCLWindow)
+ : VCLXAccessibleBox (pVCLWindow, VCLXAccessibleBox::COMBOBOX, true)
{
}
@@ -68,8 +68,8 @@
VCLXAccessibleDropDownComboBox::~VCLXAccessibleDropDownComboBox (void)
bool VCLXAccessibleDropDownComboBox::IsValid (void) const
{
- return static_cast<ComboBox*>(GetWindow()) != NULL;
-
+ return static_cast<ComboBox*>(GetWindow()) != NULL;
+
}
@@ -82,7 +82,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;
@@ -103,7 +103,7 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent
(const VclWindowEvent& r
NotifyAccessibleEvent(
AccessibleEventId::CHILD, aOldValue, aNewValue
);
- */
+ */
break;
}
@@ -117,8 +117,8 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent
(const VclWindowEvent& r
//===== XServiceInfo ========================================================
-::rtl::OUString VCLXAccessibleDropDownComboBox::getImplementationName()
- throw (RuntimeException)
+::rtl::OUString VCLXAccessibleDropDownComboBox::getImplementationName()
+ throw (RuntimeException)
{
return
::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleDropDownComboBox");
}
@@ -126,13 +126,13 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent
(const VclWindowEvent& r
-Sequence< ::rtl::OUString >
VCLXAccessibleDropDownComboBox::getSupportedServiceNames (void)
- throw (RuntimeException)
+Sequence< ::rtl::OUString >
VCLXAccessibleDropDownComboBox::getSupportedServiceNames (void)
+ throw (RuntimeException)
{
Sequence< ::rtl::OUString > aNames =
VCLXAccessibleBox::getSupportedServiceNames();
sal_Int32 nLength = aNames.getLength();
aNames.realloc( nLength + 1 );
aNames[nLength] = ::rtl::OUString::createFromAscii(
- "com.sun.star.accessibility.AccessibleDropDownComboBox" );
+ "com.sun.star.accessibility.AccessibleDropDownComboBox" );
return aNames;
}
diff --git
a/main/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
b/main/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
index 8e3cabc..59f323b 100644
--- a/main/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
+++ b/main/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -51,8 +51,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::accessibility;
-VCLXAccessibleDropDownListBox::VCLXAccessibleDropDownListBox (VCLXWindow*
pVCLWindow)
- : VCLXAccessibleBox (pVCLWindow, VCLXAccessibleBox::LISTBOX, true)
+VCLXAccessibleDropDownListBox::VCLXAccessibleDropDownListBox (VCLXWindow*
pVCLWindow)
+ : VCLXAccessibleBox (pVCLWindow, VCLXAccessibleBox::LISTBOX, true)
{
}
@@ -68,8 +68,8 @@
VCLXAccessibleDropDownListBox::~VCLXAccessibleDropDownListBox()
bool VCLXAccessibleDropDownListBox::IsValid (void) const
{
- return static_cast<ListBox*>(GetWindow()) != NULL;
-
+ return static_cast<ListBox*>(GetWindow()) != NULL;
+
}
@@ -77,7 +77,7 @@ bool VCLXAccessibleDropDownListBox::IsValid (void) const
void VCLXAccessibleDropDownListBox::ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent )
{
- VCLXAccessibleBox::ProcessWindowEvent (rVclWindowEvent);
+ VCLXAccessibleBox::ProcessWindowEvent (rVclWindowEvent);
}
@@ -85,8 +85,8 @@ void VCLXAccessibleDropDownListBox::ProcessWindowEvent( const
VclWindowEvent& rV
//===== XServiceInfo ========================================================
-::rtl::OUString VCLXAccessibleDropDownListBox::getImplementationName()
- throw (RuntimeException)
+::rtl::OUString VCLXAccessibleDropDownListBox::getImplementationName()
+ throw (RuntimeException)
{
return
::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleDropDownListBox");
}
@@ -94,13 +94,13 @@ void VCLXAccessibleDropDownListBox::ProcessWindowEvent(
const VclWindowEvent& rV
-Sequence< ::rtl::OUString >
VCLXAccessibleDropDownListBox::getSupportedServiceNames (void)
- throw (RuntimeException)
+Sequence< ::rtl::OUString >
VCLXAccessibleDropDownListBox::getSupportedServiceNames (void)
+ throw (RuntimeException)
{
Sequence< ::rtl::OUString > aNames =
VCLXAccessibleBox::getSupportedServiceNames();
sal_Int32 nLength = aNames.getLength();
aNames.realloc( nLength + 1 );
aNames[nLength] = ::rtl::OUString::createFromAscii(
- "com.sun.star.accessibility.AccessibleDropDownListBox" );
+ "com.sun.star.accessibility.AccessibleDropDownListBox" );
return aNames;
}
diff --git
a/main/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
b/main/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
index 5772889..cab95b5 100644
--- a/main/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
+++ b/main/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -65,17 +65,16 @@ void VCLXAccessibleFixedHyperlink::implGetLineBoundary(
i18n::Boundary& rBoundar
::rtl::OUString VCLXAccessibleFixedHyperlink::getImplementationName() throw
(uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii(
"com.sun.star.comp.toolkit.AccessibleFixedHyperlink" );
+ return ::rtl::OUString::createFromAscii(
"com.sun.star.comp.toolkit.AccessibleFixedHyperlink" );
}
//
-----------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString >
VCLXAccessibleFixedHyperlink::getSupportedServiceNames() throw
(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aNames(1);
- aNames[0] = ::rtl::OUString::createFromAscii(
"com.sun.star.awt.AccessibleFixedHyperlink" );
+ uno::Sequence< ::rtl::OUString > aNames(1);
+ aNames[0] = ::rtl::OUString::createFromAscii(
"com.sun.star.awt.AccessibleFixedHyperlink" );
return aNames;
}
//
-----------------------------------------------------------------------------
-
diff --git a/main/accessibility/source/standard/vclxaccessiblefixedtext.cxx
b/main/accessibility/source/standard/vclxaccessiblefixedtext.cxx
index 9050e18..18a57cf 100644
--- a/main/accessibility/source/standard/vclxaccessiblefixedtext.cxx
+++ b/main/accessibility/source/standard/vclxaccessiblefixedtext.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -60,7 +60,7 @@ void VCLXAccessibleFixedText::FillAccessibleStateSet(
utl::AccessibleStateSetHel
VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet );
if ( GetWindow() && GetWindow()->GetStyle() & WB_WORDBREAK )
- rStateSet.AddState( AccessibleStateType::MULTI_LINE );
+ rStateSet.AddState( AccessibleStateType::MULTI_LINE );
}
//
-----------------------------------------------------------------------------
diff --git a/main/accessibility/source/standard/vclxaccessiblelistbox.cxx
b/main/accessibility/source/standard/vclxaccessiblelistbox.cxx
index ae5fe3a..fe7a104 100644
--- a/main/accessibility/source/standard/vclxaccessiblelistbox.cxx
+++ b/main/accessibility/source/standard/vclxaccessiblelistbox.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -50,7 +50,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::accessibility;
VCLXAccessibleListBox::VCLXAccessibleListBox (VCLXWindow* pVCLWindow)
- : VCLXAccessibleBox (pVCLWindow, VCLXAccessibleBox::LISTBOX, false)
+ : VCLXAccessibleBox (pVCLWindow, VCLXAccessibleBox::LISTBOX, false)
{
}
@@ -66,8 +66,8 @@ VCLXAccessibleListBox::~VCLXAccessibleListBox (void)
bool VCLXAccessibleListBox::IsValid (void) const
{
- return static_cast<ListBox*>(GetWindow()) != NULL;
-
+ return static_cast<ListBox*>(GetWindow()) != NULL;
+
}
@@ -75,7 +75,7 @@ bool VCLXAccessibleListBox::IsValid (void) const
void VCLXAccessibleListBox::ProcessWindowEvent (const VclWindowEvent&
rVclWindowEvent)
{
- VCLXAccessibleBox::ProcessWindowEvent( rVclWindowEvent );
+ VCLXAccessibleBox::ProcessWindowEvent( rVclWindowEvent );
}
@@ -83,8 +83,8 @@ void VCLXAccessibleListBox::ProcessWindowEvent (const
VclWindowEvent& rVclWindow
//===== XServiceInfo ========================================================
-::rtl::OUString VCLXAccessibleListBox::getImplementationName (void)
- throw (RuntimeException)
+::rtl::OUString VCLXAccessibleListBox::getImplementationName (void)
+ throw (RuntimeException)
{
return
::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleListBox");
}
@@ -92,13 +92,13 @@ void VCLXAccessibleListBox::ProcessWindowEvent (const
VclWindowEvent& rVclWindow
-Sequence< ::rtl::OUString > VCLXAccessibleListBox::getSupportedServiceNames
(void)
- throw (RuntimeException)
+Sequence< ::rtl::OUString > VCLXAccessibleListBox::getSupportedServiceNames
(void)
+ throw (RuntimeException)
{
Sequence< ::rtl::OUString > aNames =
VCLXAccessibleBox::getSupportedServiceNames();
sal_Int32 nLength = aNames.getLength();
aNames.realloc( nLength + 1 );
aNames[nLength] = ::rtl::OUString::createFromAscii(
- "com.sun.star.accessibility.AccessibleListBox" );
+ "com.sun.star.accessibility.AccessibleListBox" );
return aNames;
}
diff --git a/main/accessibility/source/standard/vclxaccessiblelistitem.cxx
b/main/accessibility/source/standard/vclxaccessiblelistitem.cxx
index fdff723..7986c3c 100644
--- a/main/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/main/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -75,7 +75,7 @@ VCLXAccessibleListItem::VCLXAccessibleListItem(
::accessibility::IComboListBoxHe
m_nIndexInParent( _nIndexInParent ),
m_bSelected ( sal_False ),
m_bVisible ( sal_False ),
- m_nClientId ( 0 ),
+ m_nClientId ( 0 ),
m_pListBoxHelper( _pListBoxHelper ),
m_xParent ( _xParent )
@@ -105,7 +105,7 @@ void VCLXAccessibleListItem::SetSelected( sal_Bool
_bSelected )
else
aNewValue <<= AccessibleStateType::SELECTED;
m_bSelected = _bSelected;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue,
aNewValue );
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
}
}
//
-----------------------------------------------------------------------------
@@ -129,8 +129,8 @@ void VCLXAccessibleListItem::NotifyAccessibleEvent(
sal_Int16 _nEventId,
AccessibleEventObject aEvt;
aEvt.Source = *this;
aEvt.EventId = _nEventId;
- aEvt.OldValue = _aOldValue;
- aEvt.NewValue = _aNewValue;
+ aEvt.OldValue = _aOldValue;
+ aEvt.NewValue = _aNewValue;
if (m_nClientId)
comphelper::AccessibleEventNotifier::addEvent( m_nClientId,
aEvt );
@@ -211,14 +211,14 @@ void SAL_CALL VCLXAccessibleListItem::disposing()
m_xParentContext = NULL;
nId = m_nClientId;
- m_nClientId = 0;
+ m_nClientId = 0;
if ( nId )
xEventSource = *this;
}
- // Send a disposing to all listeners.
+ // Send a disposing to all listeners.
if ( nId )
-
comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nId, *this );
+
comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nId, *this );
}
//
-----------------------------------------------------------------------------
// XServiceInfo
@@ -283,7 +283,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)
@@ -302,30 +302,30 @@ sal_Int16 SAL_CALL
VCLXAccessibleListItem::getAccessibleRole( ) throw (RuntimeE
//
-----------------------------------------------------------------------------
Reference< XAccessibleRelationSet > SAL_CALL
VCLXAccessibleListItem::getAccessibleRelationSet( ) throw (RuntimeException)
{
- utl::AccessibleRelationSetHelper* pRelationSetHelper = new
utl::AccessibleRelationSetHelper;
+ utl::AccessibleRelationSetHelper* pRelationSetHelper = new
utl::AccessibleRelationSetHelper;
Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
- return xSet;
+ return xSet;
}
//
-----------------------------------------------------------------------------
Reference< XAccessibleStateSet > SAL_CALL
VCLXAccessibleListItem::getAccessibleStateSet( ) throw (RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- utl::AccessibleStateSetHelper* pStateSetHelper = new
utl::AccessibleStateSetHelper;
+ utl::AccessibleStateSetHelper* pStateSetHelper = new
utl::AccessibleStateSetHelper;
Reference< XAccessibleStateSet > xStateSet = pStateSetHelper;
if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
{
- pStateSetHelper->AddState( AccessibleStateType::TRANSIENT );
+ pStateSetHelper->AddState( AccessibleStateType::TRANSIENT );
- if(m_pListBoxHelper->IsEnabled())
+ if(m_pListBoxHelper->IsEnabled())
{
- pStateSetHelper->AddState( AccessibleStateType::SELECTABLE );
- pStateSetHelper->AddState( AccessibleStateType::ENABLED );
- pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
+ pStateSetHelper->AddState(
AccessibleStateType::SELECTABLE );
+ pStateSetHelper->AddState( AccessibleStateType::ENABLED
);
+ pStateSetHelper->AddState(
AccessibleStateType::SENSITIVE );
}
- if ( m_bSelected )
+ if ( m_bSelected )
pStateSetHelper->AddState(
AccessibleStateType::SELECTED );
if ( m_bVisible )
{
@@ -334,9 +334,9 @@ Reference< XAccessibleStateSet > SAL_CALL
VCLXAccessibleListItem::getAccessibleS
}
}
else
- pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+ pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
- return xStateSet;
+ return xStateSet;
}
//
-----------------------------------------------------------------------------
Locale SAL_CALL VCLXAccessibleListItem::getLocale( ) throw
(IllegalAccessibleComponentStateException, RuntimeException)
@@ -344,7 +344,7 @@ Locale SAL_CALL VCLXAccessibleListItem::getLocale( ) throw
(IllegalAccessibleCo
vos::OGuard aSolarGuard( Application::GetSolarMutex() );
::osl::MutexGuard aGuard( m_aMutex );
- return implGetLocale();
+ return implGetLocale();
}
//
-----------------------------------------------------------------------------
// XAccessibleComponent
@@ -439,8 +439,8 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition(
sal_Int32 nIndex ) t
vos::OGuard aSolarGuard( Application::GetSolarMutex() );
::osl::MutexGuard aGuard( m_aMutex );
- if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
+ throw IndexOutOfBoundsException();
return sal_False;
}
@@ -459,8 +459,8 @@ Sequence< PropertyValue > SAL_CALL
VCLXAccessibleListItem::getCharacterAttribute
::osl::MutexGuard aGuard( m_aMutex );
::rtl::OUString sText( implGetText() );
- if ( !implIsValidIndex( nIndex, sText.getLength() ) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+ throw IndexOutOfBoundsException();
return Sequence< PropertyValue >();
}
@@ -471,8 +471,8 @@ awt::Rectangle SAL_CALL
VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nI
::osl::MutexGuard aGuard( m_aMutex );
::rtl::OUString sText( implGetText() );
- if ( !implIsValidIndex( nIndex, sText.getLength() ) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+ throw IndexOutOfBoundsException();
awt::Rectangle aBounds( 0, 0, 0, 0 );
if ( m_pListBoxHelper )
@@ -502,15 +502,15 @@ sal_Int32 SAL_CALL
VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aP
sal_Int32 nIndex = -1;
if ( m_pListBoxHelper )
{
- sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND;
- Rectangle aItemRect = m_pListBoxHelper->GetBoundingRectangle(
(sal_uInt16)m_nIndexInParent );
+ sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND;
+ Rectangle aItemRect = m_pListBoxHelper->GetBoundingRectangle(
(sal_uInt16)m_nIndexInParent );
Point aPnt( VCLPoint( aPoint ) );
aPnt += aItemRect.TopLeft();
- sal_Int32 nI = m_pListBoxHelper->GetIndexForPoint( aPnt, nPos );
- if ( nI != -1 && (sal_uInt16)m_nIndexInParent == nPos )
- nIndex = nI;
+ sal_Int32 nI = m_pListBoxHelper->GetIndexForPoint( aPnt, nPos );
+ if ( nI != -1 && (sal_uInt16)m_nIndexInParent == nPos )
+ nIndex = nI;
}
- return nIndex;
+ return nIndex;
}
//
-----------------------------------------------------------------------------
::rtl::OUString SAL_CALL VCLXAccessibleListItem::getSelectedText() throw
(RuntimeException)
@@ -542,8 +542,8 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection(
sal_Int32 nStartIndex, s
vos::OGuard aSolarGuard( Application::GetSolarMutex() );
::osl::MutexGuard aGuard( m_aMutex );
- if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength()
) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidRange( nStartIndex, nEndIndex,
implGetText().getLength() ) )
+ throw IndexOutOfBoundsException();
return sal_False;
}
@@ -616,7 +616,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText(
sal_Int32 nStartIndex, sal_I
}
}
- return bRet;
+ return bRet;
}
//
-----------------------------------------------------------------------------
// XAccessibleEventBroadcaster
@@ -624,18 +624,18 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText(
sal_Int32 nStartIndex, sal_I
void SAL_CALL VCLXAccessibleListItem::addEventListener( const Reference<
XAccessibleEventListener >& xListener ) throw (RuntimeException)
{
if (xListener.is())
- {
+ {
if (!m_nClientId)
- m_nClientId = comphelper::AccessibleEventNotifier::registerClient(
);
+ m_nClientId =
comphelper::AccessibleEventNotifier::registerClient( );
comphelper::AccessibleEventNotifier::addEventListener(
m_nClientId, xListener );
- }
+ }
}
//
-----------------------------------------------------------------------------
void SAL_CALL VCLXAccessibleListItem::removeEventListener( const Reference<
XAccessibleEventListener >& xListener ) throw (RuntimeException)
{
if ( xListener.is() && m_nClientId )
{
- sal_Int32 nListenerCount =
comphelper::AccessibleEventNotifier::removeEventListener( m_nClientId,
xListener );
+ sal_Int32 nListenerCount =
comphelper::AccessibleEventNotifier::removeEventListener( m_nClientId,
xListener );
if ( !nListenerCount )
{
// no listeners anymore
@@ -655,21 +655,21 @@ void SAL_CALL
VCLXAccessibleListItem::removeEventListener( const Reference< XAcc
-// AF (Oct. 29 2002): Return black as constant foreground color. This is an
+// AF (Oct. 29 2002): Return black as constant foreground color. This is an
// initial implementation and has to be substituted by code that determines
// the color that is actually used.
sal_Int32 SAL_CALL VCLXAccessibleListItem::getForeground (void)
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException)
{
- return COL_BLACK;
+ return COL_BLACK;
}
-// AF (Oct. 29 2002): Return white as constant background color. This is an
+// AF (Oct. 29 2002): Return white as constant background color. This is an
// initial implementation and has to be substituted by code that determines
// the color that is actually used.
sal_Int32 SAL_CALL VCLXAccessibleListItem::getBackground (void)
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException)
{
- return COL_WHITE;
+ return COL_WHITE;
}
//
-----------------------------------------------------------------------------
diff --git a/main/accessibility/source/standard/vclxaccessiblemenu.cxx
b/main/accessibility/source/standard/vclxaccessiblemenu.cxx
index 386ac83..25d1c37 100644
--- a/main/accessibility/source/standard/vclxaccessiblemenu.cxx
+++ b/main/accessibility/source/standard/vclxaccessiblemenu.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -57,28 +57,28 @@ VCLXAccessibleMenu::~VCLXAccessibleMenu()
sal_Bool VCLXAccessibleMenu::IsFocused()
{
- sal_Bool bFocused = sal_False;
+ sal_Bool bFocused = sal_False;
- if ( IsHighlighted() && !IsChildHighlighted() )
- bFocused = sal_True;
+ if ( IsHighlighted() && !IsChildHighlighted() )
+ bFocused = sal_True;
- return bFocused;
+ return bFocused;
}
//
-----------------------------------------------------------------------------
sal_Bool VCLXAccessibleMenu::IsPopupMenuOpen()
{
- sal_Bool bPopupMenuOpen = sal_False;
+ sal_Bool bPopupMenuOpen = sal_False;
- if ( m_pParent )
- {
- PopupMenu* pPopupMenu = m_pParent->GetPopupMenu( m_pParent->GetItemId(
m_nItemPos ) );
- if ( pPopupMenu && pPopupMenu->IsMenuVisible() )
- bPopupMenuOpen = sal_True;
- }
+ if ( m_pParent )
+ {
+ PopupMenu* pPopupMenu = m_pParent->GetPopupMenu(
m_pParent->GetItemId( m_nItemPos ) );
+ if ( pPopupMenu && pPopupMenu->IsMenuVisible() )
+ bPopupMenuOpen = sal_True;
+ }
- return bPopupMenuOpen;
+ return bPopupMenuOpen;
}
//
-----------------------------------------------------------------------------
@@ -119,7 +119,7 @@ sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount( )
throw (RuntimeExceptio
{
OExternalLockGuard aGuard( this );
- return GetChildCount();
+ return GetChildCount();
}
//
-----------------------------------------------------------------------------
@@ -171,13 +171,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 );
}
//
-----------------------------------------------------------------------------
@@ -205,7 +205,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;
}
@@ -225,7 +225,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 );
@@ -255,8 +255,7 @@ void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32
nChildIndex ) throw
OExternalLockGuard aGuard( this );
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
- throw IndexOutOfBoundsException();
+ throw IndexOutOfBoundsException();
return ::rtl::OUString( );
}
-
diff --git a/main/accessibility/source/standard/vclxaccessiblemenubar.cxx
b/main/accessibility/source/standard/vclxaccessiblemenubar.cxx
index 71518d2..3decb27 100644
--- a/main/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/main/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -65,12 +65,12 @@ VCLXAccessibleMenuBar::~VCLXAccessibleMenuBar()
sal_Bool VCLXAccessibleMenuBar::IsFocused()
{
- sal_Bool bFocused = sal_False;
+ sal_Bool bFocused = sal_False;
- if ( m_pWindow && m_pWindow->HasFocus() && !IsChildHighlighted() )
- bFocused = sal_True;
+ if ( m_pWindow && m_pWindow->HasFocus() && !IsChildHighlighted() )
+ bFocused = sal_True;
- return bFocused;
+ return bFocused;
}
//
-----------------------------------------------------------------------------
@@ -81,9 +81,9 @@ IMPL_LINK( VCLXAccessibleMenuBar, WindowEventListener,
VclSimpleEvent*, pEvent )
if ( pEvent && pEvent->ISA( VclWindowEvent ) )
{
DBG_ASSERT( ((VclWindowEvent*)pEvent)->GetWindow(),
"VCLXAccessibleMenuBar::WindowEventListener: no window!" );
- if (
!((VclWindowEvent*)pEvent)->GetWindow()->IsAccessibilityEventsSuppressed() || (
pEvent->GetId() == VCLEVENT_OBJECT_DYING ) )
+ if (
!((VclWindowEvent*)pEvent)->GetWindow()->IsAccessibilityEventsSuppressed() || (
pEvent->GetId() == VCLEVENT_OBJECT_DYING ) )
{
- ProcessWindowEvent( *(VclWindowEvent*)pEvent );
+ ProcessWindowEvent( *(VclWindowEvent*)pEvent );
}
}
return 0;
diff --git a/main/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
b/main/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
index 13f2d62..92884d2 100644
--- a/main/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
+++ b/main/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
b/main/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
index 606bb94..22cea7c 100644
--- a/main/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
+++ b/main/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -51,8 +51,8 @@ VCLXAccessiblePopupMenu::~VCLXAccessiblePopupMenu()
//
-----------------------------------------------------------------------------
sal_Bool VCLXAccessiblePopupMenu::IsFocused()
-{
- return !IsChildHighlighted();
+{
+ return !IsChildHighlighted();
}
//
-----------------------------------------------------------------------------
@@ -81,7 +81,7 @@ sal_Int32
VCLXAccessiblePopupMenu::getAccessibleIndexInParent( ) throw (Runtime
{
OExternalLockGuard aGuard( this );
- return 0;
+ return 0;
}
//
-----------------------------------------------------------------------------
diff --git a/main/accessibility/source/standard/vclxaccessibleradiobutton.cxx
b/main/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index a2e492e..7217ad5 100644
--- a/main/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/main/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -71,10 +71,10 @@ VCLXAccessibleRadioButton::~VCLXAccessibleRadioButton()
void VCLXAccessibleRadioButton::ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent )
{
- switch ( rVclWindowEvent.GetId() )
- {
+ switch ( rVclWindowEvent.GetId() )
+ {
case VCLEVENT_RADIOBUTTON_TOGGLE:
- {
+ {
Any aOldValue;
Any aNewValue;
@@ -84,37 +84,37 @@ void VCLXAccessibleRadioButton::ProcessWindowEvent( const
VclWindowEvent& rVclWi
else
aOldValue <<= AccessibleStateType::CHECKED;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
- }
- break;
+ NotifyAccessibleEvent(
AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+ }
+ break;
default:
VCLXAccessibleTextComponent::ProcessWindowEvent(
rVclWindowEvent );
- }
+ }
}
//
-----------------------------------------------------------------------------
void VCLXAccessibleRadioButton::FillAccessibleRelationSet(
utl::AccessibleRelationSetHelper& rRelationSet )
{
- VCLXAccessibleTextComponent::FillAccessibleRelationSet( rRelationSet );
-
- RadioButton* pRadioButton = dynamic_cast< RadioButton* >( GetWindow() );
- if ( pRadioButton )
- {
- ::std::vector< RadioButton* > aGroup;
- pRadioButton->GetRadioButtonGroup( aGroup, true );
- if ( !aGroup.empty() )
- {
- sal_Int32 i = 0;
- Sequence< Reference< XInterface > > aSequence( static_cast<
sal_Int32 >( aGroup.size() ) );
- ::std::vector< RadioButton* >::const_iterator aEndItr =
aGroup.end();
- for ( ::std::vector< RadioButton* >::const_iterator aItr =
aGroup.begin(); aItr < aEndItr; ++aItr )
- {
- aSequence[i++] = (*aItr)->GetAccessible();
- }
- rRelationSet.AddRelation( AccessibleRelation(
AccessibleRelationType::MEMBER_OF, aSequence ) );
- }
- }
+ VCLXAccessibleTextComponent::FillAccessibleRelationSet( rRelationSet );
+
+ RadioButton* pRadioButton = dynamic_cast< RadioButton* >( GetWindow() );
+ if ( pRadioButton )
+ {
+ ::std::vector< RadioButton* > aGroup;
+ pRadioButton->GetRadioButtonGroup( aGroup, true );
+ if ( !aGroup.empty() )
+ {
+ sal_Int32 i = 0;
+ Sequence< Reference< XInterface > > aSequence(
static_cast< sal_Int32 >( aGroup.size() ) );
+ ::std::vector< RadioButton* >::const_iterator aEndItr =
aGroup.end();
+ for ( ::std::vector< RadioButton* >::const_iterator
aItr = aGroup.begin(); aItr < aEndItr; ++aItr )
+ {
+ aSequence[i++] = (*aItr)->GetAccessible();
+ }
+ rRelationSet.AddRelation( AccessibleRelation(
AccessibleRelationType::MEMBER_OF, aSequence ) );
+ }
+ }
}
//
-----------------------------------------------------------------------------
@@ -126,9 +126,9 @@ void VCLXAccessibleRadioButton::FillAccessibleStateSet(
utl::AccessibleStateSetH
VCLXRadioButton* pVCLXRadioButton = static_cast< VCLXRadioButton* >(
GetVCLXWindow() );
if ( pVCLXRadioButton )
{
- rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+ rStateSet.AddState( AccessibleStateType::FOCUSABLE );
if ( pVCLXRadioButton->getState() )
- rStateSet.AddState( AccessibleStateType::CHECKED );
+ rStateSet.AddState( AccessibleStateType::CHECKED );
}
}
@@ -170,7 +170,7 @@ sal_Int32
VCLXAccessibleRadioButton::getAccessibleActionCount( ) throw (RuntimeE
{
OExternalLockGuard aGuard( this );
- return 1;
+ return 1;
}
//
-----------------------------------------------------------------------------
@@ -180,7 +180,7 @@ sal_Bool VCLXAccessibleRadioButton::doAccessibleAction (
sal_Int32 nIndex ) thro
OExternalLockGuard aGuard( this );
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
- throw IndexOutOfBoundsException();
+ throw IndexOutOfBoundsException();
VCLXRadioButton* pVCLXRadioButton = static_cast< VCLXRadioButton* >(
GetVCLXWindow() );
if ( pVCLXRadioButton && !pVCLXRadioButton->getState() )
@@ -196,7 +196,7 @@ sal_Bool VCLXAccessibleRadioButton::doAccessibleAction (
sal_Int32 nIndex ) thro
OExternalLockGuard aGuard( this );
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
- throw IndexOutOfBoundsException();
+ throw IndexOutOfBoundsException();
return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_SELECT ) );
}
@@ -204,39 +204,39 @@ sal_Bool VCLXAccessibleRadioButton::doAccessibleAction (
sal_Int32 nIndex ) thro
Reference< XAccessibleKeyBinding >
VCLXAccessibleRadioButton::getAccessibleActionKeyBinding( sal_Int32 nIndex )
throw (IndexOutOfBoundsException, RuntimeException)
{
- OExternalLockGuard aGuard( this );
-
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
- throw IndexOutOfBoundsException();
-
- OAccessibleKeyBindingHelper* pKeyBindingHelper = new
OAccessibleKeyBindingHelper();
- Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
-
- Window* pWindow = GetWindow();
- if ( pWindow )
- {
- KeyEvent aKeyEvent = pWindow->GetActivationKey();
- KeyCode aKeyCode = aKeyEvent.GetKeyCode();
- if ( aKeyCode.GetCode() != 0 )
- {
- awt::KeyStroke aKeyStroke;
- aKeyStroke.Modifiers = 0;
- if ( aKeyCode.IsShift() )
- aKeyStroke.Modifiers |= awt::KeyModifier::SHIFT;
- if ( aKeyCode.IsMod1() )
- aKeyStroke.Modifiers |= awt::KeyModifier::MOD1;
- if ( aKeyCode.IsMod2() )
- aKeyStroke.Modifiers |= awt::KeyModifier::MOD2;
- if ( aKeyCode.IsMod3() )
- aKeyStroke.Modifiers |= awt::KeyModifier::MOD3;
- aKeyStroke.KeyCode = aKeyCode.GetCode();
- aKeyStroke.KeyChar = aKeyEvent.GetCharCode();
- aKeyStroke.KeyFunc = static_cast< sal_Int16 >(
aKeyCode.GetFunction() );
- pKeyBindingHelper->AddKeyBinding( aKeyStroke );
- }
- }
-
- return xKeyBinding;
+ OExternalLockGuard aGuard( this );
+
+ if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ throw IndexOutOfBoundsException();
+
+ OAccessibleKeyBindingHelper* pKeyBindingHelper = new
OAccessibleKeyBindingHelper();
+ Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
+
+ Window* pWindow = GetWindow();
+ if ( pWindow )
+ {
+ KeyEvent aKeyEvent = pWindow->GetActivationKey();
+ KeyCode aKeyCode = aKeyEvent.GetKeyCode();
+ if ( aKeyCode.GetCode() != 0 )
+ {
+ awt::KeyStroke aKeyStroke;
+ aKeyStroke.Modifiers = 0;
+ if ( aKeyCode.IsShift() )
+ aKeyStroke.Modifiers |= awt::KeyModifier::SHIFT;
+ if ( aKeyCode.IsMod1() )
+ aKeyStroke.Modifiers |= awt::KeyModifier::MOD1;
+ if ( aKeyCode.IsMod2() )
+ aKeyStroke.Modifiers |= awt::KeyModifier::MOD2;
+ if ( aKeyCode.IsMod3() )
+ aKeyStroke.Modifiers |= awt::KeyModifier::MOD3;
+ aKeyStroke.KeyCode = aKeyCode.GetCode();
+ aKeyStroke.KeyChar = aKeyEvent.GetCharCode();
+ aKeyStroke.KeyFunc = static_cast< sal_Int16 >(
aKeyCode.GetFunction() );
+ pKeyBindingHelper->AddKeyBinding( aKeyStroke );
+ }
+ }
+
+ return xKeyBinding;
}
//
-----------------------------------------------------------------------------
@@ -252,7 +252,7 @@ Any VCLXAccessibleRadioButton::getCurrentValue( ) throw
(RuntimeException)
VCLXRadioButton* pVCLXRadioButton = static_cast< VCLXRadioButton* >(
GetVCLXWindow() );
if ( pVCLXRadioButton )
aValue <<= (sal_Int32) pVCLXRadioButton->getState();
-
+
return aValue;
}
@@ -278,7 +278,7 @@ sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const
Any& aNumber ) throw
pVCLXRadioButton->setState( (sal_Bool) nValue );
bReturn = sal_True;
}
-
+
return bReturn;
}
@@ -290,7 +290,7 @@ Any VCLXAccessibleRadioButton::getMaximumValue( ) throw
(RuntimeException)
Any aValue;
aValue <<= (sal_Int32) 1;
-
+
return aValue;
}
@@ -302,7 +302,7 @@ Any VCLXAccessibleRadioButton::getMinimumValue( ) throw
(RuntimeException)
Any aValue;
aValue <<= (sal_Int32) 0;
-
+
return aValue;
}
diff --git a/main/accessibility/source/standard/vclxaccessiblescrollbar.cxx
b/main/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 6515aea..468a3ee 100644
--- a/main/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/main/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -67,16 +67,16 @@ VCLXAccessibleScrollBar::~VCLXAccessibleScrollBar()
void VCLXAccessibleScrollBar::ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent )
{
- switch ( rVclWindowEvent.GetId() )
- {
+ switch ( rVclWindowEvent.GetId() )
+ {
case VCLEVENT_SCROLLBAR_SCROLL:
- {
- NotifyAccessibleEvent( AccessibleEventId::VALUE_CHANGED, Any(),
Any() );
- }
- break;
+ {
+ NotifyAccessibleEvent(
AccessibleEventId::VALUE_CHANGED, Any(), Any() );
+ }
+ break;
default:
VCLXAccessibleComponent::ProcessWindowEvent(
rVclWindowEvent );
- }
+ }
}
//
-----------------------------------------------------------------------------
@@ -89,11 +89,11 @@ void VCLXAccessibleScrollBar::FillAccessibleStateSet(
utl::AccessibleStateSetHel
if ( pVCLXScrollBar )
{
// IA2 CWS: scroll bar should not have FOCUSABLE state.
- // rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+ // rStateSet.AddState( AccessibleStateType::FOCUSABLE );
if ( pVCLXScrollBar->getOrientation() ==
ScrollBarOrientation::HORIZONTAL )
- rStateSet.AddState( AccessibleStateType::HORIZONTAL );
+ rStateSet.AddState( AccessibleStateType::HORIZONTAL );
else if ( pVCLXScrollBar->getOrientation() ==
ScrollBarOrientation::VERTICAL )
- rStateSet.AddState( AccessibleStateType::VERTICAL );
+ rStateSet.AddState( AccessibleStateType::VERTICAL );
}
}
@@ -115,7 +115,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" );
}
//
-----------------------------------------------------------------------------
@@ -145,7 +145,7 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction (
sal_Int32 nIndex ) throw
OExternalLockGuard aGuard( this );
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
- throw IndexOutOfBoundsException();
+ throw IndexOutOfBoundsException();
sal_Bool bReturn = sal_False;
ScrollBar* pScrollBar = static_cast< ScrollBar* >( GetWindow() );
@@ -174,7 +174,7 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction (
sal_Int32 nIndex ) throw
OExternalLockGuard aGuard( this );
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
- throw IndexOutOfBoundsException();
+ throw IndexOutOfBoundsException();
::rtl::OUString sDescription;
@@ -197,9 +197,9 @@ Reference< XAccessibleKeyBinding >
VCLXAccessibleScrollBar::getAccessibleActionK
OExternalLockGuard aGuard( this );
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
- throw IndexOutOfBoundsException();
+ throw IndexOutOfBoundsException();
- return Reference< XAccessibleKeyBinding >();
+ return Reference< XAccessibleKeyBinding >();
}
//
-----------------------------------------------------------------------------
@@ -258,7 +258,7 @@ Any VCLXAccessibleScrollBar::getMaximumValue( ) throw
(RuntimeException)
VCLXScrollBar* pVCLXScrollBar = static_cast< VCLXScrollBar* >(
GetVCLXWindow() );
if ( pVCLXScrollBar )
aValue <<= (sal_Int32) pVCLXScrollBar->getMaximum();
-
+
return aValue;
}
@@ -270,7 +270,7 @@ Any VCLXAccessibleScrollBar::getMinimumValue( ) throw
(RuntimeException)
Any aValue;
aValue <<= (sal_Int32) 0;
-
+
return aValue;
}
@@ -285,10 +285,9 @@ Any VCLXAccessibleScrollBar::getMinimumValue( ) throw
(RuntimeException)
if ( pVCLXScrollBar )
{
if ( pVCLXScrollBar->getOrientation() ==
ScrollBarOrientation::HORIZONTAL )
- aName = TK_RES_STRING( RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL );
+ aName = TK_RES_STRING(
RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL );
else if ( pVCLXScrollBar->getOrientation() ==
ScrollBarOrientation::VERTICAL )
- aName = TK_RES_STRING( RID_STR_ACC_SCROLLBAR_NAME_VERTICAL );
+ aName = TK_RES_STRING(
RID_STR_ACC_SCROLLBAR_NAME_VERTICAL );
}
return aName;
}
-
diff --git a/main/accessibility/source/standard/vclxaccessiblestatusbar.cxx
b/main/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index 460b74c..5ff2e53 100644
--- a/main/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/main/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -160,23 +160,23 @@ void VCLXAccessibleStatusBar::RemoveChild( sal_Int32 i )
void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent )
{
- switch ( rVclWindowEvent.GetId() )
- {
+ switch ( rVclWindowEvent.GetId() )
+ {
case VCLEVENT_STATUSBAR_ITEMADDED:
- {
+ {
if ( m_pStatusBar )
{
- sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
+ sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
sal_uInt16 nItemPos = m_pStatusBar->GetItemPos(
nItemId );
InsertChild( nItemPos );
}
- }
- break;
+ }
+ break;
case VCLEVENT_STATUSBAR_ITEMREMOVED:
- {
+ {
if ( m_pStatusBar )
{
- sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
+ sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
for ( sal_Int32 i = 0, nCount =
getAccessibleChildCount(); i < nCount; ++i )
{
Reference< XAccessible > xChild(
getAccessibleChild( i ) );
@@ -191,54 +191,54 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const
VclWindowEvent& rVclWind
}
}
}
- }
- break;
+ }
+ break;
case VCLEVENT_STATUSBAR_ALLITEMSREMOVED:
- {
+ {
for ( sal_Int32 i = m_aAccessibleChildren.size() - 1; i
>= 0; --i )
RemoveChild( i );
- }
- break;
+ }
+ break;
case VCLEVENT_STATUSBAR_SHOWITEM:
case VCLEVENT_STATUSBAR_HIDEITEM:
- {
+ {
if ( m_pStatusBar )
{
- sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
+ sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
sal_uInt16 nItemPos = m_pStatusBar->GetItemPos(
nItemId );
UpdateShowing( nItemPos,
rVclWindowEvent.GetId() == VCLEVENT_STATUSBAR_SHOWITEM );
}
- }
- break;
+ }
+ 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;
+ }
+ break;
case VCLEVENT_STATUSBAR_NAMECHANGED:
- {
+ {
if ( m_pStatusBar )
{
- sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
+ sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
sal_uInt16 nItemPos = m_pStatusBar->GetItemPos(
nItemId );
- UpdateItemName( nItemPos );
+ UpdateItemName( nItemPos );
}
- }
- break;
+ }
+ break;
case VCLEVENT_STATUSBAR_DRAWITEM:
- {
+ {
if ( m_pStatusBar )
{
- sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
+ sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
sal_uInt16 nItemPos = m_pStatusBar->GetItemPos(
nItemId );
- UpdateItemText( nItemPos );
+ UpdateItemText( nItemPos );
}
- }
- break;
+ }
+ break;
case VCLEVENT_OBJECT_DYING:
- {
+ {
if ( m_pStatusBar )
{
m_pStatusBar = NULL;
@@ -250,15 +250,15 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const
VclWindowEvent& rVclWind
if ( xComponent.is() )
xComponent->dispose();
}
- m_aAccessibleChildren.clear();
+ m_aAccessibleChildren.clear();
}
VCLXAccessibleComponent::ProcessWindowEvent(
rVclWindowEvent );
- }
- break;
+ }
+ break;
default:
VCLXAccessibleComponent::ProcessWindowEvent(
rVclWindowEvent );
- }
+ }
}
//
-----------------------------------------------------------------------------
@@ -280,7 +280,7 @@ void VCLXAccessibleStatusBar::disposing()
if ( xComponent.is() )
xComponent->dispose();
}
- m_aAccessibleChildren.clear();
+ m_aAccessibleChildren.clear();
}
}
@@ -310,7 +310,7 @@ sal_Int32
VCLXAccessibleStatusBar::getAccessibleChildCount() throw (RuntimeExcep
{
OExternalLockGuard aGuard( this );
- return m_aAccessibleChildren.size();
+ return m_aAccessibleChildren.size();
}
//
-----------------------------------------------------------------------------
@@ -336,7 +336,7 @@ Reference< XAccessible >
VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32
}
}
- return xChild;
+ return xChild;
}
//
-----------------------------------------------------------------------------
diff --git a/main/accessibility/source/standard/vclxaccessibletabcontrol.cxx
b/main/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index ba06dee..433695c 100644
--- a/main/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/main/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -99,16 +99,16 @@ void VCLXAccessibleTabControl::UpdateSelected( sal_Int32 i,
bool bSelected )
void VCLXAccessibleTabControl::UpdatePageText( sal_Int32 i )
{
- if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
- {
- Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
- if ( xChild.is() )
- {
- VCLXAccessibleTabPage* pVCLXAccessibleTabPage = static_cast<
VCLXAccessibleTabPage* >( xChild.get() );
- if ( pVCLXAccessibleTabPage )
- pVCLXAccessibleTabPage->SetPageText(
pVCLXAccessibleTabPage->GetPageText() );
- }
- }
+ if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+ {
+ Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+ if ( xChild.is() )
+ {
+ VCLXAccessibleTabPage* pVCLXAccessibleTabPage =
static_cast< VCLXAccessibleTabPage* >( xChild.get() );
+ if ( pVCLXAccessibleTabPage )
+ pVCLXAccessibleTabPage->SetPageText(
pVCLXAccessibleTabPage->GetPageText() );
+ }
+ }
}
//
-----------------------------------------------------------------------------
@@ -177,45 +177,45 @@ void VCLXAccessibleTabControl::RemoveChild( sal_Int32 i )
void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent )
{
- switch ( rVclWindowEvent.GetId() )
- {
+ switch ( rVclWindowEvent.GetId() )
+ {
case VCLEVENT_TABPAGE_ACTIVATE:
case VCLEVENT_TABPAGE_DEACTIVATE:
- {
+ {
if ( m_pTabControl )
{
- sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
+ sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
sal_uInt16 nPagePos =
m_pTabControl->GetPagePos( nPageId );
- UpdateFocused();
+ UpdateFocused();
UpdateSelected( nPagePos,
rVclWindowEvent.GetId() == VCLEVENT_TABPAGE_ACTIVATE );
}
- }
- break;
+ }
+ break;
case VCLEVENT_TABPAGE_PAGETEXTCHANGED:
- {
+ {
if ( m_pTabControl )
{
- sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
+ sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
sal_uInt16 nPagePos =
m_pTabControl->GetPagePos( nPageId );
UpdatePageText( nPagePos );
}
- }
- break;
+ }
+ break;
case VCLEVENT_TABPAGE_INSERTED:
- {
+ {
if ( m_pTabControl )
{
- sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
+ sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
sal_uInt16 nPagePos =
m_pTabControl->GetPagePos( nPageId );
InsertChild( nPagePos );
}
- }
- break;
+ }
+ break;
case VCLEVENT_TABPAGE_REMOVED:
- {
+ {
if ( m_pTabControl )
{
- sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
+ sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr)
rVclWindowEvent.GetData();
for ( sal_Int32 i = 0, nCount =
getAccessibleChildCount(); i < nCount; ++i )
{
Reference< XAccessible > xChild(
getAccessibleChild( i ) );
@@ -230,22 +230,22 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const
VclWindowEvent& rVclWin
}
}
}
- }
- break;
+ }
+ break;
case VCLEVENT_TABPAGE_REMOVEDALL:
- {
+ {
for ( sal_Int32 i = m_aAccessibleChildren.size() - 1; i
>= 0; --i )
RemoveChild( i );
- }
- break;
+ }
+ break;
case VCLEVENT_WINDOW_GETFOCUS:
case VCLEVENT_WINDOW_LOSEFOCUS:
- {
- UpdateFocused();
- }
- break;
+ {
+ UpdateFocused();
+ }
+ break;
case VCLEVENT_OBJECT_DYING:
- {
+ {
if ( m_pTabControl )
{
m_pTabControl = NULL;
@@ -257,15 +257,15 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const
VclWindowEvent& rVclWin
if ( xComponent.is() )
xComponent->dispose();
}
- m_aAccessibleChildren.clear();
+ m_aAccessibleChildren.clear();
}
VCLXAccessibleComponent::ProcessWindowEvent(
rVclWindowEvent );
- }
- break;
+ }
+ break;
default:
VCLXAccessibleComponent::ProcessWindowEvent(
rVclWindowEvent );
- }
+ }
}
//
-----------------------------------------------------------------------------
@@ -275,24 +275,24 @@ void VCLXAccessibleTabControl::ProcessWindowChildEvent(
const VclWindowEvent& rV
switch ( rVclWindowEvent.GetId() )
{
case VCLEVENT_WINDOW_SHOW:
- case VCLEVENT_WINDOW_HIDE:
- {
- if ( m_pTabControl )
- {
- Window* pChild = static_cast< Window* >(
rVclWindowEvent.GetData() );
- if ( pChild && pChild->GetType() == WINDOW_TABPAGE )
- {
- for ( sal_Int32 i = 0, nCount =
m_pTabControl->GetPageCount(); i < nCount; ++i )
- {
- sal_uInt16 nPageId = m_pTabControl->GetPageId(
(sal_uInt16)i );
- TabPage* pTabPage = m_pTabControl->GetTabPage(
nPageId );
- if ( pTabPage == (TabPage*) pChild )
- UpdateTabPage( i, rVclWindowEvent.GetId() ==
VCLEVENT_WINDOW_SHOW );
- }
- }
- }
- }
- break;
+ case VCLEVENT_WINDOW_HIDE:
+ {
+ if ( m_pTabControl )
+ {
+ Window* pChild = static_cast< Window* >(
rVclWindowEvent.GetData() );
+ if ( pChild && pChild->GetType() ==
WINDOW_TABPAGE )
+ {
+ for ( sal_Int32 i = 0, nCount =
m_pTabControl->GetPageCount(); i < nCount; ++i )
+ {
+ sal_uInt16 nPageId =
m_pTabControl->GetPageId( (sal_uInt16)i );
+ TabPage* pTabPage =
m_pTabControl->GetTabPage( nPageId );
+ if ( pTabPage == (TabPage*)
pChild )
+ UpdateTabPage( i,
rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW );
+ }
+ }
+ }
+ }
+ break;
default:
VCLXAccessibleComponent::ProcessWindowChildEvent(
rVclWindowEvent );
}
@@ -340,7 +340,7 @@ void VCLXAccessibleTabControl::disposing()
if ( xComponent.is() )
xComponent->dispose();
}
- m_aAccessibleChildren.clear();
+ m_aAccessibleChildren.clear();
}
}
@@ -370,7 +370,7 @@ sal_Int32
VCLXAccessibleTabControl::getAccessibleChildCount() throw (RuntimeExce
{
OExternalLockGuard aGuard( this );
- return m_aAccessibleChildren.size();
+ return m_aAccessibleChildren.size();
}
//
-----------------------------------------------------------------------------
@@ -396,7 +396,7 @@ Reference< XAccessible >
VCLXAccessibleTabControl::getAccessibleChild( sal_Int32
}
}
- return xChild;
+ return xChild;
}
//
-----------------------------------------------------------------------------
@@ -435,17 +435,17 @@ void VCLXAccessibleTabControl::selectAccessibleChild(
sal_Int32 nChildIndex ) th
//
-----------------------------------------------------------------------------
sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32
nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
-{
- OExternalLockGuard aGuard( this );
+{
+ OExternalLockGuard aGuard( this );
- if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
- throw IndexOutOfBoundsException();
+ if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
+ throw IndexOutOfBoundsException();
- sal_Bool bSelected = sal_False;
- if ( m_pTabControl && m_pTabControl->GetCurPageId() ==
m_pTabControl->GetPageId( (sal_uInt16)nChildIndex ) )
- bSelected = sal_True;
+ sal_Bool bSelected = sal_False;
+ if ( m_pTabControl && m_pTabControl->GetCurPageId() ==
m_pTabControl->GetPageId( (sal_uInt16)nChildIndex ) )
+ bSelected = sal_True;
- return bSelected;
+ return bSelected;
}
//
-----------------------------------------------------------------------------
@@ -485,7 +485,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/main/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
b/main/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index b280356..a4d3327 100644
--- a/main/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+++ b/main/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -42,24 +42,24 @@ using namespace ::comphelper;
VCLXAccessibleTabPageWindow::VCLXAccessibleTabPageWindow( VCLXWindow*
pVCLXWindow )
:VCLXAccessibleComponent( pVCLXWindow )
{
- m_pTabPage = static_cast< TabPage* >( GetWindow() );
- if ( m_pTabPage )
- {
- Window* pParent = m_pTabPage->GetAccessibleParentWindow();
- if ( pParent && pParent->GetType() == WINDOW_TABCONTROL )
- {
- m_pTabControl = static_cast< TabControl* >( pParent );
- if ( m_pTabControl )
- {
- for ( sal_uInt16 i = 0, nCount =
m_pTabControl->GetPageCount(); i < nCount; ++i )
- {
- sal_uInt16 nPageId =
m_pTabControl->GetPageId( i );
- if ( m_pTabControl->GetTabPage( nPageId )
== m_pTabPage )
- m_nPageId = nPageId;
- }
- }
- }
- }
+ m_pTabPage = static_cast< TabPage* >( GetWindow() );
+ if ( m_pTabPage )
+ {
+ Window* pParent = m_pTabPage->GetAccessibleParentWindow();
+ if ( pParent && pParent->GetType() == WINDOW_TABCONTROL )
+ {
+ m_pTabControl = static_cast< TabControl* >( pParent );
+ if ( m_pTabControl )
+ {
+ for ( sal_uInt16 i = 0, nCount =
m_pTabControl->GetPageCount(); i < nCount; ++i )
+ {
+ sal_uInt16 nPageId =
m_pTabControl->GetPageId( i );
+ if ( m_pTabControl->GetTabPage( nPageId
) == m_pTabPage )
+ m_nPageId = nPageId;
+ }
+ }
+ }
+ }
}
//
-----------------------------------------------------------------------------
@@ -69,23 +69,23 @@ VCLXAccessibleTabPageWindow::~VCLXAccessibleTabPageWindow()
}
//
-----------------------------------------------------------------------------
-// OCommonAccessibleComponent
+// OCommonAccessibleComponent
//
-----------------------------------------------------------------------------
awt::Rectangle VCLXAccessibleTabPageWindow::implGetBounds() throw
(RuntimeException)
{
- awt::Rectangle aBounds( 0, 0, 0, 0 );
-
- if ( m_pTabControl )
- {
- Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
- if ( m_pTabPage )
- {
- Rectangle aRect = Rectangle( m_pTabPage->GetPosPixel(),
m_pTabPage->GetSizePixel() );
- aRect.Move( -aPageRect.Left(), -aPageRect.Top() );
- aBounds = AWTRectangle( aRect );
- }
- }
+ awt::Rectangle aBounds( 0, 0, 0, 0 );
+
+ if ( m_pTabControl )
+ {
+ Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
+ if ( m_pTabPage )
+ {
+ Rectangle aRect = Rectangle( m_pTabPage->GetPosPixel(),
m_pTabPage->GetSizePixel() );
+ aRect.Move( -aPageRect.Left(), -aPageRect.Top() );
+ aBounds = AWTRectangle( aRect );
+ }
+ }
return aBounds;
}
@@ -98,8 +98,8 @@ void VCLXAccessibleTabPageWindow::disposing()
{
VCLXAccessibleComponent::disposing();
- m_pTabControl = NULL;
- m_pTabPage = NULL;
+ m_pTabControl = NULL;
+ m_pTabPage = NULL;
}
//
-----------------------------------------------------------------------------
@@ -108,19 +108,19 @@ void VCLXAccessibleTabPageWindow::disposing()
Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent( )
throw (RuntimeException)
{
- OExternalLockGuard aGuard( this );
+ OExternalLockGuard aGuard( this );
Reference< XAccessible > xParent;
- if ( m_pTabControl )
- {
- Reference< XAccessible > xAcc( m_pTabControl->GetAccessible() );
- if ( xAcc.is() )
- {
- Reference< XAccessibleContext > xCont(
xAcc->getAccessibleContext() );
- if ( xCont.is() )
- xParent = xCont->getAccessibleChild(
m_pTabControl->GetPagePos( m_nPageId ) );
- }
- }
+ if ( m_pTabControl )
+ {
+ Reference< XAccessible > xAcc( m_pTabControl->GetAccessible() );
+ if ( xAcc.is() )
+ {
+ Reference< XAccessibleContext > xCont(
xAcc->getAccessibleContext() );
+ if ( xCont.is() )
+ xParent = xCont->getAccessibleChild(
m_pTabControl->GetPagePos( m_nPageId ) );
+ }
+ }
return xParent;
}
@@ -131,7 +131,7 @@ sal_Int32
VCLXAccessibleTabPageWindow::getAccessibleIndexInParent( ) throw (Run
{
OExternalLockGuard aGuard( this );
- return 0;
+ return 0;
}
//
-----------------------------------------------------------------------------
diff --git a/main/accessibility/source/standard/vclxaccessibletextfield.cxx
b/main/accessibility/source/standard/vclxaccessibletextfield.cxx
index e5820fa..7afb99d 100644
--- a/main/accessibility/source/standard/vclxaccessibletextfield.cxx
+++ b/main/accessibility/source/standard/vclxaccessibletextfield.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -64,12 +64,12 @@ VCLXAccessibleTextField::~VCLXAccessibleTextField (void)
::rtl::OUString VCLXAccessibleTextField::implGetText (void)
{
- ::rtl::OUString aText;
- ListBox* pListBox = static_cast<ListBox*>(GetWindow());
- if (pListBox!=NULL && !pListBox->IsInDropDown())
+ ::rtl::OUString aText;
+ ListBox* pListBox = static_cast<ListBox*>(GetWindow());
+ if (pListBox!=NULL && !pListBox->IsInDropDown())
aText = pListBox->GetSelectEntry();
- return aText;
+ return aText;
}
@@ -82,8 +82,8 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleTextField,
VCLXAccessibleTextComp
//===== XAccessible =========================================================
Reference<XAccessibleContext> SAL_CALL
- VCLXAccessibleTextField::getAccessibleContext (void)
- throw (RuntimeException)
+ VCLXAccessibleTextField::getAccessibleContext (void)
+ throw (RuntimeException)
{
return this;
}
@@ -92,29 +92,29 @@ Reference<XAccessibleContext> SAL_CALL
//===== XAccessibleContext ==================================================
sal_Int32 SAL_CALL VCLXAccessibleTextField::getAccessibleChildCount (void)
- throw (RuntimeException)
+ throw (RuntimeException)
{
- return 0;
+ return 0;
}
Reference<XAccessible> SAL_CALL VCLXAccessibleTextField::getAccessibleChild
(sal_Int32)
- throw (IndexOutOfBoundsException, RuntimeException)
+ throw (IndexOutOfBoundsException, RuntimeException)
{
- throw IndexOutOfBoundsException();
+ throw IndexOutOfBoundsException();
}
sal_Int16 SAL_CALL VCLXAccessibleTextField::getAccessibleRole (void)
- throw (RuntimeException)
+ throw (RuntimeException)
{
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
- return AccessibleRole::TEXT;
+ return AccessibleRole::TEXT;
}
Reference< XAccessible > SAL_CALL
VCLXAccessibleTextField::getAccessibleParent( )
@@ -130,7 +130,7 @@ Reference< XAccessible > SAL_CALL
VCLXAccessibleTextField::getAccessibleParent(
//===== XServiceInfo ==========================================================
::rtl::OUString VCLXAccessibleTextField::getImplementationName (void)
- throw (RuntimeException)
+ throw (RuntimeException)
{
return ::rtl::OUString::createFromAscii
("com.sun.star.comp.toolkit.AccessibleTextField");
}
@@ -139,12 +139,12 @@ Reference< XAccessible > SAL_CALL
VCLXAccessibleTextField::getAccessibleParent(
Sequence< ::rtl::OUString > VCLXAccessibleTextField::getSupportedServiceNames
(void)
- throw (RuntimeException)
+ throw (RuntimeException)
{
Sequence< ::rtl::OUString > aNames =
VCLXAccessibleTextComponent::getSupportedServiceNames();
sal_Int32 nLength = aNames.getLength();
aNames.realloc( nLength + 1 );
aNames[nLength] = ::rtl::OUString::createFromAscii(
- "com.sun.star.accessibility.AccessibleTextField");
+ "com.sun.star.accessibility.AccessibleTextField");
return aNames;
}
