From 3e4f51f112248b4e586f5bd86388099737ed17e9 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Sun, 25 Dec 2011 19:31:22 -0200 Subject: Fix for fdo43460 Part XIX getLength() to isEmpty() Part XIX Module formula and fpicker --- fpicker/source/office/OfficeControlAccess.cxx | 2 +- fpicker/source/office/OfficeFilePicker.cxx | 16 ++++++++-------- fpicker/source/office/OfficeFolderPicker.cxx | 2 +- fpicker/source/office/commonpicker.cxx | 8 ++++---- fpicker/source/office/fpsmartcontent.cxx | 2 +- fpicker/source/office/iodlg.cxx | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'fpicker/source/office') diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index 7b2d15951d9e..8b8288db36c1 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -515,7 +515,7 @@ namespace svt { ::rtl::OUString aEntry; _rValue >>= aEntry; - if ( aEntry.getLength() ) + if ( !aEntry.isEmpty() ) _pListbox->InsertEntry( aEntry ); } break; diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 75fba5aed80a..3df9f11f7e5f 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -166,13 +166,13 @@ void SvtFilePicker::prepareExecute() { // set the default directory // --**-- doesn't match the spec yet - if ( m_aDisplayDirectory.getLength() > 0 || m_aDefaultName.getLength() > 0 ) + if ( !m_aDisplayDirectory.isEmpty() || !m_aDefaultName.isEmpty() ) { - if ( m_aDisplayDirectory.getLength() > 0 ) + if ( !m_aDisplayDirectory.isEmpty() ) { INetURLObject aPath( m_aDisplayDirectory ); - if ( m_aDefaultName.getLength() > 0 ) + if ( !m_aDefaultName.isEmpty() ) { aPath.insertName( m_aDefaultName ); getDialog()->SetHasFilename( true ); @@ -180,7 +180,7 @@ void SvtFilePicker::prepareExecute() String sPath = aPath.GetMainURL( INetURLObject::NO_DECODE ); getDialog()->SetPath( aPath.GetMainURL( INetURLObject::NO_DECODE ) ); } - else if ( m_aDefaultName.getLength() > 0 ) + else if ( !m_aDefaultName.isEmpty() ) { getDialog()->SetPath( m_aDefaultName ); getDialog()->SetHasFilename( true ); @@ -235,7 +235,7 @@ void SvtFilePicker::prepareExecute() } // set the default filter - if ( m_aCurrentFilter.getLength() > 0 ) + if ( !m_aCurrentFilter.isEmpty() ) getDialog()->SetCurFilter( m_aCurrentFilter ); } @@ -435,7 +435,7 @@ void SvtFilePicker::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFil m_pFilterList = new FilterList; // set the first filter to the current filter - if ( ! m_aCurrentFilter.getLength() ) + if ( m_aCurrentFilter.isEmpty() ) m_aCurrentFilter = _rInitialCurrentFilter; } } @@ -490,7 +490,7 @@ SvtFileDialog* SvtFilePicker::implCreateDialog( Window* _pParent ) SvtFileDialog* dialog = new SvtFileDialog( _pParent, nBits, nExtraBits ); // Set StandardDir if present - if ( m_aStandardDir.getLength() > 0) + if ( !m_aStandardDir.isEmpty()) { String sStandardDir = String( m_aStandardDir ); dialog->SetStandardDir( sStandardDir ); @@ -1081,7 +1081,7 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments ) namedValue.Value >>= sStandardDir; // Set the directory for the "back to the default dir" button - if ( sStandardDir.getLength() > 0 ) + if ( !sStandardDir.isEmpty() ) { m_aStandardDir = sStandardDir; } diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index a43311b43b12..74dd3168c9d6 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -133,7 +133,7 @@ sal_Int16 SvtFolderPicker::implExecutePicker( ) void SvtFolderPicker::prepareExecute() { // set the default directory - if ( m_aDisplayDirectory.getLength() > 0 ) + if ( !m_aDisplayDirectory.isEmpty() ) getDialog()->SetPath( m_aDisplayDirectory ); else { diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index e6a5f227d7fe..df317e47a1f1 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -112,7 +112,7 @@ namespace svt createPicker(); // set the title - if ( m_aTitle.getLength() > 0 ) + if ( !m_aTitle.isEmpty() ) getDialog()->SetText( m_aTitle ); } @@ -218,7 +218,7 @@ namespace svt if ( m_pDlg ) { // synchronize the help id of the dialog with out help URL property - if ( m_sHelpURL.getLength() ) + if ( !m_sHelpURL.isEmpty() ) { // somebody already set the help URL while we had no dialog yet OControlAccess::setHelpURL( m_pDlg, m_sHelpURL, sal_False ); } @@ -445,7 +445,7 @@ namespace svt { if ( *pArgument >>= aPropArg ) { - if ( aPropArg.Name.getLength() <= 0) + if ( aPropArg.Name.isEmpty()) continue; sSettingName = aPropArg.Name; @@ -453,7 +453,7 @@ namespace svt } else if ( *pArgument >>= aPairArg ) { - if ( aPairArg.Name.getLength() <= 0) + if ( aPairArg.Name.isEmpty()) continue; sSettingName = aPairArg.Name; diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx index 8fe9eaf1d598..49692ac37dc8 100644 --- a/fpicker/source/office/fpsmartcontent.cxx +++ b/fpicker/source/office/fpsmartcontent.cxx @@ -158,7 +158,7 @@ namespace svt m_eState = INVALID; // default to INVALID m_sURL = _rURL; - if ( m_sURL.getLength() ) + if ( !m_sURL.isEmpty() ) { try { diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 9f093530949b..e1c4c2acaada 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -384,7 +384,7 @@ namespace _rValue = ::rtl::OUString(); ::rtl::OUString sEnvName = ::rtl::OUString::createFromAscii( _pAsciiEnvName ); osl_getEnvironment( sEnvName.pData, &_rValue.pData ); - return _rValue.getLength() != 0; + return !_rValue.isEmpty(); } } -- cgit