mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dv19#i112822# Applied patch to remove dialog, removed resources used by this dialog, too

Browse Source
This commit is contained in:
Dirk Voelzke
2010-07-06 08:42:32 +02:00
parent 2158245662
commit 2e76bcf667
7 changed files with 0 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
uui/source/iahndl-authentication.cxx
View File

@@ -52,7 +52,6 @@
#include "logindlg.hxx"
#include "masterpasscrtdlg.hxx"
#include "masterpassworddlg.hxx"
#include "passcrtdlg.hxx"
#include "passworddlg.hxx"
#include "iahndl.hxx"

2
uui/source/ids.hrc
View File

@@ -56,7 +56,6 @@
#define RID_UUI_ERRHDL (RID_UUI_START + 20)
#define DLG_UUI_MASTERPASSWORD_CRT (RID_UUI_START + 21)
#define DLG_UUI_PASSWORD (RID_UUI_START + 22)
#define DLG_UUI_PASSWORD_CRT (RID_UUI_START + 23)
#define STR_ERROR_PASSWORD_TO_OPEN_WRONG (RID_UUI_START + 24)
#define STR_ERROR_PASSWORD_TO_MODIFY_WRONG (RID_UUI_START + 25)
#define DLG_UUI_UNKNOWNAUTH (RID_UUI_START + 26)
@@ -181,7 +180,6 @@
#define HID_DLG_MASTERPASSWORD_CRT (HID_UUI_START + 3)
#define HID_DLG_FILTER_SELECT (HID_UUI_START + 4)
#define HID_DLG_PASSWORD_UUI (HID_UUI_START + 5)
#define HID_DLG_PASSWORD_CRT (HID_UUI_START + 6)
#define HID_DLG_UNKNOWNAUTH_UUI (HID_UUI_START + 7)
#define HID_DLG_SSLWARN_UUI (HID_UUI_START + 8)
#define HID_XMLSECDLG_MACROWARN (HID_UUI_START + 9)

2
uui/source/makefile.mk
View File

@@ -48,7 +48,6 @@ SLOFILES = \
$(SLO)$/masterpasscrtdlg.obj \
$(SLO)$/openlocked.obj \
$(SLO)$/passworddlg.obj \
$(SLO)$/passcrtdlg.obj \
$(SLO)$/fltdlg.obj \
$(SLO)$/interactionhandler.obj \
$(SLO)$/requeststringresolver.obj \
@@ -72,7 +71,6 @@ SRC1FILES = \
masterpasscrtdlg.src \
openlocked.src \
passworddlg.src \
passcrtdlg.src \
passworderrs.src \
fltdlg.src \
unknownauthdlg.src\

128
uui/source/passcrtdlg.cxx
View File

