diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-11-29 09:29:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-29 10:27:53 +0000 |
| commit | deba3112b6d752f305f562c059dc16657b459864 (patch) | |
| tree | 230b25ccd9447340d6de9cae4b62afac2c4e23ea | |
| parent | f8eb694c0a50f9f6f874f000e47adb1ca22453e5 (diff) | |
optional ppFlt argument never used
Change-Id: Ib2c68091f14d04818ae5e7db0ad7b8a1ec151f4f
| -rw-r--r-- | sw/inc/iodetect.hxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/basflt/iodetect.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/uno/swdet2.cxx | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx index 73bde8c3bffc..621949102d6d 100644 --- a/sw/inc/iodetect.hxx +++ b/sw/inc/iodetect.hxx @@ -111,8 +111,7 @@ public: /** Detect whether the given file is in the given format. For now, only our own filters are supported! */ - static sal_Bool IsFileFilter( SfxMedium& rMedium, const String& rFmtName, - const SfxFilter** ppFlt = 0 ); + static sal_Bool IsFileFilter(SfxMedium& rMedium, const String& rFmtName); static sal_Bool IsValidStgFilter( SotStorage& , const SfxFilter& ); static sal_Bool IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter); diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index f17eff24471a..8fd07cb9c2be 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -205,8 +205,7 @@ void TerminateBuffer(sal_Char *pBuffer, sal_uLong nBytesRead, sal_uLong nBufferL /* Feststellen ob das File in dem entsprechenden Format vorliegt. */ /* Z.z werden nur unsere eigene Filter unterstuetzt */ -sal_Bool SwIoSystem::IsFileFilter( SfxMedium& rMedium, const String& rFmtName, - const SfxFilter** ppFilter ) +sal_Bool SwIoSystem::IsFileFilter(SfxMedium& rMedium, const String& rFmtName) { sal_Bool bRet = sal_False; @@ -261,9 +260,6 @@ sal_Bool SwIoSystem::IsFileFilter( SfxMedium& rMedium, const String& rFmtName, } } } - - if( bRet && ppFilter ) - *ppFilter = pFltr; } pFltr = aIter.Next(); diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx index f002610b25ca..75cbb031c108 100644 --- a/sw/source/ui/uno/swdet2.cxx +++ b/sw/source/ui/uno/swdet2.cxx @@ -63,7 +63,7 @@ sal_uLong SwFilterDetect::DetectFilter( SfxMedium& rMedium, const SfxFilter** pp String aPrefFlt = (*ppFilter)->GetUserData(); // detection for TextFilter needs an additional checking - sal_Bool bDetected = SwIoSystem::IsFileFilter( rMedium, aPrefFlt ); + sal_Bool bDetected = SwIoSystem::IsFileFilter(rMedium, aPrefFlt); return bDetected ? nRet : ERRCODE_ABORT; } |