diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-15 18:18:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-15 18:29:47 +0100 |
| commit | 16aa2c1dd66d6ac8f26c460a7287a1ad6139eed3 (patch) | |
| tree | 99a194b6e1892a17825003a6b7cb45698b2cc8f9 /desktop | |
| parent | 240dc332ad59fc2c45eccb4b2f4923fde09a784b (diff) | |
Removed obsolete OOOBASEVERSION, OOOPACKAGEVERSION.
With the basis/brand split undone, they are always the same as
PRODUCTVERSION and ABOUTBOXPRODUCTVERSION, respectively.
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 138c599d3b26..7622e9dadd49 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -85,7 +85,6 @@ #include "com/sun/star/xml/dom/XElement.hpp" #include "com/sun/star/xml/dom/XNode.hpp" #include "osl/diagnose.h" -#include "rtl/bootstrap.hxx" #include "rtl/ref.hxx" #include "rtl/string.h" #include "rtl/ustrbuf.hxx" @@ -1283,9 +1282,7 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG) sal_Int32 nPos = m_noDependencyCurVer.indexOf( sVersion ); if ( nPos >= 0 ) { - ::rtl::OUString sCurVersion( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":Version:OOOPackageVersion}")); - ::rtl::Bootstrap::expandMacros(sCurVersion); - m_noDependencyCurVer = m_noDependencyCurVer.replaceAt( nPos, sVersion.getLength(), sCurVersion ); + m_noDependencyCurVer = m_noDependencyCurVer.replaceAt( nPos, sVersion.getLength(), utl::ConfigManager::getAboutBoxProductVersion() ); } nPos = m_noDependencyCurVer.indexOf( sProductName ); if ( nPos >= 0 ) |