diff options
| -rw-r--r-- | desktop/source/migration/pages.cxx | 7 | ||||
| -rw-r--r-- | desktop/source/migration/wizard.src | 2 | ||||
| -rw-r--r-- | desktop/source/splash/makefile.mk | 1 |
3 files changed, 8 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 diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk index 0447c0c2020e..3ca31875c937 100644 --- a/desktop/source/splash/makefile.mk +++ b/desktop/source/splash/makefile.mk @@ -72,6 +72,7 @@ SHL1STDLIBS= \ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ + $(VOSLIB) \ $(SALLIB) \ $(SFXLIB) |