summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx2
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx2
-rw-r--r--sw/source/ui/fldui/flddb.cxx2
-rw-r--r--sw/source/ui/fldui/flddok.cxx2
-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/fldvar.cxx2
-rw-r--r--sw/source/ui/vba/vbaparagraphformat.hxx10
-rw-r--r--sw/source/ui/vba/vbatablehelper.cxx4
-rw-r--r--sw/source/ui/vba/vbatablehelper.hxx6
12 files changed, 20 insertions, 20 deletions
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 7a053dadc51b..774fcada0506 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -96,7 +96,7 @@ class SwDropCapsPict : public Control
Size CalcTextSize();
inline void InitPrinter();
void _InitPrinter();
- void GetFontSettings( const SwDropCapsPage& _rPage, vcl::Font& _rFont, sal_uInt16 _nWhich );
+ static void GetFontSettings( const SwDropCapsPage& _rPage, vcl::Font& _rFont, sal_uInt16 _nWhich );
void GetFirstScriptSegment(sal_Int32 &start, sal_Int32 &end, sal_uInt16 &scriptType);
bool GetNextScriptSegment(size_t &nIdx, sal_Int32 &start, sal_Int32 &end, sal_uInt16 &scriptType);
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index ff483c39a3c4..636ba4babb56 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -299,7 +299,7 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,
SwDBManager* pDBManager = rSh.GetDBManager();
if(_xConnection.is())
- pDBManager->GetColumnNames(m_pAddressFldLB, _xConnection, rTblName);
+ SwDBManager::GetColumnNames(m_pAddressFldLB, _xConnection, rTblName);
else
pDBManager->GetColumnNames(m_pAddressFldLB, rSourceName, rTblName);
for(sal_Int32 nEntry = 0; nEntry < m_pAddressFldLB->GetEntryCount(); ++nEntry)
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)
{
diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx
index 3911e05ad967..eb799f7810f8 100644
--- a/sw/source/ui/vba/vbaparagraphformat.hxx
+++ b/sw/source/ui/vba/vbaparagraphformat.hxx
@@ -34,13 +34,13 @@ private:
css::uno::Reference< css::beans::XPropertySet > mxParaProps;
private:
- css::style::LineSpacing getOOoLineSpacing( float _lineSpace, sal_Int16 mode );
+ static css::style::LineSpacing getOOoLineSpacing( float _lineSpace, sal_Int16 mode );
css::style::LineSpacing getOOoLineSpacingFromRule( sal_Int32 _linespacingrule );
- float getMSWordLineSpacing( css::style::LineSpacing& rLineSpacing );
- sal_Int32 getMSWordLineSpacingRule( css::style::LineSpacing& rLineSpacing );
+ static float getMSWordLineSpacing( css::style::LineSpacing& rLineSpacing );
+ static sal_Int32 getMSWordLineSpacingRule( css::style::LineSpacing& rLineSpacing );
sal_Int16 getCharHeight() throw (css::uno::RuntimeException);
- sal_Int32 getOOoAlignment( sal_Int32 _alignment );
- sal_Int32 getMSWordAlignment( sal_Int32 _alignment );
+ static sal_Int32 getOOoAlignment( sal_Int32 _alignment );
+ static sal_Int32 getMSWordAlignment( sal_Int32 _alignment );
public:
SwVbaParagraphFormat( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::beans::XPropertySet >& rParaProps );
diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx
index 04d49b20c7a8..bb174d1ede0b 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -166,7 +166,7 @@ void SwVbaTableHelper::InitTabCols( SwTabCols& rCols, const SwTableBox *pStart,
pTable->GetTabCols( rCols, pStart, false, false );
}
-sal_Int32 SwVbaTableHelper::GetColCount( SwTabCols& rCols ) const
+sal_Int32 SwVbaTableHelper::GetColCount( SwTabCols& rCols )
{
sal_Int32 nCount = 0;
for( size_t i = 0; i < rCols.Count(); ++i )
@@ -175,7 +175,7 @@ sal_Int32 SwVbaTableHelper::GetColCount( SwTabCols& rCols ) const
return rCols.Count() - nCount;
}
-sal_Int32 SwVbaTableHelper::GetRightSeparator( SwTabCols& rCols, sal_Int32 nNum) const
+sal_Int32 SwVbaTableHelper::GetRightSeparator( SwTabCols& rCols, sal_Int32 nNum)
{
OSL_ENSURE( nNum < GetColCount( rCols ) ,"Index out of range");
sal_Int32 i = 0;
diff --git a/sw/source/ui/vba/vbatablehelper.hxx b/sw/source/ui/vba/vbatablehelper.hxx
index e5b31fb9e4f2..ecc02382e664 100644
--- a/sw/source/ui/vba/vbatablehelper.hxx
+++ b/sw/source/ui/vba/vbatablehelper.hxx
@@ -33,9 +33,9 @@ private:
private:
SwTableBox* GetTabBox( sal_Int32 nCol, sal_Int32 nRow ) throw (css::uno::RuntimeException);
void InitTabCols( SwTabCols& rCols, const SwTableBox *pStart, bool bCurRowOnly = false );
- sal_Int32 GetRightSeparator( SwTabCols& rCols, sal_Int32 nNum) const;
- sal_Int32 GetColCount( SwTabCols& rCols ) const;
- sal_Int32 GetColWidth( SwTabCols& rCols, sal_Int32 nNum ) throw (css::uno::RuntimeException);
+ static sal_Int32 GetRightSeparator( SwTabCols& rCols, sal_Int32 nNum);
+ static sal_Int32 GetColCount( SwTabCols& rCols );
+ static sal_Int32 GetColWidth( SwTabCols& rCols, sal_Int32 nNum ) throw (css::uno::RuntimeException);
public:
SwVbaTableHelper( const css::uno::Reference< css::text::XTextTable >& xTextTable ) throw (css::uno::RuntimeException);
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 21:25:30 +0000