diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-09 17:44:52 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-09 20:32:40 +0100 |
commit | d2f57b6c1275e0e6ed7f214d471ddb84ecb1b4ad (patch) | |
tree | 1728c15960c67ec9cc322e83ed37e0dc8e1f51b6 | |
parent | a2454a42ad2236f0f6b88be166bc7e6a8f90f036 (diff) |
fdo#43460: use isEmpty()
Change-Id: I47b35af71277fdda19767a553c960bf12164b92f
-rw-r--r-- | extensions/source/ole/unoobjw.cxx | 14 | ||||
-rw-r--r-- | sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx | 6 | ||||
-rw-r--r-- | sal/workben/testfile.cxx | 12 | ||||
-rw-r--r-- | svx/source/form/fmpage.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbunosearchcontrollers.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/style/fonthdl.cxx | 4 |
7 files changed, 24 insertions, 24 deletions
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 9bd7a4ae6996..c6551f42fa3c 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -1375,7 +1375,7 @@ STDMETHODIMP UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /* { exactName = m_xExactName->getExactName( info.name); // invoke again - if( exactName.getLength() != 0) + if( !exactName.isEmpty() ) { if( SUCCEEDED( ret= doInvoke( pdispparams, pvarResult, pexcepinfo, puArgErr, exactName, params))) @@ -1400,7 +1400,7 @@ STDMETHODIMP UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /* { exactName = m_xExactName->getExactName( info.name); // invoke again - if( exactName.getLength() != 0) + if( !exactName.isEmpty() ) { if( SUCCEEDED( ret= doSetProperty( pdispparams, pvarResult, pexcepinfo, puArgErr, exactName, params))) @@ -1424,7 +1424,7 @@ STDMETHODIMP UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /* { exactName = m_xExactName->getExactName( info.name); // invoke again - if( exactName.getLength() != 0) + if( !exactName.isEmpty() ) { if( SUCCEEDED( ret= doGetProperty( pdispparams, pvarResult, pexcepinfo, exactName))) @@ -1452,7 +1452,7 @@ STDMETHODIMP UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /* { exactName = m_xExactName->getExactName( info.name); // invoke again - if( exactName.getLength() != 0) + if( !exactName.isEmpty() ) { if( SUCCEEDED( ret= doInvoke( pdispparams, pvarResult, pexcepinfo, puArgErr, exactName, params))) @@ -1471,7 +1471,7 @@ STDMETHODIMP UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /* && ret == DISP_E_MEMBERNOTFOUND) { // try to get the exact name - if( exactName.getLength() != 0) + if( !exactName.isEmpty() ) { if( SUCCEEDED( ret= doSetProperty( pdispparams, pvarResult, pexcepinfo, puArgErr, exactName, params))) @@ -1496,7 +1496,7 @@ STDMETHODIMP UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /* { exactName = m_xExactName->getExactName( info.name); // invoke again - if( exactName.getLength() != 0) + if( !exactName.isEmpty() ) { if( SUCCEEDED( ret= doInvoke( pdispparams, pvarResult, pexcepinfo, puArgErr, exactName, params))) @@ -1514,7 +1514,7 @@ STDMETHODIMP UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /* pexcepinfo, info.name)) && ret == DISP_E_MEMBERNOTFOUND) { - if( exactName.getLength() != 0) + if( !exactName.isEmpty() ) { if( SUCCEEDED( ret= doSetProperty( pdispparams, pvarResult, pexcepinfo, puArgErr, exactName, params))) diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx index 297777178b4c..0cab17f5b546 100644 --- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx +++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx @@ -177,7 +177,7 @@ namespace rtl_Bootstrap rtl::OUString suGetname; aBootstrap.getIniName( suGetname ); printUString( suGetname ); - CPPUNIT_ASSERT_MESSAGE("ctor error without initial file.", suGetname.getLength() != 0 ); + CPPUNIT_ASSERT_MESSAGE("ctor error without initial file.", !suGetname.isEmpty() ); } CPPUNIT_TEST_SUITE(ctor); @@ -238,7 +238,7 @@ namespace rtl_Bootstrap rtl::OUString suValuename ("INHERITED_VALUE"); aBootstrap.getFrom( suValuename, suGetname ); printUString( suGetname ); - CPPUNIT_ASSERT_MESSAGE("get the value of a variable in ini file.", suGetname.getLength() != 0 ); + CPPUNIT_ASSERT_MESSAGE("get the value of a variable in ini file.", !suGetname.isEmpty()); } //use defaut value @@ -440,7 +440,7 @@ namespace rtl_Bootstrap rtl::OUString suValuename("INHERITED_VALUE"); Bootstrap::get( suValuename, suGetname ); printUString( suGetname ); - CPPUNIT_ASSERT_MESSAGE("setIniFilename and get value of the argument.", suGetname.getLength() != 0 ); + CPPUNIT_ASSERT_MESSAGE("setIniFilename and get value of the argument.", !suGetname.isEmpty()); } CPPUNIT_TEST_SUITE(setIniFilename); diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx index a670f7b7d1d2..473e25a4ddf8 100644 --- a/sal/workben/testfile.cxx +++ b/sal/workben/testfile.cxx @@ -2152,7 +2152,7 @@ void ConvertPathTest(rtl::OUString& strPath) // getFileURLFromSystemPath //-------------------------------------------------- - if ( strNormPath.getLength() != 0 ) + if ( !strNormPath.isEmpty() ) { rc=FileBase::getFileURLFromSystemPath( strNormPath, strFileURL ); @@ -2172,7 +2172,7 @@ void ConvertPathTest(rtl::OUString& strPath) // getNormalizedPathFromFileURL //-------------------------------------------------- - if ( strFileURL.getLength() != 0 ) + if ( !strFileURL.isEmpty() ) { rc=FileBase::getSystemPathFromFileURL( strFileURL, strNormPathFromFileURL ); @@ -2193,7 +2193,7 @@ void ConvertPathTest(rtl::OUString& strPath) // getSystemPathFromFileURL //-------------------------------------------------- - if ( strNormPath.getLength() != 0 ) + if ( !strNormPath.isEmpty() ) { rc=FileBase::getSystemPathFromFileURL( strNormPath, strSystemPath ); @@ -2331,7 +2331,7 @@ void SearchPathTest(void) // searchFileURL (with a normalized path) //-------------------------------------------------- - if ( strNormPath.getLength() != 0 ) + if ( !strNormPath.isEmpty() ) { printf( "\nSearch-Normalized-Path (with a normalized path) : "); printFileName ( strNormPath ); @@ -2355,7 +2355,7 @@ void SearchPathTest(void) // searchFileURL (with a File-URL) //-------------------------------------------------- - if ( strFileURL.getLength() != 0 ) + if ( !strFileURL.isEmpty() ) { printf( "\nSearch-Normalized-Path (with a FileURL) : "); printFileName( strFileURL ); @@ -2379,7 +2379,7 @@ void SearchPathTest(void) // searchFileURL (with a systempath) //-------------------------------------------------- - if ( strSystemPath.getLength() != 0 ) + if ( !strSystemPath.isEmpty() ) { printf( "\nSearch-Normalized-Path (with a SystemPath) : "); printFileName( strSystemPath ); diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index bcf3147b90dd..3243c2314a68 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -180,7 +180,7 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView, if (::comphelper::hasProperty(FM_PROP_HELPTEXT, xSet)) aHelpText = ::comphelper::getString(xSet->getPropertyValue(FM_PROP_HELPTEXT)).getStr(); - if (!aHelpText.getLength() && ::comphelper::hasProperty(FM_PROP_TARGET_URL, xSet)) + if (aHelpText.isEmpty() && ::comphelper::hasProperty(FM_PROP_TARGET_URL, xSet)) { OUString aText = ::comphelper::getString(xSet->getPropertyValue(FM_PROP_TARGET_URL)); INetURLObject aUrl(aText); @@ -200,7 +200,7 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView, } } } - if ( aHelpText.getLength() != 0 ) + if ( !aHelpText.isEmpty() ) { // Hilfe anzeigen Rectangle aItemRect = pObj->GetCurrentBoundRect(); diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index c964fceea2c3..7a020ed10ffe 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -118,7 +118,7 @@ void FindTextFieldControl::SetTextToSelected_Impl() { } - if ( aString.getLength() != 0 ) + if ( !aString.isEmpty() ) { SetText( aString ); GetModifyHdl().Call(this); // FIXME why SetText doesn't trigger this? diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 86cdd8c01ddd..b71f8513f20e 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2164,13 +2164,13 @@ void SdXMLExport::exportPresentationSettings() if( !xPageName.is() ) continue; - if( sTmp.getLength() != 0 ) + if( !sTmp.isEmpty() ) sTmp.append( sal_Unicode( ',' ) ); sTmp.append( xPageName->getName() ); } - if( sTmp.getLength() ) + if( !sTmp.isEmpty() ) AddAttribute(XML_NAMESPACE_PRESENTATION, XML_PAGES, sTmp.makeStringAndClear() ); SvXMLElementExport aShows(*this, XML_NAMESPACE_PRESENTATION, XML_SHOW, sal_True, sal_True); @@ -2685,7 +2685,7 @@ OUString SdXMLExport::getNavigationOrder( const Reference< XDrawPage >& xDrawPag OUString sId( getInterfaceToIdentifierMapper().registerReference( Reference< XInterface >( xNavOrder->getByIndex( nIndex ), UNO_QUERY ) ) ); if( !sId.isEmpty() ) { - if( sNavOrder.getLength() != 0 ) + if( !sNavOrder.isEmpty() ) sNavOrder.append( (sal_Unicode)' ' ); sNavOrder.append( sId ); } diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx index 29ca53d9c629..fb9f18c049c8 100644 --- a/xmloff/source/style/fonthdl.cxx +++ b/xmloff/source/style/fonthdl.cxx @@ -96,7 +96,7 @@ sal_Bool XMLFontFamilyNamePropHdl::importXML( const OUString& rStrImpValue, uno: if( nFirst <= nLast ) { - if( sValue.getLength() != 0 ) + if( !sValue.isEmpty() ) sValue.append(';'); sValue.append(rStrImpValue.copy( nFirst, nLast-nFirst+1)); @@ -107,7 +107,7 @@ sal_Bool XMLFontFamilyNamePropHdl::importXML( const OUString& rStrImpValue, uno: } while( -1 != nPos ); - if (sValue.getLength()) + if (!sValue.isEmpty()) { rValue <<= sValue.makeStringAndClear(); bRet = sal_True; |