1 files changed, 8 insertions, 12 deletions

diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index c83abbcd6d36..2859b3d47b44 100644..100755
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -46,7 +46,7 @@
 
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
-#include "xmlsecctrl.hxx"
+#include "svx/xmlsecctrl.hxx"
 #include <tools/urlobj.hxx>
 
 #define PAINT_OFFSET    5
@@ -58,18 +58,18 @@ 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;
 
     mpImpl->maImage             = Image( SVX_RES( RID_SVXBMP_SIGNET              ) );
     mpImpl->maImageBroken       = Image( SVX_RES( RID_SVXBMP_SIGNET_BROKEN       ) );
@@ -81,15 +81,11 @@ XmlSecStatusBarControl::~XmlSecStatusBarControl()
     delete mpImpl;
 }
 
-void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 {
-    GetStatusBar().SetHelpText( GetId(), String() );// necessary ?
-
-    GetStatusBar().SetHelpId( GetId(), nSID );      // necessary ?
-
     if( SFX_ITEM_AVAILABLE != eState )
     {
-        mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
+        mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
     }
     else if( pState->ISA( SfxUInt16Item ) )
     {
@@ -98,7 +94,7 @@ void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, con
     else
     {
         DBG_ERRORFILE( "+XmlSecStatusBarControl::StateChanged(): invalid item type" );
-        mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
+        mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
     }
 
     if( GetStatusBar().AreItemsVisible() )              // necessary ?
@@ -106,7 +102,7 @@ void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, con
 
     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 )