diff options
Diffstat (limited to 'sfx2/source/doc')
-rw-r--r-- | sfx2/source/doc/SfxDocumentMetaData.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/sfxmodelfactory.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 51825a009c14..06fddd7f3f49 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -1239,7 +1239,7 @@ void SAL_CALL SfxDocumentMetaData::init( SAL_WARN("sfx.doc", "Invalid boolean: " << text); continue; } - } else if ( type == "string" || true) { // default + } else { // default any <<= text; } try { diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx index 9267ed18846c..b1dc8c21ab7d 100644 --- a/sfx2/source/doc/sfxmodelfactory.cxx +++ b/sfx2/source/doc/sfxmodelfactory.cxx @@ -134,9 +134,7 @@ namespace sfx2 if ( ( _rArgument >>= aNamedValue ) && isSpecialArgumentName( aNamedValue.Name ) ) return true; PropertyValue aPropertyValue; - if ( ( _rArgument >>= aPropertyValue ) && isSpecialArgumentName( aPropertyValue.Name ) ) - return true; - return false; + return ( _rArgument >>= aPropertyValue ) && isSpecialArgumentName( aPropertyValue.Name ); } }; } diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 86fff479b192..a0f8da28cbb4 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -127,9 +127,7 @@ public: { if(maKeyword.isEmpty()) return false; - if(sItemName.toAsciiLowerCase().indexOf(maKeyword) >= 0) - return true; - return false; + return sItemName.toAsciiLowerCase().indexOf(maKeyword) >= 0; } private: |