strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS sdwarningsbegone (1.6.36); FILE MERGED

Browse source 
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
This commit is contained in:
Kurt Zenker 2006-12-12 15:37:46 +00:00
parent c3fba01200
commit c803e512eb
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sd/source/filter/cgm/sdcgmfilter.cxx
View file

@ -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 )
{