From ff1a7a59434f5f793d4044aad615bcf78148e963 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 5 May 2014 08:00:36 +0200 Subject: RFC: add IsValueChangedFromSaved to VCL button and listbox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a method bool IsValueChangedFromSaved() to the various Button and Listbox classes. Use it to simplify code like if ( maBoldAppFont.GetSavedValue() != TriState(maBoldAppFont.IsChecked()) ) to if ( maBoldAppFont.IsValueChangedFromSaved() ) Change-Id: I26b291d0980237497063ee301d63a49c7d2bc227 Reviewed-on: https://gerrit.libreoffice.org/9250 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- reportdesign/source/ui/dlg/GroupsSorting.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'reportdesign/source/ui') diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index cc18b17353a8..441658bd1ff9 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -1071,23 +1071,23 @@ void OGroupsSortingDialog::SaveData( sal_Int32 _nRow) return; uno::Reference< report::XGroup> xGroup = getGroup(nGroupPos); - if ( m_aHeaderLst.GetSavedValue() != m_aHeaderLst.GetSelectEntryPos() ) + if ( m_aHeaderLst.IsValueChangedFromSaved() ) xGroup->setHeaderOn( m_aHeaderLst.GetSelectEntryPos() == 0 ); - if ( m_aFooterLst.GetSavedValue() != m_aFooterLst.GetSelectEntryPos() ) + if ( m_aFooterLst.IsValueChangedFromSaved() ) xGroup->setFooterOn( m_aFooterLst.GetSelectEntryPos() == 0 ); - if ( m_aKeepTogetherLst.GetSavedValue() != m_aKeepTogetherLst.GetSelectEntryPos() ) + if ( m_aKeepTogetherLst.IsValueChangedFromSaved() ) xGroup->setKeepTogether( m_aKeepTogetherLst.GetSelectEntryPos() ); - if ( m_aGroupOnLst.GetSavedValue() != m_aGroupOnLst.GetSelectEntryPos() ) + if ( m_aGroupOnLst.IsValueChangedFromSaved() ) { sal_Int16 nGroupOn = static_cast(reinterpret_cast(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos()))); xGroup->setGroupOn( nGroupOn ); } - if ( m_aGroupIntervalEd.GetSavedValue().toInt32() != m_aGroupIntervalEd.GetValue() ) + if ( m_aGroupIntervalEd.IsValueChangedFromSaved() ) { xGroup->setGroupInterval( static_cast(m_aGroupIntervalEd.GetValue()) ); m_aGroupIntervalEd.SaveValue(); } - if ( m_aOrderLst.GetSavedValue() != m_aOrderLst.GetSelectEntryPos() ) + if ( m_aOrderLst.IsValueChangedFromSaved() ) xGroup->setSortAscending( m_aOrderLst.GetSelectEntryPos() == 0 ); ListBox* pControls[] = { &m_aHeaderLst,&m_aFooterLst,&m_aGroupOnLst,&m_aKeepTogetherLst,&m_aOrderLst}; @@ -1196,13 +1196,13 @@ IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ ) IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox*, pListBox ) { - if ( pListBox->GetSavedValue() != pListBox->GetSelectEntryPos() ) + if ( pListBox->IsValueChangedFromSaved() ) { sal_Int32 nRow = m_pFieldExpression->GetCurRow(); sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(nRow); if ( pListBox != &m_aHeaderLst && pListBox != &m_aFooterLst) { - if ( pListBox->GetSavedValue() != pListBox->GetSelectEntryPos() ) + if ( pListBox->IsValueChangedFromSaved() ) SaveData(nRow); if ( pListBox == &m_aGroupOnLst ) m_aGroupIntervalEd.Enable( pListBox->GetSelectEntryPos() != 0 ); -- cgit