diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-01 23:32:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-02 09:54:17 +0100 |
| commit | cd9038dd398db0710273e4be5fb5310ec2f2c642 (patch) | |
| tree | 8cd01dd7985c3f04c53dc275af7b64f46d4f67d2 /i18nutil | |
| parent | a2d55e1869a37247549dc6d126e4cfbbf98ef024 (diff) | |
move to comphelper, and rename
Diffstat (limited to 'i18nutil')
| -rw-r--r-- | i18nutil/Package_inc.mk | 1 | ||||
| -rw-r--r-- | i18nutil/prj/build.lst | 2 | ||||
| -rw-r--r-- | i18nutil/source/utility/widthfolding.cxx | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/i18nutil/Package_inc.mk b/i18nutil/Package_inc.mk index 05425d7892b7..92a9e71de50c 100644 --- a/i18nutil/Package_inc.mk +++ b/i18nutil/Package_inc.mk @@ -32,6 +32,5 @@ $(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/casefolding.hxx,i18n $(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/oneToOneMapping.hxx,i18nutil/oneToOneMapping.hxx)) $(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/unicode.hxx,i18nutil/unicode.hxx)) $(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/widthfolding.hxx,i18nutil/widthfolding.hxx)) -$(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/x_rtl_ustring.h,i18nutil/x_rtl_ustring.h)) # vim: set noet sw=4: diff --git a/i18nutil/prj/build.lst b/i18nutil/prj/build.lst index 67296ade20d6..29a5aed88162 100644 --- a/i18nutil/prj/build.lst +++ b/i18nutil/prj/build.lst @@ -1,2 +1,2 @@ -inu i18nutil : sal cppu offapi NULL +inu i18nutil : sal cppu comphelper offapi NULL inu i18nutil\prj nmake - all inu_prj NULL diff --git a/i18nutil/source/utility/widthfolding.cxx b/i18nutil/source/utility/widthfolding.cxx index edfe573e70be..ebcd4c2043b7 100644 --- a/i18nutil/source/utility/widthfolding.cxx +++ b/i18nutil/source/utility/widthfolding.cxx @@ -29,7 +29,7 @@ // prevent internal compiler error with MSVC6SP3 #include <utility> #include <i18nutil/widthfolding.hxx> -#include <i18nutil/x_rtl_ustring.h> +#include <comphelper/string.hxx> #include "widthfolding_data.h" using namespace com::sun::star::uno; @@ -56,7 +56,7 @@ OUString widthfolding::decompose_ja_voiced_sound_marks (const OUString& inStr, s // Create a string buffer which can hold nCount * 2 + 1 characters. // Its size may become double of nCount. // The reference count is 1 now. - rtl_uString * newStr = x_rtl_uString_new_WithLength(nCount * 2); + rtl_uString * newStr = comphelper::string::rtl_uString_alloc(nCount * 2); sal_Int32 *p = NULL; sal_Int32 position = 0; @@ -118,7 +118,7 @@ OUString widthfolding::compose_ja_voiced_sound_marks (const OUString& inStr, sal // Create a string buffer which can hold nCount + 1 characters. // Its size may become equal to nCount or smaller. // The reference count is 1 now. - rtl_uString * newStr = x_rtl_uString_new_WithLength(nCount); + rtl_uString * newStr = comphelper::string::rtl_uString_alloc(nCount); // Prepare pointers of unicode character arrays. const sal_Unicode* src = inStr.getStr() + startPos; |