summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/inc/column.hxx2
-rw-r--r--sw/source/uibase/inc/drpcps.hxx2
-rw-r--r--sw/source/uibase/inc/envlop.hxx2
-rw-r--r--sw/source/uibase/inc/frmpage.hxx4
-rw-r--r--sw/source/uibase/inc/num.hxx2
-rw-r--r--sw/source/uibase/inc/outline.hxx2
-rw-r--r--sw/source/uibase/inc/pgfnote.hxx2
-rw-r--r--sw/source/uibase/inc/pggrid.hxx2
-rw-r--r--sw/source/uibase/inc/swuiccoll.hxx2
-rw-r--r--sw/source/uibase/inc/swuicnttab.hxx6
-rw-r--r--sw/source/uibase/inc/wrap.hxx2
-rw-r--r--sw/source/uibase/table/tablepg.hxx4
12 files changed, 16 insertions, 16 deletions
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index 5ff460d8962d..d5efa31c7e59 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -161,7 +161,7 @@ class SwColumnPage : public SfxTabPage
using SfxTabPage::DeactivatePage;
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet);
diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx
index da73ac61c573..f24a6051f4b3 100644
--- a/sw/source/uibase/inc/drpcps.hxx
+++ b/sw/source/uibase/inc/drpcps.hxx
@@ -69,7 +69,7 @@ friend class SwDropCapsPict;
SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet);
virtual ~SwDropCapsPage();
- virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
void FillSet( SfxItemSet &rSet );
DECL_LINK(ClickHdl, void *);
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index 466ca759f26c..1cbd63545850 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.hxx
@@ -108,7 +108,7 @@ public:
static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
void FillItem(SwEnvItem& rItem);
virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index 88099079a5bc..6d5ab8e198ee 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -128,7 +128,7 @@ class SwFrmPage: public SfxTabPage
bool m_bIsMathBaselineAlignment;
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
DECL_LINK(RangeModifyHdl, void *);
DECL_LINK(AnchorTypeHdl, void *);
@@ -237,7 +237,7 @@ public:
virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
};
class SwFrmURLPage : public SfxTabPage
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index 91ed4d39929b..ad1a9cdc0f22 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.hxx
@@ -119,7 +119,7 @@ public:
virtual ~SwNumPositionTabPage();
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index 1581918966bf..0e1d24f4315e 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -125,7 +125,7 @@ public:
void SetWrtShell(SwWrtShell* pShell);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx
index 6d37616473a2..a1ab9bf6df1a 100644
--- a/sw/source/uibase/inc/pgfnote.hxx
+++ b/sw/source/uibase/inc/pgfnote.hxx
@@ -67,7 +67,7 @@ private:
using SfxTabPage::DeactivatePage;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
};
diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx
index 92a5d333c55a..62144bcbe8bd 100644
--- a/sw/source/uibase/inc/pggrid.hxx
+++ b/sw/source/uibase/inc/pggrid.hxx
@@ -91,7 +91,7 @@ public:
virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx
index b4bcbcf1ad7b..fc903b33627f 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.hxx
@@ -50,7 +50,7 @@ class SwCondCollPage : public SfxTabPage
SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet);
virtual ~SwCondCollPage();
- virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
DECL_LINK( OnOffHdl, CheckBox* );
DECL_LINK( AssignRemoveHdl, PushButton*);
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 3a230b940bc5..41f57750c17a 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -226,7 +226,7 @@ public:
virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
@@ -438,7 +438,7 @@ public:
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
@@ -485,7 +485,7 @@ public:
virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx
index 20b162e8cfd4..cd69f5ca98d3 100644
--- a/sw/source/uibase/inc/wrap.hxx
+++ b/sw/source/uibase/inc/wrap.hxx
@@ -85,7 +85,7 @@ class SwWrapTabPage: public SfxTabPage
void ApplyImageList();
void EnableModes(const SfxItemSet& rSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
DECL_LINK( RangeModifyHdl, MetricField * );
diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx
index f89d66e7bb14..cfc07cfacaa7 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -86,7 +86,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
};
// TabPage Format/Table/Columns
@@ -136,7 +136,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
};
generated by cgit (git 2.34.1) at 2024-08-16 13:07:17 +0000