summaryrefslogtreecommitdiff
path: root/sw/source/ui/dialog/swdlgfact.hxx
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 /sw/source/ui/dialog/swdlgfact.hxx
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 'sw/source/ui/dialog/swdlgfact.hxx')
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx304
1 files changed, 152 insertions, 152 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 55a3bdb60ff8..8654412509ac 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -54,7 +54,7 @@ public: \
: pDlg(p) \
{} \
virtual ~Class(); \
- virtual short Execute() ;
+ virtual short Execute() SAL_OVERRIDE ;
#define IMPL_ABSTDLG_BASE(Class) \
Class::~Class() \
@@ -70,30 +70,30 @@ class SwWordCountFloatDlg;
class AbstractSwWordCountFloatDlg_Impl : public AbstractSwWordCountFloatDlg
{
DECL_ABSTDLG_BASE(AbstractSwWordCountFloatDlg_Impl,SwWordCountFloatDlg)
- virtual void UpdateCounts();
- virtual void SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat);
- virtual Window * GetWindow(); //this method is added for return a Window type pointer
+ virtual void UpdateCounts() SAL_OVERRIDE;
+ virtual void SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat) SAL_OVERRIDE;
+ virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer
};
class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg
{
DECL_ABSTDLG_BASE(AbstractSwInsertAbstractDlg_Impl,SwInsertAbstractDlg)
- virtual sal_uInt8 GetLevel() const ;
- virtual sal_uInt8 GetPara() const ;
+ virtual sal_uInt8 GetLevel() const SAL_OVERRIDE ;
+ virtual sal_uInt8 GetPara() const SAL_OVERRIDE ;
};
class SwAbstractSfxDialog_Impl :public SfxAbstractDialog
{
DECL_ABSTDLG_BASE(SwAbstractSfxDialog_Impl,SfxModalDialog)
- virtual const SfxItemSet* GetOutputItemSet() const;
- virtual void SetText( const OUString& rStr );
- virtual OUString GetText() const;
+ virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE;
+ virtual void SetText( const OUString& rStr ) SAL_OVERRIDE;
+ virtual OUString GetText() const SAL_OVERRIDE;
};
class AbstractSwAsciiFilterDlg_Impl : public AbstractSwAsciiFilterDlg
{
DECL_ABSTDLG_BASE( AbstractSwAsciiFilterDlg_Impl,SwAsciiFilterDlg )
- virtual void FillOptions( SwAsciiOptions& rOptions );
+ virtual void FillOptions( SwAsciiOptions& rOptions ) SAL_OVERRIDE;
};
@@ -105,28 +105,28 @@ class VclAbstractDialog_Impl : public VclAbstractDialog
class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg
{
DECL_ABSTDLG_BASE(AbstractSwBreakDlg_Impl,SwBreakDlg)
- virtual OUString GetTemplateName();
- virtual sal_uInt16 GetKind();
- virtual ::boost::optional<sal_uInt16> GetPageNumber();
+ virtual OUString GetTemplateName() SAL_OVERRIDE;
+ virtual sal_uInt16 GetKind() SAL_OVERRIDE;
+ virtual ::boost::optional<sal_uInt16> GetPageNumber() SAL_OVERRIDE;
};
class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for
{
DECL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl, SwSplitTblDlg)
- virtual sal_uInt16 GetSplitMode();
+ virtual sal_uInt16 GetSplitMode() SAL_OVERRIDE;
};
class AbstractTabDialog_Impl : virtual public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
- virtual void SetCurPageId( sal_uInt16 nId );
- virtual void SetCurPageId( const OString &rName );
- virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
- virtual void SetInputSet( const SfxItemSet* pInSet );
+ virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE;
+ virtual void SetCurPageId( const OString &rName ) SAL_OVERRIDE;
+ virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE;
+ virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE;
+ virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE;
//From class Window.
- virtual void SetText( const OUString& rStr );
- virtual OUString GetText() const;
+ virtual void SetText( const OUString& rStr ) SAL_OVERRIDE;
+ virtual OUString GetText() const SAL_OVERRIDE;
};
class AbstractApplyTabDialog_Impl : public AbstractTabDialog_Impl, virtual public SfxAbstractApplyTabDialog
@@ -139,14 +139,14 @@ public:
DECL_LINK(ApplyHdl, void*);
private:
Link m_aHandler;
- virtual void SetApplyHdl( const Link& rLink );
+ virtual void SetApplyHdl( const Link& rLink ) SAL_OVERRIDE;
};
class AbstractSwConvertTableDlg_Impl : public AbstractSwConvertTableDlg
{
DECL_ABSTDLG_BASE( AbstractSwConvertTableDlg_Impl,SwConvertTableDlg)
virtual void GetValues( sal_Unicode& rDelim,SwInsertTableOptions& rInsTblFlags,
- SwTableAutoFmt const*& prTAFmt);
+ SwTableAutoFmt const*& prTAFmt) SAL_OVERRIDE;
};
class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPilot
@@ -155,85 +155,85 @@ class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPil
virtual void DataToDoc( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection,
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource,
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection,
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet);
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet) SAL_OVERRIDE;
};
class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog
{
DECL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl, sw::DropDownFieldDialog)
- virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const; //this method inherit from SystemWindow
- virtual void SetWindowState( const OString& rStr );//this method inherit from SystemWindow
+ virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const SAL_OVERRIDE; //this method inherit from SystemWindow
+ virtual void SetWindowState( const OString& rStr ) SAL_OVERRIDE;//this method inherit from SystemWindow
};
class AbstractSwLabDlg_Impl : public AbstractSwLabDlg
{
DECL_ABSTDLG_BASE(AbstractSwLabDlg_Impl,SwLabDlg)
- virtual void SetCurPageId( sal_uInt16 nId );
- virtual void SetCurPageId( const OString &rName );
- virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
- virtual void SetInputSet( const SfxItemSet* pInSet );
+ virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE;
+ virtual void SetCurPageId( const OString &rName ) SAL_OVERRIDE;
+ virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE;
+ virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE;
+ virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE;
//From class Window.
- virtual void SetText( const OUString& rStr );
- virtual OUString GetText() const;
- virtual const OUString& GetBusinessCardStr() const;
- virtual Printer *GetPrt();
+ virtual void SetText( const OUString& rStr ) SAL_OVERRIDE;
+ virtual OUString GetText() const SAL_OVERRIDE;
+ virtual const OUString& GetBusinessCardStr() const SAL_OVERRIDE;
+ virtual Printer *GetPrt() SAL_OVERRIDE;
};
class AbstractSwSelGlossaryDlg_Impl : public AbstractSwSelGlossaryDlg
{
DECL_ABSTDLG_BASE(AbstractSwSelGlossaryDlg_Impl,SwSelGlossaryDlg)
- virtual void InsertGlos(const OUString &rRegion, const OUString &rGlosName); // inline
- virtual sal_uInt16 GetSelectedIdx() const; // inline
- virtual void SelectEntryPos(sal_uInt16 nIdx); // inline
+ virtual void InsertGlos(const OUString &rRegion, const OUString &rGlosName) SAL_OVERRIDE; // inline
+ virtual sal_uInt16 GetSelectedIdx() const SAL_OVERRIDE; // inline
+ virtual void SelectEntryPos(sal_uInt16 nIdx) SAL_OVERRIDE; // inline
};
class AbstractSwAutoFormatDlg_Impl : public AbstractSwAutoFormatDlg
{
DECL_ABSTDLG_BASE(AbstractSwAutoFormatDlg_Impl,SwAutoFormatDlg )
- virtual void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const;
+ virtual void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const SAL_OVERRIDE;
};
class AbstractSwFldDlg_Impl : public AbstractSwFldDlg
{
DECL_ABSTDLG_BASE(AbstractSwFldDlg_Impl,SwFldDlg )
- virtual void SetCurPageId( sal_uInt16 nId );
- virtual void SetCurPageId( const OString &rName );
- virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
- virtual void SetInputSet( const SfxItemSet* pInSet );
+ virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE;
+ virtual void SetCurPageId( const OString &rName ) SAL_OVERRIDE;
+ virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE;
+ virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE;
+ virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE;
//From class Window.
- virtual void SetText( const OUString& rStr );
- virtual OUString GetText() const;
- virtual void Start( sal_Bool bShow = sal_True ); //this method from SfxTabDialog
- virtual void ShowReferencePage();
- virtual void Initialize(SfxChildWinInfo *pInfo);
- virtual void ReInitDlg();
- virtual void ActivateDatabasePage();
- virtual Window * GetWindow(); //this method is added for return a Window type pointer
+ virtual void SetText( const OUString& rStr ) SAL_OVERRIDE;
+ virtual OUString GetText() const SAL_OVERRIDE;
+ virtual void Start( sal_Bool bShow = sal_True ) SAL_OVERRIDE; //this method from SfxTabDialog
+ virtual void ShowReferencePage() SAL_OVERRIDE;
+ virtual void Initialize(SfxChildWinInfo *pInfo) SAL_OVERRIDE;
+ virtual void ReInitDlg() SAL_OVERRIDE;
+ virtual void ActivateDatabasePage() SAL_OVERRIDE;
+ virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer
};
class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg
{
DECL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl,SwRenameXNamedDlg )
- virtual void SetForbiddenChars( const OUString& rSet );
+ virtual void SetForbiddenChars( const OUString& rSet ) SAL_OVERRIDE;
virtual void SetAlternativeAccess(
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird );
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird ) SAL_OVERRIDE;
};
class AbstractSwModalRedlineAcceptDlg_Impl : public AbstractSwModalRedlineAcceptDlg
{
DECL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl,SwModalRedlineAcceptDlg )
- virtual void AcceptAll( sal_Bool bAccept );
+ virtual void AcceptAll( sal_Bool bAccept ) SAL_OVERRIDE;
};
class SwGlossaryDlg;
class AbstractGlossaryDlg_Impl : public AbstractGlossaryDlg
{
DECL_ABSTDLG_BASE(AbstractGlossaryDlg_Impl,SwGlossaryDlg)
- virtual OUString GetCurrGrpName() const;
- virtual OUString GetCurrShortName() const;
+ virtual OUString GetCurrGrpName() const SAL_OVERRIDE;
+ virtual OUString GetCurrShortName() const SAL_OVERRIDE;
};
class SwFldInputDlg;
@@ -241,21 +241,21 @@ class AbstractFldInputDlg_Impl : public AbstractFldInputDlg
{
DECL_ABSTDLG_BASE(AbstractFldInputDlg_Impl,SwFldInputDlg)
//from class SalFrame
- virtual void SetWindowState( const OString & rStr ) ;
- virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const ;
- virtual void EndDialog(long);
+ virtual void SetWindowState( const OString & rStr ) SAL_OVERRIDE ;
+ virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const SAL_OVERRIDE ;
+ virtual void EndDialog(long) SAL_OVERRIDE;
};
class SwInsFootNoteDlg;
class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg
{
DECL_ABSTDLG_BASE(AbstractInsFootNoteDlg_Impl,SwInsFootNoteDlg)
- virtual OUString GetFontName();
- virtual sal_Bool IsEndNote();
- virtual OUString GetStr();
+ virtual OUString GetFontName() SAL_OVERRIDE;
+ virtual sal_Bool IsEndNote() SAL_OVERRIDE;
+ virtual OUString GetStr() SAL_OVERRIDE;
//from class Window
- virtual void SetHelpId( const OString& sHelpId );
- virtual void SetText( const OUString& rStr );
+ virtual void SetHelpId( const OString& sHelpId ) SAL_OVERRIDE;
+ virtual void SetText( const OUString& rStr ) SAL_OVERRIDE;
};
class SwInsTableDlg;
@@ -264,87 +264,87 @@ class AbstractInsTableDlg_Impl : public AbstractInsTableDlg
DECL_ABSTDLG_BASE(AbstractInsTableDlg_Impl,SwInsTableDlg)
virtual void GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol,
SwInsertTableOptions& rInsTblFlags, OUString& rTableAutoFmtName,
- SwTableAutoFmt *& prTAFmt );
+ SwTableAutoFmt *& prTAFmt ) SAL_OVERRIDE;
};
class SwJavaEditDialog;
class AbstractJavaEditDialog_Impl : public AbstractJavaEditDialog
{
DECL_ABSTDLG_BASE(AbstractJavaEditDialog_Impl,SwJavaEditDialog)
- virtual OUString GetScriptText() const;
- virtual OUString GetScriptType() const;
- virtual sal_Bool IsUrl() const;
- virtual sal_Bool IsNew() const;
- virtual bool IsUpdate() const;
+ virtual OUString GetScriptText() const SAL_OVERRIDE;
+ virtual OUString GetScriptType() const SAL_OVERRIDE;
+ virtual sal_Bool IsUrl() const SAL_OVERRIDE;
+ virtual sal_Bool IsNew() const SAL_OVERRIDE;
+ virtual bool IsUpdate() const SAL_OVERRIDE;
};
class SwMailMergeDlg;
class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg
{
DECL_ABSTDLG_BASE(AbstractMailMergeDlg_Impl,SwMailMergeDlg)
- virtual sal_uInt16 GetMergeType() ;
- virtual const OUString& GetSaveFilter() const;
- virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const ;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const;
- virtual bool IsSaveIndividualDocs() const;
- virtual bool IsGenerateFromDataBase() const;
- virtual OUString GetColumnName() const;
- virtual OUString GetPath() const;
+ virtual sal_uInt16 GetMergeType() SAL_OVERRIDE ;
+ virtual const OUString& GetSaveFilter() const SAL_OVERRIDE;
+ virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const SAL_OVERRIDE ;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const SAL_OVERRIDE;
+ virtual bool IsSaveIndividualDocs() const SAL_OVERRIDE;
+ virtual bool IsGenerateFromDataBase() const SAL_OVERRIDE;
+ virtual OUString GetColumnName() const SAL_OVERRIDE;
+ virtual OUString GetPath() const SAL_OVERRIDE;
};
class SwMailMergeCreateFromDlg;
class AbstractMailMergeCreateFromDlg_Impl : public AbstractMailMergeCreateFromDlg
{
DECL_ABSTDLG_BASE(AbstractMailMergeCreateFromDlg_Impl,SwMailMergeCreateFromDlg)
- virtual sal_Bool IsThisDocument() const ;
+ virtual sal_Bool IsThisDocument() const SAL_OVERRIDE ;
};
class SwMailMergeFieldConnectionsDlg;
class AbstractMailMergeFieldConnectionsDlg_Impl : public AbstractMailMergeFieldConnectionsDlg
{
DECL_ABSTDLG_BASE(AbstractMailMergeFieldConnectionsDlg_Impl,SwMailMergeFieldConnectionsDlg)
- virtual sal_Bool IsUseExistingConnections() const ;
+ virtual sal_Bool IsUseExistingConnections() const SAL_OVERRIDE ;
};
class SwMultiTOXTabDialog;
class AbstractMultiTOXTabDialog_Impl : public AbstractMultiTOXTabDialog
{
DECL_ABSTDLG_BASE(AbstractMultiTOXTabDialog_Impl,SwMultiTOXTabDialog)
- virtual SwForm* GetForm(CurTOXType eType);
- virtual CurTOXType GetCurrentTOXType() const ;
- virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes);
+ virtual SwForm* GetForm(CurTOXType eType) SAL_OVERRIDE;
+ virtual CurTOXType GetCurrentTOXType() const SAL_OVERRIDE ;
+ virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes) SAL_OVERRIDE;
//from SfxTabDialog
- virtual const SfxItemSet* GetOutputItemSet() const;
+ virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE;
};
class SwEditRegionDlg;
class AbstractEditRegionDlg_Impl : public AbstractEditRegionDlg
{
DECL_ABSTDLG_BASE(AbstractEditRegionDlg_Impl,SwEditRegionDlg)
- virtual void SelectSection(const OUString& rSectionName);
+ virtual void SelectSection(const OUString& rSectionName) SAL_OVERRIDE;
};
class SwInsertSectionTabDialog;
class AbstractInsertSectionTabDialog_Impl : public AbstractInsertSectionTabDialog
{
DECL_ABSTDLG_BASE(AbstractInsertSectionTabDialog_Impl,SwInsertSectionTabDialog)
- virtual void SetSectionData(SwSectionData const& rSect);
+ virtual void SetSectionData(SwSectionData const& rSect) SAL_OVERRIDE;
};
class SwIndexMarkFloatDlg;
class AbstractIndexMarkFloatDlg_Impl : public AbstractMarkFloatDlg
{
DECL_ABSTDLG_BASE(AbstractIndexMarkFloatDlg_Impl,SwIndexMarkFloatDlg)
- virtual void ReInitDlg(SwWrtShell& rWrtShell);
- virtual Window * GetWindow(); //this method is added for return a Window type pointer
+ virtual void ReInitDlg(SwWrtShell& rWrtShell) SAL_OVERRIDE;
+ virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer
};
class SwAuthMarkFloatDlg;
class AbstractAuthMarkFloatDlg_Impl : public AbstractMarkFloatDlg
{
DECL_ABSTDLG_BASE(AbstractAuthMarkFloatDlg_Impl,SwAuthMarkFloatDlg)
- virtual void ReInitDlg(SwWrtShell& rWrtShell);
- virtual Window * GetWindow(); //this method is added for return a Window type pointer
+ virtual void ReInitDlg(SwWrtShell& rWrtShell) SAL_OVERRIDE;
+ virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer
};
class SwMailMergeWizard;
@@ -359,13 +359,13 @@ public:
: pDlg(p)
{}
virtual ~AbstractMailMergeWizard_Impl();
- virtual void StartExecuteModal( const Link& rEndDialogHdl );
- virtual long GetResult();
+ virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE;
+ virtual long GetResult() SAL_OVERRIDE;
- virtual void SetReloadDocument(const OUString& rURL);
- virtual OUString GetReloadDocument() const;
- virtual sal_Bool ShowPage( sal_uInt16 nLevel );
- virtual sal_uInt16 GetRestartPage() const;
+ virtual void SetReloadDocument(const OUString& rURL) SAL_OVERRIDE;
+ virtual OUString GetReloadDocument() const SAL_OVERRIDE;
+ virtual sal_Bool ShowPage( sal_uInt16 nLevel ) SAL_OVERRIDE;
+ virtual sal_uInt16 GetRestartPage() const SAL_OVERRIDE;
};
//AbstractDialogFactory_Impl implementations
@@ -379,134 +379,134 @@ public:
const SfxItemSet& rAttr,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame,
sal_uInt32 nResId
- );
+ ) SAL_OVERRIDE;
virtual AbstractSwWordCountFloatDlg* CreateSwWordCountDialog(SfxBindings* pBindings,
- SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo);
- virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent);
+ SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo) SAL_OVERRIDE;
+ virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent) SAL_OVERRIDE;
virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh,
- SvStream* pStream );
- virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId );
- virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh);
- virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw);
+ SvStream* pStream ) SAL_OVERRIDE;
+ virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) SAL_OVERRIDE;
+ virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE;
+ virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) SAL_OVERRIDE;
virtual SfxAbstractTabDialog * CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet,
- sal_uInt8 nDialogMode, const OUString* pFmtStr = 0);
- virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable);
- virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId);
+ sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) SAL_OVERRIDE;
+ virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) SAL_OVERRIDE;
+ virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) SAL_OVERRIDE;
virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView,
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource,
com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier> xColSupp,
- const SwDBData& rData);
- virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh);
+ const SwDBData& rData) SAL_OVERRIDE;
+ virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE;
virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog (Window *pParent, SwWrtShell &rSh,
- SwField* pField, sal_Bool bNextButton = sal_False);
- virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert );
+ SwField* pField, sal_Bool bNextButton = sal_False) SAL_OVERRIDE;
+ virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ) SAL_OVERRIDE;
virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet,
- SwNewDBMgr* pNewDBMgr, bool bLabel);
+ SwNewDBMgr* pNewDBMgr, bool bLabel) SAL_OVERRIDE;
- virtual SwLabDlgMethod GetSwLabDlgStaticMethod ();
+ virtual SwLabDlgMethod GetSwLabDlgStaticMethod () SAL_OVERRIDE;
virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent,
SwView& rVw,
const SfxItemSet& rCoreSet,
sal_uInt8 nDialogMode,
const OUString *pCollName = 0,
sal_Bool bDraw = sal_False,
- const OString& sDefPage = OString() );
+ const OString& sDefPage = OString() ) SAL_OVERRIDE;
- virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName);
- virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId );
- virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh );
+ virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName) SAL_OVERRIDE;
+ virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ) SAL_OVERRIDE;
+ virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ) SAL_OVERRIDE;
virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell,
sal_Bool bSetAutoFmt = sal_True,
- const SwTableAutoFmt* pSelFmt = 0 );
- virtual SfxAbstractDialog * CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId );
+ const SwTableAutoFmt* pSelFmt = 0 ) SAL_OVERRIDE;
+ virtual SfxAbstractDialog * CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) SAL_OVERRIDE;
- virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId );
- virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc);
+ virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ) SAL_OVERRIDE;
+ virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) SAL_OVERRIDE;
virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool,
- const SfxItemSet* pItemSet, SwWrtShell* pSh);
- virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent);
- virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId );
+ const SfxItemSet* pItemSet, SwWrtShell* pSh) SAL_OVERRIDE;
+ virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) SAL_OVERRIDE;
+ virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) SAL_OVERRIDE;
virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(Window* pParent,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess);
- virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent);
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) SAL_OVERRIDE;
+ virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent) SAL_OVERRIDE;
- virtual VclAbstractDialog* CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev);
+ virtual VclAbstractDialog* CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev) SAL_OVERRIDE;
virtual SfxAbstractTabDialog* CreateFrmTabDialog( const OString &rDialogType,
SfxViewFrame *pFrame, Window *pParent,
const SfxItemSet& rCoreSet,
bool bNewFrm = true,
bool bFmt = false,
const OString& sDefPage = OString(),
- const OUString* pFmtStr = 0);
+ const OUString* pFmtStr = 0) SAL_OVERRIDE;
virtual SfxAbstractApplyTabDialog* CreateTemplateDialog(
Window* pParent,
SfxStyleSheetBase& rBase,
sal_uInt16 nRegion,
const OString& sPage = OString(),
SwWrtShell* pActShell = 0,
- bool bNew = false);
+ bool bNew = false) SAL_OVERRIDE;
virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
- SwWrtShell *pWrtShell);
+ SwWrtShell *pWrtShell) SAL_OVERRIDE;
virtual AbstractFldInputDlg* CreateFldInputDlg(Window *pParent,
- SwWrtShell &rSh, SwField* pField, bool bNextButton = false);
+ SwWrtShell &rSh, SwField* pField, bool bNextButton = false) SAL_OVERRIDE;
virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg(
- Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False);
- virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent );
- virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView);
- virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView);
+ Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False) SAL_OVERRIDE;
+ virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent ) SAL_OVERRIDE;
+ virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView) SAL_OVERRIDE;
+ virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView) SAL_OVERRIDE;
virtual AbstractJavaEditDialog* CreateJavaEditDialog(Window* pParent,
- SwWrtShell* pWrtSh);
+ SwWrtShell* pWrtSh) SAL_OVERRIDE;
virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId,
Window* pParent, SwWrtShell& rSh,
const OUString& rSourceName,
const OUString& rTblName,
sal_Int32 nCommandType,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 );
- virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(Window* pParent);
- virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent);
- virtual VclAbstractDialog* CreateMultiTOXMarkDlg(Window* pParent, SwTOXMgr &rTOXMgr);
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) SAL_OVERRIDE;
+ virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(Window* pParent) SAL_OVERRIDE;
+ virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent) SAL_OVERRIDE;
+ virtual VclAbstractDialog* CreateMultiTOXMarkDlg(Window* pParent, SwTOXMgr &rTOXMgr) SAL_OVERRIDE;
virtual SfxAbstractTabDialog* CreateSwTabDialog( int nResId,
Window* pParent,
const SfxItemSet* pSwItemSet,
- SwWrtShell &);
+ SwWrtShell &) SAL_OVERRIDE;
virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog(
Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX,
- sal_Bool bGlobal = sal_False);
- virtual AbstractEditRegionDlg* CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh);
+ sal_Bool bGlobal = sal_False) SAL_OVERRIDE;
+ virtual AbstractEditRegionDlg* CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) SAL_OVERRIDE;
virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog(
- Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh);
+ Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) SAL_OVERRIDE;
virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg(
SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
- sal_Bool bNew=sal_True);
+ sal_Bool bNew=sal_True) SAL_OVERRIDE;
virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg(
SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
- sal_Bool bNew=sal_True);
+ sal_Bool bNew=sal_True) SAL_OVERRIDE;
virtual VclAbstractDialog * CreateIndexMarkModalDlg(
- Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark );
+ Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) SAL_OVERRIDE;
- virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem);
+ virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem) SAL_OVERRIDE;
- virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc();
- virtual GlossarySetActGroup SetGlossaryActGroupFunc();
+ virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc() SAL_OVERRIDE;
+ virtual GlossarySetActGroup SetGlossaryActGroupFunc() SAL_OVERRIDE;
// For TabPage
- virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId );
+ virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) SAL_OVERRIDE;
- virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId );
+ virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) SAL_OVERRIDE;
};