2 files changed, 7 insertions, 1 deletions
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx
index fbdf7cd4183f..326f6b356661 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -82,6 +82,8 @@ private:
     VclPtr<FixedText>       m_pFtCreatedBy;
     VclPtr<FixedText>       m_pFtCustomized;
 
+    ScEditWindow * m_pEditFocus; ///one of m_pWndLeft, m_pWndCenter, m_pWndRight
+
     sal_uInt16       nWhich;
     OUString         aCmdArr[6];
 
@@ -99,7 +101,7 @@ private:
     static bool IsExtFileNameEntry(EditTextObject* pTextObj);
     DECL_LINK_TYPED( ListHdl_Impl, ListBox&, void);
     DECL_LINK_TYPED( ClickHdl, Button*, void );
-    DECL_STATIC_LINK_TYPED( ScHFEditPage, MenuHdl, ScExtIButton&, void );
+    DECL_LINK_TYPED( MenuHdl, ScExtIButton&, void );
 };
 
 class ScRightHeaderEditPage : public ScHFEditPage
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index b362a02d255a..52024fda3998 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -33,6 +33,8 @@
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <cppuhelper/weakref.hxx>
 
+#include <functional>
+
 class ScHeaderEditEngine;
 class ScPatternAttr;
 class EditView;
@@ -72,6 +74,7 @@ public:
 
     ScHeaderEditEngine*  GetEditEngine() const { return pEdEngine; }
     void SetObjectSelectHdl( const Link<ScEditWindow&,void>& aLink) { aObjectSelectLink = aLink; }
+    void SetGetFocusHdl(const std::function<void (ScEditWindow&)>& rLink) { m_GetFocusLink = rLink; }
 
     void SetLocation(ScEditWindowLocation eLoc) { eLocation = eLoc; }
 protected:
@@ -95,6 +98,7 @@ private:
     ScAccessibleEditObject* pAcc;
 
     Link<ScEditWindow&,void> aObjectSelectLink;
+    std::function<void (ScEditWindow&)> m_GetFocusLink;
 };
 
 class SC_DLLPUBLIC ScExtIButton : public ImageButton