Skip to content

C
core
Kaydet (Commit) 7b10d5c5 authored tarafından Philipp Lohmann [pl]'s avatar Philipp Lohmann [pl]
Dosyalara gözat
Seçenekler

ppp02: #i108327# set requested paper bin

üst ab8f91dc
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 0 deletions
vcl/source/gdi/print3.cxx
Dosyayı görüntüle @ 7b10d5c5
...@@ -743,6 +743,7 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons ...@@ -743,6 +743,7 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons
PrinterController::PageSize aPageSize; PrinterController::PageSize aPageSize;
aPageSize.aSize = mpPrinter->GetPaperSize(); aPageSize.aSize = mpPrinter->GetPaperSize();
awt::Size aSetSize, aIsSize; awt::Size aSetSize, aIsSize;
sal_Int32 nPaperBin = -1;
for( sal_Int32 nProperty = 0, nPropertyCount = i_rProps.getLength(); nProperty < nPropertyCount; ++nProperty ) for( sal_Int32 nProperty = 0, nPropertyCount = i_rProps.getLength(); nProperty < nPropertyCount; ++nProperty )
{ {
if( i_rProps[ nProperty ].Name.equalsAscii( "PreferredPageSize" ) ) if( i_rProps[ nProperty ].Name.equalsAscii( "PreferredPageSize" ) )
...@@ -759,6 +760,10 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons ...@@ -759,6 +760,10 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons
i_rProps[ nProperty ].Value >>= bVal; i_rProps[ nProperty ].Value >>= bVal;
aPageSize.bFullPaper = static_cast<bool>(bVal); aPageSize.bFullPaper = static_cast<bool>(bVal);
} }
else if( i_rProps[ nProperty ].Name.equalsAscii( "PrinterPaperTray" ) )
{
i_rProps[ nProperty ].Value >>= nPaperBin;
}
} }
Size aCurSize( mpPrinter->GetPaperSize() ); Size aCurSize( mpPrinter->GetPaperSize() );
...@@ -779,6 +784,10 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons ...@@ -779,6 +784,10 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons
if( aRealPaperSize != aCurSize ) if( aRealPaperSize != aCurSize )
mpPrinter->SetPaperSizeUser( aRealPaperSize, ! isFixedPageSize() ); mpPrinter->SetPaperSizeUser( aRealPaperSize, ! isFixedPageSize() );
} }
if( nPaperBin != -1 && nPaperBin != mpPrinter->GetPaperBin() )
mpPrinter->SetPaperBin( nPaperBin );
return aPageSize; return aPageSize;
} }
......
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