[Libreoffice-commits] core.git: 2 commits - include/sfx2 sfx2/source

[Noel Grandin]

 include/sfx2/emojicontrol.hxx        |    2 +-
 sfx2/source/control/emojicontrol.cxx |    2 +-
 sfx2/source/control/emojiview.cxx    |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9da4c9bc711dd0b78889b51f8cd0043626f06af8
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Jul 29 09:41:54 2016 +0200

    loplugin:staticmethods
    
    Change-Id: If32319c1d93756d633f07a21c76e0107181704b0

diff --git a/include/sfx2/emojicontrol.hxx b/include/sfx2/emojicontrol.hxx
index 48c2aa5..7bf5df9 100644
--- a/include/sfx2/emojicontrol.hxx
+++ b/include/sfx2/emojicontrol.hxx
@@ -38,7 +38,7 @@ private:
     FILTER_CATEGORY getCurrentFilter();
 
     DECL_LINK_TYPED(ActivatePageHdl, TabControl*, void);
-    DECL_LINK_TYPED(InsertHdl, ThumbnailViewItem*, void);
+    DECL_STATIC_LINK_TYPED(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, void);
 
     VclPtr<TabControl>   mpTabControl;
     VclPtr<EmojiView>    mpEmojiView;
diff --git a/sfx2/source/control/emojicontrol.cxx b/sfx2/source/control/emojicontrol.cxx
index 77487c2..79bda2b 100644
--- a/sfx2/source/control/emojicontrol.cxx
+++ b/sfx2/source/control/emojicontrol.cxx
@@ -153,7 +153,7 @@ IMPL_LINK_NOARG_TYPED(SfxEmojiControl, ActivatePageHdl, TabControl*, void)
     mpEmojiView->filterItems(ViewFilter_Category(getCurrentFilter()));
 }
 
-IMPL_LINK_TYPED(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, pItem, void)
+IMPL_STATIC_LINK_TYPED(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, pItem, void)
 {
     OUStringBuffer sHexText = "";
     sHexText.appendUtf32(OUString(pItem->getTitle()).toUInt32(16));
commit 8ff6ba3da87a6ae8c36e8c9e44e66147c4dfb4e1
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Jul 29 09:40:01 2016 +0200

    loplugin:cstylecast
    
    Change-Id: I3adb510be10b12953e2889d0d3b74402479194ee

diff --git a/sfx2/source/control/emojiview.cxx b/sfx2/source/control/emojiview.cxx
index c9f2e29..6f60086 100644
--- a/sfx2/source/control/emojiview.cxx
+++ b/sfx2/source/control/emojiview.cxx
@@ -128,11 +128,11 @@ void EmojiView::Populate ()
                 node prop = value.child(paramVal);
 
                 //get values of parameters in AppendItem() function
-                if(paramVal == (const char*) "unicode")
+                if(paramVal == "unicode")
                 {
                     sTitle = OUString::createFromAscii(prop.string_value().get());
                 }
-                else if(paramVal == (const char*)"category")
+                else if(paramVal == "category")
                 {
                     sCategory = OUString::createFromAscii(prop.string_value().get());
                 }