diff options
| -rw-r--r-- | scripting/source/vbaevents/service.cxx | 6 | ||||
| -rw-r--r-- | sd/source/filter/eppt/eppt.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 11 |
3 files changed, 13 insertions, 8 deletions
diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx index f599dc0148f7..d6f21e234a18 100644 --- a/scripting/source/vbaevents/service.cxx +++ b/scripting/source/vbaevents/service.cxx @@ -19,8 +19,6 @@ #include "cppuhelper/implementationentry.hxx" #include <osl/diagnose.h> -#include "com/sun/star/lang/XMultiServiceFactory.hpp" -#include "com/sun/star/registry/XRegistryKey.hpp" #include <service.hxx> @@ -49,8 +47,8 @@ using namespace ::com::sun::star::uno; extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaevents_component_getFactory( - const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, - registry::XRegistryKey * pRegistryKey ) + const sal_Char * pImplName, void * pServiceManager, + void * pRegistryKey ) { OSL_TRACE("In component_getFactory"); return ::cppu::component_getFactoryHelper( diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index f4b4d8238fa0..c40de34da106 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -1448,7 +1448,7 @@ bool PPTWriter::ImplWriteAtomEnding() // - exported function - -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, SvStorageRef& rSvStorage, +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, SvStorageRef& rSvStorage, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel, ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rXStatInd, SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) @@ -1467,7 +1467,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL ExportPPT( const std::vector< com: return bStatus; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas ) { SvStorageRef xDest( new SvStorage( new SvMemoryStream(), true ) ); SvxImportMSVBasic aMSVBas( rDocShell, *xDest ); diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index 0b7be994be41..69e3f6080856 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -139,6 +139,12 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals #if !defined(ANDROID) +namespace { + +extern "C" typedef DesktopType Fn_get_desktop_environment(); + +} + static DesktopType get_desktop_environment() { OUString aModule(DESKTOP_DETECTOR_DLL_NAME); @@ -148,8 +154,9 @@ static DesktopType get_desktop_environment() DesktopType ret = DESKTOP_UNKNOWN; if( aMod ) { - DesktopType (*pSym)() = reinterpret_cast<DesktopType(*)()>( - osl_getAsciiFunctionSymbol( aMod, "get_desktop_environment" )); + Fn_get_desktop_environment * pSym + = reinterpret_cast<Fn_get_desktop_environment *>( + osl_getAsciiFunctionSymbol(aMod, "get_desktop_environment")); if( pSym ) ret = pSym(); } |