[Libreoffice-commits] .: avmedia/source avmedia/util

[Libreoffice Gerrit user]

 avmedia/source/framework/soundhandler.cxx           |    2 +-
 avmedia/source/gstreamer/avmediagstreamer.component |    2 +-
 avmedia/source/gstreamer/gstuno.cxx                 |    2 +-
 avmedia/source/quicktime/avmediaQuickTime.component |    2 +-
 avmedia/source/quicktime/quicktimeuno.mm            |    2 +-
 avmedia/source/win/avmediawin.component             |    2 +-
 avmedia/source/win/winuno.cxx                       |    2 +-
 avmedia/util/avmedia.component                      |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 67081cdf67976a6478b406b6aadca6325691e605
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Oct 1 15:18:16 2012 +0300

    Use prefixes for the components here
    
    Change-Id: I7bebc936cdb489331c82690c244f72e9c3619b10

diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index e6aee2b..1eae355 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 8a9a858..30a6cef 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/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
index 536e028..9357a5d 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 c429141..c7be231 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 040594a..7baacb4 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 1cc4723..9feb1fa 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 2bf3d6f..b42427e 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 f85783c..c410848 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"/>