diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2011-08-17 20:36:45 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-08-17 23:51:45 +0200 |
commit | 4b60da5d1d25b7cdef001dabac3bbd09d1686718 (patch) | |
tree | 169ae8f9c4f9060891b8ac9c1b9e0268bbaa886b /framework | |
parent | f3423eab7815827857149995e69d00c7b641282d (diff) |
add more component prefixes
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/macros/debug/registration.hxx | 2 | ||||
-rw-r--r-- | framework/inc/macros/registration.hxx | 6 | ||||
-rw-r--r-- | framework/source/register/register3rdcomponents.cxx | 3 | ||||
-rw-r--r-- | framework/source/register/registerservices.cxx | 3 | ||||
-rw-r--r-- | framework/source/register/registertemp.cxx | 3 | ||||
-rwxr-xr-x | framework/util/fwk.component | 2 | ||||
-rwxr-xr-x | framework/util/fwl.component | 2 | ||||
-rwxr-xr-x | framework/util/fwm.component | 2 |
8 files changed, 13 insertions, 10 deletions
diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx index f12c380011d8..6dd24feba5fc 100644 --- a/framework/inc/macros/debug/registration.hxx +++ b/framework/inc/macros/debug/registration.hxx @@ -57,7 +57,7 @@ #define LOG_REGISTRATION_GETFACTORY( SINFOTEXT ) \ { \ ::rtl::OStringBuffer sOut( 1024 ); \ - sOut.append( "component_getFactory():" ); \ + sOut.append( "fw?_component_getFactory():" ); \ sOut.append( SINFOTEXT ); \ WRITE_LOGFILE( LOGFILE_REGISTRATION, sOut.makeStringAndClear() ) \ } diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx index 94815f726b75..e4a3b785df13 100644 --- a/framework/inc/macros/registration.hxx +++ b/framework/inc/macros/registration.hxx @@ -57,7 +57,7 @@ Please use follow public macros only! IFFACTORY( CLASS ) => use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES ) - COMPONENTGETFACTORY( IFFACTORIES ) => use it to define exported function component_getFactory() + COMPONENTGETFACTORY( LIB, IFFACTORIES ) => use it to define exported function LIB_component_getFactory() _________________________________________________________________________________________________________________*/ @@ -80,8 +80,8 @@ ________________________________________________________________________________ // public // define method to instanciate new services //***************************************************************************************************************** -#define COMPONENTGETFACTORY( IFFACTORIES ) \ - extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName , \ +#define COMPONENTGETFACTORY( LIB, IFFACTORIES ) \ + extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL LIB##_component_getFactory( const sal_Char* pImplementationName, \ void* pServiceManager , \ void* /*pRegistryKey*/ ) \ { \ diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx index a045ea7cba0f..5a88f13ecd78 100644 --- a/framework/source/register/register3rdcomponents.cxx +++ b/framework/source/register/register3rdcomponents.cxx @@ -56,7 +56,8 @@ #include <dispatch/systemexec.hxx> #include <jobs/shelljob.hxx> -COMPONENTGETFACTORY ( IFFACTORY( ::framework::HelpOnStartup ) else +COMPONENTGETFACTORY ( fwm, + IFFACTORY( ::framework::HelpOnStartup ) else IFFACTORY( ::framework::TabWinFactory ) else IFFACTORY( ::framework::SystemExec ) else IFFACTORY( ::framework::ShellJob ) diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index 54695d733e0c..c271433f1878 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -89,7 +89,8 @@ #include <services/substitutepathvars.hxx> #include <services/pathsettings.hxx> -COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else +COMPONENTGETFACTORY ( fwk, + IFFACTORY( ::framework::URLTransformer ) else IFFACTORY( ::framework::Desktop ) else IFFACTORY( ::framework::Frame ) else IFFACTORY( ::framework::JobExecutor ) else diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx index b420fdfe02cd..e331701f86b3 100644 --- a/framework/source/register/registertemp.cxx +++ b/framework/source/register/registertemp.cxx @@ -74,7 +74,8 @@ #include <uielement/toolbarsmenucontroller.hxx> #include <uielement/popupmenucontroller.hxx> -COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper ) +COMPONENTGETFACTORY ( fwl, + IFFACTORY( ::framework::MediaTypeDetectionHelper ) IFFACTORY( ::framework::MailToDispatcher ) else IFFACTORY( ::framework::ServiceHandler ) else IFFACTORY( ::framework::LogoTextStatusbarController ) else diff --git a/framework/util/fwk.component b/framework/util/fwk.component index c460ecbccd70..0e206d1f7ae0 100755 --- a/framework/util/fwk.component +++ b/framework/util/fwk.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="fwk" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.frame.SessionListener"> <service name="com.sun.star.frame.SessionListener"/> diff --git a/framework/util/fwl.component b/framework/util/fwl.component index 99c5ca7213e6..5fca040b2b4a 100755 --- a/framework/util/fwl.component +++ b/framework/util/fwl.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="fwl" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sum.star.comp.framework.LanguageSelectionMenuController"> <service name="com.sun.star.frame.PopupMenuController"/> diff --git a/framework/util/fwm.component b/framework/util/fwm.component index 624249ff4382..8b2c4e653844 100755 --- a/framework/util/fwm.component +++ b/framework/util/fwm.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="fwm" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.framework.HelpOnStartup"> <service name="com.sun.star.task.Job"/> |