summaryrefslogtreecommitdiff
path: root/include/linguistic
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-03-06 11:54:26 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-03-06 17:50:30 +0100
commitbf71fe152b8e04be92def48c9aecec98d57f5f35 (patch)
treee916628135f5faf54cf154cbbfc215a2c7b2a030 /include/linguistic
parentb5d1c3c8519308d610a37e29eea300ad654cd371 (diff)
mark some more classes hidden in --enable-mergelibs mode
and speed up the script using python's multiprocessing module Change-Id: I01e1350937a0531e26603d6357982c91f3bcef0f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90107 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/linguistic')
-rw-r--r--include/linguistic/hyphdta.hxx5
-rw-r--r--include/linguistic/lngprophelp.hxx11
-rw-r--r--include/linguistic/spelldta.hxx11
3 files changed, 15 insertions, 12 deletions
diff --git a/include/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx
index 23f1c87d0e30..a346b75b15b3 100644
--- a/include/linguistic/hyphdta.hxx
+++ b/include/linguistic/hyphdta.hxx
@@ -25,6 +25,7 @@
#include <cppuhelper/implbase.hxx>
#include <linguistic/lngdllapi.h>
#include <i18nlangtag/lang.h>
+#include <config_options.h>
namespace linguistic
{
@@ -61,7 +62,7 @@ public:
virtual sal_Bool SAL_CALL
isAlternativeSpelling() override;
- static css::uno::Reference <css::linguistic2::XHyphenatedWord> LNG_DLLPUBLIC CreateHyphenatedWord(
+ static css::uno::Reference <css::linguistic2::XHyphenatedWord> UNLESS_MERGELIBS(LNG_DLLPUBLIC) CreateHyphenatedWord(
const OUString &rWord, LanguageType nLang, sal_Int16 nHyphenationPos,
const OUString &rHyphenatedWord, sal_Int16 nHyphenPos );
};
@@ -97,7 +98,7 @@ public:
virtual css::uno::Sequence< sal_Int16 > SAL_CALL
getHyphenationPositions() override;
- static css::uno::Reference < css::linguistic2::XPossibleHyphens > LNG_DLLPUBLIC CreatePossibleHyphens
+ static css::uno::Reference < css::linguistic2::XPossibleHyphens > UNLESS_MERGELIBS(LNG_DLLPUBLIC) CreatePossibleHyphens
(const OUString &rWord, LanguageType nLang,
const OUString &rHyphWord,
const css::uno::Sequence< sal_Int16 > &rPositions);
diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx
index 19cbe1f969ac..37a2124d2206 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -27,6 +27,7 @@
#include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp>
#include <linguistic/lngdllapi.h>
#include <rtl/ref.hxx>
+#include <config_options.h>
namespace com { namespace sun { namespace star { namespace beans {
class XPropertySet;
@@ -57,7 +58,7 @@ typedef cppu::WeakImplHelper
css::linguistic2::XLinguServiceEventBroadcaster
> PropertyChgHelperBase;
-class LNG_DLLPUBLIC PropertyChgHelper :
+class UNLESS_MERGELIBS(LNG_DLLPUBLIC) PropertyChgHelper :
public PropertyChgHelperBase
{
css::uno::Sequence< OUString > aPropNames;
@@ -148,7 +149,7 @@ public:
propertyChange( const css::beans::PropertyChangeEvent& rEvt ) override;
};
-class LNG_DLLPUBLIC PropertyHelper_Thesaurus
+class UNLESS_MERGELIBS(LNG_DLLPUBLIC) PropertyHelper_Thesaurus
{
rtl::Reference< PropertyHelper_Thes > mxPropHelper;
@@ -167,7 +168,7 @@ public:
};
-class LNG_DLLPUBLIC PropertyHelper_Spell final :
+class UNLESS_MERGELIBS(LNG_DLLPUBLIC) PropertyHelper_Spell final :
public PropertyChgHelper
{
// default values
@@ -207,7 +208,7 @@ public:
};
-class LNG_DLLPUBLIC PropertyHelper_Spelling
+class UNLESS_MERGELIBS(LNG_DLLPUBLIC) PropertyHelper_Spelling
{
rtl::Reference< PropertyHelper_Spell > mxPropHelper;
@@ -278,7 +279,7 @@ public:
bool IsNoHyphenateCaps() const { return bResNoHyphenateCaps; }
};
-class LNG_DLLPUBLIC PropertyHelper_Hyphenation
+class UNLESS_MERGELIBS(LNG_DLLPUBLIC) PropertyHelper_Hyphenation
{
rtl::Reference< PropertyHelper_Hyphen > mxPropHelper;
diff --git a/include/linguistic/spelldta.hxx b/include/linguistic/spelldta.hxx
index b42a323b81e3..8ed336961663 100644
--- a/include/linguistic/spelldta.hxx
+++ b/include/linguistic/spelldta.hxx
@@ -26,6 +26,7 @@
#include <cppuhelper/implbase.hxx>
#include <linguistic/lngdllapi.h>
#include <i18nlangtag/lang.h>
+#include <config_options.h>
namespace com::sun::star::linguistic2 { class XSearchableDictionaryList; }
@@ -61,7 +62,7 @@ class SpellAlternatives final
LanguageType nLanguage;
public:
- LNG_DLLPUBLIC SpellAlternatives();
+ UNLESS_MERGELIBS(LNG_DLLPUBLIC) SpellAlternatives();
SpellAlternatives(const OUString &rWord, LanguageType nLang,
const css::uno::Sequence< OUString > &rAlternatives );
virtual ~SpellAlternatives() override;
@@ -80,10 +81,10 @@ public:
virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) override;
// non-interface specific functions
- void LNG_DLLPUBLIC SetWordLanguage(const OUString &rWord, LanguageType nLang);
- void LNG_DLLPUBLIC SetFailureType(sal_Int16 nTypeP);
- void LNG_DLLPUBLIC SetAlternatives( const css::uno::Sequence< OUString > &rAlt );
- static css::uno::Reference < css::linguistic2::XSpellAlternatives > LNG_DLLPUBLIC CreateSpellAlternatives(
+ void UNLESS_MERGELIBS(LNG_DLLPUBLIC) SetWordLanguage(const OUString &rWord, LanguageType nLang);
+ void UNLESS_MERGELIBS(LNG_DLLPUBLIC) SetFailureType(sal_Int16 nTypeP);
+ void UNLESS_MERGELIBS(LNG_DLLPUBLIC) SetAlternatives( const css::uno::Sequence< OUString > &rAlt );
+ static css::uno::Reference < css::linguistic2::XSpellAlternatives > UNLESS_MERGELIBS(LNG_DLLPUBLIC) CreateSpellAlternatives(
const OUString &rWord, LanguageType nLang, sal_Int16 nTypeP, const css::uno::Sequence< OUString > &rAlt );
};