filter/source/graphicfilter/icgm/cgm.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
New commits: commit bd86b38c5bccb42cefdbf80fdf77b662e6d382f5 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Oct 15 09:45:27 2014 +0200 Make ImportCGM signature match ImportCGMPointer (in sdcgmfilter.cxx) Change-Id: I363777ff59b1756a15615d3daaa0c95542632361 diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index b032020..014b0c1 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, void* pProgressBar ) +ImportCGM( OUString& rFileName, uno::Reference< frame::XModel > & rXModel, sal_uInt32 nMode, css::uno::Reference<css::task::XStatusIndicator> & aXStatInd ) { sal_uInt32 nStatus = 0; // retvalue == 0 -> ERROR @@ -733,11 +733,8 @@ ImportCGM( OUString& rFileName, uno::Reference< frame::XModel > & rXModel, sal_u sal_uInt64 const nInSize = pIn->remainingSize(); pIn->Seek( 0 ); - uno::Reference< task::XStatusIndicator > aXStatInd; sal_uInt32 nNext = 0; sal_uInt32 nAdd = nInSize / 20; - if ( pProgressBar ) - aXStatInd = *(uno::Reference< task::XStatusIndicator > *)pProgressBar; bProgressBar = aXStatInd.is(); if ( bProgressBar ) aXStatInd->start( "CGM Import" , nInSize ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits