Attachment 59977 Details for Bug 48659 – Fix

[patch] Fix

fix.patch (text/plain), 2.78 KB, created by Andrew on 2012-04-14 08:44:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew

Created: 2012-04-14 08:44:33 UTC

Size: 2.78 KB

patch

obsolete

>diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
>index a4352e1..0703f65 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 40dd4a2c..2841155 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 6de34e5..a962503 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
>     {

Actions: View | Splinter Review

Attachments on bug 48659: 59924 | 59977 | 60243

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.