diff options
| author | Damjan Jovanovic <damjan@apache.org> | 2016-12-18 01:58:43 +0000 |
|---|---|---|
| committer | Damjan Jovanovic <damjan@apache.org> | 2016-12-18 01:58:43 +0000 |
| commit | 0a09230b9e7793eb19f7c659249662397ded36fc (patch) | |
| tree | 5752c0e141be5a0969181cb85bda23d86481db1e /avmedia/source/macavf/macavf_macavfuno.cxx | |
| parent | 3494812abc0593bc7f8f3239be4b11e10c5056fa (diff) | |
Port main/avmedia to gbuild, for real this time.
The problem with the last attempt was that
main/avmedia/source/java/avmedia.jar.component was getting delivered to the
solver verbatim, without the processing neeeded to add the "uri"
attribute to the "component" XML tag, which was causing AOO to crash on
startup since UNO couldn't bootstrap.
Since avmedia.jar isn't built but a pre-existing copy is just delivered,
this was solved by adding an already processed copy of
avmedia.jar.component to deliver instead.
Patch by: me
Notes
Notes:
ignore: obsolete
Diffstat (limited to 'avmedia/source/macavf/macavf_macavfuno.cxx')
| -rw-r--r-- | avmedia/source/macavf/macavf_macavfuno.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/avmedia/source/macavf/macavf_macavfuno.cxx b/avmedia/source/macavf/macavf_macavfuno.cxx index 470f95c8daa4..421d220c1817 100644 --- a/avmedia/source/macavf/macavf_macavfuno.cxx +++ b/avmedia/source/macavf/macavf_macavfuno.cxx @@ -36,7 +36,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno: // - component_getImplementationEnvironment - // ------------------------------------------ -extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -45,7 +45,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char // - component_getFactory - // ------------------------ -extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = 0; |