diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-09 12:20:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-09 13:37:00 +0100 |
| commit | debc96051f15652bc8d1b8aa5406f7760c5feed7 (patch) | |
| tree | 0aef3eebf6634099c50f17679ae0f4c4437d9442 /desktop | |
| parent | bf912d1a184bf50e326f428b7d0c083526f2783b (diff) | |
OpenOffice.org-minimal-version dependency is not branded.
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/misc/dp_dependencies.cxx | 18 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_misc.src | 4 |
2 files changed, 7 insertions, 15 deletions
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index d0cd2319d606..b16831703730 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -40,7 +40,6 @@ #include "rtl/ustring.hxx" #include "sal/types.h" #include "tools/resid.hxx" -#include "unotools/configmgr.hxx" #include "deployment.hrc" #include "dp_resource.h" @@ -80,19 +79,12 @@ bool satisfiesMaximalVersion(rtl::OUString const & version) { rtl::OUString produceErrorText( rtl::OUString const & reason, rtl::OUString const & version) { - rtl::OUString buf( - comphelper::string::searchAndReplaceAsciiL( - reason, RTL_CONSTASCII_STRINGPARAM("%VERSION"), - (version.isEmpty() - ? ResId::toString( - dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN)) - : version))); return comphelper::string::searchAndReplaceAsciiL( - buf, RTL_CONSTASCII_STRINGPARAM("%PRODUCTNAME"), - utl::ConfigManager::GetDirectConfigProperty( - utl::ConfigManager::PRODUCTNAME).get< rtl::OUString >()); - //TODO: can fail if the replacement of "%VERSION" introduces an - // instance of "%PRODUCTNAME" into the string + reason, RTL_CONSTASCII_STRINGPARAM("%VERSION"), + (version.isEmpty() + ? ResId::toString( + dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN)) + : version)); } } diff --git a/desktop/source/deployment/misc/dp_misc.src b/desktop/source/deployment/misc/dp_misc.src index 1dcc77d2eb60..22a6683218af 100644 --- a/desktop/source/deployment/misc/dp_misc.src +++ b/desktop/source/deployment/misc/dp_misc.src @@ -32,9 +32,9 @@ String RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN { }; String RID_DEPLOYMENT_DEPENDENCIES_MIN { - Text[en-US] = "Extension requires at least %PRODUCTNAME %VERSION"; + Text[en-US] = "Extension requires at least OpenOffice.org reference version %VERSION"; }; String RID_DEPLOYMENT_DEPENDENCIES_MAX { - Text[en-US] = "Extension doesn't support versions greater than: %PRODUCTNAME %VERSION"; + Text[en-US] = "Extension does not support OpenOffice.org reference versions greater than %VERSION"; }; |