[Libreoffice-commits] core.git: accessibility/source UnoControls/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Feb 8 09:02:36 UTC 2019
UnoControls/source/controls/progressbar.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 6 -
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 4 -
accessibility/source/extended/AccessibleGridControl.cxx | 2
accessibility/source/extended/AccessibleGridControlBase.cxx | 38 +++++-----
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 6 -
accessibility/source/extended/accessibletabbarpagelist.cxx | 4 -
accessibility/source/extended/textwindowaccessibility.cxx | 6 -
accessibility/source/standard/vclxaccessiblelist.cxx | 2
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 2
accessibility/source/standard/vclxaccessibletabpage.cxx | 2
accessibility/source/standard/vclxaccessibletoolbox.cxx | 10 +-
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 6 -
14 files changed, 46 insertions(+), 46 deletions(-)
New commits:
commit 74ed61e793ff9641a2c67b83327b066cb9a1af3d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 8 09:26:40 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Feb 8 10:02:05 2019 +0100
loplugin:indentation in UnoControls..accessibility
Change-Id: Ib58ac1c7171331eac543eba7b5f7bae8fa04ae4d
Reviewed-on: https://gerrit.libreoffice.org/67524
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index d18ae7bd7c57..c4937e1f1d66 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -310,7 +310,7 @@ void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGra
// This paint method is not buffered !!
// Every request paint the completely control. ( but only, if peer exist )
- if ( rGraphics.is () )
+ if ( rGraphics.is () )
{
MutexGuard aGuard (m_aMutex);
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 833904ff0418..488d42f7c68c 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -154,8 +154,8 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent()
}
}
}
- }
- return nRet;
+ }
+ return nRet;
}
OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleDescription()
@@ -178,7 +178,7 @@ AccessibleBrowseBoxBase::getAccessibleRelationSet()
::osl::MutexGuard aGuard( getMutex() );
ensureIsAlive();
// BrowseBox does not have relations.
- return new utl::AccessibleRelationSetHelper;
+ return new utl::AccessibleRelationSetHelper;
}
Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index 538a77cba2ae..65de6f691ec7 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -120,7 +120,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessib
Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleColumnHeaders()
{
- SolarMethodGuard aGuard(getMutex());
+ SolarMethodGuard aGuard(getMutex());
ensureIsAlive();
return nullptr; // no headers in headers
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index 908ccf1fff57..d622f38f0ab7 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -74,8 +74,8 @@ namespace accessibility
{
m_nOffset = ( _nOffset == OFFSET_DEFAULT ) ? sal_Int32(vcl::BBINDEX_FIRSTCONTROL) : _nOffset;
sal_Int32 nIndex = getIndex_Impl( _nRowPos, _nColPos, _rBrowseBox.GetColumnCount() );
- setAccessibleName( _rBrowseBox.GetAccessibleObjectName( vcl::BBTYPE_TABLECELL, nIndex ) );
- setAccessibleDescription( _rBrowseBox.GetAccessibleObjectDescription( vcl::BBTYPE_TABLECELL, nIndex ) );
+ setAccessibleName( _rBrowseBox.GetAccessibleObjectName( vcl::BBTYPE_TABLECELL, nIndex ) );
+ setAccessibleDescription( _rBrowseBox.GetAccessibleObjectDescription( vcl::BBTYPE_TABLECELL, nIndex ) );
// Need to register as event listener
Reference< XComponent > xComponent(_rxParent, UNO_QUERY);
if( xComponent.is() )
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index a61c39821d0c..9d0a34064a91 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -171,7 +171,7 @@ void SAL_CALL AccessibleGridControl::grabFocus()
{
SolarMutexGuard aSolarGuard;
ensureIsAlive();
- m_aTable.GrabFocus();
+ m_aTable.GrabFocus();
}
// XServiceInfo ---------------------------------------------------------------
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index a59f9a8d8776..5c3b98ae9625 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -111,21 +111,21 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getAccessibleIndexInParent()
xParentContext( m_xParent->getAccessibleContext() );
if( xParentContext.is() )
{
- css::uno::Reference< uno::XInterface > xChild;
+ css::uno::Reference< uno::XInterface > xChild;
sal_Int32 nChildCount = xParentContext->getAccessibleChildCount();
for( sal_Int32 nChild = 0; nChild < nChildCount; ++nChild )
{
- xChild.set(xParentContext->getAccessibleChild( nChild ), css::uno::UNO_QUERY);
- if ( xMeMyselfAndI.get() == xChild.get() )
- {
- nRet = nChild;
- break;
+ xChild.set(xParentContext->getAccessibleChild( nChild ), css::uno::UNO_QUERY);
+ if ( xMeMyselfAndI.get() == xChild.get() )
+ {
+ nRet = nChild;
+ break;
+ }
}
}
- }
- }
- return nRet;
+ }
+ return nRet;
}
OUString SAL_CALL AccessibleGridControlBase::getAccessibleDescription()
@@ -229,16 +229,16 @@ void SAL_CALL AccessibleGridControlBase::removeAccessibleEventListener(
SolarMutexGuard g;
sal_Int32 nListenerCount = AccessibleEventNotifier::removeEventListener( getClientId( ), _rxListener );
- if ( !nListenerCount )
- {
- // no listeners anymore
- // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
- // and at least to us not firing any events anymore, in case somebody calls
- // NotifyAccessibleEvent, again
- AccessibleEventNotifier::TClientId nId( getClientId( ) );
- setClientId( 0 );
- AccessibleEventNotifier::revokeClient( nId );
- }
+ if ( !nListenerCount )
+ {
+ // no listeners anymore
+ // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+ // and at least to us not firing any events anymore, in case somebody calls
+ // NotifyAccessibleEvent, again
+ AccessibleEventNotifier::TClientId nId( getClientId( ) );
+ setClientId( 0 );
+ AccessibleEventNotifier::revokeClient( nId );
+ }
}
}
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index c2cb7c94224e..14bbbb7a2b35 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -316,9 +316,9 @@ namespace accessibility
if ( IsAlive_Impl() )
{
- pStateSetHelper->AddState( AccessibleStateType::TRANSIENT );
- pStateSetHelper->AddState( AccessibleStateType::SELECTABLE );
- pStateSetHelper->AddState( AccessibleStateType::ENABLED );
+ pStateSetHelper->AddState( AccessibleStateType::TRANSIENT );
+ pStateSetHelper->AddState( AccessibleStateType::SELECTABLE );
+ pStateSetHelper->AddState( AccessibleStateType::ENABLED );
pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
if ( IsShowing_Impl() )
{
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index 1e5228a48fc6..a2c07cf1ea5a 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -175,7 +175,7 @@ namespace accessibility
{
case VclEventId::WindowEnabled:
{
- Any aNewValue;
+ Any aNewValue;
aNewValue <<= AccessibleStateType::SENSITIVE;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, Any(), aNewValue );
aNewValue <<= AccessibleStateType::ENABLED;
@@ -184,7 +184,7 @@ namespace accessibility
break;
case VclEventId::WindowDisabled:
{
- Any aOldValue;
+ Any aOldValue;
aOldValue <<= AccessibleStateType::ENABLED;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, Any() );
aOldValue <<= AccessibleStateType::SENSITIVE;
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 9823a1853aac..8a1a0b6fe1db 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -2110,9 +2110,9 @@ void Document::handleSelectionChangeNotification()
::rtl::Reference< Paragraph > xParagraph(getParagraph(aIt));
if (xParagraph.is())
{
- //disable the first event when user types in empty field.
- ::sal_Int32 count = getAccessibleChildCount();
- bool bEmpty = count > 1;
+ //disable the first event when user types in empty field.
+ ::sal_Int32 count = getAccessibleChildCount();
+ bool bEmpty = count > 1;
//if (aIt != m_aFocused)
if (aIt != m_aFocused && bEmpty)
xParagraph->notifyEvent(
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index bcc805ddb0fc..08f57db441e3 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -200,7 +200,7 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool bHasDropDownList)
{
SolarMutexGuard aSolarGuard;
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
- Reference< XAccessible > xNewAcc;
+ Reference< XAccessible > xNewAcc;
if ( m_pListBoxHelper )
{
sal_Int32 i=0;
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index d498d66919b5..cf3b20773f5b 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -461,7 +461,7 @@ sal_Unicode VCLXAccessibleStatusBarItem::getCharacter( sal_Int32 nIndex )
{
OExternalLockGuard aGuard( this );
- return OCommonAccessibleText::implGetCharacter( GetItemText(), nIndex );
+ return OCommonAccessibleText::implGetCharacter( GetItemText(), nIndex );
}
sal_Int32 VCLXAccessibleStatusBarItem::getCaretPosition()
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
index bb56e3584d78..3f725700f5fa 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -540,7 +540,7 @@ sal_Unicode VCLXAccessibleTabPage::getCharacter( sal_Int32 nIndex )
{
OExternalLockGuard aGuard( this );
- return OCommonAccessibleText::implGetCharacter( GetPageText(), nIndex );
+ return OCommonAccessibleText::implGetCharacter( GetPageText(), nIndex );
}
sal_Int32 VCLXAccessibleTabPage::getCharacterCount()
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index d226ef6383a4..4a11f6e01ba2 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -238,9 +238,9 @@ void VCLXAccessibleToolBox::UpdateFocus_Impl()
nFocusCount++;
}
}
- // both items changed?
- if ( nFocusCount > 1 )
- break;
+ // both items changed?
+ if ( nFocusCount > 1 )
+ break;
}
}
}
@@ -535,7 +535,7 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow
else if( pToolBox->GetItemPos(pToolBox->GetCurItemId()) != ToolBox::ITEM_NOTFOUND )
{
UpdateChecked_Impl( pToolBox->GetItemPos(pToolBox->GetCurItemId()) );
- UpdateIndeterminate_Impl( pToolBox->GetItemPos(pToolBox->GetCurItemId()) );
+ UpdateIndeterminate_Impl( pToolBox->GetItemPos(pToolBox->GetCurItemId()) );
}
break;
}
@@ -552,7 +552,7 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow
UpdateChecked_Impl( ToolBox::ITEM_NOTFOUND );
UpdateIndeterminate_Impl( static_cast<ToolBox::ImplToolItems::size_type>(reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData())) );
}
- break;
+ break;
}
case VclEventId::ToolboxHighlight:
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 6594731c56b9..e9bc3b34ed9d 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -154,7 +154,7 @@ void VCLXAccessibleToolBoxItem::SetFocus( bool _bFocus )
else
aNewValue <<= AccessibleStateType::FOCUSED;
m_bHasFocus = _bFocus;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
}
@@ -438,14 +438,14 @@ sal_Unicode VCLXAccessibleToolBoxItem::getCharacter( sal_Int32 nIndex )
{
OExternalLockGuard aGuard( this );
- return OCommonAccessibleText::implGetCharacter( GetText(), nIndex );
+ return OCommonAccessibleText::implGetCharacter( GetText(), nIndex );
}
OUString VCLXAccessibleToolBoxItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
{
OExternalLockGuard aGuard( this );
- return OCommonAccessibleText::implGetTextRange( GetText(), nStartIndex, nEndIndex );
+ return OCommonAccessibleText::implGetTextRange( GetText(), nStartIndex, nEndIndex );
}
sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getCaretPosition()
More information about the Libreoffice-commits
mailing list