7 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index edde37524594..be5e04189987 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -108,7 +108,7 @@ void SwFldDBPage::Reset(const SfxItemSet*)
     if (!IsFldEdit())
     {
         // initialise TypeListBox
-        const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
+        const SwFldGroupRgn& rRg = SwFldMgr::GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
 
         for(sal_uInt16 i = rRg.nStart; i < rRg.nEnd; ++i)
         {
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index c7d3761069c2..4a54d14bc10c 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -109,7 +109,7 @@ void SwFldDokPage::Reset(const SfxItemSet* )
     Init(); // general initialisation
 
     // initialise TypeListBox
-    const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
+    const SwFldGroupRgn& rRg = SwFldMgr::GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
 
     m_pTypeLB->SetUpdateMode(false);
     m_pTypeLB->Clear();
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index dc0be5131705..17e805442d54 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -107,7 +107,7 @@ SwFldEditDlg::SwFldEditDlg(SwView& rVw)
 
     EnsureSelection(pCurFld, aMgr);
 
-    sal_uInt16 nGroup = aMgr.GetGroup(false, pCurFld->GetTypeId(), pCurFld->GetSubType());
+    sal_uInt16 nGroup = SwFldMgr::GetGroup(false, pCurFld->GetTypeId(), pCurFld->GetSubType());
 
     CreatePage(nGroup);
 
@@ -284,7 +284,7 @@ IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton )
 
     EnsureSelection(pCurFld, rMgr);
 
-    sal_uInt16 nGroup = rMgr.GetGroup(false, pCurFld->GetTypeId(), pCurFld->GetSubType());
+    sal_uInt16 nGroup = SwFldMgr::GetGroup(false, pCurFld->GetTypeId(), pCurFld->GetSubType());
 
     if (nGroup != pTabPage->GetGroup())
         pTabPage = static_cast<SwFldPage*>(CreatePage(nGroup).get());
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 967ce6d8a7b5..1be9660cbb3c 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -137,7 +137,7 @@ void SwFldFuncPage::Reset(const SfxItemSet* )
     if (!IsFldEdit())
     {
         // initialise TypeListBox
-        const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
+        const SwFldGroupRgn& rRg = SwFldMgr::GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
 
         // fill Typ-Listbox
         for(sal_uInt16 i = rRg.nStart; i < rRg.nEnd; ++i)
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index fefc9db21ac4..01963e2ed2be 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -77,7 +77,7 @@ class SwFldFuncPage : public SwFldPage
     DECL_LINK( MacroHdl, Button * );
 
     void                UpdateSubType();
-    OUString            TurnMacroString(const OUString &rMacro);
+    static OUString     TurnMacroString(const OUString &rMacro);
 
 protected:
     virtual sal_uInt16      GetGroup() SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index f704afcf1bd3..e03f5db0d3b3 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -176,7 +176,7 @@ void SwFldRefPage::Reset(const SfxItemSet* )
 
     sal_Int32 nPos;
     // set/insert reference
-    const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
+    const SwFldGroupRgn& rRg = SwFldMgr::GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
 
     for (short i = rRg.nStart; i < rRg.nEnd; ++i)
     {
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 27c60f81e1f9..f4b783cc2ae6 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -126,7 +126,7 @@ void SwFldVarPage::Reset(const SfxItemSet* )
     if (!IsFldEdit())
     {
         // initialise TypeListBox
-        const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
+        const SwFldGroupRgn& rRg = SwFldMgr::GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
 
         for (short i = rRg.nStart; i < rRg.nEnd; ++i)
         {