@@ -1,128 +0,0 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#include <svtools/filedlg.hxx>
#include <vcl/msgbox.hxx>
#ifndef UUI_IDS_HRC
#include <ids.hrc>
#endif
#ifndef UUI_PASSCRTDLG_HRC
#include <passcrtdlg.hrc>
#endif
#include <passcrtdlg.hxx>
// PasswordCreateDialog---------------------------------------------------
// -----------------------------------------------------------------------
IMPL_LINK( PasswordCreateDialog, EditHdl_Impl, Edit *, EMPTYARG )
{
aOKBtn.Enable( aEDPasswordCrt.GetText().Len() >= nMinLen );
return 0;
}
// -----------------------------------------------------------------------
IMPL_LINK( PasswordCreateDialog, OKHdl_Impl, OKButton *, EMPTYARG )
{
// compare both passwords and show message box if there are not equal!!
if( aEDPasswordCrt.GetText() == aEDPasswordRepeat.GetText() )
EndDialog( RET_OK );
else
{
String aErrorMsg( ResId( STR_ERROR_PASSWORDS_NOT_IDENTICAL, *pResourceMgr ));
ErrorBox aErrorBox( this, WB_OK, aErrorMsg );
aErrorBox.Execute();
aEDPasswordCrt.SetText( String() );
aEDPasswordRepeat.SetText( String() );
aEDPasswordCrt.GrabFocus();
}
return 1;
}
// -----------------------------------------------------------------------
PasswordCreateDialog::PasswordCreateDialog( Window* _pParent, ResMgr * pResMgr, bool bMSCryptoMode)
:ModalDialog( _pParent, ResId( DLG_UUI_PASSWORD_CRT, *pResMgr ) )
,aFTPasswordCrt ( this, ResId( FT_PASSWORD_CRT, *pResMgr ) )
,aEDPasswordCrt ( this, ResId( ED_PASSWORD_CRT, *pResMgr ) )
,aFTPasswordRepeat ( this, ResId( FT_PASSWORD_REPEAT, *pResMgr ) )
,aEDPasswordRepeat ( this, ResId( ED_PASSWORD_REPEAT, *pResMgr ) )
,aFTWarning ( this, ResId( bMSCryptoMode ? FT_MSPASSWORD_WARNING : FT_PASSWORD_WARNING, *pResMgr ) )
,aFixedLine1 ( this, ResId( FL_FIXED_LINE_1, *pResMgr ) )
,aOKBtn ( this, ResId( BTN_PASSCRT_OK, *pResMgr ) )
,aCancelBtn ( this, ResId( BTN_PASSCRT_CANCEL, *pResMgr ) )
,aHelpBtn ( this, ResId( BTN_PASSCRT_HELP, *pResMgr ) )
,pResourceMgr ( pResMgr )
,nMinLen(1) // if it should be changed for ODF, it must stay 1 for bMSCryptoMode
{
FreeResource();
aOKBtn.SetClickHdl( LINK( this, PasswordCreateDialog, OKHdl_Impl ) );
aEDPasswordCrt.SetModifyHdl( LINK( this, PasswordCreateDialog, EditHdl_Impl ) );
aOKBtn.Enable( sal_False );
if ( bMSCryptoMode )
{
aEDPasswordCrt.SetMaxTextLen( 15 );
aEDPasswordRepeat.SetMaxTextLen( 15 );
}
long nLabelWidth = aFTWarning.GetSizePixel().Width();
long nLabelHeight = aFTWarning.GetSizePixel().Height();
long nTextWidth = aFTWarning.GetCtrlTextWidth( aFTWarning.GetText() );
long nTextHeight = aFTWarning.GetTextHeight();
Rectangle aLabelRect( aFTWarning.GetPosPixel(), aFTWarning.GetSizePixel() );
Rectangle aRect = aFTWarning.GetTextRect( aLabelRect, aFTWarning.GetText() );
long nNewLabelHeight = 0;
for( nNewLabelHeight = ( nTextWidth / nLabelWidth + 1 ) * nTextHeight;
nNewLabelHeight < aRect.GetHeight();
nNewLabelHeight += nTextHeight ) {} ;
long nDelta = nNewLabelHeight - nLabelHeight;
Size aNewDlgSize = GetSizePixel();
aNewDlgSize.Height() += nDelta;
SetSizePixel( aNewDlgSize );
Size aNewWarningSize = aFTWarning.GetSizePixel();
aNewWarningSize.Height() = nNewLabelHeight;
aFTWarning.SetPosSizePixel( aFTWarning.GetPosPixel(), aNewWarningSize );
Window* pControls[] = { &aFixedLine1, &aOKBtn, &aCancelBtn, &aHelpBtn };
const sal_Int32 nCCount = sizeof( pControls ) / sizeof( pControls[0] );
for ( int i = 0; i < nCCount; ++i )
{
Point aNewPos =(*pControls[i]).GetPosPixel();
aNewPos.Y() += nDelta;
pControls[i]->SetPosSizePixel( aNewPos, pControls[i]->GetSizePixel() );
}
}

43
uui/source/passcrtdlg.hrc
View File

@@ -1,43 +0,0 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef UUI_PASSCRTDLG_HRC
#define UUI_PASSCRTDLG_HRC
// local identifiers
#define BTN_PASSCRT_CANCEL 1
#define ED_PASSWORD_CRT 2
#define FT_PASSWORD_REPEAT 3
#define FT_PASSWORD_WARNING 4
#define ED_PASSWORD_REPEAT 5
#define FL_FIXED_LINE_1 6
#define BTN_PASSCRT_OK 7
#define BTN_PASSCRT_HELP 8
#define FT_PASSWORD_CRT 9
#define FT_MSPASSWORD_WARNING 10
#endif // UUI_PASSCRTDLG_HRC

