diff options
| author | Noel Grandin <noel@peralex.com> | 2015-02-13 13:31:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-02-16 06:38:42 +0000 |
| commit | 9f8ffc8dfed61eb8460d92ce85b20effe5114f87 (patch) | |
| tree | 22345276a060d99201fa271486b785a5b56dc87b /sfx2 | |
| parent | 031166e43ff2e476df5158ff3e6e631b0c346441 (diff) | |
add GetSelectEntryData to ListBox and ComboBox
to reduce code clutter like
pLbSelect->GetEntryData(pLbSelect->GetSelectEntryPos())
since this is a fairly frequent operation.
Change-Id: I41daf30fdeda2442ad1ac829e12f553233bae184
Reviewed-on: https://gerrit.libreoffice.org/14472
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/dialog/printopt.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 9cd3947bec1a..e5f2ab135b42 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -1071,7 +1071,7 @@ void SearchTabPage_Impl::SetDoubleClickHdl( const Link& rLink ) OUString SearchTabPage_Impl::GetSelectEntry() const { OUString aRet; - OUString* pData = reinterpret_cast<OUString*>(m_pResultsLB->GetEntryData( m_pResultsLB->GetSelectEntryPos() )); + OUString* pData = reinterpret_cast<OUString*>(m_pResultsLB->GetSelectEntryData()); if ( pData ) aRet = *pData; return aRet; @@ -1298,7 +1298,7 @@ void BookmarksTabPage_Impl::SetDoubleClickHdl( const Link& rLink ) OUString BookmarksTabPage_Impl::GetSelectEntry() const { OUString aRet; - OUString* pData = reinterpret_cast<OUString*>(m_pBookmarksBox->GetEntryData(m_pBookmarksBox->GetSelectEntryPos())); + OUString* pData = reinterpret_cast<OUString*>(m_pBookmarksBox->GetSelectEntryData()); if ( pData ) aRet = *pData; return aRet; @@ -1540,7 +1540,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, InitHdl) IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl) { - OUString* pFactory = reinterpret_cast<OUString*>(m_pActiveLB->GetEntryData( m_pActiveLB->GetSelectEntryPos() )); + OUString* pFactory = reinterpret_cast<OUString*>(m_pActiveLB->GetSelectEntryData()); if ( pFactory ) { SetFactory( OUString( *pFactory ).toAsciiLowerCase(), false ); diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 487dab7552ad..13b92e2ff3d2 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1433,7 +1433,7 @@ CustomPropertiesWindow::~CustomPropertiesWindow() IMPL_LINK( CustomPropertiesWindow, TypeHdl, CustomPropertiesTypeBox*, pBox ) { - long nType = reinterpret_cast<long>( pBox->GetEntryData( pBox->GetSelectEntryPos() ) ); + long nType = reinterpret_cast<long>( pBox->GetSelectEntryData() ); CustomPropertyLine* pLine = pBox->GetLine(); pLine->m_aValueEdit.Show( (CUSTOM_TYPE_TEXT == nType) || (CUSTOM_TYPE_NUMBER == nType) ); pLine->m_aDateField.Show( (CUSTOM_TYPE_DATE == nType) || (CUSTOM_TYPE_DATETIME == nType) ); @@ -1539,7 +1539,7 @@ bool CustomPropertiesWindow::IsLineValid( CustomPropertyLine* pLine ) const bool bIsValid = true; pLine->m_bTypeLostFocus = false; long nType = reinterpret_cast<long>( - pLine->m_aTypeBox.GetEntryData( pLine->m_aTypeBox.GetSelectEntryPos() ) ); + pLine->m_aTypeBox.GetSelectEntryData() ); OUString sValue = pLine->m_aValueEdit.GetText(); if ( sValue.isEmpty() ) return true; @@ -1891,7 +1891,7 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c { aPropertiesSeq[i].Name = sPropertyName; long nType = reinterpret_cast<long>( - pLine->m_aTypeBox.GetEntryData( pLine->m_aTypeBox.GetSelectEntryPos() ) ); + pLine->m_aTypeBox.GetSelectEntryData() ); if ( CUSTOM_TYPE_NUMBER == nType ) { double nValue = 0; diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 86eb2c65e6c4..fbd63402f0d8 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -210,7 +210,7 @@ void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCu } } - m_pReduceBitmapsResolutionLB->SetText( m_pReduceBitmapsResolutionLB->GetEntry( m_pReduceBitmapsResolutionLB->GetSelectEntryPos() ) ); + m_pReduceBitmapsResolutionLB->SetText( m_pReduceBitmapsResolutionLB->GetSelectEntry() ); m_pReduceBitmapsTransparencyCB->Check( pCurrentOptions->IsReducedBitmapIncludesTransparency() ); m_pConvertToGreyscalesCB->Check( pCurrentOptions->IsConvertToGreyscales() ); |