diff options
| author | Andrew Higginson <at.higginsonAtgmail.com> | 2012-04-16 16:33:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-16 16:35:00 +0100 |
| commit | f73d26889692599aadaba28db406f430b9af7d8c (patch) | |
| tree | bd06164c6e63e92fbeae668b5be1354a0b7dbcce | |
| parent | ae9a98b436e7ee9c246b85d8e9bb4ff94732f3b8 (diff) | |
Resolves: fdo#48659 about dialog misses BuildID
| -rw-r--r-- | cui/source/dialogs/about.cxx | 4 | ||||
| -rw-r--r-- | cui/source/dialogs/about.hrc | 36 | ||||
| -rw-r--r-- | cui/source/dialogs/about.src | 4 |
3 files changed, 22 insertions, 22 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index a4352e1dd396..0703f65566f2 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -368,10 +368,10 @@ rtl::OUString AboutDialog::GetVersionString() rtl::OUString sBuildId = GetBuildId(); - if (!sBuildId.isEmpty()) + if (!(sBuildId.trim()).isEmpty()) { sVersion += " "; - sVersion += m_sBuildStr.replaceAll("%BUILDID", sBuildId); + sVersion += m_sBuildStr.replaceAll("$BUILDID", sBuildId); } return sVersion; diff --git a/cui/source/dialogs/about.hrc b/cui/source/dialogs/about.hrc index 40dd4a2c67fd..2841155ee925 100644 --- a/cui/source/dialogs/about.hrc +++ b/cui/source/dialogs/about.hrc @@ -27,21 +27,21 @@ #include <sfx2/sfx.hrc> -#define ABOUT_STR_BUILD 6 -#define ABOUT_STR_VERSION 7 -#define ABOUT_STR_VENDOR 8 -#define ABOUT_STR_COPYRIGHT 9 -#define ABOUT_STR_BASED 10 -#define ABOUT_STR_BASED_DERIVED 11 -#define ABOUT_STR_LINK_WEBSITE 13 -#define ABOUT_STR_LINK_CREDITS 15 -#define ABOUT_STR_LINK_LICENSE 22 -#define ABOUT_BTN_CREDITS 17 -#define ABOUT_DESCRIPTION_TEXT 18 -#define ABOUT_COPYRIGHT_TEXT 24 -#define ABOUT_COPYRIGHT_TEXT_SHADOW 25 -#define ABOUT_IMAGE_LOGO 19 -#define ABOUT_BTN_WEBSITE 20 -#define ABOUT_BTN_LICENSE 21 -#define ABOUT_VERSION_TEXT 23 -#define ABOUT_STR_DESCRIPTION 24 +#define ABOUT_STR_BUILD 1 +#define ABOUT_STR_VERSION 2 +#define ABOUT_STR_VENDOR 3 +#define ABOUT_STR_COPYRIGHT 4 +#define ABOUT_STR_BASED 5 +#define ABOUT_STR_BASED_DERIVED 6 +#define ABOUT_STR_LINK_WEBSITE 7 +#define ABOUT_STR_LINK_CREDITS 8 +#define ABOUT_STR_LINK_LICENSE 9 +#define ABOUT_BTN_CREDITS 10 +#define ABOUT_DESCRIPTION_TEXT 11 +#define ABOUT_COPYRIGHT_TEXT 12 +#define ABOUT_COPYRIGHT_TEXT_SHADOW 13 +#define ABOUT_IMAGE_LOGO 14 +#define ABOUT_BTN_WEBSITE 15 +#define ABOUT_BTN_LICENSE 16 +#define ABOUT_VERSION_TEXT 17 +#define ABOUT_STR_DESCRIPTION 18 diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src index 6de34e5ce63b..a96250323213 100644 --- a/cui/source/dialogs/about.src +++ b/cui/source/dialogs/about.src @@ -71,7 +71,7 @@ ModalDialog RID_DEFAULTABOUT }; String ABOUT_STR_VERSION { - Text = "version %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX %PRODUCTEXTENSION"; + Text [ en-US ] = "version %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX %PRODUCTEXTENSION"; }; String ABOUT_STR_DESCRIPTION { @@ -95,7 +95,7 @@ ModalDialog RID_DEFAULTABOUT }; String ABOUT_STR_BUILD { - Text[ en-US ] = "(Build ID: %BUILDID)"; + Text[ en-US ] = "(Build ID: $BUILDID)"; }; String ABOUT_STR_LINK_WEBSITE { |