diff options
author | Olivier Hallot <olivier.hallot@alta.org.br> | 2011-12-16 17:29:07 -0200 |
---|---|---|
committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2011-12-20 19:28:37 +0400 |
commit | 1375183d465fb17db513dfe16ac522e48573a4c0 (patch) | |
tree | 149a5335e02bd92c33201cc49a4c85c390969e46 /cui | |
parent | 170d75c3f58e500bda864bf7b7aeefd06716a0a6 (diff) |
Fix for fdo43460 Part XI getLength() to isEmpty()
Part XI
Module
cui
Diffstat (limited to 'cui')
30 files changed, 117 insertions, 117 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 159272f07c2b..9a2a918e1661 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1015,7 +1015,7 @@ void SfxAcceleratorConfigPage::Apply(const css::uno::Reference< css::ui::XAccele try { - if (sCommand.getLength()) + if (!sCommand.isEmpty()) xAccMgr->setKeyEvent(aAWTKey, sCommand); else xAccMgr->removeKeyEvent(aAWTKey); @@ -1233,7 +1233,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*, EMPTYARG if ( ERRCODE_NONE == m_pFileDlg->GetError() ) sCfgName = m_pFileDlg->GetPath(); - if ( !sCfgName.getLength() ) + if ( sCfgName.isEmpty() ) return 0; GetTabDialog()->EnterWait(); @@ -1317,7 +1317,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, EMPTYARG if ( ERRCODE_NONE == m_pFileDlg->GetError() ) sCfgName = m_pFileDlg->GetPath(); - if ( !sCfgName.getLength() ) + if ( sCfgName.isEmpty() ) return 0; GetTabDialog()->EnterWait(); @@ -1358,7 +1358,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, EMPTYARG // set the correct media type if the storage was new created ::rtl::OUString sMediaType; xUIConfigProps->getPropertyValue(MEDIATYPE_PROPNAME) >>= sMediaType; - if (!sMediaType.getLength()) + if (sMediaType.isEmpty()) xUIConfigProps->setPropertyValue(MEDIATYPE_PROPNAME, css::uno::makeAny(MEDIATYPE_UICONFIG)); xCfgMgr = css::uno::Reference< css::ui::XUIConfigurationManager >(m_xSMGR->createInstance(SERVICE_UICONFIGMGR), css::uno::UNO_QUERY_THROW); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index de19df3769cf..35de8426617a 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -481,7 +481,7 @@ OUString GetUIModuleName( const OUString& aModuleId, const uno::Reference< css:: } } - if ( aModuleUIName.getLength() == 0 ) + if ( aModuleUIName.isEmpty() ) aModuleUIName = GetModuleName( aModuleId ); return aModuleUIName; @@ -613,7 +613,7 @@ ConvertSvxConfigEntry( // as an empty string. // It will be initialised again later using the command to label map. aPropSeq[2].Name = aDescriptorLabel; - if ( pEntry->HasChangedName() == sal_False && pEntry->GetCommand().getLength() ) + if ( pEntry->HasChangedName() == sal_False && !pEntry->GetCommand().isEmpty() ) { sal_Bool isDefaultName = sal_False; try @@ -694,7 +694,7 @@ ConvertToolbarEntry( // as an empty string. // It will be initialised again later using the command to label map. aPropSeq[2].Name = aDescriptorLabel; - if ( pEntry->HasChangedName() == sal_False && pEntry->GetCommand().getLength() ) + if ( pEntry->HasChangedName() == sal_False && !pEntry->GetCommand().isEmpty() ) { sal_Bool isDefaultName = sal_False; try @@ -781,7 +781,7 @@ sal_Bool impl_showKeyConfigTabPage( const css::uno::Reference< css::frame::XFram { ::rtl::OUString sModuleId = xMM->identify(xFrame); if ( - ( sModuleId.getLength() ) && + ( !sModuleId.isEmpty() ) && (!sModuleId.equals(MODULEID_STARTMODULE)) ) return sal_True; @@ -1187,7 +1187,7 @@ bool MenuSaveInData::LoadSubMenus( OUString subMenuTitle( rBaseTitle ); - if ( subMenuTitle.getLength() != 0 ) + if ( !subMenuTitle.isEmpty() ) { subMenuTitle += OUString( RTL_CONSTASCII_USTRINGPARAM(aMenuSeparatorStr)); @@ -1758,7 +1758,7 @@ void SvxConfigPage::Reset( const SfxItemSet& ) // if an item to select has been passed in (eg. the ResourceURL for a // toolbar) then try to select the SaveInData entry that has that item bool bURLToSelectFound = sal_False; - if ( m_aURLToSelect.getLength() != 0 ) + if ( !m_aURLToSelect.isEmpty() ) { if ( pDocData != NULL && pDocData->HasURL( m_aURLToSelect ) ) { @@ -3016,9 +3016,9 @@ SvxConfigEntry* SvxMainMenuOrganizerDialog::GetSelectedEntry() const OUString& SvxConfigEntry::GetHelpText() { - if ( aHelpText.getLength() == 0 ) + if ( aHelpText.isEmpty() ) { - if ( aCommand.getLength() ) + if ( !aCommand.isEmpty() ) { aHelpText = Application::GetHelp()->GetHelpText( aCommand, NULL ); } @@ -3688,7 +3688,7 @@ void SvxToolbarConfigPage::Init() ReloadTopLevelListBox(); sal_uInt16 nPos = 0; - if ( m_aURLToSelect.getLength() != 0 ) + if ( !m_aURLToSelect.isEmpty() ) { for ( sal_uInt16 i = 0 ; i < aTopLevelListBox.GetEntryCount(); ++i ) { @@ -3989,12 +3989,12 @@ SvxEntries* ToolbarSaveInData::GetEntries() uno::Reference< container::XIndexAccess > xToolbarSettings = GetConfigManager()->getSettings( url, sal_False ); - if ( uiname.getLength() == 0 ) + if ( uiname.isEmpty() ) { // try to get the name from m_xPersistentWindowState uiname = GetSystemUIName( url ); - if ( uiname.getLength() == 0 ) + if ( uiname.isEmpty() ) { uiname = systemname; } @@ -4077,12 +4077,12 @@ SvxEntries* ToolbarSaveInData::GetEntries() uno::Reference< container::XIndexAccess > xToolbarSettings = xParentCfgMgr->getSettings( url, sal_False ); - if ( uiname.getLength() == 0 ) + if ( uiname.isEmpty() ) { // try to get the name from m_xPersistentWindowState uiname = GetSystemUIName( url ); - if ( uiname.getLength() == 0 ) + if ( uiname.isEmpty() ) { uiname = systemname; } diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index b25e2e443fab..123088b82a2e 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -145,7 +145,7 @@ sal_Bool SfxStylesInfo_Impl::parseStyleCommand(SfxStyleInfo_Impl& aStyle) if (sArg.indexOf(CMDURL_FPART_ONLY) == 0) aStyle.sFamily = sArg.copy(LEN_FPART, sArg.getLength()-LEN_FPART); - if (aStyle.sFamily.getLength() && aStyle.sStyle.getLength()) + if (!(aStyle.sFamily.isEmpty() || aStyle.sStyle.isEmpty())) return sal_True; return sal_False; @@ -178,7 +178,7 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle) catch(const css::uno::Exception&) { aStyle.sLabel = ::rtl::OUString(); } - if (!aStyle.sLabel.getLength()) + if (aStyle.sLabel.isEmpty()) { aStyle.sLabel = aStyle.sCommand; } @@ -503,7 +503,7 @@ void SfxConfigGroupListBox_Impl::InitModule() try { m_xModuleCategoryInfo->getByName(sGroupID) >>= sGroupName; - if (!sGroupName.getLength()) + if (sGroupName.isEmpty()) continue; } catch(const css::container::NoSuchElementException&) @@ -813,7 +813,7 @@ Image SfxConfigGroupListBox_Impl::GetImage( } } } - if( factoryURL.getLength() > 0 ) + if( !factoryURL.isEmpty() ) { aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false ); } @@ -886,7 +886,7 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC { sUIName = ::rtl::OUString(); } // fallback for missing UINames !? - if (!sUIName.getLength()) + if (sUIName.isEmpty()) { sUIName = sCommand; } diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 26847cc25666..367fc6799cc9 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -791,7 +791,7 @@ Any _SvxMacroTabPage::GetPropsByName( const ::rtl::OUString& eventName, EventsHa Any aReturn; ::comphelper::NamedValueCollection aProps; - if ( rAssignedEvent.first.getLength() && rAssignedEvent.second.getLength() ) + if ( !(rAssignedEvent.first.isEmpty() || rAssignedEvent.second.isEmpty()) ) { aProps.put( "EventType", rAssignedEvent.first ); aProps.put( "Script", rAssignedEvent.second ); @@ -882,7 +882,7 @@ IMPL_LINK(AssignComponentDialog, ButtonHandler, Button *, EMPTYARG) { ::rtl::OUString aMethodName = maMethodEdit.GetText(); maURL = ::rtl::OUString(); - if( aMethodName.getLength() ) + if( !aMethodName.isEmpty() ) { maURL = aVndSunStarUNO; maURL += aMethodName; @@ -904,7 +904,7 @@ AssignComponentDialog::AssignComponentDialog( Window * pParent, const ::rtl::OUS maOKButton.SetClickHdl(LINK(this, AssignComponentDialog, ButtonHandler)); ::rtl::OUString aMethodName; - if( maURL.getLength() ) + if( !maURL.isEmpty() ) { sal_Int32 nIndex = maURL.indexOf( aVndSunStarUNO ); if( nIndex == 0 ) diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 2e9cd2539a93..d5beb563da30 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -470,7 +470,7 @@ void SvxConfigGroupListBox_Impl::Init() Reference< container::XNameAccess > xModuleCategories; if ( xAllCategories.is() ) { - if ( aModuleId.getLength() != 0 ) + if ( !aModuleId.isEmpty() ) { try { @@ -629,7 +629,7 @@ Image SvxConfigGroupListBox_Impl::GetImage( } } } - if( factoryURL.getLength() > 0 ) + if( !factoryURL.isEmpty() ) { aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false ); } @@ -720,7 +720,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected() for ( sal_Int32 i = 0; i < commands.getLength(); ++i ) { - if ( commands[i].Command.getLength() == 0 ) + if ( commands[i].Command.isEmpty() ) { continue; } @@ -756,7 +756,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected() { } - if ( aLabel.getLength() == 0 ) + if ( aLabel.isEmpty() ) { aLabel = commands[i].Command; } @@ -1072,7 +1072,7 @@ void SvxScriptSelectorDialog::UpdateUI() { OUString url = GetScriptURL(); - if ( url != NULL && url.getLength() != 0 ) + if ( url != NULL && !url.isEmpty() ) { String rMessage = aCommands.GetHelpText( aCommands.FirstSelected() ); diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index cb68f6b90366..58e0be99d265 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -357,7 +357,7 @@ void SpellDialog::UpdateBoxes_Impl() aExplainLink.SetURL( pSpellErrorDescription->sExplanationURL ); aExplainFT.SetText( pSpellErrorDescription->sExplanation ); } - if( pSpellErrorDescription && pSpellErrorDescription->sDialogTitle.getLength() ) + if( pSpellErrorDescription && !pSpellErrorDescription->sDialogTitle.isEmpty() ) { // use this function to apply the correct image to be used... SetTitle_Impl( nAltLanguage ); @@ -400,7 +400,7 @@ void SpellDialog::UpdateBoxes_Impl() aIgnoreAllPB.Show( bShowChangeAll ); aAddToDictMB.Show( bShowChangeAll ); aIgnoreRulePB.Show( !bShowChangeAll ); - aIgnoreRulePB.Enable(pSpellErrorDescription && pSpellErrorDescription->sRuleId.getLength()); + aIgnoreRulePB.Enable(pSpellErrorDescription && !pSpellErrorDescription->sRuleId.isEmpty()); aAutoCorrPB.Show( bShowChangeAll && rParent.HasAutoCorrection() ); } @@ -926,7 +926,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang) { String sVendor; const SpellErrorDescription* pSpellErrorDescription = aSentenceED.GetAlternatives(); - if( pSpellErrorDescription && pSpellErrorDescription->sServiceName.getLength() ) + if( pSpellErrorDescription && !pSpellErrorDescription->sServiceName.isEmpty() ) { uno::Reference< lang::XServiceDisplayName > xDisplayName( pSpellErrorDescription->xGrammarChecker, uno::UNO_QUERY ); if( xDisplayName.is() ) @@ -998,7 +998,7 @@ void SpellDialog::InitUserDicts() { OUString aDictionaryImageUrl( aCfg.GetSpellAndGrammarContextDictionaryImage( xSvcInfo->getImplementationName()) ); - if (aDictionaryImageUrl.getLength() > 0) + if (!aDictionaryImageUrl.isEmpty()) { Image aImage( lcl_GetImageFromPngUrl( aDictionaryImageUrl ) ); pMenu->SetItemImage( nItemId, aImage ); @@ -1292,7 +1292,7 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& rSentence, bool &bHasRe rtl::OUString &rString = aStart->sText; //dots are sometimes part of the spelled word but they are not necessarily part of the replacement - bool bDot = rString.getLength() && rString[rString.getLength() - 1] == '.'; + bool bDot = !rString.isEmpty() && rString[rString.getLength() - 1] == '.'; Reference<XDictionaryEntry> xEntry = xChangeAll->getEntry( rString ); @@ -1300,7 +1300,7 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& rSentence, bool &bHasRe { rString = xEntry->getReplacementText(); - if(bDot && (!rString.getLength() || rString[rString.getLength() - 1] != '.')) + if(bDot && (rString.isEmpty() || rString[rString.getLength() - 1] != '.')) rString = rString + rtl::OUString(static_cast<sal_Unicode>('.')); aStart->xAlternatives = 0; @@ -2143,7 +2143,7 @@ IMPL_LINK( SpellDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperlink ) rtl::OUString sURL=pHyperlink->GetURL(); rtl::OUString sTitle=GetText(); - if ( ! sURL.getLength() ) // Nothing to do, when the URL is empty + if ( sURL.isEmpty() ) // Nothing to do, when the URL is empty return 1; try { diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 03555748f12d..250a0d2c9376 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -95,7 +95,7 @@ GetBuildId() sBuildId = aBuffer.makeStringAndClear(); } - OSL_ENSURE( sBuildId.getLength() > 0, "No BUILDID in bootstrap file" ); + OSL_ENSURE( !sBuildId.isEmpty(), "No BUILDID in bootstrap file" ); return sBuildId; } @@ -260,7 +260,7 @@ IMPL_LINK( AboutDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperlink ) rtl::OUString sURL=pHyperlink->GetURL(); rtl::OUString sTitle=GetText(); - if ( ! sURL.getLength() ) // Nothing to do, when the URL is empty + if ( sURL.isEmpty() ) // Nothing to do, when the URL is empty return 1; try { diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 5ae4a105e7c1..60772e9e24d3 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -258,7 +258,7 @@ void HexColorControl::Paste() ::rtl::OUString aText; aData >>= aText; - if( aText.getLength() && aText.matchAsciiL( "#", 1, 0 ) ) + if( !aText.isEmpty() && aText.matchAsciiL( "#", 1, 0 ) ) aText = aText.copy(1); if( aText.getLength() > 6 ) diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 732613dcccb0..865c05aa0506 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -1518,7 +1518,7 @@ namespace svx Sequence< OUString >& _rEntries ) { bool bRet = false; - if( _xDict.is() && _rOrg.getLength() ) + if( _xDict.is() && !_rOrg.isEmpty() ) { try { diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index ae30fa0b5f4c..63d70f604ecb 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -204,7 +204,7 @@ void SvxHyperlinkNewDocTp::FillDocumentList () continue; // Insert into listbox - if ( aDocumentUrl.getLength() ) + if ( !aDocumentUrl.isEmpty() ) { if ( aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:factory/simpress?slot=6686" ) ) ) // SJ: #106216# do not start aDocumentUrl = String( RTL_CONSTASCII_USTRINGPARAM( "private:factory/simpress" ) ); // the AutoPilot for impress @@ -460,7 +460,7 @@ IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG ) INetURLObject aNewURL( aStrTmp ); - if( aStrName.Len() > 0 && aNewURL.getExtension().getLength() > 0 && + if( aStrName.Len() > 0 && !aNewURL.getExtension().isEmpty() && maLbDocTypes.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) { // get private-url diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 1018518b718d..68cc9b407294 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -134,7 +134,7 @@ void SvxHyperlinkInternetTp::FillDlgFields ( String& aStrURL ) setFTPUser(aURL.GetUser(), aURL.GetPass()); //do not show password and user in url - if(aURL.GetUser().getLength()!=0 || aURL.GetPass().getLength()!=0 ) + if(!aURL.GetUser().isEmpty() || !aURL.GetPass().isEmpty() ) aURL.SetUserAndPass(aEmptyStr,aEmptyStr); } diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index e2f666a1e7cb..0e2bdc053456 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -262,7 +262,7 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL ) { uno::Reference< lang::XComponent > xComp; - if( aURL.getLength() ) + if( !aURL.isEmpty() ) { // load from url uno::Reference< frame::XComponentLoader > xLoader( xDesktop, uno::UNO_QUERY ); @@ -303,12 +303,12 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL ) else mnError = LERR_DOCNOTOPEN; - if ( aURL.getLength() ) + if ( !aURL.isEmpty() ) xComp->dispose(); } else { - if( aURL.getLength() ) + if( !aURL.isEmpty() ) mnError=LERR_DOCNOTOPEN; } } diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 325ca92bffd2..2a0bb9add7fd 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -927,7 +927,7 @@ short SfxInsertFloatingFrameDialog::Execute() aURL = aObj.GetMainURL( INetURLObject::NO_DECODE ); } - if ( !m_xObj.is() && aURL.getLength() ) + if ( !m_xObj.is() && !aURL.isEmpty() ) { // create the object ::rtl::OUString aName; diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 7e021d020dbd..09709513a5af 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -379,7 +379,7 @@ SvLBoxEntry * SFTreeListBox::insertEntry( bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData, ::rtl::OUString factoryURL ) { SvLBoxEntry * p; - if( nBitmap == IMG_DOCUMENT && factoryURL.getLength() > 0 ) + if( nBitmap == IMG_DOCUMENT && !factoryURL.isEmpty() ) { Image aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false ); p = InsertEntry( @@ -1296,7 +1296,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection() { sal_Int32 pos = source.indexOf( token ); - if ( pos != -1 && value.getLength() != 0 ) + if ( pos != -1 && !value.isEmpty() ) { return source.replaceAt( pos, token.getLength(), value ); } @@ -1323,7 +1323,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection() result = ReplaceString( result, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%LINENUMBER") ), line ); - if ( type.getLength() != 0 ) + if ( !type.isEmpty() ) { result += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n\n") ); result += ::rtl::OUString(String(CUI_RES(RID_SVXSTR_ERROR_TYPE_LABEL))); @@ -1331,7 +1331,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection() result += type; } - if ( message.getLength() != 0 ) + if ( !message.isEmpty() ) { result += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n\n") ); result += ::rtl::OUString(String(CUI_RES(RID_SVXSTR_ERROR_MESSAGE_LABEL))); @@ -1354,17 +1354,17 @@ void SvxScriptOrgDialog::RestorePreviousSelection() ::rtl::OUString type = ::rtl::OUString(); ::rtl::OUString message = eScriptError.Message; - if ( eScriptError.language.getLength() != 0 ) + if ( !eScriptError.language.isEmpty() ) { language = eScriptError.language; } - if ( eScriptError.scriptName.getLength() != 0 ) + if ( !eScriptError.scriptName.isEmpty() ) { script = eScriptError.scriptName; } - if ( eScriptError.Message.getLength() != 0 ) + if ( !eScriptError.Message.isEmpty() ) { message = eScriptError.Message; } @@ -1397,16 +1397,16 @@ void SvxScriptOrgDialog::RestorePreviousSelection() ::rtl::OUString type = unknown; ::rtl::OUString message = eScriptException.Message; - if ( eScriptException.language.getLength() != 0 ) + if ( !eScriptException.language.isEmpty() ) { language = eScriptException.language; } - if ( eScriptException.scriptName.getLength() != 0 ) + if ( !eScriptException.scriptName.isEmpty() ) { script = eScriptException.scriptName; } - if ( eScriptException.Message.getLength() != 0 ) + if ( !eScriptException.Message.isEmpty() ) { message = eScriptException.Message; } @@ -1423,7 +1423,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection() CUI_RES( RID_SVXSTR_EXCEPTION_RUNNING ) ); } - if ( eScriptException.exceptionType.getLength() != 0 ) + if ( !eScriptException.exceptionType.isEmpty() ) { type = eScriptException.exceptionType; } @@ -1444,11 +1444,11 @@ void SvxScriptOrgDialog::RestorePreviousSelection() ::rtl::OUString message; - if ( sError.scriptName.getLength() > 0 ) + if ( !sError.scriptName.isEmpty() ) { script = sError.scriptName; } - if ( sError.language.getLength() > 0 ) + if ( !sError.language.isEmpty() ) { language = sError.language; } @@ -1565,7 +1565,7 @@ IMPL_LINK( SvxScriptErrorDialog, ShowDialog, ::rtl::OUString*, pMessage ) { ::rtl::OUString message; - if ( pMessage && pMessage->getLength() != 0 ) + if ( pMessage && !pMessage->isEmpty() ) { message = *pMessage; } diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index dde09339cb27..8c4d3ab63c47 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -305,7 +305,7 @@ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL SvxThesaurusDi xThesaurus->queryMeanings( rTerm, rLocale, rProperties ) ); // text with '.' at the end? - if (0 == aMeanings.getLength() && rTerm.getLength() && + if ( 0 == aMeanings.getLength() && !rTerm.isEmpty() && rTerm.getStr()[ rTerm.getLength() - 1 ] == '.') { // try again without trailing '.' chars. It may be a word at the @@ -342,7 +342,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() uno::Sequence< OUString > aSynonyms( pMeanings[i]->querySynonyms() ); const sal_Int32 nSynonyms = aSynonyms.getLength(); const OUString *pSynonyms = aSynonyms.getConstArray(); - DBG_ASSERT( rMeaningTxt.getLength() > 0, "meaning with empty text" ); + DBG_ASSERT( !rMeaningTxt.isEmpty(), "meaning with empty text" ); DBG_ASSERT( nSynonyms > 0, "meaning without synonym" ); m_pAlternativesCT->AddEntry( i + 1, rMeaningTxt, true ); @@ -397,7 +397,7 @@ void SvxThesaurusDialog_Impl::LookUp_Impl() String aText( aWordCB.GetText() ); aLookUpText = OUString( aText ); - if (aLookUpText.getLength() > 0 && + if (!aLookUpText.isEmpty() && (aLookUpHistory.empty() || aLookUpText != aLookUpHistory.top())) aLookUpHistory.push( aLookUpText ); @@ -534,7 +534,7 @@ void SvxThesaurusDialog_Impl::UpdateVendorImage() Image aImage; String sThesImplName( lcl_GetThesImplName( SvxCreateLocale( nLookUpLanguage ) ) ); OUString aThesDialogImageUrl( aCfg.GetThesaurusDialogImage( sThesImplName ) ); - if (sThesImplName.Len() > 0 && aThesDialogImageUrl.getLength() > 0) + if (sThesImplName.Len() > 0 && !aThesDialogImageUrl.isEmpty()) aImage = Image( lcl_GetImageFromPngUrl( aThesDialogImageUrl ) ); else aImage = aVendorDefaultImage; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 8935d1e726e6..4169fed42630 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -110,7 +110,7 @@ struct TAccInfo sal_Bool isConfigured() const { - return (m_nKeyPos>-1 && m_nListPos>-1 && m_sCommand.getLength()); + return (m_nKeyPos>-1 && m_nListPos>-1 && !m_sCommand.isEmpty()); } sal_Int32 m_nKeyPos; diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index ff926c5179b6..e42385a493a4 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -209,7 +209,7 @@ sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet ) { SvLBoxEntry* pEntry = pPathBox->GetEntry(i); DatabaseRegistration* pRegistration = static_cast< DatabaseRegistration* >( pEntry->GetUserData() ); - if ( pRegistration && pRegistration->sLocation.getLength() ) + if ( pRegistration && !pRegistration->sLocation.isEmpty() ) { ::rtl::OUString sName( pPathBox->GetEntryText( pEntry, 0 ) ); OFileNotation aTransformer( pRegistration->sLocation ); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 3a50fc23e963..c42ba08a38f9 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1535,7 +1535,7 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage() if(!bFillItemSetCalled && aColorSchemeLB.GetSavedValue() != aColorSchemeLB.GetSelectEntryPos()) { rtl::OUString sOldScheme = aColorSchemeLB.GetEntry(aColorSchemeLB.GetSavedValue()); - if(sOldScheme.getLength()) + if(!sOldScheme.isEmpty()) { pColorConfig->SetCurrentSchemeName(sOldScheme); pExtColorConfig->SetCurrentSchemeName(sOldScheme); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 0e428e39ab2e..bc86de6241df 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1321,7 +1321,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe if (theNameAccess->hasByName(sUserLocaleKey)) theNameAccess->getByName(sUserLocaleKey) >>= m_sUserLocaleValue; // select the user specified locale in the listbox - if (m_sUserLocaleValue.getLength() > 0) + if (!m_sUserLocaleValue.isEmpty()) { sal_Int32 d = 0; for (sal_uInt16 i=0; i < aUserInterfaceLB.GetEntryCount(); i++) @@ -1527,7 +1527,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) } OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString(); - LanguageType eOldLocale = (sLang.getLength() ? + LanguageType eOldLocale = (!sLang.isEmpty() ? lcl_LangStringToLangType( sLang ) : LANGUAGE_SYSTEM); LanguageType eNewLocale = aLocaleSettingLB.GetSelectLanguage(); if ( eOldLocale != eNewLocale ) @@ -1539,7 +1539,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) Locale aLocale; SvxLanguageToLocale( aLocale, eNewLocale ); sNewLang = aLocale.Language; - if ( aLocale.Country.getLength() > 0 ) + if ( !aLocale.Country.isEmpty() ) { sNewLang += C2U("-"); sNewLang += aLocale.Country; @@ -1688,7 +1688,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) { OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString(); - if ( sLang.getLength() ) + if ( !sLang.isEmpty() ) aLocaleSettingLB.SelectLanguage(lcl_LangStringToLangType(sLang)); else aLocaleSettingLB.SelectLanguage( LANGUAGE_SYSTEM ); @@ -1711,7 +1711,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) LanguageType eLang; const NfCurrencyEntry* pCurr = NULL; sLang = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString(); - if ( sLang.getLength() ) + if ( !sLang.isEmpty() ) { SvtSysLocaleOptions::GetCurrencyAbbrevAndLanguage( aAbbrev, eLang, sLang ); pCurr = SvNumberFormatter::GetCurrencyEntry( aAbbrev, eLang ); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index d716f7f51464..736bfe0b5936 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -146,7 +146,7 @@ static sal_Int32 lcl_SeqGetEntryPos( static void lcl_OpenURL( ::rtl::OUString sURL ) { - if ( sURL.getLength() > 0 ) + if ( !sURL.isEmpty() ) { localizeWebserviceURI(sURL); try @@ -629,7 +629,7 @@ Sequence< OUString > SvxLinguData_Impl::GetSortedImplNames( sal_Int16 nLang, sal case TYPE_GRAMMAR : aImplName = rInfo.sGrammarImplName; break; } - if (aImplName.getLength() && (lcl_SeqGetIndex( aRes, aImplName) == -1)) // name not yet added + if (!aImplName.isEmpty() && (lcl_SeqGetIndex( aRes, aImplName) == -1)) // name not yet added { DBG_ASSERT( nIdx < aRes.getLength(), "index out of range" ); if (nIdx < aRes.getLength()) @@ -708,7 +708,7 @@ void lcl_MergeDisplayArray( if(rToAdd.xSpell.is()) { DBG_ASSERT( !pEntry->xSpell.is() && - pEntry->sSpellImplName.getLength() == 0, + pEntry->sSpellImplName.isEmpty(), "merge conflict" ); pEntry->sSpellImplName = rToAdd.sSpellImplName; pEntry->xSpell = rToAdd.xSpell; @@ -716,7 +716,7 @@ void lcl_MergeDisplayArray( if(rToAdd.xGrammar.is()) { DBG_ASSERT( !pEntry->xGrammar.is() && - pEntry->sGrammarImplName.getLength() == 0, + pEntry->sGrammarImplName.isEmpty(), "merge conflict" ); pEntry->sGrammarImplName = rToAdd.sGrammarImplName; pEntry->xGrammar = rToAdd.xGrammar; @@ -724,7 +724,7 @@ void lcl_MergeDisplayArray( if(rToAdd.xHyph.is()) { DBG_ASSERT( !pEntry->xHyph.is() && - pEntry->sHyphImplName.getLength() == 0, + pEntry->sHyphImplName.isEmpty(), "merge conflict" ); pEntry->sHyphImplName = rToAdd.sHyphImplName; pEntry->xHyph = rToAdd.xHyph; @@ -732,7 +732,7 @@ void lcl_MergeDisplayArray( if(rToAdd.xThes.is()) { DBG_ASSERT( !pEntry->xThes.is() && - pEntry->sThesImplName.getLength() == 0, + pEntry->sThesImplName.isEmpty(), "merge conflict" ); pEntry->sThesImplName = rToAdd.sThesImplName; pEntry->xThes = rToAdd.xThes; @@ -931,7 +931,7 @@ void SvxLinguData_Impl::SetChecked(const Sequence<OUString>& rConfiguredServices if (pEntry && !pEntry->bConfigured) { const OUString &rSrvcImplName = pConfiguredServices[n]; - if (rSrvcImplName.getLength() && + if (!rSrvcImplName.isEmpty() && (pEntry->sSpellImplName == rSrvcImplName || pEntry->sGrammarImplName == rSrvcImplName || pEntry->sHyphImplName == rSrvcImplName || @@ -976,7 +976,7 @@ sal_Bool SvxLinguData_Impl::AddRemove( void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, sal_Bool bEnable ) { - DBG_ASSERT( rDisplayName.getLength(), "empty DisplayName" ); + DBG_ASSERT( !rDisplayName.isEmpty(), "empty DisplayName" ); ServiceInfo_Impl *pInfo = 0; ServiceInfo_Impl *pTmp = 0; @@ -2261,7 +2261,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pInfo->xSpell->hasLocale( aCurLocale ); aImplName = pInfo->sSpellImplName; } - if (aImplName.getLength() && bIsSuppLang) + if (!aImplName.isEmpty() && bIsSuppLang) { String aTxt( pInfo->sDisplayName ); SvLBoxEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); @@ -2305,7 +2305,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pInfo->xGrammar->hasLocale( aCurLocale ); aImplName = pInfo->sGrammarImplName; } - if (aImplName.getLength() && bIsSuppLang) + if (!aImplName.isEmpty() && bIsSuppLang) { String aTxt( pInfo->sDisplayName ); SvLBoxEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); @@ -2349,7 +2349,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pInfo->xHyph->hasLocale( aCurLocale ); aImplName = pInfo->sHyphImplName; } - if (aImplName.getLength() && bIsSuppLang) + if (!aImplName.isEmpty() && bIsSuppLang) { String aTxt( pInfo->sDisplayName ); SvLBoxEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); @@ -2393,7 +2393,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pInfo->xThes->hasLocale( aCurLocale ); aImplName = pInfo->sThesImplName; } - if (aImplName.getLength() && bIsSuppLang) + if (!aImplName.isEmpty() && bIsSuppLang) { String aTxt( pInfo->sDisplayName ); SvLBoxEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index e914524dc597..57534fcb1a27 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -344,31 +344,31 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet ) } SvtModuleOptions aModuleOpt; - if(pImpl->aDefaultArr[APP_MATH].getLength() && + if(!pImpl->aDefaultArr[APP_MATH].isEmpty() && pImpl->aDefaultArr[APP_MATH] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_MATH)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_MATH, pImpl->aDefaultArr[APP_MATH]); - if( pImpl->aDefaultArr[APP_DRAW].getLength() && + if( !pImpl->aDefaultArr[APP_DRAW].isEmpty() && pImpl->aDefaultArr[APP_DRAW] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_DRAW)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_DRAW, pImpl->aDefaultArr[APP_DRAW]); - if(pImpl->aDefaultArr[APP_IMPRESS].getLength() && + if(!pImpl->aDefaultArr[APP_IMPRESS].isEmpty() && pImpl->aDefaultArr[APP_IMPRESS] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_IMPRESS)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_IMPRESS, pImpl->aDefaultArr[APP_IMPRESS]); - if(pImpl->aDefaultArr[APP_CALC].getLength() && + if(!pImpl->aDefaultArr[APP_CALC].isEmpty() && pImpl->aDefaultArr[APP_CALC] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_CALC)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_CALC, pImpl->aDefaultArr[APP_CALC]); - if(pImpl->aDefaultArr[APP_WRITER].getLength() && + if(!pImpl->aDefaultArr[APP_WRITER].isEmpty() && pImpl->aDefaultArr[APP_WRITER] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITER)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_WRITER, pImpl->aDefaultArr[APP_WRITER]); - if(pImpl->aDefaultArr[APP_WRITER_WEB].getLength() && + if(!pImpl->aDefaultArr[APP_WRITER_WEB].isEmpty() && pImpl->aDefaultArr[APP_WRITER_WEB] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITERWEB)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_WRITERWEB, pImpl->aDefaultArr[APP_WRITER_WEB]); - if(pImpl->aDefaultArr[APP_WRITER_GLOBAL].getLength() && + if(!pImpl->aDefaultArr[APP_WRITER_GLOBAL].isEmpty() && pImpl->aDefaultArr[APP_WRITER_GLOBAL] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITERGLOBAL)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_WRITERGLOBAL, pImpl->aDefaultArr[APP_WRITER_GLOBAL]); @@ -463,7 +463,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) { SequenceAsHashMap aFilter(xList->nextElement()); OUString sFilter = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),OUString()); - if (sFilter.getLength()) + if (!sFilter.isEmpty()) { sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")),sal_Int32()); lList.push_back(sFilter); @@ -609,7 +609,7 @@ IMPL_LINK( SfxSaveTabPage, FilterHdl_Impl, ListBox *, pBox ) if(pFilters[i] == pImpl->aDefaultArr[nData]) sSelect = pUIFilters[i]; } - if(sSelect.getLength()) + if(!sSelect.isEmpty()) aSaveAsLB.SelectEntry(sSelect); aSaveAsFI.Show(pImpl->aDefaultReadonlyArr[nData]); aSaveAsFT.Enable(!pImpl->aDefaultReadonlyArr[nData]); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 6e71ed025318..8053a3f25711 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -539,7 +539,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const rtl::OUString { FreeResource(); - bIsFromExtensionManager = ( rExtensionId.getLength() > 0 ); + bIsFromExtensionManager = ( !rExtensionId.isEmpty() ); InitTreeAndHandler(); LoadExtensionOptions( rExtensionId ); ResizeTreeLB(); @@ -1266,7 +1266,7 @@ sal_Bool EnableSSO( void ) sal_Bool bSSOEnabled = ( theOfflineValue == theDefaultOfflineValue && - ( theServerTypeValue.getLength() == 0 || + ( theServerTypeValue.isEmpty() || theServerTypeValue == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("uno") ) ) && theBackendServiceTypeValue == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( @@ -2058,7 +2058,7 @@ void OfaTreeOptionsDialog::LoadExtensionOptions( const rtl::OUString& rExtension ::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY ); DBG_ASSERT( xRoot.is(), "OfaTreeOptionsDialog::LoadExtensionOptions(): no config" ); // when called by Tools - Options then load nodes of active module - if ( rExtensionId.getLength() == 0 ) + if ( rExtensionId.isEmpty() ) pModule = LoadModule( GetModuleIdentifier( xMSFac, Reference< XFrame >() ), xRoot ); VectorOfNodes aNodeList; @@ -2201,15 +2201,15 @@ void OfaTreeOptionsDialog::LoadNodes( xNodeAccess->getByName( C2U("GroupId") ) >>= sGroupId; xNodeAccess->getByName( C2U("GroupIndex") ) >>= nGroupIndex; - if ( sLabel.getLength() == 0 ) + if ( sLabel.isEmpty() ) sLabel = sGroupName; - String sTemp = getGroupName( sLabel, rExtensionId.getLength() > 0 ); + String sTemp = getGroupName( sLabel, !rExtensionId.isEmpty() ); if ( sTemp.Len() > 0 ) sLabel = sTemp; OptionsNode* pNode = new OptionsNode( sNodeId, sLabel, sPageURL, bAllModules, sGroupId, nGroupIndex ); - if ( !rExtensionId.getLength() && !isNodeActive( pNode, pModule ) ) + if ( rExtensionId.isEmpty() && !isNodeActive( pNode, pModule ) ) { delete pNode; continue; @@ -2237,12 +2237,12 @@ void OfaTreeOptionsDialog::LoadNodes( xLeaveAccess->getByName( C2U("GroupId") ) >>= sLeafGrpId; xLeaveAccess->getByName( C2U("GroupIndex") ) >>= nLeafGrpIdx; - if ( !rExtensionId.getLength() || sId == rExtensionId ) + if ( rExtensionId.isEmpty() || sId == rExtensionId ) { OptionsLeaf* pLeaf = new OptionsLeaf( sId, sLeafLabel, sLeafURL, sEventHdl, sLeafGrpId, nLeafGrpIdx ); - if ( sLeafGrpId.getLength() > 0 ) + if ( !sLeafGrpId.isEmpty() ) { bool bAlreadyOpened = false; if ( pNode->m_aGroupedLeaves.size() > 0 ) @@ -2346,7 +2346,7 @@ void lcl_insertLeaf( { sal_uInt16 nNodeGrpId = getGroupNodeId( pNode->m_sId ); nGrpId = pDlg->AddGroup( pNode->m_sLabel, NULL, NULL, nNodeGrpId ); - if ( pNode->m_sPageURL.getLength() > 0 ) + if ( !pNode->m_sPageURL.isEmpty() ) { SvLBoxEntry* pGrpEntry = rTreeLB.GetEntry( 0, nGrpId ); DBG_ASSERT( pGrpEntry, "OfaTreeOptionsDialog::InsertNodes(): no group" ); @@ -2442,7 +2442,7 @@ void ExtensionsTabPage::CreateDialogWithHandler() { try { - bool bWithHandler = ( m_sEventHdl.getLength() > 0 ); + bool bWithHandler = ( !m_sEventHdl.isEmpty() ); if ( bWithHandler ) { Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); @@ -2516,7 +2516,7 @@ void ExtensionsTabPage::ActivatePage() Size aSize = GetSizePixel(); m_xPage->setPosSize( aPos.X() + 1, aPos.Y() + 1, aSize.Width() - 2, aSize.Height() - 2, awt::PosSize::POSSIZE ); - if ( m_sEventHdl.getLength() > 0 ) + if ( !m_sEventHdl.isEmpty() ) DispatchAction( C2U("initialize") ); } } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 147a18fb9192..541ba2aeef6e 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2597,7 +2597,7 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr& rSmartTagMgr ) const rtl::OUString aSmartTagType = xRec->getSmartTagName(j); rtl::OUString aSmartTagCaption = rSmartTagMgr.GetSmartTagCaption( aSmartTagType, aLocale ); - if ( !aSmartTagCaption.getLength() ) + if ( aSmartTagCaption.isEmpty() ) aSmartTagCaption = aSmartTagType; const rtl::OUString aLBEntry = aSmartTagCaption + diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index dd5d346b95d6..22928500d2e0 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -361,8 +361,8 @@ IMPL_LINK(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) return 0; SvxNumSettings_ImplPtr _pSet = aNumSettingsArr.GetObject(nIdx); sal_Int16 eNewType = _pSet->nNumberType; - const sal_Unicode cLocalPrefix = _pSet->sPrefix.getLength() ? _pSet->sPrefix.getStr()[0] : 0; - const sal_Unicode cLocalSuffix = _pSet->sSuffix.getLength() ? _pSet->sSuffix.getStr()[0] : 0; + const sal_Unicode cLocalPrefix = !_pSet->sPrefix.isEmpty() ? _pSet->sPrefix.getStr()[0] : 0; + const sal_Unicode cLocalSuffix = !_pSet->sSuffix.isEmpty() ? _pSet->sSuffix.getStr()[0] : 0; sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) @@ -744,7 +744,7 @@ IMPL_LINK(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) // #i93908# clear suffix for bullet lists aFmt.SetPrefix(::rtl::OUString()); aFmt.SetSuffix(::rtl::OUString()); - if( pLevelSettings->sBulletFont.getLength() && + if( !pLevelSettings->sBulletFont.isEmpty() && pLevelSettings->sBulletFont.compareTo( rActBulletFont.GetName())) { @@ -780,7 +780,7 @@ IMPL_LINK(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) else aFmt.SetBulletFont( &rActBulletFont ); - aFmt.SetBulletChar( pLevelSettings->sBulletChar.getLength() + aFmt.SetBulletChar( !pLevelSettings->sBulletChar.isEmpty() ? pLevelSettings->sBulletChar.getStr()[0] : 0 ); aFmt.SetCharFmtName( sBulletCharFmtName ); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index b0877be9dba9..2de889a80afe 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -1021,7 +1021,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) { aFile.Append( pBitmapList->GetName() ); - if( !aFile.getExtension().getLength() ) + if( aFile.getExtension().isEmpty() ) aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "sob" ) ) ); } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index dca59c564862..579b9ed896f2 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -253,7 +253,7 @@ IMPL_LINK( SvxLoadSaveEmbed, ClickSaveHdl_Impl, void *, EMPTYARG ) { aFile.Append( pList->GetName() ); - if( !aFile.getExtension().getLength() ) + if( aFile.getExtension().isEmpty() ) aFile.SetExtension( XPropertyList::GetDefaultExt( meType ) ); } diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index e7fb9b4dcd9a..d82567009d8f 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -740,7 +740,7 @@ IMPL_LINK( SvxGradientTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) { aFile.Append( pGradientList->GetName() ); - if( !aFile.getExtension().getLength() ) + if( aFile.getExtension().isEmpty() ) aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "sog" ) ) ); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index a2cefa2f0d08..9568061c1195 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -779,7 +779,7 @@ IMPL_LINK( SvxHatchTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) { aFile.Append( pHatchingList->GetName() ); - if( !aFile.getExtension().getLength() ) + if( aFile.getExtension().isEmpty() ) aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "soh" ) ) ); } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 6073d54c3500..9b5876a28ed7 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -839,7 +839,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) { aFile.Append( pDashList->GetName() ); - if( !aFile.getExtension().getLength() ) + if( aFile.getExtension().isEmpty() ) aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "sod" ) ) ); } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index f8d4e0c95891..25d8eafbe315 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -639,7 +639,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) { aFile.Append( pLineEndList->GetName() ); - if( !aFile.getExtension().getLength() ) + if( aFile.getExtension().isEmpty() ) aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "soe" ) ) ); } |