diff options
author | Matteo Casalin <matteo.casalin@yahoo.com> | 2016-01-02 14:05:01 +0100 |
---|---|---|
committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2016-01-26 21:30:21 +0100 |
commit | d1c8f5a659b66007a5d56e3ed77fdacb7bc5d971 (patch) | |
tree | 5d77747b9a61bb84b491fae99102659c77818684 | |
parent | 3792dd2482db628bf7a7c8cf85f9ae2c587f3b68 (diff) |
sal_uLong/sal_uIntPtr to sal_uInt32 (printer GetCapabilities)
Change-Id: I1324c89be2a1d4954b0ddf4a9b06a8a97d5c335e
-rw-r--r-- | include/vcl/print.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/osx/salprn.h | 2 | ||||
-rw-r--r-- | vcl/inc/salprn.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/genprn.h | 2 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkprn.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/win/salprn.h | 2 | ||||
-rw-r--r-- | vcl/osx/salprn.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/print.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/salprn-gtk.cxx | 2 | ||||
-rw-r--r-- | vcl/win/gdi/salprn.cxx | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index a3125c762b03..f483ead2d50d 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -306,7 +306,7 @@ public: bool IsDisplayPrinter() const { return mpDisplayDev != nullptr; } bool IsValid() const { return !IsDisplayPrinter(); } - sal_uLong GetCapabilities( PrinterCapType nType ) const; + sal_uInt32 GetCapabilities( PrinterCapType nType ) const; bool HasSupport( PrinterSupport eFeature ) const; bool SetJobSetup( const JobSetup& rSetup ); diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h index ea78b65cd258..afb0cb70145c 100644 --- a/vcl/inc/osx/salprn.h +++ b/vcl/inc/osx/salprn.h @@ -77,7 +77,7 @@ class AquaSalInfoPrinter : public SalInfoPrinter long& o_rOutWidth, long& o_rOutHeight, long& o_rPageOffX, long& o_rPageOffY, long& o_rPageWidth, long& o_rPageHeight ) override; - virtual sal_uLong GetCapabilities( const ImplJobSetup* i_pSetupData, PrinterCapType i_nType ) override; + virtual sal_uInt32 GetCapabilities( const ImplJobSetup* i_pSetupData, PrinterCapType i_nType ) override; virtual sal_uLong GetPaperBinCount( const ImplJobSetup* i_pSetupData ) override; virtual OUString GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin ) override; virtual void InitPaperFormats( const ImplJobSetup* i_pSetupData ) override; diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx index 0e4debbb0fcb..d4d1a0e049f0 100644 --- a/vcl/inc/salprn.hxx +++ b/vcl/inc/salprn.hxx @@ -77,7 +77,7 @@ public: long& rOutWidth, long& rOutHeight, long& rPageOffX, long& rPageOffY, long& rPageWidth, long& rPageHeight ) = 0; - virtual sal_uLong GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) = 0; + virtual sal_uInt32 GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) = 0; virtual sal_uLong GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0; virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) = 0; // fills m_aPaperFormats and sets m_bPapersInit to true diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h index f17393553b01..7d34984b7b64 100644 --- a/vcl/inc/unx/genprn.h +++ b/vcl/inc/unx/genprn.h @@ -47,7 +47,7 @@ public: long& rOutWidth, long& rOutHeight, long& rPageOffX, long& rPageOffY, long& rPageWidth, long& rPageHeight ) override; - virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) override; + virtual sal_uInt32 GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) override; virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData ) override; virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ) override; virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) override; diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx index e7da3c75b0fd..63158a9af1e9 100644 --- a/vcl/inc/unx/gtk/gtkprn.hxx +++ b/vcl/inc/unx/gtk/gtkprn.hxx @@ -41,7 +41,7 @@ private: class VCL_DLLPUBLIC GtkSalInfoPrinter : public PspSalInfoPrinter { public: - sal_uLong GetCapabilities(const ImplJobSetup* i_pSetupData, PrinterCapType i_nType) override; + sal_uInt32 GetCapabilities(const ImplJobSetup* i_pSetupData, PrinterCapType i_nType) override; }; #endif // INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h index c7f201bbbc99..7d0a0fd1bc6a 100644 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -64,7 +64,7 @@ public: long& rOutWidth, long& rOutHeight, long& rPageOffX, long& rPageOffY, long& rPageWidth, long& rPageHeight ) override; - virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) override; + virtual sal_uInt32 GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) override; virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData ) override; virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ) override; virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) override; diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx index 7e1d5873451a..ca9bec2ea86f 100644 --- a/vcl/osx/salprn.cxx +++ b/vcl/osx/salprn.cxx @@ -269,7 +269,7 @@ OUString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong ) return OUString(); } -sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, PrinterCapType i_nType ) +sal_uInt32 AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, PrinterCapType i_nType ) { switch( i_nType ) { diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 1c97b9968c30..0dca9afda244 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -1030,7 +1030,7 @@ void Printer::dispose() OutputDevice::dispose(); } -sal_uLong Printer::GetCapabilities( PrinterCapType nType ) const +sal_uInt32 Printer::GetCapabilities( PrinterCapType nType ) const { if ( IsDisplayPrinter() ) return 0; diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 9f6b6a956c45..6af1c69faa7c 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -781,7 +781,7 @@ OUString PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_ return aRet; } -sal_uLong PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, PrinterCapType nType ) +sal_uInt32 PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, PrinterCapType nType ) { switch( nType ) { diff --git a/vcl/unx/gtk/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx index b0732720ab8f..92dc95524d89 100644 --- a/vcl/unx/gtk/salprn-gtk.cxx +++ b/vcl/unx/gtk/salprn-gtk.cxx @@ -1133,7 +1133,7 @@ const pItem->Commit(); } -sal_uLong +sal_uInt32 GtkSalInfoPrinter::GetCapabilities( const ImplJobSetup* const i_pSetupData, const PrinterCapType i_nType) diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx index 25d64d07e1d3..ef624c2bb392 100644 --- a/vcl/win/gdi/salprn.cxx +++ b/vcl/win/gdi/salprn.cxx @@ -1239,7 +1239,7 @@ OUString WinSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pSetupData, sal return aPaperBinName; } -sal_uLong WinSalInfoPrinter::GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) +sal_uInt32 WinSalInfoPrinter::GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) { DWORD nRet; |