sw/source/core/access/accmap.cxx | 29 +++++------------------------
1 file changed, 5 insertions(+), 24 deletions(-)
New commits:
commit 5bb15993486b60c3c339f83953e67171ca537d40
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Dec 2 10:43:30 2013 +0000
we don't need bChanged
Change-Id: Ieafa794347acb8d3a32bf24114e1ca56dbacc905
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index ac86219..f9d9c56 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1114,7 +1114,6 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
{
while( aIter != aEndIter )
{
- sal_Bool bChanged = sal_False;
sal_Bool bMarked = sal_False;
SwAccessibleChild pFrm( (*aIter).first );
@@ -1162,13 +1161,13 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
{
uno::Reference < XAccessible >
xAcc( (*aIter).second );
if( xAcc.is() )
- bChanged = (static_cast <
::accessibility::AccessibleShape* >(xAcc.get()))->SetState(
AccessibleStateType::SELECTED );
+ static_cast <
::accessibility::AccessibleShape* >(xAcc.get())->SetState(
AccessibleStateType::SELECTED );
}
else
{
uno::Reference < XAccessible >
xAcc( (*aIter).second );
if( xAcc.is() )
- bChanged = (static_cast <
::accessibility::AccessibleShape* >(xAcc.get()))->ResetState(
AccessibleStateType::SELECTED );
+ static_cast <
::accessibility::AccessibleShape* >(xAcc.get())->ResetState(
AccessibleStateType::SELECTED );
}
}
else if( pAnchor.GetAnchorId() ==
FLY_AT_PARA )
@@ -1178,13 +1177,13 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
{
uno::Reference < XAccessible >
xAcc( (*aIter).second );
if( xAcc.is() )
- bChanged = (static_cast <
::accessibility::AccessibleShape* >(xAcc.get()))->SetState(
AccessibleStateType::SELECTED );
+ static_cast <
::accessibility::AccessibleShape* >(xAcc.get())->SetState(
AccessibleStateType::SELECTED );
}
else
{
uno::Reference < XAccessible >
xAcc( (*aIter).second );
if(xAcc.is())
- bChanged = (static_cast <
::accessibility::AccessibleShape* >(xAcc.get()))->ResetState(
AccessibleStateType::SELECTED );
+ (static_cast <
::accessibility::AccessibleShape* >(xAcc.get()))->ResetState(
AccessibleStateType::SELECTED );
}
}
}
@@ -1204,7 +1203,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
{
uno::Reference < XAccessible > xAcc(
(*aIter).second );
if(xAcc.is())
- bChanged = (static_cast <
::accessibility::AccessibleShape* >(xAcc.get()))->ResetState(
AccessibleStateType::SELECTED );
+ (static_cast <
::accessibility::AccessibleShape* >(xAcc.get()))->ResetState(
AccessibleStateType::SELECTED );
}
--nNumShapes;
++pShape;
@@ -1212,8 +1211,6 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
}
}
- (void)bChanged; //cmc: this is totally busted, bChanged is not
used at all
-
++aIter;
}//while( aIter != aEndIter )
}//else
@@ -1468,22 +1465,6 @@ void
SwAccessibleMap::DoInvalidateShapeSelection(sal_Bool bInvalidateFocusMode /
}
++nCountSelectedShape;
}
- /* MT: This still was in DEV300m80, but was removed in IA2 CWS.
- Someone needs to check what should happen here, see
original diff CWS oo31ia2 vs. OOO310M11
- else
- {
- bChanged =
- pShape->second->ResetState(
AccessibleStateType::SELECTED );
- pShape->second->ResetState( AccessibleStateType::FOCUSED );
- }
- if( bChanged )
- {
- const SwFrm* pParent = SwAccessibleFrame::GetParent(
- SwAccessibleChild(
pShape->first ),
- GetShell()->IsPreview() );
- aParents.push_back( pParent );
- }
- */
}
--nShapes;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
