[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - svx/source

[Szymon KÅ‚os (via logerrit)]

 svx/source/tbxctrls/fillctrl.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 82dd508c9d534997522adf02869c35b616fc989b
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Jul 10 12:12:02 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Jul 10 14:50:18 2020 +0200

    Fix FillControl vcl structure for online notebookbar
    
    Change-Id: I6fff96284270821382e07cb1a024f76c67c67f3e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98486
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 7a9be740539c..876d27ed7d53 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -541,7 +541,7 @@ VclPtr<vcl::Window> SvxFillToolBoxControl::CreateItemWindow(vcl::Window *pParent
 
         return mpFillControl.get();
     }
-    return VclPtr<vcl::Window>();
+    return mpFillControl;
 }
 
 FillControl::FillControl(vcl::Window* pParent)
@@ -551,6 +551,7 @@ FillControl::FillControl(vcl::Window* pParent)
     , mpLbFillAttr(VclPtr<SvxFillAttrBox>::Create(this))
 {
     SetOptimalSize();
+    mpToolBoxColor->set_id("colortoolbox");
 }
 
 FillControl::~FillControl()