summaryrefslogtreecommitdiff
path: root/include/i18nutil
diff options
context:
space:
mode:
Diffstat (limited to 'include/i18nutil')
-rw-r--r--include/i18nutil/casefolding.hxx3
-rw-r--r--include/i18nutil/oneToOneMapping.hxx3
-rw-r--r--include/i18nutil/widthfolding.hxx3
3 files changed, 6 insertions, 3 deletions
diff --git a/include/i18nutil/casefolding.hxx b/include/i18nutil/casefolding.hxx
index 1b7df9e74b5e..14b0f6bf4333 100644
--- a/include/i18nutil/casefolding.hxx
+++ b/include/i18nutil/casefolding.hxx
@@ -22,6 +22,7 @@
#include <sal/types.h>
#include <i18nutil/i18nutildllapi.h>
#include <o3tl/typed_flags_set.hxx>
+#include <config_options.h>
namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
@@ -70,7 +71,7 @@ struct MappingElement
sal_Int8 current;
};
-class I18NUTIL_DLLPUBLIC casefolding
+class UNLESS_MERGELIBS(I18NUTIL_DLLPUBLIC) casefolding
{
public:
/// @throws css::uno::RuntimeException
diff --git a/include/i18nutil/oneToOneMapping.hxx b/include/i18nutil/oneToOneMapping.hxx
index c483b8388ada..bc659b30a727 100644
--- a/include/i18nutil/oneToOneMapping.hxx
+++ b/include/i18nutil/oneToOneMapping.hxx
@@ -21,6 +21,7 @@
#include <i18nutil/i18nutildllapi.h>
#include <memory>
+#include <config_options.h>
namespace i18nutil {
@@ -38,7 +39,7 @@ struct UnicodePairWithFlag
UnicodePairFlag flag;
};
-class I18NUTIL_DLLPUBLIC oneToOneMapping
+class UNLESS_MERGELIBS(I18NUTIL_DLLPUBLIC) oneToOneMapping
{
private:
oneToOneMapping(const oneToOneMapping&) = delete;
diff --git a/include/i18nutil/widthfolding.hxx b/include/i18nutil/widthfolding.hxx
index 90048110ce1f..73ad5eb2a558 100644
--- a/include/i18nutil/widthfolding.hxx
+++ b/include/i18nutil/widthfolding.hxx
@@ -22,6 +22,7 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <i18nutil/i18nutildllapi.h>
+#include <config_options.h>
namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
namespace i18nutil { class oneToOneMapping; }
@@ -30,7 +31,7 @@ namespace i18nutil {
#define WIDTHFOLDING_DONT_USE_COMBINED_VU 0x01
-class I18NUTIL_DLLPUBLIC widthfolding
+class UNLESS_MERGELIBS(I18NUTIL_DLLPUBLIC) widthfolding
{
public:
static oneToOneMapping& getfull2halfTable();