Re: [Libreoffice] error in basic.src ?

On 16 July 2011 22:27, Andras Timar <timar74@gmail.com> wrote:
> Hi Matus,
>
> 2011.07.16. 21:40 keltezéssel, Matúš Kukan írta:
> > So, I guess It's wrong in basic.src and there should be something else
> > or maybe whole IDD_TT_ABOUT_DIALOG is unused.
> > Or it shall be there and we want to define that also when using new
> > build system?
>
> It is not used in the main LibreOffice product but in the VCLTesttool
> utility. As we no longer use the master workspace + milestone concept, I
> think the build ID should be there as in
> http://opengrok.libreoffice.org/xref/components/cui/source/dialogs/about.cxx#77
It seems to be unused also in VCLTestTool. At least I could not grep
aVersionString from
http://opengrok.libreoffice.org/xref/libs-core/basic/source/app/dialogs.cxx#67
anywhere.
So maybe something like attached patch could be pushed.
Someone willing to review and push?

Regards,
Matus

From 52868ff0402ccb304f2869fdfa2e473df1856db9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@gmail.com>
Date: Sat, 16 Jul 2011 23:16:22 +0200
Subject: [PATCH] Get rid of unused RID_VERSIONSTRING

---
 basic/source/app/basic.src   |    6 ------
 basic/source/app/dialogs.cxx |    1 -
 basic/source/app/dialogs.hxx |    2 +-
 basic/source/app/resids.hrc  |    7 ++-----
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/basic/source/app/basic.src b/basic/source/app/basic.src
index 4402142..0c85eba 100644
--- a/basic/source/app/basic.src
+++ b/basic/source/app/basic.src
@@ -81,12 +81,6 @@ ModalDialog IDD_TT_ABOUT_DIALOG {
             CENTER = TRUE;
         TEXT[ en-US ] = "VCLTestTool";
     };
-    FixedText RID_VERSIONSTRING {
-            Pos = MAP_APPFONT( 5, 25 );
-            Size = MAP_APPFONT( 110, 10 );
-            Text = UPDVER;
-            CENTER = TRUE;
-        };
     FixedText 4 {
             Pos = MAP_APPFONT( 5, 40 );
             Size = MAP_APPFONT( 110, 10 );
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index 2f0913b..62f3e58 100644
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -68,7 +68,6 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& id )
 : ModalDialog( pParent, id )
 , a1( this, ResId( 1, *id.GetResMgr() ) )
 , a4( this, ResId( 4, *id.GetResMgr() ) )
-, aVersionString( this, ResId( RID_VERSIONSTRING, *id.GetResMgr() ) )
 , aOk  ( this, ResId( RID_OK, *id.GetResMgr() ) )
 {
     FreeResource();
diff --git a/basic/source/app/dialogs.hxx b/basic/source/app/dialogs.hxx
index d1fa15d..0ac5901 100644
--- a/basic/source/app/dialogs.hxx
+++ b/basic/source/app/dialogs.hxx
@@ -50,7 +50,7 @@ class SbxVariable;
 #include <basic/ttstrhlp.hxx>
 
 class AboutDialog : public ModalDialog {
-    FixedText a1,a4,aVersionString;
+    FixedText a1, a4;
     OKButton  aOk;
 public:
     AboutDialog (Window*, const ResId&);
diff --git a/basic/source/app/resids.hrc b/basic/source/app/resids.hrc
index 115c88e..a2a129c 100755
--- a/basic/source/app/resids.hrc
+++ b/basic/source/app/resids.hrc
@@ -36,12 +36,9 @@
 #define        RID_DIRSLIST            6
 #define        RID_FIND                        7
 #define RID_REPLACE                    8
-//#define RID_ICON                     9
-//#define RID_EDITFIELD                10
+
 #define RID_TEXT                       11
-//#define RID_FRAME1           12
-//#define RID_FRAME2           13
-#define RID_VERSIONSTRING      14
+
 #define RID_FIXEDTEXT1         15
 #define RID_FIXEDTEXT2         16
 
-- 
1.7.1