[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/vcl vcl/inc vcl/jsdialog

[Szymon KÅ‚os (via logerrit)]

 include/vcl/weld.hxx                 |    2 +-
 vcl/inc/jsdialog/jsdialogbuilder.hxx |    2 --
 vcl/jsdialog/jsdialogbuilder.cxx     |    6 ------
 3 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit c07f037dc4dc39478fe1448d52db76374cfc87b8
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jan 19 14:20:51 2021 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Fri Feb 5 09:00:25 2021 +0100

    jsdialog: remove unnecessary handler
    
    Change-Id: I4e4d032c73fc090f443dcc7bef0267e1df123810
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109643
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109947
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index b0612c66d630..30231aecaf30 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1988,7 +1988,7 @@ protected:
 
     friend class ::LOKTrigger;
 
-    virtual void signal_clicked(const OString& rIdent) { m_aClickHdl.Call(rIdent); }
+    void signal_clicked(const OString& rIdent) { m_aClickHdl.Call(rIdent); }
 
 public:
     virtual void set_item_sensitive(const OString& rIdent, bool bSensitive) = 0;
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index d2793ece7e3c..52533c0b8f2a 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -428,8 +428,6 @@ class JSToolbar : public JSWidget<SalInstanceToolbar, ::ToolBox>
 public:
     JSToolbar(JSDialogSender* pSender, ::ToolBox* pToolbox, SalInstanceBuilder* pBuilder,
               bool bTakeOwnership);
-
-    virtual void signal_clicked(const OString& rIdent) override;
 };
 
 class JSTextView : public JSWidget<SalInstanceTextView, ::VclMultiLineEdit>
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index f12d25e73359..54c773cc2fdf 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -960,12 +960,6 @@ JSToolbar::JSToolbar(JSDialogSender* pSender, ::ToolBox* pToolbox, SalInstanceBu
 {
 }
 
-void JSToolbar::signal_clicked(const OString& rIdent)
-{
-    SalInstanceToolbar::signal_clicked(rIdent);
-    sendFullUpdate();
-}
-
 JSTextView::JSTextView(JSDialogSender* pSender, ::VclMultiLineEdit* pTextView,
                        SalInstanceBuilder* pBuilder, bool bTakeOwnership)
     : JSWidget<SalInstanceTextView, ::VclMultiLineEdit>(pSender, pTextView, pBuilder,