GtkWidget for the priority of extension under Extension Tab.

The new structure :
 PriorityMergedHBox
  --OptionalBox
    --ToolBoxExtension
      --Extension1
  --OptionalBox
.....

Change-Id: I72760e4f0d60eb6f1f82c1e928601d41a2e4b6ce
Reviewed-on: https://gerrit.libreoffice.org/76987
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>

2 files changed, 52 insertions, 2 deletions

diff --git a/include/vcl/NotebookBarAddonsMerger.hxx b/include/vcl/NotebookBarAddonsMerger.hxx
index fde1196e4a63..ccd45ffb0f65 100644
--- a/include/vcl/NotebookBarAddonsMerger.hxx
+++ b/include/vcl/NotebookBarAddonsMerger.hxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <memory>
 #include <vector>
+#include <map>
 
 class PopupMenu;
 
@@ -62,11 +63,15 @@ struct AddonNotebookBarItem
 class NotebookBarAddonsMerger
 {
 public:
+    typedef std::map<OString, OUString> stringmap;
+    typedef void (*customMakeWidget)(VclPtr<vcl::Window>& rRet, VclPtr<vcl::Window>& pParent,
+                                     stringmap& rVec);
     NotebookBarAddonsMerger();
     ~NotebookBarAddonsMerger();
-    static void MergeNotebookBarAddons(vcl::Window* pParent,
+    static void MergeNotebookBarAddons(vcl::Window* pParent, const customMakeWidget& pFunction,
                                        const css::uno::Reference<css::frame::XFrame>& rFrame,
-                                       const NotebookBarAddonsItem& aNotebookBarAddonsItem);
+                                       const NotebookBarAddonsItem& aNotebookBarAddonsItem,
+                                       stringmap rVec);
     static void MergeNotebookBarMenuAddons(PopupMenu* pPopupMenu, sal_Int16 nItemId,
                                            const OString& sItemIdName,
                                            NotebookBarAddonsItem& aNotebookBarAddonsItem);
diff --git a/include/vcl/OptionalBox.hxx b/include/vcl/OptionalBox.hxx
new file mode 100644
index 000000000000..0b6731bd15c1
--- /dev/null
+++ b/include/vcl/OptionalBox.hxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_VCL_OPTIONALBOX_HXX
+#define INCLUDED_VCL_OPTIONALBOX_HXX
+
+#include <vcl/builderfactory.hxx>
+#include <vcl/IPrioritable.hxx>
+#include <vcl/layout.hxx>
+#include <vcl/floatwin.hxx>
+#include <vcl/toolbox.hxx>
+
+class OptionalBox : public VclHBox, public vcl::IPrioritable
+{
+private:
+    bool m_bInFullView;
+
+public:
+    explicit OptionalBox(vcl::Window* pParent);
+    virtual ~OptionalBox() override;
+
+    void HideContent() override;
+    void ShowContent() override;
+    bool IsHidden() override;
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */