[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sc/source unusedcode.easy

[Noel Power]

 sc/source/ui/app/inputwin.cxx |   10 +++-------
 sc/source/ui/inc/inputwin.hxx |    1 -
 unusedcode.easy               |    1 -
 3 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 9cd03b7a91c63066cb061966b474ee736ceddbdd
Author: Noel Power <noel.power at novell.com>
Date:   Wed Dec 14 14:02:29 2011 +0000

    remove unused ScInputBarGroup::GainFocus

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 2588cae..1793fae 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -987,13 +987,6 @@ void ScInputBarGroup::Resize()
     Invalidate();
 }
 
-
-void ScInputBarGroup::GainFocus()
-{
-    aMultiTextWnd.GrabFocus();
-}
-
-
 void ScInputBarGroup::StopEditEngine( sal_Bool bAll )
 {
     aMultiTextWnd.StopEditEngine( bAll );
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 1f200c1..7b5bc28 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -223,7 +223,6 @@ public:
     virtual const String&   GetTextString() const;
     virtual void            StopEditEngine( sal_Bool bAll );
     void            InitEditEngine(SfxObjectShell* pObjSh);
-    void            GainFocus();
     void            SetFormulaMode( sal_Bool bSet );
     bool            IsFocus();
     void            MakeDialogEditView();
diff --git a/unusedcode.easy b/unusedcode.easy
index b6db194..7ef3336 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -392,7 +392,6 @@ ScHTMLColOffset_SAR::Replace(unsigned long const&, unsigned short)
 ScHTMLColOffset_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
 ScHTMLColOffset_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
 ScHorizontalValueIterator::GetCurNumFmtInfo(short&, unsigned long&)
-ScInputBarGroup::GainFocus()
 ScJobSetup::ScJobSetup(SfxPrinter*)
 ScLeftFooterEditPage::GetRanges()
 ScLeftHeaderEditPage::GetRanges()
commit ea925e2415bb751488f510ca48b96d5702fa87f9
Author: Noel Power <noel.power at novell.com>
Date:   Wed Dec 14 12:49:28 2011 +0000

    if editing in formulabar restore focus to inputline after expand/collapse

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index b9ab412..2588cae 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1061,6 +1061,9 @@ IMPL_LINK( ScInputBarGroup, ClickHdl, PushButton*, EMPTYARG )
         aMultiTextWnd.SetNumLines( aMultiTextWnd.GetLastNumExpandedLines() );
     }
     TriggerToolboxLayout();
+    // Restore focus to input line(s) if necessary
+    if (  SC_MOD()->GetInputHdl()->IsTopMode() )
+        aMultiTextWnd.GrabFocus();
     return 0;
 }