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

[Arnaud Versini]

 accessibility/source/standard/vclxaccessibleedit.cxx |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

New commits:
commit aba73077851a744c06e72b3bddf5a0bae85d7c28
Author: Arnaud Versini <Arnaud.Versini at libreoffice.org>
Date:   Sun Jul 23 14:05:34 2017 +0200

    Accessibility: simplify VCLXAccessibleEdit::setText.
    
    Change-Id: Ie007d8e005909cfa8a59a25178c5694588443e94
    Reviewed-on: https://gerrit.libreoffice.org/40324
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index 005ddac8e4d6..4a85ab8797f1 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -592,16 +592,18 @@ sal_Bool VCLXAccessibleEdit::setText( const OUString& sText )
 {
     OExternalLockGuard aGuard( this );
 
-    bool bSuccess = false;
-    try
-    {
-        bSuccess = replaceText( 0, implGetText().getLength(), sText );
-    }
-    catch( const IndexOutOfBoundsException& )
+    bool bReturn = false;
+
+    VCLXEdit* pVCLXEdit = static_cast< VCLXEdit* >( GetVCLXWindow() );
+    if ( pVCLXEdit && pVCLXEdit->isEditable() )
     {
-        OSL_FAIL( "VCLXAccessibleText::setText: caught an exception!" );
+        pVCLXEdit->setText( sText );
+        sal_Int32 nSize = sText.getLength();
+        pVCLXEdit->setSelection( awt::Selection( nSize, nSize ) );
+        bReturn = true;
     }
-    return bSuccess;
+
+    return bReturn;
 }