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

[Noel Grandin]

 sc/source/ui/inc/scuitphfedit.hxx     |    2 -
 sc/source/ui/inc/tphfedit.hxx         |    4 +--
 sc/source/ui/pagedlg/scuitphfedit.cxx |   38 +++++++++++++++-------------------
 sc/source/ui/pagedlg/tphfedit.cxx     |    2 -
 4 files changed, 21 insertions(+), 25 deletions(-)

New commits:
commit 5ae90e154aa2544174f7522a5464436901152cc7
Author: Noel Grandin <noelgran...@gmail.com>
Date:   Wed Sep 23 14:22:52 2015 +0200

    convert Link<> to typed
    
    Change-Id: Ib0f043cf40f2a1b4b9f0837a5c536994bff3aeef
    Reviewed-on: https://gerrit.libreoffice.org/18810
    Reviewed-by: Noel Grandin <noelgran...@gmail.com>
    Tested-by: Noel Grandin <noelgran...@gmail.com>

diff --git a/sc/source/ui/inc/scuitphfedit.hxx 
b/sc/source/ui/inc/scuitphfedit.hxx
index d0767fc..4e9e06b 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -99,7 +99,7 @@ private:
     static bool IsExtFileNameEntry(EditTextObject* pTextObj);
     DECL_LINK( ListHdl_Impl, ListBox* );
     DECL_LINK_TYPED( ClickHdl, Button*, void );
-    DECL_STATIC_LINK( ScHFEditPage, MenuHdl, ScExtIButton* );
+    DECL_STATIC_LINK_TYPED( ScHFEditPage, MenuHdl, ScExtIButton&, void );
 };
 
 class ScRightHeaderEditPage : public ScHFEditPage
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index 60cab02..b26dcde 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -103,7 +103,7 @@ private:
 
     Idle            aIdle;
     PopupMenu*      pPopupMenu;
-    Link<>          aMLink;
+    Link<ScExtIButton&,void> aMLink;
     sal_uInt16      nSelected;
     OString         aSelectedIdent;
 
@@ -126,7 +126,7 @@ public:
     sal_uInt16      GetSelected() const { return nSelected;}
     OString         GetSelectedIdent() const { return aSelectedIdent;}
 
-    void            SetMenuHdl( const Link<>& rLink ) { aMLink = rLink; }
+    void            SetMenuHdl( const Link<ScExtIButton&,void>& rLink ) { 
aMLink = rLink; }
 
     virtual bool    PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 };
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx 
b/sc/source/ui/pagedlg/scuitphfedit.cxx
index b4df75a..2f1cb0d 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -823,33 +823,29 @@ IMPL_LINK_TYPED( ScHFEditPage, ClickHdl, Button*, pBtn, 
void )
     pActiveEdWnd->GrabFocus();
 }
 
-IMPL_STATIC_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn )
+IMPL_STATIC_LINK_TYPED( ScHFEditPage, MenuHdl, ScExtIButton&, rBtn, void )
 {
     pActiveEdWnd = ::GetScEditWindow();
     if ( !pActiveEdWnd )
-        return 0;
+        return;
 
-    if(pBtn!=NULL)
-    {
-        SAL_WARN_IF(pBtn->GetSelected() == 0, "sc.ui", "nothing selected");
-        OString sSelectedId = pBtn->GetSelectedIdent();
+    SAL_WARN_IF(rBtn.GetSelected() == 0, "sc.ui", "nothing selected");
+    OString sSelectedId = rBtn.GetSelectedIdent();
 
-        if (sSelectedId == "title")
-        {
-            pActiveEdWnd->InsertField( SvxFieldItem( SvxFileField(), 
EE_FEATURE_FIELD ) );
-        }
-        else if (sSelectedId == "filename")
-        {
-            pActiveEdWnd->InsertField( SvxFieldItem( SvxExtFileField(
-                OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_NAME_EXT ), 
EE_FEATURE_FIELD ) );
-        }
-        else if (sSelectedId == "pathname")
-        {
-            pActiveEdWnd->InsertField( SvxFieldItem( SvxExtFileField(
-                OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_FULLPATH ), 
EE_FEATURE_FIELD ) );
-        }
+    if (sSelectedId == "title")
+    {
+        pActiveEdWnd->InsertField( SvxFieldItem( SvxFileField(), 
EE_FEATURE_FIELD ) );
+    }
+    else if (sSelectedId == "filename")
+    {
+        pActiveEdWnd->InsertField( SvxFieldItem( SvxExtFileField(
+            OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_NAME_EXT ), 
EE_FEATURE_FIELD ) );
+    }
+    else if (sSelectedId == "pathname")
+    {
+        pActiveEdWnd->InsertField( SvxFieldItem( SvxExtFileField(
+            OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_FULLPATH ), 
EE_FEATURE_FIELD ) );
     }
-    return 0;
 }
 
 // class ScRightHeaderEditPage
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx 
b/sc/source/ui/pagedlg/tphfedit.cxx
index 0452e9c..a152453 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -395,7 +395,7 @@ void ScExtIButton::StartPopup()
         if(nSelected)
         {
             aSelectedIdent = pPopupMenu->GetItemIdent(nSelected);
-            aMLink.Call(this);
+            aMLink.Call(*this);
         }
 
         SetPressed( false);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits