diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-01-18 13:58:02 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-01-18 13:58:02 +0000 |
| commit | d7ed149fb6bf8837b5ed1cbe856826095bc00a4e (patch) | |
| tree | 0644b53c4fac54f78b53887ea902e882938f2d17 /desktop | |
| parent | 27c8e7653f53e09cca6d10d282c5fb439b0727d7 (diff) | |
INTEGRATION: CWS sb66 (1.2.4); FILE MERGED
2007/01/05 12:01:06 sb 1.2.4.2: #i69910# Improved identifier vs file name handling.
2007/01/04 09:46:49 sb 1.2.4.1: #i69910# Made obsolete pkgchk dysfunctional, cleaned up.
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 71fe8156ee6c..4a2533995ed2 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unopkg_misc.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: ihi $ $Date: 2006-12-19 11:46:28 $ + * last change: $Author: vg $ $Date: 2007-01-18 14:58:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,7 +37,8 @@ #include "precompiled_desktop.hxx" #include "deployment.hrc" -#include "../unopkg_shared.h" +#include "unopkg_shared.h" +#include "dp_identifier.hxx" #include "../../deployment/gui/dp_gui.hrc" #include "../../app/lockfile.hxx" #include "vcl/svapp.hxx" @@ -277,7 +278,13 @@ void printf_package( Reference<deployment::XPackage> const & xPackage, Reference<XCommandEnvironment> const & xCmdEnv, sal_Int32 level ) { - printf_line( OUSTR("Name"), xPackage->getName(), level ); + beans::Optional< OUString > id( + level == 0 + ? beans::Optional< OUString >( + true, dp_misc::getIdentifier( xPackage ) ) + : xPackage->getIdentifier() ); + if (id.IsPresent) + printf_line( OUSTR("Identifier"), id.Value, level ); OUString version(xPackage->getVersion()); if (version.getLength() != 0) printf_line( OUSTR("Version"), version, level + 1 ); |