Merge branch 'master' into feature/killsdf

Conflicts:
	Makefile.top
	Module_tail_build.mk
	RepositoryExternal.mk
	RepositoryFixes.mk
	accessibility/source/standard/vclxaccessibletoolbox.cxx
	basic/source/uno/dlgcont.cxx
	connectivity/Library_ado.mk
	cross_tail_build/prj/build.lst
	desktop/source/offacc/acceptor.cxx
	filter/Library_PptImporter.mk
	filter/source/t602/filterenv.cxx
	i18npool/Library_textconv_dict.mk
	ooo.lst.in
	saxon/ExternalProject_saxon.mk
	saxon/build.xml
	sc/sdi/scalc.sdi
	sc/source/filter/xml/xmlstyli.cxx
	sc/source/ui/condformat/condformatdlg.cxx
	sc/source/ui/condformat/condformatmgr.cxx
	sc/source/ui/view/cellsh1.cxx
	sdext/source/pdfimport/misc/pwdinteract.cxx
	shell/qa/zip/makefile.mk
	shell/qa/zip/testimpl/makefile.mk
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/gbuild.mk
	solenv/gbuild/platform/android.mk
	solenv/gbuild/platform/com_GCC_defs.mk
	solenv/gbuild/platform/macosx.mk
	soltools/Executable_adjustvisibility.mk
	soltools/Executable_checkdll.mk
	soltools/Executable_cpp.mk
	soltools/Executable_javadep.mk
	soltools/Executable_makedepend.mk
	sw/qa/extras/rtfimport/rtfimport.cxx
	tail_build/prj/build.lst
	tomcat/ExternalProject_tomcat.mk
	ucb/source/ucp/webdav/webdavcontent.cxx
	xml2cmp/Executable_xml2cmp.mk

9 files changed, 9 insertions, 9 deletions

diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index e6aee2b4aa75..1eae3551ee15 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -446,7 +446,7 @@ IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify)
 
 } // namespace framework
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmedia_component_getFactory(const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ )
 {
     void* pReturn = NULL;
     if  (pServiceManager !=  NULL )
diff --git a/avmedia/source/gstreamer/avmediagstreamer.component b/avmedia/source/gstreamer/avmediagstreamer.component
index 8a9a85807cea..30a6cef26abc 100644
--- a/avmedia/source/gstreamer/avmediagstreamer.component
+++ b/avmedia/source/gstreamer/avmediagstreamer.component
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
 -->
-<component loader="com.sun.star.loader.SharedLibrary" xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" prefix="avmediagst" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.media.Manager_GStreamer">
     <service name="com.sun.star.comp.avmedia.Manager_GStreamer"/>
   </implementation>
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index 0b87c7430862..e5ce553a3779 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -21,7 +21,7 @@
 #define _FRAMEGRABBER_HXX
 
 #include "gstplayer.hxx"
-#include "com/sun/star/media/XFrameGrabber.hdl"
+#include <com/sun/star/media/XFrameGrabber.hpp>
 #include <cppuhelper/implbase2.hxx>
 
 namespace avmedia { namespace gstreamer {
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
index 536e02879f77..9357a5d6db7f 100644
--- a/avmedia/source/gstreamer/gstuno.cxx
+++ b/avmedia/source/gstreamer/gstuno.cxx
@@ -39,7 +39,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno:
     return uno::Reference< uno::XInterface >( *new ::avmedia::gstreamer::Manager( rxFact ) );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediagst_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
 {
     uno::Reference< lang::XSingleServiceFactory > xFactory;
     void*                                   pRet = 0;
diff --git a/avmedia/source/quicktime/avmediaQuickTime.component b/avmedia/source/quicktime/avmediaQuickTime.component
index c429141074f3..c7be231ac030 100644
--- a/avmedia/source/quicktime/avmediaQuickTime.component
+++ b/avmedia/source/quicktime/avmediaQuickTime.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="avmediaQuickTime"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.avmedia.Manager_QuickTime">
     <service name="com.sun.star.media.Manager_QuickTime"/>
diff --git a/avmedia/source/quicktime/quicktimeuno.mm b/avmedia/source/quicktime/quicktimeuno.mm
index 040594a6564d..7baacb49e7e2 100644
--- a/avmedia/source/quicktime/quicktimeuno.mm
+++ b/avmedia/source/quicktime/quicktimeuno.mm
@@ -31,7 +31,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno:
     return uno::Reference< uno::XInterface >( *new ::avmedia::quicktime::Manager( rxFact ) );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediaQuickTime_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
 {
     uno::Reference< lang::XSingleServiceFactory > xFactory;
     void*                                   pRet = 0;
diff --git a/avmedia/source/win/avmediawin.component b/avmedia/source/win/avmediawin.component
index 1cc47230aa16..9feb1facd204 100644
--- a/avmedia/source/win/avmediawin.component
+++ b/avmedia/source/win/avmediawin.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="avmediawin"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.avmedia.Manager_DirectX">
     <service name="com.sun.star.media.Manager_DirectX"/>
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index 2bf3d6f9295b..b42427e2172e 100644
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -31,7 +31,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno:
     return uno::Reference< uno::XInterface >( *new ::avmedia::win::Manager( rxFact ) );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediawin_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* )
 {
     uno::Reference< lang::XSingleServiceFactory > xFactory;
     void*                                   pRet = 0;
diff --git a/avmedia/util/avmedia.component b/avmedia/util/avmedia.component
index f85783cb63a9..c410848a1bb4 100644
--- a/avmedia/util/avmedia.component
+++ b/avmedia/util/avmedia.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="avmedia"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.framework.SoundHandler">
     <service name="com.sun.star.frame.ContentHandler"/>