diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2011-08-02 22:45:48 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-08-02 23:18:54 +0200 |
commit | 5c715d3708b6324a1d1a7d8b6607f9c92984a40f (patch) | |
tree | a8ba4dd25053cae3d5f81c88c30732c187a503bc /i18nutil/inc | |
parent | Add static sax cppunittester for iOS (diff) | |
download | core-5c715d3708b6324a1d1a7d8b6607f9c92984a40f.tar.gz core-5c715d3708b6324a1d1a7d8b6607f9c92984a40f.zip |
convert i18nutil to gbuild
Diffstat (limited to 'i18nutil/inc')
-rw-r--r-- | i18nutil/inc/i18nutil/casefolding.hxx | 3 | ||||
-rw-r--r-- | i18nutil/inc/i18nutil/i18nutildllapi.h | 16 | ||||
-rw-r--r-- | i18nutil/inc/i18nutil/oneToOneMapping.hxx | 13 | ||||
-rw-r--r-- | i18nutil/inc/i18nutil/unicode.hxx | 3 | ||||
-rw-r--r-- | i18nutil/inc/i18nutil/widthfolding.hxx | 3 | ||||
-rw-r--r-- | i18nutil/inc/i18nutil/x_rtl_ustring.h | 7 |
6 files changed, 33 insertions, 12 deletions
diff --git a/i18nutil/inc/i18nutil/casefolding.hxx b/i18nutil/inc/i18nutil/casefolding.hxx index 941b3772e5e0..f11d480e3b1f 100644 --- a/i18nutil/inc/i18nutil/casefolding.hxx +++ b/i18nutil/inc/i18nutil/casefolding.hxx @@ -32,6 +32,7 @@ #include <com/sun/star/i18n/TransliterationModules.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/uno/RuntimeException.hpp> +#include "i18nutildllapi.h" namespace com { namespace sun { namespace star { namespace i18n { @@ -71,7 +72,7 @@ struct MappingElement sal_Int8 current; }; -class casefolding +class I18NUTIL_DLLPUBLIC casefolding { public: static Mapping& getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 len, com::sun::star::lang::Locale& aLocale, sal_uInt8 nMappingType) throw (com::sun::star::uno::RuntimeException); diff --git a/i18nutil/inc/i18nutil/i18nutildllapi.h b/i18nutil/inc/i18nutil/i18nutildllapi.h new file mode 100644 index 000000000000..efb9f21efa6c --- /dev/null +++ b/i18nutil/inc/i18nutil/i18nutildllapi.h @@ -0,0 +1,16 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +#ifndef INCLUDED_I18NUTILDLLAPI_H +#define INCLUDED_I18NUTILDLLAPI_H + +#include "sal/types.h" + +#if defined(I18NUTIL_DLLIMPLEMENTATION) +#define I18NUTIL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define I18NUTIL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define I18NUTIL_DLLPRIVATE SAL_DLLPRIVATE + +#endif /* INCLUDED_I18NUTILDLLAPI_H */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18nutil/inc/i18nutil/oneToOneMapping.hxx b/i18nutil/inc/i18nutil/oneToOneMapping.hxx index 9ad5cb1256a2..a0ec1861c8d3 100644 --- a/i18nutil/inc/i18nutil/oneToOneMapping.hxx +++ b/i18nutil/inc/i18nutil/oneToOneMapping.hxx @@ -30,6 +30,7 @@ #include <utility> #include <rtl/ustring.hxx> +#include "i18nutildllapi.h" namespace com { namespace sun { namespace star { namespace i18n { @@ -47,12 +48,12 @@ typedef struct _UnicodePairWithFlag UnicodePairFlag flag; } UnicodePairWithFlag; -class oneToOneMapping +class I18NUTIL_DLLPUBLIC oneToOneMapping { private: // no copy, no substitution - oneToOneMapping( const oneToOneMapping& ); - oneToOneMapping& operator=( const oneToOneMapping& ); + I18NUTIL_DLLPRIVATE oneToOneMapping( const oneToOneMapping& ); + I18NUTIL_DLLPRIVATE oneToOneMapping& operator=( const oneToOneMapping& ); public: oneToOneMapping( OneToOneMappingTable_t *rpTable, const size_t rnSize, const size_t rnUnitSize = sizeof(OneToOneMappingTable_t) ); virtual ~oneToOneMapping(); @@ -68,14 +69,14 @@ protected: size_t mnSize; }; -class oneToOneMappingWithFlag : public oneToOneMapping +class I18NUTIL_DLLPUBLIC oneToOneMappingWithFlag : public oneToOneMapping { friend class widthfolding; private: // no copy, no substitution - oneToOneMappingWithFlag( const oneToOneMappingWithFlag& ); - oneToOneMappingWithFlag& operator=( const oneToOneMappingWithFlag& ); + I18NUTIL_DLLPRIVATE oneToOneMappingWithFlag( const oneToOneMappingWithFlag& ); + I18NUTIL_DLLPRIVATE oneToOneMappingWithFlag& operator=( const oneToOneMappingWithFlag& ); public: oneToOneMappingWithFlag( UnicodePairWithFlag *rpTableWF, const size_t rnSize, const UnicodePairFlag rnFlag ); virtual ~oneToOneMappingWithFlag(); diff --git a/i18nutil/inc/i18nutil/unicode.hxx b/i18nutil/inc/i18nutil/unicode.hxx index d6b33f188389..f865552f1709 100644 --- a/i18nutil/inc/i18nutil/unicode.hxx +++ b/i18nutil/inc/i18nutil/unicode.hxx @@ -30,6 +30,7 @@ #include <com/sun/star/i18n/UnicodeScript.hpp> #include <sal/types.h> +#include "i18nutildllapi.h" typedef struct _ScriptTypeList { sal_Int16 from; @@ -37,7 +38,7 @@ typedef struct _ScriptTypeList { sal_Int16 value; } ScriptTypeList; -class unicode +class I18NUTIL_DLLPUBLIC unicode { public: diff --git a/i18nutil/inc/i18nutil/widthfolding.hxx b/i18nutil/inc/i18nutil/widthfolding.hxx index 337fa34cad37..edb69058639b 100644 --- a/i18nutil/inc/i18nutil/widthfolding.hxx +++ b/i18nutil/inc/i18nutil/widthfolding.hxx @@ -31,12 +31,13 @@ #include <sal/types.h> #include <com/sun/star/uno/Sequence.hxx> #include <i18nutil/oneToOneMapping.hxx> +#include "i18nutildllapi.h" namespace com { namespace sun { namespace star { namespace i18n { #define WIDTHFOLDNIG_DONT_USE_COMBINED_VU 0x01 -class widthfolding +class I18NUTIL_DLLPUBLIC widthfolding { public: static oneToOneMapping& getfull2halfTable(); diff --git a/i18nutil/inc/i18nutil/x_rtl_ustring.h b/i18nutil/inc/i18nutil/x_rtl_ustring.h index 330c6bce3d6b..6b644afd1691 100644 --- a/i18nutil/inc/i18nutil/x_rtl_ustring.h +++ b/i18nutil/inc/i18nutil/x_rtl_ustring.h @@ -33,6 +33,7 @@ #endif #include <rtl/memory.h> #include <rtl/alloc.h> +#include "i18nutildllapi.h" /** @@ -44,14 +45,14 @@ * @param [output] newStr * @param [input] nLen */ -inline void SAL_CALL x_rtl_uString_new_WithLength( rtl_uString ** newStr, sal_Int32 nLen, sal_Int32 _refCount = 0 ) +I18NUTIL_DLLPUBLIC inline void SAL_CALL x_rtl_uString_new_WithLength( rtl_uString ** newStr, sal_Int32 nLen, sal_Int32 _refCount = 0 ) { *newStr = (rtl_uString*) rtl_allocateMemory ( sizeof(rtl_uString) + sizeof(sal_Unicode) * nLen); (*newStr)->refCount = _refCount; (*newStr)->length = nLen; } -inline rtl_uString * SAL_CALL x_rtl_uString_new_WithLength( sal_Int32 nLen, sal_Int32 _refCount = 0 ) +I18NUTIL_DLLPUBLIC inline rtl_uString * SAL_CALL x_rtl_uString_new_WithLength( sal_Int32 nLen, sal_Int32 _refCount = 0 ) { rtl_uString *newStr = (rtl_uString*) rtl_allocateMemory ( sizeof(rtl_uString) + sizeof(sal_Unicode) * nLen); newStr->refCount = _refCount; @@ -62,7 +63,7 @@ inline rtl_uString * SAL_CALL x_rtl_uString_new_WithLength( sal_Int32 nLen, sal_ /** * Release <code>rtl_uString</code> regardless its reference count. */ -inline void SAL_CALL x_rtl_uString_release( rtl_uString * value ) +I18NUTIL_DLLPUBLIC inline void SAL_CALL x_rtl_uString_release( rtl_uString * value ) { rtl_freeMemory(value); } |