diff options
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/brdwin.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/cvtsvm.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/generic/glyphcache.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/graphite_features.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/image.h | 8 | ||||
-rw-r--r-- | vcl/inc/impfont.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/impimagetree.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/opengl/program.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/osx/salframe.h | 4 | ||||
-rw-r--r-- | vcl/inc/osx/salprn.h | 8 | ||||
-rw-r--r-- | vcl/inc/outfont.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/sallayout.hxx | 12 | ||||
-rw-r--r-- | vcl/inc/textlayout.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/window.h | 4 |
14 files changed, 34 insertions, 34 deletions
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 5811c052b419..7832b216167d 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -112,8 +112,8 @@ private: WinBits nStyle, sal_uInt16 nTypeStyle, const ::com::sun::star::uno::Any& ); - ImplBorderWindow (const ImplBorderWindow &) SAL_DELETED_FUNCTION; - ImplBorderWindow& operator= (const ImplBorderWindow &) SAL_DELETED_FUNCTION; + ImplBorderWindow (const ImplBorderWindow &) = delete; + ImplBorderWindow& operator= (const ImplBorderWindow &) = delete; public: ImplBorderWindow( vcl::Window* pParent, diff --git a/vcl/inc/cvtsvm.hxx b/vcl/inc/cvtsvm.hxx index 437839dcfb88..fdb83338fe3e 100644 --- a/vcl/inc/cvtsvm.hxx +++ b/vcl/inc/cvtsvm.hxx @@ -89,8 +89,8 @@ public: ~SVMConverter() {} private: - SVMConverter( const SVMConverter& ) SAL_DELETED_FUNCTION; - SVMConverter& operator=( const SVMConverter& ) SAL_DELETED_FUNCTION; + SVMConverter( const SVMConverter& ) = delete; + SVMConverter& operator=( const SVMConverter& ) = delete; }; #endif // INCLUDED_VCL_INC_CVTSVM_HXX diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 37568c735804..198da6ee76e0 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -306,8 +306,8 @@ private: ServerFont& mrServerFont; com::sun::star::uno::Reference<com::sun::star::i18n::XBreakIterator> mxBreak; - ServerFontLayout( const ServerFontLayout& ) SAL_DELETED_FUNCTION; - ServerFontLayout& operator=( const ServerFontLayout& ) SAL_DELETED_FUNCTION; + ServerFontLayout( const ServerFontLayout& ) = delete; + ServerFontLayout& operator=( const ServerFontLayout& ) = delete; }; diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx index dc37dfc89d89..97bd1861eaef 100644 --- a/vcl/inc/graphite_features.hxx +++ b/vcl/inc/graphite_features.hxx @@ -50,7 +50,7 @@ namespace grutils ~GrFeatureParser(); gr_feature_val * values() const { return mpSettings; }; private: - GrFeatureParser(const GrFeatureParser & copy) SAL_DELETED_FUNCTION; + GrFeatureParser(const GrFeatureParser & copy) = delete; void setLang(const gr_face * face, const OString & lang); static bool isCharId(const OString & id, size_t offset, size_t length); static gr_uint32 getCharId(const OString & id, size_t offset, size_t length); diff --git a/vcl/inc/image.h b/vcl/inc/image.h index 00861670abba..1315db1ba9b7 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -51,8 +51,8 @@ private: void ImplUpdateDisabledBmpEx(); private: - ImplImageBmp( const ImplImageBmp& ) SAL_DELETED_FUNCTION; - void operator=( const ImplImageBmp& ) SAL_DELETED_FUNCTION; + ImplImageBmp( const ImplImageBmp& ) = delete; + void operator=( const ImplImageBmp& ) = delete; }; // - ImageTypes - @@ -137,8 +137,8 @@ struct ImplImage ~ImplImage(); private: - ImplImage( const ImplImage&) SAL_DELETED_FUNCTION; - void operator=( const ImplImage&) SAL_DELETED_FUNCTION; + ImplImage( const ImplImage&) = delete; + void operator=( const ImplImage&) = delete; }; #endif // INCLUDED_VCL_INC_IMAGE_H diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 5ad974e56841..25aa15afb75e 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -173,8 +173,8 @@ private: friend void intrusive_ptr_add_ref(ImplFontCharMap* pImplFontCharMap); friend void intrusive_ptr_release(ImplFontCharMap* pImplFontCharMap); - ImplFontCharMap( const ImplFontCharMap& ) SAL_DELETED_FUNCTION; - void operator=( const ImplFontCharMap& ) SAL_DELETED_FUNCTION; + ImplFontCharMap( const ImplFontCharMap& ) = delete; + void operator=( const ImplFontCharMap& ) = delete; static ImplFontCharMapPtr getDefaultMap( bool bSymbols=false); bool isDefaultMap() const; diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx index 5323eadb44d0..2ee52c8dd917 100644 --- a/vcl/inc/impimagetree.hxx +++ b/vcl/inc/impimagetree.hxx @@ -57,8 +57,8 @@ public: css::uno::Reference< css::container::XNameAccess > getNameAccess(); private: - ImplImageTree(const ImplImageTree&) SAL_DELETED_FUNCTION; - ImplImageTree& operator=(const ImplImageTree&) SAL_DELETED_FUNCTION; + ImplImageTree(const ImplImageTree&) = delete; + ImplImageTree& operator=(const ImplImageTree&) = delete; typedef std::unordered_map<OUString, std::pair<bool, BitmapEx>, OUStringHash> IconCache; typedef std::unordered_map<OUString, OUString, OUStringHash> IconLinkHash; diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx index 3a4751286332..5de3c1bdbe5f 100644 --- a/vcl/inc/opengl/program.hxx +++ b/vcl/inc/opengl/program.hxx @@ -45,7 +45,7 @@ private: float mfLastPixelOffset; - OpenGLProgram(const OpenGLProgram &) SAL_DELETED_FUNCTION; + OpenGLProgram(const OpenGLProgram &) = delete; public: OpenGLProgram(); ~OpenGLProgram(); diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 52a8ac378b0c..1e8a61eb3a57 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -202,8 +202,8 @@ public: private: // data static AquaSalFrame* s_pCaptureFrame; - AquaSalFrame( const AquaSalFrame& ) SAL_DELETED_FUNCTION; - AquaSalFrame& operator=(const AquaSalFrame&) SAL_DELETED_FUNCTION; + AquaSalFrame( const AquaSalFrame& ) = delete; + AquaSalFrame& operator=(const AquaSalFrame&) = delete; }; #endif // INCLUDED_VCL_INC_OSX_SALFRAME_H diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h index 51964643d37e..20ac58189fbb 100644 --- a/vcl/inc/osx/salprn.h +++ b/vcl/inc/osx/salprn.h @@ -109,8 +109,8 @@ class AquaSalInfoPrinter : public SalInfoPrinter void setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation ); private: - AquaSalInfoPrinter( const AquaSalInfoPrinter& ) SAL_DELETED_FUNCTION; - AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&) SAL_DELETED_FUNCTION; + AquaSalInfoPrinter( const AquaSalInfoPrinter& ) = delete; + AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&) = delete; }; // - AquaSalPrinter - @@ -142,8 +142,8 @@ class AquaSalPrinter : public SalPrinter virtual sal_uLong GetErrorCode() SAL_OVERRIDE; private: - AquaSalPrinter( const AquaSalPrinter& ) SAL_DELETED_FUNCTION; - AquaSalPrinter& operator=(const AquaSalPrinter&) SAL_DELETED_FUNCTION; + AquaSalPrinter( const AquaSalPrinter& ) = delete; + AquaSalPrinter& operator=(const AquaSalPrinter&) = delete; }; const double fPtTo100thMM = 35.27777778; diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index 2b56acd4fdea..c4c30fbc81bd 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -295,8 +295,8 @@ public: sal_Int32 Count() const { return mnLines; } private: - ImplMultiTextLineInfo( const ImplMultiTextLineInfo& ) SAL_DELETED_FUNCTION; - ImplMultiTextLineInfo& operator=( const ImplMultiTextLineInfo& ) SAL_DELETED_FUNCTION; + ImplMultiTextLineInfo( const ImplMultiTextLineInfo& ) = delete; + ImplMultiTextLineInfo& operator=( const ImplMultiTextLineInfo& ) = delete; }; #endif // INCLUDED_VCL_INC_OUTFONT_HXX diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 46a3a9e521ad..775a34d8da2a 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -216,8 +216,8 @@ protected: static int CalcAsianKerning( sal_UCS4, bool bLeft, bool bVertical ); private: - SalLayout( const SalLayout& ) SAL_DELETED_FUNCTION; - SalLayout& operator=( const SalLayout& ) SAL_DELETED_FUNCTION; + SalLayout( const SalLayout& ) = delete; + SalLayout& operator=( const SalLayout& ) = delete; protected: int mnMinCharPos; @@ -264,8 +264,8 @@ private: virtual void DropGlyph( int ) SAL_OVERRIDE {} virtual void Simplify( bool ) SAL_OVERRIDE {} - MultiSalLayout( const MultiSalLayout& ) SAL_DELETED_FUNCTION; - MultiSalLayout& operator=( const MultiSalLayout& ) SAL_DELETED_FUNCTION; + MultiSalLayout( const MultiSalLayout& ) = delete; + MultiSalLayout& operator=( const MultiSalLayout& ) = delete; private: SalLayout* mpLayouts[ MAX_FALLBACK ]; @@ -368,8 +368,8 @@ protected: private: mutable Point maBasePoint; - GenericSalLayout( const GenericSalLayout& ) SAL_DELETED_FUNCTION; - GenericSalLayout& operator=( const GenericSalLayout& ) SAL_DELETED_FUNCTION; + GenericSalLayout( const GenericSalLayout& ) = delete; + GenericSalLayout& operator=( const GenericSalLayout& ) = delete; }; #undef SalGraphics diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx index 6b86aafc422a..f7fbeb91ff78 100644 --- a/vcl/inc/textlayout.hxx +++ b/vcl/inc/textlayout.hxx @@ -97,8 +97,8 @@ namespace vcl MetricVector* _pVector = NULL, OUString* _pDisplayText = NULL ); private: - ControlTextRenderer( const ControlTextRenderer& ) SAL_DELETED_FUNCTION; - ControlTextRenderer& operator=( const ControlTextRenderer& ) SAL_DELETED_FUNCTION; + ControlTextRenderer( const ControlTextRenderer& ) = delete; + ControlTextRenderer& operator=( const ControlTextRenderer& ) = delete; private: ::std::unique_ptr< ReferenceDeviceTextLayout > m_pImpl; diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 4eebb7639cad..eb79d392edc8 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -203,8 +203,8 @@ enum AlwaysInputMode { AlwaysInputNone = 0, AlwaysInputEnabled = 1, AlwaysInputD class WindowImpl { private: - WindowImpl(const WindowImpl&) SAL_DELETED_FUNCTION; - WindowImpl& operator=(const WindowImpl&) SAL_DELETED_FUNCTION; + WindowImpl(const WindowImpl&) = delete; + WindowImpl& operator=(const WindowImpl&) = delete; public: WindowImpl( WindowType ); ~WindowImpl(); |