diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-27 17:07:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-02 07:24:36 +0100 |
| commit | 312c0abcff23a5bc7cf4442359ec48187ec06d48 (patch) | |
| tree | 9f4b8be273c1560018f035a73294fcab9b1476a7 /vcl/inc | |
| parent | 451ed3d595c5e2a32d820e1751e890f894832a9c (diff) | |
drop old tools/gen methods in vcl
Change-Id: I863ce5ae46ae90f06780261fa17b087a7153c807
Reviewed-on: https://gerrit.libreoffice.org/50445
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/osx/salprn.h | 4 | ||||
| -rw-r--r-- | vcl/inc/salgdi.hxx | 3 | ||||
| -rw-r--r-- | vcl/inc/salprn.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/unx/genprn.h | 4 | ||||
| -rw-r--r-- | vcl/inc/win/salprn.h | 4 |
5 files changed, 11 insertions, 8 deletions
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h index b82095c7559f..8f9c04017a66 100644 --- a/vcl/inc/osx/salprn.h +++ b/vcl/inc/osx/salprn.h @@ -73,8 +73,8 @@ class AquaSalInfoPrinter : public SalInfoPrinter virtual bool SetData( JobSetFlags i_nFlags, ImplJobSetup* i_pSetupData ) override; virtual void GetPageInfo( const ImplJobSetup* i_pSetupData, long& o_rOutWidth, long& o_rOutHeight, - long& o_rPageOffX, long& o_rPageOffY, - long& o_rPageWidth, long& o_rPageHeight ) override; + Point& rPageOffset, + Size& rPaperSize ) override; virtual sal_uInt32 GetCapabilities( const ImplJobSetup* i_pSetupData, PrinterCapType i_nType ) override; virtual sal_uInt16 GetPaperBinCount( const ImplJobSetup* i_pSetupData ) override; virtual OUString GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nPaperBin ) override; diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 32b51f6630d9..655c3ea17aa1 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -203,6 +203,9 @@ public: void SetLayout( SalLayoutFlags aLayout ) { m_nLayout = aLayout;} void mirror( long& nX, const OutputDevice *pOutDev ) const; + // only called mirror2 to avoid ambiguity + SAL_WARN_UNUSED_RESULT + long mirror2( long nX, const OutputDevice *pOutDev ) const; void mirror( long& nX, long nWidth, const OutputDevice *pOutDev, bool bBack = false ) const; bool mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev ) const; void mirror( tools::Rectangle& rRect, const OutputDevice*, bool bBack = false ) const; diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx index d8b4182f4fee..d9da1a6d80ed 100644 --- a/vcl/inc/salprn.hxx +++ b/vcl/inc/salprn.hxx @@ -72,8 +72,8 @@ public: virtual void GetPageInfo( const ImplJobSetup* pSetupData, long& rOutWidth, long& rOutHeight, - long& rPageOffX, long& rPageOffY, - long& rPageWidth, long& rPageHeight ) = 0; + Point& rPageOffset, + Size& rPaperSize ) = 0; virtual sal_uInt32 GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) = 0; virtual sal_uInt16 GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0; virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uInt16 nPaperBin ) = 0; diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h index f741ca03effb..9d80de32f99b 100644 --- a/vcl/inc/unx/genprn.h +++ b/vcl/inc/unx/genprn.h @@ -45,8 +45,8 @@ public: virtual bool SetData( JobSetFlags nFlags, ImplJobSetup* pSetupData ) override; virtual void GetPageInfo( const ImplJobSetup* pSetupData, long& rOutWidth, long& rOutHeight, - long& rPageOffX, long& rPageOffY, - long& rPageWidth, long& rPageHeight ) override; + Point& rPageOffset, + Size& rPaperSize ) override; virtual sal_uInt32 GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) override; virtual sal_uInt16 GetPaperBinCount( const ImplJobSetup* pSetupData ) override; virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uInt16 nPaperBin ) override; diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h index a1be0336e4c1..f9be4757ad13 100644 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -60,8 +60,8 @@ public: virtual bool SetData( JobSetFlags nFlags, ImplJobSetup* pSetupData ) override; virtual void GetPageInfo( const ImplJobSetup* pSetupData, long& rOutWidth, long& rOutHeight, - long& rPageOffX, long& rPageOffY, - long& rPageWidth, long& rPageHeight ) override; + Point& rPageOffset, + Size& rPaperSize ) override; virtual sal_uInt32 GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) override; virtual sal_uInt16 GetPaperBinCount( const ImplJobSetup* pSetupData ) override; virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uInt16 nPaperBin ) override; |