diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-10-21 19:57:45 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-22 09:14:19 +0100 |
commit | 5d9889070846e2e0d1d836ecf867590ebee7c027 (patch) | |
tree | e2da09695539fd037c3ee3b5de676803a877d6e2 /tools | |
parent | b2e954e300f51120387a55bf237cafdcd40ed7e6 (diff) |
move ResId::toString
Change-Id: I287a92de9ae30255990595263c3302d753fdbccf
Diffstat (limited to 'tools')
-rw-r--r-- | tools/source/rc/rc.cxx | 44 | ||||
-rw-r--r-- | tools/source/string/strucvt.cxx | 44 |
2 files changed, 43 insertions, 45 deletions
diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx index af2cc3d67521..f3e966dcee9f 100644 --- a/tools/source/rc/rc.cxx +++ b/tools/source/rc/rc.cxx @@ -18,7 +18,7 @@ */ #include <string.h> - +#include <rtl/ustrbuf.hxx> #include <tools/date.hxx> #include <tools/time.hxx> #include <tools/rc.hxx> @@ -78,4 +78,46 @@ Date::Date( const ResId& rResId ) : nDate(0) SetDay( (sal_uInt16)pResMgr->ReadShort() ); } +OUString ResId::toString() const +{ + SetRT( RSC_STRING ); + ResMgr* pResMgr = GetResMgr(); + + if ( !pResMgr || !pResMgr->GetResource( *this ) ) + { + OUString sRet; + +#if OSL_DEBUG_LEVEL > 0 + sRet = OUStringBuffer(). + append("<resource id "). + append(static_cast<sal_Int32>(GetId())). + append(" not found>"). + makeStringAndClear(); +#endif + + if( pResMgr ) + pResMgr->PopContext(); + + return sRet; + } + + // String loading + RSHEADER_TYPE * pResHdr = (RSHEADER_TYPE*)pResMgr->GetClass(); + + sal_Int32 nStringLen = rtl_str_getLength( (char*)(pResHdr+1) ); + OUString sRet((const char*)(pResHdr+1), nStringLen, RTL_TEXTENCODING_UTF8); + + sal_uInt32 nSize = sizeof( RSHEADER_TYPE ) + + sal::static_int_cast< sal_uInt32 >(nStringLen) + 1; + nSize += nSize % 2; + pResMgr->Increment( nSize ); + + ResHookProc pImplResHookProc = ResMgr::GetReadStringHook(); + if ( pImplResHookProc ) + sRet = pImplResHookProc(sRet); + return sRet; +} + + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx index be8c72de7920..916eb04116ad 100644 --- a/tools/source/string/strucvt.cxx +++ b/tools/source/string/strucvt.cxx @@ -55,48 +55,4 @@ UniString& UniString::Assign( const OUString& rStr ) return *this; } -#include <rtl/ustrbuf.hxx> -#include <tools/rc.hxx> -#include <tools/rcid.h> - -OUString ResId::toString() const -{ - SetRT( RSC_STRING ); - ResMgr* pResMgr = GetResMgr(); - - if ( !pResMgr || !pResMgr->GetResource( *this ) ) - { - OUString sRet; - -#if OSL_DEBUG_LEVEL > 0 - sRet = OUStringBuffer(). - append("<resource id "). - append(static_cast<sal_Int32>(GetId())). - append(" not found>"). - makeStringAndClear(); -#endif - - if( pResMgr ) - pResMgr->PopContext(); - - return sRet; - } - - // String loading - RSHEADER_TYPE * pResHdr = (RSHEADER_TYPE*)pResMgr->GetClass(); - - sal_Int32 nStringLen = rtl_str_getLength( (char*)(pResHdr+1) ); - OUString sRet((const char*)(pResHdr+1), nStringLen, RTL_TEXTENCODING_UTF8); - - sal_uInt32 nSize = sizeof( RSHEADER_TYPE ) - + sal::static_int_cast< sal_uInt32 >(nStringLen) + 1; - nSize += nSize % 2; - pResMgr->Increment( nSize ); - - ResHookProc pImplResHookProc = ResMgr::GetReadStringHook(); - if ( pImplResHookProc ) - sRet = pImplResHookProc(sRet); - return sRet; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |