summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-01-18 13:53:29 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-01-18 13:53:29 +0000
commit883529b9ec39885a10cdb8db9690bf315077881b (patch)
tree43bd63dc51c39fdde4fe62f3d8debb9093e73d48 /desktop
parent37481a31d3a24249ebd7a9e4f2a258dcc6385a1d (diff)
INTEGRATION: CWS sb66 (1.2.4); FILE MERGED
2007/01/05 12:01:04 sb 1.2.4.1: #i69910# Improved identifier vs file name handling.
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index ee1ffb192d79..2ddbd284c8d4 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: dp_gui_updatedialog.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: ihi $ $Date: 2006-12-20 14:24:40 $
+ * last change: $Author: vg $ $Date: 2007-01-18 14:53:29 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -102,6 +102,7 @@
#include "dp_dependencies.hxx"
#include "dp_descriptioninfoset.hxx"
+#include "dp_identifier.hxx"
#include "dp_version.hxx"
#include "dp_misc.h"
@@ -487,8 +488,7 @@ void UpdateDialog::Thread::handle(
packageManager,
Map * map) const
{
- OSL_ASSERT(package->getIdentifier().IsPresent);
- rtl::OUString id(package->getIdentifier().Value);
+ rtl::OUString id(dp_misc::getIdentifier(package));
css::uno::Sequence< rtl::OUString > urls(
package->getUpdateInformationURLs());
if (urls.getLength() == 0) {