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 /sfx2 | |
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 'sfx2')
-rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index e3623820edb0..08bf474a32d8 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -57,7 +57,6 @@ #include <svtools/helpopt.hxx> #include <unotools/moduleoptions.hxx> #include <tools/urlobj.hxx> -#include <unotools/configmgr.hxx> #include <ucbhelper/content.hxx> #include <unotools/pathoptions.hxx> #include <rtl/ustring.hxx> @@ -184,16 +183,8 @@ void AppendConfigToken( String& rURL, sal_Bool bQuestionMark, const rtl::OUStrin rURL += String( aLocaleStr ); rURL += DEFINE_CONST_UNICODE("&System="); rURL += SvtHelpOptions().GetSystem(); - - static rtl::OUString aVersion; - if ( aVersion.isEmpty() ) - aVersion = utl::Bootstrap::getProductVersion(); - - if ( !aVersion.isEmpty() ) - { - rURL += DEFINE_CONST_UNICODE( "&Version=" ); - rURL += String( aVersion ); - } + rURL += DEFINE_CONST_UNICODE("&Version="); + rURL += utl::ConfigManager::getProductVersion(); } sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor ) |