diff options
| author | Andras Timar <timar@fsf.hu> | 2011-03-05 11:48:51 +0100 |
|---|---|---|
| committer | Andras Timar <timar@fsf.hu> | 2011-03-05 16:26:28 +0100 |
| commit | d4b9ff4722fc73cb6d613065bdbc7ae9b3f96d00 (patch) | |
| tree | de818483ad59c7474232a0a46f5bf48fbf837ef4 /desktop/source/deployment/gui/dp_gui_updatedialog.cxx | |
| parent | b2a06d3210d488deea327711dc9e2edb9b1c96bf (diff) | |
Replace OpenOffice.org to %PRODUCTNAME
Diffstat (limited to 'desktop/source/deployment/gui/dp_gui_updatedialog.cxx')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 590b8daa9b..df1744fa5c 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -1039,6 +1039,7 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG) { // create error string for version mismatch ::rtl::OUString sVersion( RTL_CONSTASCII_USTRINGPARAM("%VERSION") ); + ::rtl::OUString sProductName( RTL_CONSTASCII_USTRINGPARAM("%PRODUCTNAME") ); sal_Int32 nPos = m_noDependencyCurVer.indexOf( sVersion ); if ( nPos >= 0 ) { @@ -1046,7 +1047,17 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG) ::rtl::Bootstrap::expandMacros(sCurVersion); m_noDependencyCurVer = m_noDependencyCurVer.replaceAt( nPos, sVersion.getLength(), sCurVersion ); } - + nPos = m_noDependencyCurVer.indexOf( sProductName ); + if ( nPos >= 0 ) + { + m_noDependencyCurVer = m_noDependencyCurVer.replaceAt( nPos, sProductName.getLength(), BrandName::get() ); + } + nPos = m_noDependency.indexOf( sProductName ); + if ( nPos >= 0 ) + { + m_noDependency = m_noDependency.replaceAt( nPos, sProductName.getLength(), BrandName::get() ); + } + b.append(m_noInstall); b.append(LF); b.append(m_noDependency); |