Skip to content

C
core
Kaydet (Commit) 4da0bd78 authored tarafından gt's avatar gt
Dosyalara gözat
Seçenekler

#i20883# minor changes

üst 8a806a89
Hide whitespace changes
Inline Side-by-side
Showing with 389 additions and 12 deletions
xmlsecurity/source/dialogs/certificatechooser.src
Dosyayı görüntüle @ 4da0bd78
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: certificatechooser.src,v $ * $RCSfile: certificatechooser.src,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: mt $ $Date: 2004-07-12 13:15:23 $ * last change: $Author: gt $ $Date: 2004-07-19 11:08:45 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -70,8 +70,7 @@ ModalDialog RID_XMLSECDLG_CERTCHOOSER ...@@ -70,8 +70,7 @@ ModalDialog RID_XMLSECDLG_CERTCHOOSER
Moveable = TRUE; Moveable = TRUE;
SVLook = TRUE; SVLook = TRUE;
// Text = "Zertifikat auswhlen"; Text = "Zertifikat auswhlen";
Text = "Select Certificate";
Text [ en-US ] = "Select Certificate"; Text [ en-US ] = "Select Certificate";
FixedText FT_HINT_SELECT FixedText FT_HINT_SELECT
...@@ -97,8 +96,7 @@ ModalDialog RID_XMLSECDLG_CERTCHOOSER ...@@ -97,8 +96,7 @@ ModalDialog RID_XMLSECDLG_CERTCHOOSER
{ {
Pos = MAP_APPFONT( CS_COL_1, CS_ROW_3 ); Pos = MAP_APPFONT( CS_COL_1, CS_ROW_3 );
Size = MAP_APPFONT( CS_COL_2-CS_COL_1, RSC_CD_PUSHBUTTON_HEIGHT ); Size = MAP_APPFONT( CS_COL_2-CS_COL_1, RSC_CD_PUSHBUTTON_HEIGHT );
// Text = "Zertifikat anzeigen..."; Text = "Zertifikat anzeigen...";
Text = "View Certificate...";
Text [ en-US ] = "View Certificate..."; Text [ en-US ] = "View Certificate...";
}; };
FixedLine FL_BOTTOM_SEP FixedLine FL_BOTTOM_SEP
......
xmlsecurity/source/dialogs/dialogs.hrc
Dosyayı görüntüle @ 4da0bd78
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: dialogs.hrc,v $ * $RCSfile: dialogs.hrc,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: gt $ $Date: 2004-07-16 06:28:07 $ * last change: $Author: gt $ $Date: 2004-07-19 11:08:45 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
#define RID_XMLSECTP_MACROSEC 1006 #define RID_XMLSECTP_MACROSEC 1006
#define RID_XMLSECTP_SECLEVEL 1007 #define RID_XMLSECTP_SECLEVEL 1007
#define RID_XMLSECTP_TRUSTSOURCES 1008 #define RID_XMLSECTP_TRUSTSOURCES 1008
#define RID_XMLSECTP_SIGNMACROWARN 1009
#define FL_BOTTOM_SEP 50 #define FL_BOTTOM_SEP 50
#define BTN_OK 51 #define BTN_OK 51
...@@ -334,4 +335,38 @@ ...@@ -334,4 +335,38 @@
#define TS_ROW_9 (TS_ROW_10-RSC_CD_PUSHBUTTON_HEIGHT) #define TS_ROW_9 (TS_ROW_10-RSC_CD_PUSHBUTTON_HEIGHT)
#define TS_ROW_8 (TS_ROW_9-RSC_SP_CTRL_GROUP_Y) #define TS_ROW_8 (TS_ROW_9-RSC_SP_CTRL_GROUP_Y)
// --------- signed macro warning ---------
#define FI_DOCNAME 1
#define FI_DESCR1A 2
#define FI_SIGNS 3
#define PB_VIEWSIGNS 4
#define FI_DESCR2 5
#define CB_ALWAYSTRUST 6
#define PB_ENABLE 7
#define PB_DISABLE 8
#define FI_DESCR1B 9
#define MW_WIDTH DLGS_WIDTH
#define MW_HEIGHT DLGS_HEIGHT
#define MW_SYMBOL_WIDTH (20)
#define MW_COL_0 (RSC_SP_DLG_INNERBORDER_LEFT)
#define MW_COL_1 (MW_COL_0+MW_SYMBOL_WIDTH)
#define MW_COL_4 (MW_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
#define MW_COL_3 (MW_COL_4-RSC_CD_PUSHBUTTON_WIDTH)
#define MW_COL_2 (MW_COL_3-RSC_SP_CTRL_DESC_X)
#define MW_COL_A (DLGS_BOTTOM_OK_X(MW_WIDTH))
#define MW_COL_C (DLGS_BOTTOM_CANCEL_X(MW_WIDTH))
#define MW_COL_E (DLGS_BOTTOM_HELP_X(MW_WIDTH))
#define MW_ROW_0 (RSC_SP_DLG_INNERBORDER_TOP)
#define MW_ROW_1 (MW_ROW_0+3*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y)
#define MW_ROW_2 (MW_ROW_1+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y)
#define MW_ROW_7 (MW_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM)
#define MW_ROW_6 (DLGS_BOTTOM_BTN_Y(MW_HEIGHT))
#define MW_ROW_5 (DLGS_BOTTOM_FL_Y(MW_HEIGHT))
#define MW_ROW_4 (MW_ROW_5-RSC_CD_CHECKBOX_HEIGHT-RSC_SP_CTRL_Y)
#define MW_ROW_3 (MW_ROW_4-4*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y)
#endif #endif
xmlsecurity/source/dialogs/makefile.mk
Dosyayı görüntüle @ 4da0bd78
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.2 $ # $Revision: 1.3 $
# #
# last change: $Author: gt $ $Date: 2004-07-16 06:28:08 $ # last change: $Author: gt $ $Date: 2004-07-19 11:08:46 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
...@@ -86,7 +86,8 @@ SRC1FILES = \ ...@@ -86,7 +86,8 @@ SRC1FILES = \
digitalsignaturesdialog.src \ digitalsignaturesdialog.src \
certificatechooser.src \ certificatechooser.src \
certificateviewer.src \ certificateviewer.src \
macrosecurity.src macrosecurity.src \
warnings.src
SLOFILES= \ SLOFILES= \
$(SLO)$/stbcontrl.obj \ $(SLO)$/stbcontrl.obj \
...@@ -94,7 +95,8 @@ SLOFILES= \ ...@@ -94,7 +95,8 @@ SLOFILES= \
$(SLO)$/certificatechooser.obj \ $(SLO)$/certificatechooser.obj \
$(SLO)$/certificateviewer.obj \ $(SLO)$/certificateviewer.obj \
$(SLO)$/macrosecurity.obj \ $(SLO)$/macrosecurity.obj \
$(SLO)$/resourcemanager.obj $(SLO)$/resourcemanager.obj \
$(SLO)$/warnings.obj
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------
......
xmlsecurity/source/dialogs/warnings.cxx 0 → 100644
Dosyayı görüntüle @ 4da0bd78
/*************************************************************************
*
* $RCSfile: warnings.cxx,v $
*
* $Revision: 1.1 $
*
* last change: $Author: gt $ $Date: 2004-07-19 11:09:28 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
*
* - GNU Lesser General Public License Version 2.1
* - Sun Industry Standards Source License Version 1.1
*
* Sun Microsystems Inc., October, 2000
*
* GNU Lesser General Public License Version 2.1
* =============================================
* Copyright 2000 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License version 2.1, as published by the Free Software Foundation.
*
* This library 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 for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
*
* Sun Industry Standards Source License Version 1.1
* =================================================
* The contents of this file are subject to the Sun Industry Standards
* Source License Version 1.1 (the "License"); You may not use this file
* except in compliance with the License. You may obtain a copy of the
* License at http://www.openoffice.org/license.html.
*
* Software provided under this License is provided on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
* WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
* MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
* See the License for the specific provisions governing your rights and
* obligations concerning the Software.
*
* The Initial Developer of the Original Code is: Sun Microsystems, Inc.
*
* Copyright: 2000 by Sun Microsystems, Inc.
*
* All Rights Reserved.
*
* Contributor(s): _______________________________________
*
*
************************************************************************/
#include <xmlsecurity/warnings.hxx>
#include <xmlsecurity/certificateviewer.hxx>
#ifndef _COM_SUN_STAR_XML_CRYPTO_XSECURITYENVIRONMENT_HPP_
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
#endif
#ifndef _COMPHELPER_SEQUENCE_HXX_
#include <comphelper/sequence.hxx>
#endif
// MM : added for password exception
#include <vcl/msgbox.hxx>
#include <com/sun/star/security/NoPasswordException.hpp>
using namespace ::com::sun::star::security;
// Only for bigIntegerToNumericString
#include <xmlsecurity/xmlsignaturehelper.hxx>
#include "dialogs.hrc"
#include "resourcemanager.hxx"
/* HACK: disable some warnings for MS-C */
#ifdef _MSC_VER
#pragma warning (disable : 4355) // 4355: this used in initializer-list
#endif
using namespace ::com::sun::star;
using namespace ::com::sun::star;
MacroWarning::MacroWarning( Window* _pParent, uno::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, cssu::Reference< dcss::security::XCertificate >& _rxCert )
:ModalDialog ( _pParent, XMLSEC_RES( RID_XMLSECTP_MACROWARN ) )
,maDocNameFI ( this, ResId( FI_DOCNAME ) )
,maDescr1aFI ( this, ResId( FI_DESCR1A ) )
,maDescr1bFI ( this, ResId( FI_DESCR1B ) )
,maSignsFI ( this, ResId( FI_SIGNS ) )
,maViewSignsBtn ( this, ResId( PB_VIEWSIGNS ) )
,maDescr2FI ( this, ResId( FI_DESCR2 ) )
,maAlwaysTrustCB ( this, ResId( CB_ALWAYSTRUST ) )
,maBottomSepFL ( this, ResId( FL_BOTTOM_SEP ) )
,maEnableBtn ( this, ResId( PB_DISABLE ) )
,maDisableBtn ( this, ResId( PB_DISABLE ) )
,maHelpBtn ( this, ResId( BTN_HELP ) )
,mbSignedMode ( true )
{
FreeResource();
mxSecurityEnvironment = _rxSecurityEnvironment;
mxCert = _rxCert;
// hide unused parts
maDescr1bFI.Hide();
maViewSignsBtn.SetClickHdl( LINK( this, MacroWarning, ViewSignsBtnHdl ) );
maEnableBtn.SetClickHdl( LINK( this, MacroWarning, EnableBtnHdl ) );
// maDisableBtn.SetClickHdl( LINK( this, MacroWarning, DisableBtnHdl ) );
if( mxCert.is() )
{
String aCN_Id( String::CreateFromAscii( "CN" ) );
String s;
s = XmlSec::GetContentPart( mxCert->getSubjectName(), aCN_Id );
maSignsFI.SetText( s );
}
else
// nothing to view!
maViewSignsBtn.Disable();
}
MacroWarning::MacroWarning( Window* _pParent )
:ModalDialog ( _pParent, XMLSEC_RES( RID_XMLSECTP_MACROWARN ) )
,maDocNameFI ( this, ResId( FI_DOCNAME ) )
,maDescr1aFI ( this, ResId( FI_DESCR1A ) )
,maDescr1bFI ( this, ResId( FI_DESCR1B ) )
,maSignsFI ( this, ResId( FI_SIGNS ) )
,maViewSignsBtn ( this, ResId( PB_VIEWSIGNS ) )
,maDescr2FI ( this, ResId( FI_DESCR2 ) )
,maAlwaysTrustCB ( this, ResId( CB_ALWAYSTRUST ) )
,maBottomSepFL ( this, ResId( FL_BOTTOM_SEP ) )
,maEnableBtn ( this, ResId( PB_DISABLE ) )
,maDisableBtn ( this, ResId( PB_DISABLE ) )
,maHelpBtn ( this, ResId( BTN_HELP ) )
,mbSignedMode ( false )
{
FreeResource();
// hide unused parts
maDescr1aFI.Hide();
maSignsFI.Hide();
maViewSignsBtn.Hide();
maAlwaysTrustCB.Hide();
maDescr2FI.Hide();
// move hint up to position of signer list
maDescr1FI.SetPosPixel( maSignsFI.GetPosPixel() );
}
MacroWarning::~MacroWarning()
{
}
IMPL_LINK( MacroWarning, ViewSignsBtnHdl, void*, EMPTYARG )
{
DBG_ASSERT( mxCert.is(), "*MacroWarning::ViewSignsBtnHdl(): no certificate set!" );
CertificateViewer aViewer( this, mxSecurityEnvironment, mxCert );
aViewer.Execute();
return 0;
}
IMPL_LINK( MacroWarning, EnableBtnHdl, void*, EMPTYARG )
{
if( mbSignedMode && maAlwaysTrustCB.IsChecked() )
{ // insert path into trusted path list
}
return 0;
}
/*IMPL_LINK( MacroWarning, DisableBtnHdl, void*, EMPTYARG )
{
return 0;
}*/
xmlsecurity/source/dialogs/warnings.src 0 → 100644
Dosyayı görüntüle @ 4da0bd78
/*************************************************************************
*
* $RCSfile: warnings.src,v $
*
* $Revision: 1.1 $
*
* last change: $Author: gt $ $Date: 2004-07-19 11:09:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
*
* - GNU Lesser General Public License Version 2.1
* - Sun Industry Standards Source License Version 1.1
*
* Sun Microsystems Inc., October, 2000
*
* GNU Lesser General Public License Version 2.1
* =============================================
* Copyright 2000 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License version 2.1, as published by the Free Software Foundation.
*
* This library 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 for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
*
* Sun Industry Standards Source License Version 1.1
* =================================================
* The contents of this file are subject to the Sun Industry Standards
* Source License Version 1.1 (the "License"); You may not use this file
* except in compliance with the License. You may obtain a copy of the
* License at http://www.openoffice.org/license.html.
*
* Software provided under this License is provided on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
* WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
* MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
* See the License for the specific provisions governing your rights and
* obligations concerning the Software.
*
* The Initial Developer of the Original Code is: Sun Microsystems, Inc.
*
* Copyright: 2000 by Sun Microsystems, Inc.
*
* All Rights Reserved.
*
* Contributor(s): _______________________________________
*
*
************************************************************************/
#include "dialogs.hrc"
ModalDialog RID_XMLSECTP_MACROWARN
{
// HelpId = HID_XMLSECTP_MACROWARN;
Size = MAP_APPFONT( MW_WIDTH, MW_HEIGHT );
OutputSize = TRUE;
Closeable = TRUE;
Moveable = TRUE;
SVLook = TRUE;
Text [ de ] = "Sicherheitswarnung";
Text [ en-US ] = "Security Warning";
FixedText FI_DOCNAME
{
Pos = MAP_APPFONT( MW_COL_1, MW_ROW_0 );
Size = MAP_APPFONT( MW_COL_4-MW_COL_1, 3*RSC_CD_FIXEDTEXT_HEIGHT );
Wordbreak = TRUE;
Text [ de ] = "";
Text [ en-US ] = "";
};
FixedText FI_DESCR1A
{
Pos = MAP_APPFONT( MW_COL_1, MW_ROW_1 );
Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT );
Wordbreak = TRUE;
Text [ de ] = "";
Text [ en-US ] = "The document contains document macros signed by:";
};
FixedText FI_DESCR1B
{
Pos = MAP_APPFONT( MW_COL_1, MW_ROW_1 );
Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT );
Wordbreak = TRUE;
Text [ de ] = "";
Text [ en-US ] = "The document contains document macros.";
};
FixedText FI_SIGNS
{
Pos = MAP_APPFONT( MW_COL_1, MW_ROW_2 );
Size = MAP_APPFONT( MW_COL_4-MW_COL_2, MW_ROW_3-MW_ROW_2 );
Wordbreak = TRUE;
Text [ de ] = "";
Text [ en-US ] = "";
};
PushButton PB_VIEWSIGNS
{
Pos = MAP_APPFONT( MW_COL_3, MW_ROW_2 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ de ] = "Signatur anzeigen...";
Text [ en-US ] = "View Signatures...";
};
FixedText FI_DESCR2
{
Pos = MAP_APPFONT( MW_COL_1, MW_ROW_3 );
Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT );
Wordbreak = TRUE;
Text [ de ] = "";
Text [ en-US ] = "Macros may contain viruses. Disabling macros for a document is always save. If you disable macros you may lose functionality provided by the document macros.";
};
CheckBox CB_ALWAYSTRUST
{
Pos = MAP_APPFONT( MW_COL_1, MW_ROW_4 );
Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_CHECKBOX_HEIGHT );
Text [ de ] = "";
Text [ en-US ] = "Always trust macros from this source";
};
FixedLine FL_BOTTOM_SEP
{
Pos = MAP_APPFONT( 0, DLGS_BOTTOM_FL_Y( MW_HEIGHT ) );
Size = MAP_APPFONT( MW_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
};
OKButton PB_ENABLE
{
Pos = MAP_APPFONT( DLGS_BOTTOM_OK_X( MW_WIDTH ), DLGS_BOTTOM_BTN_Y( MW_HEIGHT ) );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Default = FALSE;
Text [ de ] = "";
Text [ en-US ] = "Enable Macros";
};
CancelButton PB_DISABLE
{
Pos = MAP_APPFONT( DLGS_BOTTOM_CANCEL_X( MW_WIDTH ), DLGS_BOTTOM_BTN_Y( MW_HEIGHT ) );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ de ] = "";
Text [ en-US ] = "Disable Macros";
};
HelpButton BTN_HELP
{
Pos = MAP_APPFONT( DLGS_BOTTOM_HELP_X( MW_WIDTH ), DLGS_BOTTOM_BTN_Y( MW_HEIGHT ) );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
};
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment