diff options
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/accessibility/AccessibleShape.cxx | 1 | ||||
| -rw-r--r-- | svx/source/accessibility/AccessibleShapeInfo.cxx | 15 | ||||
| -rw-r--r-- | svx/source/accessibility/ChildrenManagerImpl.cxx | 7 | ||||
| -rw-r--r-- | svx/source/svdraw/svdotextpathdecomposition.cxx | 1 |
4 files changed, 8 insertions, 16 deletions
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index fd4a9bff049b..6a19e3419f78 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -105,7 +105,6 @@ AccessibleShape::AccessibleShape ( mpChildrenManager(nullptr), mxShape (rShapeInfo.mxShape), maShapeTreeInfo (rShapeTreeInfo), - mnIndex (rShapeInfo.mnIndex), m_nIndexInParent(-1), mpText (nullptr), mpParent (rShapeInfo.mpChildrenManager) diff --git a/svx/source/accessibility/AccessibleShapeInfo.cxx b/svx/source/accessibility/AccessibleShapeInfo.cxx index a83ac75b11c2..7a70ca4d799d 100644 --- a/svx/source/accessibility/AccessibleShapeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeInfo.cxx @@ -25,12 +25,10 @@ namespace accessibility { AccessibleShapeInfo::AccessibleShapeInfo ( const css::uno::Reference<css::drawing::XShape>& rxShape, const css::uno::Reference<css::accessibility::XAccessible>& rxParent, - IAccessibleParent* pChildrenManager, - sal_Int32 nIndex) + IAccessibleParent* pChildrenManager) : mxShape (rxShape), mxParent (rxParent), - mpChildrenManager (pChildrenManager), - mnIndex (nIndex) + mpChildrenManager (pChildrenManager) { // empty. } @@ -38,12 +36,10 @@ AccessibleShapeInfo::AccessibleShapeInfo ( AccessibleShapeInfo::AccessibleShapeInfo ( const css::uno::Reference<css::drawing::XShape>& rxShape, - const css::uno::Reference<css::accessibility::XAccessible>& rxParent, - sal_Int32 nIndex) + const css::uno::Reference<css::accessibility::XAccessible>& rxParent) : mxShape (rxShape), mxParent (rxParent), - mpChildrenManager (nullptr), - mnIndex (nIndex) + mpChildrenManager (nullptr) { // empty. } @@ -51,8 +47,7 @@ AccessibleShapeInfo::AccessibleShapeInfo ( AccessibleShapeInfo::AccessibleShapeInfo (const AccessibleShapeInfo &rOther) : mxShape (rOther.mxShape), mxParent (rOther.mxParent), - mpChildrenManager (rOther.mpChildrenManager), - mnIndex (rOther.mnIndex) + mpChildrenManager (rOther.mpChildrenManager) { // empty. } diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 62925b936ea7..5dee9c7d595a 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -155,8 +155,7 @@ uno::Reference<XAccessible> AccessibleShapeInfo aShapeInfo( rChildDescriptor.mxShape, mxParent, - this, - mnNewNameIndex++); + this); // Create accessible object that corresponds to the descriptor's // shape. rtl::Reference<AccessibleShape> pShape( @@ -756,11 +755,11 @@ void ChildrenManagerImpl::ViewForwarderChanged (ChangeType aChangeType, bool ChildrenManagerImpl::ReplaceChild ( AccessibleShape* pCurrentChild, const css::uno::Reference< css::drawing::XShape >& _rxShape, - const long _nIndex, + const long /*_nIndex*/, const AccessibleShapeTreeInfo& _rShapeTreeInfo) throw (uno::RuntimeException) { - AccessibleShapeInfo aShapeInfo( _rxShape, pCurrentChild->getAccessibleParent(), this, _nIndex ); + AccessibleShapeInfo aShapeInfo( _rxShape, pCurrentChild->getAccessibleParent(), this ); // create the new child rtl::Reference<AccessibleShape> pNewChild(ShapeTypeHandler::Instance().CreateAccessibleObject ( aShapeInfo, diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index cc5f37de2dd9..c9a1c2c550e7 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -87,7 +87,6 @@ namespace maText(rInfo.maText), mnTextStart(rInfo.mnTextStart), mnTextLength(rInfo.mnTextLen), - mnParagraph(rInfo.mnPara), maFont(rInfo.mrFont), maDblDXArray(), maLocale(rInfo.mpLocale ? *rInfo.mpLocale : css::lang::Locale()), |