summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-02-18 10:41:06 +0000
committerOliver Bolte <obo@openoffice.org>2009-02-18 10:41:06 +0000
commitead5366fd166722a9a55e94ac326d39020dcc06b (patch)
tree8e1078dd3efd8fdc69168276c2f3fe7c882baa3d /extensions
parentc652249a92298b7f4354db8e054e2bc5439f871b (diff)
CWS-TOOLING: integrate CWS dv07
2009-02-12 13:22:37 +0100 dv r267650 : #i94560# Removed string, which needed translation 2009-01-27 16:09:50 +0100 dv r267004 : #i94560# Allow building without redistributable 2009-01-27 10:56:38 +0100 is r266965 : #i98509# InstallOrder for extension module 2009-01-26 08:08:16 +0100 dv r266899 : #i94560# Work around Windows Vista installation problems 2009-01-19 14:28:56 +0100 dv r266498 : CWS-TOOLING: rebase CWS dv07 to trunk@266428 (milestone: DEV300:m39) 2009-01-19 09:56:07 +0100 dv r266477 : #i94560# Added custom action to work around 'major upgrade' problem on Windows Vista 2009-01-19 09:54:30 +0100 dv r266476 : #i94560# Added custom action to work around 'major upgrade' problem on Windows Vista 2009-01-19 09:13:06 +0100 dv r266474 : #i94347# Changed LaunchCondition from AdminUser to Privileged 2008-12-18 08:42:04 +0100 dv r265662 : #i97201# remove old release notes when notified about updates 2008-12-15 14:50:33 +0100 dv r265501 : #i96844# Use fputs instead of fprintf
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/update/check/updatecheck.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index d77ef542f3cc..23d4da29a41f 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -898,18 +898,14 @@ UpdateCheck::install()
uno::UNO_QUERY );
try {
-
// Construct install command ??
-
// Store release note for position 3 and 4
rtl::OUString aURL(getReleaseNote(m_aUpdateInfo, 3));
- if( aURL.getLength() > 0 )
- storeReleaseNote(1, aURL);
+ storeReleaseNote(1, aURL);
aURL = getReleaseNote(m_aUpdateInfo, 4);
- if( aURL.getLength() > 0 )
- storeReleaseNote(2, aURL);
+ storeReleaseNote(2, aURL);
if( xShellExecute.is() )
{
@@ -1479,6 +1475,10 @@ UpdateCheck::storeReleaseNote(sal_Int8 nNum, const rtl::OUString &rURL)
rc = osl::File::remove( aFilePath );
+ // don't store empty release notes, but delete old ones
+ if ( rURL.getLength() == 0 )
+ return true;
+
osl::File aFile( aFilePath );
rc = aFile.open( OpenFlag_Write | OpenFlag_Create );