Hi,
Translated German comments in libs-core/svx/source/accessibility/.
Made a few other fixes (removed out commented code) along the way.
You can commit the patch under the terms of MPL 1.1 / GPLv3+ / LGPLv3+
triple license.
/Albert
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index dfb7e81..6cbf923 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -625,12 +625,7 @@ void AccFrameSelector::NotifyFocusListeners(sal_Bool bGetFocus)
aEvent.FocusFlags |= AwtFocusChangeReason::AROUND;
if(nFocusFlags&GETFOCUS_UNIQUEMNEMONIC)
aEvent.FocusFlags |= AwtFocusChangeReason::UNIQUEMNEMONIC;
- // if(nFocusFlags&GETFOCUS_INIT)
- // aEvent.FocusFlags |= AwtFocusChangeReason::
}
-// else
- //how can I find the current focus window?
-// aEvent.NextFocus = ;
aEvent.Temporary = sal_False;
Reference < XAccessibleContext > xThis( this );
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index fc696b5..5682ada 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -569,27 +569,6 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds (void)
int x = aPixelPosition.getX() - aParentLocation.X;
int y = aPixelPosition.getY() - aParentLocation.Y;
- /* // The following block is a workarround for bug #99889# (property
- // BoundRect returnes coordinates relative to document window
- // instead of absolute coordinates for shapes in Writer). Has to
- // be removed as soon as bug is fixed.
-
- // Use a non-null anchor position as flag that the shape is in a
- // Writer document.
- if (xSetInfo.is())
- if (xSetInfo->hasPropertyByName (sAnchorPositionName))
- {
- uno::Any aPos = xSet->getPropertyValue (sAnchorPositionName);
- awt::Point aAnchorPosition;
- aPos >>= aAnchorPosition;
- if (aAnchorPosition.X > 0)
- {
- x = aPixelPosition.getX();
- y = aPixelPosition.getY();
- }
- }
- // End of workarround.
- */
// Clip with parent (with coordinates relative to itself).
::Rectangle aBBox (
x, y, x + aPixelSize.getWidth(), y + aPixelSize.getHeight());
@@ -845,8 +824,6 @@ uno::Sequence<uno::Type> SAL_CALL
::getCppuType((const uno::Reference<document::XEventListener>*)0);
const uno::Type aUnoTunnelType =
::getCppuType((const uno::Reference<lang::XUnoTunnel>*)0);
- // const uno::Type aStateSetType =
- // ::getCppuType((const uno::Reference<XAccessibleStateSet>*)0);
// ... and merge them all into one list.
sal_Int32 nTypeCount (aTypeList.getLength()),
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 1f50794..84a2f08 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -683,14 +683,6 @@ namespace accessibility
else if ( maLastSelection.HasRange() &&
aSelection.HasRange() )
{
- // send event TEXT_SELECTION_CHANGED for difference
- // between last and new selection. (#i27299#)
-// // selection was on, now is different: take union of ranges
-// maParaManager.FireEvent( ::std::min(sortedSelection.first,
-// sortedLastSelection.second),
-// ::std::max(sortedSelection.first,
-// sortedLastSelection.second)+1,
-// nTextSelChgEventId );
// use sorted last and new selection
ESelection aTmpLastSel( maLastSelection );
aTmpLastSel.Adjust();
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 0e60765..1d05ca3 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -432,8 +432,6 @@ Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAcce
}
else
{
- // pStateSetHelper->AddState( AccessibleStateType::ENABLED );
- // pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE );
if( mpControl->HasFocus() )
pStateSetHelper->AddState( AccessibleStateType::FOCUSED );
@@ -949,7 +947,7 @@ void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHi
{
const SfxSimpleHint* pSfxHint = PTR_CAST(SfxSimpleHint, &rHint );
- // ist unser SdDrawDocument gerade gestorben?
+ // Has our SdDrawDocument just died?
if(pSfxHint && pSfxHint->GetId() == SFX_HINT_DYING)
{
dispose();
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 9952496..3103305 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -94,7 +94,6 @@ ShapeTypeId ShapeTypeHandler::GetTypeId (const OUString& aServiceName) const
tServiceNameToSlotId::iterator I (maServiceNameToSlotId.find (aServiceName));
if (I != maServiceNameToSlotId.end())
{
- // long nSlotId = maServiceNameToSlotId[aServiceName];
return maShapeTypeDescriptorList[I->second].mnShapeTypeId;
}
else
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index f758115..8cee0d8 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -60,7 +60,7 @@ SvxShowCharSetVirtualAcc::SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ) :
,m_pTable(NULL)
{
osl_incrementInterlockedCount(&m_refCount);
- { // #b6211265 #
+ {
lateInit(this);
}
osl_decrementInterlockedCount(&m_refCount);
@@ -301,7 +301,7 @@ SvxShowCharSetAcc::SvxShowCharSetAcc( SvxShowCharSetVirtualAcc* _pParent ) : OAc
,m_pParent( _pParent )
{
osl_incrementInterlockedCount(&m_refCount);
- { // #b6211265 #
+ {
lateInit(this);
}
osl_decrementInterlockedCount(&m_refCount);
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 2b02a99..bb84c7c 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -389,8 +389,6 @@ Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccess
if( IsAlive() )
{
- // pStateSetHelper->AddState( AccessibleStateType::ENABLED );
- // pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE );
if( mpRepr->HasFocus() )
pStateSetHelper->AddState( AccessibleStateType::FOCUSED );
@@ -846,7 +844,6 @@ Reference< XAccessibleContext> SAL_CALL SvxRectCtlChildAccessibleContext::getAcc
sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException )
{
// no guard -> done in getBounds()
-// return GetBoundingBox().IsInside( VCLPoint( rPoint ) );
return Rectangle( Point( 0, 0 ), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
}
@@ -994,7 +991,6 @@ Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getA
if( mbIsChecked )
{
pStateSetHelper->AddState( AccessibleStateType::CHECKED );
-// pStateSetHelper->AddState( AccessibleStateType::SELECTED );
}
pStateSetHelper->AddState( AccessibleStateType::ENABLED );
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
