diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-12 11:59:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-12 13:54:14 +0100 |
| commit | 99b1b4d4751081cee70d4ccb1d459a3776ed2250 (patch) | |
| tree | 71746e44b6394a4888fb1ec21f8a54d3e308a967 /extensions | |
| parent | 3137acbe78d7c61cb9d8e58cf44312943857f5f7 (diff) | |
don't use raw english string
Change-Id: I5f34889520afb2149ba480f56d59f14d75ee50c0
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/scanner/grid.cxx | 19 | ||||
| -rw-r--r-- | extensions/source/scanner/grid.hxx | 8 |
2 files changed, 5 insertions, 22 deletions
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 5266919fbbf5..898f834ecb11 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -62,17 +62,6 @@ GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window* get(m_pOKButton, "ok"); get(m_pResetTypeBox, "resetTypeCombobox"); get(m_pResetButton, "resetButton"); - sal_uInt16 nPos = m_pResetTypeBox->InsertEntry( "Linear ascending" ); - m_pResetTypeBox->SetEntryData( nPos, (void *)LINEAR_ASCENDING ); - - nPos = m_pResetTypeBox->InsertEntry( "Linear descending" ); - m_pResetTypeBox->SetEntryData( nPos, (void *)LINEAR_DESCENDING ); - - nPos = m_pResetTypeBox->InsertEntry( "Original values" ); - m_pResetTypeBox->SetEntryData( nPos, (void *)RESET ); - - nPos = m_pResetTypeBox->InsertEntry( "Exponential increasing" ); - m_pResetTypeBox->SetEntryData( nPos, (void *)EXPONENTIAL ); m_pResetTypeBox->SelectEntryPos( 0 ); @@ -450,8 +439,6 @@ void GridWindow::MouseMove( const MouseEvent& rEvt ) ModalDialog::MouseMove( rEvt ); } - - void GridWindow::MouseButtonUp( const MouseEvent& rEvt ) { if( rEvt.GetButtons() == MOUSE_LEFT ) @@ -468,8 +455,6 @@ void GridWindow::MouseButtonUp( const MouseEvent& rEvt ) ModalDialog::MouseButtonUp( rEvt ); } - - void GridWindow::MouseButtonDown( const MouseEvent& rEvt ) { Point aPoint( rEvt.GetPosPixel() ); @@ -520,13 +505,11 @@ void GridWindow::MouseButtonDown( const MouseEvent& rEvt ) ModalDialog::MouseButtonDown( rEvt ); } - - IMPL_LINK( GridWindow, ClickButtonHdl, Button*, pButton ) { if( pButton == m_pResetButton ) { - int nType = (int)(sal_IntPtr)m_pResetTypeBox->GetEntryData( m_pResetTypeBox->GetSelectEntryPos() ); + int nType = m_pResetTypeBox->GetSelectEntryPos(); switch( nType ) { case LINEAR_ASCENDING: diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx index 04346ba1b52d..da59d6560610 100644 --- a/extensions/source/scanner/grid.hxx +++ b/extensions/source/scanner/grid.hxx @@ -60,10 +60,10 @@ class GridWindow : public ModalDialog enum resetType { - LINEAR_ASCENDING = 10, - LINEAR_DESCENDING, - RESET, - EXPONENTIAL + LINEAR_ASCENDING = 0, + LINEAR_DESCENDING = 1, + RESET = 2, + EXPONENTIAL = 3 }; Rectangle m_aGridArea; |