Kaydet (Commit) 72f34874 authored tarafından Tor Lillqvist's avatar Tor Lillqvist Kaydeden (comit) Tor Lillqvist

There is no ExportCGM

Change-Id: I1251c25e14636fea96aba08f90dfe3d16978a270
üst 29b8f729
...@@ -73,7 +73,6 @@ typedef sal_Bool ( __LOADONCALLAPI *ExportCGMPointer )( ::rtl::OUString&, Refere ...@@ -73,7 +73,6 @@ typedef sal_Bool ( __LOADONCALLAPI *ExportCGMPointer )( ::rtl::OUString&, Refere
#ifdef DISABLE_DYNLOADING #ifdef DISABLE_DYNLOADING
extern "C" sal_uInt32 ImportCGM( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); extern "C" sal_uInt32 ImportCGM( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& );
extern "C" sal_Bool ExportCGM( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* );
#endif #endif
...@@ -150,22 +149,16 @@ sal_Bool SdCGMFilter::Import() ...@@ -150,22 +149,16 @@ sal_Bool SdCGMFilter::Import()
sal_Bool SdCGMFilter::Export() sal_Bool SdCGMFilter::Export()
{ {
#ifndef DISABLE_DYNLOADING #ifdef DISABLE_DYNLOADING
// No ExportCGM function exists(!)
return sal_False;
#else
::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() );
#endif
sal_Bool bRet = sal_False; sal_Bool bRet = sal_False;
if( if( pLibrary && mxModel.is() )
#ifndef DISABLE_DYNLOADING
pLibrary &&
#endif
mxModel.is() )
{ {
#ifndef DISABLE_DYNLOADING
ExportCGMPointer FncCGMExport = reinterpret_cast< ExportCGMPointer >( pLibrary->getFunctionSymbol( "ExportCGM" ) ); ExportCGMPointer FncCGMExport = reinterpret_cast< ExportCGMPointer >( pLibrary->getFunctionSymbol( "ExportCGM" ) );
#else
ExportCGMPointer FncCGMExport = ExportCGM;
#endif
if( FncCGMExport ) if( FncCGMExport )
{ {
...@@ -176,10 +169,9 @@ sal_Bool SdCGMFilter::Export() ...@@ -176,10 +169,9 @@ sal_Bool SdCGMFilter::Export()
} }
} }
#ifndef DISABLE_DYNLOADING
delete pLibrary; delete pLibrary;
#endif
return bRet; return bRet;
#endif
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment