diff options
Diffstat (limited to 'tools/source')
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 2 | ||||
| -rw-r--r-- | tools/source/string/strucvt.cxx | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 5a70c10e95f1..2c315f189596 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -737,7 +737,7 @@ UniString GetTypeRes_Impl( const ResId& rTypeId ) rTypeId.SetRT( RSC_STRING ); if ( rTypeId.GetResMgr()->IsAvailable( rTypeId ) ) { - aTypStr = ResId::toString(rTypeId); + aTypStr = rTypeId.toString(); // Versions Resource Klassenzeiger ans Ende setzen rTypeId.GetResMgr()->Increment( sizeof( RSHEADER_TYPE ) ); } diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx index 94884db24c27..f8d2dbd0d6b3 100644 --- a/tools/source/string/strucvt.cxx +++ b/tools/source/string/strucvt.cxx @@ -124,7 +124,7 @@ UniString& UniString::Assign( const rtl::OUString& rStr ) UniString::UniString( const ResId& rResId ) : mpData(NULL) { - rtl::OUString sStr(ResId::toString(rResId)); + rtl::OUString sStr(rResId.toString()); DBG_CTOR( UniString, DbgCheckUniString ); @@ -144,19 +144,19 @@ UniString::UniString( const ResId& rResId ) } -rtl::OUString ResId::toString(const ResId& rResId) +rtl::OUString ResId::toString() const { - rResId.SetRT( RSC_STRING ); - ResMgr* pResMgr = rResId.GetResMgr(); + SetRT( RSC_STRING ); + ResMgr* pResMgr = GetResMgr(); - if ( !pResMgr || !pResMgr->GetResource( rResId ) ) + if ( !pResMgr || !pResMgr->GetResource( *this ) ) { rtl::OUString sRet; #if OSL_DEBUG_LEVEL > 0 sRet = rtl::OUStringBuffer(). appendAscii(RTL_CONSTASCII_STRINGPARAM("<resource id ")). - append(static_cast<sal_Int32>(rResId.GetId())). + append(static_cast<sal_Int32>(GetId())). appendAscii(RTL_CONSTASCII_STRINGPARAM(" not found>")). makeStringAndClear(); #endif |