android/experimental/DocumentLoader/Makefile | 2 + android/experimental/DocumentLoader/native-code.cxx | 8 ++++ cpputools/source/registercomponent/registercomponent.cxx | 6 ++- cpputools/source/unoexe/unoexe.cxx | 28 ++++++--------- oox/source/core/services.cxx | 2 - oox/util/oox.component | 2 - sdext/source/minimizer/minimizer.component | 3 + sdext/source/minimizer/pppoptimizeruno.cxx | 2 - sdext/source/pdfimport/pdfimport.component | 3 + sdext/source/pdfimport/services.cxx | 2 - sdext/source/presenter/PresenterComponent.cxx | 4 +- sdext/source/presenter/presenter.component | 3 + shell/source/backends/gconfbe/gconfbackend.cxx | 2 - shell/source/backends/gconfbe/gconfbe1.component | 2 - shell/source/backends/kde4be/kde4backend.cxx | 2 - shell/source/backends/kde4be/kde4be1.component | 2 - shell/source/backends/kdebe/kdebackend.cxx | 2 - shell/source/backends/kdebe/kdebe1.component | 2 - shell/source/backends/macbe/macbe1.component | 2 - shell/source/backends/macbe/macbecdef.cxx | 2 - shell/source/backends/wininetbe/wininetbe1.component | 2 - shell/source/backends/wininetbe/wininetbecdef.cxx | 2 - shell/source/cmdmail/cmdmail.component | 2 - shell/source/cmdmail/cmdmailentry.cxx | 2 - shell/source/unix/exec/shellexecentry.cxx | 2 - shell/source/unix/exec/syssh.component | 2 - shell/source/win32/SysShentry.cxx | 2 - shell/source/win32/simplemail/smplmail.component | 2 - shell/source/win32/simplemail/smplmailentry.cxx | 2 - shell/source/win32/syssh.component | 2 - starmath/source/accessibility.cxx | 2 - stoc/source/javaloader/javaloader.component | 2 - stoc/source/javaloader/javaloader.cxx | 2 - stoc/source/javavm/javavm.component | 2 - stoc/source/javavm/javavm.cxx | 2 - vbahelper/source/msforms/service.cxx | 2 - vbahelper/util/msforms.component | 2 - writerfilter/source/filter/WriterFilter.cxx | 2 - writerfilter/util/writerfilter.component | 2 - 39 files changed, 65 insertions(+), 54 deletions(-)
New commits: commit 115c492e85206fce18b39405f1f82a5e4e39cd38 Author: Tor Lillqvist <t...@iki.fi> Date: Tue Oct 2 12:59:32 2012 +0300 Use prefix Change-Id: Ic63d4b6403438fee2d6c70e329ee33d2cde7426b diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx index 7a32b49..9bc7953 100644 --- a/vbahelper/source/msforms/service.cxx +++ b/vbahelper/source/msforms/service.cxx @@ -42,7 +42,7 @@ extern sdecl::ServiceDecl const serviceDecl; extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL msforms_component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/vbahelper/util/msforms.component b/vbahelper/util/msforms.component index 5e4c28b..f4fc168 100644 --- a/vbahelper/util/msforms.component +++ b/vbahelper/util/msforms.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="msforms" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="ControlProviderImpl"> <service name="ooo.vba.ControlProvider"/> commit c14ba0883e0caa23570f25f6aa57a27acbf273cb Author: Tor Lillqvist <t...@iki.fi> Date: Tue Oct 2 12:54:32 2012 +0300 Use prefix Change-Id: I128623b27bd88795e21de13d7a6fc960de3b6ea8 diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index 68550cf..7e139c5 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -51,7 +51,7 @@ static struct ::cppu::ImplementationEntry s_component_entries [] = { 0, 0, 0, 0, 0, 0 } // terminate with NULL }; -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL writerfilter_component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry ) { return ::cppu::component_getFactoryHelper(implName, xMgr, xRegistry, s_component_entries ); } diff --git a/writerfilter/util/writerfilter.component b/writerfilter/util/writerfilter.component index 0101ea0..b5deea5 100644 --- a/writerfilter/util/writerfilter.component +++ b/writerfilter/util/writerfilter.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="writerfilter" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Writer.WriterFilter"> <service name="com.sun.star.document.ExportFilter"/> commit c11064f70f5f89176a1bfe32eccdaa019c08ed3b Author: Matúš Kukan <matus.ku...@gmail.com> Date: Tue Oct 2 11:01:23 2012 +0200 stoc: prefix more libs; only bootstrap is remaining Change-Id: Ie9032c6faa493da47e76bc9ff467c4de4b318ca9 diff --git a/cpputools/source/registercomponent/registercomponent.cxx b/cpputools/source/registercomponent/registercomponent.cxx index 06c38f5..950952b 100644 --- a/cpputools/source/registercomponent/registercomponent.cxx +++ b/cpputools/source/registercomponent/registercomponent.cxx @@ -722,13 +722,15 @@ static void bootstrap( OUString(), OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaVirtualMachine")), xSMgr, - Reference< XRegistryKey > () ); + Reference< XRegistryKey > (), + "javavm" ); Reference< XInterface > r2 = loadSharedLibComponentFactory( OUString(RTL_CONSTASCII_USTRINGPARAM("javaloader.uno" SAL_DLLEXTENSION)), OUString(), OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaComponentLoader")), xSMgr, - Reference< XRegistryKey > () ); + Reference< XRegistryKey > (), + "javaloader" ); Reference <XSet> xSet( xSMgr, UNO_QUERY ); if( r.is() && r2.is() && xSet.is() ) { diff --git a/stoc/source/javaloader/javaloader.component b/stoc/source/javaloader/javaloader.component index bb2ea0f..5fd7d86 100644 --- a/stoc/source/javaloader/javaloader.component +++ b/stoc/source/javaloader/javaloader.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="javaloader" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.stoc.JavaComponentLoader"> <service name="com.sun.star.loader.Java"/> diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 7bfe440..cb48b6c 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -435,7 +435,7 @@ static struct ImplementationEntry g_entries[] = extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL javaloader_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/stoc/source/javavm/javavm.component b/stoc/source/javavm/javavm.component index 1394b5b..570ce4c 100644 --- a/stoc/source/javavm/javavm.component +++ b/stoc/source/javavm/javavm.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="javavm" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.stoc.JavaVirtualMachine"> <service name="com.sun.star.java.JavaVirtualMachine"/> diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index fbb1c89..4667fee 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -598,7 +598,7 @@ private: } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL javavm_component_getFactory(sal_Char const * pImplName, void * pServiceManager, void * pRegistryKey) { commit e1d6afce7cc5a898472fbfb3498b48b89cb58739 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Tue Oct 2 10:57:38 2012 +0200 these libs are now prefixed Change-Id: Ida3cc87ef2ef6fdb40b03d0401fbefa5e7cd7c92 diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index d9a92e3..db3e63b 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -257,29 +257,25 @@ void createInstance( Reference< XMultiServiceFactory > xSF( xMgr, UNO_QUERY ); // acceptor xSet->insert( makeAny( loadSharedLibComponentFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "acceptor.uno" SAL_DLLEXTENSION) ), + OUString( "acceptor.uno" SAL_DLLEXTENSION ), OUString(), - OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.io.Acceptor") ), - xSF, Reference< XRegistryKey >() ) ) ); + OUString( "com.sun.star.comp.io.Acceptor" ), + xSF, Reference< XRegistryKey >(), + "acceptor" ) ) ); // connector xSet->insert( makeAny( loadSharedLibComponentFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "connector.uno" SAL_DLLEXTENSION) ), + OUString( "connector.uno" SAL_DLLEXTENSION ), OUString(), - OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.io.Connector") ), - xSF, Reference< XRegistryKey >() ) ) ); + OUString( "com.sun.star.comp.io.Connector" ), + xSF, Reference< XRegistryKey >(), + "connector" ) ) ); // bridge factory xSet->insert( makeAny( loadSharedLibComponentFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "binaryurp.uno" SAL_DLLEXTENSION) ), + OUString( "binaryurp.uno" SAL_DLLEXTENSION ), OUString(), - OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.bridge.BridgeFactory") ), - xSF, Reference< XRegistryKey >() ) ) ); + OUString( "com.sun.star.comp.bridge.BridgeFactory" ), + xSF, Reference< XRegistryKey >(), + "binaryurp" ) ) ); } s_bSet = sal_True; } commit 556b5bba14a23d465a038fb1ee9b7910e5364b71 Author: Tor Lillqvist <t...@iki.fi> Date: Tue Oct 2 12:04:10 2012 +0300 Use prefix Change-Id: Ife93e37f8b24f3ce96b55c5a221f0f929b789f60 diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index 82ea9fe..263fa7d 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -217,7 +217,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL gconfbe1_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/gconfbe/gconfbe1.component b/shell/source/backends/gconfbe/gconfbe1.component index 7638e05..b48806c 100644 --- a/shell/source/backends/gconfbe/gconfbe1.component +++ b/shell/source/backends/gconfbe/gconfbe1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="gconfbe1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.configuration.backend.GconfBackend"> <service name="com.sun.star.configuration.backend.GconfBackend"/> diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index 1c87c48..314cd5a 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -215,7 +215,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL kde4be1_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/kde4be/kde4be1.component b/shell/source/backends/kde4be/kde4be1.component index 8ea7ae1..9bceccc 100644 --- a/shell/source/backends/kde4be/kde4be1.component +++ b/shell/source/backends/kde4be/kde4be1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="kde4be1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.configuration.backend.KDE4Backend"> <service name="com.sun.star.configuration.backend.KDE4Backend"/> diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 4faf911..ad82efc 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -215,7 +215,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL kdebe1_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/kdebe/kdebe1.component b/shell/source/backends/kdebe/kdebe1.component index 393fbc8..7e70f65 100644 --- a/shell/source/backends/kdebe/kdebe1.component +++ b/shell/source/backends/kdebe/kdebe1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="kdebe1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.configuration.backend.KDEBackend"> <service name="com.sun.star.configuration.backend.KDEBackend"/> diff --git a/shell/source/backends/macbe/macbe1.component b/shell/source/backends/macbe/macbe1.component index 10bac2e..c760361 100644 --- a/shell/source/backends/macbe/macbe1.component +++ b/shell/source/backends/macbe/macbe1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="macbe1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.configuration.backend.MacOSXBackend"> <service name="com.sun.star.configuration.backend.MacOSXBackend"/> diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx index a52d7ac..cd1f702 100644 --- a/shell/source/backends/macbe/macbecdef.cxx +++ b/shell/source/backends/macbe/macbecdef.cxx @@ -60,7 +60,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = //------------------------------------------------------------------------------ -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL macbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/wininetbe/wininetbe1.component b/shell/source/backends/wininetbe/wininetbe1.component index d893028..a6655ce 100644 --- a/shell/source/backends/wininetbe/wininetbe1.component +++ b/shell/source/backends/wininetbe/wininetbe1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="wininetbe1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.configuration.backend.WinInetBackend"> <service name="com.sun.star.configuration.backend.WinInetBackend"/> diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx index ca82c1b..8b47da5 100644 --- a/shell/source/backends/wininetbe/wininetbecdef.cxx +++ b/shell/source/backends/wininetbe/wininetbecdef.cxx @@ -60,7 +60,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = //------------------------------------------------------------------------------ -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *aImplementationName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL wininetbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/cmdmail/cmdmail.component b/shell/source/cmdmail/cmdmail.component index 7e56741..7b2761d 100644 --- a/shell/source/cmdmail/cmdmail.component +++ b/shell/source/cmdmail/cmdmail.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="cmdmail" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.system.SimpleCommandMail"> <service name="com.sun.star.system.SimpleCommandMail"/> diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index b0e45fe..3dbb894 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -62,7 +62,7 @@ extern "C" // component_getFactory //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void* SAL_CALL cmdmail_component_getFactory( const sal_Char* pImplName, SAL_UNUSED_PARAMETER uno_Interface* /*pSrvManager*/, SAL_UNUSED_PARAMETER uno_Interface* /*pRegistryKey*/ ) diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index 684acfe..997de21 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -60,7 +60,7 @@ extern "C" // component_getFactory //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( const sal_Char* pImplName, SAL_UNUSED_PARAMETER uno_Interface* /*pSrvManager*/, SAL_UNUSED_PARAMETER uno_Interface* /*pRegistryKey*/ ) diff --git a/shell/source/unix/exec/syssh.component b/shell/source/unix/exec/syssh.component index 030240d..d7e7694 100644 --- a/shell/source/unix/exec/syssh.component +++ b/shell/source/unix/exec/syssh.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="syssh" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.system.SystemShellExecute"> <service name="com.sun.star.system.SystemShellExecute"/> diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index e5a61bb..93a4533 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -63,7 +63,7 @@ extern "C" // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface*, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( const sal_Char* pImplName, uno_Interface*, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/shell/source/win32/simplemail/smplmail.component b/shell/source/win32/simplemail/smplmail.component index 59246c6..c0a2bcb 100644 --- a/shell/source/win32/simplemail/smplmail.component +++ b/shell/source/win32/simplemail/smplmail.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="smplmail" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.system.SimpleSystemMail"> <service name="com.sun.star.system.SimpleSystemMail"/> diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index df3774a..9b6228b 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -63,7 +63,7 @@ extern "C" // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL smplmail_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/shell/source/win32/syssh.component b/shell/source/win32/syssh.component index 1e783f5..78da5c2 100644 --- a/shell/source/win32/syssh.component +++ b/shell/source/win32/syssh.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="syssh" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.system.SystemShellExecute"> <service name="com.sun.star.system.SystemShellExecute"/> commit 68a9e26bc58a6b33dc954033941178ac1b186188 Author: Tor Lillqvist <t...@iki.fi> Date: Tue Oct 2 11:53:55 2012 +0300 Use prefix Change-Id: I80de62d3afd461bc51a33d427794c86c4a6bc32c diff --git a/sdext/source/minimizer/minimizer.component b/sdext/source/minimizer/minimizer.component index 8a90fd2..a0111a3 100644 --- a/sdext/source/minimizer/minimizer.component +++ b/sdext/source/minimizer/minimizer.component @@ -1,6 +1,7 @@ <?xml version="1.0"?> <component xmlns="http://openoffice.org/2010/uno-components" - loader="com.sun.star.loader.SharedLibrary"> + loader="com.sun.star.loader.SharedLibrary" + prefix="pptminimizer"> <implementation name="com.sun.star.comp.PPPOptimizerImp"> <service name="com.sun.star.comp.PPPOptimizer"/> </implementation> diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx index 515baf3..5de73c7 100644 --- a/sdext/source/minimizer/pppoptimizeruno.cxx +++ b/sdext/source/minimizer/pppoptimizeruno.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::registry; extern "C" { - SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void* SAL_CALL pptminimizer_component_getFactory( const sal_Char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { diff --git a/sdext/source/pdfimport/pdfimport.component b/sdext/source/pdfimport/pdfimport.component index 1392302..548af84 100644 --- a/sdext/source/pdfimport/pdfimport.component +++ b/sdext/source/pdfimport/pdfimport.component @@ -1,6 +1,7 @@ <?xml version="1.0"?> <component xmlns="http://openoffice.org/2010/uno-components" - loader="com.sun.star.loader.SharedLibrary"> + loader="com.sun.star.loader.SharedLibrary" + prefix="pdfimport"> <implementation name="com.sun.star.comp.documents.HybridPDFImport"> <service name="com.sun.star.document.ImportFilter"/> </implementation> diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index 7e4da4b..1bafab0 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -119,7 +119,7 @@ namespace } } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pdfimport_component_getFactory( const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void* /*pServiceManager*/, SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ ) diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx index 8032fb0..4a5180d 100644 --- a/sdext/source/presenter/PresenterComponent.cxx +++ b/sdext/source/presenter/PresenterComponent.cxx @@ -100,12 +100,12 @@ static struct ImplementationEntry gServiceEntries[] = extern "C" { - SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) + SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL presenter_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 presenter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries); diff --git a/sdext/source/presenter/presenter.component b/sdext/source/presenter/presenter.component index 4dfd7cc..a61807b 100644 --- a/sdext/source/presenter/presenter.component +++ b/sdext/source/presenter/presenter.component @@ -1,6 +1,7 @@ <?xml version="1.0"?> <component xmlns="http://openoffice.org/2010/uno-components" - loader="com.sun.star.loader.SharedLibrary"> + loader="com.sun.star.loader.SharedLibrary" + prefix="presenter"> <implementation name="com.sun.star.comp.Draw.framework.PresenterScreenJob"> <service name="com.sun.star.drawing.framework.PresenterScreenJob"/> </implementation> commit 0306f781ffb35d0647c0104307865226c295c391 Author: Tor Lillqvist <t...@iki.fi> Date: Tue Oct 2 13:35:39 2012 +0300 More libs Change-Id: I83214fffadf68c6d92e129fd8f89f671fd9bc1c2 diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 90d640a..3919144 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -38,8 +38,10 @@ LIBS = \ configmgr.uno \ cppcanvaslo \ crypto \ + dbalo \ dbaxmllo \ dbtoolslo \ + dbulo \ deploymentmisclo \ dict_ja \ dict_zh \ diff --git a/android/experimental/DocumentLoader/native-code.cxx b/android/experimental/DocumentLoader/native-code.cxx index d859f44..48b0727 100644 --- a/android/experimental/DocumentLoader/native-code.cxx +++ b/android/experimental/DocumentLoader/native-code.cxx @@ -12,16 +12,20 @@ extern "C" { extern void * avmedia_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * dbaxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * fwk_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * fwl_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * fwm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * hwp_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * lotuswordpro_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * oox_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * sc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * scd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * scfilt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * sd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * sdd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * sm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * smd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * svgfilter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * sw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * swd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); @@ -42,16 +46,20 @@ lo_get_libmap(void) { static lib_to_component_mapping map[] = { { "libavmedialo.a", avmedia_component_getFactory }, + { "libdbaxmllo.a", dbaxml_component_getFactory }, { "libfwklo.a", fwk_component_getFactory }, { "libfwllo.a", fwl_component_getFactory }, { "libfwmlo.a", fwm_component_getFactory }, { "libhwplo.a", hwp_component_getFactory }, { "liblwpftlo.a", lotuswordpro_component_getFactory }, + { "libooxlo.a", oox_component_getFactory }, { "libscdlo.a", scd_component_getFactory }, { "libscfiltlo.a", scfilt_component_getFactory }, { "libsclo.a", sc_component_getFactory }, { "libsddlo.a", sdd_component_getFactory }, { "libsdlo.a", sd_component_getFactory }, + { "libsmdlo.a", smd_component_getFactory }, + { "libsmlo.a", sm_component_getFactory }, { "libsvgfilterlo.a", svgfilter_component_getFactory }, { "libswdlo.a", swd_component_getFactory }, { "libswlo.a", sw_component_getFactory }, commit d2065d9d5acd082b137d74174e466e8b31702a19 Author: Tor Lillqvist <t...@iki.fi> Date: Tue Oct 2 10:50:01 2012 +0300 Use prefix Change-Id: I7905186e71fa4871c85e5243fda217b884bec0c2 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 ff06505e8d719a301b475f41706ec6a518f59d04 Author: Tor Lillqvist <t...@iki.fi> Date: Mon Oct 1 16:41:50 2012 +0300 Make a function static for deduplication in the DISABLE_DYNLOADING case Change-Id: Ib05f7b3b9b66f9e1c0b619e6a8b14e253d1adbb7 diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index b271773..9ec8d24 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -1129,7 +1129,7 @@ void SmTextForwarder::FieldClicked(const SvxFieldItem&, sal_uInt16, sal_uInt16) { } -sal_uInt16 GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, sal_uInt16 nWhich ) +static sal_uInt16 GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, sal_uInt16 nWhich ) { std::vector<EECharAttrib> aAttribs;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits