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

[Arnaud Versini]

 accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx   |    2 +-
 accessibility/source/extended/AccessibleGridControlTableCell.cxx |    2 +-
 accessibility/source/extended/accessibleiconchoicectrlentry.cxx  |    2 +-
 accessibility/source/extended/accessiblelistboxentry.cxx         |    2 +-
 accessibility/source/extended/textwindowaccessibility.cxx        |    2 +-
 accessibility/source/standard/vclxaccessiblelistitem.cxx         |    2 +-
 accessibility/source/standard/vclxaccessiblemenuitem.cxx         |    2 +-
 accessibility/source/standard/vclxaccessibletextcomponent.cxx    |    2 +-
 comphelper/source/misc/accessibletexthelper.cxx                  |    8 +-------
 editeng/source/accessibility/AccessibleEditableTextPara.cxx      |    4 ++--
 include/comphelper/accessibletexthelper.hxx                      |    2 --
 11 files changed, 11 insertions(+), 19 deletions(-)

New commits:
commit 2ed9a2b641682d8612b5404bd3978ed049aa0266
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date:   Sat Jul 8 14:41:48 2017 +0200

    Remove useless method OCommonAccessibleText::getText
    
    Change-Id: I4ee2df05ffceaea9d22ec7e2f78dc6e13061b5ef
    Reviewed-on: https://gerrit.libreoffice.org/39714
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index 835bd62d6365..4798bffd5a90 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -280,7 +280,7 @@ namespace accessibility
     {
         SolarMethodGuard aGuard(getMutex());
 
-        return OCommonAccessibleText::getText(  );
+        return implGetText(  );
     }
     OUString SAL_CALL AccessibleBrowseBoxTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index 753c9bd643f6..5bcdcfcf93f5 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -287,7 +287,7 @@ namespace accessibility
     {
         SolarMutexGuard aSolarGuard;
 
-        return OCommonAccessibleText::getText(  );
+        return implGetText(  );
     }
     OUString SAL_CALL AccessibleGridControlTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 94816740b8cb..0c0c859c3741 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -595,7 +595,7 @@ namespace accessibility
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
-        return OCommonAccessibleText::getText(  );
+        return implGetText(  );
     }
     OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 0f471650ca41..3c17f1675909 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -1059,7 +1059,7 @@ namespace accessibility
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
-        return OCommonAccessibleText::getText(  );
+        return implGetText(  );
     }
     OUString SAL_CALL AccessibleListBoxEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 9d0e19931131..306cf797ff21 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -378,7 +378,7 @@ sal_Bool SAL_CALL Paragraph::setSelection(::sal_Int32 nStartIndex,
 OUString SAL_CALL Paragraph::getText()
 {
     checkDisposed();
-    return OCommonAccessibleText::getText();
+    return implGetText();
 }
 
 // virtual
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index d53245dca36d..68be49dfe4ef 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -506,7 +506,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getText()
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    return OCommonAccessibleText::getText();
+    return implGetText();
 }
 
 OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 7c6001721dfb..70ade57c927f 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -323,7 +323,7 @@ OUString VCLXAccessibleMenuItem::getText()
 {
     OExternalLockGuard aGuard( this );
 
-    return OCommonAccessibleText::getText();
+    return implGetText();
 }
 
 
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index 637094aac295..08a84c35db37 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -311,7 +311,7 @@ OUString VCLXAccessibleTextComponent::getText()
 {
     OExternalLockGuard aGuard( this );
 
-    return OCommonAccessibleText::getText();
+    return implGetText();
 }
 
 
diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx
index 99f095bdeb83..279cb995e238 100644
--- a/comphelper/source/misc/accessibletexthelper.cxx
+++ b/comphelper/source/misc/accessibletexthelper.cxx
@@ -282,12 +282,6 @@ namespace comphelper
     }
 
 
-    OUString OCommonAccessibleText::getText()
-    {
-        return implGetText();
-    }
-
-
     OUString OCommonAccessibleText::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         OUString sText( implGetText() );
@@ -816,7 +810,7 @@ namespace comphelper
     {
         OExternalLockGuard aGuard( this );
 
-        return OCommonAccessibleText::getText();
+        return implGetText();
     }
 
 
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index c923d83adbe7..c1a5a5265c22 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -600,7 +600,7 @@ namespace accessibility
 
     void AccessibleEditableTextPara::TextChanged()
     {
-        OUString aCurrentString( OCommonAccessibleText::getText() );
+        OUString aCurrentString( implGetText() );
         uno::Any aDeleted;
         uno::Any aInserted;
         if( OCommonAccessibleText::implInitTextChangedEvent( maLastTextString, aCurrentString,
@@ -1453,7 +1453,7 @@ namespace accessibility
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
                    "AccessibleEditableTextPara::getText: paragraph index value overflow");
 
-        return OCommonAccessibleText::getText();
+        return implGetText();
     }
 
     OUString SAL_CALL AccessibleEditableTextPara::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx
index 7b5e1a144eac..3b633716c2b3 100644
--- a/include/comphelper/accessibletexthelper.hxx
+++ b/include/comphelper/accessibletexthelper.hxx
@@ -76,8 +76,6 @@ namespace comphelper
         sal_Int32 SAL_CALL getSelectionStart();
         /// @throws css::uno::RuntimeException
         sal_Int32 SAL_CALL getSelectionEnd();
-        /// @throws css::uno::RuntimeException
-        OUString SAL_CALL getText();
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::uno::RuntimeException
         OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex );