summaryrefslogtreecommitdiff
path: root/xmlsecurity/source/dialogs
diff options
context:
space:
mode:
Diffstat (limited to 'xmlsecurity/source/dialogs')
-rw-r--r--xmlsecurity/source/dialogs/certificatechooser.cxx28
-rw-r--r--xmlsecurity/source/dialogs/certificatechooser.src2
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.cxx114
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.src2
-rw-r--r--xmlsecurity/source/dialogs/dialogs.hrc436
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx148
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc2
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.src6
-rw-r--r--xmlsecurity/source/dialogs/helpids.hrc2
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.cxx76
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.src2
-rw-r--r--xmlsecurity/source/dialogs/resourcemanager.cxx76
-rw-r--r--xmlsecurity/source/dialogs/resourcemanager.hxx28
-rw-r--r--xmlsecurity/source/dialogs/stbcontrl.cxx44
-rw-r--r--xmlsecurity/source/dialogs/warnings.cxx62
-rw-r--r--xmlsecurity/source/dialogs/warnings.src2
16 files changed, 515 insertions, 515 deletions
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index d07f5071e618..fa82427d2fe1 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -46,16 +46,16 @@
/* HACK: disable some warnings for MS-C */
#ifdef _MSC_VER
-#pragma warning (disable : 4355) // 4355: this used in initializer-list
+#pragma warning (disable : 4355) // 4355: this used in initializer-list
#endif
using namespace ::com::sun::star;
-#define INVAL_SEL 0xFFFF
+#define INVAL_SEL 0xFFFF
USHORT CertificateChooser::GetSelectedEntryPos( void ) const
{
- USHORT nSel = INVAL_SEL;
+ USHORT nSel = INVAL_SEL;
SvLBoxEntry* pSel = maCertLB.FirstSelected();
if( pSel )
@@ -65,15 +65,15 @@ USHORT CertificateChooser::GetSelectedEntryPos( void ) const
}
CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::XComponentContext>& _rxCtx, uno::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, const SignatureInformations& _rCertsToIgnore )
- :ModalDialog ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTCHOOSER ) )
+ :ModalDialog ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTCHOOSER ) )
,maCertsToIgnore( _rCertsToIgnore )
- ,maHintFT ( this, XMLSEC_RES( FT_HINT_SELECT ) )
- ,maCertLB ( this, XMLSEC_RES( LB_SIGNATURES ) )
- ,maViewBtn ( this, XMLSEC_RES( BTN_VIEWCERT ) )
- ,maBottomSepFL ( this, XMLSEC_RES( FL_BOTTOM_SEP ) )
- ,maOKBtn ( this, XMLSEC_RES( BTN_OK ) )
- ,maCancelBtn ( this, XMLSEC_RES( BTN_CANCEL ) )
- ,maHelpBtn ( this, XMLSEC_RES( BTN_HELP ) )
+ ,maHintFT ( this, XMLSEC_RES( FT_HINT_SELECT ) )
+ ,maCertLB ( this, XMLSEC_RES( LB_SIGNATURES ) )
+ ,maViewBtn ( this, XMLSEC_RES( BTN_VIEWCERT ) )
+ ,maBottomSepFL ( this, XMLSEC_RES( FL_BOTTOM_SEP ) )
+ ,maOKBtn ( this, XMLSEC_RES( BTN_OK ) )
+ ,maCancelBtn ( this, XMLSEC_RES( BTN_CANCEL ) )
+ ,maHelpBtn ( this, XMLSEC_RES( BTN_HELP ) )
{
static long nTabs[] = { 3, 0, 30*CS_LB_WIDTH/100, 60*CS_LB_WIDTH/100 };
maCertLB.SetTabs( &nTabs[0] );
@@ -100,7 +100,7 @@ short CertificateChooser::Execute()
{
// #i48432#
// We can't check for personal certificates before raising this dialog,
- // because the mozilla implementation throws a NoPassword exception,
+ // because the mozilla implementation throws a NoPassword exception,
// if the user pressed cancel, and also if the database does not exist!
// But in the later case, the is no password query, and the user is confused
// that nothing happens when pressing "Add..." in the SignatureDialog.
@@ -201,7 +201,7 @@ void CertificateChooser::ImplInitialize()
uno::Reference< dcss::security::XCertificate > CertificateChooser::GetSelectedCertificate()
{
uno::Reference< dcss::security::XCertificate > xCert;
- USHORT nSelected = GetSelectedEntryPos();
+ USHORT nSelected = GetSelectedEntryPos();
if ( nSelected < maCerts.getLength() )
xCert = maCerts[ nSelected ];
return xCert;
diff --git a/xmlsecurity/source/dialogs/certificatechooser.src b/xmlsecurity/source/dialogs/certificatechooser.src
index 13ce734e46df..9fa8e5ec78b6 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.src
+++ b/xmlsecurity/source/dialogs/certificatechooser.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 7980b8046cbf..10e1487b9978 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -43,7 +43,7 @@
/* HACK: disable some warnings for MS-C */
#ifdef _MSC_VER
-#pragma warning (disable : 4355) // 4355: this used in initializer-list
+#pragma warning (disable : 4355) // 4355: this used in initializer-list
#endif
using namespace ::com::sun::star;
@@ -72,10 +72,10 @@ CertificateViewer::CertificateViewer(
Window* _pParent,
const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment,
const cssu::Reference< dcss::security::XCertificate >& _rXCert, BOOL bCheckForPrivateKey )
- :TabDialog ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTVIEWER ) )
- ,maTabCtrl ( this, XMLSEC_RES( 1 ) )
- ,maOkBtn ( this, XMLSEC_RES( BTN_OK ) )
- ,maHelpBtn ( this, XMLSEC_RES( BTN_HELP ) )
+ :TabDialog ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTVIEWER ) )
+ ,maTabCtrl ( this, XMLSEC_RES( 1 ) )
+ ,maOkBtn ( this, XMLSEC_RES( BTN_OK ) )
+ ,maHelpBtn ( this, XMLSEC_RES( BTN_HELP ) )
{
FreeResource();
@@ -98,27 +98,27 @@ CertificateViewer::~CertificateViewer()
}
CertificateViewerTP::CertificateViewerTP( Window* _pParent, const ResId& _rResId, CertificateViewer* _pDlg )
- :TabPage ( _pParent, _rResId )
- ,mpDlg ( _pDlg )
+ :TabPage ( _pParent, _rResId )
+ ,mpDlg ( _pDlg )
{
}
CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, CertificateViewer* _pDlg )
- :CertificateViewerTP ( _pParent, XMLSEC_RES( RID_XMLSECTP_GENERAL ), _pDlg )
- ,maFrameWin ( this, XMLSEC_RES( WIN_FRAME ) )
- ,maCertImg ( this, XMLSEC_RES( IMG_CERT ) )
- ,maCertInfoFI ( this, XMLSEC_RES( FI_CERTINFO ) )
- ,maSep1FL ( this, XMLSEC_RES( FL_SEP1 ) )
- ,maHintNotTrustedFI ( this, XMLSEC_RES( FI_HINTNOTTRUST ) )
- ,maSep2FL ( this, XMLSEC_RES( FL_SEP2 ) )
- ,maIssuedToLabelFI ( this, XMLSEC_RES( FI_ISSTOLABEL ) )
- ,maIssuedToFI ( this, XMLSEC_RES( FI_ISSTO ) )
- ,maIssuedByLabelFI ( this, XMLSEC_RES( FI_ISSBYLABEL ) )
- ,maIssuedByFI ( this, XMLSEC_RES( FI_ISSBY ) )
+ :CertificateViewerTP ( _pParent, XMLSEC_RES( RID_XMLSECTP_GENERAL ), _pDlg )
+ ,maFrameWin ( this, XMLSEC_RES( WIN_FRAME ) )
+ ,maCertImg ( this, XMLSEC_RES( IMG_CERT ) )
+ ,maCertInfoFI ( this, XMLSEC_RES( FI_CERTINFO ) )
+ ,maSep1FL ( this, XMLSEC_RES( FL_SEP1 ) )
+ ,maHintNotTrustedFI ( this, XMLSEC_RES( FI_HINTNOTTRUST ) )
+ ,maSep2FL ( this, XMLSEC_RES( FL_SEP2 ) )
+ ,maIssuedToLabelFI ( this, XMLSEC_RES( FI_ISSTOLABEL ) )
+ ,maIssuedToFI ( this, XMLSEC_RES( FI_ISSTO ) )
+ ,maIssuedByLabelFI ( this, XMLSEC_RES( FI_ISSBYLABEL ) )
+ ,maIssuedByFI ( this, XMLSEC_RES( FI_ISSBY ) )
,maValidDateFI ( this, XMLSEC_RES( FI_VALIDDATE ) )
- ,maKeyImg ( this, XMLSEC_RES( IMG_KEY ) )
- ,maHintCorrespPrivKeyFI ( this, XMLSEC_RES( FI_CORRPRIVKEY ) )
+ ,maKeyImg ( this, XMLSEC_RES( IMG_KEY ) )
+ ,maHintCorrespPrivKeyFI ( this, XMLSEC_RES( FI_CORRPRIVKEY ) )
{
if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
maKeyImg.SetImage( Image( XMLSEC_RES( IMG_KEY_HC ) ) );
@@ -157,7 +157,7 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, Certif
maHintCorrespPrivKeyFI.SetBackground( aBack );
// make some bold
- Font aFnt( maCertInfoFI.GetFont() );
+ Font aFnt( maCertInfoFI.GetFont() );
aFnt.SetWeight( WEIGHT_BOLD );
maCertInfoFI.SetFont( aFnt );
maHintNotTrustedFI.SetFont( aFnt );
@@ -166,7 +166,7 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, Certif
maValidDateFI.SetFont( aFnt );
// insert data
- cssu::Reference< dcss::security::XCertificate > xCert = mpDlg->mxCert;
+ cssu::Reference< dcss::security::XCertificate > xCert = mpDlg->mxCert;
maIssuedToFI.SetText( XmlSec::GetContentPart( xCert->getSubjectName() ) );
maIssuedByFI.SetText( XmlSec::GetContentPart( xCert->getIssuerName() ) );
@@ -232,15 +232,15 @@ void CertificateViewerGeneralTP::ActivatePage()
struct Details_UserDatat
{
- String maTxt;
- bool mbFixedWidthFont;
+ String maTxt;
+ bool mbFixedWidthFont;
- inline Details_UserDatat( const String& _rTxt, bool _bFixedWidthFont );
+ inline Details_UserDatat( const String& _rTxt, bool _bFixedWidthFont );
};
inline Details_UserDatat::Details_UserDatat( const String& _rTxt, bool _bFixedWidthFont )
- :maTxt ( _rTxt )
- ,mbFixedWidthFont ( _bFixedWidthFont )
+ :maTxt ( _rTxt )
+ ,mbFixedWidthFont ( _bFixedWidthFont )
{
}
@@ -248,8 +248,8 @@ inline Details_UserDatat::Details_UserDatat( const String& _rTxt, bool _bFixedWi
void CertificateViewerDetailsTP::Clear( void )
{
maElementML.SetText( String() );
- ULONG i = 0;
- SvLBoxEntry* pEntry = maElementsLB.GetEntry( i );
+ ULONG i = 0;
+ SvLBoxEntry* pEntry = maElementsLB.GetEntry( i );
while( pEntry )
{
delete ( Details_UserDatat* ) pEntry->GetUserData();
@@ -263,17 +263,17 @@ void CertificateViewerDetailsTP::Clear( void )
void CertificateViewerDetailsTP::InsertElement( const String& _rField, const String& _rValue,
const String& _rDetails, bool _bFixedWidthFont )
{
- SvLBoxEntry* pEntry = maElementsLB.InsertEntry( _rField );
+ SvLBoxEntry* pEntry = maElementsLB.InsertEntry( _rField );
maElementsLB.SetEntryText( _rValue, pEntry, 1 );
pEntry->SetUserData( ( void* ) new Details_UserDatat( _rDetails, _bFixedWidthFont ) );
}
CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, CertificateViewer* _pDlg )
- :CertificateViewerTP ( _pParent, XMLSEC_RES( RID_XMLSECTP_DETAILS ), _pDlg )
- ,maElementsLB ( this, XMLSEC_RES( LB_ELEMENTS ) )
- ,maElementML ( this, XMLSEC_RES( ML_ELEMENT ) )
- ,maStdFont ( maElementML.GetControlFont() )
- ,maFixedWidthFont ( OutputDevice::GetDefaultFont( DEFAULTFONT_UI_FIXED, LANGUAGE_DONTKNOW, DEFAULTFONT_FLAGS_ONLYONE, this ) )
+ :CertificateViewerTP ( _pParent, XMLSEC_RES( RID_XMLSECTP_DETAILS ), _pDlg )
+ ,maElementsLB ( this, XMLSEC_RES( LB_ELEMENTS ) )
+ ,maElementML ( this, XMLSEC_RES( ML_ELEMENT ) )
+ ,maStdFont ( maElementML.GetControlFont() )
+ ,maFixedWidthFont ( OutputDevice::GetDefaultFont( DEFAULTFONT_UI_FIXED, LANGUAGE_DONTKNOW, DEFAULTFONT_FLAGS_ONLYONE, this ) )
{
WinBits nStyle = maElementsLB.GetStyle();
nStyle &= ~WB_HSCROLL;
@@ -281,30 +281,30 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif
maFixedWidthFont.SetHeight( maStdFont.GetHeight() );
- static long nTabs[] = { 2, 0, 30*CS_LB_WIDTH/100 };
+ static long nTabs[] = { 2, 0, 30*CS_LB_WIDTH/100 };
maElementsLB.SetTabs( &nTabs[ 0 ] );
maElementsLB.InsertHeaderEntry( String( XMLSEC_RES( STR_HEADERBAR ) ) );
// fill list box
Reference< security::XCertificate > xCert = mpDlg->mxCert;
- UINT16 nLineBreak = 16;
- const char* pHexSep = " ";
- String aLBEntry;
- String aDetails;
+ UINT16 nLineBreak = 16;
+ const char* pHexSep = " ";
+ String aLBEntry;
+ String aDetails;
// --> PB 2004-10-11 #i35107# - 0 == "V1", 1 == "V2", ..., n = "V(n+1)"
aLBEntry = String::CreateFromAscii( "V" );
aLBEntry += String::CreateFromInt32( xCert->getVersion() + 1 );
// <--
InsertElement( String( XMLSEC_RES( STR_VERSION ) ), aLBEntry, aLBEntry );
- Sequence< sal_Int8 > aSeq = xCert->getSerialNumber();
+ Sequence< sal_Int8 > aSeq = xCert->getSerialNumber();
aLBEntry = XmlSec::GetHexString( aSeq, pHexSep );
aDetails = XmlSec::GetHexString( aSeq, pHexSep, nLineBreak );
InsertElement( String( XMLSEC_RES( STR_SERIALNUM ) ), aLBEntry, aDetails, true );
- std::pair< ::rtl::OUString, ::rtl::OUString> pairIssuer =
+ std::pair< ::rtl::OUString, ::rtl::OUString> pairIssuer =
XmlSec::GetDNForCertDetailsView(xCert->getIssuerName());
aLBEntry = pairIssuer.first;
- aDetails = pairIssuer.second;
+ aDetails = pairIssuer.second;
InsertElement( String( XMLSEC_RES( STR_ISSUER ) ), aLBEntry, aDetails );
/*
aSeq = xCert->getIssuerUniqueID();
@@ -325,7 +325,7 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif
aLBEntry += GetSettings().GetUILocaleDataWrapper().getTime( aDateTime.GetTime() );
InsertElement( String( XMLSEC_RES( STR_VALIDTO ) ), aLBEntry, aLBEntry );
- std::pair< ::rtl::OUString, ::rtl::OUString > pairSubject =
+ std::pair< ::rtl::OUString, ::rtl::OUString > pairSubject =
XmlSec::GetDNForCertDetailsView(xCert->getSubjectName());
aLBEntry = pairSubject.first;
aDetails = pairSubject.second;
@@ -372,12 +372,12 @@ void CertificateViewerDetailsTP::ActivatePage()
IMPL_LINK( CertificateViewerDetailsTP, ElementSelectHdl, void*, EMPTYARG )
{
- SvLBoxEntry* pEntry = maElementsLB.FirstSelected();
- String aElementText;
- bool bFixedWidthFont;
+ SvLBoxEntry* pEntry = maElementsLB.FirstSelected();
+ String aElementText;
+ bool bFixedWidthFont;
if( pEntry )
{
- const Details_UserDatat* p = ( Details_UserDatat* ) pEntry->GetUserData();
+ const Details_UserDatat* p = ( Details_UserDatat* ) pEntry->GetUserData();
aElementText = p->maTxt;
bFixedWidthFont = p->mbFixedWidthFont;
}
@@ -394,7 +394,7 @@ IMPL_LINK( CertificateViewerDetailsTP, ElementSelectHdl, void*, EMPTYARG )
struct CertPath_UserData
{
cssu::Reference< dcss::security::XCertificate > mxCert;
- String maStatus;
+ String maStatus;
bool mbValid;
CertPath_UserData( cssu::Reference< dcss::security::XCertificate > xCert, bool bValid):
@@ -406,12 +406,12 @@ struct CertPath_UserData
CertificateViewerCertPathTP::CertificateViewerCertPathTP( Window* _pParent, CertificateViewer* _pDlg )
- :CertificateViewerTP ( _pParent, XMLSEC_RES( RID_XMLSECTP_CERTPATH ), _pDlg )
- ,maCertPathFT ( this, XMLSEC_RES( FT_CERTPATH ) )
- ,maCertPathLB ( this, XMLSEC_RES( LB_SIGNATURES ) )
+ :CertificateViewerTP ( _pParent, XMLSEC_RES( RID_XMLSECTP_CERTPATH ), _pDlg )
+ ,maCertPathFT ( this, XMLSEC_RES( FT_CERTPATH ) )
+ ,maCertPathLB ( this, XMLSEC_RES( LB_SIGNATURES ) )
,maViewCertPB ( this, XMLSEC_RES( BTN_VIEWCERT ) )
- ,maCertStatusFT ( this, XMLSEC_RES( FT_CERTSTATUS ) )
- ,maCertStatusML ( this, XMLSEC_RES( ML_CERTSTATUS ) )
+ ,maCertStatusFT ( this, XMLSEC_RES( FT_CERTSTATUS ) )
+ ,maCertStatusML ( this, XMLSEC_RES( ML_CERTSTATUS ) )
,mpParent ( _pDlg )
,mbFirstActivateDone ( false )
,maCertImage ( XMLSEC_RES( IMG_CERT_SMALL ) )
@@ -526,8 +526,8 @@ IMPL_LINK( CertificateViewerCertPathTP, CertSelectHdl, void*, EMPTYARG )
void CertificateViewerCertPathTP::Clear( void )
{
maCertStatusML.SetText( String() );
- ULONG i = 0;
- SvLBoxEntry* pEntry = maCertPathLB.GetEntry( i );
+ ULONG i = 0;
+ SvLBoxEntry* pEntry = maCertPathLB.GetEntry( i );
while( pEntry )
{
delete ( CertPath_UserData* ) pEntry->GetUserData();
diff --git a/xmlsecurity/source/dialogs/certificateviewer.src b/xmlsecurity/source/dialogs/certificateviewer.src
index 3a9466aeb9a8..19f90de45099 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.src
+++ b/xmlsecurity/source/dialogs/certificateviewer.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc
index b30eb9198e32..eb6fd0347e2a 100644
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ b/xmlsecurity/source/dialogs/dialogs.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -31,53 +31,53 @@
#include <svtools/controldims.hrc>
#include <xmlsecurity/global.hrc>
-#define STD_MASKCOLOR Color{Red=0xffff;Green=0x0000;Blue=0xffff;}
+#define STD_MASKCOLOR Color{Red=0xffff;Green=0x0000;Blue=0xffff;}
-#define FL_BOTTOM_SEP 50
-#define BTN_OK 51
-#define BTN_CANCEL 52
-#define BTN_HELP 53
-#define LB_SIGNATURES 54
-#define BTN_VIEWCERT 55
-#define STR_HEADERBAR 56
-#define BTN_RESET 57
+#define FL_BOTTOM_SEP 50
+#define BTN_OK 51
+#define BTN_CANCEL 52
+#define BTN_HELP 53
+#define LB_SIGNATURES 54
+#define BTN_VIEWCERT 55
+#define STR_HEADERBAR 56
+#define BTN_RESET 57
#define STR_VALID_SIGNATURE 58
#define STR_NO_INFO_TO_VERIFY 59
#define STR_INVALID_SIGNATURE 60
// --------- general metrics ---------
-#define DLGS_WIDTH 287
-#define DLGS_HEIGHT 195
+#define DLGS_WIDTH 287
+#define DLGS_HEIGHT 195
// --------- ... for tab dialogs -----
-#define TP_WIDTH 260
-#define TP_HEIGHT 185
-#define RIDDER_HEIGHT (RSC_CD_PUSHBUTTON_HEIGHT)
-#define TD_SP_INNERBORDER_LEFT 3
-#define TD_SP_INNERBORDER_RIGHT 3
-#define TD_SP_INNERBORDER_TOP 3
-#define TD_SP_INNERBORDER_BOTTOM 3
+#define TP_WIDTH 260
+#define TP_HEIGHT 185
+#define RIDDER_HEIGHT (RSC_CD_PUSHBUTTON_HEIGHT)
+#define TD_SP_INNERBORDER_LEFT 3
+#define TD_SP_INNERBORDER_RIGHT 3
+#define TD_SP_INNERBORDER_TOP 3
+#define TD_SP_INNERBORDER_BOTTOM 3
#define TD_WIDTH (TP_WIDTH+RSC_SP_DLG_INNERBORDER_LEFT+RSC_SP_DLG_INNERBORDER_RIGHT)
-#define TD_HEIGHT (TP_HEIGHT+TD_SP_INNERBORDER_TOP+2*TD_SP_INNERBORDER_BOTTOM+RSC_CD_PUSHBUTTON_HEIGHT+RIDDER_HEIGHT)
-
-#define SEP_FL_SPACE_Y 6
-#define SEP_FL_ADJ_Y(val) (val-3)
-#define DLGS_BOTTOM_BTN_L(dlgh) (dlgh-RSC_SP_DLG_INNERBORDER_BOTTOM)
-#define DLGS_BOTTOM_BTN_Y(dlgh) (DLGS_BOTTOM_BTN_L(dlgh)-RSC_CD_PUSHBUTTON_HEIGHT)
-#define DLGS_BOTTOM_FL_Y(dlgh) (DLGS_BOTTOM_BTN_Y(dlgh)-SEP_FL_SPACE_Y-5)
-#define DLGS_BOTTOM_LAST_CTRL_L(dlgh) (DLGS_BOTTOM_BTN_Y(dlgh)-2*SEP_FL_SPACE_Y-3)
-#define DLGS_BOTTOM_HELP_X(dlgw) (dlgw-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH)
-#define DLGS_BOTTOM_CANCEL_X(dlgw) (DLGS_BOTTOM_HELP_X(dlgw)-RSC_SP_CTRL_X-RSC_CD_PUSHBUTTON_WIDTH)
+#define TD_HEIGHT (TP_HEIGHT+TD_SP_INNERBORDER_TOP+2*TD_SP_INNERBORDER_BOTTOM+RSC_CD_PUSHBUTTON_HEIGHT+RIDDER_HEIGHT)
+
+#define SEP_FL_SPACE_Y 6
+#define SEP_FL_ADJ_Y(val) (val-3)
+#define DLGS_BOTTOM_BTN_L(dlgh) (dlgh-RSC_SP_DLG_INNERBORDER_BOTTOM)
+#define DLGS_BOTTOM_BTN_Y(dlgh) (DLGS_BOTTOM_BTN_L(dlgh)-RSC_CD_PUSHBUTTON_HEIGHT)
+#define DLGS_BOTTOM_FL_Y(dlgh) (DLGS_BOTTOM_BTN_Y(dlgh)-SEP_FL_SPACE_Y-5)
+#define DLGS_BOTTOM_LAST_CTRL_L(dlgh) (DLGS_BOTTOM_BTN_Y(dlgh)-2*SEP_FL_SPACE_Y-3)
+#define DLGS_BOTTOM_HELP_X(dlgw) (dlgw-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH)
+#define DLGS_BOTTOM_CANCEL_X(dlgw) (DLGS_BOTTOM_HELP_X(dlgw)-RSC_SP_CTRL_X-RSC_CD_PUSHBUTTON_WIDTH)
#define DLGS_BOTTOM_OK_X(dlgw) (DLGS_BOTTOM_CANCEL_X(dlgw)-RSC_SP_CTRL_DESC_X-RSC_CD_PUSHBUTTON_WIDTH)
// --------- dialog Digital Signatures ---------
-#define BTN_ADDCERT 2
-#define BTN_REMOVECERT 3
-#define FT_HINT_DOC 4
-#define FT_HINT_BASIC 5
-#define FT_HINT_PACK 6
-#define IMG_STATE_VALID 7
-#define FI_STATE_VALID 8
+#define BTN_ADDCERT 2
+#define BTN_REMOVECERT 3
+#define FT_HINT_DOC 4
+#define FT_HINT_BASIC 5
+#define FT_HINT_PACK 6
+#define IMG_STATE_VALID 7
+#define FI_STATE_VALID 8
#define IMG_STATE_BROKEN 9
#define FI_STATE_BROKEN 10
#define IMG_STATE_NOTVALIDATED 11
@@ -87,89 +87,89 @@
#define IMG_STATE_NOTVALIDATED_HC 15
#define FI_STATE_OLDSIGNATURE 16
-//#define DS_WIDTH DLGS_WIDTH
-//#define DS_HEIGHT DLGS_HEIGHT
-#define DS_BTNWIDTH_1 70
-#define DS_BTNSPACE_X RSC_SP_CTRL_X
-#define DS_WIDTH (RSC_SP_DLG_INNERBORDER_LEFT+RSC_SP_DLG_INNERBORDER_RIGHT+2*DS_BTNSPACE_X+3*DS_BTNWIDTH_1)
-#define DS_HEIGHT (DLGS_WIDTH*2/3)
-
-#define DS_COL_0 RSC_SP_DLG_INNERBORDER_LEFT
-//#define DS_COL_MID (DS_WIDTH/2)
-//#define DS_COL_3 (DS_COL_MID-(DS_BTNWIDTH_1/2))
-//#define DS_COL_4 (DS_COL_2+DS_BTNWIDTH_1)
-//#define DS_COL_2 (DS_COL_3-DS_BTNSPACE_X)
-//#define DS_COL_1 (DS_COL_2-DS_BTNWIDTH_1)
-#define DS_COL_1 DS_COL_0
-#define DS_COL_2 (DS_COL_1+DS_BTNWIDTH_1)
-#define DS_COL_3 (DS_COL_2+DS_BTNSPACE_X)
-#define DS_COL_4 (DS_COL_3+DS_BTNWIDTH_1)
-#define DS_COL_5 (DS_COL_4+DS_BTNSPACE_X)
-//#define DS_COL_6 (DS_COL_5+DS_BTNWIDTH_1)
-#define DS_COL_7 (DS_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
-#define DS_COL_6 DS_COL_7
-
-#define DS_ROW_0 RSC_SP_DLG_INNERBORDER_TOP
-#define DS_ROW_1 (DS_ROW_0+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_X)
-#define DS_ROW_7 DLGS_BOTTOM_BTN_L(DS_HEIGHT)
-#define DS_ROW_6 DLGS_BOTTOM_BTN_Y(DS_HEIGHT)
-#define DS_ROW_5 DLGS_BOTTOM_FL_Y(DS_HEIGHT)
-#define DS_ROW_4 DLGS_BOTTOM_LAST_CTRL_L(DS_HEIGHT)
-#define DS_ROW_3 (DS_ROW_4-RSC_CD_PUSHBUTTON_HEIGHT)
-#define DS_ROW_2A (DS_ROW_3-RSC_CD_FIXEDTEXT_HEIGHT-RSC_SP_CTRL_Y)
-#define DS_ROW_2 (DS_ROW_2A-RSC_SP_CTRL_GROUP_Y)
-
-#define DS_LB_WIDTH (DS_COL_7-DS_COL_0)
+//#define DS_WIDTH DLGS_WIDTH
+//#define DS_HEIGHT DLGS_HEIGHT
+#define DS_BTNWIDTH_1 70
+#define DS_BTNSPACE_X RSC_SP_CTRL_X
+#define DS_WIDTH (RSC_SP_DLG_INNERBORDER_LEFT+RSC_SP_DLG_INNERBORDER_RIGHT+2*DS_BTNSPACE_X+3*DS_BTNWIDTH_1)
+#define DS_HEIGHT (DLGS_WIDTH*2/3)
+
+#define DS_COL_0 RSC_SP_DLG_INNERBORDER_LEFT
+//#define DS_COL_MID (DS_WIDTH/2)
+//#define DS_COL_3 (DS_COL_MID-(DS_BTNWIDTH_1/2))
+//#define DS_COL_4 (DS_COL_2+DS_BTNWIDTH_1)
+//#define DS_COL_2 (DS_COL_3-DS_BTNSPACE_X)
+//#define DS_COL_1 (DS_COL_2-DS_BTNWIDTH_1)
+#define DS_COL_1 DS_COL_0
+#define DS_COL_2 (DS_COL_1+DS_BTNWIDTH_1)
+#define DS_COL_3 (DS_COL_2+DS_BTNSPACE_X)
+#define DS_COL_4 (DS_COL_3+DS_BTNWIDTH_1)
+#define DS_COL_5 (DS_COL_4+DS_BTNSPACE_X)
+//#define DS_COL_6 (DS_COL_5+DS_BTNWIDTH_1)
+#define DS_COL_7 (DS_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
+#define DS_COL_6 DS_COL_7
+
+#define DS_ROW_0 RSC_SP_DLG_INNERBORDER_TOP
+#define DS_ROW_1 (DS_ROW_0+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_X)
+#define DS_ROW_7 DLGS_BOTTOM_BTN_L(DS_HEIGHT)
+#define DS_ROW_6 DLGS_BOTTOM_BTN_Y(DS_HEIGHT)
+#define DS_ROW_5 DLGS_BOTTOM_FL_Y(DS_HEIGHT)
+#define DS_ROW_4 DLGS_BOTTOM_LAST_CTRL_L(DS_HEIGHT)
+#define DS_ROW_3 (DS_ROW_4-RSC_CD_PUSHBUTTON_HEIGHT)
+#define DS_ROW_2A (DS_ROW_3-RSC_CD_FIXEDTEXT_HEIGHT-RSC_SP_CTRL_Y)
+#define DS_ROW_2 (DS_ROW_2A-RSC_SP_CTRL_GROUP_Y)
+
+#define DS_LB_WIDTH (DS_COL_7-DS_COL_0)
// --------- dialog Ceritficate chooser ---------
-#define FT_HINT_SELECT 1
+#define FT_HINT_SELECT 1
-#define CS_WIDTH DLGS_WIDTH
-#define CS_HEIGHT DLGS_HEIGHT
-#define CS_BTNWIDTH_1 DS_BTNWIDTH_1
+#define CS_WIDTH DLGS_WIDTH
+#define CS_HEIGHT DLGS_HEIGHT
+#define CS_BTNWIDTH_1 DS_BTNWIDTH_1
-#define CS_COL_0 RSC_SP_DLG_INNERBORDER_LEFT
-#define CS_COL_2 (CS_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
-#define CS_COL_1 (CS_COL_2-CS_BTNWIDTH_1)
+#define CS_COL_0 RSC_SP_DLG_INNERBORDER_LEFT
+#define CS_COL_2 (CS_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
+#define CS_COL_1 (CS_COL_2-CS_BTNWIDTH_1)
-#define CS_ROW_0 RSC_SP_DLG_INNERBORDER_TOP
-#define CS_ROW_1 (CS_ROW_0+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_X)
-#define CS_ROW_4 DLGS_BOTTOM_LAST_CTRL_L(CS_HEIGHT)
-#define CS_ROW_3 (CS_ROW_4-RSC_CD_PUSHBUTTON_HEIGHT)
-#define CS_ROW_2 (CS_ROW_3-RSC_SP_CTRL_Y)
+#define CS_ROW_0 RSC_SP_DLG_INNERBORDER_TOP
+#define CS_ROW_1 (CS_ROW_0+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_X)
+#define CS_ROW_4 DLGS_BOTTOM_LAST_CTRL_L(CS_HEIGHT)
+#define CS_ROW_3 (CS_ROW_4-RSC_CD_PUSHBUTTON_HEIGHT)
+#define CS_ROW_2 (CS_ROW_3-RSC_SP_CTRL_Y)
-#define CS_LB_WIDTH (CS_COL_2-CS_COL_0)
+#define CS_LB_WIDTH (CS_COL_2-CS_COL_0)
// --------- tab dialog Certificate viewer ---------
-#define CV_COL_0 TD_SP_INNERBORDER_LEFT
-#define CV_COL_1 (TP_WIDTH-RSC_SP_TBPG_INNERBORDER_RIGHT)
-#define CV_ROW_0 RSC_SP_TBPG_INNERBORDER_TOP
-#define CV_ROW_3 (TP_HEIGHT-RSC_SP_TBPG_INNERBORDER_BOTTOM)
-#define CV_CONT_WIDTH (CV_COL_1-CV_COL_0)
-#define CV_CONT_HEIGHT (CV_ROW_3-CV_ROW_0)
-#define CV_ROW_1 (CV_ROW_0+2*CV_CONT_HEIGHT/3)
-#define CV_ROW_2 (CV_ROW_1+RSC_SP_CTRL_GROUP_Y)
+#define CV_COL_0 TD_SP_INNERBORDER_LEFT
+#define CV_COL_1 (TP_WIDTH-RSC_SP_TBPG_INNERBORDER_RIGHT)
+#define CV_ROW_0 RSC_SP_TBPG_INNERBORDER_TOP
+#define CV_ROW_3 (TP_HEIGHT-RSC_SP_TBPG_INNERBORDER_BOTTOM)
+#define CV_CONT_WIDTH (CV_COL_1-CV_COL_0)
+#define CV_CONT_HEIGHT (CV_ROW_3-CV_ROW_0)
+#define CV_ROW_1 (CV_ROW_0+2*CV_CONT_HEIGHT/3)
+#define CV_ROW_2 (CV_ROW_1+RSC_SP_CTRL_GROUP_Y)
-#define CV_COL_D (TD_WIDTH-TD_SP_INNERBORDER_RIGHT)
-#define CV_COL_C (CV_COL_D-RSC_CD_PUSHBUTTON_WIDTH)
-#define CV_COL_B (CV_COL_C-RSC_SP_CTRL_X)
-#define CV_COL_A (CV_COL_B-RSC_CD_PUSHBUTTON_WIDTH)
+#define CV_COL_D (TD_WIDTH-TD_SP_INNERBORDER_RIGHT)
+#define CV_COL_C (CV_COL_D-RSC_CD_PUSHBUTTON_WIDTH)
+#define CV_COL_B (CV_COL_C-RSC_SP_CTRL_X)
+#define CV_COL_A (CV_COL_B-RSC_CD_PUSHBUTTON_WIDTH)
-#define CV_ROW_B (TD_HEIGHT-TD_SP_INNERBORDER_BOTTOM)
-#define CV_ROW_A (CV_ROW_B-RSC_CD_PUSHBUTTON_HEIGHT)
+#define CV_ROW_B (TD_HEIGHT-TD_SP_INNERBORDER_BOTTOM)
+#define CV_ROW_A (CV_ROW_B-RSC_CD_PUSHBUTTON_HEIGHT)
// --------- tab page Certificate viewer - General ---------
-#define WIN_FRAME 2
-#define IMG_CERT 3
-#define FI_CERTINFO 4
-#define FL_SEP1 5
-#define FI_HINTNOTTRUST 6
-#define FL_SEP2 7
-#define FI_ISSTOLABEL 8
-#define FI_ISSTO 9
-#define FI_ISSBYLABEL 10
-#define FI_ISSBY 11
+#define WIN_FRAME 2
+#define IMG_CERT 3
+#define FI_CERTINFO 4
+#define FL_SEP1 5
+#define FI_HINTNOTTRUST 6
+#define FL_SEP2 7
+#define FI_ISSTOLABEL 8
+#define FI_ISSTO 9
+#define FI_ISSBYLABEL 10
+#define FI_ISSBY 11
#define FI_VALIDDATE 12
#define IMG_KEY 13
#define FI_CORRPRIVKEY 14
@@ -179,63 +179,63 @@
#define IMG_STATE_NOT_VALIDATED_HC 18
#define IMG_KEY_HC 19
-#define IMG1_WIDTH 33
-#define IMG1_HEIGHT 22
-#define IMG2_WIDTH 20
-#define IMG2_HEIGHT 20
-#define DATE_WIDTH 30
-#define CW_COL_0 (CV_COL_0+RSC_SP_GRP_INNERBORDER_LEFT)
-#define CW_COL_1 (CW_COL_0+RSC_SP_FLGR_SPACE_X)
-#define CW_COL_1a (CW_COL_0+IMG2_WIDTH+1)
-#define CW_COL_2 (CW_COL_0+IMG1_WIDTH)
-#define CW_COL_3 (CW_COL_2+RSC_SP_CTRL_GROUP_X)
-#define CW_COL_4 (CW_COL_1+40)
-#define CW_COL_5 (CV_CONT_WIDTH-RSC_SP_GRP_INNERBORDER_RIGHT)
-#define CW_COL_5a (CW_COL_5-RSC_SP_GRP_INNERBORDER_RIGHT)
-#define CW_COL_4a (CW_COL_1+38)
-#define CW_COL_4b (CW_COL_4a+DATE_WIDTH)
-#define CW_COL_4c (CW_COL_4b+3)
-#define CW_COL_4d (CW_COL_4c+8)
-#define CW_COL_4e (CW_COL_4d+3)
-#define CW_ROW_0 (CV_ROW_0+RSC_SP_GRP_INNERBORDER_TOP)
-#define CW_ROW_1 (CW_ROW_0+RSC_SP_GRP_INNERBORDER_TOP)
-#define CW_ROW_2 (CW_ROW_0+IMG1_HEIGHT)
-#define CW_ROW_3 (CW_ROW_2+3)
-#define CW_ROW_4 (CW_ROW_3+RSC_SP_CTRL_Y+RSC_CD_FIXEDLINE_HEIGHT)
-#define CW_ROW_4a (CW_ROW_4+35)
-#define CW_ROW_5 (CW_ROW_4a+3)
-#define CW_ROW_6 (CW_ROW_5+RSC_SP_CTRL_Y+RSC_CD_FIXEDLINE_HEIGHT)
-#define CW_ROW_7 (CW_ROW_6+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT)
-#define CW_ROW_8 (CW_ROW_7+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT)
-#define CW_ROW_9 (CW_ROW_8+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT)
-#define CW_ROW_10 (CW_ROW_9+2)
-#define CW_ROW_11 (CW_ROW_9+IMG2_HEIGHT)
+#define IMG1_WIDTH 33
+#define IMG1_HEIGHT 22
+#define IMG2_WIDTH 20
+#define IMG2_HEIGHT 20
+#define DATE_WIDTH 30
+#define CW_COL_0 (CV_COL_0+RSC_SP_GRP_INNERBORDER_LEFT)
+#define CW_COL_1 (CW_COL_0+RSC_SP_FLGR_SPACE_X)
+#define CW_COL_1a (CW_COL_0+IMG2_WIDTH+1)
+#define CW_COL_2 (CW_COL_0+IMG1_WIDTH)
+#define CW_COL_3 (CW_COL_2+RSC_SP_CTRL_GROUP_X)
+#define CW_COL_4 (CW_COL_1+40)
+#define CW_COL_5 (CV_CONT_WIDTH-RSC_SP_GRP_INNERBORDER_RIGHT)
+#define CW_COL_5a (CW_COL_5-RSC_SP_GRP_INNERBORDER_RIGHT)
+#define CW_COL_4a (CW_COL_1+38)
+#define CW_COL_4b (CW_COL_4a+DATE_WIDTH)
+#define CW_COL_4c (CW_COL_4b+3)
+#define CW_COL_4d (CW_COL_4c+8)
+#define CW_COL_4e (CW_COL_4d+3)
+#define CW_ROW_0 (CV_ROW_0+RSC_SP_GRP_INNERBORDER_TOP)
+#define CW_ROW_1 (CW_ROW_0+RSC_SP_GRP_INNERBORDER_TOP)
+#define CW_ROW_2 (CW_ROW_0+IMG1_HEIGHT)
+#define CW_ROW_3 (CW_ROW_2+3)
+#define CW_ROW_4 (CW_ROW_3+RSC_SP_CTRL_Y+RSC_CD_FIXEDLINE_HEIGHT)
+#define CW_ROW_4a (CW_ROW_4+35)
+#define CW_ROW_5 (CW_ROW_4a+3)
+#define CW_ROW_6 (CW_ROW_5+RSC_SP_CTRL_Y+RSC_CD_FIXEDLINE_HEIGHT)
+#define CW_ROW_7 (CW_ROW_6+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT)
+#define CW_ROW_8 (CW_ROW_7+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT)
+#define CW_ROW_9 (CW_ROW_8+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT)
+#define CW_ROW_10 (CW_ROW_9+2)
+#define CW_ROW_11 (CW_ROW_9+IMG2_HEIGHT)
// --------- tab page Certificate viewer - Details ---------
-#define LB_ELEMENTS 1
-#define ML_ELEMENT 2
-
-#define STR_VERSION 1
-#define STR_SERIALNUM 2
-#define STR_SIGALGORITHM 3
-#define STR_ISSUER 4
-#define STR_ISSUER_ID 5
-#define STR_VALIDFROM 6
-#define STR_VALIDTO 7
-#define STR_SUBJECT 8
-#define STR_SUBJECT_ID 9
-#define STR_SUBJECT_PUBKEY_ALGO 10
-#define STR_SUBJECT_PUBKEY_VAL 11
-#define STR_SIGNATURE_ALGO 12
-#define STR_THUMBPRINT_SHA1 13
-#define STR_THUMBPRINT_MD5 14
+#define LB_ELEMENTS 1
+#define ML_ELEMENT 2
+
+#define STR_VERSION 1
+#define STR_SERIALNUM 2
+#define STR_SIGALGORITHM 3
+#define STR_ISSUER 4
+#define STR_ISSUER_ID 5
+#define STR_VALIDFROM 6
+#define STR_VALIDTO 7
+#define STR_SUBJECT 8
+#define STR_SUBJECT_ID 9
+#define STR_SUBJECT_PUBKEY_ALGO 10
+#define STR_SUBJECT_PUBKEY_VAL 11
+#define STR_SIGNATURE_ALGO 12
+#define STR_THUMBPRINT_SHA1 13
+#define STR_THUMBPRINT_MD5 14
// --------- tab page Certificate viewer - Certification Path ---------
-#define FT_CERTPATH 1
-#define FT_CERTSTATUS 2
-#define ML_CERTSTATUS 3
+#define FT_CERTPATH 1
+#define FT_CERTSTATUS 2
+#define ML_CERTSTATUS 3
#define IMG_CERT_SMALL 4
#define IMG_CERT_SMALL_HC 5
#define IMG_CERT_NOTVALIDATED_SMALL 6
@@ -256,30 +256,30 @@
// --------- tab dialog macro security ---------
#define MS_COL_A (TD_WIDTH-RSC_SP_DLG_INNERBORDER_LEFT)
-#define MS_COL_B (MS_COL_A-RSC_CD_PUSHBUTTON_WIDTH)
-#define MS_COL_C (MS_COL_B-RSC_SP_CTRL_X)
-#define MS_COL_D (MS_COL_C-RSC_CD_PUSHBUTTON_WIDTH)
-#define MS_COL_E (MS_COL_D-RSC_SP_CTRL_X)
-#define MS_COL_F (MS_COL_E-RSC_CD_PUSHBUTTON_WIDTH)
-#define MS_COL_G (MS_COL_F-RSC_SP_CTRL_X)
-#define MS_COL_H (MS_COL_G-RSC_CD_PUSHBUTTON_WIDTH)
+#define MS_COL_B (MS_COL_A-RSC_CD_PUSHBUTTON_WIDTH)
+#define MS_COL_C (MS_COL_B-RSC_SP_CTRL_X)
+#define MS_COL_D (MS_COL_C-RSC_CD_PUSHBUTTON_WIDTH)
+#define MS_COL_E (MS_COL_D-RSC_SP_CTRL_X)
+#define MS_COL_F (MS_COL_E-RSC_CD_PUSHBUTTON_WIDTH)
+#define MS_COL_G (MS_COL_F-RSC_SP_CTRL_X)
+#define MS_COL_H (MS_COL_G-RSC_CD_PUSHBUTTON_WIDTH)
// --------- tab page security level ---------
-#define FL_SECLEVEL 1
-#define RB_VERYHIGH 2
-#define RB_HIGH 3
-#define RB_MEDIUM 4
-#define RB_LOW 5
+#define FL_SECLEVEL 1
+#define RB_VERYHIGH 2
+#define RB_HIGH 3
+#define RB_MEDIUM 4
+#define RB_LOW 5
#define FI_SEC_READONLY 6
#define RSC_BIG_RADIOBUTTON 40
#define SL_RB_DIST_Y (RSC_SP_FLGR_SPACE_Y+RSC_BIG_RADIOBUTTON)
#define SL_COL_0 RSC_SP_TBPG_INNERBORDER_LEFT
-#define SL_COL_1 (SL_COL_0+RSC_SP_FLGR_SPACE_X)
-#define SL_COL_3 (TP_WIDTH-RSC_SP_TBPG_INNERBORDER_RIGHT)
+#define SL_COL_1 (SL_COL_0+RSC_SP_FLGR_SPACE_X)
+#define SL_COL_3 (TP_WIDTH-RSC_SP_TBPG_INNERBORDER_RIGHT)
#define SL_COL_2 ((SL_COL_3-SL_COL_1)*100/105)
-#define SL_ROW_0 RSC_SP_TBPG_INNERBORDER_TOP
+#define SL_ROW_0 RSC_SP_TBPG_INNERBORDER_TOP
#define SL_ROW_1 (SL_ROW_0+SL_RB_DIST_Y)
#define SL_ROW_2 (SL_ROW_1+SL_RB_DIST_Y)
#define SL_ROW_3 (SL_ROW_2+SL_RB_DIST_Y)
@@ -287,28 +287,28 @@
// --------- tab page trusted sources ---------
-#define FL_TRUSTCERT 1
-#define LB_TRUSTCERT 2
-#define PB_ADD_TRUSTCERT 3
-#define PB_VIEW_TRUSTCERT 4
-#define PB_REMOVE_TRUSTCERT 5
-#define FL_TRUSTFILELOC 6
-#define FI_TRUSTFILELOC 7
-#define LB_TRUSTFILELOC 8
-#define FL_ADD_TRUSTFILELOC 9
-#define FL_REMOVE_TRUSTFILELOC 10
+#define FL_TRUSTCERT 1
+#define LB_TRUSTCERT 2
+#define PB_ADD_TRUSTCERT 3
+#define PB_VIEW_TRUSTCERT 4
+#define PB_REMOVE_TRUSTCERT 5
+#define FL_TRUSTFILELOC 6
+#define FI_TRUSTFILELOC 7
+#define LB_TRUSTFILELOC 8
+#define FL_ADD_TRUSTFILELOC 9
+#define FL_REMOVE_TRUSTFILELOC 10
#define FI_TRUSTCERT_RO 11
#define FI_TRUSTFILE_RO 12
#define TS_COL_0 RSC_SP_TBPG_INNERBORDER_LEFT
-#define TS_COL_1 (TS_COL_0+RSC_SP_FLGR_SPACE_X)
+#define TS_COL_1 (TS_COL_0+RSC_SP_FLGR_SPACE_X)
#define TS_COL_8 (TP_WIDTH-RSC_SP_TBPG_INNERBORDER_RIGHT)
#define TS_COL_7 (TS_COL_8-RSC_SP_FLGR_SPACE_X)
#define TS_COL_6 (TS_COL_7-RSC_CD_PUSHBUTTON_WIDTH)
-#define TS_COL_5 (TS_COL_6-RSC_SP_CTRL_GROUP_X)
-#define TS_COL_4 (TS_COL_5-RSC_CD_PUSHBUTTON_WIDTH)
-#define TS_COL_3 (TS_COL_4-RSC_SP_CTRL_GROUP_X)
-#define TS_COL_2 (TS_COL_3-RSC_CD_PUSHBUTTON_WIDTH)
+#define TS_COL_5 (TS_COL_6-RSC_SP_CTRL_GROUP_X)
+#define TS_COL_4 (TS_COL_5-RSC_CD_PUSHBUTTON_WIDTH)
+#define TS_COL_3 (TS_COL_4-RSC_SP_CTRL_GROUP_X)
+#define TS_COL_2 (TS_COL_3-RSC_CD_PUSHBUTTON_WIDTH)
#define RSC_CD_TABLISTBOX_HEIGHT 6*RSC_BS_CHARHEIGHT
#define TS_ROW_0 RSC_SP_TBPG_INNERBORDER_TOP
@@ -324,37 +324,37 @@
// --------- 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)
+#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
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 03abc233ab3b..301952ed9077 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -71,7 +71,7 @@
/* HACK: disable some warnings for MS-C */
#ifdef _MSC_VER
-#pragma warning (disable : 4355) // 4355: this used in initializer-list
+#pragma warning (disable : 4355) // 4355: this used in initializer-list
#endif
using namespace ::com::sun::star::security;
@@ -80,12 +80,12 @@ using namespace ::com::sun::star;
namespace css = ::com::sun::star;
using ::rtl::OUString;
-namespace
+namespace
{
class SaveODFItem: public utl::ConfigItem
{
sal_Int16 m_nODF;
- public:
+ public:
virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
SaveODFItem();
@@ -180,31 +180,31 @@ bool DigitalSignaturesDialog::isXML(const rtl::OUString& rURI )
return bIsXML;
}
-DigitalSignaturesDialog::DigitalSignaturesDialog(
- Window* pParent,
- uno::Reference< uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
+DigitalSignaturesDialog::DigitalSignaturesDialog(
+ Window* pParent,
+ uno::Reference< uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
sal_Bool bReadOnly, const ::rtl::OUString& sODFVersion, bool bHasDocumentSignature)
- :ModalDialog ( pParent, XMLSEC_RES( RID_XMLSECDLG_DIGSIG ) )
- ,mxCtx ( rxCtx )
- ,maSignatureHelper ( rxCtx )
- ,meSignatureMode ( eMode )
- ,maHintDocFT ( this, XMLSEC_RES( FT_HINT_DOC ) )
- ,maHintBasicFT ( this, XMLSEC_RES( FT_HINT_BASIC ) )
- ,maHintPackageFT ( this, XMLSEC_RES( FT_HINT_PACK ) )
- ,maSignaturesLB ( this, XMLSEC_RES( LB_SIGNATURES ) )
- ,maSigsValidImg ( this, XMLSEC_RES( IMG_STATE_VALID ) )
- ,maSigsValidFI ( this, XMLSEC_RES( FI_STATE_VALID ) )
- ,maSigsInvalidImg ( this, XMLSEC_RES( IMG_STATE_BROKEN ) )
+ :ModalDialog ( pParent, XMLSEC_RES( RID_XMLSECDLG_DIGSIG ) )
+ ,mxCtx ( rxCtx )
+ ,maSignatureHelper ( rxCtx )
+ ,meSignatureMode ( eMode )
+ ,maHintDocFT ( this, XMLSEC_RES( FT_HINT_DOC ) )
+ ,maHintBasicFT ( this, XMLSEC_RES( FT_HINT_BASIC ) )
+ ,maHintPackageFT ( this, XMLSEC_RES( FT_HINT_PACK ) )
+ ,maSignaturesLB ( this, XMLSEC_RES( LB_SIGNATURES ) )
+ ,maSigsValidImg ( this, XMLSEC_RES( IMG_STATE_VALID ) )
+ ,maSigsValidFI ( this, XMLSEC_RES( FI_STATE_VALID ) )
+ ,maSigsInvalidImg ( this, XMLSEC_RES( IMG_STATE_BROKEN ) )
,maSigsInvalidFI ( this, XMLSEC_RES( FI_STATE_BROKEN ) )
,maSigsNotvalidatedImg( this, XMLSEC_RES( IMG_STATE_NOTVALIDATED ) )
,maSigsNotvalidatedFI ( this, XMLSEC_RES( FI_STATE_NOTVALIDATED ) )
,maSigsOldSignatureFI ( this, XMLSEC_RES( FI_STATE_OLDSIGNATURE) )
,maViewBtn ( this, XMLSEC_RES( BTN_VIEWCERT ) )
- ,maAddBtn ( this, XMLSEC_RES( BTN_ADDCERT ) )
- ,maRemoveBtn ( this, XMLSEC_RES( BTN_REMOVECERT ) )
- ,maBottomSepFL ( this, XMLSEC_RES( FL_BOTTOM_SEP ) )
- ,maOKBtn ( this, XMLSEC_RES( BTN_OK ) )
- ,maHelpBtn ( this, XMLSEC_RES( BTN_HELP ) )
+ ,maAddBtn ( this, XMLSEC_RES( BTN_ADDCERT ) )
+ ,maRemoveBtn ( this, XMLSEC_RES( BTN_REMOVECERT ) )
+ ,maBottomSepFL ( this, XMLSEC_RES( FL_BOTTOM_SEP ) )
+ ,maOKBtn ( this, XMLSEC_RES( BTN_OK ) )
+ ,maHelpBtn ( this, XMLSEC_RES( BTN_HELP ) )
,m_sODFVersion (sODFVersion)
,m_bHasDocumentSignature(bHasDocumentSignature)
,m_bWarningShowSignMacro(false)
@@ -251,9 +251,9 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
switch( meSignatureMode )
{
- case SignatureModeDocumentContent: maHintDocFT.Show(); break;
- case SignatureModeMacros: maHintBasicFT.Show(); break;
- case SignatureModePackage: maHintPackageFT.Show(); break;
+ case SignatureModeDocumentContent: maHintDocFT.Show(); break;
+ case SignatureModeMacros: maHintBasicFT.Show(); break;
+ case SignatureModePackage: maHintPackageFT.Show(); break;
}
// adjust fixed text to images
@@ -285,17 +285,17 @@ void DigitalSignaturesDialog::SetStorage( const com::sun::star::uno::Reference <
{
mxStore = rxStore;
maSignatureHelper.SetStorage( mxStore, m_sODFVersion);
-
+
Reference < css::packages::manifest::XManifestReader > xReader(
mxCtx->getServiceManager()->createInstanceWithContext(
OUSTR("com.sun.star.packages.manifest.ManifestReader"), mxCtx), UNO_QUERY_THROW);
//Get the manifest.xml
- Reference < css::embed::XStorage > xSubStore(rxStore->openStorageElement(
+ Reference < css::embed::XStorage > xSubStore(rxStore->openStorageElement(
OUSTR("META-INF"), css::embed::ElementModes::READ), UNO_QUERY_THROW);
Reference< css::io::XInputStream > xStream(
- xSubStore->openStreamElement(OUSTR("manifest.xml"), css::embed::ElementModes::READ),
+ xSubStore->openStreamElement(OUSTR("manifest.xml"), css::embed::ElementModes::READ),
UNO_QUERY_THROW);
m_manifest = xReader->readManifestSequence(xStream);
@@ -314,7 +314,7 @@ bool DigitalSignaturesDialog::canAddRemove()
bool bDoc1_1 = DocumentSignatureHelper::isODFPre_1_2(m_sODFVersion);
SaveODFItem item;
bool bSave1_1 = item.isLessODF1_2();
-
+
// see specification
//cvs: specs/www/appwide/security/Electronic_Signatures_and_Security.sxw
//Paragraph 'Behavior with regard to ODF 1.2'
@@ -325,9 +325,9 @@ bool DigitalSignaturesDialog::canAddRemove()
ErrorBox err(NULL, XMLSEC_RES(RID_XMLSECDLG_OLD_ODF_FORMAT));
err.Execute();
ret = false;
- }
+ }
- //As of OOo 3.2 the document signature includes in macrosignatures.xml. That is
+ //As of OOo 3.2 the document signature includes in macrosignatures.xml. That is
//adding a macro signature will break an existing document signature.
//The sfx2 will remove the documentsignature when the user adds a macro signature
if (meSignatureMode == SignatureModeMacros
@@ -336,7 +336,7 @@ bool DigitalSignaturesDialog::canAddRemove()
if (m_bHasDocumentSignature && !m_bWarningShowSignMacro)
{
//The warning says that the document signatures will be removed if the user
- //continues. He can then either press 'OK' or 'NO'
+ //continues. He can then either press 'OK' or 'NO'
//It the user presses 'Add' or 'Remove' several times then, then the warning
//is shown every time until the user presses 'OK'. From then on, the warning
//is not displayed anymore as long as the signatures dialog is alive.
@@ -349,7 +349,7 @@ bool DigitalSignaturesDialog::canAddRemove()
}
}
return ret;
-}
+}
bool DigitalSignaturesDialog::canAdd()
{
@@ -392,16 +392,16 @@ IMPL_LINK( DigitalSignaturesDialog, SignatureHighlightHdl, void*, EMPTYARG )
IMPL_LINK( DigitalSignaturesDialog, OKButtonHdl, void*, EMPTYARG )
{
// Export all other signatures...
- SignatureStreamHelper aStreamHelper = ImplOpenSignatureStream(
+ SignatureStreamHelper aStreamHelper = ImplOpenSignatureStream(
embed::ElementModes::WRITE|embed::ElementModes::TRUNCATE, false );
- uno::Reference< io::XOutputStream > xOutputStream(
+ uno::Reference< io::XOutputStream > xOutputStream(
aStreamHelper.xSignatureStream, uno::UNO_QUERY );
- uno::Reference< com::sun::star::xml::sax::XDocumentHandler> xDocumentHandler =
+ uno::Reference< com::sun::star::xml::sax::XDocumentHandler> xDocumentHandler =
maSignatureHelper.CreateDocumentHandlerWithHeader( xOutputStream );
int nInfos = maCurrentSignatureInformations.size();
for( int n = 0 ; n < nInfos ; ++n )
- maSignatureHelper.ExportSignature(
+ maSignatureHelper.ExportSignature(
xDocumentHandler, maCurrentSignatureInformations[ n ] );
maSignatureHelper.CloseDocumentHandler( xDocumentHandler);
@@ -409,10 +409,10 @@ IMPL_LINK( DigitalSignaturesDialog, OKButtonHdl, void*, EMPTYARG )
// If stream was not provided, we are responsible for committing it....
if ( !mxSignatureStream.is() )
{
- uno::Reference< embed::XTransactedObject > xTrans(
+ uno::Reference< embed::XTransactedObject > xTrans(
aStreamHelper.xSignatureStorage, uno::UNO_QUERY );
xTrans->commit();
- }
+ }
EndDialog(RET_OK);
return 0;
@@ -438,7 +438,7 @@ IMPL_LINK( DigitalSignaturesDialog, AddButtonHdl, Button*, EMPTYARG )
{
uno::Reference<com::sun::star::xml::crypto::XSecurityEnvironment> xSecEnv = maSignatureHelper.GetSecurityEnvironment();
- uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter =
+ uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter =
::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
CertificateChooser aChooser( this, mxCtx, xSecEnv, maCurrentSignatureInformations );
if ( aChooser.Execute() == RET_OK )
@@ -462,13 +462,13 @@ IMPL_LINK( DigitalSignaturesDialog, AddButtonHdl, Button*, EMPTYARG )
rtl::OUStringBuffer aStrBuffer;
SvXMLUnitConverter::encodeBase64(aStrBuffer, xCert->getEncoded());
-
+
maSignatureHelper.SetX509Certificate( nSecurityId,
- xCert->getIssuerName(), aCertSerial,
+ xCert->getIssuerName(), aCertSerial,
aStrBuffer.makeStringAndClear());
- std::vector< rtl::OUString > aElements =
- DocumentSignatureHelper::CreateElementList(
+ std::vector< rtl::OUString > aElements =
+ DocumentSignatureHelper::CreateElementList(
mxStore, rtl::OUString(), meSignatureMode, OOo3_2Document);
sal_Int32 nElements = aElements.size();
@@ -480,16 +480,16 @@ IMPL_LINK( DigitalSignaturesDialog, AddButtonHdl, Button*, EMPTYARG )
maSignatureHelper.SetDateTime( nSecurityId, Date(), Time() );
- // We open a signature stream in which the existing and the new
+ // We open a signature stream in which the existing and the new
//signature is written. ImplGetSignatureInformation (later in this function) will
//then read the stream an will fill maCurrentSignatureInformations. The final signature
- //is written when the user presses OK. Then only maCurrentSignatureInformation and
+ //is written when the user presses OK. Then only maCurrentSignatureInformation and
//a sax writer are used to write the information.
SignatureStreamHelper aStreamHelper = ImplOpenSignatureStream(
css::embed::ElementModes::WRITE|css::embed::ElementModes::TRUNCATE, true);
- Reference< css::io::XOutputStream > xOutputStream(
+ Reference< css::io::XOutputStream > xOutputStream(
aStreamHelper.xSignatureStream, UNO_QUERY_THROW);
- Reference< css::xml::sax::XDocumentHandler> xDocumentHandler =
+ Reference< css::xml::sax::XDocumentHandler> xDocumentHandler =
maSignatureHelper.CreateDocumentHandlerWithHeader( xOutputStream );
// Export old signatures...
@@ -505,8 +505,8 @@ IMPL_LINK( DigitalSignaturesDialog, AddButtonHdl, Button*, EMPTYARG )
maSignatureHelper.EndMission();
- aStreamHelper = SignatureStreamHelper(); // release objects...
-
+ aStreamHelper = SignatureStreamHelper(); // release objects...
+
mbSignaturesChanged = true;
sal_Int32 nStatus = maSignatureHelper.GetSignatureInformation( nSecurityId ).nStatus;
@@ -550,9 +550,9 @@ IMPL_LINK( DigitalSignaturesDialog, RemoveButtonHdl, Button*, EMPTYARG )
// Export all other signatures...
SignatureStreamHelper aStreamHelper = ImplOpenSignatureStream(
css::embed::ElementModes::WRITE | css::embed::ElementModes::TRUNCATE, true);
- Reference< css::io::XOutputStream > xOutputStream(
+ Reference< css::io::XOutputStream > xOutputStream(
aStreamHelper.xSignatureStream, UNO_QUERY_THROW);
- Reference< css::xml::sax::XDocumentHandler> xDocumentHandler =
+ Reference< css::xml::sax::XDocumentHandler> xDocumentHandler =
maSignatureHelper.CreateDocumentHandlerWithHeader( xOutputStream );
int nInfos = maCurrentSignatureInformations.size();
@@ -563,7 +563,7 @@ IMPL_LINK( DigitalSignaturesDialog, RemoveButtonHdl, Button*, EMPTYARG )
mbSignaturesChanged = true;
- aStreamHelper = SignatureStreamHelper(); // release objects...
+ aStreamHelper = SignatureStreamHelper(); // release objects...
ImplFillSignaturesBox();
}
@@ -589,7 +589,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
maSignaturesLB.Clear();
uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecEnv = maSignatureHelper.GetSecurityEnvironment();
- uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter =
+ uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter =
::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
uno::Reference< ::com::sun::star::security::XCertificate > xCert;
@@ -605,8 +605,8 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
{
DocumentSignatureAlgorithm mode = DocumentSignatureHelper::getDocumentAlgorithm(
m_sODFVersion, maCurrentSignatureInformations[n]);
- std::vector< rtl::OUString > aElementsToBeVerified =
- DocumentSignatureHelper::CreateElementList(
+ std::vector< rtl::OUString > aElementsToBeVerified =
+ DocumentSignatureHelper::CreateElementList(
mxStore, ::rtl::OUString(), meSignatureMode, mode);
const SignatureInformation& rInfo = maCurrentSignatureInformations[n];
@@ -622,7 +622,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
//to find out if the X509IssuerName was modified does not work. See #i62684
DBG_ASSERT(sal_False, "Could not find embedded certificate!");
}
-
+
//In case there is no embedded certificate we try to get it from a local store
//Todo: This probably could be removed, see above.
if (!xCert.is())
@@ -630,9 +630,9 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
DBG_ASSERT( xCert.is(), "Certificate not found and can't be created!" );
- String aSubject;
- String aIssuer;
- String aDateTimeStr;
+ String aSubject;
+ String aIssuer;
+ String aDateTimeStr;
bool bSigValid = false;
bool bCertValid = false;
@@ -642,7 +642,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
try {
sal_Int32 certResult = xSecEnv->verifyCertificate(xCert,
Sequence<css::uno::Reference<css::security::XCertificate> >());
-
+
bCertValid = certResult == css::security::CertificateValidity::VALID ? true : false;
if ( bCertValid )
nValidCerts++;
@@ -667,7 +667,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
if( bSigValid )
nValidSigs++;
}
-
+
Image aImage;
if (!bSigValid)
{
@@ -679,7 +679,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
}
//Check if the signature is a "old" document signature, that is, which was created
//by an version of OOo previous to 3.2
- else if (meSignatureMode == SignatureModeDocumentContent
+ else if (meSignatureMode == SignatureModeDocumentContent
&& bSigValid && bCertValid && !DocumentSignatureHelper::isOOo3_2_Signature(
maCurrentSignatureInformations[n]))
{
@@ -697,19 +697,19 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
{
aImage = aImage = maSigsValidImg.GetImage();
}
-
+
SvLBoxEntry* pEntry = maSignaturesLB.InsertEntry( aNullStr, aImage, aImage );
maSignaturesLB.SetEntryText( aSubject, pEntry, 1 );
maSignaturesLB.SetEntryText( aIssuer, pEntry, 2 );
maSignaturesLB.SetEntryText( aDateTimeStr, pEntry, 3 );
- pEntry->SetUserData( ( void* ) n ); // missuse user data as index
+ pEntry->SetUserData( ( void* ) n ); // missuse user data as index
}
}
bool bAllSigsValid = (nValidSigs == nInfos);
bool bAllCertsValid = (nValidCerts == nInfos);
bool bShowValidState = nInfos && (bAllSigsValid && bAllCertsValid && bAllNewSignatures);
-
+
bool bShowNotValidatedState = nInfos && (bAllSigsValid && (!bAllCertsValid || !bAllNewSignatures));
bool bShowInvalidState = nInfos && !bAllSigsValid;
@@ -754,10 +754,10 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails()
if( maSignaturesLB.FirstSelected() )
{
USHORT nSelected = (USHORT) (sal_uIntPtr) maSignaturesLB.FirstSelected()->GetUserData();
- const SignatureInformation& rInfo = maCurrentSignatureInformations[ nSelected ];
+ const SignatureInformation& rInfo = maCurrentSignatureInformations[ nSelected ];
css::uno::Reference<css::xml::crypto::XSecurityEnvironment > xSecEnv =
maSignatureHelper.GetSecurityEnvironment();
- css::uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter =
+ css::uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter =
::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
// Use Certificate from doc, not from key store
uno::Reference< dcss::security::XCertificate > xCert;
@@ -780,7 +780,7 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails()
//signature stream is used.
//Everytime the user presses Add a new temporary stream is created.
//We keep the temporary stream as member because ImplGetSignatureInformations
-//will later access the stream to create DocumentSignatureInformation objects
+//will later access the stream to create DocumentSignatureInformation objects
//which are stored in maCurrentSignatureInformations.
SignatureStreamHelper DigitalSignaturesDialog::ImplOpenSignatureStream(
sal_Int32 nStreamOpenMode, bool bTempStream)
@@ -791,7 +791,7 @@ SignatureStreamHelper DigitalSignaturesDialog::ImplOpenSignatureStream(
if (nStreamOpenMode & css::embed::ElementModes::TRUNCATE)
{
//We write always into a new temporary stream.
- mxTempSignatureStream = Reference < css::io::XStream >(
+ mxTempSignatureStream = Reference < css::io::XStream >(
mxCtx->getServiceManager()->createInstanceWithContext(
OUSTR( "com.sun.star.io.TempFile" ), mxCtx) ,
UNO_QUERY_THROW);
@@ -799,7 +799,7 @@ SignatureStreamHelper DigitalSignaturesDialog::ImplOpenSignatureStream(
}
else
{
- //When we read from the temp stream, then we must have previously
+ //When we read from the temp stream, then we must have previously
//created one.
OSL_ASSERT(mxTempSignatureStream.is());
}
@@ -813,7 +813,7 @@ SignatureStreamHelper DigitalSignaturesDialog::ImplOpenSignatureStream(
//We may not have a dedicated stream for writing the signature
//So we take one directly from the storage
//Or DocumentDigitalSignatures::showDocumentContentSignatures was called,
- //in which case Add/Remove is not allowed. This is done, for example, if the
+ //in which case Add/Remove is not allowed. This is done, for example, if the
//document is readonly
aHelper = DocumentSignatureHelper::OpenSignatureStream(
mxStore, nStreamOpenMode, meSignatureMode );
@@ -826,7 +826,7 @@ SignatureStreamHelper DigitalSignaturesDialog::ImplOpenSignatureStream(
if (nStreamOpenMode & css::embed::ElementModes::TRUNCATE)
{
- css::uno::Reference < css::io::XTruncate > xTruncate(
+ css::uno::Reference < css::io::XTruncate > xTruncate(
aHelper.xSignatureStream, UNO_QUERY_THROW);
DBG_ASSERT( xTruncate.is(), "ImplOpenSignatureStream - Stream does not support xTruncate!" );
xTruncate->truncate();
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
index d63b44834f2c..98cb51782d97 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
index 87d2de520103..fcdc60bee5f4 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -85,7 +85,7 @@ ModalDialog RID_XMLSECDLG_DIGSIG
{
Text [ en-US ] = "The signatures in this document are invalid";
};
-
+
FixedImage IMG_STATE_VALID
{
Pos = MAP_APPFONT( 6, 127 );
@@ -200,7 +200,7 @@ ErrorBox RID_XMLSECDLG_OLD_ODF_FORMAT
{
Buttons = WB_OK ;
DefButton = WB_DEF_OK ;
- Message [ en-US ] =
+ Message [ en-US ] =
"This document contains signatures in ODF 1.1 (OpenOffice.org 2.x) format. "
"Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format version. "
"Thus no signatures can be added or removed to this document.\n\n"
diff --git a/xmlsecurity/source/dialogs/helpids.hrc b/xmlsecurity/source/dialogs/helpids.hrc
index 6456dddb47b9..4b0329de3eb3 100644
--- a/xmlsecurity/source/dialogs/helpids.hrc
+++ b/xmlsecurity/source/dialogs/helpids.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index e9474b4b957b..3bacce05c045 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -57,7 +57,7 @@
/* HACK: disable some warnings for MS-C */
#ifdef _MSC_VER
-#pragma warning (disable : 4355) // 4355: this used in initializer-list
+#pragma warning (disable : 4355) // 4355: this used in initializer-list
#endif
using namespace ::com::sun::star;
@@ -74,12 +74,12 @@ IMPL_LINK( MacroSecurity, OkBtnHdl, void*, EMPTYARG )
}
MacroSecurity::MacroSecurity( Window* _pParent, const cssu::Reference< cssu::XComponentContext> &_rxCtx, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment )
- :TabDialog ( _pParent, XMLSEC_RES( RID_XMLSECTP_MACROSEC ) )
- ,maTabCtrl ( this, XMLSEC_RES( 1 ) )
- ,maOkBtn ( this, XMLSEC_RES( BTN_OK ) )
- ,maCancelBtn ( this, XMLSEC_RES( BTN_CANCEL ) )
- ,maHelpBtn ( this, XMLSEC_RES( BTN_HELP ) )
- ,maResetBtn ( this, XMLSEC_RES( BTN_RESET ) )
+ :TabDialog ( _pParent, XMLSEC_RES( RID_XMLSECTP_MACROSEC ) )
+ ,maTabCtrl ( this, XMLSEC_RES( 1 ) )
+ ,maOkBtn ( this, XMLSEC_RES( BTN_OK ) )
+ ,maCancelBtn ( this, XMLSEC_RES( BTN_CANCEL ) )
+ ,maHelpBtn ( this, XMLSEC_RES( BTN_HELP ) )
+ ,maResetBtn ( this, XMLSEC_RES( BTN_RESET ) )
{
FreeResource();
@@ -104,19 +104,19 @@ MacroSecurity::~MacroSecurity()
MacroSecurityTP::MacroSecurityTP( Window* _pParent, const ResId& _rResId, MacroSecurity* _pDlg )
- :TabPage ( _pParent, _rResId )
- ,mpDlg ( _pDlg )
+ :TabPage ( _pParent, _rResId )
+ ,mpDlg ( _pDlg )
{
}
MacroSecurityLevelTP::MacroSecurityLevelTP( Window* _pParent, MacroSecurity* _pDlg )
- :MacroSecurityTP ( _pParent, XMLSEC_RES( RID_XMLSECTP_SECLEVEL ), _pDlg )
- ,maSecLevelFL ( this, XMLSEC_RES( FL_SECLEVEL ) )
+ :MacroSecurityTP ( _pParent, XMLSEC_RES( RID_XMLSECTP_SECLEVEL ), _pDlg )
+ ,maSecLevelFL ( this, XMLSEC_RES( FL_SECLEVEL ) )
,maSecReadonlyFI ( this, XMLSEC_RES( FI_SEC_READONLY ))
,maVeryHighRB ( this, XMLSEC_RES( RB_VERYHIGH ) )
- ,maHighRB ( this, XMLSEC_RES( RB_HIGH ) )
- ,maMediumRB ( this, XMLSEC_RES( RB_MEDIUM ) )
- ,maLowRB ( this, XMLSEC_RES( RB_LOW ) )
+ ,maHighRB ( this, XMLSEC_RES( RB_HIGH ) )
+ ,maMediumRB ( this, XMLSEC_RES( RB_MEDIUM ) )
+ ,maLowRB ( this, XMLSEC_RES( RB_LOW ) )
{
FreeResource();
@@ -141,18 +141,18 @@ MacroSecurityLevelTP::MacroSecurityLevelTP( Window* _pParent, MacroSecurity* _pD
else
{
DBG_ERROR("illegal macro security level");
- }
+ }
maSecReadonlyFI.Show(bReadonly);
if(bReadonly)
{
//move to the selected button
if( pCheck && pCheck != &maVeryHighRB)
- {
+ {
long nDiff = pCheck->GetPosPixel().Y() - maVeryHighRB.GetPosPixel().Y();
Point aPos(maSecReadonlyFI.GetPosPixel());
aPos.Y() += nDiff;
maSecReadonlyFI.SetPosPixel(aPos);
- }
+ }
maVeryHighRB.Enable(sal_False);
maHighRB.Enable(sal_False);
maMediumRB.Enable(sal_False);
@@ -279,7 +279,7 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, AddLocPBHdl, void*, EMPTYARG )
IMPL_LINK( MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, void*, EMPTYARG )
{
- USHORT nSel = maTrustFileLocLB.GetSelectEntryPos();
+ USHORT nSel = maTrustFileLocLB.GetSelectEntryPos();
if( nSel != LISTBOX_ENTRY_NOTFOUND )
{
maTrustFileLocLB.RemoveEntry( nSel );
@@ -321,8 +321,8 @@ void MacroSecurityTrustedSourcesTP::FillCertLB( void )
{
for( sal_uInt32 nEntry = 0 ; nEntry < nEntries ; ++nEntry )
{
- cssu::Sequence< ::rtl::OUString >& rEntry = maTrustedAuthors[ nEntry ];
- uno::Reference< css::security::XCertificate > xCert;
+ cssu::Sequence< ::rtl::OUString >& rEntry = maTrustedAuthors[ nEntry ];
+ uno::Reference< css::security::XCertificate > xCert;
// create from RawData
xCert = mpDlg->mxSecurityEnvironment->createCertificateFromAscii( rEntry[ 2 ] );
@@ -330,34 +330,34 @@ void MacroSecurityTrustedSourcesTP::FillCertLB( void )
SvLBoxEntry* pLBEntry = maTrustCertLB.InsertEntry( XmlSec::GetContentPart( xCert->getSubjectName() ) );
maTrustCertLB.SetEntryText( XmlSec::GetContentPart( xCert->getIssuerName() ), pLBEntry, 1 );
maTrustCertLB.SetEntryText( XmlSec::GetDateTimeString( xCert->getNotValidAfter() ), pLBEntry, 2 );
- pLBEntry->SetUserData( ( void* ) sal_Int32( nEntry ) ); // missuse user data as index
+ pLBEntry->SetUserData( ( void* ) sal_Int32( nEntry ) ); // missuse user data as index
}
}
}
MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP( Window* _pParent, MacroSecurity* _pDlg )
- :MacroSecurityTP ( _pParent, XMLSEC_RES( RID_XMLSECTP_TRUSTSOURCES ), _pDlg )
- ,maTrustCertFL ( this, XMLSEC_RES( FL_TRUSTCERT ) )
+ :MacroSecurityTP ( _pParent, XMLSEC_RES( RID_XMLSECTP_TRUSTSOURCES ), _pDlg )
+ ,maTrustCertFL ( this, XMLSEC_RES( FL_TRUSTCERT ) )
,maTrustCertROFI ( this, XMLSEC_RES( FI_TRUSTCERT_RO ) )
,maTrustCertLB ( this, XMLSEC_RES( LB_TRUSTCERT ) )
- ,maAddCertPB ( this, XMLSEC_RES( PB_ADD_TRUSTCERT ) )
- ,maViewCertPB ( this, XMLSEC_RES( PB_VIEW_TRUSTCERT ) )
- ,maRemoveCertPB ( this, XMLSEC_RES( PB_REMOVE_TRUSTCERT ) )
- ,maTrustFileLocFL ( this, XMLSEC_RES( FL_TRUSTFILELOC ) )
+ ,maAddCertPB ( this, XMLSEC_RES( PB_ADD_TRUSTCERT ) )
+ ,maViewCertPB ( this, XMLSEC_RES( PB_VIEW_TRUSTCERT ) )
+ ,maRemoveCertPB ( this, XMLSEC_RES( PB_REMOVE_TRUSTCERT ) )
+ ,maTrustFileLocFL ( this, XMLSEC_RES( FL_TRUSTFILELOC ) )
,maTrustFileROFI ( this, XMLSEC_RES( FI_TRUSTFILE_RO ) )
,maTrustFileLocFI ( this, XMLSEC_RES( FI_TRUSTFILELOC ) )
- ,maTrustFileLocLB ( this, XMLSEC_RES( LB_TRUSTFILELOC ) )
- ,maAddLocPB ( this, XMLSEC_RES( FL_ADD_TRUSTFILELOC ) )
- ,maRemoveLocPB ( this, XMLSEC_RES( FL_REMOVE_TRUSTFILELOC ) )
+ ,maTrustFileLocLB ( this, XMLSEC_RES( LB_TRUSTFILELOC ) )
+ ,maAddLocPB ( this, XMLSEC_RES( FL_ADD_TRUSTFILELOC ) )
+ ,maRemoveLocPB ( this, XMLSEC_RES( FL_REMOVE_TRUSTFILELOC ) )
{
- static long nTabs[] = { 3, 0, 35*CS_LB_WIDTH/100, 70*CS_LB_WIDTH/100 };
+ static long nTabs[] = { 3, 0, 35*CS_LB_WIDTH/100, 70*CS_LB_WIDTH/100 };
maTrustCertLB.SetTabs( &nTabs[ 0 ] );
maTrustCertLB.InsertHeaderEntry( String( XMLSEC_RES( STR_HEADERBAR ) ) );
FreeResource();
maTrustCertLB.SetSelectHdl( LINK( this, MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl ) );
- maAddCertPB.Hide(); // not used in the moment...
+ maAddCertPB.Hide(); // not used in the moment...
maViewCertPB.SetClickHdl( LINK( this, MacroSecurityTrustedSourcesTP, ViewCertPBHdl ) );
maViewCertPB.Disable();
maRemoveCertPB.SetClickHdl( LINK( this, MacroSecurityTrustedSourcesTP, RemoveCertPBHdl ) );
@@ -372,12 +372,12 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP( Window* _pParent,
mbAuthorsReadonly = mpDlg->maSecOptions.IsReadOnly( SvtSecurityOptions::E_MACRO_TRUSTEDAUTHORS );
maTrustCertROFI.Show( mbAuthorsReadonly );
mbAuthorsReadonly ? maTrustCertLB.DisableTable() : maTrustCertLB.EnableTable();
-// unused button
+// unused button
// maAddCertPB.Enable( !mbAuthorsReadonly );
FillCertLB();
- cssu::Sequence< rtl::OUString > aSecureURLs = mpDlg->maSecOptions.GetSecureURLs();
+ cssu::Sequence< rtl::OUString > aSecureURLs = mpDlg->maSecOptions.GetSecureURLs();
mbURLsReadonly = mpDlg->maSecOptions.IsReadOnly( SvtSecurityOptions::E_SECUREURLS );
maTrustFileROFI.Show( mbURLsReadonly );
maTrustFileLocLB.Enable( !mbURLsReadonly );
@@ -400,10 +400,10 @@ void MacroSecurityTrustedSourcesTP::ActivatePage()
void MacroSecurityTrustedSourcesTP::ClosePage( void )
{
- USHORT nEntryCnt = maTrustFileLocLB.GetEntryCount();
+ USHORT nEntryCnt = maTrustFileLocLB.GetEntryCount();
if( nEntryCnt )
{
- cssu::Sequence< rtl::OUString > aSecureURLs( nEntryCnt );
+ cssu::Sequence< rtl::OUString > aSecureURLs( nEntryCnt );
for( USHORT i = 0 ; i < nEntryCnt ; ++i )
{
::rtl::OUString aURL( maTrustFileLocLB.GetEntry( i ) );
@@ -450,7 +450,7 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
String aStr(ReadOnlyImage::GetHelpTip());
if ( Help::IsBalloonHelpEnabled() )
- Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect,
+ Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect,
aStr );
else if ( Help::IsQuickHelpEnabled() )
Help::ShowQuickHelp( this, aScreenRect, aStr );
diff --git a/xmlsecurity/source/dialogs/macrosecurity.src b/xmlsecurity/source/dialogs/macrosecurity.src
index 0683606f500c..9e7411ef92c2 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.src
+++ b/xmlsecurity/source/dialogs/macrosecurity.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 2bb2bd1fa262..4022f497e98e 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -45,17 +45,17 @@ using namespace std;
namespace XmlSec
{
- static ResMgr* pResMgr = 0;
+ static ResMgr* pResMgr = 0;
static SvtSysLocale* pSysLocale = 0;
ResMgr* GetResMgr( void )
{
if( !pResMgr )
{
- ByteString aName( "xmlsec" );
-// pResMgr = ResMgr::CreateResMgr( aName.GetBuffer(), Application::GetSettings().GetUILanguage() );
-// LanguageType aLang( LANGUAGE_ENGLISH_US );
-// pResMgr = ResMgr::CreateResMgr( aName.GetBuffer(), aLang );
+ ByteString aName( "xmlsec" );
+// pResMgr = ResMgr::CreateResMgr( aName.GetBuffer(), Application::GetSettings().GetUILanguage() );
+// LanguageType aLang( LANGUAGE_ENGLISH_US );
+// pResMgr = ResMgr::CreateResMgr( aName.GetBuffer(), aLang );
// MT: Change to Locale
pResMgr = ResMgr::CreateResMgr( aName.GetBuffer() );
}
@@ -114,11 +114,11 @@ namespace XmlSec
}
/*
- Creates two strings based on the distinguished name which are displayed in the
+ Creates two strings based on the distinguished name which are displayed in the
certificate details view. The first string contains only the values of the attribute
and valudes pairs, which are separated by commas. All escape characters ('"') are
removed.
- The second string is for the details view at the bottom. It shows the attribute/value
+ The second string is for the details view at the bottom. It shows the attribute/value
pairs on different lines. All escape characters ('"') are removed.
*/
pair< OUString, OUString> GetDNForCertDetailsView( const OUString & rRawString)
@@ -141,11 +141,11 @@ namespace XmlSec
}
return make_pair(s1.makeStringAndClear(), s2.makeStringAndClear());
}
-
+
/*
Whenever the attribute value contains special characters, such as '"' or ',' (without '')
then the value will be enclosed in double quotes by the respective Windows or NSS function
- which we use to retrieve, for example, the subject name. If double quotes appear in the value then
+ which we use to retrieve, for example, the subject name. If double quotes appear in the value then
they are escaped with a double quote. This function removes the escape characters.
*/
#ifdef WNT
@@ -163,7 +163,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
for (sal_Int32 i = 0; i < length; i++)
{
sal_Unicode c = rRawString[i];
-
+
if (c == '=')
{
if (! bInValue)
@@ -181,9 +181,9 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
{
if (!bInEscape)
{
- //If this is the quote is the first of the couple which enclose the
+ //If this is the quote is the first of the couple which enclose the
//whole value, because the value contains special characters
- //then we just drop it. That is, this character must be followed by
+ //then we just drop it. That is, this character must be followed by
//a character which is not '"'.
if ( i + 1 < length && rRawString[i+1] == '"')
bInEscape = true;
@@ -192,7 +192,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
}
else
{
- //This quote is escaped by a preceding quote and therefore is
+ //This quote is escaped by a preceding quote and therefore is
//part of the value
sbufValue.append(c);
bInEscape = false;
@@ -200,8 +200,8 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
}
else if (c == ',' || c == '+')
{
- //The comma separate the attribute value pairs.
- //If the comma is not part of a value (the value would then be enclosed in '"'),
+ //The comma separate the attribute value pairs.
+ //If the comma is not part of a value (the value would then be enclosed in '"'),
//then we have reached the end of the value
if (!bInValue)
{
@@ -215,7 +215,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
else
{
//The whole string is enclosed because it contains special characters.
- //The enclosing '"' are not part of certificate but will be added by
+ //The enclosing '"' are not part of certificate but will be added by
//the function (Windows or NSS) which retrieves DN
sbufValue.append(c);
}
@@ -249,7 +249,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
for (sal_Int32 i = 0; i < length; i++)
{
sal_Unicode c = rRawString[i];
-
+
if (c == '=')
{
if (! bInValue)
@@ -273,7 +273,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
{ // bInEscape is true
sbufValue.append(c);
bInEscape = false;
- }
+ }
}
else if (c == '"')
{
@@ -287,7 +287,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
}
else
{
- //This quote is escaped by a preceding quote and therefore is
+ //This quote is escaped by a preceding quote and therefore is
//part of the value
sbufValue.append(c);
bInEscape = false;
@@ -295,8 +295,8 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
}
else if (c == ',' || c == '+')
{
- //The comma separate the attribute value pairs.
- //If the comma is not part of a value (the value would then be enclosed in '"'),
+ //The comma separate the attribute value pairs.
+ //If the comma is not part of a value (the value would then be enclosed in '"'),
//then we have reached the end of the value
if (!bInValue)
{
@@ -310,7 +310,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
else
{
//The whole string is enclosed because it contains special characters.
- //The enclosing '"' are not part of certificate but will be added by
+ //The enclosing '"' are not part of certificate but will be added by
//the function (Windows or NSS) which retrieves DN
sbufValue.append(c);
}
@@ -360,14 +360,14 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
String GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep, UINT16 _nLineBreak )
{
- const sal_Int8* pSerNumSeq = _rSeq.getConstArray();
- int nCnt = _rSeq.getLength();
- String aStr;
- const char pHexDigs[ 17 ] = "0123456789ABCDEF";
- char pBuffer[ 3 ] = " ";
- UINT8 nNum;
- UINT16 nBreakStart = _nLineBreak? _nLineBreak : 1;
- UINT16 nBreak = nBreakStart;
+ const sal_Int8* pSerNumSeq = _rSeq.getConstArray();
+ int nCnt = _rSeq.getLength();
+ String aStr;
+ const char pHexDigs[ 17 ] = "0123456789ABCDEF";
+ char pBuffer[ 3 ] = " ";
+ UINT8 nNum;
+ UINT16 nBreakStart = _nLineBreak? _nLineBreak : 1;
+ UINT16 nBreak = nBreakStart;
for( int i = 0 ; i < nCnt ; ++i )
{
nNum = UINT8( pSerNumSeq[ i ] );
@@ -393,8 +393,8 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
long ShrinkToFitWidth( Control& _rCtrl, long _nOffs )
{
- long nWidth = _rCtrl.GetTextWidth( _rCtrl.GetText() );
- Size aSize( _rCtrl.GetSizePixel() );
+ long nWidth = _rCtrl.GetTextWidth( _rCtrl.GetText() );
+ Size aSize( _rCtrl.GetSizePixel() );
nWidth += _nOffs;
aSize.Width() = nWidth;
_rCtrl.SetSizePixel( aSize );
@@ -403,15 +403,15 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
void AlignAfterImage( const FixedImage& _rImage, Control& _rCtrl, long _nXOffset )
{
- Point aPos( _rImage.GetPosPixel() );
- Size aSize( _rImage.GetSizePixel() );
- long n = aPos.X();
+ Point aPos( _rImage.GetPosPixel() );
+ Size aSize( _rImage.GetSizePixel() );
+ long n = aPos.X();
n += aSize.Width();
n += _nXOffset;
aPos.X() = n;
n = aPos.Y();
- n += aSize.Height() / 2; // y-position is in the middle of the image
- n -= _rCtrl.GetSizePixel().Height() / 2; // center Control
+ n += aSize.Height() / 2; // y-position is in the middle of the image
+ n -= _rCtrl.GetSizePixel().Height() / 2; // center Control
aPos.Y() = n;
_rCtrl.SetPosPixel( aPos );
}
diff --git a/xmlsecurity/source/dialogs/resourcemanager.hxx b/xmlsecurity/source/dialogs/resourcemanager.hxx
index ffea19c9a0a8..3f3e552eb8b4 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.hxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -43,29 +43,29 @@ class LocaleDataWrapper;
namespace XmlSec
{
- ResMgr* GetResMgr( void );
+ ResMgr* GetResMgr( void );
const LocaleDataWrapper& GetLocaleData( void );
- DateTime GetDateTime( const ::com::sun::star::util::DateTime& _rDT );
- String GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT );
- String GetDateTimeString( const rtl::OUString& _rDate, const rtl::OUString& _rTime );
- String GetDateString( const ::com::sun::star::util::DateTime& _rDT );
+ DateTime GetDateTime( const ::com::sun::star::util::DateTime& _rDT );
+ String GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT );
+ String GetDateTimeString( const rtl::OUString& _rDate, const rtl::OUString& _rTime );
+ String GetDateString( const ::com::sun::star::util::DateTime& _rDT );
- std::vector< std::pair< ::rtl::OUString, ::rtl::OUString> >
+ std::vector< std::pair< ::rtl::OUString, ::rtl::OUString> >
parseDN(const ::rtl::OUString& rRawString);
- std::pair< ::rtl::OUString, ::rtl::OUString> GetDNForCertDetailsView(
+ std::pair< ::rtl::OUString, ::rtl::OUString> GetDNForCertDetailsView(
const ::rtl::OUString & rRawString);
String GetContentPart( const String& _rRawString );
- String GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep = ":", UINT16 _nLineBreak = 0xFFFF );
+ String GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep = ":", UINT16 _nLineBreak = 0xFFFF );
- long ShrinkToFitWidth( Control& _rCtrl, long _nOffs = 0 ); // return = new width
- void AlignAfterImage( const FixedImage& _rImage, Control& _rCtrl, long _nXOffset = 0 );
- void AlignAfterImage( const FixedImage& _rImage, FixedInfo& _rFI, long _nXOffset = 0 );
- void AlignAndFitImageAndControl( FixedImage& _rImage, FixedInfo& _rFI, long _nXOffset = 0 );
+ long ShrinkToFitWidth( Control& _rCtrl, long _nOffs = 0 ); // return = new width
+ void AlignAfterImage( const FixedImage& _rImage, Control& _rCtrl, long _nXOffset = 0 );
+ void AlignAfterImage( const FixedImage& _rImage, FixedInfo& _rFI, long _nXOffset = 0 );
+ void AlignAndFitImageAndControl( FixedImage& _rImage, FixedInfo& _rFI, long _nXOffset = 0 );
}
-#define XMLSEC_RES(id) ResId(id,*XmlSec::GetResMgr())
+#define XMLSEC_RES(id) ResId(id,*XmlSec::GetResMgr())
#endif
diff --git a/xmlsecurity/source/dialogs/stbcontrl.cxx b/xmlsecurity/source/dialogs/stbcontrl.cxx
index 19a8cc675622..ee726d8a9524 100644
--- a/xmlsecurity/source/dialogs/stbcontrl.cxx
+++ b/xmlsecurity/source/dialogs/stbcontrl.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -43,7 +43,7 @@
#include <xmlsecurity/stbcontrl.hxx>
-#define PAINT_OFFSET 5
+#define PAINT_OFFSET 5
SFX_IMPL_STATUSBAR_CONTROL( XmlSecStatusBarControl, SfxBoolItem );
@@ -53,10 +53,10 @@ class FunctionPopup_Impl : public PopupMenu
public:
FunctionPopup_Impl( USHORT nCheck );
- USHORT GetSelected() const { return nSelected; }
+ USHORT GetSelected() const { return nSelected; }
private:
- USHORT nSelected;
+ USHORT nSelected;
virtual void Select();
};
@@ -83,10 +83,10 @@ void FunctionPopup_Impl::Select()
struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl
{
- Point maPos;
- Size maSize;
- bool mbSigned;
- Image maImage;
+ Point maPos;
+ Size maSize;
+ bool mbSigned;
+ Image maImage;
};
@@ -96,7 +96,7 @@ XmlSecStatusBarControl::XmlSecStatusBarControl( USHORT _nId, StatusBar& _rStb, S
,mpImpl( new XmlSecStatusBarControl_Impl )
{
mpImpl->mbSigned = false;
-// pImp->maImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
+// pImp->maImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
}
XmlSecStatusBarControl::~XmlSecStatusBarControl()
@@ -106,8 +106,8 @@ XmlSecStatusBarControl::~XmlSecStatusBarControl()
void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
{
- GetStatusBar().SetHelpText( GetId(), String() ); // necessary ?
- GetStatusBar().SetHelpId( GetId(), nSID ); // necessary ?
+ GetStatusBar().SetHelpText( GetId(), String() ); // necessary ?
+ GetStatusBar().SetHelpId( GetId(), nSID ); // necessary ?
if( SFX_ITEM_AVAILABLE != eState )
{
@@ -123,19 +123,19 @@ void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, con
mpImpl->mbSigned = false;
}
- if( GetStatusBar().AreItemsVisible() ) // necessary ?
+ if( GetStatusBar().AreItemsVisible() ) // necessary ?
GetStatusBar().SetItemData( GetId(), 0 );
- GetStatusBar().SetItemText( GetId(), String() ); // necessary ?
+ GetStatusBar().SetItemText( GetId(), String() ); // necessary ?
}
void XmlSecStatusBarControl::Command( const CommandEvent& rCEvt )
{
// can / has to be done when integrated in Office!
-// if( rCEvt.GetCommand() == .... )
+// if( rCEvt.GetCommand() == .... )
if( false )
{
-// GetBindings().GetDispatcher()->Execute( SID_PSZ_FUNCTION, SFX_CALLMODE_RECORD, &aItem, 0L );
+// GetBindings().GetDispatcher()->Execute( SID_PSZ_FUNCTION, SFX_CALLMODE_RECORD, &aItem, 0L );
}
else
SfxStatusBarControl::Command( rCEvt );
@@ -143,19 +143,19 @@ void XmlSecStatusBarControl::Command( const CommandEvent& rCEvt )
void XmlSecStatusBarControl::Paint( const UserDrawEvent& rUsrEvt )
{
- OutputDevice* pDev = rUsrEvt.GetDevice();
+ OutputDevice* pDev = rUsrEvt.GetDevice();
DBG_ASSERT( pDev, "-XmlSecStatusBarControl::Paint(): no Output Device... this will lead to nirvana..." );
- const Rectangle& rRect = rUsrEvt.GetRect();
- StatusBar& rBar = GetStatusBar();
- Point aItemPos = rBar.GetItemTextPos( GetId() );
- Color aOldLineColor = pDev->GetLineColor();
- Color aOldFillColor = pDev->GetFillColor();
+ const Rectangle& rRect = rUsrEvt.GetRect();
+ StatusBar& rBar = GetStatusBar();
+ Point aItemPos = rBar.GetItemTextPos( GetId() );
+ Color aOldLineColor = pDev->GetLineColor();
+ Color aOldFillColor = pDev->GetFillColor();
// just 4 testing until we've got a bitmap
pDev->SetLineColor();
pDev->SetFillColor( pDev->GetBackground().GetColor() );
- String s( String::CreateFromAscii( mpImpl->mbSigned? "X" : "-" ) );
+ String s( String::CreateFromAscii( mpImpl->mbSigned? "X" : "-" ) );
pDev->DrawRect( rRect );
pDev->DrawText( Point( rRect.Left() + rRect.GetWidth() / 2 - pDev->GetTextWidth( s ) / 2, aItemPos.Y() ), s );
diff --git a/xmlsecurity/source/dialogs/warnings.cxx b/xmlsecurity/source/dialogs/warnings.cxx
index a5dd33ca9cca..be836a92de26 100644
--- a/xmlsecurity/source/dialogs/warnings.cxx
+++ b/xmlsecurity/source/dialogs/warnings.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::security;
/* HACK: disable some warnings for MS-C */
#ifdef _MSC_VER
-#pragma warning (disable : 4355) // 4355: this used in initializer-list
+#pragma warning (disable : 4355) // 4355: this used in initializer-list
#endif
using namespace ::com::sun::star;
@@ -53,19 +53,19 @@ 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 )
+ :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();
@@ -77,7 +77,7 @@ MacroWarning::MacroWarning( Window* _pParent, uno::Reference< dcss::xml::crypto:
maViewSignsBtn.SetClickHdl( LINK( this, MacroWarning, ViewSignsBtnHdl ) );
maEnableBtn.SetClickHdl( LINK( this, MacroWarning, EnableBtnHdl ) );
-// maDisableBtn.SetClickHdl( LINK( this, MacroWarning, DisableBtnHdl ) );
+// maDisableBtn.SetClickHdl( LINK( this, MacroWarning, DisableBtnHdl ) );
if( mxCert.is() )
maSignsFI.SetText( XmlSec::GetContentPart( mxCert->getSubjectName() ) );
@@ -87,19 +87,19 @@ MacroWarning::MacroWarning( Window* _pParent, uno::Reference< dcss::xml::crypto:
}
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 )
+ :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();
@@ -122,7 +122,7 @@ IMPL_LINK( MacroWarning, ViewSignsBtnHdl, void*, EMPTYARG )
{
DBG_ASSERT( mxCert.is(), "*MacroWarning::ViewSignsBtnHdl(): no certificate set!" );
- CertificateViewer aViewer( this, mxSecurityEnvironment, mxCert );
+ CertificateViewer aViewer( this, mxSecurityEnvironment, mxCert );
aViewer.Execute();
return 0;
@@ -131,7 +131,7 @@ IMPL_LINK( MacroWarning, ViewSignsBtnHdl, void*, EMPTYARG )
IMPL_LINK( MacroWarning, EnableBtnHdl, void*, EMPTYARG )
{
if( mbSignedMode && maAlwaysTrustCB.IsChecked() )
- { // insert path into trusted path list
+ { // insert path into trusted path list
}
diff --git a/xmlsecurity/source/dialogs/warnings.src b/xmlsecurity/source/dialogs/warnings.src
index 2e0e697dae1f..913717d3beb0 100644
--- a/xmlsecurity/source/dialogs/warnings.src
+++ b/xmlsecurity/source/dialogs/warnings.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-25 06:48:25 +0000