Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
	avmedia/source/framework/mediacontrol.cxx
	connectivity/source/commontools/DateConversion.cxx
	desktop/source/deployment/registry/component/dp_component.cxx
	editeng/inc/editeng/numitem.hxx
	editeng/inc/editeng/txtrange.hxx
	editeng/source/editeng/editobj.cxx
	editeng/source/editeng/editview.cxx
	editeng/source/editeng/eehtml.cxx
	editeng/source/editeng/impedit3.cxx
	editeng/source/editeng/impedit4.cxx
	editeng/source/misc/txtrange.cxx
	editeng/source/outliner/outlin2.cxx
	editeng/source/outliner/outlvw.cxx
	framework/source/layoutmanager/layoutmanager.cxx
	linguistic/source/lngsvcmgr.hxx
	sfx2/source/appl/app.cxx
	sfx2/source/appl/app.src
	sfx2/source/appl/appbas.cxx
	sfx2/source/appl/appcfg.cxx
	sfx2/source/appl/appdde.cxx
	sfx2/source/appl/appmain.cxx
	sfx2/source/appl/appopen.cxx
	sfx2/source/appl/appquit.cxx
	sfx2/source/appl/appserv.cxx
	sfx2/source/appl/childwin.cxx
	sfx2/source/appl/fileobj.cxx
	sfx2/source/appl/fileobj.hxx
	sfx2/source/appl/workwin.cxx
	sfx2/source/control/dispatch.cxx
	sfx2/source/control/macro.cxx
	sfx2/source/control/objface.cxx
	sfx2/source/control/request.cxx
	sfx2/source/control/shell.cxx
	sfx2/source/control/statcach.cxx
	sfx2/source/dialog/dinfdlg.cxx
	sfx2/source/dialog/dockwin.cxx
	sfx2/source/dialog/mailmodel.cxx
	sfx2/source/dialog/mailmodelapi.cxx
	sfx2/source/dialog/mgetempl.cxx
	sfx2/source/dialog/splitwin.cxx
	sfx2/source/dialog/styledlg.cxx
	sfx2/source/dialog/tabdlg.cxx
	sfx2/source/dialog/templdlg.cxx
	sfx2/source/dialog/tplcitem.cxx
	sfx2/source/dialog/tplpitem.cxx
	sfx2/source/doc/doctempl.cxx
	sfx2/source/doc/docvor.cxx
	sfx2/source/doc/new.cxx
	sfx2/source/doc/objcont.cxx
	sfx2/source/doc/objserv.cxx
	sfx2/source/doc/objxtor.cxx
	sfx2/source/inc/appdata.hxx
	sfx2/source/inc/helpid.hrc
	sfx2/source/inc/sfxlocal.hrc
	sfx2/source/inc/statcach.hxx
	sfx2/source/inc/templdgi.hxx
	sfx2/source/inc/virtmenu.hxx
	sfx2/source/inc/workwin.hxx
	sfx2/source/menu/mnumgr.cxx
	sfx2/source/menu/virtmenu.cxx
	sfx2/source/statbar/stbitem.cxx
	sfx2/source/view/frame.cxx
	sfx2/source/view/frame2.cxx
	sfx2/source/view/orgmgr.cxx
	sfx2/source/view/printer.cxx
	sfx2/source/view/prnmon.cxx
	sfx2/source/view/sfxbasecontroller.cxx
	sfx2/source/view/viewfrm.cxx
	sfx2/source/view/viewfrm2.cxx
	sfx2/source/view/viewprn.cxx
	sfx2/source/view/viewsh.cxx
	svx/inc/svx/svditer.hxx
	svx/source/dialog/sdstring.src
	svx/source/form/fmpage.cxx
	svx/source/form/formcontroller.cxx
	svx/source/svdraw/svdcrtv.cxx
	svx/source/svdraw/svditer.cxx
	svx/source/svdraw/svdview.cxx
	xmloff/source/forms/elementimport.cxx

85 files changed, 361 insertions, 324 deletions

diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index 7b80f5899a..bec9391f65 100644..100755
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -70,7 +70,7 @@ class MediaItem : public SfxPoolItem
 public:
                             TYPEINFO();
 
-                            MediaItem( USHORT nWhich = 0, sal_uInt32 nMaskSet = AVMEDIA_SETMASK_NONE );
+                            MediaItem( sal_uInt16 nWhich = 0, sal_uInt32 nMaskSet = AVMEDIA_SETMASK_NONE );
                             MediaItem( const MediaItem& rMediaItem );
     virtual					~MediaItem();
 
@@ -81,8 +81,8 @@ public:
                                                  SfxMapUnit ePresUnit,
                                                  XubString& rText, 
                                                  const IntlWrapper *pIntl ) const;
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     void					merge( const MediaItem& rMediaItem );
 
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
index 175719a8f4..2d382113be 100644..100755
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -53,7 +53,7 @@ namespace avmedia
 class MediaPlayer : public SfxChildWindow
 {
 public:
-                        MediaPlayer( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+                        MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
                         ~MediaPlayer();
 
                         SFX_DECL_CHILDWINDOW( MediaPlayer );
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
index c65a670a58..681305af55 100644..100755
--- a/avmedia/inc/avmedia/mediatoolbox.hxx
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -49,10 +49,10 @@ public:
 
                                 SFX_DECL_TOOLBOX_CONTROL();
 
-                                MediaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbX );
+                                MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbX );
                                 ~MediaToolBoxControl();
 
-    virtual void				StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void				StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual Window*				CreateItemWindow( Window* pParent );
 
 private:
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
index dc4ea62aa6..dc4ea62aa6 100644..100755
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/avmedia/inc/avmedia/mediawindow.hxx
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc
index 1f7ffb6172..a16eaa6ce9 100644..100755
--- a/avmedia/inc/helpids.hrc
+++ b/avmedia/inc/helpids.hrc
@@ -28,19 +28,17 @@
 #ifndef _AVMEDIA_HELPIDS_HRC
 #define _AVMEDIA_HELPIDS_HRC
 
