From e3f11c10d8cc759d01afa4b8fd8bd98c81a03119 Mon Sep 17 00:00:00 2001 From: "Chr. Rossmanith" Date: Mon, 21 Jan 2013 14:32:09 +0100 Subject: Changed SetText() / GetText() to take/return OUString replaced lots of Len() with isEmpty() Change-Id: I6b82d48245ee2a0782e05a326f7934e9357227d0 Reviewed-on: https://gerrit.libreoffice.org/1795 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- chart2/source/controller/dialogs/res_ErrorBar.cxx | 5 ++--- chart2/source/controller/dialogs/res_Titles.cxx | 14 +++++++------- chart2/source/controller/dialogs/tp_AxisPositions.cxx | 2 +- chart2/source/controller/dialogs/tp_DataSource.cxx | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) (limited to 'chart2') diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 377c7dd282af..3b1fb4fe52e1 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -393,9 +393,8 @@ IMPL_LINK( ErrorBarResources, CategoryChosen, void *, ) eOldError != CHERROR_RANGE ) { m_aCbSyncPosNeg.Check( - (m_aEdRangePositive.GetText().Len() > 0) && - m_aEdRangePositive.GetText().Equals( - m_aEdRangeNegative.GetText())); + (!m_aEdRangePositive.GetText().isEmpty()) && + m_aEdRangePositive.GetText() == m_aEdRangeNegative.GetText()); } // changed from range else if( m_eErrorKind != CHERROR_RANGE && diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx index e2845b7566ab..ee1b2391e87a 100644 --- a/chart2/source/controller/dialogs/res_Titles.cxx +++ b/chart2/source/controller/dialogs/res_Titles.cxx @@ -188,13 +188,13 @@ void TitleResources::writeToResources( const TitleDialogData& rInput ) void TitleResources::readFromResources( TitleDialogData& rOutput ) { - rOutput.aExistenceList[0] = static_cast(m_aEd_Main.GetText().Len()!=0); - rOutput.aExistenceList[1] = static_cast(m_aEd_Sub.GetText().Len()!=0); - rOutput.aExistenceList[2] = static_cast(m_aEd_XAxis.GetText().Len()!=0); - rOutput.aExistenceList[3] = static_cast(m_aEd_YAxis.GetText().Len()!=0); - rOutput.aExistenceList[4] = static_cast(m_aEd_ZAxis.GetText().Len()!=0); - rOutput.aExistenceList[5] = static_cast(m_aEd_SecondaryXAxis.GetText().Len()!=0); - rOutput.aExistenceList[6] = static_cast(m_aEd_SecondaryYAxis.GetText().Len()!=0); + rOutput.aExistenceList[0] = static_cast(!m_aEd_Main.GetText().isEmpty()); + rOutput.aExistenceList[1] = static_cast(!m_aEd_Sub.GetText().isEmpty()); + rOutput.aExistenceList[2] = static_cast(!m_aEd_XAxis.GetText().isEmpty()); + rOutput.aExistenceList[3] = static_cast(!m_aEd_YAxis.GetText().isEmpty()); + rOutput.aExistenceList[4] = static_cast(!m_aEd_ZAxis.GetText().isEmpty()); + rOutput.aExistenceList[5] = static_cast(!m_aEd_SecondaryXAxis.GetText().isEmpty()); + rOutput.aExistenceList[6] = static_cast(!m_aEd_SecondaryYAxis.GetText().isEmpty()); rOutput.aTextList[0] = m_aEd_Main.GetText(); rOutput.aTextList[1] = m_aEd_Sub.GetText(); diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 9f4dd121a0f8..11a98c6efe2f 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -454,7 +454,7 @@ IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl) m_aED_CrossesAt.Show( (2==nPos) && !m_bCrossingAxisIsCategoryAxis ); m_aED_CrossesAtCategory.Show( (2==nPos) && m_bCrossingAxisIsCategoryAxis ); - if(! m_aED_CrossesAt.GetText().Len() ) + if( m_aED_CrossesAt.GetText().isEmpty() ) m_aED_CrossesAt.SetValue(0.0); if( 0 == m_aED_CrossesAtCategory.GetSelectEntryCount() ) m_aED_CrossesAtCategory.SelectEntryPos(0); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index bb5ef2ae63a2..257a2773d809 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -629,7 +629,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl) { OSL_ASSERT( m_pCurrentRangeChoosingField == 0 ); m_pCurrentRangeChoosingField = & m_aEDT_RANGE; - if( m_aEDT_RANGE.GetText().Len() > 0 && + if( !m_aEDT_RANGE.GetText().isEmpty() && ! updateModelFromControl( m_pCurrentRangeChoosingField )) return 0; @@ -673,7 +673,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl) { OSL_ASSERT( m_pCurrentRangeChoosingField == 0 ); m_pCurrentRangeChoosingField = & m_aEDT_CATEGORIES; - if( m_aEDT_CATEGORIES.GetText().Len() > 0 && + if( !m_aEDT_CATEGORIES.GetText().isEmpty() && ! updateModelFromControl( m_pCurrentRangeChoosingField )) return 0; -- cgit