Return-Path: X-Original-To: apmail-openoffice-commits-archive@www.apache.org Delivered-To: apmail-openoffice-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 89C801015C for ; Tue, 18 Mar 2014 09:16:51 +0000 (UTC) Received: (qmail 42086 invoked by uid 500); 18 Mar 2014 09:16:50 -0000 Delivered-To: apmail-openoffice-commits-archive@openoffice.apache.org Received: (qmail 42040 invoked by uid 500); 18 Mar 2014 09:16:47 -0000 Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list commits@openoffice.apache.org Received: (qmail 42028 invoked by uid 99); 18 Mar 2014 09:16:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Mar 2014 09:16:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Mar 2014 09:16:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9ED012388906; Tue, 18 Mar 2014 09:16:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1578786 - /openoffice/trunk/main/svtools/source/edit/svmedit.cxx Date: Tue, 18 Mar 2014 09:16:21 -0000 To: commits@openoffice.apache.org From: orw@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140318091621.9ED012388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: orw Date: Tue Mar 18 09:16:21 2014 New Revision: 1578786 URL: http://svn.apache.org/r1578786 Log: 124427: - call parent class' method to assure corresponding notifications and listener calls This reverts a change made for the IA2 integration Modified: openoffice/trunk/main/svtools/source/edit/svmedit.cxx Modified: openoffice/trunk/main/svtools/source/edit/svmedit.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/edit/svmedit.cxx?rev=1578786&r1=1578785&r2=1578786&view=diff ============================================================================== --- openoffice/trunk/main/svtools/source/edit/svmedit.cxx (original) +++ openoffice/trunk/main/svtools/source/edit/svmedit.cxx Tue Mar 18 09:16:21 2014 @@ -941,34 +941,40 @@ void TextWindow::Command( const CommandE void TextWindow::GetFocus() { - //Window::GetFocus(); - if ( !mbActivePopup ) - { - sal_Bool bGotoCursor = !mpExtTextView->IsReadOnly(); - if ( mbFocusSelectionHide && IsReallyVisible() && !mpExtTextView->IsReadOnly() - && ( mbSelectOnTab && - (!mbInMBDown || ( GetSettings().GetStyleSettings().GetSelectionOptions() & SELECTION_OPTION_FOCUS ) )) ) - { - // Alles selektieren, aber nicht scrollen - sal_Bool bAutoScroll = mpExtTextView->IsAutoScroll(); - mpExtTextView->SetAutoScroll( sal_False ); - mpExtTextView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFF, 0xFFFF ) ) ); - mpExtTextView->SetAutoScroll( bAutoScroll ); - bGotoCursor = sal_False; - } - mpExtTextView->SetPaintSelection( sal_True ); - mpExtTextView->ShowCursor( bGotoCursor ); - } + Window::GetFocus(); + + if ( !mbActivePopup ) + { + sal_Bool bGotoCursor = !mpExtTextView->IsReadOnly(); + if ( mbFocusSelectionHide + && IsReallyVisible() + && !mpExtTextView->IsReadOnly() + && ( mbSelectOnTab + && ( !mbInMBDown + || ( GetSettings().GetStyleSettings().GetSelectionOptions() & SELECTION_OPTION_FOCUS ) ) ) ) + { + // Alles selektieren, aber nicht scrollen + sal_Bool bAutoScroll = mpExtTextView->IsAutoScroll(); + mpExtTextView->SetAutoScroll( sal_False ); + mpExtTextView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFF, 0xFFFF ) ) ); + mpExtTextView->SetAutoScroll( bAutoScroll ); + bGotoCursor = sal_False; + } + mpExtTextView->SetPaintSelection( sal_True ); + mpExtTextView->ShowCursor( bGotoCursor ); + } } + void TextWindow::LoseFocus() { - Window::LoseFocus(); + Window::LoseFocus(); - if ( mbFocusSelectionHide && !mbActivePopup ) - mpExtTextView->SetPaintSelection( sal_False ); + if ( mbFocusSelectionHide && !mbActivePopup ) + mpExtTextView->SetPaintSelection( sal_False ); } + // virtual ::css::uno::Reference< ::css::awt::XWindowPeer > TextWindow::GetComponentInterface(sal_Bool bCreate) @@ -1246,13 +1252,15 @@ void MultiLineEdit::Resize() void MultiLineEdit::GetFocus() { - if ( !pImpSvMEdit ) // might be called from within the dtor, when pImpSvMEdit == NULL is a valid state + if ( pImpSvMEdit == NULL ) // might be called from within the dtor, when pImpSvMEdit == NULL is a valid state return; - //Disable the focused event on scroll pane - //Edit::GetFocus(); + + Edit::GetFocus(); + pImpSvMEdit->GetFocus(); } + void MultiLineEdit::SetSelection( const Selection& rSelection ) { pImpSvMEdit->SetSelection( rSelection );