diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 15:37:46 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 15:37:46 +0000 |
| commit | c803e512eb2af091a65dc9fd918cbaf8e41235e1 (patch) | |
| tree | 86de39c9e7f0d62a9353e6a2af9ec684ee37ed98 /sd/source/filter/cgm | |
| parent | c3fba012001652591050921c49b947988727482e (diff) | |
INTEGRATION: CWS sdwarningsbegone (1.6.36); FILE MERGED
2006/11/22 14:58:50 cl 1.6.36.2: RESYNC: (1.6-1.7); FILE MERGED
2006/11/22 12:41:35 cl 1.6.36.1: #i69285# warning free code changes for unxlngi6.pro
Diffstat (limited to 'sd/source/filter/cgm')
| -rw-r--r-- | sd/source/filter/cgm/sdcgmfilter.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index dbbf4852c97e..639bb28bbcc9 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sdcgmfilter.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: ihi $ $Date: 2006-11-14 14:22:32 $ + * last change: $Author: kz $ $Date: 2006-12-12 16:37:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,7 +36,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include <vos/module.hxx> +#include <osl/module.hxx> #include <tools/urlobj.hxx> #include <svtools/itemset.hxx> #include <sfx2/docfile.hxx> @@ -97,12 +97,12 @@ SdCGMFilter::~SdCGMFilter() sal_Bool SdCGMFilter::Import() { - ::vos::OModule* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); + ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); sal_Bool bRet = sal_False; if( pLibrary && mxModel.is() ) { - ImportCGM FncImportCGM = ( ImportCGM ) pLibrary->getSymbol( ::rtl::OUString::createFromAscii( "ImportCGM" ) ); + ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii( "ImportCGM" ) ) ); ::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); UINT32 nRetValue; @@ -143,12 +143,12 @@ sal_Bool SdCGMFilter::Import() sal_Bool SdCGMFilter::Export() { - ::vos::OModule* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); + ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); sal_Bool bRet = sal_False; if( pLibrary && mxModel.is() ) { - ExportCGM FncCGMExport = ( ExportCGM ) pLibrary->getSymbol( ::rtl::OUString::createFromAscii( "ExportCGM" ) ); + ExportCGM FncCGMExport = reinterpret_cast< ExportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii( "ExportCGM" ) ) ); if( FncCGMExport ) { |