[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - jvmfwk/source svtools/source

[Oliver-Rainer Wittmann]

 jvmfwk/source/framework.cxx     |    2 ++
 svtools/source/edit/svmedit.cxx |   22 +++++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

New commits:
commit f5185b2b078a6ce4b1c478c2a041f99c93826bdc
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Tue Mar 18 09:16:21 2014 +0000

    124427: <TextWindow/MultiLineEdit::GetFocus()> - call parent class' method to assure corresponding notifications and listener calls
    
    This reverts a change made for the IA2 integration

diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index b5ee591..5f1cbf9 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -941,13 +941,17 @@ void TextWindow::Command( const CommandEvent& rCEvt )
 
 void TextWindow::GetFocus()
 {
-    //Window::GetFocus();
+    Window::GetFocus();
+
     if ( !mbActivePopup )
     {
         sal_Bool bGotoCursor = !mpExtTextView->IsReadOnly();
-        if ( mbFocusSelectionHide && IsReallyVisible() && !mpExtTextView->IsReadOnly()
-                && ( mbSelectOnTab &&
-                    (!mbInMBDown || ( GetSettings().GetStyleSettings().GetSelectionOptions() & SELECTION_OPTION_FOCUS ) )) )
+        if ( mbFocusSelectionHide
+             && IsReallyVisible()
+             && !mpExtTextView->IsReadOnly()
+             && ( mbSelectOnTab
+                  && ( !mbInMBDown
+                       || ( GetSettings().GetStyleSettings().GetSelectionOptions() & SELECTION_OPTION_FOCUS ) ) ) )
         {
             // Alles selektieren, aber nicht scrollen
             sal_Bool bAutoScroll = mpExtTextView->IsAutoScroll();
@@ -961,6 +965,7 @@ void TextWindow::GetFocus()
     }
 }
 
+
 void TextWindow::LoseFocus()
 {
     Window::LoseFocus();
@@ -969,6 +974,7 @@ void TextWindow::LoseFocus()
         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 );
commit 7f8afd52810d57a1c325f3e54a299d23a5a608b5
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Tue Mar 18 08:24:41 2014 +0000

    #124442# merge from beta branch, special handling of nRequirements flag on MacOS when comparing JavaInfo

diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 581d378..88d5f00 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -644,7 +644,9 @@ sal_Bool SAL_CALL jfw_areEqualJavaInfo(
         && sLocation.equals(pInfoB->sLocation) == sal_True
         && sVersion.equals(pInfoB->sVersion) == sal_True
         && pInfoA->nFeatures == pInfoB->nFeatures
+#ifndef MACOSX
         && pInfoA->nRequirements == pInfoB->nRequirements
+#endif
         && sData == pInfoB->arVendorData)
     {
         return sal_True;