-#include <svl/solar.hrc>
-
-#define HID_AVMEDIA_TOOLBOXITEM_PLAY 	(HID_AVMEDIA_START+0)
-#define HID_AVMEDIA_TOOLBOXITEM_PAUSE 	(HID_AVMEDIA_START+1)
-#define HID_AVMEDIA_TOOLBOXITEM_STOP 	(HID_AVMEDIA_START+2)
-#define HID_AVMEDIA_TOOLBOXITEM_MUTE	(HID_AVMEDIA_START+3)
-#define HID_AVMEDIA_TOOLBOXITEM_LOOP	(HID_AVMEDIA_START+4)
-#define HID_AVMEDIA_TOOLBOXITEM_OPEN 	(HID_AVMEDIA_START+5)
-#define HID_AVMEDIA_TOOLBOXITEM_INSERT 	(HID_AVMEDIA_START+6)
-#define HID_AVMEDIA_ZOOMLISTBOX 	    (HID_AVMEDIA_START+7)
-#define HID_AVMEDIA_TIMESLIDER          (HID_AVMEDIA_START+8)
-#define HID_AVMEDIA_TIMEEDIT            (HID_AVMEDIA_START+9)
-#define HID_AVMEDIA_VOLUMESLIDER        (HID_AVMEDIA_START+10)
-#define HID_AVMEDIA_PLAYERWINDOW        (HID_AVMEDIA_START+11)
+#define HID_AVMEDIA_TOOLBOXITEM_PLAY                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY"
+#define HID_AVMEDIA_TOOLBOXITEM_PAUSE                      "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE"
+#define HID_AVMEDIA_TOOLBOXITEM_STOP                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP"
+#define HID_AVMEDIA_TOOLBOXITEM_MUTE                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE"
+#define HID_AVMEDIA_TOOLBOXITEM_LOOP                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP"
+#define HID_AVMEDIA_TOOLBOXITEM_OPEN                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN"
+#define HID_AVMEDIA_TOOLBOXITEM_INSERT                     "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT"
+#define HID_AVMEDIA_ZOOMLISTBOX                            "AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX"
+#define HID_AVMEDIA_TIMESLIDER                             "AVMEDIA_HID_AVMEDIA_TIMESLIDER"
+#define HID_AVMEDIA_TIMEEDIT                               "AVMEDIA_HID_AVMEDIA_TIMEEDIT"
+#define HID_AVMEDIA_VOLUMESLIDER                           "AVMEDIA_HID_AVMEDIA_VOLUMESLIDER"
+#define HID_AVMEDIA_PLAYERWINDOW                           "AVMEDIA_HID_AVMEDIA_PLAYERWINDOW"
 
 #endif // _AVMEDIA_HELPIDS_HRC
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index 20e90c4ee2..20e90c4ee2 100644..100755
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
diff --git a/avmedia/prj/build.lst b/avmedia/prj/build.lst
index 025e850973..7d9343b916 100644..100755
--- a/avmedia/prj/build.lst
+++ b/avmedia/prj/build.lst
@@ -1,4 +1,4 @@
-av	avmedia	:    l10n tools sfx2 NULL
+av	avmedia	:    L10N:l10n tools sfx2 LIBXSLT:libxslt NULL
 av	avmedia                 	usr1	-	all	av_mkout												NULL
 av	avmedia\prj					get		-	all	av_prj													NULL
 av	avmedia\inc					get		-	all	av_inv													NULL
@@ -7,5 +7,5 @@ av  avmedia\source\framework	nmake	-	all	av_framework	        								NULL
 av  avmedia\source\win	    	nmake	-	all	av_win	            									NULL
 av	avmedia\source\java			nmake	-	all	av_java	            									NULL
 av	avmedia\source\quicktime	nmake	-	all	av_quicktime											NULL
-av	avmedia\source\gstreamer		nmake	-	all	av_gstreamer           									NULL
+av	avmedia\source\gstreamer	nmake	-	all	av_gstreamer	            							NULL
 av	avmedia\util				nmake	-	all	av_util av_viewer av_framework av_win av_java av_quicktime av_gstreamer	NULL
diff --git a/avmedia/prj/d.lst b/avmedia/prj/d.lst
index c82db252aa..23f7c35723 100644..100755
--- a/avmedia/prj/d.lst
+++ b/avmedia/prj/d.lst
@@ -16,3 +16,8 @@ mkdir: %_DEST%\inc%_EXT%\avmedia
 ..\inc\avmedia\mediatoolbox.hxx %_DEST%\inc%_EXT%\avmedia\mediatoolbox.hxx
 
 ..\%__SRC%\class\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar
+..\%__SRC%\misc\avmedia.component %_DEST%\xml%_EXT%\avmedia.component
+..\%__SRC%\misc\avmedia.jar.component %_DEST%\xml%_EXT%\avmedia.jar.component
+..\%__SRC%\misc\avmediaQuickTime.component %_DEST%\xml%_EXT%\avmediaQuickTime.component
+..\%__SRC%\misc\avmediagstreamer.component %_DEST%\xml%_EXT%\avmediagstreamer.component
+..\%__SRC%\misc\avmediawin.component %_DEST%\xml%_EXT%\avmediawin.component
diff --git a/avmedia/source/framework/makefile.mk b/avmedia/source/framework/makefile.mk
index 4c814c5348..4c814c5348 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 2afc68c57a..832fb1f27f 100644..100755
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -87,12 +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 );
         
@@ -103,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 );
 
     }
     
