diff options
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 5 | ||||
-rw-r--r-- | writerfilter/source/dmapper/OLEHandler.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMap.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/TableManager.hxx | 16 | ||||
-rw-r--r-- | writerfilter/source/dmapper/TagLogger.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 6 | ||||
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 22 | ||||
-rw-r--r-- | writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfvalue.hxx | 4 |
9 files changed, 29 insertions, 32 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx index eee27fcd1b3e..8ed1b1412d1f 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx @@ -102,10 +102,7 @@ public: virtual void startCell(const Handle_t & start, TablePropertyMapPtr pProps) SAL_OVERRIDE; virtual void endCell(const Handle_t & end) SAL_OVERRIDE; - virtual Handle_t* getTable( ) - { - return &m_xTableRange; - }; + Handle_t& getTable() { return m_xTableRange; }; }; }} diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx index 0bb98a4b3a2b..5c7011550d89 100644 --- a/writerfilter/source/dmapper/OLEHandler.hxx +++ b/writerfilter/source/dmapper/OLEHandler.hxx @@ -77,7 +77,7 @@ class OLEHandler : public LoggedProperties virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; // Interoperability - virtual void saveInteropProperties( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument > const& xTextDocument, + void saveInteropProperties( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument > const& xTextDocument, const OUString& sObjectName, const OUString& sOldObjectName = OUString() ); public: diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index f411a8bd3e4e..2aefbeed6aa1 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -172,7 +172,7 @@ public: void printProperties(); #ifdef DEBUG_WRITERFILTER - virtual void dumpXml( const TagLogger::Pointer_t pLogger ) const; + void dumpXml( const TagLogger::Pointer_t pLogger ) const; #endif static com::sun::star::table::ShadowFormat getShadowFromBorder(com::sun::star::table::BorderLine2 aBorder); diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx index 0644a879e9ee..2f1c32d5df8d 100644 --- a/writerfilter/source/dmapper/TableManager.hxx +++ b/writerfilter/source/dmapper/TableManager.hxx @@ -504,7 +504,7 @@ public: @param rHandle the handle */ - virtual void handle(const css::uno::Reference<css::text::XTextRange>& rHandle); + void handle(const css::uno::Reference<css::text::XTextRange>& rHandle); /** Start a new table level. @@ -537,12 +537,12 @@ public: /** Handle the start of a paragraph group. */ - virtual void startParagraphGroup(); + void startParagraphGroup(); /** Handle the end of a paragraph group. */ - virtual void endParagraphGroup(); + void endParagraphGroup(); /** Handle an SPRM at curent handle. @@ -556,12 +556,12 @@ public: @param pProps the properites */ - virtual void props(TablePropertyMapPtr pProps); + void props(TablePropertyMapPtr pProps); /** Handle occurrence of character 0x7. */ - virtual void handle0x7(); + void handle0x7(); /** Handle 8 bit text at current handle. @@ -569,7 +569,7 @@ public: @param data array of characters @param len number of characters to handle */ - virtual void text(const sal_uInt8 * data, size_t len); + void text(const sal_uInt8 * data, size_t len); /** Handle 16 bit text at current handle. @@ -577,7 +577,7 @@ public: @param data array of characters @param len number of characters to handle */ - virtual void utext(const sal_uInt8 * data, size_t len); + void utext(const sal_uInt8 * data, size_t len); /** Handle properties of the current cell. @@ -614,7 +614,7 @@ public: If this function returns true the current paragraph contains only control information, e.g. end of row. */ - virtual bool isIgnore() const; + bool isIgnore() const; #ifdef DEBUG_WRITERFILTER diff --git a/writerfilter/source/dmapper/TagLogger.hxx b/writerfilter/source/dmapper/TagLogger.hxx index 9282f5b16c9e..f3ce41f0d76b 100644 --- a/writerfilter/source/dmapper/TagLogger.hxx +++ b/writerfilter/source/dmapper/TagLogger.hxx @@ -34,7 +34,7 @@ namespace writerfilter { public: typedef std::shared_ptr<IdToString> Pointer_t; - virtual std::string toString(const Id & id) const = 0; + ; protected: ~IdToString() {} diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx index b074b54bfe9c..a4b4d61514aa 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx @@ -65,10 +65,10 @@ class OOXMLDocumentImpl : public OOXMLDocument sal_Int32 mnProgressEndPos; protected: - virtual void resolveFastSubStream(Stream & rStream, + void resolveFastSubStream(Stream & rStream, OOXMLStream::StreamType_t nType); - virtual void resolveFastSubStreamWithId(Stream & rStream, + void resolveFastSubStreamWithId(Stream & rStream, writerfilter::Reference<Stream>::Pointer_t pStream, sal_uInt32 nId); @@ -110,7 +110,7 @@ public: virtual void resolveComment(Stream & rStream, const sal_Int32 nId) SAL_OVERRIDE; - virtual OOXMLPropertySet * getPicturePropSet + OOXMLPropertySet * getPicturePropSet (const OUString & rId); virtual void resolvePicture(Stream & rStream, const OUString & rId) SAL_OVERRIDE; diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 73a0d3bdb192..a21221af2f23 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -84,7 +84,7 @@ public: throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8> & rId) throw (css::uno::RuntimeException); + sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8> & rId) throw (css::uno::RuntimeException); // local @@ -183,12 +183,12 @@ public: void positivePercentage(const OUString& rText); void startTxbxContent(); void endTxbxContent(); - virtual void propagateCharacterProperties(); - virtual void propagateCharacterPropertiesAsSet(const Id & rId); - virtual void propagateTableProperties(); - virtual void propagateRowProperties(); - virtual void propagateCellProperties(); - virtual bool propagatesProperties() const; + void propagateCharacterProperties(); + void propagateCharacterPropertiesAsSet(const Id & rId); + void propagateTableProperties(); + void propagateRowProperties(); + void propagateCellProperties(); + bool propagatesProperties() const; void sendPropertiesWithId(const Id & rId); void sendPropertiesToParent(); void sendCellProperties(); @@ -235,7 +235,7 @@ protected: void startAction(Token_t Element); void endAction(Token_t Element); - virtual OOXMLPropertySet * getPicturePropSet + OOXMLPropertySet * getPicturePropSet (const OUString & rId); virtual void resolvePropertySetAttrs(); @@ -269,7 +269,7 @@ public: OOXMLPropertySet::Pointer_t getPropertySetAttrs() const { return mpPropertySetAttrs;} virtual void newProperty(const Id & rId, OOXMLValue::Pointer_t pVal) SAL_OVERRIDE; - virtual void sendProperty(Id nId); + void sendProperty(Id nId); virtual OOXMLPropertySet::Pointer_t getPropertySet() const SAL_OVERRIDE; void handleHyperlink(); @@ -338,7 +338,7 @@ public: (OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerValue(); - virtual void setValue(OOXMLValue::Pointer_t pValue); + void setValue(OOXMLValue::Pointer_t pValue); virtual OOXMLValue::Pointer_t getValue() const SAL_OVERRIDE; virtual void lcl_endFastElement(Token_t Element) @@ -365,7 +365,7 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; - virtual void newPropertySet(OOXMLPropertySet::Pointer_t pPropertySet); + void newPropertySet(OOXMLPropertySet::Pointer_t pPropertySet); protected: OOXMLTableImpl mTable; diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx index 00ca3c278ebf..79308ab41fd7 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx @@ -291,7 +291,7 @@ public: virtual ~OOXMLTableImpl(); virtual void resolve(Table & rTable) SAL_OVERRIDE; - virtual void add(ValuePointer_t pPropertySet); + void add(ValuePointer_t pPropertySet); virtual OOXMLTable * clone() const SAL_OVERRIDE; }; diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx index 5ea046d35f6e..dcd5bbaf81e0 100644 --- a/writerfilter/source/rtftok/rtfvalue.hxx +++ b/writerfilter/source/rtftok/rtfvalue.hxx @@ -51,8 +51,8 @@ public: #ifdef DEBUG_WRITERFILTER virtual std::string toString() const SAL_OVERRIDE; #endif - virtual RTFValue* Clone(); - virtual RTFValue* CloneWithSprms(RTFSprms const& rAttributes, RTFSprms const& rSprms); + RTFValue* Clone(); + RTFValue* CloneWithSprms(RTFSprms const& rAttributes, RTFSprms const& rSprms); RTFSprms& getAttributes(); RTFSprms& getSprms(); RTFShape& getShape() const; |