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/toolkit | |
| 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/toolkit')
| -rw-r--r-- | include/toolkit/awt/vclxmenu.hxx | 3 | ||||
| -rw-r--r-- | include/toolkit/awt/vclxwindows.hxx | 7 | ||||
| -rw-r--r-- | include/toolkit/controls/unocontrols.hxx | 3 | ||||
| -rw-r--r-- | include/toolkit/helper/listenermultiplexer.hxx | 3 |
4 files changed, 10 insertions, 6 deletions
diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx index 298a8ccdd676..5232ee699efa 100644 --- a/include/toolkit/awt/vclxmenu.hxx +++ b/include/toolkit/awt/vclxmenu.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_TOOLKIT_AWT_VCLXMENU_HXX #define INCLUDED_TOOLKIT_AWT_VCLXMENU_HXX +#include <config_options.h> #include <toolkit/dllapi.h> #include <toolkit/helper/listenermultiplexer.hxx> @@ -142,7 +143,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -class TOOLKIT_DLLPUBLIC VCLXMenuBar final : public VCLXMenu +class UNLESS_MERGELIBS(TOOLKIT_DLLPUBLIC) VCLXMenuBar final : public VCLXMenu { public: VCLXMenuBar(); diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index dd03843c4908..af60b504f8f4 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX #define INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX +#include <config_options.h> #include <toolkit/dllapi.h> #include <com/sun/star/awt/XTextComponent.hpp> @@ -623,7 +624,7 @@ public: // class VCLXEdit -class TOOLKIT_DLLPUBLIC VCLXEdit : public css::awt::XTextComponent, +class UNLESS_MERGELIBS(TOOLKIT_DLLPUBLIC) VCLXEdit : public css::awt::XTextComponent, public css::awt::XTextEditField, public css::awt::XTextLayoutConstrains, public VCLXWindow @@ -831,7 +832,7 @@ public: // class VCLXSpinField -class TOOLKIT_DLLPUBLIC VCLXSpinField : public css::awt::XSpinField, +class UNLESS_MERGELIBS(TOOLKIT_DLLPUBLIC) VCLXSpinField : public css::awt::XSpinField, public VCLXEdit { private: @@ -897,7 +898,7 @@ public: // class VCLXDateField -class TOOLKIT_DLLPUBLIC VCLXDateField : public css::awt::XDateField, +class UNLESS_MERGELIBS(TOOLKIT_DLLPUBLIC) VCLXDateField : public css::awt::XDateField, public VCLXFormattedSpinField { protected: diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index 4c8f696d2c3c..6f92de103529 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLS_HXX #define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLS_HXX +#include <config_options.h> #include <toolkit/dllapi.h> #include <com/sun/star/awt/XTextComponent.hpp> #include <com/sun/star/awt/XTextListener.hpp> @@ -105,7 +106,7 @@ typedef ::cppu::ImplHelper4 < css::awt::XTextComponent , css::awt::XLayoutConstrains , css::awt::XTextLayoutConstrains > UnoEditControl_Base; -class TOOLKIT_DLLPUBLIC UnoEditControl :public UnoControlBase +class UNLESS_MERGELIBS(TOOLKIT_DLLPUBLIC) UnoEditControl :public UnoControlBase ,public UnoEditControl_Base { private: diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx index 23afbbfe159b..a837aeb83de3 100644 --- a/include/toolkit/helper/listenermultiplexer.hxx +++ b/include/toolkit/helper/listenermultiplexer.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX #define INCLUDED_TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX +#include <config_options.h> #include <toolkit/dllapi.h> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/awt/XFocusListener.hpp> @@ -51,7 +52,7 @@ // class ListenerMultiplexerBase -class TOOLKIT_DLLPUBLIC ListenerMultiplexerBase : public MutexHelper, +class UNLESS_MERGELIBS(TOOLKIT_DLLPUBLIC) ListenerMultiplexerBase : public MutexHelper, public ::comphelper::OInterfaceContainerHelper2, public css::uno::XInterface { |