Kaydet (Commit) deba3112 authored tarafından Caolán McNamara's avatar Caolán McNamara

optional ppFlt argument never used

Change-Id: Ib2c68091f14d04818ae5e7db0ad7b8a1ec151f4f
üst f8eb694c
...@@ -111,8 +111,7 @@ public: ...@@ -111,8 +111,7 @@ public:
/** Detect whether the given file is in the given format. /** Detect whether the given file is in the given format.
For now, only our own filters are supported! */ For now, only our own filters are supported! */
static sal_Bool IsFileFilter( SfxMedium& rMedium, const String& rFmtName, static sal_Bool IsFileFilter(SfxMedium& rMedium, const String& rFmtName);
const SfxFilter** ppFlt = 0 );
static sal_Bool IsValidStgFilter( SotStorage& , const SfxFilter& ); 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); static sal_Bool IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter);
......
...@@ -205,8 +205,7 @@ void TerminateBuffer(sal_Char *pBuffer, sal_uLong nBytesRead, sal_uLong nBufferL ...@@ -205,8 +205,7 @@ void TerminateBuffer(sal_Char *pBuffer, sal_uLong nBytesRead, sal_uLong nBufferL
/* Feststellen ob das File in dem entsprechenden Format vorliegt. */ /* Feststellen ob das File in dem entsprechenden Format vorliegt. */
/* Z.z werden nur unsere eigene Filter unterstuetzt */ /* Z.z werden nur unsere eigene Filter unterstuetzt */
sal_Bool SwIoSystem::IsFileFilter( SfxMedium& rMedium, const String& rFmtName, sal_Bool SwIoSystem::IsFileFilter(SfxMedium& rMedium, const String& rFmtName)
const SfxFilter** ppFilter )
{ {
sal_Bool bRet = sal_False; sal_Bool bRet = sal_False;
...@@ -261,9 +260,6 @@ sal_Bool SwIoSystem::IsFileFilter( SfxMedium& rMedium, const String& rFmtName, ...@@ -261,9 +260,6 @@ sal_Bool SwIoSystem::IsFileFilter( SfxMedium& rMedium, const String& rFmtName,
} }
} }
} }
if( bRet && ppFilter )
*ppFilter = pFltr;
} }
pFltr = aIter.Next(); pFltr = aIter.Next();
......
...@@ -63,7 +63,7 @@ sal_uLong SwFilterDetect::DetectFilter( SfxMedium& rMedium, const SfxFilter** pp ...@@ -63,7 +63,7 @@ sal_uLong SwFilterDetect::DetectFilter( SfxMedium& rMedium, const SfxFilter** pp
String aPrefFlt = (*ppFilter)->GetUserData(); String aPrefFlt = (*ppFilter)->GetUserData();
// detection for TextFilter needs an additional checking // 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; return bDetected ? nRet : ERRCODE_ABORT;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment