diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 15:28:52 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 15:28:52 +0000 |
| commit | 952ee937bed83ae49b5b3c873e121d645518686c (patch) | |
| tree | 0c60c33c47047eaffa87f3beec9bebcd1fc7a703 /basic/source/app/dialogs.cxx | |
| parent | dc0cc730e80bf32f777d52e911cdb522919b1dc7 (diff) | |
INTEGRATION: CWS mergebuild (1.15.2); FILE MERGED
2004/04/21 00:11:19 hjs 1.15.2.4: RESYNC: (1.15-1.17); FILE MERGED
2004/01/29 13:57:25 hjs 1.15.2.3: #i8252# chng. resmgr creation parameters from LanguageType to ::com::sun::star::lang::Locale
2004/01/29 13:56:58 hjs 1.15.2.2: #i8252# chng. resmgr creation parameters from LanguageType to ::com::sun::star::lang::Locale
2004/01/29 13:52:55 hjs 1.15.2.1: #i8252# chng. resmgr creation parameters from LanguageType to ::com::sun::star::lang::Locale
Diffstat (limited to 'basic/source/app/dialogs.cxx')
| -rw-r--r-- | basic/source/app/dialogs.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx index e7120eb0ff..01c897f383 100644 --- a/basic/source/app/dialogs.cxx +++ b/basic/source/app/dialogs.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dialogs.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: rt $ $Date: 2004-06-17 11:46:37 $ + * last change: $Author: hjs $ $Date: 2004-06-25 16:28:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -118,8 +118,6 @@ HACK( #define protected public ) #include <svtools/ctrltool.hxx> #endif -#include <svtools/pver.hxx> - // Ohne Includeschutz #include <svtools/svtdata.hxx> #include <svtools/solar.hrc> @@ -135,6 +133,8 @@ HACK( #define protected public ) #include "app.hxx" +#include "_version.h" + AboutDialog::AboutDialog( Window* pParent, const ResId& id ) : ModalDialog( pParent, id ) , a1( this, ResId( 1 ) ) @@ -142,8 +142,8 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& id ) , aVersionString( this, ResId( RID_VERSIONSTRING ) ) , aOk ( this, ResId( RID_OK ) ) { - aVersionString.SetText( ProductVersion::GetMajorVersion().Append( ProductVersion::GetMinorVersion() ) - .AppendAscii( " BUILD:" ).Append( ProductVersion::GetBuildNumber() ) ); + aVersionString.SetText( UniString::CreateFromAscii( _UPD ).Append( UniString::CreateFromAscii( _LAST_MINOR ) ) + .AppendAscii( " BUILD:" ).Append( UniString::CreateFromAscii( _BUILD ) ) ); FreeResource(); } |