summaryrefslogtreecommitdiffstats
path: root/writerperfect/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /writerperfect/inc
parentHAVE_CXX11_OVERRIDE is required on all supported toolchains (diff)
downloadcore-b36963c0a6a09f70ca6d8d607dd3249a3496497d.tar.gz
core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.zip
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'writerperfect/inc')
-rw-r--r--writerperfect/inc/DirectoryStream.hxx20
-rw-r--r--writerperfect/inc/DocumentHandler.hxx10
-rw-r--r--writerperfect/inc/ImportFilter.hxx10
-rw-r--r--writerperfect/inc/WPFTEncodingDialog.hxx2
-rw-r--r--writerperfect/inc/WPXSvInputStream.hxx20
5 files changed, 31 insertions, 31 deletions
diff --git a/writerperfect/inc/DirectoryStream.hxx b/writerperfect/inc/DirectoryStream.hxx
index 1107a1d76630..d35a78038228 100644
--- a/writerperfect/inc/DirectoryStream.hxx
+++ b/writerperfect/inc/DirectoryStream.hxx
@@ -44,17 +44,17 @@ public:
static DirectoryStream *createForParent(const com::sun::star::uno::Reference<com::sun::star::ucb::XContent> &xContent);
static bool isDirectory(const com::sun::star::uno::Reference<com::sun::star::ucb::XContent> &xContent);
- virtual bool isStructured() SAL_OVERRIDE;
- virtual unsigned subStreamCount() SAL_OVERRIDE;
- virtual const char *subStreamName(unsigned id) SAL_OVERRIDE;
- virtual bool existsSubStream(const char *name) SAL_OVERRIDE;
- virtual librevenge::RVNGInputStream *getSubStreamByName(const char *name) SAL_OVERRIDE;
- virtual librevenge::RVNGInputStream *getSubStreamById(unsigned id) SAL_OVERRIDE;
+ virtual bool isStructured() override;
+ virtual unsigned subStreamCount() override;
+ virtual const char *subStreamName(unsigned id) override;
+ virtual bool existsSubStream(const char *name) override;
+ virtual librevenge::RVNGInputStream *getSubStreamByName(const char *name) override;
+ virtual librevenge::RVNGInputStream *getSubStreamById(unsigned id) override;
- virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead) SAL_OVERRIDE;
- virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) SAL_OVERRIDE;
- virtual long tell() SAL_OVERRIDE;
- virtual bool isEnd() SAL_OVERRIDE;
+ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead) override;
+ virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) override;
+ virtual long tell() override;
+ virtual bool isEnd() override;
private:
Impl *m_pImpl;
diff --git a/writerperfect/inc/DocumentHandler.hxx b/writerperfect/inc/DocumentHandler.hxx
index 15cd4a8b45c1..26436f4b73ad 100644
--- a/writerperfect/inc/DocumentHandler.hxx
+++ b/writerperfect/inc/DocumentHandler.hxx
@@ -50,11 +50,11 @@ class WRITERPERFECT_DLLPUBLIC DocumentHandler: public OdfDocumentHandler
{
public:
DocumentHandler(com::sun::star::uno::Reference < com::sun::star::xml::sax::XDocumentHandler > &xHandler);
- void startDocument() SAL_OVERRIDE;
- void endDocument() SAL_OVERRIDE;
- void startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList) SAL_OVERRIDE;
- void endElement(const char *psName) SAL_OVERRIDE;
- void characters(const librevenge::RVNGString &sCharacters) SAL_OVERRIDE;
+ void startDocument() override;
+ void endDocument() override;
+ void startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList) override;
+ void endElement(const char *psName) override;
+ void characters(const librevenge::RVNGString &sCharacters) override;
private:
com::sun::star::uno::Reference < com::sun::star::xml::sax::XDocumentHandler > mxHandler;
diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx
index 1edd9e9fc4c6..673261b2bbf8 100644
--- a/writerperfect/inc/ImportFilter.hxx
+++ b/writerperfect/inc/ImportFilter.hxx
@@ -66,7 +66,7 @@ public:
// XFilter
virtual sal_Bool SAL_CALL filter(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > &rDescriptor)
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override
{
utl::MediaDescriptor aDescriptor(rDescriptor);
css::uno::Reference < css::io::XInputStream > xInputStream;
@@ -102,20 +102,20 @@ public:
}
virtual void SAL_CALL cancel()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override
{
}
// XImporter
virtual void SAL_CALL setTargetDocument(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &xDoc)
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override
{
mxDoc = xDoc;
}
//XExtendedFilterDetection
virtual OUString SAL_CALL detect(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &Descriptor)
- throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ throw(com::sun::star::uno::RuntimeException, std::exception) override
{
OUString sTypeName;
sal_Int32 nLength = Descriptor.getLength();
@@ -153,7 +153,7 @@ public:
// XInitialization
virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &aArguments)
- throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override
{
css::uno::Sequence < css::beans::PropertyValue > aAnySeq;
sal_Int32 nLength = aArguments.getLength();
diff --git a/writerperfect/inc/WPFTEncodingDialog.hxx b/writerperfect/inc/WPFTEncodingDialog.hxx
index bbc53ad093c8..9fc747d749ff 100644
--- a/writerperfect/inc/WPFTEncodingDialog.hxx
+++ b/writerperfect/inc/WPFTEncodingDialog.hxx
@@ -45,7 +45,7 @@ private:
DECL_LINK_TYPED(DoubleClickHdl, ListBox &, void);
DECL_LINK_TYPED(CancelHdl, Button *, void);
- void dispose() SAL_OVERRIDE;
+ void dispose() override;
WPFTEncodingDialog(WPFTEncodingDialog const &) = delete;
WPFTEncodingDialog &operator=(WPFTEncodingDialog const &) = delete;
diff --git a/writerperfect/inc/WPXSvInputStream.hxx b/writerperfect/inc/WPXSvInputStream.hxx
index 7382607ab1a0..7de7455a6f03 100644
--- a/writerperfect/inc/WPXSvInputStream.hxx
+++ b/writerperfect/inc/WPXSvInputStream.hxx
@@ -42,17 +42,17 @@ public:
WPXSvInputStream(::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xStream);
virtual ~WPXSvInputStream();
- virtual bool isStructured() SAL_OVERRIDE;
- virtual unsigned subStreamCount() SAL_OVERRIDE;
- virtual const char *subStreamName(unsigned id) SAL_OVERRIDE;
- virtual bool existsSubStream(const char *name) SAL_OVERRIDE;
- virtual librevenge::RVNGInputStream *getSubStreamByName(const char *name) SAL_OVERRIDE;
- virtual librevenge::RVNGInputStream *getSubStreamById(unsigned id) SAL_OVERRIDE;
+ virtual bool isStructured() override;
+ virtual unsigned subStreamCount() override;
+ virtual const char *subStreamName(unsigned id) override;
+ virtual bool existsSubStream(const char *name) override;
+ virtual librevenge::RVNGInputStream *getSubStreamByName(const char *name) override;
+ virtual librevenge::RVNGInputStream *getSubStreamById(unsigned id) override;
- virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead) SAL_OVERRIDE;
- virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) SAL_OVERRIDE;
- virtual long tell() SAL_OVERRIDE;
- virtual bool isEnd() SAL_OVERRIDE;
+ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead) override;
+ virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) override;
+ virtual long tell() override;
+ virtual bool isEnd() override;
private:
WPXSvInputStreamImpl *mpImpl;