diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-02 22:45:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-03 00:06:33 +0100 |
| commit | 80fdb3498c68f9e7f9bdd98674e762cb084fce57 (patch) | |
| tree | 4d3f3625003d4093b8bc061eecf118709d1f9bdf /uui/source/iahndl.cxx | |
| parent | 4312651dfc47a9bb6eff5c18862e67dded1cf385 (diff) | |
drop ensure for non-NULL pointer and use a ref
Change-Id: I492c576a9a04874538f07769f5ac40f84e2d4308
Diffstat (limited to 'uui/source/iahndl.cxx')
| -rw-r--r-- | uui/source/iahndl.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 2406b40b9821..8816ea971383 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -1488,7 +1488,7 @@ UUIInteractionHelper::handleBrokenPackageRequest( return; ResId aResId( RID_UUI_ERRHDL, *xManager.get() ); - if ( !ErrorResource(aResId).getString(nErrorCode, &aMessage) ) + if ( !ErrorResource(aResId).getString(nErrorCode, aMessage) ) return; } @@ -1545,17 +1545,16 @@ UUIInteractionHelper::handleBrokenPackageRequest( //========================================================================= bool -ErrorResource::getString(ErrCode nErrorCode, rtl::OUString * pString) +ErrorResource::getString(ErrCode nErrorCode, rtl::OUString &rString) const SAL_THROW(()) { - OSL_ENSURE(pString, "specification violation"); ResId aResId(static_cast< sal_uInt16 >(nErrorCode & ERRCODE_RES_MASK), *m_pResMgr); aResId.SetRT(RSC_STRING); if (!IsAvailableRes(aResId)) return false; aResId.SetAutoRelease(false); - *pString = UniString(aResId); + rString = aResId.toString(); m_pResMgr->PopContext(); return true; } |