summaryrefslogtreecommitdiff
path: root/sd/source/filter
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
commit567ef6d5782cdb729b49005caf6005610ce03e22 (patch)
tree7e3be1da41382e555d9091914ef7e064852a4fd4 /sd/source/filter
parentc36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff)
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'sd/source/filter')
-rw-r--r--sd/source/filter/eppt/eppt.hxx14
-rw-r--r--sd/source/filter/eppt/epptooxml.hxx28
-rw-r--r--sd/source/filter/eppt/escherex.hxx4
-rw-r--r--sd/source/filter/eppt/pptx-epptooxml.cxx6
-rw-r--r--sd/source/filter/grf/sdgrffilter.cxx2
-rw-r--r--sd/source/filter/html/HtmlOptionsDialog.cxx22
-rw-r--r--sd/source/filter/html/htmlattr.hxx2
-rw-r--r--sd/source/filter/html/htmlex.hxx2
-rw-r--r--sd/source/filter/ppt/pptin.hxx6
9 files changed, 43 insertions, 43 deletions
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index d36957d766ea..1b8023faf5b8 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -223,11 +223,11 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
void ImplCreateHeaderFooterStrings( SvStream& rOut,
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet );
void ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet );
- virtual sal_Bool ImplCreateDocument();
+ virtual sal_Bool ImplCreateDocument() SAL_OVERRIDE;
sal_Bool ImplCreateHyperBlob( SvMemoryStream& rStream );
sal_uInt32 ImplInsertBookmarkURL( const OUString& rBookmark, const sal_uInt32 nType,
const OUString& rStringVer0, const OUString& rStringVer1, const OUString& rStringVer2, const OUString& rStringVer3 );
- virtual sal_Bool ImplCreateMainNotes();
+ virtual sal_Bool ImplCreateMainNotes() SAL_OVERRIDE;
sal_Bool ImplCreateNotes( sal_uInt32 nPageNum );
void ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXBackgroundPropSet );
void ImplWriteVBA();
@@ -267,9 +267,9 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
sal_Bool ImplCloseDocument(); // we write the font, hyper and sound list
virtual void ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterID, sal_uInt16 nMode,
- sal_Bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet );
- virtual void ImplWriteNotes( sal_uInt32 nPageNum );
- virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet );
+ sal_Bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE;
+ virtual void ImplWriteNotes( sal_uInt32 nPageNum ) SAL_OVERRIDE;
+ virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE;
public:
PPTWriter( SvStorageRef& rSvStorage,
@@ -281,8 +281,8 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
sal_Bool IsValid() const { return mbStatus; };
- virtual void exportPPTPre( const std::vector< com::sun::star::beans::PropertyValue >& );
- virtual void exportPPTPost( );
+ virtual void exportPPTPre( const std::vector< com::sun::star::beans::PropertyValue >& ) SAL_OVERRIDE;
+ virtual void exportPPTPost( ) SAL_OVERRIDE;
};
#endif
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index b4f9e641ebda..6f4fa03afefc 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -70,15 +70,15 @@ public:
~PowerPointExport();
// from FilterBase
- virtual bool importDocument() throw();
- virtual bool exportDocument() throw();
+ virtual bool importDocument() throw() SAL_OVERRIDE;
+ virtual bool exportDocument() throw() SAL_OVERRIDE;
// only needed for import, leave them empty, refactor later XmlFilterBase to export and import base?
virtual sal_Int32 getSchemeClr( sal_Int32 /* nColorSchemeToken */ ) const { return 0; }
- virtual oox::vml::Drawing* getVmlDrawing() { return NULL; }
- virtual const oox::drawingml::Theme* getCurrentTheme() const { return NULL; }
- virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() { return oox::drawingml::table::TableStyleListPtr(); }
- virtual oox::drawingml::chart::ChartConverter* getChartConverter() { return NULL; }
+ virtual oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE { return NULL; }
+ virtual const oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE { return NULL; }
+ virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE { return oox::drawingml::table::TableStyleListPtr(); }
+ virtual oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE { return NULL; }
static const char* GetSideDirection( sal_uInt8 nDirection );
static const char* GetCornerDirection( sal_uInt8 nDirection );
@@ -88,16 +88,16 @@ public:
protected:
virtual void ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 nMode,
- sal_Bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet );
- virtual void ImplWriteNotes( sal_uInt32 nPageNum );
- virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet );
- virtual void ImplWriteLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum );
+ sal_Bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE;
+ virtual void ImplWriteNotes( sal_uInt32 nPageNum ) SAL_OVERRIDE;
+ virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE;
+ virtual void ImplWriteLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum ) SAL_OVERRIDE;
void ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum );
void WriteTheme( sal_Int32 nThemeNum );
- virtual sal_Bool ImplCreateDocument();
- virtual sal_Bool ImplCreateMainNotes();
- virtual ::oox::ole::VbaProject* implCreateVbaProject() const;
+ virtual sal_Bool ImplCreateDocument() SAL_OVERRIDE;
+ virtual sal_Bool ImplCreateMainNotes() SAL_OVERRIDE;
+ virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE;
sal_Bool WriteNotesMaster();
void WriteAnimateTo( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any aValue, const OUString& rAttributeName );
@@ -130,7 +130,7 @@ protected:
private:
void AddLayoutIdAndRelation( ::sax_fastparser::FSHelperPtr pFS, sal_Int32 nLayoutFileId );
- virtual OUString implGetImplementationName() const;
+ virtual OUString implGetImplementationName() const SAL_OVERRIDE;
::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv;
diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx
index 81c45447abe8..9ef08c3f55b4 100644
--- a/sd/source/filter/eppt/escherex.hxx
+++ b/sd/source/filter/eppt/escherex.hxx
@@ -51,8 +51,8 @@ class PptEscherEx : public EscherEx
PptEscherEx( SvStream& rOut, const OUString& );
~PptEscherEx();
- void OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance = 0 );
- void CloseContainer();
+ void OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance = 0 ) SAL_OVERRIDE;
+ void CloseContainer() SAL_OVERRIDE;
sal_uInt32 EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClientData );
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 74d06fe8907f..9cab5ade0780 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -110,9 +110,9 @@ public:
PowerPointShapeExport( FSHelperPtr pFS, ShapeHashMap* pShapeMap, PowerPointExport* pFB );
void SetMaster( sal_Bool bMaster );
void SetPageType( PageType ePageType );
- ShapeExport& WriteNonVisualProperties( Reference< XShape > xShape );
- ShapeExport& WriteTextShape( Reference< XShape > xShape );
- ShapeExport& WriteUnknownShape( Reference< XShape > xShape );
+ ShapeExport& WriteNonVisualProperties( Reference< XShape > xShape ) SAL_OVERRIDE;
+ ShapeExport& WriteTextShape( Reference< XShape > xShape ) SAL_OVERRIDE;
+ ShapeExport& WriteUnknownShape( Reference< XShape > xShape ) SAL_OVERRIDE;
ShapeExport& WritePlaceholderShape( Reference< XShape > xShape, PlaceholderType ePlaceholder );
ShapeExport& WritePageShape( Reference< XShape > xShape, PageType ePageType, sal_Bool bPresObj );
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 61e9fe27f039..bffc54efd364 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -108,7 +108,7 @@ class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper1< com::sun:
sal_uInt16 GetErrorCode() const { return nFilterError; };
virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& )
- throw( com::sun::star::uno::RuntimeException, std::exception );
+ throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
SdGRFFilter_ImplInteractionHdl::~SdGRFFilter_ImplInteractionHdl()
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 44933efc6c58..5d3d4431f714 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -64,33 +64,33 @@ public:
~SdHtmlOptionsDialog();
// XInterface
- virtual void SAL_CALL acquire() throw();
- virtual void SAL_CALL release() throw();
+ virtual void SAL_CALL acquire() throw() SAL_OVERRIDE;
+ virtual void SAL_CALL release() throw() SAL_OVERRIDE;
// XInitialization
- virtual void SAL_CALL initialize( const Sequence< Any > & aArguments ) throw ( Exception, RuntimeException, std::exception );
+ virtual void SAL_CALL initialize( const Sequence< Any > & aArguments ) throw ( Exception, RuntimeException, std::exception ) SAL_OVERRIDE;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw ( RuntimeException, std::exception );
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw ( RuntimeException, std::exception );
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName() throw ( RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw ( RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( RuntimeException, std::exception ) SAL_OVERRIDE;
// XPropertyAccess
- virtual Sequence< PropertyValue > SAL_CALL getPropertyValues() throw ( RuntimeException, std::exception );
+ virtual Sequence< PropertyValue > SAL_CALL getPropertyValues() throw ( RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & aProps )
throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XExecuteDialog
virtual sal_Int16 SAL_CALL execute()
- throw ( com::sun::star::uno::RuntimeException, std::exception );
+ throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setTitle( const OUString& aTitle )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XExporter
virtual void SAL_CALL setSourceDocument( 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 );
+ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
diff --git a/sd/source/filter/html/htmlattr.hxx b/sd/source/filter/html/htmlattr.hxx
index ad6946158ab7..5274632da254 100644
--- a/sd/source/filter/html/htmlattr.hxx
+++ b/sd/source/filter/html/htmlattr.hxx
@@ -34,7 +34,7 @@ public:
SdHtmlAttrPreview( Window* pParent, const ResId& rResId );
~SdHtmlAttrPreview();
- virtual void Paint( const Rectangle& rRect );
+ virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
void SetColors( Color& aBack, Color& aText, Color& aLink,
Color& aVLink, Color& aALink );
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index bb4d01f6c798..1912e007bae8 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -70,7 +70,7 @@ public:
HtmlErrorContext(Window *pWin=0);
~HtmlErrorContext() {};
- virtual bool GetString( sal_uLong nErrId, OUString& rCtxStr );
+ virtual bool GetString( sal_uLong nErrId, OUString& rCtxStr ) SAL_OVERRIDE;
void SetContext( sal_uInt16 nResId, const OUString& rURL );
void SetContext( sal_uInt16 nResId, const OUString& rURL1, const OUString& rURL2 );
diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx
index 92c992ee2292..003699ee6878 100644
--- a/sd/source/filter/ppt/pptin.hxx
+++ b/sd/source/filter/ppt/pptin.hxx
@@ -65,9 +65,9 @@ class ImplSdPPTImport : public SdrPowerPointImport
void FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiveInfoAtom* pIAtom, const OUString& aMacroName );
- virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj );
+ virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) SAL_OVERRIDE;
virtual SdrObject* ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pText, SdPage* pPage,
- SfxStyleSheet*, SfxStyleSheet** ) const;
+ SfxStyleSheet*, SfxStyleSheet** ) const SAL_OVERRIDE;
public:
@@ -78,7 +78,7 @@ public:
~ImplSdPPTImport();
sal_Bool Import();
- virtual bool ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rFormComp ) const;
+ virtual bool ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rFormComp ) const SAL_OVERRIDE;
};
class SdPPTImport