@@ -366,7 +363,7 @@ void MediaControl::implUpdateToolboxes()
         
         if( !mpZoomListBox->IsTravelSelect() && !mpZoomListBox->IsInDropDown() )
         {
-            USHORT nSelectEntryPos ;
+            sal_uInt16 nSelectEntryPos ;
         
             switch( maItem.getZoom() )
             {
@@ -458,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 1c98b5ac81..1c98b5ac81 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 e7d6958e65..e7d6958e65 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 8501fd054d..e6096ddc47 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 ),
@@ -123,7 +123,7 @@ SfxItemPresentation MediaItem::GetPresentation( SfxItemPresentation,
 
 //------------------------------------------------------------------------
 
-bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
+bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const
 {
     uno::Sequence< uno::Any > aSeq( 9 );
 
@@ -144,7 +144,7 @@ bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
 
 //------------------------------------------------------------------------
 
-bool MediaItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
+bool MediaItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 )
 {
     uno::Sequence< uno::Any >	aSeq;
     bool						bRet = false;
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index 73f1d75206..73f1d75206 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 9ef4042c5b..d1f20ee6ff 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 993bf5d507..f0e10900f2 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 5048961376..5e7e3cdc76 100644..100755
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -493,44 +493,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 67f4f6bf6f..67f4f6bf6f 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 3eb039dec7..3eb039dec7 100644..100755
--- a/avmedia/source/framework/soundhandler.xml
+++ b/avmedia/source/framework/soundhandler.xml
diff --git a/avmedia/source/gstreamer/ChangeLog b/avmedia/source/gstreamer/ChangeLog
index 8671b11a97..8671b11a97 100644..100755
--- a/avmedia/source/gstreamer/ChangeLog
+++ b/avmedia/source/gstreamer/ChangeLog
diff --git a/avmedia/source/gstreamer/avmediagst.component b/avmedia/source/gstreamer/avmediagst.component
new file mode 100755
index 0000000000..75d39d275f
--- /dev/null
+++ b/avmedia/source/gstreamer/avmediagst.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.avmedia.Manager_GStreamer">
+    <service name="com.sun.star.media.Manager_GStreamer"/>
+  </implementation>
+</component>
diff --git a/avmedia/source/gstreamer/avmediagstreamer.component b/avmedia/source/gstreamer/avmediagstreamer.component
new file mode 100644
index 0000000000..97a8c83709
--- /dev/null
+++ b/avmedia/source/gstreamer/avmediagstreamer.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component loader="com.sun.star.loader.SharedLibrary" xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.avmedia.Manager_GStreamer">
+    <service name="com.sun.star.media.Manager_GStreamer"/>
+  </implementation>
+</component>
diff --git a/avmedia/source/gstreamer/exports.dxp b/avmedia/source/gstreamer/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/avmedia/source/gstreamer/exports.dxp
+++ b/avmedia/source/gstreamer/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/avmedia/source/gstreamer/gstcommon.hxx b/avmedia/source/gstreamer/gstcommon.hxx
index 1d9b5caaff..1d9b5caaff 100644..100755
--- a/avmedia/source/gstreamer/gstcommon.hxx
+++ b/avmedia/source/gstreamer/gstcommon.hxx
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index e0b161c483..e0b161c483 100644..100755
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index fc0795221a..fc0795221a 100644..100755
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx
index 558b949563..558b949563 100644..100755
--- a/avmedia/source/gstreamer/gstmanager.cxx
+++ b/avmedia/source/gstreamer/gstmanager.cxx
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index 2d83215402..2d83215402 100644..100755
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 227f1eca8c..227f1eca8c 100644..100755
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 02839dc9b2..02839dc9b2 100644..100755
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
index 4ce3fdf6d2..da9ee9aa47 100644..100755
--- a/avmedia/source/gstreamer/gstuno.cxx
+++ b/avmedia/source/gstreamer/gstuno.cxx
@@ -39,46 +39,11 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno:
     return uno::Reference< uno::XInterface >( *new ::avmedia::gstreamer::Manager( rxFact ) );
 }
 
-// ------------------------------------------
-// - component_getImplementationEnvironment -
-// ------------------------------------------
-
 extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
     *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
-        {
-            uno::Reference< registry::XRegistryKey > xNewKey1(
-                static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/com.sun.star.comp.media.Manager_GStreamer/UNO/SERVICES/com.sun.star.media.Manager_GStreamer" )) ) );
-
-            bRet = sal_True;
-        }
-        catch( registry::InvalidRegistryException& )
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-
-    return bRet;
-}
-
-// ------------------------
-// - component_getFactory -
-// ------------------------
-
 extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
 {
     uno::Reference< lang::XSingleServiceFactory > xFactory;
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index 9228f9e6c9..9228f9e6c9 100644..100755
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index 18b9a7dbd0..18b9a7dbd0 100644..100755
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
diff --git a/avmedia/source/gstreamer/makefile.mk b/avmedia/source/gstreamer/makefile.mk
index 2f52b9cc47..692a63abe7 100644..100755
--- a/avmedia/source/gstreamer/makefile.mk
+++ b/avmedia/source/gstreamer/makefile.mk
@@ -70,8 +70,19 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 DEF1EXPORTFILE=exports.dxp
 
-.ENDIF
-
-.ENDIF
+.ENDIF # UNX / WNT
+.ENDIF # ENABLE_GSTREAMER
 
 .INCLUDE :  	target.mk
+
+.IF "$(ENABLE_GSTREAMER)" == "TRUE"
+.IF "$(GUI)" == "UNX" || "$(GUI)" == "WNT"
+
+ALLTAR : $(MISC)/avmediagstreamer.component
+$(MISC)/avmediagstreamer.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt avmediagstreamer.component
+    $(XSLTPROC) --nonet \
+	--stringparam uri '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' \
+	-o $@ $(SOLARENV)/bin/createcomponent.xslt avmediagstreamer.component
+
+.ENDIF # UNX / WNT
+.ENDIF # ENABLE_GSTREAMER
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index 7c24df071a..47c78f3f13 100644..100755
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -34,12 +34,30 @@ class ResMgr;
 #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
 #else
 #ifdef WNT 
-#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
+
+#define AVMEDIA_MANAGER_SERVICE_NAME                    "com.sun.star.comp.avmedia.Manager_DirectX"
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED            sal_False
+
+#define AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1          ""
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1  sal_False
+
 #else
 #ifdef QUARTZ
-#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_QuickTime"
+
+#define AVMEDIA_MANAGER_SERVICE_NAME                    "com.sun.star.comp.avmedia.Manager_QuickTime"
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED            sal_False
+
+#define AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1           ""
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1  sal_False
+
 #else
-#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
+
+#define AVMEDIA_MANAGER_SERVICE_NAME                    "com.sun.star.comp.avmedia.Manager_GStreamer"
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED            sal_False
+
+#define AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1          "com.sun.star.comp.avmedia.Manager_Java"
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1  sal_True
+
 #endif
 #endif
 #endif
diff --git a/avmedia/source/java/FrameGrabber.java b/avmedia/source/java/FrameGrabber.java
index a3ad559aa9..a3ad559aa9 100644..100755
--- a/avmedia/source/java/FrameGrabber.java
+++ b/avmedia/source/java/FrameGrabber.java
diff --git a/avmedia/source/java/Manager.java b/avmedia/source/java/Manager.java
index a85a5176a1..a85a5176a1 100644..100755
--- a/avmedia/source/java/Manager.java
+++ b/avmedia/source/java/Manager.java
diff --git a/avmedia/source/java/MediaUno.java b/avmedia/source/java/MediaUno.java
index 004ae7cf68..b77fd97eae 100644..100755
--- a/avmedia/source/java/MediaUno.java
+++ b/avmedia/source/java/MediaUno.java
@@ -64,13 +64,4 @@ public class MediaUno
                 
         return null;
     }
-
-    // -------------------------------------------------------------------------
-    
-    public static boolean __writeRegistryServiceInfo(
-        com.sun.star.registry.XRegistryKey regKey )
-    {
-        return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(
-            s_implName, s_serviceName, regKey );
-    }
 }
diff --git a/avmedia/source/java/Player.java b/avmedia/source/java/Player.java
index d35be5cc1a..d35be5cc1a 100644..100755
--- a/avmedia/source/java/Player.java
+++ b/avmedia/source/java/Player.java
diff --git a/avmedia/source/java/PlayerWindow.java b/avmedia/source/java/PlayerWindow.java
index 4bc9db4ac7..58df751b39 100644..100755
--- a/avmedia/source/java/PlayerWindow.java
+++ b/avmedia/source/java/PlayerWindow.java
@@ -67,9 +67,7 @@ public class PlayerWindow implements java.awt.event.KeyListener,
 
                 maFrame = new WindowAdapter( AnyConverter.toInt( aArgs[ 0 ] ) );
                 maFrame.setPosSize( aBoundRect.X, aBoundRect.Y, aBoundRect.Width, aBoundRect.Height, (short) 0 );
-
-                if( aArgs.length > 2 )
-                    mbShowControls = AnyConverter.toBoolean( aArgs[ 2 ] );
+                mbShowControls = false;
 
                 java.awt.Panel aPanel = new java.awt.Panel( new java.awt.BorderLayout() );
 
diff --git a/avmedia/source/java/WindowAdapter.java b/avmedia/source/java/WindowAdapter.java
index 053b37e1bd..053b37e1bd 100644..100755
--- a/avmedia/source/java/WindowAdapter.java
+++ b/avmedia/source/java/WindowAdapter.java
diff --git a/avmedia/source/java/avmedia.jar b/avmedia/source/java/avmedia.jar
index 55576baa5b..85a98bbcf3 100644..100755
--- a/avmedia/source/java/avmedia.jar
+++ b/avmedia/source/java/avmedia.jar
diff --git a/avmedia/source/java/avmedia.jar.component b/avmedia/source/java/avmedia.jar.component
new file mode 100755
index 0000000000..d7cc160bd7
--- /dev/null
+++ b/avmedia/source/java/avmedia.jar.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.media.Manager_Java">
+    <service name="com.sun.star.media.Manager_Java"/>
+  </implementation>
+</component>
diff --git a/avmedia/source/java/makefile.mk b/avmedia/source/java/makefile.mk
index 37c53a7211..1fe771c117 100644..100755
--- a/avmedia/source/java/makefile.mk
+++ b/avmedia/source/java/makefile.mk
@@ -59,3 +59,11 @@ CUSTOMMANIFESTFILE      = manifest
 # --- Targets ------------------------------------------------------
 
 .INCLUDE: target.mk
+
+ALLTAR : $(MISC)/avmedia.jar.component
+
+$(MISC)/avmedia.jar.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt avmedia.jar.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)avmedia.jar' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt avmedia.jar.component
diff --git a/avmedia/source/java/manifest b/avmedia/source/java/manifest
index fa9c2500d3..fa9c2500d3 100644..100755
--- a/avmedia/source/java/manifest
+++ b/avmedia/source/java/manifest
diff --git a/avmedia/source/java/win/SystemWindowAdapter.java b/avmedia/source/java/win/SystemWindowAdapter.java
index 1d2f143add..1d2f143add 100644..100755
--- a/avmedia/source/java/win/SystemWindowAdapter.java
+++ b/avmedia/source/java/win/SystemWindowAdapter.java
diff --git a/avmedia/source/java/x11/SystemWindowAdapter.java b/avmedia/source/java/x11/SystemWindowAdapter.java
index 6cada42982..6cada42982 100644..100755
--- a/avmedia/source/java/x11/SystemWindowAdapter.java
+++ b/avmedia/source/java/x11/SystemWindowAdapter.java
diff --git a/avmedia/source/quicktime/avmediaQuickTime.component b/avmedia/source/quicktime/avmediaQuickTime.component
new file mode 100755
index 0000000000..aa0251d74c
--- /dev/null
+++ b/avmedia/source/quicktime/avmediaQuickTime.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.avmedia.Manager_QuickTime">
+    <service name="com.sun.star.media.Manager_QuickTime"/>
+  </implementation>
+</component>
diff --git a/avmedia/source/quicktime/framegrabber.cxx b/avmedia/source/quicktime/framegrabber.cxx
index d6b51290cc..d6b51290cc 100644..100755
--- a/avmedia/source/quicktime/framegrabber.cxx
+++ b/avmedia/source/quicktime/framegrabber.cxx
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index 95d62c18cf..95d62c18cf 100644..100755
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk
index f3c9f244f3..358fce4918 100644..100755
--- a/avmedia/source/quicktime/makefile.mk
+++ b/avmedia/source/quicktime/makefile.mk
@@ -83,3 +83,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 dummy:
     @echo " Nothing to build for GUIBASE=$(GUIBASE)"
 .ENDIF
