diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-01-18 13:52:55 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-01-18 13:52:55 +0000 |
| commit | 6fdc999505ec79dd44a09b4e2b490e1b3b3b304d (patch) | |
| tree | e97d4d58cdd2ee989257aa1950252a3d75ba5be7 /desktop | |
| parent | d4fabe9c02fcade99043aac360fd001299fb9d2c (diff) | |
INTEGRATION: CWS sb66 (1.12.4); FILE MERGED
2007/01/05 12:01:03 sb 1.12.4.2: #i69910# Improved identifier vs file name handling.
2007/01/04 09:51:15 sb 1.12.4.1: #i69910# Adapted to unique extension identifiers.
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_cmdenv.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_cmdenv.cxx b/desktop/source/deployment/gui/dp_gui_cmdenv.cxx index 0910ff4ca211..58917b708533 100644 --- a/desktop/source/deployment/gui/dp_gui_cmdenv.cxx +++ b/desktop/source/deployment/gui/dp_gui_cmdenv.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dp_gui_cmdenv.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: jl $ $Date: 2006-12-22 09:00:28 $ + * last change: $Author: vg $ $Date: 2007-01-18 14:52:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,6 +42,7 @@ #include "dp_gui_shared.hxx" #include "dp_gui_dependencydialog.hxx" #include "dp_dependencies.hxx" +#include "dp_identifier.hxx" #include "dp_version.hxx" #include "comphelper/anytostring.hxx" #include "com/sun/star/lang/WrappedTargetException.hpp" @@ -388,7 +389,8 @@ void ProgressCommandEnv::handle( vos::OGuard guard(Application::GetSolarMutex()); InfoBox box(activeDialog(), ResId(id, DeploymentGuiResMgr::get())); String s(box.GetMessText()); - s.SearchAndReplaceAllAscii("$NAME", verExc.New->getName()); + s.SearchAndReplaceAllAscii( + "$NAME", dp_misc::getIdentifier(verExc.New)); s.SearchAndReplaceAllAscii("$NEW", getVersion(verExc.New)); s.SearchAndReplaceAllAscii( "$DEPLOYED", getVersion(verExc.Deployed)); |