From 079a57802576eb84cc0d26b1d708a727c6b18a2a Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 12 Dec 2016 11:41:56 +0000 Subject: Revert "tdf#103654: Make git hash clickable in the About dialog" This reverts commit cc02097495f95967f8f06c364dfa6a8949132868. Need to improve the solution here a little I think. --- cui/source/dialogs/about.cxx | 1 - cui/source/inc/about.hxx | 3 +-- cui/uiconfig/ui/aboutdialog.ui | 7 +++++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index fb1e15e4f5b8..336951b3a7f3 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -77,7 +77,6 @@ AboutDialog::AboutDialog(vcl::Window* pParent) m_aLocaleStr = get("locale")->GetText(); m_pVersion->SetText(GetVersionString()); - m_pVersion->SetURL("https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=" + GetBuildId()); OUString aCopyrightString = GetCopyrightString(); m_pCopyrightText->SetText( aCopyrightString ); diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index bdeef6585afc..80fda68b6552 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -35,7 +34,7 @@ private: BitmapEx aBackgroundBitmap; BitmapEx aLogoBitmap; - VclPtr m_pVersion; + VclPtr m_pVersion; VclPtr m_pDescriptionText; VclPtr m_pCopyrightText; VclPtr m_pLogoImage; diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui index 8e887ebd8ed3..d313cac4ef73 100644 --- a/cui/uiconfig/ui/aboutdialog.ui +++ b/cui/uiconfig/ui/aboutdialog.ui @@ -2,6 +2,9 @@ + + Version: %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX + False 6 @@ -144,7 +147,7 @@ - + True True True @@ -152,7 +155,7 @@ word center False - Version: %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX + textbuffer1 0 -- cgit v1.2.3