summaryrefslogtreecommitdiff
path: root/sw/source/ui/fldui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/fldui')
-rw-r--r--sw/source/ui/fldui/flddb.cxx2
-rw-r--r--sw/source/ui/fldui/flddb.hxx2
-rw-r--r--sw/source/ui/fldui/flddinf.cxx2
-rw-r--r--sw/source/ui/fldui/flddinf.hxx2
-rw-r--r--sw/source/ui/fldui/flddok.cxx2
-rw-r--r--sw/source/ui/fldui/flddok.hxx2
-rw-r--r--sw/source/ui/fldui/fldedt.cxx4
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx2
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx2
-rw-r--r--sw/source/ui/fldui/fldref.cxx2
-rw-r--r--sw/source/ui/fldui/fldref.hxx2
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx2
-rw-r--r--sw/source/ui/fldui/fldvar.cxx2
-rw-r--r--sw/source/ui/fldui/fldvar.hxx2
14 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 935403bbc76d..a302e4e8ec0b 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -178,7 +178,7 @@ void SwFldDBPage::Reset(const SfxItemSet&)
}
}
-bool SwFldDBPage::FillItemSet(SfxItemSet& )
+bool SwFldDBPage::FillItemSet(SfxItemSet* )
{
OUString sTableName;
OUString sColumnName;
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 4f2bf1ba6eed..90e5311965d4 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -74,7 +74,7 @@ public:
static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 5e18019f02e4..279dfab73df2 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -414,7 +414,7 @@ sal_Int32 SwFldDokInfPage::FillSelectionLB(sal_uInt16 nSubType)
return nSize;
}
-bool SwFldDokInfPage::FillItemSet(SfxItemSet& )
+bool SwFldDokInfPage::FillItemSet(SfxItemSet* )
{
if (!pSelEntry || (sal_uInt16)(sal_uLong)pSelEntry->GetUserData() == USHRT_MAX)
return false;
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index 24ba93b89c9b..50e49f92aacc 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -65,7 +65,7 @@ public:
static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 7b265d170c1d..ab0c365b943b 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -540,7 +540,7 @@ IMPL_LINK_NOARG(SwFldDokPage, FormatHdl)
return 0;
}
-bool SwFldDokPage::FillItemSet(SfxItemSet& )
+bool SwFldDokPage::FillItemSet(SfxItemSet* )
{
sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index 4af41fdfe6d3..9e549b77d9eb 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -67,7 +67,7 @@ public:
static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 54b938b48f7c..c69391281622 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -219,7 +219,7 @@ IMPL_LINK_NOARG(SwFldEditDlg, OKHdl)
SfxTabPage* pTabPage = GetTabPage();
if (pTabPage)
{
- pTabPage->FillItemSet(*(SfxItemSet*)0);
+ pTabPage->FillItemSet(0);
}
EndDialog( RET_OK );
@@ -247,7 +247,7 @@ IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton )
//#112462# FillItemSet may delete the current field
//that's why it has to be called before accessing the current field
if( GetOKButton()->IsEnabled() )
- pTabPage->FillItemSet(*(SfxItemSet*)0);
+ pTabPage->FillItemSet(0);
SwFldMgr& rMgr = pTabPage->GetFldMgr();
SwField *pCurFld = rMgr.GetCurFld();
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 00a37dac4419..868d72fe6629 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -510,7 +510,7 @@ IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn )
return 0;
}
-bool SwFldFuncPage::FillItemSet(SfxItemSet& )
+bool SwFldFuncPage::FillItemSet(SfxItemSet* )
{
const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 434f884172c1..434999ebae54 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -89,7 +89,7 @@ public:
static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 65aa5df431b5..c1ebf3494478 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -756,7 +756,7 @@ IMPL_LINK_NOARG(SwFldRefPage, ModifyHdl)
return 0;
}
-bool SwFldRefPage::FillItemSet(SfxItemSet& )
+bool SwFldRefPage::FillItemSet(SfxItemSet* )
{
bool bModified = false;
sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index a8102aa544d0..cb4ac98a8dfb 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -80,7 +80,7 @@ public:
static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index fe6829a999d5..536f0fee99bb 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -185,7 +185,7 @@ IMPL_LINK_NOARG(SwFldDlg, OKHdl)
if (GetOKButton().IsEnabled())
{
SfxTabPage* pPage = GetTabPage(GetCurPageId());
- pPage->FillItemSet(*(SfxItemSet*)0);
+ pPage->FillItemSet(0);
GetOKButton().GrabFocus(); // because of InputField-Dlg
}
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 1079a22bb483..f392afc0b88d 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -1089,7 +1089,7 @@ IMPL_LINK_NOARG(SwFldVarPage, SeparatorHdl)
return 0;
}
-bool SwFldVarPage::FillItemSet(SfxItemSet& )
+bool SwFldVarPage::FillItemSet(SfxItemSet* )
{
const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index ab4222e4245b..203882935813 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -96,7 +96,7 @@ public:
static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;