From 94d85ef550ad17efba5dec09290d0e8176a8b455 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Mon, 10 Jan 2011 16:11:35 +0100
Subject: removetooltypes01: #i112600# remove tooltypes from svx
---
svx/source/stbctrls/xmlsecctrl.cxx | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
(limited to 'svx/source/stbctrls/xmlsecctrl.cxx')
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 26daed799c6e..4a5062cc6645 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -80,19 +80,19 @@ struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl
{
Point maPos;
Size maSize;
- UINT16 mnState;
+ sal_uInt16 mnState;
Image maImage;
Image maImageBroken;
Image maImageNotValidated;
};
-XmlSecStatusBarControl::XmlSecStatusBarControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb )
+XmlSecStatusBarControl::XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb )
:SfxStatusBarControl( _nSlotId, _nId, _rStb )
,mpImpl( new XmlSecStatusBarControl_Impl )
{
- mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
+ mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
sal_Bool bHC = GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode();
mpImpl->maImage = Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_H : RID_SVXBMP_SIGNET ) );
@@ -107,11 +107,11 @@ XmlSecStatusBarControl::~XmlSecStatusBarControl()
delete mpImpl;
}
-void XmlSecStatusBarControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
if( SFX_ITEM_AVAILABLE != eState )
{
- mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
+ mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
}
else if( pState->ISA( SfxUInt16Item ) )
{
@@ -121,7 +121,7 @@ void XmlSecStatusBarControl::StateChanged( USHORT, SfxItemState eState, const Sf
else
{
DBG_ERRORFILE( "+XmlSecStatusBarControl::StateChanged(): invalid item type" );
- mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
+ mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
}
if( GetStatusBar().AreItemsVisible() ) // necessary ?
@@ -129,7 +129,7 @@ void XmlSecStatusBarControl::StateChanged( USHORT, SfxItemState eState, const Sf
GetStatusBar().SetItemText( GetId(), String() ); // necessary ?
- USHORT nResId = RID_SVXSTR_XMLSEC_NO_SIG;
+ sal_uInt16 nResId = RID_SVXSTR_XMLSEC_NO_SIG;
if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_OK )
nResId = RID_SVXSTR_XMLSEC_SIG_OK;
else if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_BROKEN )
--
cgit