diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
| commit | db45e5f229c444e481e354863da1d07348ba9d67 (patch) | |
| tree | ada7b20bd8efcfd76f8e169754ddf5bdb774252e /vcl/inc/win/salprn.h | |
| parent | vcl2gnumake: #i116588# remove old makefiles (diff) | |
| parent | DEV300 masterfix: #i116814,i116838#: fix XCloneable so that tests work again (diff) | |
| download | core-db45e5f229c444e481e354863da1d07348ba9d67.tar.gz core-db45e5f229c444e481e354863da1d07348ba9d67.zip | |
rebase to DEV300_m100
Diffstat (limited to 'vcl/inc/win/salprn.h')
| -rwxr-xr-x | vcl/inc/win/salprn.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h index c438fc3ead71..538fc8ea18e3 100755 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -35,7 +35,7 @@ // ----------------- // WNT3 -#define SAL_DRIVERDATA_SYSSIGN ((ULONG)0x574E5433) +#define SAL_DRIVERDATA_SYSSIGN ((sal_uIntPtr)0x574E5433) #define SAL_DRIVERDATA_VERSION_A 1 #define SAL_DRIVERDATA_VERSION_W 2 @@ -43,9 +43,9 @@ struct SalDriverData { - ULONG mnSysSignature; - USHORT mnVersion; - USHORT mnDriverOffset; + sal_uIntPtr mnSysSignature; + sal_uInt16 mnVersion; + sal_uInt16 mnDriverOffset; BYTE maDriverData[1]; }; @@ -65,23 +65,23 @@ public: XubString maDeviceName; // printer device name XubString maPortName; // printer port name HDC mhDC; // printer hdc - BOOL mbGraphics; // is Graphics used + sal_Bool mbGraphics; // is Graphics used public: WinSalInfoPrinter(); virtual ~WinSalInfoPrinter(); virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* pGraphics ); - virtual BOOL Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); - virtual BOOL SetPrinterData( ImplJobSetup* pSetupData ); - virtual BOOL SetData( ULONG nFlags, ImplJobSetup* pSetupData ); + virtual sal_Bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); + virtual sal_Bool SetPrinterData( ImplJobSetup* pSetupData ); + virtual sal_Bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ); virtual void GetPageInfo( const ImplJobSetup* pSetupData, long& rOutWidth, long& rOutHeight, long& rPageOffX, long& rPageOffY, long& rPageWidth, long& rPageHeight ); - virtual ULONG GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType ); - virtual ULONG GetPaperBinCount( const ImplJobSetup* pSetupData ); - virtual String GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin ); + virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ); + virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData ); + virtual String GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ); virtual void InitPaperFormats( const ImplJobSetup* pSetupData ); virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ); }; @@ -97,10 +97,10 @@ public: WinSalInfoPrinter* mpInfoPrinter; // pointer to the compatible InfoPrinter WinSalPrinter* mpNextPrinter; // next printing printer HDC mhDC; // printer hdc - ULONG mnError; // Error Code - ULONG mnCopies; // Kopien - BOOL mbCollate; // Sortierte Kopien - BOOL mbAbort; // Job Aborted + sal_uIntPtr mnError; // Error Code + sal_uIntPtr mnCopies; // Kopien + sal_Bool mbCollate; // Sortierte Kopien + sal_Bool mbAbort; // Job Aborted bool mbValid; @@ -109,18 +109,18 @@ public: virtual ~WinSalPrinter(); using SalPrinter::StartJob; - virtual BOOL StartJob( const XubString* pFileName, + virtual sal_Bool StartJob( const XubString* pFileName, const XubString& rJobName, const XubString& rAppName, - ULONG nCopies, + sal_uIntPtr nCopies, bool bCollate, bool bDirect, ImplJobSetup* pSetupData ); - virtual BOOL EndJob(); - virtual BOOL AbortJob(); - virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData ); - virtual BOOL EndPage(); - virtual ULONG GetErrorCode(); + virtual sal_Bool EndJob(); + virtual sal_Bool AbortJob(); + virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ); + virtual sal_Bool EndPage(); + virtual sal_uIntPtr GetErrorCode(); void markInvalid(); bool isValid() const { return mbValid; } |