Attachment #23798 for issue #44979

View | Details | Raw Unified | Return to issue 44979
Collapse All | Expand All




	maPasswordED	( this, ResId( ED_PASSWD_PASSWORD ) ),
	maConfirmFT		( this, ResId( FT_PASSWD_CONFIRM ) ),
	maConfirmED		( this, ResId( ED_PASSWD_CONFIRM ) ),
	maMinLengthFT	( this, ResId( FT_PASSWD_MINLEN ) ),
	maPasswordBox	( this, ResId( GB_PASSWD_PASSWORD ) ),
	maOKBtn			( this, ResId( BTN_PASSWD_OK ) ),
	maCancelBtn		( this, ResId( BTN_PASSWD_CANCEL ) ),

			aPos = maUserED.GetPosPixel();
			maPasswordED.SetPosPixel( aPos );

			aPos = maConfirmFT.GetPosPixel();
			maConfirmFT.SetPosPixel( aPwdPos1 );
			maConfirmED.SetPosPixel( aPwdPos2 );
			maMinLengthFT.SetPosPixel(aPos);
		}

		Size aBoxSize = maPasswordBox.GetSizePixel();

Lines 70-75 Link Here

(-)../src680-m78.bak/sfx2/source/dialog/passwd.hrc (+1 lines)
70	#define ED_PASSWD_PASSWORD 14	70	#define ED_PASSWD_PASSWORD 14
71	#define FT_PASSWD_CONFIRM 15	71	#define FT_PASSWD_CONFIRM 15
72	#define ED_PASSWD_CONFIRM 16	72	#define ED_PASSWD_CONFIRM 16
		73	#define FT_PASSWD_MINLEN 17
73		74
74	#define BTN_PASSWD_OK 20	75	#define BTN_PASSWD_OK 20
75	#define BTN_PASSWD_CANCEL 21	76	#define BTN_PASSWD_CANCEL 21

Lines 117-122 Link Here

(-)../src680-m78.bak/sfx2/source/dialog/passwd.src (+7 lines)
117	Pos = MAP_APPFONT( 57, 44 );	117	Pos = MAP_APPFONT( 57, 44 );
118	Size = MAP_APPFONT( 75, 12 );	118	Size = MAP_APPFONT( 75, 12 );
119	};	119	};
		120	FixedText FT_PASSWD_MINLEN
		121	{
		122	Pos = MAP_APPFONT(12, 65 );
		123	Size = MAP_APPFONT( 82, 10 );
		124	Text [ de ] = "";
		125	Text [ en-US ] = "(Minimum 5 characters)";
		126	};
120	FixedLine GB_PASSWD_PASSWORD	127	FixedLine GB_PASSWD_PASSWORD
121	{	128	{
122	Pos = MAP_APPFONT( 6, 3 );	129	Pos = MAP_APPFONT( 6, 3 );

Lines 100-105 Link Here

(-)../src680-m78.bak/sfx2/inc/passwd.hxx (+1 lines)
100	Edit maPasswordED;	100	Edit maPasswordED;
101	FixedText maConfirmFT;	101	FixedText maConfirmFT;
102	Edit maConfirmED;	102	Edit maConfirmED;
		103	FixedText maMinLengthFT;
103	FixedLine maPasswordBox;	104	FixedLine maPasswordBox;
104		105
105	OKButton maOKBtn;	106	OKButton maOKBtn;

Return to issue 44979

Lines 126-131 Link Here

(-)../src680-m78.bak/sfx2/source/dialog/passwd.cxx (+3 lines)
126	maPasswordED ( this, ResId( ED_PASSWD_PASSWORD ) ),	126	maPasswordED ( this, ResId( ED_PASSWD_PASSWORD ) ),
127	maConfirmFT ( this, ResId( FT_PASSWD_CONFIRM ) ),	127	maConfirmFT ( this, ResId( FT_PASSWD_CONFIRM ) ),
128	maConfirmED ( this, ResId( ED_PASSWD_CONFIRM ) ),	128	maConfirmED ( this, ResId( ED_PASSWD_CONFIRM ) ),
		129	maMinLengthFT ( this, ResId( FT_PASSWD_MINLEN ) ),
129	maPasswordBox ( this, ResId( GB_PASSWD_PASSWORD ) ),	130	maPasswordBox ( this, ResId( GB_PASSWD_PASSWORD ) ),
130	maOKBtn ( this, ResId( BTN_PASSWD_OK ) ),	131	maOKBtn ( this, ResId( BTN_PASSWD_OK ) ),
131	maCancelBtn ( this, ResId( BTN_PASSWD_CANCEL ) ),	132	maCancelBtn ( this, ResId( BTN_PASSWD_CANCEL ) ),
Lines 205-212 Link Here
205	aPos = maUserED.GetPosPixel();	206	aPos = maUserED.GetPosPixel();
206	maPasswordED.SetPosPixel( aPos );	207	maPasswordED.SetPosPixel( aPos );
207		208
		209	aPos = maConfirmFT.GetPosPixel();
208	maConfirmFT.SetPosPixel( aPwdPos1 );	210	maConfirmFT.SetPosPixel( aPwdPos1 );
209	maConfirmED.SetPosPixel( aPwdPos2 );	211	maConfirmED.SetPosPixel( aPwdPos2 );
		212	maMinLengthFT.SetPosPixel(aPos);
210	}	213	}
211		214
212	Size aBoxSize = maPasswordBox.GetSizePixel();	215	Size aBoxSize = maPasswordBox.GetSizePixel();