diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-06-20 16:01:07 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-06-26 10:10:14 +0200 |
| commit | 78d7aec108cd9d979ff00d4376ad2f12dd867f05 (patch) | |
| tree | 45d81ac95bb07525fa9ea6ea6910e47123a5657a /sfx2 | |
| parent | eaafb80e02dddb8d7c8c00d338e827cdaf427f01 (diff) | |
most of jsdialogbuilder is not used outside vcl
so split it into the bit that is needed and just include that.
add missing license headers
Change-Id: I875f91176e6881e830fee6a58368d0b28ce9a0f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96774
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97118
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/Library_sfx.mk | 1 | ||||
| -rw-r--r-- | sfx2/source/notebookbar/SfxNotebookBar.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/notebookbar/WeldedTabbedNotebookbar.cxx | 25 |
3 files changed, 1 insertions, 27 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index b8b33751581c..cc2386fe5f82 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -243,7 +243,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/notebookbar/SfxNotebookBar \ sfx2/source/notebookbar/NotebookbarPopup \ sfx2/source/notebookbar/NotebookbarTabControl \ - sfx2/source/notebookbar/WeldedTabbedNotebookbar \ sfx2/source/notify/eventsupplier \ sfx2/source/notify/globalevents \ sfx2/source/notify/hintpost \ diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index 1e33810e552d..a3ef7e7aa2fd 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -34,7 +34,7 @@ #include <framework/addonsoptions.hxx> #include <vcl/NotebookBarAddonsMerger.hxx> #include <vector> -#include <sfx2/notebookbar/WeldedTabbedNotebookbar.hxx> +#include <vcl/WeldedTabbedNotebookbar.hxx> using namespace sfx2; using namespace css::uno; diff --git a/sfx2/source/notebookbar/WeldedTabbedNotebookbar.cxx b/sfx2/source/notebookbar/WeldedTabbedNotebookbar.cxx deleted file mode 100644 index baa4e598a554..000000000000 --- a/sfx2/source/notebookbar/WeldedTabbedNotebookbar.cxx +++ /dev/null @@ -1,25 +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/. - */ - -#include <sfx2/notebookbar/WeldedTabbedNotebookbar.hxx> -#include <vcl/svapp.hxx> -#include <vcl/jsdialog/jsdialogbuilder.hxx> - -WeldedTabbedNotebookbar::WeldedTabbedNotebookbar( - VclPtr<vcl::Window>& pContainerWindow, const OUString& rUIFilePath, - const css::uno::Reference<css::frame::XFrame>& rFrame, sal_uInt64 nWindowId) - : m_xBuilder(new JSInstanceBuilder(pContainerWindow, VclBuilderContainer::getUIRootDir(), - rUIFilePath, rFrame, nWindowId)) -{ - m_xContainer = m_xBuilder->weld_container("NotebookBar"); - m_xNotebook = m_xBuilder->weld_notebook("ContextContainer"); - m_xNotebook->set_current_page("HomeLabel"); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |