This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 04c8800 Fixed mixed style (space/tabs) in indentation
04c8800 is described below
commit 04c88002691bc4b2a5ac56d20828b7f32c699f8c
Author: mseidel <msei...@apache.org>
AuthorDate: Sat Aug 28 12:02:33 2021 +0200
Fixed mixed style (space/tabs) in indentation
---
.../source/extended/accessiblelistbox.cxx | 187 ++++++++++-----------
.../source/standard/vclxaccessiblemenuitem.cxx | 152 ++++++++---------
.../standard/vclxaccessiblestatusbaritem.cxx | 64 +++----
.../source/standard/vclxaccessibletabpage.cxx | 164 +++++++++---------
.../standard/vclxaccessibletextcomponent.cxx | 102 +++++------
.../source/standard/vclxaccessibletoolboxitem.cxx | 160 +++++++++---------
6 files changed, 414 insertions(+), 415 deletions(-)
diff --git a/main/accessibility/source/extended/accessiblelistbox.cxx
b/main/accessibility/source/extended/accessiblelistbox.cxx
index 41e50ac..06b0d2c 100644
--- a/main/accessibility/source/extended/accessiblelistbox.cxx
+++ b/main/accessibility/source/extended/accessiblelistbox.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.
- *
+ *
*************************************************************/
@@ -69,8 +69,8 @@ namespace accessibility
if ( isAlive() )
{
// increment ref count to prevent double call of Dtor
- osl_incrementInterlockedCount( &m_refCount );
- dispose();
+ osl_incrementInterlockedCount( &m_refCount );
+ dispose();
}
}
IMPLEMENT_FORWARD_XINTERFACE2(AccessibleListBox,
VCLXAccessibleComponent, AccessibleListBox_BASE)
@@ -83,11 +83,11 @@ namespace accessibility
//
-----------------------------------------------------------------------------
void AccessibleListBox::ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent )
{
- if ( isAlive() )
+ if ( isAlive() )
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_CHECKBOX_TOGGLE :
+ case VCLEVENT_CHECKBOX_TOGGLE :
{
if ( !getListBox() ||
!getListBox()->HasFocus() )
{
@@ -100,7 +100,7 @@ namespace accessibility
}
uno::Any aValue;
aValue <<= AccessibleStateType::CHECKED;
-
+
if ( getListBox()->GetCheckButtonState(
pCurOpEntry->GetSvLBoxEntry() ) == SV_BUTTON_CHECKED )
{
pCurOpEntry->NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
uno::Any(), aValue );
@@ -114,11 +114,11 @@ namespace accessibility
case VCLEVENT_LISTBOX_SELECT :
{
- // First send an event that tells the listeners of a
- // modified selection. The active descendant event is
- // send after that so that the receiving AT has time to
- // read the text or name of the active child.
-// NotifyAccessibleEvent(
AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
+ // First send an event that tells the
listeners of a
+ // modified selection. The active
descendant event is
+ // send after that so that the
receiving AT has time to
+ // read the text or name of the active
child.
+// NotifyAccessibleEvent(
AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
OSL_ASSERT(0 && "Debug: Treelist
shouldn't use VCLEVENT_LISTBOX_SELECT");
}
case VCLEVENT_LISTBOX_TREESELECT:
@@ -150,7 +150,7 @@ namespace accessibility
if (pSVData &&
pSVData->maWinData.mpFirstFloat == (FloatingWindow*)pParent)
bNeedFocus = sal_True;
*/
- }
+ }
}
if( pBox && (pBox->HasFocus()
|| bNeedFocus) )
{
@@ -181,7 +181,7 @@ namespace accessibility
m_xFocusedChild = pEntNew;
m_mapEntry.insert(MAP_ENTRY::value_type(pEntry,pEntNew));
}
-
+
aNewValue <<=
m_xFocusedChild;
NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldValue,
aNewValue );
}
@@ -191,7 +191,7 @@ namespace accessibility
aNewValue <<=
AccessibleStateType::FOCUSED;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
- }
+ }
}
break;
case VCLEVENT_LISTBOX_ITEMREMOVED:
@@ -209,41 +209,41 @@ namespace accessibility
{
uno::Any
aNewValue;
uno::Any
aOldValue;
- aOldValue <<=
mi->second;
+ aOldValue <<=
mi->second;
NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue, aNewValue );
}
m_mapEntry.clear();
}
-
-
+
+
}
break;
- // --> OD 2009-04-01 #i92103#
- case VCLEVENT_ITEM_EXPANDED :
- case VCLEVENT_ITEM_COLLAPSED :
- {
- SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >(
rVclWindowEvent.GetData() );
- if ( pEntry )
- {
- AccessibleListBoxEntry* pAccListBoxEntry =
- new AccessibleListBoxEntry( *getListBox(), pEntry,
this );
- Reference< XAccessible > xChild = pAccListBoxEntry;
- const short nAccEvent =
- ( rVclWindowEvent.GetId() ==
VCLEVENT_ITEM_EXPANDED )
- ? AccessibleEventId::LISTBOX_ENTRY_EXPANDED
- : AccessibleEventId::LISTBOX_ENTRY_COLLAPSED;
- uno::Any aListBoxEntry;
- aListBoxEntry <<= xChild;
- NotifyAccessibleEvent( nAccEvent, Any(), aListBoxEntry
);
- if ( getListBox() && getListBox()->HasFocus() )
- {
- NotifyAccessibleEvent(
AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, Any(), aListBoxEntry );
- }
- }
- }
- break;
- // <--
+ // --> OD 2009-04-01 #i92103#
+ case VCLEVENT_ITEM_EXPANDED :
+ case VCLEVENT_ITEM_COLLAPSED :
+ {
+ SvLBoxEntry* pEntry = static_cast<
SvLBoxEntry* >( rVclWindowEvent.GetData() );
+ if ( pEntry )
+ {
+ AccessibleListBoxEntry*
pAccListBoxEntry =
+ new
AccessibleListBoxEntry( *getListBox(), pEntry, this );
+ Reference< XAccessible > xChild
= pAccListBoxEntry;
+ const short nAccEvent =
+ (
rVclWindowEvent.GetId() == VCLEVENT_ITEM_EXPANDED )
+ ?
AccessibleEventId::LISTBOX_ENTRY_EXPANDED
+ :
AccessibleEventId::LISTBOX_ENTRY_COLLAPSED;
+ uno::Any aListBoxEntry;
+ aListBoxEntry <<= xChild;
+ NotifyAccessibleEvent(
nAccEvent, Any(), aListBoxEntry );
+ if ( getListBox() &&
getListBox()->HasFocus() )
+ {
+ NotifyAccessibleEvent(
AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, Any(), aListBoxEntry );
+ }
+ }
+ }
+ break;
+ // <--
default:
VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent);
}
@@ -255,7 +255,7 @@ namespace accessibility
SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >(
rVclWindowEvent.GetData() );
if ( !pEntry )
pEntry = getListBox()->GetCurEntry();
-
+
AccessibleListBoxEntry* pEntryFocus =static_cast<
AccessibleListBoxEntry* >(m_xFocusedChild.get());
if (pEntryFocus && pEntry && pEntry !=
pEntryFocus->GetSvLBoxEntry())
{
@@ -267,15 +267,15 @@ namespace accessibility
}
else
{
- pAccCurOptionEntry =new AccessibleListBoxEntry(
*getListBox(), pEntry, NULL );
- std::pair<MAP_ENTRY::iterator, bool> pairMi =
m_mapEntry.insert(MAP_ENTRY::value_type(pAccCurOptionEntry->GetSvLBoxEntry(),pAccCurOptionEntry));
+ pAccCurOptionEntry =new AccessibleListBoxEntry(
*getListBox(), pEntry, NULL );
+ std::pair<MAP_ENTRY::iterator, bool> pairMi =
m_mapEntry.insert(MAP_ENTRY::value_type(pAccCurOptionEntry->GetSvLBoxEntry(),pAccCurOptionEntry));
mi = pairMi.first;
- }
+ }
- uno::Any aNewValue;
+ uno::Any aNewValue;
aNewValue <<= mi->second;//xAcc
- NotifyAccessibleEvent( AccessibleEventId::CHILD,
uno::Any(), aNewValue );//Add
-
+ NotifyAccessibleEvent( AccessibleEventId::CHILD,
uno::Any(), aNewValue );//Add
+
return pAccCurOptionEntry;
}
else
@@ -292,7 +292,7 @@ namespace accessibility
{
uno::Any aNewValue;
uno::Any aOldValue;
- aOldValue <<= mi->second;
+ aOldValue <<= mi->second;
NotifyAccessibleEvent( AccessibleEventId::CHILD,
aOldValue, aNewValue );
m_mapEntry.erase(mi);
@@ -304,26 +304,26 @@ namespace accessibility
{
RemoveChildEntries(pEntryChild);
pEntryChild = pBox->NextSibling(pEntryChild);
- }
+ }
}
//
-----------------------------------------------------------------------------
- void AccessibleListBox::ProcessWindowChildEvent( const VclWindowEvent&
rVclWindowEvent )
- {
- switch ( rVclWindowEvent.GetId() )
- {
- case VCLEVENT_WINDOW_SHOW:
- case VCLEVENT_WINDOW_HIDE:
- {
- }
- break;
- default:
- {
- VCLXAccessibleComponent::ProcessWindowChildEvent(
rVclWindowEvent );
- }
- break;
- }
- }
+ void AccessibleListBox::ProcessWindowChildEvent( const VclWindowEvent&
rVclWindowEvent )
+ {
+ switch ( rVclWindowEvent.GetId() )
+ {
+ case VCLEVENT_WINDOW_SHOW:
+ case VCLEVENT_WINDOW_HIDE:
+ {
+ }
+ break;
+ default:
+ {
+
VCLXAccessibleComponent::ProcessWindowChildEvent( rVclWindowEvent );
+ }
+ break;
+ }
+ }
//
-----------------------------------------------------------------------------
// XComponent
@@ -334,7 +334,7 @@ namespace accessibility
m_mapEntry.clear();
VCLXAccessibleComponent::disposing();
- m_xParent = NULL;
+ m_xParent = NULL;
}
//
-----------------------------------------------------------------------------
// XServiceInfo
@@ -392,12 +392,12 @@ namespace accessibility
ensureAlive();
- sal_Int32 nCount = 0;
- SvTreeListBox* pSvTreeListBox = getListBox();
- if ( pSvTreeListBox )
- nCount = pSvTreeListBox->GetLevelChildCount( NULL );
+ sal_Int32 nCount = 0;
+ SvTreeListBox* pSvTreeListBox = getListBox();
+ if ( pSvTreeListBox )
+ nCount = pSvTreeListBox->GetLevelChildCount( NULL );
- return nCount;
+ return nCount;
}
//
-----------------------------------------------------------------------------
Reference< XAccessible > SAL_CALL
AccessibleListBox::getAccessibleChild( sal_Int32 i ) throw
(IndexOutOfBoundsException,RuntimeException)
@@ -435,7 +435,7 @@ namespace accessibility
}
}
- sal_Bool bHasButtons = (getListBox()->GetStyle() &
WB_HASBUTTONS)!=0;
+ sal_Bool bHasButtons = (getListBox()->GetStyle() &
WB_HASBUTTONS)!=0;
if( !(getListBox()->GetTreeFlags() & TREEFLAG_CHKBTN) )
{
if( bHasButtons )
@@ -454,7 +454,7 @@ namespace accessibility
{
if(getListBox())
{
- short nType =
getListBox()->GetAllEntriesAccessibleRoleType();
+ short nType =
getListBox()->GetAllEntriesAccessibleRoleType();
if( nType == TREEBOX_ALLITEM_ACCROLE_TYPE_TREE)
return AccessibleRole::TREE;
else if( nType == TREEBOX_ALLITEM_ACCROLE_TYPE_LIST)
@@ -462,7 +462,7 @@ namespace accessibility
}
//o is: return AccessibleRole::TREE;
- sal_Bool bHasButtons = (getListBox()->GetStyle() &
WB_HASBUTTONS)!=0;
+ sal_Bool bHasButtons = (getListBox()->GetStyle() &
WB_HASBUTTONS)!=0;
if(!bHasButtons && (getListBox()->GetTreeFlags() &
TREEFLAG_CHKBTN))
return AccessibleRole::LIST;
else
@@ -492,7 +492,7 @@ namespace accessibility
//
-----------------------------------------------------------------------------
void SAL_CALL AccessibleListBox::selectAccessibleChild( sal_Int32
nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
{
- ::comphelper::OExternalLockGuard aGuard( this );
+ ::comphelper::OExternalLockGuard aGuard( this );
ensureAlive();
@@ -505,7 +505,7 @@ namespace accessibility
//
-----------------------------------------------------------------------------
sal_Bool SAL_CALL AccessibleListBox::isAccessibleChildSelected(
sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
{
- ::comphelper::OExternalLockGuard aGuard( this );
+ ::comphelper::OExternalLockGuard aGuard( this );
ensureAlive();
@@ -518,11 +518,11 @@ namespace accessibility
//
-----------------------------------------------------------------------------
void SAL_CALL AccessibleListBox::clearAccessibleSelection( ) throw
(RuntimeException)
{
- ::comphelper::OExternalLockGuard aGuard( this );
+ ::comphelper::OExternalLockGuard aGuard( this );
ensureAlive();
- sal_Int32 i, nCount = 0;
+ sal_Int32 i, nCount = 0;
nCount = getListBox()->GetLevelChildCount( NULL );
for ( i = 0; i < nCount; ++i )
{
@@ -534,11 +534,11 @@ namespace accessibility
//
-----------------------------------------------------------------------------
void SAL_CALL AccessibleListBox::selectAllAccessibleChildren( ) throw
(RuntimeException)
{
- ::comphelper::OExternalLockGuard aGuard( this );
+ ::comphelper::OExternalLockGuard aGuard( this );
ensureAlive();
- sal_Int32 i, nCount = 0;
+ sal_Int32 i, nCount = 0;
nCount = getListBox()->GetLevelChildCount( NULL );
for ( i = 0; i < nCount; ++i )
{
@@ -550,12 +550,12 @@ namespace accessibility
//
-----------------------------------------------------------------------------
sal_Int32 SAL_CALL AccessibleListBox::getSelectedAccessibleChildCount(
) throw (RuntimeException)
{
- ::comphelper::OExternalLockGuard aGuard( this );
+ ::comphelper::OExternalLockGuard aGuard( this );
ensureAlive();
-
-// sal_Int32 i, nSelCount = 0, nCount = 0;
+
+// sal_Int32 i, nSelCount = 0, nCount = 0;
// nCount = getListBox()->GetLevelChildCount( NULL );
// for ( i = 0; i < nCount; ++i )
// {
@@ -563,15 +563,15 @@ namespace accessibility
// if ( getListBox()->IsSelected( pEntry ) )
// ++nSelCount;
// }
-// return nSelCount;
+// return nSelCount;
- int nTestCount = getListBox()->GetSelectionCount();
+ int nTestCount = getListBox()->GetSelectionCount();
return nTestCount;
}
//
-----------------------------------------------------------------------------
Reference< XAccessible > SAL_CALL
AccessibleListBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
throw (IndexOutOfBoundsException, RuntimeException)
{
- ::comphelper::OExternalLockGuard aGuard( this );
+ ::comphelper::OExternalLockGuard aGuard( this );
ensureAlive();
@@ -579,7 +579,7 @@ namespace accessibility
throw IndexOutOfBoundsException();
Reference< XAccessible > xChild;
- sal_Int32 i, nSelCount = 0, nCount = 0;
+ sal_Int32 i, nSelCount = 0, nCount = 0;
nCount = getListBox()->GetLevelChildCount( NULL );
for ( i = 0; i < nCount; ++i )
{
@@ -601,7 +601,7 @@ namespace accessibility
//
-----------------------------------------------------------------------------
void SAL_CALL AccessibleListBox::deselectAccessibleChild( sal_Int32
nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
{
- ::comphelper::OExternalLockGuard aGuard( this );
+ ::comphelper::OExternalLockGuard aGuard( this );
ensureAlive();
@@ -628,4 +628,3 @@ namespace accessibility
//........................................................................
}// namespace accessibility
//........................................................................
-
diff --git a/main/accessibility/source/standard/vclxaccessiblemenuitem.cxx
b/main/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 652d283..f249b44 100644
--- a/main/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/main/accessibility/source/standard/vclxaccessiblemenuitem.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.
- *
+ *
*************************************************************/
@@ -72,18 +72,18 @@ VCLXAccessibleMenuItem::~VCLXAccessibleMenuItem()
sal_Bool VCLXAccessibleMenuItem::IsFocused()
{
- return IsHighlighted();
+ return IsHighlighted();
}
//
-----------------------------------------------------------------------------
-
+
sal_Bool VCLXAccessibleMenuItem::IsSelected()
{
- return IsHighlighted();
+ return IsHighlighted();
}
//
-----------------------------------------------------------------------------
-
+
sal_Bool VCLXAccessibleMenuItem::IsChecked()
{
sal_Bool bChecked = sal_False;
@@ -99,13 +99,13 @@ sal_Bool VCLXAccessibleMenuItem::IsChecked()
}
//
-----------------------------------------------------------------------------
-
+
sal_Bool VCLXAccessibleMenuItem::IsHighlighted()
{
sal_Bool bHighlighted = sal_False;
- if ( m_pParent && m_pParent->IsHighlighted( m_nItemPos ) )
- bHighlighted = sal_True;
+ if ( m_pParent && m_pParent->IsHighlighted( m_nItemPos ) )
+ bHighlighted = sal_True;
return bHighlighted;
}
@@ -114,20 +114,20 @@ sal_Bool VCLXAccessibleMenuItem::IsHighlighted()
void VCLXAccessibleMenuItem::FillAccessibleStateSet(
utl::AccessibleStateSetHelper& rStateSet )
{
- OAccessibleMenuItemComponent::FillAccessibleStateSet( rStateSet );
+ OAccessibleMenuItemComponent::FillAccessibleStateSet( rStateSet );
- rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+ rStateSet.AddState( AccessibleStateType::FOCUSABLE );
- if ( IsFocused() )
- rStateSet.AddState( AccessibleStateType::FOCUSED );
+ if ( IsFocused() )
+ rStateSet.AddState( AccessibleStateType::FOCUSED );
- rStateSet.AddState( AccessibleStateType::SELECTABLE );
+ rStateSet.AddState( AccessibleStateType::SELECTABLE );
- if ( IsSelected() )
- rStateSet.AddState( AccessibleStateType::SELECTED );
+ if ( IsSelected() )
+ rStateSet.AddState( AccessibleStateType::SELECTED );
- if ( IsChecked() )
- rStateSet.AddState( AccessibleStateType::CHECKED );
+ if ( IsChecked() )
+ rStateSet.AddState( AccessibleStateType::CHECKED );
}
//
-----------------------------------------------------------------------------
@@ -191,14 +191,14 @@ Sequence< ::rtl::OUString >
VCLXAccessibleMenuItem::getSupportedServiceNames() t
sal_Int16 VCLXAccessibleMenuItem::getAccessibleRole( ) throw
(RuntimeException)
{
OExternalLockGuard aGuard( this );
- // IA2 CWS. MT: We had the aditional roles in UAA for ever, but never
used them anywhere.
+ // IA2 CWS. MT: We had the additional roles in UAA for ever, but never
used them anywhere.
// Looks reasonable, but need to verify in Orca and VoiceOver.
sal_Int16 nRole = AccessibleRole::MENU_ITEM;
if ( m_pParent )
{
sal_uInt16 nItemId = m_pParent->GetItemId( m_nItemPos );
MenuItemBits nItemBits = m_pParent->GetItemBits(nItemId);
- if( nItemBits & MIB_RADIOCHECK)
+ if( nItemBits & MIB_RADIOCHECK)
nRole = AccessibleRole::RADIO_MENU_ITEM;
else if( nItemBits & MIB_CHECKABLE)
nRole = AccessibleRole::CHECK_MENU_ITEM;
@@ -224,8 +224,8 @@ sal_Bool VCLXAccessibleMenuItem::setCaretPosition(
sal_Int32 nIndex ) throw (Ind
OExternalLockGuard aGuard( this );
- if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
+ throw IndexOutOfBoundsException();
return sal_False;
}
@@ -235,8 +235,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 );
}
//
-----------------------------------------------------------------------------
@@ -248,16 +248,16 @@ Sequence< PropertyValue >
VCLXAccessibleMenuItem::getCharacterAttributes( sal_In
Sequence< PropertyValue > aValues;
::rtl::OUString sText( implGetText() );
- if ( !implIsValidIndex( nIndex, sText.getLength() ) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+ throw IndexOutOfBoundsException();
Font aFont =
Application::GetSettings().GetStyleSettings().GetMenuFont();
sal_Int32 nBackColor = getBackground();
sal_Int32 nColor = getForeground();
- ::std::auto_ptr< CharacterAttributesHelper > pHelper( new
CharacterAttributesHelper( aFont, nBackColor, nColor ) );
- aValues = pHelper->GetCharacterAttributes( aRequestedAttributes );
+ ::std::auto_ptr< CharacterAttributesHelper > pHelper( new
CharacterAttributesHelper( aFont, nBackColor, nColor ) );
+ aValues = pHelper->GetCharacterAttributes( aRequestedAttributes );
- return aValues;
+ return aValues;
}
//
-----------------------------------------------------------------------------
@@ -266,8 +266,8 @@ awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds(
sal_Int32 nIndex ) th
{
OExternalLockGuard aGuard( this );
- if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
+ throw IndexOutOfBoundsException();
awt::Rectangle aBounds( 0, 0, 0, 0 );
if ( m_pParent )
@@ -288,7 +288,7 @@ sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw
(RuntimeException)
{
OExternalLockGuard aGuard( this );
- return OCommonAccessibleText::getCharacterCount();
+ return OCommonAccessibleText::getCharacterCount();
}
//
-----------------------------------------------------------------------------
@@ -317,8 +317,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();
}
//
-----------------------------------------------------------------------------
@@ -326,7 +326,7 @@ sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const
awt::Point& aPoint ) th
sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException)
{
OExternalLockGuard aGuard( this );
-
+
return OCommonAccessibleText::getSelectionStart();
}
@@ -335,8 +335,8 @@ sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw
(RuntimeException)
sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException)
{
OExternalLockGuard aGuard( this );
-
- return OCommonAccessibleText::getSelectionEnd();
+
+ return OCommonAccessibleText::getSelectionEnd();
}
//
-----------------------------------------------------------------------------
@@ -345,8 +345,8 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32
nStartIndex, sal_Int32
{
OExternalLockGuard aGuard( this );
- if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength()
) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidRange( nStartIndex, nEndIndex,
implGetText().getLength() ) )
+ throw IndexOutOfBoundsException();
return sal_False;
}
@@ -356,7 +356,7 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32
nStartIndex, sal_Int32
::rtl::OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException)
{
OExternalLockGuard aGuard( this );
-
+
return OCommonAccessibleText::getText();
}
@@ -365,8 +365,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 );
}
//
-----------------------------------------------------------------------------
@@ -374,7 +374,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 );
}
@@ -383,7 +383,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 );
}
@@ -392,7 +392,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 );
}
@@ -406,7 +406,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();
@@ -421,7 +421,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;
@@ -440,7 +440,7 @@ sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount(
) throw (RuntimeExce
{
OExternalLockGuard aGuard( this );
- return 1;
+ return 1;
}
//
-----------------------------------------------------------------------------
@@ -450,7 +450,7 @@ sal_Bool VCLXAccessibleMenuItem::doAccessibleAction (
sal_Int32 nIndex ) throw (
OExternalLockGuard aGuard( this );
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
- throw IndexOutOfBoundsException();
+ throw IndexOutOfBoundsException();
Click();
@@ -464,7 +464,7 @@ sal_Bool VCLXAccessibleMenuItem::doAccessibleAction (
sal_Int32 nIndex ) throw (
OExternalLockGuard aGuard( this );
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
- throw IndexOutOfBoundsException();
+ throw IndexOutOfBoundsException();
return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_SELECT ) );
}
@@ -475,8 +475,8 @@ Reference< XAccessibleKeyBinding >
VCLXAccessibleMenuItem::getAccessibleActionKe
OExternalLockGuard aGuard( this );
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
- throw IndexOutOfBoundsException();
-
+ throw IndexOutOfBoundsException();
+
OAccessibleKeyBindingHelper* pKeyBindingHelper = new
OAccessibleKeyBindingHelper();
Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
@@ -500,7 +500,7 @@ Reference< XAccessibleKeyBinding >
VCLXAccessibleMenuItem::getAccessibleActionKe
}
aSeq1[0].KeyCode = aKeyCode.GetCode();
aSeq1[0].KeyChar = aKeyEvent.GetCharCode();
- aSeq1[0].KeyFunc = static_cast< sal_Int16 >( aKeyCode.GetFunction() );
+ aSeq1[0].KeyFunc = static_cast< sal_Int16 >(
aKeyCode.GetFunction() );
pKeyBindingHelper->AddKeyBinding( aSeq1 );
// complete menu activation key sequence
@@ -515,31 +515,31 @@ Reference< XAccessibleKeyBinding >
VCLXAccessibleMenuItem::getAccessibleActionKe
{
Reference< XAccessibleKeyBinding >
xKeyB( xAction->getAccessibleActionKeyBinding( 0 ) );
if ( xKeyB.is() &&
xKeyB->getAccessibleKeyBindingCount() > 1 )
- aSeq =
xKeyB->getAccessibleKeyBinding( 1 );
+ aSeq =
xKeyB->getAccessibleKeyBinding( 1 );
}
}
}
Sequence< awt::KeyStroke > aSeq2 =
::comphelper::concatSequences( aSeq, aSeq1 );
pKeyBindingHelper->AddKeyBinding( aSeq2 );
- // accelerator key
- KeyCode aAccelKeyCode = m_pParent->GetAccelKey( m_pParent->GetItemId(
m_nItemPos ) );
- if ( aAccelKeyCode.GetCode() != 0 )
- {
- Sequence< awt::KeyStroke > aSeq3(1);
- aSeq3[0].Modifiers = 0;
- if ( aAccelKeyCode.IsShift() )
- aSeq3[0].Modifiers |= awt::KeyModifier::SHIFT;
- if ( aAccelKeyCode.IsMod1() )
- aSeq3[0].Modifiers |= awt::KeyModifier::MOD1;
- if ( aAccelKeyCode.IsMod2() )
- aSeq3[0].Modifiers |= awt::KeyModifier::MOD2;
- if ( aAccelKeyCode.IsMod3() )
- aSeq3[0].Modifiers |= awt::KeyModifier::MOD3;
- aSeq3[0].KeyCode = aAccelKeyCode.GetCode();
- aSeq3[0].KeyFunc = static_cast< sal_Int16 >(
aAccelKeyCode.GetFunction() );
- pKeyBindingHelper->AddKeyBinding( aSeq3 );
- }
+ // accelerator key
+ KeyCode aAccelKeyCode = m_pParent->GetAccelKey(
m_pParent->GetItemId( m_nItemPos ) );
+ if ( aAccelKeyCode.GetCode() != 0 )
+ {
+ Sequence< awt::KeyStroke > aSeq3(1);
+ aSeq3[0].Modifiers = 0;
+ if ( aAccelKeyCode.IsShift() )
+ aSeq3[0].Modifiers |= awt::KeyModifier::SHIFT;
+ if ( aAccelKeyCode.IsMod1() )
+ aSeq3[0].Modifiers |= awt::KeyModifier::MOD1;
+ if ( aAccelKeyCode.IsMod2() )
+ aSeq3[0].Modifiers |= awt::KeyModifier::MOD2;
+ if ( aAccelKeyCode.IsMod3() )
+ aSeq3[0].Modifiers |= awt::KeyModifier::MOD3;
+ aSeq3[0].KeyCode = aAccelKeyCode.GetCode();
+ aSeq3[0].KeyFunc = static_cast< sal_Int16 >(
aAccelKeyCode.GetFunction() );
+ pKeyBindingHelper->AddKeyBinding( aSeq3 );
+ }
}
return xKeyBinding;
@@ -594,7 +594,7 @@ Any VCLXAccessibleMenuItem::getMaximumValue( ) throw
(RuntimeException)
Any aValue;
aValue <<= (sal_Int32) 1;
-
+
return aValue;
}
@@ -606,7 +606,7 @@ Any VCLXAccessibleMenuItem::getMinimumValue( ) throw
(RuntimeException)
Any aValue;
aValue <<= (sal_Int32) 0;
-
+
return aValue;
}
diff --git a/main/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
b/main/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index 72f99df..d47f39b 100644
--- a/main/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/main/accessibility/source/standard/vclxaccessiblestatusbaritem.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.
- *
+ *
*************************************************************/
@@ -114,7 +114,7 @@ void VCLXAccessibleStatusBarItem::SetItemName( const
::rtl::OUString& sItemName
aOldValue <<= m_sItemName;
aNewValue <<= sItemName;
m_sItemName = sItemName;
- NotifyAccessibleEvent( AccessibleEventId::NAME_CHANGED, aOldValue,
aNewValue );
+ NotifyAccessibleEvent( AccessibleEventId::NAME_CHANGED,
aOldValue, aNewValue );
}
}
@@ -134,11 +134,11 @@ void VCLXAccessibleStatusBarItem::SetItemName( const
::rtl::OUString& sItemName
void VCLXAccessibleStatusBarItem::SetItemText( const ::rtl::OUString&
sItemText )
{
Any aOldValue, aNewValue;
- if ( implInitTextChangedEvent( m_sItemText, sItemText, aOldValue,
aNewValue ) )
- {
- m_sItemText = sItemText;
+ if ( implInitTextChangedEvent( m_sItemText, sItemText, aOldValue,
aNewValue ) )
+ {
+ m_sItemText = sItemText;
NotifyAccessibleEvent( AccessibleEventId::TEXT_CHANGED,
aOldValue, aNewValue );
- }
+ }
}
//
-----------------------------------------------------------------------------
@@ -162,7 +162,7 @@ void VCLXAccessibleStatusBarItem::SetItemText( const
::rtl::OUString& sItemText
void VCLXAccessibleStatusBarItem::FillAccessibleStateSet(
utl::AccessibleStateSetHelper& rStateSet )
{
rStateSet.AddState( AccessibleStateType::ENABLED );
- rStateSet.AddState( AccessibleStateType::SENSITIVE );
+ rStateSet.AddState( AccessibleStateType::SENSITIVE );
rStateSet.AddState( AccessibleStateType::VISIBLE );
@@ -171,12 +171,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 )
);
@@ -341,7 +341,7 @@ sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole(
) throw (RuntimeExcep
::rtl::OUString sDescription;
if ( m_pStatusBar )
- sDescription = m_pStatusBar->GetHelpText( m_nItemId );
+ sDescription = m_pStatusBar->GetHelpText( m_nItemId );
return sDescription;
}
@@ -361,9 +361,9 @@ Reference< XAccessibleRelationSet >
VCLXAccessibleStatusBarItem::getAccessibleRe
{
OExternalLockGuard aGuard( this );
- utl::AccessibleRelationSetHelper* pRelationSetHelper = new
utl::AccessibleRelationSetHelper;
+ utl::AccessibleRelationSetHelper* pRelationSetHelper = new
utl::AccessibleRelationSetHelper;
Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
- return xSet;
+ return xSet;
}
//
-----------------------------------------------------------------------------
@@ -381,7 +381,7 @@ Reference< XAccessibleStateSet >
VCLXAccessibleStatusBarItem::getAccessibleState
}
else
{
- pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+ pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
}
return xSet;
@@ -426,7 +426,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getForeground(
) throw (RuntimeException)
{
Reference< XAccessibleComponent > xParentComp(
xParent->getAccessibleContext(), UNO_QUERY );
if ( xParentComp.is() )
- nColor = xParentComp->getForeground();
+ nColor = xParentComp->getForeground();
}
return nColor;
@@ -444,7 +444,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;
@@ -464,7 +464,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;
@@ -505,8 +505,8 @@ sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition(
sal_Int32 nIndex ) throw
{
OExternalLockGuard aGuard( this );
- if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
+ throw IndexOutOfBoundsException();
return sal_False;
}
@@ -520,19 +520,19 @@ Sequence< PropertyValue >
VCLXAccessibleStatusBarItem::getCharacterAttributes( s
Sequence< PropertyValue > aValues;
::rtl::OUString sText( implGetText() );
- if ( !implIsValidIndex( nIndex, sText.getLength() ) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+ throw IndexOutOfBoundsException();
if ( m_pStatusBar )
{
Font aFont = m_pStatusBar->GetFont();
sal_Int32 nBackColor = getBackground();
sal_Int32 nColor = getForeground();
- ::std::auto_ptr< CharacterAttributesHelper > pHelper( new
CharacterAttributesHelper( aFont, nBackColor, nColor ) );
+ ::std::auto_ptr< CharacterAttributesHelper > pHelper( new
CharacterAttributesHelper( aFont, nBackColor, nColor ) );
aValues = pHelper->GetCharacterAttributes( aRequestedAttributes
);
}
- return aValues;
+ return aValues;
}
//
-----------------------------------------------------------------------------
@@ -541,8 +541,8 @@ awt::Rectangle
VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex
{
OExternalLockGuard aGuard( this );
- if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
+ throw IndexOutOfBoundsException();
awt::Rectangle aBounds( 0, 0, 0, 0 );
if ( m_pStatusBar )
@@ -575,7 +575,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint(
const awt::Point& aPoint
nIndex = aLayoutData.GetIndexForPoint( aPnt );
}
- return nIndex;
+ return nIndex;
}
//
-----------------------------------------------------------------------------
@@ -584,8 +584,8 @@ sal_Bool VCLXAccessibleStatusBarItem::setSelection(
sal_Int32 nStartIndex, sal_I
{
OExternalLockGuard aGuard( this );
- if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength()
) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidRange( nStartIndex, nEndIndex,
implGetText().getLength() ) )
+ throw IndexOutOfBoundsException();
return sal_False;
}
@@ -612,14 +612,14 @@ 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;
}
}
- return bReturn;
+ return bReturn;
}
//
-----------------------------------------------------------------------------
diff --git a/main/accessibility/source/standard/vclxaccessibletabpage.cxx
b/main/accessibility/source/standard/vclxaccessibletabpage.cxx
index 406fc71..29c395d 100644
--- a/main/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/main/accessibility/source/standard/vclxaccessibletabpage.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,7 +64,7 @@ VCLXAccessibleTabPage::VCLXAccessibleTabPage( TabControl*
pTabControl, sal_uInt1
m_pExternalLock = static_cast< VCLExternalSolarLock* >(
getExternalLock() );
m_bFocused = IsFocused();
m_bSelected = IsSelected();
- m_sPageText = GetPageText();
+ m_sPageText = GetPageText();
}
//
-----------------------------------------------------------------------------
@@ -79,24 +79,24 @@ VCLXAccessibleTabPage::~VCLXAccessibleTabPage()
bool VCLXAccessibleTabPage::IsFocused()
{
- bool bFocused = false;
+ bool bFocused = false;
- if ( m_pTabControl && m_pTabControl->HasFocus() &&
m_pTabControl->GetCurPageId() == m_nPageId )
- bFocused = true;
+ if ( m_pTabControl && m_pTabControl->HasFocus() &&
m_pTabControl->GetCurPageId() == m_nPageId )
+ bFocused = true;
- return bFocused;
+ return bFocused;
}
//
-----------------------------------------------------------------------------
bool VCLXAccessibleTabPage::IsSelected()
{
- bool bSelected = false;
+ bool bSelected = false;
- if ( m_pTabControl && m_pTabControl->GetCurPageId() == m_nPageId )
- bSelected = true;
+ if ( m_pTabControl && m_pTabControl->GetCurPageId() == m_nPageId )
+ bSelected = true;
- return bSelected;
+ return bSelected;
}
//
-----------------------------------------------------------------------------
@@ -127,7 +127,7 @@ void VCLXAccessibleTabPage::SetSelected( bool bSelected )
else
aNewValue <<= AccessibleStateType::SELECTED;
m_bSelected = bSelected;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue,
aNewValue );
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
}
}
@@ -135,16 +135,16 @@ void VCLXAccessibleTabPage::SetSelected( bool bSelected )
void VCLXAccessibleTabPage::SetPageText( const ::rtl::OUString& sPageText )
{
- Any aOldValue, aNewValue;
- if ( OCommonAccessibleText::implInitTextChangedEvent( m_sPageText,
sPageText, aOldValue, aNewValue ) )
- {
- Any aOldName, aNewName;
- aOldName <<= m_sPageText;
- aNewName <<= sPageText;
- m_sPageText = sPageText;
- NotifyAccessibleEvent( AccessibleEventId::NAME_CHANGED, aOldName,
aNewName );
- NotifyAccessibleEvent( AccessibleEventId::TEXT_CHANGED, aOldValue,
aNewValue );
- }
+ Any aOldValue, aNewValue;
+ if ( OCommonAccessibleText::implInitTextChangedEvent( m_sPageText,
sPageText, aOldValue, aNewValue ) )
+ {
+ Any aOldName, aNewName;
+ aOldName <<= m_sPageText;
+ aNewName <<= sPageText;
+ m_sPageText = sPageText;
+ NotifyAccessibleEvent( AccessibleEventId::NAME_CHANGED,
aOldName, aNewName );
+ NotifyAccessibleEvent( AccessibleEventId::TEXT_CHANGED,
aOldValue, aNewValue );
+ }
}
//
-----------------------------------------------------------------------------
@@ -162,23 +162,23 @@ void VCLXAccessibleTabPage::SetPageText( const
::rtl::OUString& sPageText )
void VCLXAccessibleTabPage::Update( bool bNew )
{
- if ( m_pTabControl )
- {
- TabPage* pTabPage = m_pTabControl->GetTabPage( m_nPageId );
- if ( pTabPage )
- {
- Reference< XAccessible > xChild( pTabPage->GetAccessible( bNew
) );
- if ( xChild.is() )
- {
- Any aOldValue, aNewValue;
- if ( bNew )
- aNewValue <<= xChild;
- else
- aOldValue <<= xChild;
- NotifyAccessibleEvent( AccessibleEventId::CHILD,
aOldValue, aNewValue );
- }
- }
- }
+ if ( m_pTabControl )
+ {
+ TabPage* pTabPage = m_pTabControl->GetTabPage( m_nPageId );
+ if ( pTabPage )
+ {
+ Reference< XAccessible > xChild(
pTabPage->GetAccessible( bNew ) );
+ if ( xChild.is() )
+ {
+ Any aOldValue, aNewValue;
+ if ( bNew )
+ aNewValue <<= xChild;
+ else
+ aOldValue <<= xChild;
+ NotifyAccessibleEvent(
AccessibleEventId::CHILD, aOldValue, aNewValue );
+ }
+ }
+ }
}
//
-----------------------------------------------------------------------------
@@ -186,7 +186,7 @@ void VCLXAccessibleTabPage::Update( bool bNew )
void VCLXAccessibleTabPage::FillAccessibleStateSet(
utl::AccessibleStateSetHelper& rStateSet )
{
rStateSet.AddState( AccessibleStateType::ENABLED );
- rStateSet.AddState( AccessibleStateType::SENSITIVE );
+ rStateSet.AddState( AccessibleStateType::SENSITIVE );
rStateSet.AddState( AccessibleStateType::FOCUSABLE );
@@ -197,22 +197,22 @@ void VCLXAccessibleTabPage::FillAccessibleStateSet(
utl::AccessibleStateSetHelpe
rStateSet.AddState( AccessibleStateType::SHOWING );
- rStateSet.AddState( AccessibleStateType::SELECTABLE );
+ rStateSet.AddState( AccessibleStateType::SELECTABLE );
if ( IsSelected() )
- rStateSet.AddState( AccessibleStateType::SELECTED );
+ rStateSet.AddState( AccessibleStateType::SELECTED );
}
//
-----------------------------------------------------------------------------
-// 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 ) );
+ aBounds = AWTRectangle( m_pTabControl->GetTabBounds( m_nPageId
) );
return aBounds;
}
@@ -223,7 +223,7 @@ awt::Rectangle VCLXAccessibleTabPage::implGetBounds() throw
(RuntimeException)
::rtl::OUString VCLXAccessibleTabPage::implGetText()
{
- return GetPageText();
+ return GetPageText();
}
//
-----------------------------------------------------------------------------
@@ -262,7 +262,7 @@ void VCLXAccessibleTabPage::disposing()
AccessibleTextHelper_BASE::disposing();
m_pTabControl = NULL;
- m_sPageText = ::rtl::OUString();
+ m_sPageText = ::rtl::OUString();
}
//
-----------------------------------------------------------------------------
@@ -320,7 +320,7 @@ sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount()
throw (RuntimeExcepti
{
TabPage* pTabPage = m_pTabControl->GetTabPage( m_nPageId );
if ( pTabPage && pTabPage->IsVisible() )
- nCount = 1;
+ nCount = 1;
}
return nCount;
@@ -340,7 +340,7 @@ Reference< XAccessible >
VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i
{
TabPage* pTabPage = m_pTabControl->GetTabPage( m_nPageId );
if ( pTabPage && pTabPage->IsVisible() )
- xChild = pTabPage->GetAccessible();
+ xChild = pTabPage->GetAccessible();
}
return xChild;
@@ -385,13 +385,13 @@ sal_Int16 VCLXAccessibleTabPage::getAccessibleRole( )
throw (RuntimeException)
::rtl::OUString VCLXAccessibleTabPage::getAccessibleDescription( ) throw
(RuntimeException)
{
- OExternalLockGuard aGuard( this );
+ OExternalLockGuard aGuard( this );
- ::rtl::OUString sDescription;
- if ( m_pTabControl )
- sDescription = m_pTabControl->GetHelpText( m_nPageId );
+ ::rtl::OUString sDescription;
+ if ( m_pTabControl )
+ sDescription = m_pTabControl->GetHelpText( m_nPageId );
- return sDescription;
+ return sDescription;
}
//
-----------------------------------------------------------------------------
@@ -400,7 +400,7 @@ sal_Int16 VCLXAccessibleTabPage::getAccessibleRole( )
throw (RuntimeException)
{
OExternalLockGuard aGuard( this );
- return GetPageText();
+ return GetPageText();
}
//
-----------------------------------------------------------------------------
@@ -409,9 +409,9 @@ Reference< XAccessibleRelationSet >
VCLXAccessibleTabPage::getAccessibleRelation
{
OExternalLockGuard aGuard( this );
- utl::AccessibleRelationSetHelper* pRelationSetHelper = new
utl::AccessibleRelationSetHelper;
+ utl::AccessibleRelationSetHelper* pRelationSetHelper = new
utl::AccessibleRelationSetHelper;
Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
- return xSet;
+ return xSet;
}
//
-----------------------------------------------------------------------------
@@ -429,7 +429,7 @@ Reference< XAccessibleStateSet >
VCLXAccessibleTabPage::getAccessibleStateSet(
}
else
{
- pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+ pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
}
return xSet;
@@ -457,8 +457,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() );
@@ -482,10 +482,10 @@ void VCLXAccessibleTabPage::grabFocus( ) throw
(RuntimeException)
OExternalLockGuard aGuard( this );
if ( m_pTabControl )
- {
+ {
m_pTabControl->SelectTabPage( m_nPageId );
- m_pTabControl->GrabFocus();
- }
+ m_pTabControl->GrabFocus();
+ }
}
//
-----------------------------------------------------------------------------
@@ -500,7 +500,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;
@@ -518,7 +518,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;
@@ -538,7 +538,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;
@@ -579,8 +579,8 @@ sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32
nIndex ) throw (Inde
{
OExternalLockGuard aGuard( this );
- if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
+ throw IndexOutOfBoundsException();
return sal_False;
}
@@ -594,19 +594,19 @@ Sequence< PropertyValue >
VCLXAccessibleTabPage::getCharacterAttributes( sal_Int
Sequence< PropertyValue > aValues;
::rtl::OUString sText( implGetText() );
- if ( !implIsValidIndex( nIndex, sText.getLength() ) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+ throw IndexOutOfBoundsException();
if ( m_pTabControl )
{
Font aFont = m_pTabControl->GetFont();
sal_Int32 nBackColor = getBackground();
sal_Int32 nColor = getForeground();
- ::std::auto_ptr< CharacterAttributesHelper > pHelper( new
CharacterAttributesHelper( aFont, nBackColor, nColor ) );
+ ::std::auto_ptr< CharacterAttributesHelper > pHelper( new
CharacterAttributesHelper( aFont, nBackColor, nColor ) );
aValues = pHelper->GetCharacterAttributes( aRequestedAttributes
);
}
- return aValues;
+ return aValues;
}
//
-----------------------------------------------------------------------------
@@ -615,8 +615,8 @@ awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds(
sal_Int32 nIndex ) thr
{
OExternalLockGuard aGuard( this );
- if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
+ throw IndexOutOfBoundsException();
awt::Rectangle aBounds( 0, 0, 0, 0 );
if ( m_pTabControl )
@@ -641,14 +641,14 @@ sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const
awt::Point& aPoint ) thr
{
sal_uInt16 nPageId = 0;
Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
- Point aPnt( VCLPoint( aPoint ) );
+ Point aPnt( VCLPoint( aPoint ) );
aPnt += aPageRect.TopLeft();
sal_Int32 nI = m_pTabControl->GetIndexForPoint( aPnt, nPageId );
if ( nI != -1 && m_nPageId == nPageId )
nIndex = nI;
}
- return nIndex;
+ return nIndex;
}
//
-----------------------------------------------------------------------------
@@ -657,8 +657,8 @@ sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32
nStartIndex, sal_Int32 n
{
OExternalLockGuard aGuard( this );
- if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength()
) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidRange( nStartIndex, nEndIndex,
implGetText().getLength() ) )
+ throw IndexOutOfBoundsException();
return sal_False;
}
@@ -685,14 +685,14 @@ 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;
}
}
- return bReturn;
+ return bReturn;
}
//
-----------------------------------------------------------------------------
diff --git a/main/accessibility/source/standard/vclxaccessibletextcomponent.cxx
b/main/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index 3c34166..c66d1b4 100644
--- a/main/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/main/accessibility/source/standard/vclxaccessibletextcomponent.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.
- *
+ *
*************************************************************/
@@ -56,7 +56,7 @@ using namespace ::comphelper;
VCLXAccessibleTextComponent::VCLXAccessibleTextComponent( VCLXWindow*
pVCLXWindow )
:VCLXAccessibleComponent( pVCLXWindow )
{
- if ( GetWindow() )
+ if ( GetWindow() )
m_sText = OutputDevice::GetNonMnemonicString(
GetWindow()->GetText() );
}
@@ -71,28 +71,28 @@ VCLXAccessibleTextComponent::~VCLXAccessibleTextComponent()
void VCLXAccessibleTextComponent::SetText( const ::rtl::OUString& sText )
{
Any aOldValue, aNewValue;
- if ( implInitTextChangedEvent( m_sText, sText, aOldValue, aNewValue ) )
- {
- m_sText = sText;
+ if ( implInitTextChangedEvent( m_sText, sText, aOldValue, aNewValue ) )
+ {
+ m_sText = sText;
NotifyAccessibleEvent( AccessibleEventId::TEXT_CHANGED,
aOldValue, aNewValue );
- }
+ }
}
//
-----------------------------------------------------------------------------
void VCLXAccessibleTextComponent::ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent )
{
- switch ( rVclWindowEvent.GetId() )
- {
- case VCLEVENT_WINDOW_FRAMETITLECHANGED:
- {
+ switch ( rVclWindowEvent.GetId() )
+ {
+ case VCLEVENT_WINDOW_FRAMETITLECHANGED:
+ {
VCLXAccessibleComponent::ProcessWindowEvent(
rVclWindowEvent );
- SetText( implGetText() );
- }
- break;
+ SetText( implGetText() );
+ }
+ break;
default:
VCLXAccessibleComponent::ProcessWindowEvent(
rVclWindowEvent );
- }
+ }
}
//
-----------------------------------------------------------------------------
@@ -101,11 +101,11 @@ void VCLXAccessibleTextComponent::ProcessWindowEvent(
const VclWindowEvent& rVcl
::rtl::OUString VCLXAccessibleTextComponent::implGetText()
{
- ::rtl::OUString aText;
- if ( GetWindow() )
+ ::rtl::OUString aText;
+ if ( GetWindow() )
aText = OutputDevice::GetNonMnemonicString(
GetWindow()->GetText() );
- return aText;
+ return aText;
}
//
-----------------------------------------------------------------------------
@@ -171,8 +171,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 );
}
//
-----------------------------------------------------------------------------
@@ -184,11 +184,11 @@ Sequence< PropertyValue >
VCLXAccessibleTextComponent::getCharacterAttributes( s
Sequence< PropertyValue > aValues;
::rtl::OUString sText( implGetText() );
- if ( !implIsValidIndex( nIndex, sText.getLength() ) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+ throw IndexOutOfBoundsException();
- if ( GetWindow() )
- {
+ if ( GetWindow() )
+ {
Font aFont = GetWindow()->GetControlFont();
sal_Int32 nBackColor =
GetWindow()->GetControlBackground().GetColor();
@@ -200,7 +200,7 @@ Sequence< PropertyValue >
VCLXAccessibleTextComponent::getCharacterAttributes( s
Font aDefaultVCLFont;
OutputDevice* pDev = Application::GetDefaultDevice();
if ( pDev )
- {
+ {
aDefaultVCLFont =
pDev->GetSettings().GetStyleSettings().GetAppFont();
if ( !aFont.GetName().Len() )
{
@@ -244,11 +244,11 @@ Sequence< PropertyValue >
VCLXAccessibleTextComponent::getCharacterAttributes( s
*/
::std::auto_ptr< CharacterAttributesHelper > pHelper( new
CharacterAttributesHelper( aFont, nBackColor, nColor ) );
-
+
aValues = pHelper->GetCharacterAttributes( aRequestedAttributes
);
- }
+ }
- return aValues;
+ return aValues;
}
//
-----------------------------------------------------------------------------
@@ -257,15 +257,15 @@ awt::Rectangle
VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex
{
OExternalLockGuard aGuard( this );
- if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
+ throw IndexOutOfBoundsException();
awt::Rectangle aRect;
Control* pControl = static_cast< Control* >( GetWindow() );
if ( pControl )
aRect = AWTRectangle( pControl->GetCharacterBounds( nIndex ) );
- return aRect;
+ return aRect;
}
//
-----------------------------------------------------------------------------
@@ -273,8 +273,8 @@ awt::Rectangle
VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex
sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw
(RuntimeException)
{
OExternalLockGuard aGuard( this );
-
- return OCommonAccessibleText::getCharacterCount();
+
+ return OCommonAccessibleText::getCharacterCount();
}
//
-----------------------------------------------------------------------------
@@ -288,7 +288,7 @@ sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint(
const awt::Point& aPoint
if ( pControl )
nIndex = pControl->GetIndexForPoint( VCLPoint( aPoint ) );
- return nIndex;
+ return nIndex;
}
//
-----------------------------------------------------------------------------
@@ -296,8 +296,8 @@ sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint(
const awt::Point& aPoint
::rtl::OUString VCLXAccessibleTextComponent::getSelectedText() throw
(RuntimeException)
{
OExternalLockGuard aGuard( this );
-
- return OCommonAccessibleText::getSelectedText();
+
+ return OCommonAccessibleText::getSelectedText();
}
//
-----------------------------------------------------------------------------
@@ -305,7 +305,7 @@ sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint(
const awt::Point& aPoint
sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw
(RuntimeException)
{
OExternalLockGuard aGuard( this );
-
+
return OCommonAccessibleText::getSelectionStart();
}
@@ -314,8 +314,8 @@ sal_Int32 VCLXAccessibleTextComponent::getSelectionStart()
throw (RuntimeExcepti
sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw
(RuntimeException)
{
OExternalLockGuard aGuard( this );
-
- return OCommonAccessibleText::getSelectionEnd();
+
+ return OCommonAccessibleText::getSelectionEnd();
}
//
-----------------------------------------------------------------------------
@@ -324,8 +324,8 @@ sal_Bool VCLXAccessibleTextComponent::setSelection(
sal_Int32 nStartIndex, sal_I
{
OExternalLockGuard aGuard( this );
- if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength()
) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidRange( nStartIndex, nEndIndex,
implGetText().getLength() ) )
+ throw IndexOutOfBoundsException();
return sal_False;
}
@@ -335,7 +335,7 @@ sal_Bool VCLXAccessibleTextComponent::setSelection(
sal_Int32 nStartIndex, sal_I
::rtl::OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException)
{
OExternalLockGuard aGuard( this );
-
+
return OCommonAccessibleText::getText();
}
@@ -344,8 +344,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 );
}
//
-----------------------------------------------------------------------------
@@ -353,7 +353,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 );
}
@@ -362,7 +362,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 );
}
@@ -371,7 +371,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 );
}
@@ -397,14 +397,14 @@ 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;
}
}
- return bReturn;
+ return bReturn;
}
//
-----------------------------------------------------------------------------
diff --git a/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
b/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 8c17c6e..1a988bf 100644
--- a/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/main/accessibility/source/standard/vclxaccessibletoolboxitem.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.
- *
+ *
*************************************************************/
@@ -74,7 +74,7 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem(
ToolBox* _pToolBox, sal_In
m_nItemId ( 0 ),
m_bHasFocus ( sal_False ),
m_bIsChecked ( sal_False ),
- m_bIndeterminate( false )
+ m_bIndeterminate( false )
{
DBG_CTOR( VCLXAccessibleToolBoxItem, NULL );
@@ -84,18 +84,18 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem(
ToolBox* _pToolBox, sal_In
DBG_ASSERT( m_pToolBox, "invalid toolbox" );
m_nItemId = m_pToolBox->GetItemId( (sal_uInt16)m_nIndexInParent );
m_sOldName = GetText( true );
- m_bIsChecked = m_pToolBox->IsItemChecked( m_nItemId );
- m_bIndeterminate = ( m_pToolBox->GetItemState( m_nItemId ) ==
STATE_DONTKNOW );
+ m_bIsChecked = m_pToolBox->IsItemChecked( m_nItemId );
+ m_bIndeterminate = ( m_pToolBox->GetItemState( m_nItemId ) ==
STATE_DONTKNOW );
ToolBoxItemType eType = m_pToolBox->GetItemType(
(sal_uInt16)m_nIndexInParent );
switch ( eType )
{
case TOOLBOXITEM_BUTTON :
{
- ToolBoxItemBits nBits = m_pToolBox->GetItemBits( m_nItemId );
- if (( nBits & TIB_DROPDOWN ) == TIB_DROPDOWN)
+ ToolBoxItemBits nBits = m_pToolBox->GetItemBits(
m_nItemId );
+ if (( nBits & TIB_DROPDOWN ) == TIB_DROPDOWN)
m_nRole = AccessibleRole::BUTTON_DROPDOWN;
else if (( ( nBits & TIB_CHECKABLE ) == TIB_CHECKABLE )
||
- ( ( nBits & TIB_AUTOCHECK ) == TIB_AUTOCHECK ) )
+ ( ( nBits & TIB_AUTOCHECK ) == TIB_AUTOCHECK ) )
m_nRole = AccessibleRole::TOGGLE_BUTTON;
else if ( (nBits & TIB_DROPDOWN) == TIB_DROPDOWN )
{
@@ -148,7 +148,7 @@ VCLXAccessibleToolBoxItem::~VCLXAccessibleToolBoxItem()
// sRet += String( RTL_CONSTASCII_USTRINGPARAM( "
" ) );
// sRet += sWinText;
// }
- if ( sRet.isEmpty() )
+ if ( sRet.isEmpty() )
{
Window* pItemWindow = m_pToolBox->GetItemWindow(
m_nItemId );
if ( m_nRole == AccessibleRole::PANEL && pItemWindow &&
pItemWindow->GetAccessible().is() &&
@@ -175,7 +175,7 @@ void VCLXAccessibleToolBoxItem::SetFocus( sal_Bool _bFocus )
else
aNewValue <<= AccessibleStateType::FOCUSED;
m_bHasFocus = _bFocus;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue,
aNewValue );
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
}
}
//
-----------------------------------------------------------------------------
@@ -192,7 +192,7 @@ void VCLXAccessibleToolBoxItem::SetChecked( sal_Bool
_bCheck )
else
aNewValue <<= AccessibleStateType::CHECKED;
m_bIsChecked = _bCheck;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue,
aNewValue );
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
}
}
//
-----------------------------------------------------------------------------
@@ -206,7 +206,7 @@ void VCLXAccessibleToolBoxItem::SetIndeterminate( bool
_bIndeterminate )
else
aNewValue <<= AccessibleStateType::INDETERMINATE;
m_bIndeterminate = _bIndeterminate;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue,
aNewValue );
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
}
}
//
-----------------------------------------------------------------------------
@@ -226,32 +226,32 @@ void VCLXAccessibleToolBoxItem::NameChanged()
//
-----------------------------------------------------------------------------
void VCLXAccessibleToolBoxItem::SetChild( const Reference< XAccessible >&
_xChild )
{
- m_xChild = _xChild;
+ m_xChild = _xChild;
}
//
-----------------------------------------------------------------------------
void VCLXAccessibleToolBoxItem::NotifyChildEvent( const Reference< XAccessible
>& _xChild, bool _bShow )
{
- Any aOld = _bShow ? Any() : makeAny( _xChild );
- Any aNew = _bShow ? makeAny( _xChild ) : Any();
- NotifyAccessibleEvent( AccessibleEventId::CHILD, aOld, aNew );
+ Any aOld = _bShow ? Any() : makeAny( _xChild );
+ Any aNew = _bShow ? makeAny( _xChild ) : Any();
+ NotifyAccessibleEvent( AccessibleEventId::CHILD, aOld, aNew );
}
//
-----------------------------------------------------------------------------
void VCLXAccessibleToolBoxItem::ToggleEnableState()
{
- Any aOldValue[2], aNewValue[2];
- if ( m_pToolBox->IsItemEnabled( m_nItemId ) )
- {
- aNewValue[0] <<= AccessibleStateType::SENSITIVE;
- aNewValue[1] <<= AccessibleStateType::ENABLED;
- }
- else
- {
- aOldValue[0] <<= AccessibleStateType::ENABLED;
- aOldValue[1] <<= AccessibleStateType::SENSITIVE;
- }
+ Any aOldValue[2], aNewValue[2];
+ if ( m_pToolBox->IsItemEnabled( m_nItemId ) )
+ {
+ aNewValue[0] <<= AccessibleStateType::SENSITIVE;
+ aNewValue[1] <<= AccessibleStateType::ENABLED;
+ }
+ else
+ {
+ aOldValue[0] <<= AccessibleStateType::ENABLED;
+ aOldValue[1] <<= AccessibleStateType::SENSITIVE;
+ }
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[0],
aNewValue[0] );
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[1],
aNewValue[1] );
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[0],
aNewValue[0] );
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[1],
aNewValue[1] );
}
//
-----------------------------------------------------------------------------
awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::implGetBounds( ) throw
(RuntimeException)
@@ -367,7 +367,7 @@ Reference< XAccessible > SAL_CALL
VCLXAccessibleToolBoxItem::getAccessibleParent
{
OContextEntryGuard aGuard( this );
- return m_pToolBox->GetAccessible();
+ return m_pToolBox->GetAccessible();
}
//
-----------------------------------------------------------------------------
sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleIndexInParent( )
throw (RuntimeException)
@@ -388,7 +388,7 @@ sal_Int16 SAL_CALL
VCLXAccessibleToolBoxItem::getAccessibleRole( ) throw (Runti
{
OExternalLockGuard aGuard( this );
-
+
if(m_nRole == AccessibleRole::PANEL && getAccessibleChildCount() >
0 )
{
return ::rtl::OUString( TK_RES_STRING(
RID_STR_ACC_PANEL_DESCRIPTION ) );
@@ -417,39 +417,39 @@ Reference< XAccessibleRelationSet > SAL_CALL
VCLXAccessibleToolBoxItem::getAcces
utl::AccessibleRelationSetHelper* pRelationSetHelper = new
utl::AccessibleRelationSetHelper;
Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
- return xSet;
+ return xSet;
}
//
-----------------------------------------------------------------------------
Reference< XAccessibleStateSet > SAL_CALL
VCLXAccessibleToolBoxItem::getAccessibleStateSet( ) throw (RuntimeException)
{
OExternalLockGuard aGuard( this );
- utl::AccessibleStateSetHelper* pStateSetHelper = new
utl::AccessibleStateSetHelper;
+ utl::AccessibleStateSetHelper* pStateSetHelper = new
utl::AccessibleStateSetHelper;
Reference< XAccessibleStateSet > xStateSet = pStateSetHelper;
if ( m_pToolBox && !rBHelper.bDisposed && !rBHelper.bInDispose )
{
- pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE );
- if ( m_bIsChecked && m_nRole != AccessibleRole::PANEL )
- pStateSetHelper->AddState( AccessibleStateType::CHECKED );
- if ( m_bIndeterminate )
- pStateSetHelper->AddState( AccessibleStateType::INDETERMINATE );
- if ( m_pToolBox->IsEnabled() && m_pToolBox->IsItemEnabled(
m_nItemId ) )
- {
- pStateSetHelper->AddState( AccessibleStateType::ENABLED );
- pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
- }
+ pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE );
+ if ( m_bIsChecked && m_nRole != AccessibleRole::PANEL )
+ pStateSetHelper->AddState( AccessibleStateType::CHECKED
);
+ if ( m_bIndeterminate )
+ pStateSetHelper->AddState(
AccessibleStateType::INDETERMINATE );
+ if ( m_pToolBox->IsEnabled() && m_pToolBox->IsItemEnabled(
m_nItemId ) )
+ {
+ pStateSetHelper->AddState( AccessibleStateType::ENABLED
);
+ pStateSetHelper->AddState(
AccessibleStateType::SENSITIVE );
+ }
if ( m_pToolBox->IsItemVisible( m_nItemId ) )
- pStateSetHelper->AddState( AccessibleStateType::VISIBLE );
- if ( m_pToolBox->IsItemReallyVisible( m_nItemId ) )
+ pStateSetHelper->AddState( AccessibleStateType::VISIBLE
);
+ if ( m_pToolBox->IsItemReallyVisible( m_nItemId ) )
pStateSetHelper->AddState( AccessibleStateType::SHOWING
);
if ( m_bHasFocus )
- pStateSetHelper->AddState( AccessibleStateType::FOCUSED );
+ pStateSetHelper->AddState( AccessibleStateType::FOCUSED
);
}
else
- pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+ pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
- return xStateSet;
+ return xStateSet;
}
//
-----------------------------------------------------------------------------
// XAccessibleText
@@ -463,8 +463,8 @@ sal_Bool SAL_CALL
VCLXAccessibleToolBoxItem::setCaretPosition( sal_Int32 nIndex
{
OExternalLockGuard aGuard( this );
- if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
+ throw IndexOutOfBoundsException();
return sal_False;
}
@@ -475,8 +475,8 @@ Sequence< PropertyValue > SAL_CALL
VCLXAccessibleToolBoxItem::getCharacterAttrib
::rtl::OUString sText( implGetText() );
- if ( !implIsValidIndex( nIndex, sText.getLength() ) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+ throw IndexOutOfBoundsException();
return Sequence< PropertyValue >();
}
@@ -487,8 +487,8 @@ awt::Rectangle SAL_CALL
VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32
::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_pToolBox && m_pToolBox->GetButtonType() != BUTTON_SYMBOL ) //
symbol buttons have no character bounds
@@ -525,8 +525,8 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setSelection(
sal_Int32 nStartIndex
{
OExternalLockGuard aGuard( this );
- if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength()
) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidRange( nStartIndex, nEndIndex,
implGetText().getLength() ) )
+ throw IndexOutOfBoundsException();
return sal_False;
}
@@ -535,8 +535,8 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText(
sal_Int32 nStartIndex, sa
{
OExternalLockGuard aGuard( this );
- if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength()
) )
- throw IndexOutOfBoundsException();
+ if ( !implIsValidRange( nStartIndex, nEndIndex,
implGetText().getLength() ) )
+ throw IndexOutOfBoundsException();
sal_Bool bReturn = sal_False;
@@ -573,17 +573,17 @@ 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() );
- }
- }
+ Reference< XAccessible > xParent(getAccessibleParent());
+
+ if( xParent.is() )
+ {
+ Reference< XAccessibleSelection >
rxAccessibleSelection(xParent->getAccessibleContext(), UNO_QUERY);
+
+ if ( rxAccessibleSelection.is() )
+ {
+ rxAccessibleSelection -> selectAccessibleChild (
getAccessibleIndexInParent() );
+ }
+ }
}
//
-----------------------------------------------------------------------------
sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getForeground( ) throw
(RuntimeException)
@@ -592,7 +592,7 @@ sal_Int32 SAL_CALL
VCLXAccessibleToolBoxItem::getForeground( ) throw (RuntimeEx
sal_Int32 nColor = 0;
if ( m_pToolBox )
- nColor = m_pToolBox->GetControlForeground().GetColor();
+ nColor = m_pToolBox->GetControlForeground().GetColor();
return nColor;
}
@@ -603,7 +603,7 @@ sal_Int32 SAL_CALL
VCLXAccessibleToolBoxItem::getBackground( ) throw (RuntimeEx
sal_Int32 nColor = 0;
if ( m_pToolBox )
- nColor = m_pToolBox->GetControlBackground().GetColor();
+ nColor = m_pToolBox->GetControlBackground().GetColor();
return nColor;
}
@@ -638,10 +638,10 @@ awt::FontDescriptor SAL_CALL
VCLXAccessibleToolBoxItem::getFontMetrics( const Re
::rtl::OUString sRet;
if ( m_pToolBox )
{
- if ( Help::IsExtHelpEnabled() )
- sRet = m_pToolBox->GetHelpText( m_nItemId );
- else
- sRet = m_pToolBox->GetQuickHelpText( m_nItemId );
+ if ( Help::IsExtHelpEnabled() )
+ sRet = m_pToolBox->GetHelpText( m_nItemId );
+ else
+ sRet = m_pToolBox->GetQuickHelpText( m_nItemId );
if ( sRet.isEmpty() )
// no help text set, so use item text
sRet = m_pToolBox->GetItemText( m_nItemId );
@@ -662,7 +662,7 @@ sal_Bool VCLXAccessibleToolBoxItem::doAccessibleAction (
sal_Int32 nIndex ) thro
OExternalLockGuard aGuard( this );
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
- throw IndexOutOfBoundsException();
+ throw IndexOutOfBoundsException();
if ( m_pToolBox )
m_pToolBox->TriggerItem( m_nItemId );
@@ -675,7 +675,7 @@ sal_Bool VCLXAccessibleToolBoxItem::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_CLICK ) );
}
@@ -685,7 +685,7 @@ Reference< XAccessibleKeyBinding >
VCLXAccessibleToolBoxItem::getAccessibleActio
OContextEntryGuard aGuard( this );
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
- throw IndexOutOfBoundsException();
+ throw IndexOutOfBoundsException();
return Reference< XAccessibleKeyBinding >();
}