+
+ALLTAR : $(MISC)/avmediaQuickTime.component
+
+$(MISC)/avmediaQuickTime.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
diff --git a/avmedia/source/quicktime/manager.cxx b/avmedia/source/quicktime/manager.cxx
index bdf5105cae..bdf5105cae 100644..100755
--- a/avmedia/source/quicktime/manager.cxx
+++ b/avmedia/source/quicktime/manager.cxx
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index 2fb8f3d106..2fb8f3d106 100644..100755
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
diff --git a/avmedia/source/quicktime/player.cxx b/avmedia/source/quicktime/player.cxx
index d77dcf2438..d77dcf2438 100644..100755
--- a/avmedia/source/quicktime/player.cxx
+++ b/avmedia/source/quicktime/player.cxx
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index f8dd0ebe12..f8dd0ebe12 100644..100755
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
index c768901164..c768901164 100644..100755
--- a/avmedia/source/quicktime/quicktimecommon.hxx
+++ b/avmedia/source/quicktime/quicktimecommon.hxx
diff --git a/avmedia/source/quicktime/quicktimeuno.cxx b/avmedia/source/quicktime/quicktimeuno.cxx
index ba80cc85da..f127beb788 100644..100755
--- a/avmedia/source/quicktime/quicktimeuno.cxx
+++ b/avmedia/source/quicktime/quicktimeuno.cxx
@@ -49,35 +49,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
-        {
-            uno::Reference< registry::XRegistryKey > xNewKey1(
-                static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(                                
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                    "/" AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME "/UNO/SERVICES/"
-                    AVMEDIA_QUICKTIME_MANAGER_SERVICENAME )) ) );
-            
-            bRet = sal_True;
-        }
-        catch( registry::InvalidRegistryException& )
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-
-    return bRet;
-}
-
 // ------------------------
 // - component_getFactory -
 // ------------------------
