diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-11-29 09:29:19 +0000 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-12-13 21:10:09 +0100 |
| commit | a4d8430cf797c3ba6ce5408f1b994e55e54b7bff (patch) | |
| tree | 73e7c8490a48cd7e877147636f8cf061cd656233 | |
| parent | dfb25f8c69e5b2521c2e911d06cadc0329afea9d (diff) | |
optional ppFlt argument never used
Change-Id: Ib2c68091f14d04818ae5e7db0ad7b8a1ec151f4f
Signed-off-by: Tor Lillqvist <tlillqvist@suse.com>
| -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 cc58b29a24b3..f8ff622eac20 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 7a72a6f552ef..b99d57ccfbde 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -211,8 +211,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; @@ -267,9 +266,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 40e4be543d12..559443831802 100644 --- a/sw/source/ui/uno/swdet2.cxx +++ b/sw/source/ui/uno/swdet2.cxx @@ -65,7 +65,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; } |