summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper
diff options
context:
space:
mode:
Diffstat (limited to 'writerfilter/source/dmapper')
-rw-r--r--writerfilter/source/dmapper/BorderHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/CellColorHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/CellMarginHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/DomainMapper.hxx2
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.hxx2
-rw-r--r--writerfilter/source/dmapper/FFDataHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/FontTable.hxx4
-rw-r--r--writerfilter/source/dmapper/GraphicHelpers.hxx4
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx2
-rw-r--r--writerfilter/source/dmapper/GraphicImport.hxx2
-rw-r--r--writerfilter/source/dmapper/LatentStyleHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/MeasureHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/ModelEventListener.hxx2
-rw-r--r--writerfilter/source/dmapper/NumberingManager.hxx6
-rw-r--r--writerfilter/source/dmapper/OLEHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/PageBordersHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/PropertyMap.hxx8
-rw-r--r--writerfilter/source/dmapper/SectionColumnHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/SettingsTable.hxx2
-rw-r--r--writerfilter/source/dmapper/SmartTagHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.hxx4
-rw-r--r--writerfilter/source/dmapper/TDefTableHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/TablePositionHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/TblStylePrHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/TextEffectsHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/ThemeTable.hxx2
-rw-r--r--writerfilter/source/dmapper/TrackChangesHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/WrapPolygonHandler.hxx2
28 files changed, 36 insertions, 36 deletions
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 6ea1e33d7286..cd862d256617 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -65,7 +65,7 @@ private:
public:
explicit BorderHandler( bool bOOXML );
- virtual ~BorderHandler();
+ virtual ~BorderHandler() override;
::std::shared_ptr<PropertyMap> getProperties();
css::table::BorderLine2 getBorderLine();
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx
index 98c8aaf18ddf..a239c203fca3 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -51,7 +51,7 @@ private:
public:
CellColorHandler( );
- virtual ~CellColorHandler();
+ virtual ~CellColorHandler() override;
::std::shared_ptr<TablePropertyMap> getProperties();
diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx
index a33f92d64b4d..b31e9cdf47a6 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.hxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.hxx
@@ -56,7 +56,7 @@ public:
public:
CellMarginHandler( );
- virtual ~CellMarginHandler();
+ virtual ~CellMarginHandler() override;
void enableInteropGrabBag(const OUString& aName);
css::beans::PropertyValue getInteropGrabBag();
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx
index 2abaf1233656..54b12a1a2233 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -82,7 +82,7 @@ public:
bool bRepairStorage,
SourceDocumentType eDocumentType,
utl::MediaDescriptor& rMediaDesc);
- virtual ~DomainMapper();
+ virtual ~DomainMapper() override;
// Stream
virtual void markLastParagraphInSection() override;
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index c4e8d638794d..11e1a7b782cc 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -80,7 +80,7 @@ class DomainMapperTableManager : public TableManager
public:
DomainMapperTableManager();
- virtual ~DomainMapperTableManager();
+ virtual ~DomainMapperTableManager() override;
// use this method to avoid adding the properties for the table
// but in the provided properties map.
diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx
index a2149e9c7727..3ec35292549f 100644
--- a/writerfilter/source/dmapper/FFDataHandler.hxx
+++ b/writerfilter/source/dmapper/FFDataHandler.hxx
@@ -33,7 +33,7 @@ public:
// constructor
FFDataHandler();
// destructor
- virtual ~FFDataHandler();
+ virtual ~FFDataHandler() override;
// member: name
const OUString & getName() const { return m_sName;}
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index 32ead8865dad..0c1e689df8cc 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -50,7 +50,7 @@ class FontTable : public LoggedProperties, public LoggedTable
public:
FontTable();
- virtual ~FontTable();
+ virtual ~FontTable() override;
sal_uInt32 size();
const FontEntry::Pointer_t getFontEntry(sal_uInt32 nIndex);
@@ -89,7 +89,7 @@ class EmbeddedFontHandler : public LoggedProperties
{
public:
EmbeddedFontHandler( const OUString& fontName, const char* style );
- virtual ~EmbeddedFontHandler();
+ virtual ~EmbeddedFontHandler() override;
private:
virtual void lcl_attribute( Id name, Value& val ) override;
virtual void lcl_sprm( Sprm& rSprm ) override;
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx
index a1ca90990bfd..0911992a4d73 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -34,7 +34,7 @@ class PositionHandler: public LoggedProperties
{
public:
PositionHandler( std::pair<OUString, OUString>& rPositionOffsets, std::pair<OUString, OUString>& rAligns );
- virtual ~PositionHandler( );
+ virtual ~PositionHandler( ) override;
sal_Int16 orientation() const;
sal_Int16 relation() const { return m_nRelation;}
sal_Int32 position() const { return m_nPosition;}
@@ -53,7 +53,7 @@ class WrapHandler: public LoggedProperties
{
public:
WrapHandler( );
- virtual ~WrapHandler( );
+ virtual ~WrapHandler( ) override;
sal_Int32 m_nType;
sal_Int32 m_nSide;
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 006c91c44489..837308cc9659 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -80,7 +80,7 @@ class XInputStreamHelper : public cppu::WeakImplHelper<io::XInputStream>
sal_Int32 m_nHeaderLength;
public:
XInputStreamHelper(const sal_uInt8* buf, size_t len);
- virtual ~XInputStreamHelper();
+ virtual ~XInputStreamHelper() override;
virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override;
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx
index deb738366a0d..9b0246e79581 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -85,7 +85,7 @@ public:
std::pair<OUString, OUString>& rPositionOffsets,
std::pair<OUString, OUString>& rAligns,
std::queue<OUString>& rPositivePercentages);
- virtual ~GraphicImport();
+ virtual ~GraphicImport() override;
// BinaryObj
virtual void data(const sal_uInt8* buffer, size_t len, writerfilter::Reference<Properties>::Pointer_t ref) override;
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/writerfilter/source/dmapper/LatentStyleHandler.hxx
index 80891b124ec6..ec1b8dd6d176 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.hxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx
@@ -31,7 +31,7 @@ class LatentStyleHandler
public:
LatentStyleHandler();
- virtual ~LatentStyleHandler();
+ virtual ~LatentStyleHandler() override;
const std::vector<css::beans::PropertyValue>& getAttributes() const;
};
diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx
index 6a8ff9dfd944..92741825f5c0 100644
--- a/writerfilter/source/dmapper/MeasureHandler.hxx
+++ b/writerfilter/source/dmapper/MeasureHandler.hxx
@@ -46,7 +46,7 @@ class MeasureHandler : public LoggedProperties
public:
MeasureHandler();
- virtual ~MeasureHandler();
+ virtual ~MeasureHandler() override;
sal_Int32 getMeasureValue() const;
diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx b/writerfilter/source/dmapper/ModelEventListener.hxx
index 124f221ec388..f2396dce2b14 100644
--- a/writerfilter/source/dmapper/ModelEventListener.hxx
+++ b/writerfilter/source/dmapper/ModelEventListener.hxx
@@ -32,7 +32,7 @@ class ModelEventListener : public cppu::WeakImplHelper<css::document::XEventList
bool m_bControls;
public:
ModelEventListener(bool bIndexes, bool bControls);
- virtual ~ModelEventListener();
+ virtual ~ModelEventListener() override;
virtual void SAL_CALL notifyEvent(const css::document::EventObject& Event) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index f189041e9030..039eabdb927e 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -73,7 +73,7 @@ public:
,m_outline(false)
{}
- virtual ~ListLevel( ){ }
+ virtual ~ListLevel( ) override { }
// Setters for the import
void SetValue( Id nId, sal_Int32 nValue );
@@ -178,7 +178,7 @@ public:
typedef std::shared_ptr< ListDef > Pointer;
ListDef( );
- virtual ~ListDef( );
+ virtual ~ListDef( ) override;
// Accessors
void SetAbstractDefinition( AbstractListDef::Pointer pAbstract ) { m_pAbstractDef = pAbstract; };
@@ -228,7 +228,7 @@ private:
public:
ListsManager(DomainMapper& rDMapper, const css::uno::Reference<css::lang::XMultiServiceFactory>& xFactory);
- virtual ~ListsManager();
+ virtual ~ListsManager() override;
typedef std::shared_ptr< ListsManager > Pointer;
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx
index 503c164e24f0..2f99de501e5f 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -78,7 +78,7 @@ class OLEHandler : public LoggedProperties
public:
OLEHandler(DomainMapper& rDomainMapper);
- virtual ~OLEHandler();
+ virtual ~OLEHandler() override;
const css::uno::Reference<css::drawing::XShape>& getShape() { return m_xShape; };
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx
index ef699ca8df42..8fa0f40a6976 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.hxx
@@ -60,7 +60,7 @@ private:
public:
PageBordersHandler( );
- virtual ~PageBordersHandler( );
+ virtual ~PageBordersHandler( ) override;
inline sal_Int32 GetDisplayOffset( )
{
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 37e111d9e08e..3a90fa6a5ec4 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -266,7 +266,7 @@ class SectionPropertyMap : public PropertyMap
public:
explicit SectionPropertyMap(bool bIsFirstSection);
- virtual ~SectionPropertyMap();
+ virtual ~SectionPropertyMap() override;
enum PageType
{
@@ -469,7 +469,7 @@ class StyleSheetPropertyMap : public PropertyMap, public ParagraphProperties
sal_Int32 mnNumId;
public:
explicit StyleSheetPropertyMap();
- virtual ~StyleSheetPropertyMap();
+ virtual ~StyleSheetPropertyMap() override;
void SetCT_TrPrBase_jc( sal_Int32 nSet )
{mnCT_TrPrBase_jc = nSet; mbCT_TrPrBase_jcSet = true; }
@@ -500,7 +500,7 @@ class ParagraphPropertyMap : public PropertyMap, public ParagraphProperties
{
public:
explicit ParagraphPropertyMap();
- virtual ~ParagraphPropertyMap();
+ virtual ~ParagraphPropertyMap() override;
};
@@ -535,7 +535,7 @@ private:
public:
explicit TablePropertyMap();
- virtual ~TablePropertyMap();
+ virtual ~TablePropertyMap() override;
bool getValue( TablePropertyMapTarget eWhich, sal_Int32& nFill );
void setValue( TablePropertyMapTarget eWhich, sal_Int32 nSet );
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx
index ee7bc7f1d740..632129c10f04 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.hxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx
@@ -49,7 +49,7 @@ class SectionColumnHandler : public LoggedProperties
public:
SectionColumnHandler();
- virtual ~SectionColumnHandler();
+ virtual ~SectionColumnHandler() override;
bool IsEqualWidth() const { return m_bEqualWidth; }
sal_Int32 GetSpace() const { return m_nSpace; }
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx
index 648bf6d41b93..8328ec2050b5 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -46,7 +46,7 @@ class SettingsTable : public LoggedProperties, public LoggedTable
public:
SettingsTable();
- virtual ~SettingsTable();
+ virtual ~SettingsTable() override;
//returns default TabStop in 1/100th mm
int GetDefaultTabStop() const;
diff --git a/writerfilter/source/dmapper/SmartTagHandler.hxx b/writerfilter/source/dmapper/SmartTagHandler.hxx
index e6a4a230fed5..a8365a64e2d4 100644
--- a/writerfilter/source/dmapper/SmartTagHandler.hxx
+++ b/writerfilter/source/dmapper/SmartTagHandler.hxx
@@ -35,7 +35,7 @@ class SmartTagHandler
public:
SmartTagHandler(const css::uno::Reference<css::uno::XComponentContext>& xComponentContext, const css::uno::Reference<css::text::XTextDocument>& xTextDocument);
- virtual ~SmartTagHandler();
+ virtual ~SmartTagHandler() override;
virtual void lcl_attribute(Id Name, Value& val) override;
virtual void lcl_sprm(Sprm& sprm) override;
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index a2344dbba3df..5bacc96b050c 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -88,7 +88,7 @@ class StyleSheetTable :
public:
StyleSheetTable(DomainMapper& rDMapper, css::uno::Reference<css::text::XTextDocument> const& xTextDocument, bool bIsNewDoc);
- virtual ~StyleSheetTable();
+ virtual ~StyleSheetTable() override;
void ApplyStyleSheets( const FontTablePtr& rFontTable );
const StyleSheetEntryPtr FindStyleSheetByISTD(const OUString& sIndex);
@@ -144,7 +144,7 @@ public:
PropertyMapPtr GetProperties( sal_Int32 nMask);
TableStyleSheetEntry( StyleSheetEntry& aEntry, StyleSheetTable* pStyles );
- virtual ~TableStyleSheetEntry( );
+ virtual ~TableStyleSheetEntry( ) override;
protected:
PropertyMapPtr GetLocalPropertiesFromMask( sal_Int32 nMask );
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx
index 3e8ce7f802f4..677c44fa6660 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -69,7 +69,7 @@ private:
public:
TDefTableHandler();
- virtual ~TDefTableHandler();
+ virtual ~TDefTableHandler() override;
void fillCellProperties( size_t nCell, const ::std::shared_ptr< TablePropertyMap >& pCellProperties) const;
void enableInteropGrabBag(const OUString& aName);
diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx
index 1a1daece76a3..1e0d096f02c6 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.hxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.hxx
@@ -81,7 +81,7 @@ public:
}
TablePositionHandler();
- virtual ~TablePositionHandler();
+ virtual ~TablePositionHandler() override;
/** Compute the UNO properties for the frame containing the table based
on the received tokens.
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index 393242554fd9..5d38727f806c 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -66,7 +66,7 @@ private:
public:
explicit TblStylePrHandler( DomainMapper & rDMapper );
- virtual ~TblStylePrHandler( );
+ virtual ~TblStylePrHandler( ) override;
const PropertyMapPtr& getProperties() { return m_pProperties; };
inline TblStyleType getType() { return m_nType; };
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx
index 1ee928d76475..fd89b2adf5d8 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -44,7 +44,7 @@ private:
public:
TextEffectsHandler(sal_uInt32 aElementId);
- virtual ~TextEffectsHandler();
+ virtual ~TextEffectsHandler() override;
const boost::optional<PropertyIds>& getGrabBagPropertyId() { return maPropertyId;}
diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx
index 38d304134035..5965e7c42e02 100644
--- a/writerfilter/source/dmapper/ThemeTable.hxx
+++ b/writerfilter/source/dmapper/ThemeTable.hxx
@@ -39,7 +39,7 @@ class ThemeTable : public LoggedProperties, public LoggedTable
public:
ThemeTable();
- virtual ~ThemeTable();
+ virtual ~ThemeTable() override;
const OUString getFontNameForTheme(const Id id) const;
static OUString getStringForTheme(const Id id);
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx b/writerfilter/source/dmapper/TrackChangesHandler.hxx
index 81130b984fca..272e86de0c15 100644
--- a/writerfilter/source/dmapper/TrackChangesHandler.hxx
+++ b/writerfilter/source/dmapper/TrackChangesHandler.hxx
@@ -33,7 +33,7 @@ class TrackChangesHandler : public LoggedProperties
public:
explicit TrackChangesHandler( sal_Int32 nToken );
- virtual ~TrackChangesHandler();
+ virtual ~TrackChangesHandler() override;
/// Compute the UNO properties for the track changes object based on the received tokens.
css::uno::Sequence<css::beans::PropertyValue> getRedlineProperties() const;
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index c44cf0ced996..0f4002752622 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -58,7 +58,7 @@ class WrapPolygonHandler : public LoggedProperties
{
public:
WrapPolygonHandler();
- virtual ~WrapPolygonHandler();
+ virtual ~WrapPolygonHandler() override;
const WrapPolygon::Pointer_t& getPolygon() { return mpPolygon;}