diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-04-26 07:23:08 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-04-26 07:23:08 +0000 |
| commit | bce8a00adf872ced3285477dd5b025c7a54f9926 (patch) | |
| tree | ffa0f5f95c1f63c2d050b69a4f68b38e66c86ce3 | |
| parent | 9b6a952a93c95eec011fcc55361f7f12fa9c4343 (diff) | |
INTEGRATION: CWS residcleanup (1.20.6); FILE MERGED
2007/03/20 15:17:35 pl 1.20.6.2: RESYNC: (1.20-1.21); FILE MERGED
2007/02/24 19:59:50 pl 1.20.6.1: #i74635# residcleanup
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.cxx b/desktop/source/deployment/gui/dp_gui_dialog.cxx index 997aecf5b318..5c69df87c733 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dp_gui_dialog.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: ihi $ $Date: 2007-04-17 10:31:31 $ + * last change: $Author: rt $ $Date: 2007-04-26 08:23:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -658,7 +658,7 @@ struct StrAllFiles : public rtl::StaticWithInit<const OUString, StrAllFiles> { ::std::auto_ptr<ResMgr> const resmgr( ResMgr::CreateResMgr( "fps_office" LIBRARY_SOLARUPD() ) ); OSL_ASSERT( resmgr.get() != 0 ); - String ret( ResId( STR_FILTERNAME_ALL, resmgr.get() ) ); + String ret( ResId( STR_FILTERNAME_ALL, *resmgr.get() ) ); return ret; } }; @@ -1143,7 +1143,7 @@ DialogImpl::ThreadedPushButton::~ThreadedPushButton() ResId DialogImpl::getResId( USHORT id ) { const ::vos::OGuard guard( Application::GetSolarMutex() ); - return ResId( id, DeploymentGuiResMgr::get() ); + return ResId( id, *DeploymentGuiResMgr::get() ); } //============================================================================== @@ -1152,7 +1152,7 @@ String DialogImpl::getResourceString( USHORT id ) // init with non-acquired solar mutex: BrandName::get(); const ::vos::OGuard guard( Application::GetSolarMutex() ); - String ret( ResId( id, DeploymentGuiResMgr::get() ) ); + String ret( ResId( id, *DeploymentGuiResMgr::get() ) ); if (ret.SearchAscii( "%PRODUCTNAME" ) != STRING_NOTFOUND) { ret.SearchAndReplaceAllAscii( "%PRODUCTNAME", BrandName::get() ); } |