diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-09-10 22:33:17 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-09-10 22:33:17 +0000 |
| commit | 270e03fea6602d0b4d4b0e63c9711fed00d6646b (patch) | |
| tree | fca4f8cf85e27aa868eb521483aea8371071d71a /desktop/source/migration | |
| parent | 98bdbea6c12f54ae59e0a20c15e2dfd5d7986d1f (diff) | |
CWS-TOOLING: integrate CWS mh232
2009-08-26 03:52:57 +0200 mh r275385 : #i102182# FreeBSD patch
2009-08-26 03:43:20 +0200 mh r275384 : #i101333# patch for FreeBSD
2009-08-26 03:11:20 +0200 mh r275383 : #i39230
2009-08-26 03:07:51 +0200 mh r275382 : #i39230# more space for initials field
2009-08-26 02:41:19 +0200 mh r275380 : #i39230# use vos::osecurity for reading the user name
2009-08-18 22:06:00 +0200 mh r275130 : #i104243#, line ending problem with newer perl
2009-08-18 21:53:21 +0200 mh r275129 : #i39230# read initials via getpwnam
2009-08-18 21:34:05 +0200 mh r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
2009-08-17 18:02:59 +0200 mh r275067 : #i95498# make compile with gcc3
Diffstat (limited to 'desktop/source/migration')
| -rw-r--r-- | desktop/source/migration/pages.cxx | 7 | ||||
| -rw-r--r-- | desktop/source/migration/wizard.src | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx index 461ced320da4..0122caba945e 100644 --- a/desktop/source/migration/pages.cxx +++ b/desktop/source/migration/pages.cxx @@ -37,6 +37,7 @@ #include "migration.hxx" #include <vcl/msgbox.hxx> #include <vcl/mnemonic.hxx> +#include <vos/security.hxx> #include <app.hxx> #include <rtl/ustring.hxx> #include <osl/file.hxx> @@ -60,7 +61,6 @@ #include <unotools/bootstrap.hxx> #include <tools/config.hxx> - using namespace rtl; using namespace osl; using namespace utl; @@ -388,6 +388,10 @@ UserPage::UserPage( svt::OWizardMachine* parent, const ResId& resid) SvtUserOptions aUserOpt; m_edFirst.SetText(aUserOpt.GetFirstName()); m_edLast.SetText(aUserOpt.GetLastName()); + rtl::OUString aUserName; + vos::OSecurity().getUserName( aUserName ); + aUserOpt.SetID( aUserName ); + m_edInitials.SetText(aUserOpt.GetID()); if (m_lang == LANGUAGE_RUSSIAN) { @@ -403,6 +407,7 @@ sal_Bool UserPage::commitPage( CommitPageReason ) aUserOpt.SetFirstName(m_edFirst.GetText()); aUserOpt.SetLastName(m_edLast.GetText()); aUserOpt.SetID( m_edInitials.GetText()); + if (m_lang == LANGUAGE_RUSSIAN) aUserOpt.SetFathersName(m_edFather.GetText()); diff --git a/desktop/source/migration/wizard.src b/desktop/source/migration/wizard.src index 05f637fe7027..3b49e070fa6d 100644 --- a/desktop/source/migration/wizard.src +++ b/desktop/source/migration/wizard.src @@ -305,7 +305,7 @@ TabPage TP_UPDATE_CHECK #define USERINDENT 40 #define EDHEIGHT 12 -#define INITIALSWIDTH 25 +#define INITIALSWIDTH 50 #define FTADD 2 TabPage TP_USER |