diff options
Diffstat (limited to 'sw/source/ui/misc')
-rw-r--r-- | sw/source/ui/misc/bookmark.cxx | 7 | ||||
-rw-r--r-- | sw/source/ui/misc/glossary.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/misc/insfnote.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/misc/linenum.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/outline.cxx | 2 |
5 files changed, 12 insertions, 13 deletions
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 8ab55b4503d4..5d40a8b7b20e 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -103,10 +103,9 @@ void SwInsertBookmarkDlg::Apply() } // insert text mark - sal_uInt16 nLen = m_pBookmarkBox->GetText().Len(); SwBoxEntry aTmpEntry(m_pBookmarkBox->GetText(), 0 ); - if ( nLen && (m_pBookmarkBox->GetEntryPos(aTmpEntry) == COMBOBOX_ENTRY_NOTFOUND) ) + if ( !m_pBookmarkBox->GetText().isEmpty() && (m_pBookmarkBox->GetEntryPos(aTmpEntry) == COMBOBOX_ENTRY_NOTFOUND) ) { String sEntry(comphelper::string::remove(m_pBookmarkBox->GetText(), m_pBookmarkBox->GetMultiSelectionSeparator())); @@ -177,7 +176,7 @@ sal_uInt16 BookmarkCombo::GetSelEntryPos(sal_uInt16 nPos) const for (; nPos < nCnt; nPos++) { - String sEntry(comphelper::string::strip(GetText().GetToken(nPos, cSep), ' ')); + String sEntry(comphelper::string::strip(GetText().getToken(nPos, cSep), ' ')); if (GetEntryPos(sEntry) != COMBOBOX_ENTRY_NOTFOUND) return nPos; } @@ -212,7 +211,7 @@ sal_uInt16 BookmarkCombo::GetSelectEntryPos( sal_uInt16 nSelIndex ) const if (nSelIndex == nCnt) { sal_Unicode cSep = GetMultiSelectionSeparator(); - String sEntry(comphelper::string::strip(GetText().GetToken(nPos, cSep), ' ')); + String sEntry(comphelper::string::strip(GetText().getToken(nPos, cSep), ' ')); return GetEntryPos(sEntry); } nPos = GetNextSelEntryPos(nPos); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index ecec7b1551a2..c5a38aefbc12 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -410,7 +410,7 @@ IMPL_LINK( SwGlossaryDlg, EnableHdl, Menu *, pMn ) SvTreeListEntry* pEntry = m_pCategoryBox->FirstSelected(); const String aEditText(m_pNameED->GetText()); - const sal_Bool bHasEntry = aEditText.Len() && m_pShortNameEdit->GetText().Len(); + const sal_Bool bHasEntry = aEditText.Len() && !m_pShortNameEdit->GetText().isEmpty(); const sal_Bool bExists = 0 != DoesBlockExist(aEditText, m_pShortNameEdit->GetText()); const sal_Bool bIsGroup = pEntry && !m_pCategoryBox->GetParent(pEntry); pMn->EnableItem("new", bSelection && bHasEntry && !bExists); @@ -798,13 +798,13 @@ IMPL_LINK_NOARG_INLINE_END(SwGlossaryDlg, EditHdl) ------------------------------------------------------------------------*/ IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox ) { - String aName(aNewName.GetText()); + OUString aName(aNewName.GetText()); SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParent(); if( pBox == &aNewName ) aNewShort.SetText( lcl_GetValidShortCut( aName ) ); - sal_Bool bEnable = aName.Len() && aNewShort.GetText().Len() && + sal_Bool bEnable = !aName.isEmpty() && !aNewShort.GetText().isEmpty() && (!pDlg->DoesBlockExist(aName, aNewShort.GetText()) || aName == aOldName.GetText()); aOk.Enable(bEnable); @@ -814,7 +814,7 @@ IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox ) IMPL_LINK_NOARG(SwNewGlosNameDlg, Rename) { SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParent(); - String sNew = GetAppCharClass().uppercase(aNewShort.GetText()); + OUString sNew = GetAppCharClass().uppercase(aNewShort.GetText()); if( pDlg->pGlossaryHdl->HasShortName(aNewShort.GetText()) && sNew != aOldShort.GetText() ) { diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 368550b6db5f..e455bfe992fa 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -87,7 +87,7 @@ void SwInsFootNoteDlg::Apply() IMPL_LINK_NOARG_INLINE_START(SwInsFootNoteDlg, NumberCharHdl) { m_pNumberCharEdit->GrabFocus(); - m_pOkBtn->Enable( m_pNumberCharEdit->GetText().Len() || bExtCharAvailable ); + m_pOkBtn->Enable( !m_pNumberCharEdit->GetText().isEmpty() || bExtCharAvailable ); return 0; } IMPL_LINK_NOARG_INLINE_END(SwInsFootNoteDlg, NumberCharHdl) @@ -95,7 +95,7 @@ IMPL_LINK_NOARG_INLINE_END(SwInsFootNoteDlg, NumberCharHdl) IMPL_LINK_NOARG_INLINE_START(SwInsFootNoteDlg, NumberEditHdl) { m_pNumberCharBtn->Check( sal_True ); - m_pOkBtn->Enable( 0 != m_pNumberCharEdit->GetText().Len() ); + m_pOkBtn->Enable( !m_pNumberCharEdit->GetText().isEmpty() ); return 0; } @@ -143,7 +143,7 @@ IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl) } bExtCharAvailable = sal_True; - m_pOkBtn->Enable(0 != m_pNumberCharEdit->GetText().Len()); + m_pOkBtn->Enable(!m_pNumberCharEdit->GetText().isEmpty()); } } delete pDlg; diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 159d54bd5e3c..4a7b87e6d4b5 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -191,7 +191,7 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl) --------------------------------------------------------------------*/ IMPL_LINK_NOARG(SwLineNumberingDlg, ModifyHdl) { - bool bEnable = m_pNumberingOnCB->IsChecked() && m_pDivisorED->GetText().Len() != 0; + bool bEnable = m_pNumberingOnCB->IsChecked() && !m_pDivisorED->GetText().isEmpty(); m_pDivIntervalFT->Enable(bEnable); m_pDivIntervalNF->Enable(bEnable); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 5a4d9e31d45f..a5d114266984 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -117,7 +117,7 @@ void SwNumNamesDlg::SetUserNames(const String *pList[]) ------------------------------------------------------------------------*/ IMPL_LINK_INLINE_START( SwNumNamesDlg, ModifyHdl, Edit *, pBox ) { - aOKBtn.Enable(0 != pBox->GetText().Len()); + aOKBtn.Enable(!pBox->GetText().isEmpty()); return 0; } IMPL_LINK_INLINE_END( SwNumNamesDlg, ModifyHdl, Edit *, pBox ) |