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

[Caolán McNamara (via logerrit)]

 cui/source/options/optcolor.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit 1c3eb14d8620e1b8f933c6faf24fdfcfa322cf2f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Sep 27 09:01:32 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Sep 27 13:11:29 2019 +0200

    cid#1453994 Uninitialized pointer field
    
    Change-Id: Ife94e1e8861f108cd6db54694232c7686f47dc6e
    Reviewed-on: https://gerrit.libreoffice.org/79671
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 24b810744e9b..0a3d11931638 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -177,7 +177,6 @@ public:
     void Update(EditableColorConfig const*, EditableExtendedColorConfig const*);
     void ClickHdl(EditableColorConfig*, weld::ToggleButton&);
     void ColorHdl(EditableColorConfig*, EditableExtendedColorConfig*, ColorListBox*);
-    void Init(weld::ScrolledWindow* pVScroll);
 
     weld::Widget& GetWidget1()
     {
@@ -240,7 +239,6 @@ private:
 
 private:
     weld::Window* m_pTopLevel;
-    weld::ScrolledWindow* m_pVScroll;
     std::unique_ptr<weld::Builder> m_xBuilder;
     std::unique_ptr<weld::Container> m_xGrid;
     std::unique_ptr<weld::Widget> m_xWidget1;
@@ -459,11 +457,6 @@ void ColorConfigWindow_Impl::AdjustExtraWidths(int nTextWidth)
         vEntries[i]->set_width_request(nTextWidth);
 }
 
-void ColorConfigWindow_Impl::Init(weld::ScrolledWindow* pVScroll)
-{
-    m_pVScroll = pVScroll;
-}
-
 // SetLinks()
 void ColorConfigWindow_Impl::SetLinks(Link<weld::ToggleButton&,void> const& aCheckLink,
                                       Link<ColorListBox&,void> const& aColorLink,
@@ -626,7 +619,6 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(weld::Window* pTopLevel, weld::Builde
     , pColorConfig(nullptr)
     , pExtColorConfig(nullptr)
 {
-    m_xScrollWindow->Init(m_xVScroll.get());
     m_xBody->set_stack_background();
 
     Link<weld::ToggleButton&,void> aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl);