diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-01 11:55:47 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-01 12:21:00 +0200 |
| commit | 59c0f8f452a538308a9d4098cdc8319b884c3c81 (patch) | |
| tree | 6272bb19d30661acdc9995f8a18ce11e9f2fe6b0 /stoc/source/loader | |
| parent | b3b76d1abb5ab9af33ce559872c2e1c45ecdbbd0 (diff) | |
| parent | 464a3a271cd4b97573e87d15a38b3f4cad727daf (diff) | |
merge origin/master
Diffstat (limited to 'stoc/source/loader')
| -rw-r--r-- | stoc/source/loader/dllcomponentloader.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index cd690a23e563..b2327262a472 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -229,9 +229,16 @@ sal_Bool SAL_CALL DllComponentLoader::writeRegistryInfo( throw(CannotRegisterImplementationException, RuntimeException) { +#ifdef DISABLE_DYNLOADING + (void) xKey; + (void) rLibName; + OSL_FAIL( "DllComponentLoader::writeRegistryInfo() should not be called I think?" ); + return sal_False; +#else writeSharedLibComponentInfo( expand_url( rLibName ), OUString(), m_xSMgr, xKey ); return sal_True; +#endif } } |