forms/source/misc/services.cxx | 2 +-
forms/util/frm.component | 2 +-
fpicker/source/aqua/FPentry.mm | 2 +-
fpicker/source/aqua/fps_aqua.component | 2 +-
fpicker/source/generic/fpicker.component | 2 +-
fpicker/source/generic/fpicker.cxx | 2 +-
fpicker/source/office/fps_office.component | 2 +-
fpicker/source/office/fps_office.cxx | 2 +-
fpicker/source/win32/filepicker/FPentry.cxx | 2 +-
fpicker/source/win32/fps.component | 2 +-
io/source/TextInputStream/TextInputStream.cxx | 2 +-
io/source/TextInputStream/textinstream.component | 2 +-
io/source/TextOutputStream/TextOutputStream.cxx | 2 +-
io/source/TextOutputStream/textoutstream.component | 2 +-
io/source/acceptor/acceptor.component | 2 +-
io/source/acceptor/acceptor.cxx | 2 +-
io/source/connector/connector.component | 2 +-
io/source/connector/connector.cxx | 2 +-
io/source/stm/factreg.cxx | 2 +-
io/source/stm/streams.component | 2 +-
20 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 3cba672351b2736e35fcaba1b4b465da5b4ecc9a
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Oct 2 11:19:05 2012 +0300
Use prefix
Change-Id: I84ec9d6eed209eb429f5b5d4a667d3450a1435e1
diff --git a/io/source/TextInputStream/TextInputStream.cxx
b/io/source/TextInputStream/TextInputStream.cxx
index 8015c3b..5e87cf6 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -493,7 +493,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload(
TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL textinstream_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
diff --git a/io/source/TextInputStream/textinstream.component
b/io/source/TextInputStream/textinstream.component
index 8c02149..5d543a1 100644
--- a/io/source/TextInputStream/textinstream.component
+++ b/io/source/TextInputStream/textinstream.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="textinstream"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.io.TextInputStream">
<service name="com.sun.star.io.TextInputStream"/>
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx
b/io/source/TextOutputStream/TextOutputStream.cxx
index da32f34..beabc01 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -292,7 +292,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload(
TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL textoutstream_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
diff --git a/io/source/TextOutputStream/textoutstream.component
b/io/source/TextOutputStream/textoutstream.component
index f498f5a..807489c 100644
--- a/io/source/TextOutputStream/textoutstream.component
+++ b/io/source/TextOutputStream/textoutstream.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="textoutstream"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.io.TextOutputStream">
<service name="com.sun.star.io.TextOutputStream"/>
diff --git a/io/source/acceptor/acceptor.component
b/io/source/acceptor/acceptor.component
index 1fcb6ab..0b4877b 100644
--- a/io/source/acceptor/acceptor.component
+++ b/io/source/acceptor/acceptor.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="acceptor"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.io.Acceptor">
<service name="com.sun.star.connection.Acceptor"/>
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index d3efe3b..eb94ca5 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -339,7 +339,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload(
TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL acceptor_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
diff --git a/io/source/connector/connector.component
b/io/source/connector/connector.component
index 13f0513..3e60b18 100644
--- a/io/source/connector/connector.component
+++ b/io/source/connector/connector.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="connector"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.io.Connector">
<service name="com.sun.star.connection.Connector"/>
diff --git a/io/source/connector/connector.cxx
b/io/source/connector/connector.cxx
index 72401cd..9ba335b 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -250,7 +250,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload(
TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL connector_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
diff --git a/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx
index 35111fa..ccd4eac 100644
--- a/io/source/stm/factreg.cxx
+++ b/io/source/stm/factreg.cxx
@@ -94,7 +94,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload(
TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL streams_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
diff --git a/io/source/stm/streams.component b/io/source/stm/streams.component
index 1469ef1..7de1ebb 100644
--- a/io/source/stm/streams.component
+++ b/io/source/stm/streams.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="streams"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.io.Pump">
<service name="com.sun.star.io.Pump"/>
commit 4b6111cf6a6bcc8e3e7064871fea687aa7798299
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Oct 2 10:46:53 2012 +0300
Use prefix
Change-Id: Ifbe8796e3af2e7544cf7d47bacb0632d36202433
diff --git a/fpicker/source/aqua/FPentry.mm b/fpicker/source/aqua/FPentry.mm
index f3fee99..d514868 100644
--- a/fpicker/source/aqua/FPentry.mm
+++ b/fpicker/source/aqua/FPentry.mm
@@ -53,7 +53,7 @@ static Reference< XInterface > SAL_CALL createFolderInstance(
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_aqua_component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface*
/*pRegistryKey*/ )
{
void* pRet = 0;
diff --git a/fpicker/source/aqua/fps_aqua.component
b/fpicker/source/aqua/fps_aqua.component
index f0e2f47..7ad2926 100644
--- a/fpicker/source/aqua/fps_aqua.component
+++ b/fpicker/source/aqua/fps_aqua.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="fps_aqua"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.ui.dialogs.SalAquaFilePicker">
<service name="com.sun.star.ui.dialogs.AquaFilePicker"/>
diff --git a/fpicker/source/generic/fpicker.component
b/fpicker/source/generic/fpicker.component
index b87a2c8..7aee017 100644
--- a/fpicker/source/generic/fpicker.component
+++ b/fpicker/source/generic/fpicker.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="fpicker"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.fpicker.FilePicker">
<service name="com.sun.star.ui.dialogs.FilePicker"/>
diff --git a/fpicker/source/generic/fpicker.cxx
b/fpicker/source/generic/fpicker.cxx
index 1222025..4c4dd9a 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -225,7 +225,7 @@ static cppu::ImplementationEntry g_entries[] =
*/
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL fpicker_component_getFactory (
const sal_Char * pImplementationName, void * pServiceManager, void *
pRegistryKey)
{
return cppu::component_getFactoryHelper (
diff --git a/fpicker/source/office/fps_office.component
b/fpicker/source/office/fps_office.component
index ebce7f2..335a63a 100644
--- a/fpicker/source/office/fps_office.component
+++ b/fpicker/source/office/fps_office.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="fps_office"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.svtools.OfficeFilePicker">
<service name="com.sun.star.ui.dialogs.OfficeFilePicker"/>
diff --git a/fpicker/source/office/fps_office.cxx
b/fpicker/source/office/fps_office.cxx
index 77a9e20..e38d25f 100644
--- a/fpicker/source/office/fps_office.cxx
+++ b/fpicker/source/office/fps_office.cxx
@@ -44,7 +44,7 @@ static cppu::ImplementationEntry g_entries[] =
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL fps_office_component_getFactory(
const sal_Char * pImplementationName, void * pServiceManager, void *
pRegistryKey)
{
return cppu::component_getFactoryHelper (
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx
b/fpicker/source/win32/filepicker/FPentry.cxx
index 532edcf..f09938d 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -89,7 +89,7 @@ createInstance_fop( const Reference< XMultiServiceFactory >&
rServiceManager )
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_win32_component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
{
void* pRet = 0;
diff --git a/fpicker/source/win32/fps.component
b/fpicker/source/win32/fps.component
index 1a2e7f2..1dc9d4f 100644
--- a/fpicker/source/win32/fps.component
+++ b/fpicker/source/win32/fps.component
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* 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="fps_win32"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.ui.dialogs.Win32FilePicker">
<service name="com.sun.star.ui.dialogs.SystemFilePicker"/>
commit e40a86ca748ff7cd742250f1fb989eeeeb4d80b3
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Oct 2 10:37:33 2012 +0300
Use prefix
Change-Id: Id6ef3325df8dc8d193a7745370134ef47792893a
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index 9f1785f..de7cf79 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -319,7 +319,7 @@ void SAL_CALL createRegistryInfo_FORMS()
}
//---------------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char*
_pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char*
_pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
{
if (!_pServiceManager || !_pImplName)
return NULL;
diff --git a/forms/util/frm.component b/forms/util/frm.component
index c727e80..fcb7050 100644
--- a/forms/util/frm.component
+++ b/forms/util/frm.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="frm"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.form.ONavigationBarControl">
<service name="com.sun.star.form.control.NavigationToolBar"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
