diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 11:54:10 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 11:54:55 +0100 |
commit | 5fb78604c1c3e91beb867c352928af9e1ef57a26 (patch) | |
tree | 7d6a0f7c1bfe2f2803f5f2ffb5741dd3c05c5818 /include/xmloff | |
parent | bc5060b32f08b0408fb929faea1f8140a58d3cc5 (diff) |
Split TYPEINFO into plain and TYPEINFO_OVERRIDE
...where the latter contains SAL_OVERRIDE annotations
Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1
Diffstat (limited to 'include/xmloff')
-rw-r--r-- | include/xmloff/XMLBase64ImportContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLCharContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLEventsImportContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLFontStylesContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLGraphicsDefaultStyle.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLShapeStyleContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLTextMasterPageContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLTextMasterStylesContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLTextShapeStyleContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLTextTableContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/prstylei.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/shapeimport.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/txtstyli.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/xmlnumi.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/xmlstyle.hxx | 4 |
15 files changed, 16 insertions, 16 deletions
diff --git a/include/xmloff/XMLBase64ImportContext.hxx b/include/xmloff/XMLBase64ImportContext.hxx index 041bfa0e91b6..27a67ee33995 100644 --- a/include/xmloff/XMLBase64ImportContext.hxx +++ b/include/xmloff/XMLBase64ImportContext.hxx @@ -35,7 +35,7 @@ class XMLOFF_DLLPUBLIC XMLBase64ImportContext : public SvXMLImportContext OUString sBase64CharsLeft; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLBase64ImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx index c147d4d79251..c4993583c9d1 100644 --- a/include/xmloff/XMLCharContext.hxx +++ b/include/xmloff/XMLCharContext.hxx @@ -33,7 +33,7 @@ protected: sal_Unicode m_c; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLCharContext( SvXMLImport& rImport, diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx index fc988c26da0a..6c50f23277f8 100644 --- a/include/xmloff/XMLEventsImportContext.hxx +++ b/include/xmloff/XMLEventsImportContext.hxx @@ -64,7 +64,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLEventsImportContext( SvXMLImport& rImport, diff --git a/include/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx index 08382d218163..b8730ddfcd70 100644 --- a/include/xmloff/XMLFontStylesContext.hxx +++ b/include/xmloff/XMLFontStylesContext.hxx @@ -53,7 +53,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFontStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/include/xmloff/XMLGraphicsDefaultStyle.hxx b/include/xmloff/XMLGraphicsDefaultStyle.hxx index 8382607d873e..d39d9ea51e79 100644 --- a/include/xmloff/XMLGraphicsDefaultStyle.hxx +++ b/include/xmloff/XMLGraphicsDefaultStyle.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace container class XMLOFF_DLLPUBLIC XMLGraphicsDefaultStyle : public XMLPropStyleContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx index cedd322ef6c1..6b86280ce638 100644 --- a/include/xmloff/XMLShapeStyleContext.hxx +++ b/include/xmloff/XMLShapeStyleContext.hxx @@ -42,7 +42,7 @@ protected: const OUString& rLocalName, const OUString& rValue ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLShapeStyleContext( SvXMLImport& rImport, diff --git a/include/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx index 26fb62896b1e..f0620ceceaf2 100644 --- a/include/xmloff/XMLTextMasterPageContext.hxx +++ b/include/xmloff/XMLTextMasterPageContext.hxx @@ -59,7 +59,7 @@ protected: ::com::sun::star::style::XStyle > GetStyle() { return xStyle; } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/include/xmloff/XMLTextMasterStylesContext.hxx b/include/xmloff/XMLTextMasterStylesContext.hxx index 526fb1de5806..2034628f4a45 100644 --- a/include/xmloff/XMLTextMasterStylesContext.hxx +++ b/include/xmloff/XMLTextMasterStylesContext.hxx @@ -40,7 +40,7 @@ protected: virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextMasterStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx index d95675dcb425..22fc3cad331c 100644 --- a/include/xmloff/XMLTextShapeStyleContext.hxx +++ b/include/xmloff/XMLTextShapeStyleContext.hxx @@ -39,7 +39,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextShapeStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/include/xmloff/XMLTextTableContext.hxx b/include/xmloff/XMLTextTableContext.hxx index 16171be2e386..d5576e92af96 100644 --- a/include/xmloff/XMLTextTableContext.hxx +++ b/include/xmloff/XMLTextTableContext.hxx @@ -37,7 +37,7 @@ class XMLOFF_DLLPUBLIC XMLTextTableContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextTableContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx index b5a99a0031a9..e727003987b8 100644 --- a/include/xmloff/prstylei.hxx +++ b/include/xmloff/prstylei.hxx @@ -60,7 +60,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLPropStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index 1f616ec8fe0d..15efd3702e19 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -256,7 +256,7 @@ public: SvXMLShapeContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLName, sal_Bool bTemporaryShape ) : SvXMLImportContext( rImp, nPrfx, rLName ), mbTemporaryShape(bTemporaryShape) {} - TYPEINFO(); + TYPEINFO_OVERRIDE(); const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& getShape() const { return mxShape; } diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx index 7fea288089bf..336f5f915a3b 100644 --- a/include/xmloff/txtstyli.hxx +++ b/include/xmloff/txtstyli.hxx @@ -63,7 +63,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx index 5371b8cc14b3..fae4482c785f 100644 --- a/include/xmloff/xmlnumi.hxx +++ b/include/xmloff/xmlnumi.hxx @@ -53,7 +53,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxXMLListStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx index ab43cefc250e..78e82522bc36 100644 --- a/include/xmloff/xmlstyle.hxx +++ b/include/xmloff/xmlstyle.hxx @@ -90,7 +90,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvXMLStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -213,7 +213,7 @@ protected: virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, |