[Libreoffice-commits] .: 5 commits - lingucomponent/source oox/source oox/util pyuno/source remotebridges/source scripting/source scripting/util
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Oct 2 01:46:40 PDT 2012
lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component | 2 +-
lingucomponent/source/spellcheck/macosxspell/macreg.mm | 2 +-
oox/source/core/services.cxx | 2 +-
oox/util/oox.component | 2 +-
pyuno/source/loader/pythonloader.component | 2 +-
pyuno/source/loader/pyuno_loader.cxx | 2 +-
remotebridges/source/unourl_resolver/unourl_resolver.cxx | 4 ++--
remotebridges/source/unourl_resolver/uuresolver.component | 2 +-
scripting/source/basprov/basprov.component | 2 +-
scripting/source/basprov/basprov.cxx | 2 +-
scripting/source/dlgprov/dlgprov.component | 2 +-
scripting/source/dlgprov/dlgprov.cxx | 2 +-
scripting/source/protocolhandler/protocolhandler.component | 2 +-
scripting/source/protocolhandler/scripthandler.cxx | 2 +-
scripting/source/provider/MasterScriptProvider.cxx | 2 +-
scripting/source/stringresource/stringresource.component | 2 +-
scripting/source/stringresource/stringresource.cxx | 2 +-
scripting/source/vbaevents/service.cxx | 2 +-
scripting/source/vbaevents/vbaevents.component | 2 +-
scripting/util/scriptframe.component | 2 +-
20 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 671746f57cd3337ba49a0be512080dd5b69e3d40
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Oct 2 11:45:48 2012 +0300
Use prefix
Change-Id: Id1ac9a800b58595771be22097d77d3a7c5a8862c
diff --git a/oox/source/core/services.cxx b/oox/source/core/services.cxx
index 16d1e5f..aec6559 100644
--- a/oox/source/core/services.cxx
+++ b/oox/source/core/services.cxx
@@ -65,7 +65,7 @@ static ::cppu::ImplementationEntry const spServices[] =
} // namespace
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL oox_component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey )
{
return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, spServices );
}
diff --git a/oox/util/oox.component b/oox/util/oox.component
index 0c3157f..54f4655 100644
--- a/oox/util/oox.component
+++ b/oox/util/oox.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="oox"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.oox.core.FastTokenHandler">
<service name="com.sun.star.xml.sax.FastTokenHandler"/>
commit 1b075ea2cbeef67bf556cade80f2fcf8130be571
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Oct 2 11:45:11 2012 +0300
Use prefix
Change-Id: I0323e3eb9446c4f2b18f84f5ed33909a877163c8
diff --git a/scripting/source/basprov/basprov.component b/scripting/source/basprov/basprov.component
index 5268cfe..09ed542 100644
--- a/scripting/source/basprov/basprov.component
+++ b/scripting/source/basprov/basprov.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="basprov"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.scripting.ScriptProviderForBasic">
<service name="com.sun.star.script.browse.BrowseNode"/>
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 06675e8..bf4a449 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -586,7 +586,7 @@ namespace basprov
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL basprov_component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
{
diff --git a/scripting/source/dlgprov/dlgprov.component b/scripting/source/dlgprov/dlgprov.component
index dffc48e..66dd111 100644
--- a/scripting/source/dlgprov/dlgprov.component
+++ b/scripting/source/dlgprov/dlgprov.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="dlgprov"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.scripting.DialogProvider">
<service name="com.sun.star.awt.ContainerWindowProvider"/>
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index 862e21a..2c55c32 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -876,7 +876,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver");
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL dlgprov_component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
{
diff --git a/scripting/source/protocolhandler/protocolhandler.component b/scripting/source/protocolhandler/protocolhandler.component
index 5bfe9d9..95c6b50 100644
--- a/scripting/source/protocolhandler/protocolhandler.component
+++ b/scripting/source/protocolhandler/protocolhandler.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="protocolhandler"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ScriptProtocolHandler">
<service name="com.sun.star.frame.ProtocolHandler"/>
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 1881c91..4151a56 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -497,7 +497,7 @@ extern "C"
namespace css = ::com::sun::star;
- SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplementationName ,
+ SAL_DLLPUBLIC_EXPORT void* SAL_CALL protocolhandler_component_getFactory( const sal_Char * pImplementationName ,
void * pServiceManager ,
void * pRegistryKey )
{
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index f0623c0..ff03469 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -959,7 +959,7 @@ extern "C"
* data
* @return a component factory
*/
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL scriptframe_component_getFactory(
const sal_Char * pImplName,
lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
diff --git a/scripting/source/stringresource/stringresource.component b/scripting/source/stringresource/stringresource.component
index eb2e9ac..5407300 100644
--- a/scripting/source/stringresource/stringresource.component
+++ b/scripting/source/stringresource/stringresource.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="stringresource"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.scripting.StringResource">
<service name="com.sun.star.resource.StringResource"/>
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 7af39bd..338883d 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -3050,7 +3050,7 @@ static struct ::cppu::ImplementationEntry s_component_entries [] =
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL stringresource_component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
{
diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx
index 1f6bbc8..11b51d0 100644
--- a/scripting/source/vbaevents/service.cxx
+++ b/scripting/source/vbaevents/service.cxx
@@ -90,7 +90,7 @@ namespace ooevtdescgen
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaevents_component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
{
diff --git a/scripting/source/vbaevents/vbaevents.component b/scripting/source/vbaevents/vbaevents.component
index 78b17a3..ea45658 100644
--- a/scripting/source/vbaevents/vbaevents.component
+++ b/scripting/source/vbaevents/vbaevents.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="vbaevents"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="ooo.vba.EventListener">
<service name="ooo.vba.EventListener"/>
diff --git a/scripting/util/scriptframe.component b/scripting/util/scriptframe.component
index 959f9fc..09f874e 100644
--- a/scripting/util/scriptframe.component
+++ b/scripting/util/scriptframe.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="scriptframe"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.script.browse.BrowseNodeFactory">
<service name="com.sun.star.script.browse.BrowseNodeFactory"/>
commit ae53e3e9fc0e0f878e7911732a5dd918a9bec597
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Oct 2 11:38:39 2012 +0300
Use prefix
Change-Id: Ifa5ea2dd818043b6b5442e580bff51d1e2cb93e1
diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index a44d0b4..a5577be 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -194,13 +194,13 @@ static struct ImplementationEntry g_entries[] =
extern "C"
{
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL uuresolver_component_canUnload( TimeValue *pTime )
{
return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL uuresolver_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/remotebridges/source/unourl_resolver/uuresolver.component b/remotebridges/source/unourl_resolver/uuresolver.component
index 4cfb40e..5131b8a 100644
--- a/remotebridges/source/unourl_resolver/uuresolver.component
+++ b/remotebridges/source/unourl_resolver/uuresolver.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="uuresolver"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.bridge.UnoUrlResolver">
<service name="com.sun.star.bridge.UnoUrlResolver"/>
commit e6150aa67e98d8de7cd3b83d17df12a8f9678c7d
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Oct 2 11:37:05 2012 +0300
Use prefix
Change-Id: Ibc446d8616bad00ce71c273e46517e80527e2f0e
diff --git a/pyuno/source/loader/pythonloader.component b/pyuno/source/loader/pythonloader.component
index 0abab7f..1dc51f4 100644
--- a/pyuno/source/loader/pythonloader.component
+++ b/pyuno/source/loader/pythonloader.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="pythonloader"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="org.openoffice.comp.pyuno.Loader">
<service name="com.sun.star.loader.Python"/>
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index 34176eb..3e7a250 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -252,7 +252,7 @@ static struct cppu::ImplementationEntry g_entries[] =
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL pythonloader_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
commit 303b86bc23d4bac5379ad0924ab93d482467ff13
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Oct 2 11:33:11 2012 +0300
Use prefix
Change-Id: Iee586539871acee78a32d13141dd446feb43efdb
diff --git a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
index 2f2f9e1..9bc9267 100644
--- a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
+++ b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="MacOSXSpell"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="org.openoffice.lingu.MacOSXSpellChecker">
<service name="com.sun.star.linguistic2.SpellChecker"/>
diff --git a/lingucomponent/source/spellcheck/macosxspell/macreg.mm b/lingucomponent/source/spellcheck/macosxspell/macreg.mm
index 9020ace..6e438bb 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macreg.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macreg.mm
@@ -52,7 +52,7 @@ extern void * SAL_CALL MacSpellChecker_getFactory(
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL MacOSXSpell_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
void * pRet = NULL;
More information about the Libreoffice-commits
mailing list