diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-04-04 06:49:34 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-04-04 06:49:34 +0000 |
| commit | c04a23e855f5687618b46e7ac6b6758f8be5b6d5 (patch) | |
| tree | 984dee164c4de5f0d3f615c5a6a901094ac38f7b /desktop | |
| parent | 9661c81173eb4118fe4599f4a02d2ff946f9d167 (diff) | |
INTEGRATION: CWS updchk05 (1.12.58); FILE MERGED
2007/02/19 09:06:32 dv 1.12.58.2: #i72084# renamed local variable due to name clash
2007/02/01 08:26:28 dv 1.12.58.1: #i72084# delete resmgr after use
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/migration/wizard.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx index 6ca91bdfe685..5045114291ef 100644 --- a/desktop/source/migration/wizard.cxx +++ b/desktop/source/migration/wizard.cxx @@ -4,9 +4,9 @@ * * $RCSfile: wizard.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: vg $ $Date: 2006-11-21 17:29:19 $ + * last change: $Author: rt $ $Date: 2007-04-04 07:49:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -717,7 +717,7 @@ OUString FirstStartWizard::getLicensePath() OString aMgrName = OString("dkt") + OString::valueOf((sal_Int32)SUPD, 10); AllSettings aSettings(Application::GetSettings()); aLocale = aSettings.GetUILocale(); - ResMgr::SearchCreateResMgr(aMgrName, aLocale); + ResMgr* pLocalResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale); aLangString = aLocale.Language; if ( aLocale.Country.getLength() != 0 ) @@ -745,6 +745,7 @@ OUString FirstStartWizard::getLicensePath() + aLangString + OUString::createFromAscii(szUNXLicenseExt); #endif + delete pLocalResMgr; return aLicensePath; } } |