diff --git a/avmedia/source/quicktime/window.cxx b/avmedia/source/quicktime/window.cxx
index 7e09966d03..7e09966d03 100644..100755
--- a/avmedia/source/quicktime/window.cxx
+++ b/avmedia/source/quicktime/window.cxx
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index a2e58ece2c..a2e58ece2c 100644..100755
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
diff --git a/avmedia/source/viewer/makefile.mk b/avmedia/source/viewer/makefile.mk
index 7771d1eb05..7771d1eb05 100644..100755
--- a/avmedia/source/viewer/makefile.mk
+++ b/avmedia/source/viewer/makefile.mk
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index 1d96dc9245..1bdca46406 100644..100755
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -118,7 +118,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt
     if( mpNotifyWindow )
     {
         MouseEvent aVCLMouseEvt( Point( e.X, e.Y ),
-                                 sal::static_int_cast< USHORT >(e.ClickCount),
+                                 sal::static_int_cast< sal_uInt16 >(e.ClickCount),
                                  0,
                                 ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) |
                                 ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
@@ -139,7 +139,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw
     if( mpNotifyWindow )
     {
         MouseEvent aVCLMouseEvt( Point( e.X, e.Y ),
-                                 sal::static_int_cast< USHORT >(e.ClickCount),
+                                 sal::static_int_cast< sal_uInt16 >(e.ClickCount),
                                  0,
                                 ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) |
                                 ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index 7246eb7b36..7246eb7b36 100644..100755
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 2e20eadb97..1bec5100c5 100644..100755
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -163,7 +163,9 @@ Size MediaWindow::getPreferredSize() const
 void MediaWindow::setPosSize( const Rectangle& rNewRect )
 {
     if( mpImpl )
+    {
         mpImpl->setPosSize( rNewRect );
+    }
 }
 
 // -------------------------------------------------------------------------
@@ -370,6 +372,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
                                         "AVI", "avi",
                                         "CD Audio", "cda",
                                         "FLAC Audio", "flac",
+                                        "Matroska Media", "mkv",
                                         "MIDI Audio", "mid;midi",
                                         "MPEG Audio", "mp2;mp3;mpa",
                                         "MPEG Video", "mpg;mpeg;mpv;mp4",
@@ -466,39 +469,26 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr
     {
         if( bDeep || pPreferredSizePixel )
         {
-            uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
-
-            if( xFactory.is() )
+            try
             {
-                try
-                {
-                    fprintf(stderr, "-->%s uno reference \n\n",AVMEDIA_MANAGER_SERVICE_NAME);
+                uno::Reference< media::XPlayer > xPlayer( priv::MediaWindowImpl::createPlayer(
+                                                            aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) );
 
-                    uno::Reference< ::com::sun::star::media::XManager > xManager(
-                        xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MANAGER_SERVICE_NAME )) ),
-                        uno::UNO_QUERY );
+                if( xPlayer.is() )
+                {
+                    bRet = true;
 
-                    if( xManager.is() )
+                    if( pPreferredSizePixel )
                     {
-                        uno::Reference< media::XPlayer > xPlayer( xManager->createPlayer( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) );
-
-                        if( xPlayer.is() )
-                        {
-                            bRet = true;
+                        const awt::Size aAwtSize( xPlayer->getPreferredPlayerWindowSize() );
 
-                            if( pPreferredSizePixel )
-                            {
-                                const awt::Size aAwtSize( xPlayer->getPreferredPlayerWindowSize() );
-
-                                pPreferredSizePixel->Width() = aAwtSize.Width;
-                                pPreferredSizePixel->Height() = aAwtSize.Height;
-                            }
-                        }
+                        pPreferredSizePixel->Width() = aAwtSize.Width;
+                        pPreferredSizePixel->Height() = aAwtSize.Height;
                     }
                 }
-                catch( ... )
-                {
-                }
+            }
+            catch( ... )
+            {
             }
         }
         else
diff --git a/avmedia/source/viewer/mediawindow.hrc b/avmedia/source/viewer/mediawindow.hrc
index 988088e88b..988088e88b 100644..100755
--- a/avmedia/source/viewer/mediawindow.hrc
+++ b/avmedia/source/viewer/mediawindow.hrc
diff --git a/avmedia/source/viewer/mediawindow.src b/avmedia/source/viewer/mediawindow.src
index 4cadd3fac8..4cadd3fac8 100644..100755
--- a/avmedia/source/viewer/mediawindow.src
+++ b/avmedia/source/viewer/mediawindow.src
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 3e4151037a..48cd33b078 100644..100755
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -77,7 +77,7 @@ MediaWindowControl::~MediaWindowControl()
 void MediaWindowControl::update()
 {
     MediaItem aItem;
-    
+
     static_cast< MediaWindowImpl* >( GetParent() )->updateMediaItem( aItem );
     setState( aItem );
 }
@@ -94,11 +94,7 @@ void  MediaWindowControl::execute( const MediaItem& rItem )
 // --------------------
 
 MediaChildWindow::MediaChildWindow( Window* pParent ) :
-#ifdef GSTREAMER
     SystemChildWindow( pParent, WB_CLIPCHILDREN )
-#else
-    JavaChildWindow( pParent, WB_CLIPCHILDREN )
-#endif
 {
 }
 
@@ -114,12 +110,8 @@ void MediaChildWindow::MouseMove( const MouseEvent& rMEvt )
 {
     const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
                                           rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
-    
-#ifdef GSTREAMER
+
     SystemChildWindow::MouseMove( rMEvt );
-#else
-    JavaChildWindow::MouseMove( rMEvt );
-#endif
     GetParent()->MouseMove( aTransformedEvent );
 }
 
@@ -129,12 +121,8 @@ void MediaChildWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
     const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
                                           rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
-    
-#ifdef GSTREAMER
+
     SystemChildWindow::MouseButtonDown( rMEvt );
-#else
-    JavaChildWindow::MouseButtonDown( rMEvt );
-#endif
     GetParent()->MouseButtonDown( aTransformedEvent );
 }
 
@@ -145,11 +133,7 @@ void MediaChildWindow::MouseButtonUp( const MouseEvent& rMEvt )
     const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
                                           rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
 
-#ifdef GSTREAMER
     SystemChildWindow::MouseButtonUp( rMEvt );
-#else
-    JavaChildWindow::MouseButtonUp( rMEvt );
-#endif
     GetParent()->MouseButtonUp( aTransformedEvent );
 }
 
