diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:57:43 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:57:43 +0200 |
| commit | fd0649408ac52ec0c6a443c5716d50c9243bca7e (patch) | |
| tree | 5c5472ebd37157ec38bef497ddad7c8fa4acfbba /io/test/stm/testfactreg.cxx | |
| parent | ea3da31396ff5a1d88efdbd6e53f2c1b1794ccb0 (diff) | |
| parent | 1247c8b2350734c4f16bbc15404c3c7d56bf8523 (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
xmlreader/prj/d.lst
Diffstat (limited to 'io/test/stm/testfactreg.cxx')
| -rw-r--r-- | io/test/stm/testfactreg.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/io/test/stm/testfactreg.cxx b/io/test/stm/testfactreg.cxx index 17a3c374b..d69c945e5 100644 --- a/io/test/stm/testfactreg.cxx +++ b/io/test/stm/testfactreg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,7 +47,7 @@ using namespace ::com::sun::star::lang; extern "C" { -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -121,13 +122,13 @@ sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException &) { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); + OSL_FAIL( "### InvalidRegistryException!" ); } } return sal_False; } -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = 0; @@ -214,3 +215,4 @@ Sequence<sal_Int8> createIntSeq( sal_Int32 i ) return createSeq( pcCount ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |