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 | 7e42ff08d72c6824d0df59c8c655842ae8a10d4b (patch) | |
| tree | 2c0eb261f08f94b95c3010aee0fc2aff1d2afcce /desktop/source/deployment/misc | |
| parent | 365e2987220a3c69feb6f01c26f8bfd4025da906 (diff) | |
Replace OpenOffice.org to %PRODUCTNAME
Diffstat (limited to 'desktop/source/deployment/misc')
| -rw-r--r-- | desktop/source/deployment/misc/dp_dependencies.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_misc.src | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 375138d86532..6b937547ae93 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -137,6 +137,7 @@ check(::dp_misc::DescriptionInfoset const & infoset) { ::rtl::OUString sReason; ::rtl::OUString sValue; ::rtl::OUString sVersion(RTL_CONSTASCII_USTRINGPARAM("%VERSION")); + ::rtl::OUString sProductName(RTL_CONSTASCII_USTRINGPARAM("%PRODUCTNAME")); if ( dependency->getNamespaceURI().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( xmlNamespace ) ) && dependency->getTagName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OpenOffice.org-minimal-version" ) ) ) @@ -166,6 +167,9 @@ check(::dp_misc::DescriptionInfoset const & infoset) { sal_Int32 nPos = sReason.indexOf( sVersion ); if ( nPos >= 0 ) sReason = sReason.replaceAt( nPos, sVersion.getLength(), sValue ); + nPos = sReason.indexOf( sProductName ); + if ( nPos >= 0 ) + sReason = sReason.replaceAt( nPos, sProductName.getLength(), BrandName::get() ); return sReason; } diff --git a/desktop/source/deployment/misc/dp_misc.src b/desktop/source/deployment/misc/dp_misc.src index 0d341122af16..4639879d7582 100644 --- a/desktop/source/deployment/misc/dp_misc.src +++ b/desktop/source/deployment/misc/dp_misc.src @@ -32,9 +32,9 @@ String RID_DEPLYOMENT_DEPENDENCIES_UNKNOWN { }; String RID_DEPLYOMENT_DEPENDENCIES_MIN { - Text[en-US] = "Extensions requires at least OpenOffice.org %VERSION"; + Text[en-US] = "Extensions requires at least %PRODUCTNAME %VERSION"; }; String RID_DEPLYOMENT_DEPENDENCIES_MAX { - Text[en-US] = "Extension doesn't support versions greater than: OpenOffice.org %VERSION"; + Text[en-US] = "Extension doesn't support versions greater than: %PRODUCTNAME %VERSION"; }; |