[Libreoffice-commits] core.git: editeng/source include/editeng

[Caolán McNamara]

 editeng/source/accessibility/AccessibleEditableTextPara.cxx |   11 ++---------
 editeng/source/accessibility/accessibility.src              |    5 -----
 include/editeng/editrids.hrc                                |    2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

New commits:
commit 0d174c974819d781804026f4c7e916a8092315c5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 27 13:19:03 2016 +0100

    Resolves: tdf#101003 don't give paras in editeng accessible names
    
    change since...
    
    commit c23ab5eaed57cc3fb5860e26c591c73c5b22687b
    Author: Steve Yin <steve_y at apache.org>
    Date:   Tue Nov 26 14:25:22 2013 +0000
    
        Integrate branch of IAccessible2
    
    keep the accessible description, but drop thea accessible name which
    is reportedly an undesirable change.
    
    Change-Id: I8f9c53ef967c4e566fde1829832aa035efce4f23

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index a719dbf..709a229 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -785,15 +785,8 @@ namespace accessibility
 
     OUString SAL_CALL AccessibleEditableTextPara::getAccessibleName() throw (uno::RuntimeException, std::exception)
     {
-        SolarMutexGuard aGuard;
-
-        // throws if defunc
-        sal_Int32 nPara( GetParagraphIndex() );
-
-        // Get the string from the resource for the specified id.
-        OUString sStr(EditResId(RID_SVXSTR_A11Y_PARAGRAPH_NAME));
-        OUString sParaIndex = OUString::number(nPara);
-        return sStr.replaceFirst("$(ARG)", sParaIndex);
+        //See tdf#101003 before implementing a body
+        return OUString();
     }
 
     uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleEditableTextPara::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception)
diff --git a/editeng/source/accessibility/accessibility.src b/editeng/source/accessibility/accessibility.src
index d668290..f1ff0da 100644
--- a/editeng/source/accessibility/accessibility.src
+++ b/editeng/source/accessibility/accessibility.src
@@ -34,9 +34,4 @@ String RID_SVXSTR_A11Y_PARAGRAPH_DESCRIPTION
     Text [ en-US ] = "Paragraph: $(ARG) " ;
 };
 
-String RID_SVXSTR_A11Y_PARAGRAPH_NAME
-{
-    Text [ en-US ] = "Paragraph $(ARG)" ;
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/editrids.hrc b/include/editeng/editrids.hrc
index ab43df9..cff44d4 100644
--- a/include/editeng/editrids.hrc
+++ b/include/editeng/editrids.hrc
@@ -383,7 +383,7 @@
 #define RID_SVXITEMS_JUSTMETHOD_DISTRIBUTE      (RID_EDIT_START + 327)
 
 #define RID_SVXSTR_A11Y_PARAGRAPH_DESCRIPTION   (RID_EDIT_START + 328)
-#define RID_SVXSTR_A11Y_PARAGRAPH_NAME          (RID_EDIT_START + 329)
+// unused (RID_EDIT_START + 329)
 
 // Border lines (continued)
 #define RID_DASH_DOT                        (RID_EDIT_START + 330)