diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-11-29 09:23:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-29 10:27:53 +0000 |
| commit | f8eb694c0a50f9f6f874f000e47adb1ca22453e5 (patch) | |
| tree | b5be9ffde8e8d34915d059fca90869db47f57a43 /sw | |
| parent | af7bd0c91f0a6a1d40b4051cb8a8c1c19f7108e3 (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
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/basflt/iodetect.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index af3cd972e6ea..f17eff24471a 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -230,16 +230,15 @@ sal_Bool SwIoSystem::IsFileFilter( SfxMedium& rMedium, const String& rFmtName, const SfxFilter* pFltr = aIter.First(); while ( pFltr ) { - if( pFltr->GetUserData().equals(rFmtName) ) + const rtl::OUString& rUserData = pFltr->GetUserData(); + if (rUserData.equals(rFmtName)) { - const rtl::OUString& rUserData = pFltr->GetUserData(); if( 'C' == rUserData[0] ) { if ( xStor.is() ) bRet = IsValidStgFilter( xStor, *pFltr ); else if ( xStg.Is() ) - bRet = xStg.Is() && IsValidStgFilter( *xStg, *pFltr ); - bRet = bRet && (pFltr->GetUserData().equals(rFmtName)); + bRet = IsValidStgFilter( *xStg, *pFltr ); } else if( !xStg.Is() && !xStor.is() ) { |