summaryrefslogtreecommitdiff
path: root/extensions/source/scanner/grid.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source/scanner/grid.cxx')
-rw-r--r--extensions/source/scanner/grid.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index 61f52b916e5d..d0b76ce4c0e6 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -51,7 +51,7 @@ ResId SaneResId( sal_uInt32 );
// ---------------------------------------------------------------------
-GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window* pParent, BOOL bCutValues )
+GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window* pParent, sal_Bool bCutValues )
: ModalDialog( pParent, SaneResId( GRID_DIALOG ) ),
m_aGridArea( 50, 15, 100, 100 ),
m_pXValues( pXValues ),
@@ -67,7 +67,7 @@ GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window*
m_aResetTypeBox( this, SaneResId( GRID_DIALOG_TYPE_BOX ) ),
m_aResetButton( this, SaneResId( GRID_DIALOG_RESET_BTN ) )
{
- USHORT nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_LINEAR_ASCENDING ) ) );
+ sal_uInt16 nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_LINEAR_ASCENDING ) ) );
m_aResetTypeBox.SetEntryData( nPos, (void *)RESET_TYPE_LINEAR_ASCENDING );
nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_LINEAR_DESCENDING ) ) );