63
uui/source/passcrtdlg.hxx
View File

@@ -1,63 +0,0 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef UUI_PASSCRTDLG_HXX
#define UUI_PASSCRTDLG_HXX
#include <com/sun/star/task/PasswordRequestMode.hpp>
#include <svtools/stdctrl.hxx>
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
//============================================================================
class PasswordCreateDialog : public ModalDialog
{
FixedText aFTPasswordCrt;
Edit aEDPasswordCrt;
FixedText aFTPasswordRepeat;
Edit aEDPasswordRepeat;
FixedText aFTWarning;
FixedLine aFixedLine1;
OKButton aOKBtn;
CancelButton aCancelBtn;
HelpButton aHelpBtn;
ResMgr* pResourceMgr;
sal_uInt16 nMinLen;
DECL_LINK( OKHdl_Impl, OKButton * );
DECL_LINK( EditHdl_Impl, Edit * );
public:
PasswordCreateDialog( Window* pParent, ResMgr * pResMgr, bool bMSCryptoMode = false );
String GetPassword() const { return aEDPasswordCrt.GetText(); }
};
#endif // UUI_PASSCRTDLG_HXX

108
uui/source/passcrtdlg.src
View File

@@ -1,108 +0,0 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#define __RSC
#ifndef UUI_IDS_HRC
#include <ids.hrc>
#endif
#ifndef UUI_PASSCRTDLG_HRC
#include "passcrtdlg.hrc"
#endif
ModalDialog DLG_UUI_PASSWORD_CRT
{
HelpId = HID_DLG_PASSWORD_CRT ;
Border = TRUE ;
Moveable = TRUE ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT( 145, 129 );
FixedText FT_PASSWORD_CRT
{
Pos = MAP_APPFONT( 3, 4 );
Size = MAP_APPFONT( 139, 9 );
Text [ en-US ] = "Enter password";
};
Edit ED_PASSWORD_CRT
{
Border = TRUE ;
Pos = MAP_APPFONT( 3, 17 );
Size = MAP_APPFONT( 139, 13 );
PassWord = TRUE ;
};
Edit ED_PASSWORD_REPEAT
{
Border = TRUE ;
Pos = MAP_APPFONT( 3, 47 );
Size = MAP_APPFONT( 139, 13 );
PassWord = TRUE ;
};
OKButton BTN_PASSCRT_OK
{
Pos = MAP_APPFONT( 27, 110 );
Size = MAP_APPFONT( 37, 15 );
DefButton = TRUE ;
};
CancelButton BTN_PASSCRT_CANCEL
{
Pos = MAP_APPFONT( 66, 110 );
Size = MAP_APPFONT( 37, 15 );
};
HelpButton BTN_PASSCRT_HELP
{
Pos = MAP_APPFONT( 105, 110 );
Size = MAP_APPFONT( 37, 15 );
};
FixedText FT_PASSWORD_REPEAT
{
Pos = MAP_APPFONT( 3, 34 );
Size = MAP_APPFONT( 139, 9 );
Text [ en-US ] = "Reenter password";
};
FixedText FT_PASSWORD_WARNING
{
Pos = MAP_APPFONT( 4, 64 );
Size = MAP_APPFONT( 137, 40 );
Text [ en-US ] = "WARNING: If you lose or forget the password, it cannot be recovered. It is advisable to keep passwords in a safe place. Passwords are case-sensitive.";
WordBreak = TRUE;
};
FixedText FT_MSPASSWORD_WARNING
{
Pos = MAP_APPFONT( 4, 64 );
Size = MAP_APPFONT( 137, 40 );
Text [ en-US ] = "WARNING: If you lose or forget the password, it cannot be recovered. It is advisable to keep passwords in a safe place. Passwords are case-sensitive and at most fifteen characters long.";
WordBreak = TRUE;
};
FixedLine FL_FIXED_LINE_1
{
Pos = MAP_APPFONT( 0, 104 );
Size = MAP_APPFONT( 145, 6 );
};
Text [ en-US ] = "Enter Password";
};