summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-11-29 09:23:37 +0000
committerAndras Timar <atimar@suse.com>2013-01-13 21:59:28 +0100
commit907d934daca790c0168c57924de6bef9ef8068f6 (patch)
tree3c2a5fecf4ed40e12618cde3b28faaf562cfea8b
parent8180265067a9596dfd1946eb94b724525b384732 (diff)
Simplify SwIoSystem::IsFileFilter
bRet = bRet && (pFltr->GetUserData().equals(rFmtName)); is already inside an if bRet = bRet && (pFltr->GetUserData().equals(rFmtName)); condition bRet = xStg.Is() && IsValidStgFilter( *xStg, *pFltr ); is already inside an if ( xStg.Is() ) condition Change-Id: I2115041d99b6fcbae7a829557c37627d03b5ee24 Signed-off-by: Tor Lillqvist <tlillqvist@suse.com>
-rw-r--r--sw/source/filter/basflt/iodetect.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 41adf6762445..7a72a6f552ef 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -244,8 +244,7 @@ sal_Bool SwIoSystem::IsFileFilter( SfxMedium& rMedium, const String& rFmtName,
if ( xStor.is() )
bRet = IsValidStgFilter( xStor, *pFltr );
else if ( xStg.Is() )
- bRet = xStg.Is() && IsValidStgFilter( *xStg, *pFltr );
- bRet = bRet && (pFltr->GetUserData() == rFmtName);
+ bRet = IsValidStgFilter( *xStg, *pFltr );
}
else if( !xStg.Is() && !xStor.is() )
{