filter/source/graphicfilter/icgm/cgm.cxx | 2 +- sd/source/filter/cgm/sdcgmfilter.cxx | 28 +++------------------------- 2 files changed, 4 insertions(+), 26 deletions(-)
New commits: commit b9789a63191830a74569ed46f4292968818b5fe2 Author: Stephan Bergmann <[email protected]> Date: Fri Oct 17 14:23:27 2014 +0200 There is no ExportCGM Change-Id: I84b0d4daa3a6090aadaa7f64bdb9277efbba371f diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index 1e9ece2..cad19cd 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )( OUString const &, Reference< XModel > const &, sal_uInt32, Reference< XStatusIndicator > const & ); -typedef sal_Bool ( SAL_CALL *ExportCGMPointer )( OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); #ifdef DISABLE_DYNLOADING @@ -112,29 +111,8 @@ bool SdCGMFilter::Import() bool SdCGMFilter::Export() { -#ifdef DISABLE_DYNLOADING // No ExportCGM function exists(!) - return sal_False; -#else - ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); - bool bRet = false; - - if( pLibrary && mxModel.is() ) - { - ExportCGMPointer FncCGMExport = reinterpret_cast< ExportCGMPointer >( pLibrary->getFunctionSymbol( "ExportCGM" ) ); - - if( FncCGMExport ) - { - OUString aPhysicalName( mrMedium.GetPhysicalName() ); - - CreateStatusIndicator(); - bRet = FncCGMExport( aPhysicalName, mxModel, mxStatusIndicator, NULL ); - } - } - - delete pLibrary; - return bRet; -#endif + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit fc78d8dfbaaa4e9bc482e91ce4437373b1db5cff Author: Stephan Bergmann <[email protected]> Date: Fri Oct 17 14:10:17 2014 +0200 Pass args by const & Change-Id: I510e1aba6772e1f8d4013b235e95a1e5599fd601 diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index 014b0c1..9e44147 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -710,7 +710,7 @@ bool CGM::Write( SvStream& rIStm ) // GraphicImport - the exported function extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL -ImportCGM( OUString& rFileName, uno::Reference< frame::XModel > & rXModel, sal_uInt32 nMode, css::uno::Reference<css::task::XStatusIndicator> & aXStatInd ) +ImportCGM( OUString const & rFileName, uno::Reference< frame::XModel > const & rXModel, sal_uInt32 nMode, css::uno::Reference<css::task::XStatusIndicator> const & aXStatInd ) { sal_uInt32 nStatus = 0; // retvalue == 0 -> ERROR diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index eeb0107..1e9ece2 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -40,12 +40,12 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; -typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )( OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); +typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )( OUString const &, Reference< XModel > const &, sal_uInt32, Reference< XStatusIndicator > const & ); typedef sal_Bool ( SAL_CALL *ExportCGMPointer )( OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); #ifdef DISABLE_DYNLOADING -extern "C" sal_uInt32 ImportCGM( OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); +extern "C" sal_uInt32 ImportCGM( OUString const &, Reference< XModel > const &, sal_uInt32, Reference< XStatusIndicator > const & ); #endif _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
