Kaydet (Commit) 9c7cf46f authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: fdo#61656 use order and orientation combobox select pos as index

not the associated entry data, which isn't set for these simple
1 to 1 position -> data comboboxes

Change-Id: I0c73786bca00684cedc4672d0ad5e61d0c1f9bd7
üst 6840ba61
...@@ -449,11 +449,7 @@ void PrintDialog::NUpTabPage::initFromMultiPageSetup( const vcl::PrinterControll ...@@ -449,11 +449,7 @@ void PrintDialog::NUpTabPage::initFromMultiPageSetup( const vcl::PrinterControll
mpBorderCB->Check( i_rMPS.bDrawBorder ); mpBorderCB->Check( i_rMPS.bDrawBorder );
mpNupRowsEdt->SetValue( i_rMPS.nRows ); mpNupRowsEdt->SetValue( i_rMPS.nRows );
mpNupColEdt->SetValue( i_rMPS.nColumns ); mpNupColEdt->SetValue( i_rMPS.nColumns );
for( sal_uInt16 i = 0; i < mpNupOrderBox->GetEntryCount(); i++ ) mpNupOrderBox->SelectEntryPos( i_rMPS.nOrder );
{
if( int(sal_IntPtr(mpNupOrderBox->GetEntryData( i ))) == i_rMPS.nOrder )
mpNupOrderBox->SelectEntryPos( i );
}
if( i_rMPS.nRows != 1 || i_rMPS.nColumns != 1 ) if( i_rMPS.nRows != 1 || i_rMPS.nColumns != 1 )
{ {
mpNupPagesBox->SelectEntryPos( mpNupPagesBox->GetEntryCount()-1 ); mpNupPagesBox->SelectEntryPos( mpNupPagesBox->GetEntryCount()-1 );
...@@ -1438,8 +1434,7 @@ void PrintDialog::updateNup() ...@@ -1438,8 +1434,7 @@ void PrintDialog::updateNup()
aMPS.bDrawBorder = maNUpPage.mpBorderCB->IsChecked(); aMPS.bDrawBorder = maNUpPage.mpBorderCB->IsChecked();
int nOrderMode = int(sal_IntPtr(maNUpPage.mpNupOrderBox->GetEntryData( int nOrderMode = maNUpPage.mpNupOrderBox->GetSelectEntryPos();
maNUpPage.mpNupOrderBox->GetSelectEntryPos() )));
if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_LRTB ) if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_LRTB )
aMPS.nOrder = PrinterController::LRTB; aMPS.nOrder = PrinterController::LRTB;
else if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_TBLR ) else if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_TBLR )
...@@ -1449,8 +1444,7 @@ void PrintDialog::updateNup() ...@@ -1449,8 +1444,7 @@ void PrintDialog::updateNup()
else if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_TBRL ) else if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_TBRL )
aMPS.nOrder = PrinterController::TBRL; aMPS.nOrder = PrinterController::TBRL;
int nOrientationMode = int(sal_IntPtr(maNUpPage.mpNupOrientationBox->GetEntryData( int nOrientationMode = maNUpPage.mpNupOrientationBox->GetSelectEntryPos();
maNUpPage.mpNupOrientationBox->GetSelectEntryPos() )));
if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE ) if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE )
aMPS.aPaperSize = maNupLandscapeSize; aMPS.aPaperSize = maNupLandscapeSize;
else if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT ) else if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment