extensions/source/scanner/sanedlg.cxx | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
New commits: commit ab713ba1ffd00952ef8957f9b524e4e44f382f13 Author: Caolán McNamara <[email protected]> Date: Wed Jun 11 14:50:04 2014 +0100 Changing scanners has no effect I guess no-one ever tested with multiple scanners but it just happens that my laptops webcam is presented as a (non-functional) scanner alongside the real one Change-Id: Ie36651cfc867027ef19e272dbabe46de6c4261ee diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 4a83424..af45214 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -182,7 +182,6 @@ SaneDlg::SaneDlg( Window* pParent, Sane& rSane, bool bScanEnabled ) : get(mpRightField, "rightSpinbutton"); get(mpBottomField, "bottomSpinbutton"); get(mpDeviceBox, "deviceCombobox"); - mpDeviceBox->SetStyle(mpDeviceBox->GetStyle() | WB_SORT); get(mpReslBox, "reslCombobox"); get(mpAdvancedBox, "advancedCheckbutton"); get(mpVectorBox, "vectorSpinbutton-nospin"); @@ -264,13 +263,12 @@ void SaneDlg::InitDevices() mrSane.Close(); mrSane.ReloadDevices(); mpDeviceBox->Clear(); - for( int i = 0; i < Sane::CountDevices(); i++ ) - mpDeviceBox->InsertEntry( Sane::GetName( i ) ); + for (int i = 0; i < Sane::CountDevices(); ++i) + mpDeviceBox->InsertEntry(Sane::GetName(i)); if( Sane::CountDevices() ) { - mrSane.Open( 0 ); - mpDeviceBox->SelectEntry( Sane::GetName( 0 ) ); - + mrSane.Open(0); + mpDeviceBox->SelectEntryPos(0); } } @@ -599,12 +597,12 @@ IMPL_LINK( SaneDlg, SelectHdl, ListBox*, pListBox ) { if( pListBox == mpDeviceBox && Sane::IsSane() && Sane::CountDevices() ) { - OUString aNewDevice = mpDeviceBox->GetSelectEntry(); - int nNumber; - if( aNewDevice == Sane::GetName( nNumber = mrSane.GetDeviceNumber() ) ) + int nNewNumber = mpDeviceBox->GetSelectEntryPos(); + int nOldNumber = mrSane.GetDeviceNumber(); + if (nNewNumber != nOldNumber) { mrSane.Close(); - mrSane.Open( nNumber ); + mrSane.Open(nNewNumber); InitFields(); } }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
