diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:47:46 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:38 -0500 |
commit | 2d4d886819ccb900873b24475f443ed06ea5394a (patch) | |
tree | dbc0934ee6ab8aab2ba8a5b589849bb2bddacebf | |
parent | d88b292704957818eff9a348a524b5c90b40031b (diff) |
remove vos::OModule
-rw-r--r-- | vos/inc/vos/module.hxx | 75 | ||||
-rw-r--r-- | vos/source/makefile.mk | 2 | ||||
-rw-r--r-- | vos/source/module.cxx | 89 |
3 files changed, 0 insertions, 166 deletions
diff --git a/vos/inc/vos/module.hxx b/vos/inc/vos/module.hxx deleted file mode 100644 index d808c9bf53d8..000000000000 --- a/vos/inc/vos/module.hxx +++ /dev/null @@ -1,75 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#ifndef _VOS_MODULE_HXX_ -#define _VOS_MODULE_HXX_ - -# include <vos/object.hxx> -# include <rtl/ustring.hxx> -# include <osl/module.h> - -namespace vos -{ - -class OModule : public OObject -{ - VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OModule, vos)); - -public: - - /// default c'tor - OModule(); - - /// this c'tor is a combination of the default c'tor and load() - OModule(const ::rtl::OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT); - virtual ~OModule(); - - /// loads the specified module - sal_Bool SAL_CALL load(const ::rtl::OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT); - - /// unloads the currently loaded module - void SAL_CALL unload(); - - /// returns sal_True, if a module is loaded, sal_False otherwise - sal_Bool SAL_CALL isLoaded(); - - /// returns a pointer to the specified Symbol if found, NULL otherwise - void* SAL_CALL getSymbol(const ::rtl::OUString& strSymbolName); - -protected: - - oslModule m_Module; -}; - -} - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/source/makefile.mk b/vos/source/makefile.mk index d890b7f554d0..84f53a4d0719 100644 --- a/vos/source/makefile.mk +++ b/vos/source/makefile.mk @@ -42,7 +42,6 @@ SLOFILES= \ $(SLO)$/refernce.obj \ $(SLO)$/thread.obj \ $(SLO)$/stream.obj \ - $(SLO)$/module.obj \ $(SLO)$/process.obj \ $(SLO)$/xception.obj @@ -53,7 +52,6 @@ OBJFILES= \ $(OBJ)$/refernce.obj \ $(OBJ)$/thread.obj \ $(OBJ)$/stream.obj \ - $(OBJ)$/module.obj \ $(OBJ)$/process.obj \ $(OBJ)$/xception.obj diff --git a/vos/source/module.cxx b/vos/source/module.cxx deleted file mode 100644 index 95d9c7fbb8b9..000000000000 --- a/vos/source/module.cxx +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include <vos/module.hxx> -#include <osl/diagnose.h> - -using namespace vos; - -VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OModule, vos), - VOS_NAMESPACE(OModule, vos), - VOS_NAMESPACE(OObject, vos), 0); - - -OModule::OModule() - :m_Module(0) -{ -} - -OModule::OModule(const rtl::OUString& ustrModuleName, sal_Int32 nRtldMode) : m_Module(0) -{ - if (ustrModuleName) - load(ustrModuleName, nRtldMode); -} - -OModule::~OModule() -{ - if (m_Module) - osl_unloadModule(m_Module); -} - -sal_Bool OModule::load(const rtl::OUString& ustrModuleName, sal_Int32 nRtldMode) -{ - OSL_ASSERT(ustrModuleName); - - unload(); - - m_Module = osl_loadModule( ustrModuleName.pData, nRtldMode ); - - return (m_Module != 0); -} - -void OModule::unload() -{ - if (m_Module) - { - osl_unloadModule(m_Module); - m_Module = 0; - } -} - -sal_Bool OModule::isLoaded() -{ - return m_Module != NULL; -} - -void *OModule::getSymbol(const rtl::OUString& strSymbolName) -{ - OSL_ASSERT(strSymbolName); - OSL_ASSERT(m_Module); - return ( osl_getSymbol( m_Module, strSymbolName.pData ) ); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |