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/basic | |
| 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/basic')
| -rw-r--r-- | include/basic/codecompletecache.hxx | 3 | ||||
| -rw-r--r-- | include/basic/modsizeexceeded.hxx | 3 | ||||
| -rw-r--r-- | include/basic/sbmod.hxx | 3 | ||||
| -rw-r--r-- | include/basic/sbx.hxx | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/include/basic/codecompletecache.hxx b/include/basic/codecompletecache.hxx index d7ce0f69f0d4..8f4b4a565c1c 100644 --- a/include/basic/codecompletecache.hxx +++ b/include/basic/codecompletecache.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_BASIC_CODECOMPLETECACHE_HXX #define INCLUDED_BASIC_CODECOMPLETECACHE_HXX +#include <config_options.h> #include <basic/basicdllapi.h> #include <rtl/ustring.hxx> #include <svtools/miscopt.hxx> @@ -67,7 +68,7 @@ public: static void SetAutoCorrectOn( bool b ); }; -class BASIC_DLLPUBLIC CodeCompleteDataCache final +class UNLESS_MERGELIBS(BASIC_DLLPUBLIC) CodeCompleteDataCache final { /* * cache to store data for diff --git a/include/basic/modsizeexceeded.hxx b/include/basic/modsizeexceeded.hxx index cbcfa37b858e..decaae9b07b3 100644 --- a/include/basic/modsizeexceeded.hxx +++ b/include/basic/modsizeexceeded.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_BASIC_MODSIZEEXCEEDED_HXX #define INCLUDED_BASIC_MODSIZEEXCEEDED_HXX +#include <config_options.h> #include <com/sun/star/task/XInteractionRequest.hpp> #include <cppuhelper/implbase.hxx> #include <basic/basicdllapi.h> @@ -27,7 +28,7 @@ namespace com::sun::star::task { class XInteractionContinuation; } -class BASIC_DLLPUBLIC ModuleSizeExceeded final : public cppu::WeakImplHelper< css::task::XInteractionRequest > +class UNLESS_MERGELIBS(BASIC_DLLPUBLIC) ModuleSizeExceeded final : public cppu::WeakImplHelper< css::task::XInteractionRequest > { // C++ interface public: diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index cc9ab469d3a5..64a87900a659 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_BASIC_SBMOD_HXX #define INCLUDED_BASIC_SBMOD_HXX +#include <config_options.h> #include <basic/sbdef.hxx> #include <basic/sbxobj.hxx> #include <basic/sbxdef.hxx> @@ -138,7 +139,7 @@ typedef tools::SvRef<SbModule> SbModuleRef; typedef std::vector<SbModuleRef> SbModules; // Object class for instances of class modules -class BASIC_DLLPUBLIC SbClassModuleObject : public SbModule +class UNLESS_MERGELIBS(BASIC_DLLPUBLIC) SbClassModuleObject : public SbModule { SbModule* mpClassModule; bool mbInitializeEventDone; diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx index 51cd516b53e0..0390d421c9d1 100644 --- a/include/basic/sbx.hxx +++ b/include/basic/sbx.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_BASIC_SBX_HXX #define INCLUDED_BASIC_SBX_HXX +#include <config_options.h> #include <tools/ref.hxx> #include <svl/hint.hxx> @@ -47,7 +48,7 @@ struct SbxParamInfo typedef std::vector<std::unique_ptr<SbxParamInfo>> SbxParams; -class BASIC_DLLPUBLIC SbxInfo : public SvRefBase +class UNLESS_MERGELIBS(BASIC_DLLPUBLIC) SbxInfo : public SvRefBase { friend class SbxVariable; friend class SbMethod; |