diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-15 09:45:27 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-15 09:45:27 +0200 |
| commit | bd86b38c5bccb42cefdbf80fdf77b662e6d382f5 (patch) | |
| tree | 41eba7f7abff87895de65dc561442a6372c4891f | |
| parent | da77897d1923137574fd3a5a65921a5dbaf0aafc (diff) | |
Make ImportCGM signature match ImportCGMPointer (in sdcgmfilter.cxx)
Change-Id: I363777ff59b1756a15615d3daaa0c95542632361
| -rw-r--r-- | filter/source/graphicfilter/icgm/cgm.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index b03202090cad..014b0c104ed2 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 ); |