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 /sw/source/filter/xml/xmltexti.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/source/filter/xml/xmltexti.hxx')
-rw-r--r-- | sw/source/filter/xml/xmltexti.hxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index 23e4051eab23..f753c44f33d8 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -33,7 +33,7 @@ protected: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; public: SwXMLTextImportHelper( @@ -53,14 +53,14 @@ public: const OUString& rHRef, const OUString& rStyleName, const OUString& rTableName, - sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; + sal_Int32 nWidth, sal_Int32 nHeight ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertOOoLink( SvXMLImport& rImport, const OUString& rHRef, const OUString& rStyleName, const OUString& rTableName, - sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; + sal_Int32 nWidth, sal_Int32 nHeight ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertApplet( @@ -68,14 +68,14 @@ public: const OUString &rCode, bool bMayScript, const OUString& rHRef, - sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; + sal_Int32 nWidth, sal_Int32 nHeight ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertPlugin( const OUString &rMimeType, const OUString& rHRef, - sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; + sal_Int32 nWidth, sal_Int32 nHeight ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> @@ -83,13 +83,13 @@ public: const OUString &rName, const OUString &rHRef, const OUString &rStyleName, - sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; + sal_Int32 nWidth, sal_Int32 nHeight ) override; virtual void endAppletOrPlugin( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &rPropSet, - ::std::map < const OUString, OUString > &rParamMap) SAL_OVERRIDE; + ::std::map < const OUString, OUString > &rParamMap) override; - virtual bool IsInHeaderFooter() const SAL_OVERRIDE; + virtual bool IsInHeaderFooter() const override; // redlining helper methods // (here is the real implementation) @@ -99,21 +99,21 @@ public: const OUString& rAuthor, /// name of the author const OUString& rComment, /// redline comment const ::com::sun::star::util::DateTime& rDateTime, /// date+time - bool bMergeLastPara) SAL_OVERRIDE; /// merge last paragraph + bool bMergeLastPara) override; /// merge last paragraph virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor> RedlineCreateText( ::com::sun::star::uno::Reference< /// needed to get the document ::com::sun::star::text::XTextCursor> & rOldCursor, - const OUString& rId) SAL_OVERRIDE; /// ID used to RedlineAdd() call + const OUString& rId) override; /// ID used to RedlineAdd() call virtual void RedlineSetCursor( const OUString& rId, /// ID used to RedlineAdd() call bool bStart, /// start or end Cursor - bool bIsOutsideOfParagraph) SAL_OVERRIDE; - virtual void RedlineAdjustStartNodeCursor( bool bStart) SAL_OVERRIDE; - virtual void SetShowChanges( bool bShowChanges ) SAL_OVERRIDE; - virtual void SetRecordChanges( bool bRecordChanges ) SAL_OVERRIDE; + bool bIsOutsideOfParagraph) override; + virtual void RedlineAdjustStartNodeCursor( bool bStart) override; + virtual void SetShowChanges( bool bShowChanges ) override; + virtual void SetRecordChanges( bool bRecordChanges ) override; virtual void SetChangesProtectionKey( - const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ) SAL_OVERRIDE; + const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ) override; }; #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTI_HXX |