sfx2/inc/sidebar/SidebarToolBox.hxx | 2 +- sfx2/inc/sidebar/TitleBar.hxx | 2 +- sfx2/source/notebookbar/NotebookbarTabControl.cxx | 2 +- sfx2/source/sidebar/SidebarToolBox.cxx | 2 +- solenv/clang-format/excludelist | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit cab162e77a357bef8e8f5563acfa46b09bd5340c Author: Caolán McNamara <[email protected]> AuthorDate: Fri Oct 30 12:10:11 2020 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Oct 30 20:44:41 2020 +0100 SidebarToolBox.hxx can be a private header Change-Id: I2367ef3912f3b84cdd0324b8e76598fc44a22874 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105078 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/sfx2/inc/sidebar/SidebarToolBox.hxx similarity index 97% rename from include/sfx2/sidebar/SidebarToolBox.hxx rename to sfx2/inc/sidebar/SidebarToolBox.hxx index bf0fbf60ceba..33bfc9ec3437 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/sfx2/inc/sidebar/SidebarToolBox.hxx @@ -33,7 +33,7 @@ namespace sfx2::sidebar { background window. 2. Create and handle tool bar controller for its items. */ -class UNLESS_MERGELIBS(SFX2_DLLPUBLIC) SidebarToolBox : public ToolBox +class SidebarToolBox : public ToolBox { public: SidebarToolBox(vcl::Window* pParentWindow); diff --git a/sfx2/inc/sidebar/TitleBar.hxx b/sfx2/inc/sidebar/TitleBar.hxx index e6a3e302bae0..917a09cda416 100644 --- a/sfx2/inc/sidebar/TitleBar.hxx +++ b/sfx2/inc/sidebar/TitleBar.hxx @@ -20,7 +20,7 @@ #include <sidebar/Paint.hxx> -#include <sfx2/sidebar/SidebarToolBox.hxx> +#include <sidebar/SidebarToolBox.hxx> namespace sfx2::sidebar { diff --git a/sfx2/source/notebookbar/NotebookbarTabControl.cxx b/sfx2/source/notebookbar/NotebookbarTabControl.cxx index 79f0cd7ef67c..c503c7b52ea3 100644 --- a/sfx2/source/notebookbar/NotebookbarTabControl.cxx +++ b/sfx2/source/notebookbar/NotebookbarTabControl.cxx @@ -34,7 +34,7 @@ #include <com/sun/star/frame/XPopupMenuController.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/propertyvalue.hxx> -#include <sfx2/sidebar/SidebarToolBox.hxx> +#include <sidebar/SidebarToolBox.hxx> #include <cppuhelper/implbase.hxx> #define ICON_SIZE 25 diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index f77e6d5ff260..d96f1419f6b7 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/sidebar/SidebarToolBox.hxx> +#include <sidebar/SidebarToolBox.hxx> #include <sidebar/ControllerFactory.hxx> #include <sfx2/viewfrm.hxx> diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 844f96d7f7ad..6afc193dd6c8 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -6346,7 +6346,6 @@ include/sfx2/sidebar/SidebarController.hxx include/sfx2/sidebar/SidebarDockingWindow.hxx include/sfx2/sidebar/SidebarModelUpdate.hxx include/sfx2/sidebar/SidebarPanelBase.hxx -include/sfx2/sidebar/SidebarToolBox.hxx include/sfx2/sidebar/TabBar.hxx include/sfx2/sidebar/Theme.hxx include/sfx2/signaturestate.hxx @@ -11828,6 +11827,7 @@ sfx2/inc/sidebar/MenuButton.hxx sfx2/inc/sidebar/Paint.hxx sfx2/inc/sidebar/PanelDescriptor.hxx sfx2/inc/sidebar/PanelTitleBar.hxx +sfx2/inc/sidebar/SidebarToolBox.hxx sfx2/inc/sidebar/TabItem.hxx sfx2/inc/sidebar/TitleBar.hxx sfx2/inc/sidebar/Tools.hxx _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
