11 files changed, 10 insertions, 52 deletions
diff --git a/avmedia/source/framework/makefile.mk b/avmedia/source/framework/makefile.mk
index 4c814c534844..4c814c534844 100644..100755
--- a/avmedia/source/framework/makefile.mk
+++ b/avmedia/source/framework/makefile.mk
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 110900071d3b..e69d4d3b93a0 100644..100755
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -87,13 +87,11 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
     const String aTimeText( RTL_CONSTASCII_USTRINGPARAM( " 00:00:00/00:00:00 " ) );
 
     SetBackground();
-    SetPaintTransparent( TRUE );
+    SetPaintTransparent( sal_True );
     SetParentClipMode( PARENTCLIPMODE_NOCLIP );
 
     if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle )
     {
-
-
         maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage( AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) );
         maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, HID_AVMEDIA_TOOLBOXITEM_OPEN );
 
@@ -104,16 +102,14 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
     }
     else
     {
-        maTimeSlider.SetBackground();
-        maVolumeSlider.SetBackground();
         mpZoomListBox->SetBackground();
 
         maZoomToolBox.SetBackground();
-        maZoomToolBox.SetPaintTransparent( TRUE );
+        maZoomToolBox.SetPaintTransparent( sal_True );
         maPlayToolBox.SetBackground();
-        maPlayToolBox.SetPaintTransparent( TRUE );
+        maPlayToolBox.SetPaintTransparent( sal_True );
         maMuteToolBox.SetBackground();
-        maMuteToolBox.SetPaintTransparent( TRUE );
+        maMuteToolBox.SetPaintTransparent( sal_True );
 
     }
 
@@ -367,7 +363,7 @@ void MediaControl::implUpdateToolboxes()
 
         if( !mpZoomListBox->IsTravelSelect() && !mpZoomListBox->IsInDropDown() )
         {
-            USHORT nSelectEntryPos ;
+            sal_uInt16 nSelectEntryPos ;
 
             switch( maItem.getZoom() )
             {
@@ -459,7 +455,7 @@ void MediaControl::implUpdateTimeField( double fCurTime )
 
 Image MediaControl::implGetImage( sal_Int32 nImageId ) const
 {
-    return maImageList.GetImage( static_cast< USHORT >( nImageId ) );
+    return maImageList.GetImage( static_cast< sal_uInt16 >( nImageId ) );
 }
 
 // ------------------------------------------------------------------------------
diff --git a/avmedia/source/framework/mediacontrol.hrc b/avmedia/source/framework/mediacontrol.hrc
index f69ab937f5f5..f69ab937f5f5 100644..100755
--- a/avmedia/source/framework/mediacontrol.hrc
+++ b/avmedia/source/framework/mediacontrol.hrc
diff --git a/avmedia/source/framework/mediacontrol.src b/avmedia/source/framework/mediacontrol.src
index 22ddc29b3550..22ddc29b3550 100644..100755
--- a/avmedia/source/framework/mediacontrol.src
+++ b/avmedia/source/framework/mediacontrol.src
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 5ed6c0d4ea69..d89d2db77e4e 100644..100755
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -51,7 +51,7 @@ TYPEINIT1_AUTOFACTORY( MediaItem, ::SfxPoolItem );
 
 // ------------------------------------------------------------------------------
 
-MediaItem::MediaItem( USHORT _nWhich, sal_uInt32 nMaskSet ) :
+MediaItem::MediaItem( sal_uInt16 _nWhich, sal_uInt32 nMaskSet ) :
     SfxPoolItem( _nWhich ),
     mnMaskSet( nMaskSet ),
     meState( MEDIASTATE_STOP ),
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index 882f5db55d9c..882f5db55d9c 100644..100755
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index af6fde31d984..350e4e92bbe2 100644..100755
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -46,7 +46,7 @@ namespace avmedia
 // - MediaPlayer -
 // ---------------
 
-MediaPlayer::MediaPlayer( Window* _pParent, USHORT nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
+MediaPlayer::MediaPlayer( Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
     SfxChildWindow( _pParent, nId )
 {
     pWindow = new MediaFloater( _pBindings, this, _pParent );
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index e6c7750b37a4..cb795692011b 100644..100755
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -96,7 +96,7 @@ SFX_IMPL_TOOLBOX_CONTROL( ::avmedia::MediaToolBoxControl, ::avmedia::MediaItem )
 
 // -----------------------------------------------------------------------------
 
-MediaToolBoxControl::MediaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
         rTbx.Invalidate();
@@ -110,7 +110,7 @@ MediaToolBoxControl::~MediaToolBoxControl()
 
 // -----------------------------------------------------------------------------
 
-void MediaToolBoxControl::StateChanged( USHORT /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
+void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     MediaToolBoxControl_Impl* pCtrl = static_cast< MediaToolBoxControl_Impl* >( GetToolBox().GetItemWindow( GetId() ) );
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index aba551d8f928..872106443732 100644..100755
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -494,44 +494,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char
        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-// -----------------------
-// - component_writeInfo -
-// -----------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
-    sal_Bool bRet = sal_False;
-
-    if( pRegistryKey )
-    {
-       try
-       {
-           rtl::OUString sKeyName = DECLARE_ASCII( "/" );
-           sKeyName += avmedia::SoundHandler::impl_getStaticImplementationName();
-           sKeyName += DECLARE_ASCII( "/UNO/SERVICES" );
-           css::uno::Reference< css::registry::XRegistryKey > xNewKey(
-               static_cast< css::registry::XRegistryKey* >( pRegistryKey )->createKey(sKeyName));
-
-           if ( xNewKey.is() == sal_True )
-           {
-               css::uno::Sequence< ::rtl::OUString > seqServiceNames = avmedia::SoundHandler::impl_getStaticSupportedServiceNames();
-               const ::rtl::OUString* pArray = seqServiceNames.getArray();
-               sal_Int32 nLength = seqServiceNames.getLength();
-               for ( sal_Int32 nCounter = 0; nCounter < nLength; ++nCounter )
-                   xNewKey->createKey( pArray[nCounter] );
-           }
-
-           bRet = sal_True;
-       }
-       catch( css::registry::InvalidRegistryException& )
-       {
-           OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-       }
-    }
-
-    return bRet;
-}
-
 // ------------------------
 // - component_getFactory -
 // ------------------------
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index 0544ee41071b..0544ee41071b 100644..100755
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
diff --git a/avmedia/source/framework/soundhandler.xml b/avmedia/source/framework/soundhandler.xml
index 065b31a2c402..065b31a2c402 100644..100755
--- a/avmedia/source/framework/soundhandler.xml
+++ b/avmedia/source/framework/soundhandler.xml