@@ -157,11 +141,7 @@ void MediaChildWindow::MouseButtonUp( const MouseEvent& rMEvt )
 
 void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
 {
-#ifdef GSTREAMER
     SystemChildWindow::KeyInput( rKEvt );
-#else
-    JavaChildWindow::KeyInput( rKEvt );
-#endif
     GetParent()->KeyInput( rKEvt );
 }
 
@@ -169,11 +149,7 @@ void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
 
 void MediaChildWindow::KeyUp( const KeyEvent& rKEvt )
 {
-#ifdef GSTREAMER
     SystemChildWindow::KeyUp( rKEvt );
-#else
-    JavaChildWindow::KeyUp( rKEvt );
-#endif
     GetParent()->KeyUp( rKEvt );
 }
 
@@ -183,12 +159,8 @@ void MediaChildWindow::Command( const CommandEvent& rCEvt )
 {
     const CommandEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rCEvt.GetMousePosPixel() ) ),
                                             rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() );
-    
-#ifdef GSTREAMER
+
     SystemChildWindow::Command( rCEvt );
-#else
-    JavaChildWindow::Command( rCEvt );
-#endif
     GetParent()->Command( aTransformedEvent );
 }
 
@@ -207,9 +179,10 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bo
     mpEmptyBmpEx( NULL ),
     mpAudioBmpEx( NULL )
 {
+    maChildWindow.SetBackground( Color( COL_BLACK ) );
     maChildWindow.SetHelpId( HID_AVMEDIA_PLAYERWINDOW );
     maChildWindow.Hide();
-    
+
     if( mpMediaWindowControl )
     {
         mpMediaWindowControl->SetSizePixel( mpMediaWindowControl->getMinSizePixel() );
@@ -239,12 +212,12 @@ void MediaWindowImpl::cleanUp()
         xPlayerWindow->removeKeyListener( uno::Reference< awt::XKeyListener >( mxEventsIf, uno::UNO_QUERY ) );
         xPlayerWindow->removeMouseListener( uno::Reference< awt::XMouseListener >( mxEventsIf, uno::UNO_QUERY ) );
         xPlayerWindow->removeMouseMotionListener( uno::Reference< awt::XMouseMotionListener >( mxEventsIf, uno::UNO_QUERY ) );
-        
+
         uno::Reference< lang::XComponent > xComponent( xPlayerWindow, uno::UNO_QUERY );
-        
+
         if( xComponent.is() )
             xComponent->dispose();
-            
+
         setPlayerWindow( NULL );
     }
 
@@ -261,28 +234,15 @@ void MediaWindowImpl::onURLChanged()
         uno::Reference< media::XPlayerWindow > xPlayerWindow;
         const Point                            aPoint;
         const Size					           aSize( maChildWindow.GetSizePixel() );
-#ifndef GSTREAMER
-        const sal_IntPtr                       nWndHandle = static_cast< sal_IntPtr >( maChildWindow.getParentWindowHandleForJava() );
-#else
         const sal_Int32                        nWndHandle = 0;
-#endif
        
         aArgs[ 0 ] = uno::makeAny( nWndHandle );
         aArgs[ 1 ] = uno::makeAny( awt::Rectangle( aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height() ) );
-#ifdef GSTREAMER
-                const SystemEnvData *pSystemData = maChildWindow.GetSystemData();
-                OSL_TRACE( "MediaWindowImpl::onURLChanged xwindow id: %ld", pSystemData->aWindow );
-                aArgs[ 2 ] = uno::makeAny( pSystemData->aWindow );
-#endif
-        
+        aArgs[ 2 ] = uno::makeAny( reinterpret_cast< sal_IntPtr >( &maChildWindow ) );
+
         try
         {
-#ifdef GSTREAMER
-            if( pSystemData->aWindow != 0 )
-#else
-            if( nWndHandle != 0 )
-#endif
-                xPlayerWindow = getPlayer()->createPlayerWindow( aArgs );
+            xPlayerWindow = getPlayer()->createPlayerWindow( aArgs );
         }
         catch( uno::RuntimeException )
         {
@@ -323,7 +283,7 @@ void MediaWindowImpl::onURLChanged()
 void MediaWindowImpl::update()
 {
     uno::Reference< media::XPlayerWindow > xPlayerWindow( getPlayerWindow() );
-    
+
     if( xPlayerWindow.is() )
         xPlayerWindow->update();
 }
@@ -332,7 +292,7 @@ void MediaWindowImpl::update()
 
 void MediaWindowImpl::setPosSize( const Rectangle& rRect )
 {
-    SetPosSizePixel( rRect.Left(), rRect.Top(), rRect.GetWidth(), rRect.GetHeight() );
+    SetPosSizePixel( rRect.TopLeft(), rRect.GetSize() );
 }
 
 // ---------------------------------------------------------------------
@@ -340,25 +300,24 @@ void MediaWindowImpl::setPosSize( const Rectangle& rRect )
 void MediaWindowImpl::setPointer( const Pointer& rPointer )
 {
     uno::Reference< media::XPlayerWindow >	xPlayerWindow( getPlayerWindow() );
-    
+
     SetPointer( rPointer );
     maChildWindow.SetPointer( rPointer );
-    
+
     if( xPlayerWindow.is() )
     {
-        
         long nPointer;
-        
+
         switch( rPointer.GetStyle() )
         {
             case( POINTER_CROSS ): nPointer = awt::SystemPointer::CROSS; break;
             case( POINTER_HAND ): nPointer = awt::SystemPointer::HAND; break;
             case( POINTER_MOVE ): nPointer = awt::SystemPointer::MOVE; break;
             case( POINTER_WAIT ): nPointer = awt::SystemPointer::WAIT; break;
-            
+
             default: nPointer = awt::SystemPointer::ARROW; break;
         }
-        
+
         xPlayerWindow->setPointerType( nPointer );
     }
 }
@@ -386,20 +345,20 @@ void MediaWindowImpl::Resize()
     const sal_Int32							nOffset( mpMediaWindowControl ? AVMEDIA_CONTROLOFFSET : 0 );
     Size 									aPlayerWindowSize( aCurSize.Width() - ( nOffset << 1 ),
                                                                aCurSize.Height() - ( nOffset << 1 ) );
-    
+
     if( mpMediaWindowControl )
     {
         const sal_Int32	nControlHeight = mpMediaWindowControl->GetSizePixel().Height();
         const sal_Int32	nControlY = ::std::max( aCurSize.Height() - nControlHeight - nOffset, 0L );
-        
+
         aPlayerWindowSize.Height() = ( nControlY - ( nOffset << 1 ) );
         mpMediaWindowControl->SetPosSizePixel( Point( nOffset, nControlY ), Size( aCurSize.Width() - ( nOffset << 1 ), nControlHeight ) );
     }
-                                       
-    maChildWindow.SetPosSizePixel( Point( nOffset, nOffset ), aPlayerWindowSize );
-    
+
     if( xPlayerWindow.is() )
         xPlayerWindow->setPosSize( 0, 0, aPlayerWindowSize.Width(), aPlayerWindowSize.Height(), 0 );
+
+    maChildWindow.SetPosSizePixel( Point( nOffset, nOffset ), aPlayerWindowSize );
 }
 
 // ---------------------------------------------------------------------
@@ -438,25 +397,25 @@ void MediaWindowImpl::StateChanged( StateChangedType eType )
 void MediaWindowImpl::Paint( const Rectangle& )
 {
     BitmapEx* pLogo = NULL;
-    
+
     if( !getPlayer().is() )
     {
         if( !mpEmptyBmpEx )
             mpEmptyBmpEx = new BitmapEx( AVMEDIA_RESID( AVMEDIA_BMP_EMPTYLOGO ) );
-        
+
         pLogo = mpEmptyBmpEx;
     }
-    else if ( !getPlayerWindow().is() )
+    else if( !getPlayerWindow().is() )
     {
         if( !mpAudioBmpEx )
             mpAudioBmpEx = new BitmapEx( AVMEDIA_RESID( AVMEDIA_BMP_AUDIOLOGO ) );
-    
+
         pLogo = mpAudioBmpEx;
     }
 
     const Point     aBasePos( maChildWindow.GetPosPixel() );
-    const Rectangle aVideoRect( aBasePos, maChildWindow.GetSizePixel() ); 	
-        
+    const Rectangle aVideoRect( aBasePos, maChildWindow.GetSizePixel() );
+
     if( pLogo && !pLogo->IsEmpty() && ( aVideoRect.GetWidth() > 0 ) && ( aVideoRect.GetHeight() > 0 ) )
     {
         Size	    aLogoSize( pLogo->GetSizePixel() );
@@ -465,7 +424,7 @@ void MediaWindowImpl::Paint( const Rectangle& )
         SetLineColor( aBackgroundColor );
         SetFillColor( aBackgroundColor );
         DrawRect( aVideoRect );
-        
+
         if( ( aLogoSize.Width() > aVideoRect.GetWidth() || aLogoSize.Height() > aVideoRect.GetHeight() ) &&
             ( aLogoSize.Height() > 0 ) )
         {
@@ -483,12 +442,10 @@ void MediaWindowImpl::Paint( const Rectangle& )
             }
         }
 
-        DrawBitmapEx( Point( aBasePos.X() + ( ( aVideoRect.GetWidth() - aLogoSize.Width() ) >> 1 ), 
+        DrawBitmapEx( Point( aBasePos.X() + ( ( aVideoRect.GetWidth() - aLogoSize.Width() ) >> 1 ),
                              aBasePos.Y() + ( ( aVideoRect.GetHeight() - aLogoSize.Height() ) >> 1 ) ),
                       aLogoSize, *pLogo );
     }
-
-    update();
 }
 
 // ---------------------------------------------------------------------
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index c2dc310821..f8abda9bb7 100644..100755
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -2,11 +2,14 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
+ * $RCSfile: mediawindow_impl.hxx,v $
+ * $Revision: 1.3 $
+ *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,11 +33,7 @@
 #define _AVMEDIA_MEDIAWINDOW_IMPL_HXX
 
 #include <svtools/transfer.hxx>
-#ifdef GSTREAMER
 #include <vcl/syschild.hxx>
-#else
-#include <vcl/javachild.hxx>
-#endif
 
 #include "mediawindowbase_impl.hxx"
 #include "mediacontrol.hxx"
@@ -48,16 +47,16 @@ namespace avmedia
         // ----------------------
         // - MediaWindowControl -
         // ----------------------
-        
+
         class MediaWindowControl : public MediaControl
         {
         public:
-        
+
                     MediaWindowControl( Window* pParent );
                     ~MediaWindowControl();
-        
+
         protected:
-        
+
             void 	update();
             void 	execute( const MediaItem& rItem );
         };
@@ -65,20 +64,16 @@ namespace avmedia
         // --------------------
         // - MediaChildWindow -
         // --------------------
-        
-#ifdef GSTREAMER
+
         class MediaChildWindow : public SystemChildWindow
-#else
-        class MediaChildWindow : public JavaChildWindow
-#endif
         {
         public:
-        
+
                             MediaChildWindow( Window* pParent );
                             ~MediaChildWindow();
-        
+
         protected:
-        
+
             virtual void    MouseMove( const MouseEvent& rMEvt );
             virtual void    MouseButtonDown( const MouseEvent& rMEvt );
             virtual void    MouseButtonUp( const MouseEvent& rMEvt );
@@ -86,7 +81,7 @@ namespace avmedia
             virtual void    KeyUp( const KeyEvent& rKEvt );
             virtual void    Command( const CommandEvent& rCEvt );
         };
-                
+
         // ------------------.
         // - MediaWindowImpl -
         // -------------------
@@ -97,7 +92,7 @@ namespace avmedia
                                 public MediaWindowBaseImpl,
                                 public DropTargetHelper,
                                 public DragSourceHelper
-                                   
+
         {
         public:
 
@@ -106,18 +101,18 @@ namespace avmedia
 
             virtual void    cleanUp();
             virtual void	onURLChanged();
-        
+
         public:
-        
+
             void			update();
 
             void    		setPosSize( const Rectangle& rRect );
-                
+
             void			setPointer( const Pointer& rPointer );
             const Pointer&	getPointer() const;
-            
+
             bool			hasInternalMediaControl() const;
-            
+
         protected:
 
             // Window
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index 24f6802aac..89928b27ed 100644..100755
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -46,6 +46,7 @@ namespace avmedia { namespace priv {
 // - MediaWindowBaseImpl -
 // -----------------------
 
+
 MediaWindowBaseImpl::MediaWindowBaseImpl( MediaWindow* pMediaWindow ) :
     mpMediaWindow( pMediaWindow )
 {
@@ -141,10 +142,7 @@ void MediaWindowBaseImpl::stopPlayingInternal( bool bStop )
 {
     if( isPlaying() )
     {
-        if( bStop )
-            mxPlayer->stop();
-        else
-            mxPlayer->start();
+        bStop ? mxPlayer->stop() : mxPlayer->start();
     }
 }
 
diff --git a/avmedia/source/viewer/mediawindowbase_impl.hxx b/avmedia/source/viewer/mediawindowbase_impl.hxx
index 063665b97d..408528e209 100644..100755
--- a/avmedia/source/viewer/mediawindowbase_impl.hxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.hxx
@@ -62,7 +62,7 @@ namespace avmedia
             virtual void 	cleanUp();
             virtual void	onURLChanged();
             
-            static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const ::rtl::OUString& rURL );
+            static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const ::rtl::OUString& rURL);
         
         public:
 
@@ -113,6 +113,7 @@ namespace avmedia
             void	stopPlayingInternal( bool );
 
             MediaWindow* getMediaWindow() const;
+            inline sal_Bool isMediaWindowJavaBased() const { return( mbIsMediaWindowJavaBased ); }
 
             ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > getPlayer() const;
 
@@ -125,6 +126,7 @@ namespace avmedia
             ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > 		mxPlayer;
             ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow >	mxPlayerWindow;
             MediaWindow*                                                                mpMediaWindow;
+            sal_Bool                                                                    mbIsMediaWindowJavaBased;
         };
     }
 }
diff --git a/avmedia/source/win/avmediawin.component b/avmedia/source/win/avmediawin.component
new file mode 100755
index 0000000000..c80c19bff0
--- /dev/null
+++ b/avmedia/source/win/avmediawin.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.avmedia.Manager_DirectX">
+    <service name="com.sun.star.media.Manager_DirectX"/>
+  </implementation>
+</component>
diff --git a/avmedia/source/win/exports.dxp b/avmedia/source/win/exports.dxp
index db9c0a52f2..926e49f5f1 100644..100755
--- a/avmedia/source/win/exports.dxp
+++ b/avmedia/source/win/exports.dxp
@@ -1,4 +1,3 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 9633aa7e98..9633aa7e98 100644..100755
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 9d3b23753c..9d3b23753c 100644..100755
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
diff --git a/avmedia/source/win/interface.hxx b/avmedia/source/win/interface.hxx
index be9efe3fcd..f14d35ba9f 100644..100755
--- a/avmedia/source/win/interface.hxx
+++ b/avmedia/source/win/interface.hxx
@@ -91,7 +91,7 @@ public:
         IMediaSample *pSample) = 0;
     virtual HRESULT __stdcall BufferCB(
         double SampleTime,
-        WIN_BYTE *pBuffer,
+        BYTE *pBuffer,
         long BufferLen) = 0;
 };
 
