summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2011-02-08 11:49:29 +0100
committerMathias Bauer <mba@openoffice.org>2011-02-08 11:49:29 +0100
commit817da8b9dbd1147e2b92640e87465b0c9cf5b1b4 (patch)
treeed5a2a0eb8178e17db6fea60800ddfeaf95ff7c2 /xmlsecurity
parent0c4f5c96f98c621008e27b9fdc3a5a83982565c1 (diff)
parent25fafb0689a8cd60890a3f439bb4bf6f747131c4 (diff)
CWS gnumake3: pull in cws removetooltypes01
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/inc/xmlsecurity/certificatechooser.hxx4
-rw-r--r--xmlsecurity/inc/xmlsecurity/certificateviewer.hxx4
-rw-r--r--xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx4
-rw-r--r--xmlsecurity/inc/xmlsecurity/macrosecurity.hxx2
-rw-r--r--xmlsecurity/inc/xmlsecurity/stbcontrl.hxx4
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.cxx4
-rw-r--r--xmlsecurity/source/dialogs/certificatechooser.cxx20
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.cxx14
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx8
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.cxx18
-rw-r--r--xmlsecurity/source/dialogs/resourcemanager.cxx12
-rw-r--r--xmlsecurity/source/dialogs/resourcemanager.hxx2
-rw-r--r--xmlsecurity/source/dialogs/stbcontrl.cxx12
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper2.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx2
-rw-r--r--xmlsecurity/tools/demo/util.cxx6
-rw-r--r--xmlsecurity/tools/demo/util.hxx2
-rw-r--r--xmlsecurity/tools/demo/util2.cxx4
-rw-r--r--xmlsecurity/workben/signaturetest.cxx8
20 files changed, 68 insertions, 68 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
index 1f822e8df096..fa259cadc647 100644
--- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
@@ -69,9 +69,9 @@ private:
CancelButton maCancelBtn;
HelpButton maHelpBtn;
- BOOL mbInitialized;
+ sal_Bool mbInitialized;
- USHORT GetSelectedEntryPos( void ) const;
+ sal_uInt16 GetSelectedEntryPos( void ) const;
// DECL_LINK( Initialize, void* );
DECL_LINK( ViewButtonHdl, Button* );
DECL_LINK( CertificateHighlightHdl, void* );
diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
index 10727ad63d47..622a912e788e 100644
--- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
@@ -62,12 +62,12 @@ private:
OKButton maOkBtn;
HelpButton maHelpBtn;
- BOOL mbCheckForPrivateKey;
+ sal_Bool mbCheckForPrivateKey;
cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment;
cssu::Reference< dcss::security::XCertificate > mxCert;
public:
- CertificateViewer( Window* pParent, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const cssu::Reference< dcss::security::XCertificate >& rXCert, BOOL bCheckForPrivateKey );
+ CertificateViewer( Window* pParent, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const cssu::Reference< dcss::security::XCertificate >& rXCert, sal_Bool bCheckForPrivateKey );
virtual ~CertificateViewer();
};
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index 4d48aad47555..d40f2ebf4a12 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -132,8 +132,8 @@ public:
sal_Bool bReadOnly, const ::rtl::OUString& sODFVersion, bool bHasDocumentSignature);
~DigitalSignaturesDialog();
- // Initialize the dialog and the security environment, returns TRUE on success
- BOOL Init( const rtl::OUString& rTokenName );
+ // Initialize the dialog and the security environment, returns sal_True on success
+ sal_Bool Init( const rtl::OUString& rTokenName );
// Set the storage which should be signed or verified
void SetStorage( const cssu::Reference < css::embed::XStorage >& rxStore );
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index 2b4b57c00425..6ebab6d99265 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -120,7 +120,7 @@ private:
RadioButton maMediumRB;
RadioButton maLowRB;
- USHORT mnCurLevel;
+ sal_uInt16 mnCurLevel;
protected:
DECL_LINK( RadioButtonHdl, RadioButton* );
diff --git a/xmlsecurity/inc/xmlsecurity/stbcontrl.hxx b/xmlsecurity/inc/xmlsecurity/stbcontrl.hxx
index b10465db2208..8e99a393ace2 100644
--- a/xmlsecurity/inc/xmlsecurity/stbcontrl.hxx
+++ b/xmlsecurity/inc/xmlsecurity/stbcontrl.hxx
@@ -45,10 +45,10 @@ private:
public:
SFX_DECL_STATUSBAR_CONTROL();
- XmlSecStatusBarControl( USHORT _nId, StatusBar& _rStb, SfxBindings& _rBind );
+ XmlSecStatusBarControl( sal_uInt16 _nId, StatusBar& _rStb, SfxBindings& _rBind );
~XmlSecStatusBarControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual void Paint( const UserDrawEvent& rEvt );
virtual void Command( const CommandEvent& rCEvt );
};
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index ff7de666036d..e8eddefb51cf 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -230,7 +230,7 @@ sal_Bool DocumentDigitalSignatures::ImplViewSignatures(
{
if ( aSignaturesDialog.SignaturesChanged() )
{
- bChanges = TRUE;
+ bChanges = sal_True;
// If we have a storage and no stream, we are responsible for commit
if ( rxStorage.is() && !xSignStream.is() )
{
@@ -397,7 +397,7 @@ void DocumentDigitalSignatures::showCertificate(
if ( bInit )
{
- CertificateViewer aViewer( NULL, aSignatureHelper.GetSecurityEnvironment(), _Certificate, FALSE );
+ CertificateViewer aViewer( NULL, aSignatureHelper.GetSecurityEnvironment(), _Certificate, sal_False );
aViewer.Execute();
}
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 5a34945c639b..9e934d4e04f8 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -52,15 +52,15 @@ using namespace ::com::sun::star;
#define INVAL_SEL 0xFFFF
-USHORT CertificateChooser::GetSelectedEntryPos( void ) const
+sal_uInt16 CertificateChooser::GetSelectedEntryPos( void ) const
{
- USHORT nSel = INVAL_SEL;
+ sal_uInt16 nSel = INVAL_SEL;
SvLBoxEntry* pSel = maCertLB.FirstSelected();
if( pSel )
- nSel = (USHORT) ( sal_uIntPtr ) pSel->GetUserData();
+ nSel = (sal_uInt16) ( sal_uIntPtr ) pSel->GetUserData();
- return (USHORT) nSel;
+ return (sal_uInt16) nSel;
}
CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::XComponentContext>& _rxCtx, uno::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, const SignatureInformations& _rCertsToIgnore )
@@ -85,7 +85,7 @@ CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::X
mxCtx = _rxCtx;
mxSecurityEnvironment = _rxSecurityEnvironment;
- mbInitialized = FALSE;
+ mbInitialized = sal_False;
// disable buttons
CertificateHighlightHdl( NULL );
@@ -113,12 +113,12 @@ short CertificateChooser::Execute()
Window* pMe = this;
Window* pParent = GetParent();
if ( pParent )
- pParent->EnableInput( FALSE );
+ pParent->EnableInput( sal_False );
pMe->Show();
pMe->Update();
ImplInitialize();
if ( pParent )
- pParent->EnableInput( TRUE );
+ pParent->EnableInput( sal_True );
return ModalDialog::Execute();
}
@@ -192,7 +192,7 @@ void CertificateChooser::ImplInitialize()
// enable/disable buttons
CertificateHighlightHdl( NULL );
- mbInitialized = TRUE;
+ mbInitialized = sal_True;
}
}
@@ -200,7 +200,7 @@ void CertificateChooser::ImplInitialize()
uno::Reference< dcss::security::XCertificate > CertificateChooser::GetSelectedCertificate()
{
uno::Reference< dcss::security::XCertificate > xCert;
- USHORT nSelected = GetSelectedEntryPos();
+ sal_uInt16 nSelected = GetSelectedEntryPos();
if ( nSelected < maCerts.getLength() )
xCert = maCerts[ nSelected ];
return xCert;
@@ -231,7 +231,7 @@ void CertificateChooser::ImplShowCertificateDetails()
uno::Reference< dcss::security::XCertificate > xCert = GetSelectedCertificate();
if( xCert.is() )
{
- CertificateViewer aViewer( this, mxSecurityEnvironment, xCert, TRUE );
+ CertificateViewer aViewer( this, mxSecurityEnvironment, xCert, sal_True );
aViewer.Execute();
}
}
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index af2ffc4352ed..3b38045938f2 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -70,7 +70,7 @@ namespace
CertificateViewer::CertificateViewer(
Window* _pParent,
const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment,
- const cssu::Reference< dcss::security::XCertificate >& _rXCert, BOOL bCheckForPrivateKey )
+ const cssu::Reference< dcss::security::XCertificate >& _rXCert, sal_Bool bCheckForPrivateKey )
:TabDialog ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTVIEWER ) )
,maTabCtrl ( this, XMLSEC_RES( 1 ) )
,maOkBtn ( this, XMLSEC_RES( BTN_OK ) )
@@ -209,12 +209,12 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, Certif
XmlSec::AlignAfterImage( maKeyImg, maHintCorrespPrivKeyFI, 12 );
// Check if we have the private key...
- BOOL bHasPrivateKey = FALSE;
+ sal_Bool bHasPrivateKey = sal_False;
// #i41270# Check only if we have that certificate in our security environment
if ( _pDlg->mbCheckForPrivateKey )
{
long nCertificateCharacters = _pDlg->mxSecurityEnvironment->getCertificateCharacters( xCert );
- bHasPrivateKey = ( nCertificateCharacters & security::CertificateCharacters::HAS_PRIVATE_KEY ) ? TRUE : FALSE;
+ bHasPrivateKey = ( nCertificateCharacters & security::CertificateCharacters::HAS_PRIVATE_KEY ) ? sal_True : sal_False;
}
if ( !bHasPrivateKey )
{
@@ -247,7 +247,7 @@ inline Details_UserDatat::Details_UserDatat( const String& _rTxt, bool _bFixedWi
void CertificateViewerDetailsTP::Clear( void )
{
maElementML.SetText( String() );
- ULONG i = 0;
+ sal_uLong i = 0;
SvLBoxEntry* pEntry = maElementsLB.GetEntry( i );
while( pEntry )
{
@@ -286,7 +286,7 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif
// fill list box
Reference< security::XCertificate > xCert = mpDlg->mxCert;
- UINT16 nLineBreak = 16;
+ sal_uInt16 nLineBreak = 16;
const char* pHexSep = " ";
String aLBEntry;
String aDetails;
@@ -499,7 +499,7 @@ IMPL_LINK( CertificateViewerCertPathTP, ViewCertHdl, void*, EMPTYARG )
SvLBoxEntry* pEntry = maCertPathLB.FirstSelected();
if( pEntry )
{
- CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, ((CertPath_UserData*)pEntry->GetUserData())->mxCert, FALSE );
+ CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, ((CertPath_UserData*)pEntry->GetUserData())->mxCert, sal_False );
aViewer.Execute();
}
@@ -525,7 +525,7 @@ IMPL_LINK( CertificateViewerCertPathTP, CertSelectHdl, void*, EMPTYARG )
void CertificateViewerCertPathTP::Clear( void )
{
maCertStatusML.SetText( String() );
- ULONG i = 0;
+ sal_uLong i = 0;
SvLBoxEntry* pEntry = maCertPathLB.GetEntry( i );
while( pEntry )
{
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index df032dcbe5ef..15ac9b591c48 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -266,7 +266,7 @@ DigitalSignaturesDialog::~DigitalSignaturesDialog()
{
}
-BOOL DigitalSignaturesDialog::Init( const rtl::OUString& rTokenName )
+sal_Bool DigitalSignaturesDialog::Init( const rtl::OUString& rTokenName )
{
bool bInit = maSignatureHelper.Init( rTokenName );
@@ -543,7 +543,7 @@ IMPL_LINK( DigitalSignaturesDialog, RemoveButtonHdl, Button*, EMPTYARG )
{
try
{
- USHORT nSelected = (USHORT) (sal_uIntPtr) maSignaturesLB.FirstSelected()->GetUserData();
+ sal_uInt16 nSelected = (sal_uInt16) (sal_uIntPtr) maSignaturesLB.FirstSelected()->GetUserData();
maCurrentSignatureInformations.erase( maCurrentSignatureInformations.begin()+nSelected );
// Export all other signatures...
@@ -752,7 +752,7 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails()
{
if( maSignaturesLB.FirstSelected() )
{
- USHORT nSelected = (USHORT) (sal_uIntPtr) maSignaturesLB.FirstSelected()->GetUserData();
+ sal_uInt16 nSelected = (sal_uInt16) (sal_uIntPtr) maSignaturesLB.FirstSelected()->GetUserData();
const SignatureInformation& rInfo = maCurrentSignatureInformations[ nSelected ];
css::uno::Reference<css::xml::crypto::XSecurityEnvironment > xSecEnv =
maSignatureHelper.GetSecurityEnvironment();
@@ -769,7 +769,7 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails()
DBG_ASSERT( xCert.is(), "Error getting cCertificate!" );
if ( xCert.is() )
{
- CertificateViewer aViewer( this, maSignatureHelper.GetSecurityEnvironment(), xCert, FALSE );
+ CertificateViewer aViewer( this, maSignatureHelper.GetSecurityEnvironment(), xCert, sal_False );
aViewer.Execute();
}
}
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 9c554d023018..6e9498c264b5 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -123,7 +123,7 @@ MacroSecurityLevelTP::MacroSecurityLevelTP( Window* _pParent, MacroSecurity* _pD
maHighRB.SetClickHdl( LINK( this, MacroSecurityLevelTP, RadioButtonHdl ) );
maVeryHighRB.SetClickHdl( LINK( this, MacroSecurityLevelTP, RadioButtonHdl ) );
- mnCurLevel = (USHORT) mpDlg->maSecOptions.GetMacroSecurityLevel();
+ mnCurLevel = (sal_uInt16) mpDlg->maSecOptions.GetMacroSecurityLevel();
sal_Bool bReadonly = mpDlg->maSecOptions.IsReadOnly( SvtSecurityOptions::E_MACRO_SECLEVEL );
RadioButton* pCheck = 0;
@@ -161,7 +161,7 @@ MacroSecurityLevelTP::MacroSecurityLevelTP( Window* _pParent, MacroSecurity* _pD
IMPL_LINK( MacroSecurityLevelTP, RadioButtonHdl, RadioButton*, EMPTYARG )
{
- USHORT nNewLevel = 0;
+ sal_uInt16 nNewLevel = 0;
if( maVeryHighRB.IsChecked() )
nNewLevel = 3;
else if( maHighRB.IsChecked() )
@@ -198,7 +198,7 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, ViewCertPBHdl, void*, EMPTYARG )
{
if( maTrustCertLB.FirstSelected() )
{
- USHORT nSelected = USHORT( sal_uIntPtr( maTrustCertLB.FirstSelected()->GetUserData() ) );
+ sal_uInt16 nSelected = sal_uInt16( sal_uIntPtr( maTrustCertLB.FirstSelected()->GetUserData() ) );
uno::Reference< dcss::security::XSerialNumberAdapter > xSerialNumberAdapter =
::com::sun::star::security::SerialNumberAdapter::create(mpDlg->mxCtx);
@@ -213,7 +213,7 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, ViewCertPBHdl, void*, EMPTYARG )
if ( xCert.is() )
{
- CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, xCert, FALSE );
+ CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, xCert, sal_False );
aViewer.Execute();
}
}
@@ -224,7 +224,7 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, RemoveCertPBHdl, void*, EMPTYARG )
{
if( maTrustCertLB.FirstSelected() )
{
- USHORT nAuthor = USHORT( sal_uIntPtr( maTrustCertLB.FirstSelected()->GetUserData() ) );
+ sal_uInt16 nAuthor = sal_uInt16( sal_uIntPtr( maTrustCertLB.FirstSelected()->GetUserData() ) );
::comphelper::removeElementAt( maTrustedAuthors, nAuthor );
FillCertLB();
@@ -277,13 +277,13 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, AddLocPBHdl, void*, EMPTYARG )
IMPL_LINK( MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, void*, EMPTYARG )
{
- USHORT nSel = maTrustFileLocLB.GetSelectEntryPos();
+ sal_uInt16 nSel = maTrustFileLocLB.GetSelectEntryPos();
if( nSel != LISTBOX_ENTRY_NOTFOUND )
{
maTrustFileLocLB.RemoveEntry( nSel );
// --> PB 2004-09-21 #i33584#
// after remove an entry, select another one if exists
- USHORT nNewCount = maTrustFileLocLB.GetEntryCount();
+ sal_uInt16 nNewCount = maTrustFileLocLB.GetEntryCount();
if ( nNewCount > 0 )
{
if ( nSel >= nNewCount )
@@ -398,11 +398,11 @@ void MacroSecurityTrustedSourcesTP::ActivatePage()
void MacroSecurityTrustedSourcesTP::ClosePage( void )
{
- USHORT nEntryCnt = maTrustFileLocLB.GetEntryCount();
+ sal_uInt16 nEntryCnt = maTrustFileLocLB.GetEntryCount();
if( nEntryCnt )
{
cssu::Sequence< rtl::OUString > aSecureURLs( nEntryCnt );
- for( USHORT i = 0 ; i < nEntryCnt ; ++i )
+ for( sal_uInt16 i = 0 ; i < nEntryCnt ; ++i )
{
::rtl::OUString aURL( maTrustFileLocLB.GetEntry( i ) );
osl::FileBase::getFileURLFromSystemPath( aURL, aURL );
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index e41cf546f74f..25de43ac4566 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -98,7 +98,7 @@ namespace XmlSec
String sSec( _rTime, 6, 2 );
- Date aDate( (USHORT)sDay.ToInt32(), (USHORT) sMonth.ToInt32(), (USHORT)sYear.ToInt32() );
+ Date aDate( (sal_uInt16)sDay.ToInt32(), (sal_uInt16) sMonth.ToInt32(), (sal_uInt16)sYear.ToInt32() );
Time aTime( sHour.ToInt32(), sMin.ToInt32(), sSec.ToInt32(), 0 );
const LocaleDataWrapper& rLoDa = GetLocaleData();
String aStr( rLoDa.getDate( aDate ) );
@@ -357,19 +357,19 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
return retVal;
}
- String GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep, UINT16 _nLineBreak )
+ String GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep, sal_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;
+ sal_uInt8 nNum;
+ sal_uInt16 nBreakStart = _nLineBreak? _nLineBreak : 1;
+ sal_uInt16 nBreak = nBreakStart;
for( int i = 0 ; i < nCnt ; ++i )
{
- nNum = UINT8( pSerNumSeq[ i ] );
+ nNum = sal_uInt8( pSerNumSeq[ i ] );
//MM : exchange the buffer[0] and buffer[1], which make it consistent with Mozilla and Windows
pBuffer[ 1 ] = pHexDigs[ nNum & 0x0F ];
diff --git a/xmlsecurity/source/dialogs/resourcemanager.hxx b/xmlsecurity/source/dialogs/resourcemanager.hxx
index 9ca06d17d0b5..0a0615871af3 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.hxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.hxx
@@ -56,7 +56,7 @@ namespace XmlSec
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 = ":", sal_uInt16 _nLineBreak = 0xFFFF );
long ShrinkToFitWidth( Control& _rCtrl, long _nOffs = 0 ); // return = new width
void AlignAfterImage( const FixedImage& _rImage, Control& _rCtrl, long _nXOffset = 0 );
diff --git a/xmlsecurity/source/dialogs/stbcontrl.cxx b/xmlsecurity/source/dialogs/stbcontrl.cxx
index cc18373f04d8..44395ed5d328 100644
--- a/xmlsecurity/source/dialogs/stbcontrl.cxx
+++ b/xmlsecurity/source/dialogs/stbcontrl.cxx
@@ -74,19 +74,19 @@ SFX_IMPL_STATUSBAR_CONTROL( XmlSecStatusBarControl, SfxBoolItem );
class FunctionPopup_Impl : public PopupMenu
{
public:
- FunctionPopup_Impl( USHORT nCheck );
+ FunctionPopup_Impl( sal_uInt16 nCheck );
- USHORT GetSelected() const { return nSelected; }
+ sal_uInt16 GetSelected() const { return nSelected; }
private:
- USHORT nSelected;
+ sal_uInt16 nSelected;
virtual void Select();
};
// -----------------------------------------------------------------------
-FunctionPopup_Impl::FunctionPopup_Impl( USHORT nCheck ) :
+FunctionPopup_Impl::FunctionPopup_Impl( sal_uInt16 nCheck ) :
PopupMenu( ResId( RID_SVXMNU_PSZ_FUNC, DIALOG_MGR() ) ),
nSelected( 0 )
{
@@ -113,7 +113,7 @@ struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl
};
-XmlSecStatusBarControl::XmlSecStatusBarControl( USHORT _nId, StatusBar& _rStb, SfxBindings& _rBind )
+XmlSecStatusBarControl::XmlSecStatusBarControl( sal_uInt16 _nId, StatusBar& _rStb, SfxBindings& _rBind )
:SfxStatusBarControl( _nId, _rStb, _rBind )
,mpImpl( new XmlSecStatusBarControl_Impl )
@@ -127,7 +127,7 @@ XmlSecStatusBarControl::~XmlSecStatusBarControl()
delete mpImpl;
}
-void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void XmlSecStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
GetStatusBar().SetHelpText( GetId(), String() ); // necessary ?
GetStatusBar().SetHelpId( GetId(), nSID ); // necessary ?
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index 4c0c847b8d54..c701adefd445 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -183,9 +183,9 @@ uno::Reference< io::XInputStream > SAL_CALL UriBindingHelper::getUriBinding( con
{
SvFileStream* pStream = new SvFileStream( uri, STREAM_READ );
pStream->Seek( STREAM_SEEK_TO_END );
- ULONG nBytes = pStream->Tell();
+ sal_uLong nBytes = pStream->Tell();
pStream->Seek( STREAM_SEEK_TO_BEGIN );
- SvLockBytesRef xLockBytes = new SvLockBytes( pStream, TRUE );
+ SvLockBytesRef xLockBytes = new SvLockBytes( pStream, sal_True );
xInputStream = new utl::OInputStreamHelper( xLockBytes, nBytes );
}
return xInputStream;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index 48d27e4e6737..e4a89201f081 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -474,7 +474,7 @@ void X509Certificate_MSCryptImpl :: setRawCert( Sequence< sal_Int8 > rawCert ) t
}
if( rawCert.getLength() != 0 ) {
- m_pCertContext = CertCreateCertificateContext( X509_ASN_ENCODING, ( const BYTE* )&rawCert[0], rawCert.getLength() ) ;
+ m_pCertContext = CertCreateCertificateContext( X509_ASN_ENCODING, ( const sal_uInt8* )&rawCert[0], rawCert.getLength() ) ;
}
}
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 9458424afa7c..f004d0195f88 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -112,7 +112,7 @@ char* GetPasswordFunction( PK11SlotInfo* pSlot, PRBool bRetry, void* /*arg*/ )
if ( pPasswordRequest->isPassword() )
{
ByteString aPassword = ByteString( String( pPasswordRequest->getPassword() ), gsl_getSystemTextEncoding() );
- USHORT nLen = aPassword.Len();
+ sal_uInt16 nLen = aPassword.Len();
char* pPassword = (char*) PORT_Alloc( nLen+1 ) ;
pPassword[nLen] = 0;
memcpy( pPassword, aPassword.GetBuffer(), nLen );
diff --git a/xmlsecurity/tools/demo/util.cxx b/xmlsecurity/tools/demo/util.cxx
index a124edfd523b..5f9fccb9f7d9 100644
--- a/xmlsecurity/tools/demo/util.cxx
+++ b/xmlsecurity/tools/demo/util.cxx
@@ -92,9 +92,9 @@ cssu::Reference< cssl::XMultiServiceFactory > CreateDemoServiceFactory()
{
SvFileStream* pStream = new SvFileStream( rStreamName, STREAM_READ );
pStream->Seek( STREAM_SEEK_TO_END );
- ULONG nBytes = pStream->Tell();
+ sal_uLong nBytes = pStream->Tell();
pStream->Seek( STREAM_SEEK_TO_BEGIN );
- SvLockBytesRef xLockBytes = new SvLockBytes( pStream, TRUE );
+ SvLockBytesRef xLockBytes = new SvLockBytes( pStream, sal_True );
uno::Reference< io::XInputStream > xInputStream = new utl::OInputStreamHelper( xLockBytes, nBytes );
return xInputStream;
@@ -104,7 +104,7 @@ cssu::Reference< cssl::XMultiServiceFactory > CreateDemoServiceFactory()
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > OpenOutputStream( const ::rtl::OUString& rStreamName )
{
SvFileStream* pStream = new SvFileStream( rStreamName, STREAM_WRITE );
- SvLockBytesRef xLockBytes = new SvLockBytes( pStream, TRUE );
+ SvLockBytesRef xLockBytes = new SvLockBytes( pStream, sal_True );
uno::Reference< io::XOutputStream > xOutputStream = new utl::OOutputStreamHelper( xLockBytes );
return xOutputStream;
diff --git a/xmlsecurity/tools/demo/util.hxx b/xmlsecurity/tools/demo/util.hxx
index 46abbc5b7e21..7ac5bb69a21a 100644
--- a/xmlsecurity/tools/demo/util.hxx
+++ b/xmlsecurity/tools/demo/util.hxx
@@ -47,4 +47,4 @@ long QueryVerifySignature();
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > OpenOutputStream( const ::rtl::OUString& rStreamName );
::rtl::OUString getSignatureInformations( const SignatureInformations& SignatureInformations, ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecurityEnvironment );
-::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > getCertificateFromEnvironment( ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecurityEnvironment, BOOL nType);
+::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > getCertificateFromEnvironment( ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecurityEnvironment, sal_Bool nType);
diff --git a/xmlsecurity/tools/demo/util2.cxx b/xmlsecurity/tools/demo/util2.cxx
index 0ec576d8d3f8..f0115c419aa8 100644
--- a/xmlsecurity/tools/demo/util2.cxx
+++ b/xmlsecurity/tools/demo/util2.cxx
@@ -331,7 +331,7 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
}
::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >
- getCertificateFromEnvironment( ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecurityEnvironment , BOOL nType)
+ getCertificateFromEnvironment( ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecurityEnvironment , sal_Bool nType)
{
cssu::Sequence< cssu::Reference< ::com::sun::star::security::XCertificate > > xPersonalCerts ;
int length = 0;
@@ -344,7 +344,7 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
encoding = osl_getTextEncodingFromLocale( pLocale ) ;
// CP end
- if( nType != FALSE )
+ if( nType != sal_False )
xPersonalCerts = xSecurityEnvironment->getPersonalCertificates() ;
else
return NULL; // not support then;
diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx
index 669d3e6705ea..005122b8cce7 100644
--- a/xmlsecurity/workben/signaturetest.cxx
+++ b/xmlsecurity/workben/signaturetest.cxx
@@ -226,7 +226,7 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
maCryptoCheckBox.SetPosSizePixel( TEXTFIELDSTARTX, nY, aOutputSize.Width()-2*TEXTFIELDSTARTX, FIXEDLINEHEIGHT );
maCryptoCheckBox.SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Use Default Token (NSS option only)" ) ) );
- maCryptoCheckBox.Check( TRUE );
+ maCryptoCheckBox.Check( sal_True );
maEditTokenName.Disable();
maFixedTextTokenName.Disable();
maCryptoCheckBox.SetClickHdl( LINK( this, MyWin, CryptoCheckBoxHdl ) );
@@ -475,7 +475,7 @@ IMPL_LINK( MyWin, SignButtonHdl, Button*, EMPTYARG )
aSignatureHelper.AddForSigning( nSecurityId, aBINFileName, aBINFileName, sal_True );
SvFileStream* pStream = new SvFileStream( aSIGFileName, STREAM_WRITE );
- SvLockBytesRef xLockBytes = new SvLockBytes( pStream, TRUE );
+ SvLockBytesRef xLockBytes = new SvLockBytes( pStream, sal_True );
uno::Reference< io::XOutputStream > xOutputStream = new utl::OOutputStreamHelper( xLockBytes );
bool bDone = aSignatureHelper.CreateAndWriteSignature( xOutputStream );
@@ -524,9 +524,9 @@ IMPL_LINK( MyWin, VerifyButtonHdl, Button*, EMPTYARG )
SvFileStream* pStream = new SvFileStream( aSIGFileName, STREAM_READ );
pStream->Seek( STREAM_SEEK_TO_END );
- ULONG nBytes = pStream->Tell();
+ sal_uLong nBytes = pStream->Tell();
pStream->Seek( STREAM_SEEK_TO_BEGIN );
- SvLockBytesRef xLockBytes = new SvLockBytes( pStream, TRUE );
+ SvLockBytesRef xLockBytes = new SvLockBytes( pStream, sal_True );
uno::Reference< io::XInputStream > xInputStream = new utl::OInputStreamHelper( xLockBytes, nBytes );
bool bDone = aSignatureHelper.ReadAndVerifySignature( xInputStream );
xInputStream->closeInput();