Kaydet (Commit) 0d4f4223 authored tarafından Douglas Mencken's avatar Douglas Mencken Kaydeden (comit) Norbert Thiebaud

vcl.osx.print: convert to use modern API for print dialog

Change-Id: Icc7d7ad95d1ffbf55f1cd704148f3ceb58618e6c
Reviewed-on: https://gerrit.libreoffice.org/19432Reviewed-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
Tested-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
üst caf093e5
...@@ -42,7 +42,8 @@ struct PrintAccessoryViewState ...@@ -42,7 +42,8 @@ struct PrintAccessoryViewState
vcl::PrinterController* mpController; vcl::PrinterController* mpController;
AquaSalInfoPrinter* mpInfoPrinter; AquaSalInfoPrinter* mpInfoPrinter;
} }
-(id)initWithController: (vcl::PrinterController*)pController withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter; -(id)initWithController: (vcl::PrinterController*)pController
withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter;
-(BOOL)knowsPageRange: (NSRangePointer)range; -(BOOL)knowsPageRange: (NSRangePointer)range;
-(NSRect)rectForPage: (int)page; -(NSRect)rectForPage: (int)page;
-(NSPoint)locationOfPrintRect: (NSRect)aRect; -(NSPoint)locationOfPrintRect: (NSRect)aRect;
...@@ -52,7 +53,9 @@ struct PrintAccessoryViewState ...@@ -52,7 +53,9 @@ struct PrintAccessoryViewState
@interface AquaPrintAccessoryView : NSObject @interface AquaPrintAccessoryView : NSObject
{ {
} }
+(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp withController: (vcl::PrinterController*)pController withState: (PrintAccessoryViewState*)pState; +(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp
withController: (vcl::PrinterController*)pController
withState: (PrintAccessoryViewState*)pState;
@end @end
#endif // INCLUDED_VCL_INC_OSX_PRINTVIEW_H #endif // INCLUDED_VCL_INC_OSX_PRINTVIEW_H
......
This diff is collapsed.
...@@ -24,7 +24,9 @@ ...@@ -24,7 +24,9 @@
#include "osx/salprn.h" #include "osx/salprn.h"
@implementation AquaPrintView @implementation AquaPrintView
-(id)initWithController: (vcl::PrinterController*)pController withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter
-(id)initWithController: (vcl::PrinterController*)pController
withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter
{ {
NSRect aRect = { NSZeroPoint, [pInfoPrinter->getPrintInfo() paperSize] }; NSRect aRect = { NSZeroPoint, [pInfoPrinter->getPrintInfo() paperSize] };
if( (self = [super initWithFrame: aRect]) != nil ) if( (self = [super initWithFrame: aRect]) != nil )
...@@ -49,7 +51,9 @@ ...@@ -49,7 +51,9 @@
// #i101108# sanity check // #i101108# sanity check
if( nWidth < 1 ) if( nWidth < 1 )
nWidth = 1; nWidth = 1;
NSRect aRect = { { static_cast<CGFloat>(page % nWidth), static_cast<CGFloat>(page / nWidth) }, aPaperSize }; NSRect aRect = { { static_cast<CGFloat>(page % nWidth),
static_cast<CGFloat>(page / nWidth) },
aPaperSize };
return aRect; return aRect;
} }
...@@ -61,7 +65,8 @@ ...@@ -61,7 +65,8 @@
-(void)drawRect: (NSRect)rect -(void)drawRect: (NSRect)rect
{ {
mpInfoPrinter->setStartPageOffset( static_cast<int>(rect.origin.x), static_cast<int>(rect.origin.y) ); mpInfoPrinter->setStartPageOffset( static_cast<int>(rect.origin.x),
static_cast<int>(rect.origin.y) );
NSSize aPaperSize = [mpInfoPrinter->getPrintInfo() paperSize]; NSSize aPaperSize = [mpInfoPrinter->getPrintInfo() paperSize];
int nPage = (int)(aPaperSize.width * rect.origin.y + rect.origin.x); int nPage = (int)(aPaperSize.width * rect.origin.y + rect.origin.x);
...@@ -69,6 +74,7 @@ ...@@ -69,6 +74,7 @@
if( nPage - 1 < (mpInfoPrinter->getCurPageRangeStart() + mpInfoPrinter->getCurPageRangeCount() ) ) if( nPage - 1 < (mpInfoPrinter->getCurPageRangeStart() + mpInfoPrinter->getCurPageRangeCount() ) )
mpController->printFilteredPage( nPage-1 ); mpController->printFilteredPage( nPage-1 );
} }
@end @end
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -499,8 +499,9 @@ bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName, ...@@ -499,8 +499,9 @@ bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName,
bSuccess = true; bSuccess = true;
mbJob = true; mbJob = true;
pInst->startedPrintJob(); pInst->startedPrintJob();
[pPrintOperation runOperation]; BOOL wasSuccessful = [pPrintOperation runOperation];
pInst->endedPrintJob(); pInst->endedPrintJob();
bSuccess = wasSuccessful ? true : false;
bWasAborted = [[[pPrintOperation printInfo] jobDisposition] compare: NSPrintCancelJob] == NSOrderedSame; bWasAborted = [[[pPrintOperation printInfo] jobDisposition] compare: NSPrintCancelJob] == NSOrderedSame;
mbJob = false; mbJob = false;
if( pReleaseAfterUse ) if( pReleaseAfterUse )
......
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