diff options
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/provider/MasterScriptProvider.cxx | 4 | ||||
| -rw-r--r-- | scripting/source/vbaevents/eventhelper.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index b2e229b62cd9..5c8422e41a7b 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -267,8 +267,8 @@ throw ( provider::ScriptFrameworkErrorException, OUString langKey("language"); OUString locKey("location"); - if ( sfUri->hasParameter( langKey ) == sal_False || - sfUri->hasParameter( locKey ) == sal_False || + if ( !sfUri->hasParameter( langKey ) || + !sfUri->hasParameter( locKey ) || ( sfUri->getName().isEmpty() ) ) { OUString errorMsg = "Incorrect format for Script URI: "; diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index a34c2735e09f..976f1534e18d 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -491,7 +491,7 @@ public: virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<OUString>::get(); } virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) SAL_OVERRIDE - { return ( ( m_hEvents.empty() ? sal_False : sal_True ) ); } + { return !m_hEvents.empty(); } private: typedef std::unordered_map< OUString, Any, OUStringHash, |