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>

4 files changed, 1 insertions, 118 deletions

diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 6abba0617c7f..2ca29436aff7 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -238,7 +238,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
     sfx2/source/inet/inettbc \
     sfx2/source/notebookbar/ContextVBox \
     sfx2/source/notebookbar/DropdownBox \
-    sfx2/source/notebookbar/OptionalBox \
     sfx2/source/notebookbar/PriorityHBox \
     sfx2/source/notebookbar/PriorityMergedHBox \
     sfx2/source/notebookbar/SfxNotebookBar \
diff --git a/sfx2/source/notebookbar/OptionalBox.cxx b/sfx2/source/notebookbar/OptionalBox.cxx
deleted file mode 100644
index 6a343ce48d07..000000000000
--- a/sfx2/source/notebookbar/OptionalBox.cxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- 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 .
- */
-
-#include <vcl/builderfactory.hxx>
-#include <vcl/layout.hxx>
-#include <sfx2/dllapi.h>
-#include <sfx2/viewfrm.hxx>
-#include "OptionalBox.hxx"
-
-/*
- * OptionalBox - shows or hides the content. To use with PriorityHBox
- * or PriorityMergedHBox
- */
-
-OptionalBox::OptionalBox(vcl::Window* pParent)
-    : VclHBox(pParent)
-    , IPrioritable()
-    , m_bInFullView(true)
-{
-}
-
-OptionalBox::~OptionalBox() { disposeOnce(); }
-
-void OptionalBox::HideContent()
-{
-    if (m_bInFullView)
-    {
-        m_bInFullView = false;
-
-        for (int i = 0; i < GetChildCount(); i++)
-            GetChild(i)->Hide();
-
-        SetOutputSizePixel(Size(10, GetSizePixel().Height()));
-    }
-}
-
-void OptionalBox::ShowContent()
-{
-    if (!m_bInFullView)
-    {
-        m_bInFullView = true;
-
-        for (int i = 0; i < GetChildCount(); i++)
-            GetChild(i)->Show();
-    }
-}
-
-bool OptionalBox::IsHidden() { return !m_bInFullView; }
-
-VCL_BUILDER_FACTORY(OptionalBox)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/notebookbar/OptionalBox.hxx b/sfx2/source/notebookbar/OptionalBox.hxx
deleted file mode 100644
index ad36540aed61..000000000000
--- a/sfx2/source/notebookbar/OptionalBox.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- 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_SFX2_NOTEBOOKBAR_OPTIONALBOX_HXX
-#define INCLUDED_SFX2_NOTEBOOKBAR_OPTIONALBOX_HXX
-
-#include <vcl/builderfactory.hxx>
-#include <vcl/IPrioritable.hxx>
-#include <vcl/layout.hxx>
-#include <sfx2/dllapi.h>
-#include <sfx2/viewfrm.hxx>
-#include <vcl/floatwin.hxx>
-#include <vcl/toolbox.hxx>
-#include <sfx2/tbxctrl.hxx>
-
-class SFX2_DLLPUBLIC 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: */
diff --git a/sfx2/source/notebookbar/PriorityMergedHBox.cxx b/sfx2/source/notebookbar/PriorityMergedHBox.cxx
index 4e7fa0c16d2a..e187306ff437 100644
--- a/sfx2/source/notebookbar/PriorityMergedHBox.cxx
+++ b/sfx2/source/notebookbar/PriorityMergedHBox.cxx
@@ -22,7 +22,7 @@
 #include <sfx2/dllapi.h>
 #include <sfx2/viewfrm.hxx>
 #include <bitmaps.hlst>
-#include "OptionalBox.hxx"
+#include <vcl/OptionalBox.hxx>
 #include "PriorityHBox.hxx"
 #include "NotebookbarPopup.hxx"