diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /vcl/generic/print | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'vcl/generic/print')
-rw-r--r-- | vcl/generic/print/bitmap_gfx.cxx | 6 | ||||
-rw-r--r-- | vcl/generic/print/genprnpsp.cxx | 2 | ||||
-rw-r--r-- | vcl/generic/print/genpspgraphics.cxx | 26 | ||||
-rw-r--r-- | vcl/generic/print/prtsetup.hxx | 6 |
4 files changed, 20 insertions, 20 deletions
diff --git a/vcl/generic/print/bitmap_gfx.cxx b/vcl/generic/print/bitmap_gfx.cxx index 317b24e2e044..c2c66a2aca37 100644 --- a/vcl/generic/print/bitmap_gfx.cxx +++ b/vcl/generic/print/bitmap_gfx.cxx @@ -69,7 +69,7 @@ public: explicit HexEncoder (osl::File* pFile); virtual ~HexEncoder (); void WriteAscii (sal_uInt8 nByte); - virtual void EncodeByte (sal_uInt8 nByte) SAL_OVERRIDE; + virtual void EncodeByte (sal_uInt8 nByte) override; void FlushLine (); }; @@ -142,7 +142,7 @@ public: explicit Ascii85Encoder (osl::File* pFile); virtual ~Ascii85Encoder (); - virtual void EncodeByte (sal_uInt8 nByte) SAL_OVERRIDE; + virtual void EncodeByte (sal_uInt8 nByte) override; void WriteAscii (sal_uInt8 nByte); }; @@ -289,7 +289,7 @@ public: explicit LZWEncoder (osl::File* pOutputFile); virtual ~LZWEncoder (); - virtual void EncodeByte (sal_uInt8 nByte) SAL_OVERRIDE; + virtual void EncodeByte (sal_uInt8 nByte) override; }; LZWEncoder::LZWEncoder(osl::File* pOutputFile) : diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 0602636e3ce3..dffcd036e265 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -103,7 +103,7 @@ namespace // parent window, Query text, initial value QueryString(vcl::Window*, OUString &, OUString &); virtual ~QueryString() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE + virtual void dispose() override { m_pOKButton.clear(); m_pFixedText.clear(); diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 86f9ccb70fca..a3ebd0eec1bb 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -81,12 +81,12 @@ private: explicit SalPrinterBmp (BitmapBuffer* pBitmap); virtual ~SalPrinterBmp (); - virtual sal_uInt32 GetPaletteColor (sal_uInt32 nIdx) const SAL_OVERRIDE; - virtual sal_uInt32 GetPaletteEntryCount () const SAL_OVERRIDE; - virtual sal_uInt32 GetPixelRGB (sal_uInt32 nRow, sal_uInt32 nColumn) const SAL_OVERRIDE; - virtual sal_uInt8 GetPixelGray (sal_uInt32 nRow, sal_uInt32 nColumn) const SAL_OVERRIDE; - virtual sal_uInt8 GetPixelIdx (sal_uInt32 nRow, sal_uInt32 nColumn) const SAL_OVERRIDE; - virtual sal_uInt32 GetDepth () const SAL_OVERRIDE; + virtual sal_uInt32 GetPaletteColor (sal_uInt32 nIdx) const override; + virtual sal_uInt32 GetPaletteEntryCount () const override; + virtual sal_uInt32 GetPixelRGB (sal_uInt32 nRow, sal_uInt32 nColumn) const override; + virtual sal_uInt8 GetPixelGray (sal_uInt32 nRow, sal_uInt32 nColumn) const override; + virtual sal_uInt8 GetPixelIdx (sal_uInt32 nRow, sal_uInt32 nColumn) const override; + virtual sal_uInt32 GetDepth () const override; }; SalPrinterBmp::SalPrinterBmp (BitmapBuffer* pBuffer) @@ -547,9 +547,9 @@ private: public: explicit ImplPspFontData( const psp::FastPrintFontInfo& ); - virtual sal_IntPtr GetFontId() const SAL_OVERRIDE { return mnFontId; } - virtual PhysicalFontFace* Clone() const SAL_OVERRIDE { return new ImplPspFontData( *this ); } - virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE; + virtual sal_IntPtr GetFontId() const override { return mnFontId; } + virtual PhysicalFontFace* Clone() const override { return new ImplPspFontData( *this ); } + virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const override; }; ImplPspFontData::ImplPspFontData( const psp::FastPrintFontInfo& rInfo ) @@ -567,9 +567,9 @@ class PspFontLayout : public GenericSalLayout { public: explicit PspFontLayout( ::psp::PrinterGfx& ); - virtual bool LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE; - virtual void InitFont() const SAL_OVERRIDE; - virtual void DrawText( SalGraphics& ) const SAL_OVERRIDE; + virtual bool LayoutText( ImplLayoutArgs& ) override; + virtual void InitFont() const override; + virtual void DrawText( SalGraphics& ) const override; private: ::psp::PrinterGfx& mrPrinterGfx; sal_IntPtr mnFontID; @@ -655,7 +655,7 @@ class PspServerFontLayout : public ServerFontLayout public: PspServerFontLayout( psp::PrinterGfx&, ServerFont& rFont, const ImplLayoutArgs& rArgs ); - virtual void InitFont() const SAL_OVERRIDE; + virtual void InitFont() const override; const sal_Unicode* getTextPtr() const { return maText.getStr() - mnMinCharPos; } int getMinCharPos() const { return mnMinCharPos; } int getMaxCharPos() const { return mnMinCharPos+maText.getLength()-1; } diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx index e1e60d55b535..78e4a9e8485f 100644 --- a/vcl/generic/print/prtsetup.hxx +++ b/vcl/generic/print/prtsetup.hxx @@ -66,7 +66,7 @@ class RTSDialog : public TabDialog public: RTSDialog(const ::psp::PrinterInfo& rJobData, vcl::Window* pParent = NULL); virtual ~RTSDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; const ::psp::PrinterInfo& getSetup() const { return m_aJobData; } @@ -93,7 +93,7 @@ class RTSPaperPage : public TabPage public: explicit RTSPaperPage( RTSDialog* ); virtual ~RTSPaperPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void update(); @@ -120,7 +120,7 @@ class RTSDevicePage : public TabPage public: explicit RTSDevicePage( RTSDialog* ); virtual ~RTSDevicePage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; sal_uLong getLevel(); sal_uLong getPDFDevice(); |