diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-20 16:07:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-23 12:05:36 +0100 |
| commit | 01159643623de55f9e1de84d568032ca919dbd8f (patch) | |
| tree | ce16c0be84c8648eae7afb69196b02393bc71c2f /include/sfx2/sidebar | |
| parent | f6f37e3341f2a3ad292af1a923dbc33d81e439c9 (diff) | |
make more classes private in mergedlibs mode
Change-Id: I486922d0652f26fa7ee56f5fe308e19fe5ff137e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90856
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sfx2/sidebar')
| -rw-r--r-- | include/sfx2/sidebar/SidebarToolBox.hxx | 3 | ||||
| -rw-r--r-- | include/sfx2/sidebar/TabBar.hxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 9808eb581edc..b33a074fa267 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SFX2_SIDEBAR_SIDEBARTOOLBOX_HXX #define INCLUDED_SFX2_SIDEBAR_SIDEBARTOOLBOX_HXX +#include <config_options.h> #include <sfx2/dllapi.h> #include <vcl/toolbox.hxx> #include <map> @@ -32,7 +33,7 @@ namespace sfx2 { namespace sidebar { background window. 2. Create and handle tool bar controller for its items. */ -class SFX2_DLLPUBLIC SidebarToolBox : public ToolBox +class UNLESS_MERGELIBS(SFX2_DLLPUBLIC) SidebarToolBox : public ToolBox { public: SidebarToolBox(vcl::Window* pParentWindow); diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index 909b90ef9a50..a37949f10060 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_TABBAR_HXX #define INCLUDED_SFX2_SOURCE_SIDEBAR_TABBAR_HXX +#include <config_options.h> #include <sfx2//dllapi.h> #include <sfx2/sidebar/ResourceManager.hxx> @@ -41,7 +42,7 @@ class SidebarController; /** The tab bar is the container for the individual tabs. */ -class SFX2_DLLPUBLIC TabBar final +class UNLESS_MERGELIBS(SFX2_DLLPUBLIC) TabBar final : public vcl::Window { public: |