diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-04-10 14:44:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-12 06:46:38 +0000 |
| commit | f9aee52eb56c69373c98ced5aff2128ea8c26f1d (patch) | |
| tree | 6a5c7120c876d29db824a6391c3d8e1a1de4ebf4 /tools | |
| parent | 4c7ec9f112c042a7246b002f94c1afc627569708 (diff) | |
give tools::ResId a shave and a haircut
m_nRT2 and m_nWinBits fields are not in use anymore, at least as far
back as 2013, when the heading files were moved around
Change-Id: Ie3299a5999976450803332aeab72d5c0e68227e2
Reviewed-on: https://gerrit.libreoffice.org/23960
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/rc/rc.cxx | 11 | ||||
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx index de16eaa486c5..262f07a6a5e3 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 <rtl/ustring.hxx> #include <tools/date.hxx> #include <tools/time.hxx> #include <tools/rc.hxx> @@ -42,6 +42,7 @@ void Resource::GetRes( const ResId& rResId ) OUString ResId::toString() const { SetRT( RSC_STRING ); + ResMgr* pResMgr = GetResMgr(); if ( !pResMgr || !pResMgr->GetResource( *this ) ) @@ -49,11 +50,9 @@ OUString ResId::toString() const OUString sRet; #if OSL_DEBUG_LEVEL > 0 - sRet = OUStringBuffer(). - append("<resource id "). - append(static_cast<sal_Int32>(GetId())). - append(" not found>"). - makeStringAndClear(); + sRet = "<resource id " + + OUString::number(static_cast<sal_Int32>(GetId())) + + " not found>"; #endif if( pResMgr ) diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 8cccee4c54bd..668b414e1ae4 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -913,7 +913,7 @@ bool ResMgr::IsAvailable( const ResId& rId, const Resource* pResObj ) const bool bAvailable = false; RSHEADER_TYPE* pClassRes = rId.GetpResource(); - RESOURCE_TYPE nRT = rId.GetRT2(); + RESOURCE_TYPE nRT = rId.GetRT(); sal_uInt32 nId = rId.GetId(); const ResMgr* pMgr = rId.GetResMgr(); @@ -978,7 +978,7 @@ bool ResMgr::GetResource( const ResId& rId, const Resource* pResObj ) } RSHEADER_TYPE* pClassRes = rId.GetpResource(); - RESOURCE_TYPE nRT = rId.GetRT2(); + RESOURCE_TYPE nRT = rId.GetRT(); sal_uInt32 nId = rId.GetId(); incStack(); |