@@ -104,13 +104,13 @@ ISampleGrabber : public IUnknown
 {
 public:
     virtual HRESULT __stdcall SetOneShot(
-        WIN_BOOL OneShot) = 0;
+        BOOL OneShot) = 0;
     virtual HRESULT __stdcall SetMediaType(
         const AM_MEDIA_TYPE *pType) = 0;
     virtual HRESULT __stdcall GetConnectedMediaType(
         AM_MEDIA_TYPE *pType) = 0;
     virtual HRESULT __stdcall SetBufferSamples(
-        WIN_BOOL BufferThem) = 0;
+        BOOL BufferThem) = 0;
     virtual HRESULT __stdcall GetCurrentBuffer(
          long *pBufferSize,
          long *pBuffer) = 0;
diff --git a/avmedia/source/win/makefile.mk b/avmedia/source/win/makefile.mk
index 7fdb92378d..7c6c9e14da 100644..100755
--- a/avmedia/source/win/makefile.mk
+++ b/avmedia/source/win/makefile.mk
@@ -78,3 +78,11 @@ SHL1STDLIBS += dxguid.lib
 .ENDIF
 
 .INCLUDE :  	target.mk
+
+ALLTAR : $(MISC)/avmediawin.component
+
+$(MISC)/avmediawin.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        avmediawin.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt avmediawin.component
diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx
index 3ba63fab82..3ba63fab82 100644..100755
--- a/avmedia/source/win/manager.cxx
+++ b/avmedia/source/win/manager.cxx
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index 9f4d6b46bb..9f4d6b46bb 100644..100755
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index f44f22f63b..f44f22f63b 100644..100755
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index c91a1435e5..c91a1435e5 100644..100755
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
diff --git a/avmedia/source/win/wincommon.hxx b/avmedia/source/win/wincommon.hxx
index d0877fd055..d0877fd055 100644..100755
--- a/avmedia/source/win/wincommon.hxx
+++ b/avmedia/source/win/wincommon.hxx
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index 1f9dd0f3b4..1f9dd0f3b4 100644..100755
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index 047f1744c8..047f1744c8 100644..100755
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index 9c8e6f4933..f444e8f14d 100644..100755
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -49,33 +49,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*, void* pRegistryKey )
-{
-    sal_Bool bRet = sal_False;
-
-    if( pRegistryKey )
-    {
-        try
-        {
-            uno::Reference< registry::XRegistryKey > xNewKey1(
-                static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(                                
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/com.sun.star.comp.media.Manager_DirectX/UNO/SERVICES/com.sun.star.media.Manager_DirectX" )) ) );
-
-            bRet = sal_True;
-        }
-        catch( registry::InvalidRegistryException& )
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-
-    return bRet;
-}
-
 // ------------------------
 // - component_getFactory -
 // ------------------------
@@ -85,13 +58,13 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
     uno::Reference< lang::XSingleServiceFactory > xFactory;
     void*									pRet = 0;
 
-    if( rtl_str_compare( pImplName, "com.sun.star.comp.media.Manager_DirectX" ) == 0 )
+    if( rtl_str_compare( pImplName, "com.sun.star.comp.avmedia.Manager_DirectX" ) == 0 )
     {
         const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.media.Manager_DirectX" )) );
 
         xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
                         reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.media.Manager_DirectX" )),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.avmedia.Manager_DirectX" )),
                         create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
     }
 
diff --git a/avmedia/util/avmedia.component b/avmedia/util/avmedia.component
new file mode 100755
index 0000000000..fa01dc03eb
--- /dev/null
+++ b/avmedia/util/avmedia.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.framework.SoundHandler">
+    <service name="com.sun.star.frame.ContentHandler"/>
+  </implementation>
+</component>
diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk
index bd167e8744..6d12706a26 100644..100755
--- a/avmedia/util/makefile.mk
+++ b/avmedia/util/makefile.mk
@@ -77,3 +77,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
     @echo LibMain>>$@
     @echo CT>>$@
 .ENDIF
+
+ALLTAR : $(MISC)/avmedia.component
+
+$(MISC)/avmedia.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        avmedia.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt avmedia.component