summaryrefslogtreecommitdiff
path: root/sw/source/core/doc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/doc')
-rw-r--r--sw/source/core/doc/DocumentStylePoolManager.cxx2
-rw-r--r--sw/source/core/doc/dbgoutsw.cxx2
-rw-r--r--sw/source/core/doc/docglbl.cxx8
-rw-r--r--sw/source/core/doc/docnum.cxx2
-rw-r--r--sw/source/core/doc/docredln.cxx2
-rw-r--r--sw/source/core/doc/gctable.cxx2
-rw-r--r--sw/source/core/doc/notxtfrm.cxx4
-rw-r--r--sw/source/core/doc/tblrwcl.cxx6
-rw-r--r--sw/source/core/doc/textboxhelper.cxx2
9 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index aafd5fffab7f..d397be625b26 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -2538,7 +2538,7 @@ std::vector<OUString> *SwStyleNameMapper::s_pTextUINameArray = nullptr,
*SwStyleNameMapper::s_pTableStyleUINameArray = nullptr,
*SwStyleNameMapper::s_pCellStyleUINameArray = nullptr;
-std::vector<OUString>*
+static std::vector<OUString>*
lcl_NewUINameArray(const char** pIds, const size_t nLen, const size_t nSvxIds = 0)
{
assert(nSvxIds <= nLen);
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index bf51116f14c6..a670fc83ded4 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -92,7 +92,7 @@ const char * dbg_out(const OUString & aStr)
return aDbgOutResult.getStr();
}
-map<sal_uInt16,OUString> & GetItemWhichMap()
+static map<sal_uInt16,OUString> & GetItemWhichMap()
{
static map<sal_uInt16,OUString> aItemWhichMap;
static bool bInitialized = false;
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 4484ff45dd2c..3ddbf4bc96ad 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -84,7 +84,7 @@ bool SwDoc::GenerateHTMLDoc( const OUString& rPath,
}
// two helpers for outline mode
-SwNodePtr GetStartNode( SwOutlineNodes const * pOutlNds, int nOutlineLevel, SwOutlineNodes::size_type* nOutl )
+static SwNodePtr GetStartNode( SwOutlineNodes const * pOutlNds, int nOutlineLevel, SwOutlineNodes::size_type* nOutl )
{
SwNodePtr pNd;
@@ -97,7 +97,7 @@ SwNodePtr GetStartNode( SwOutlineNodes const * pOutlNds, int nOutlineLevel, SwOu
return nullptr;
}
-SwNodePtr GetEndNode( SwOutlineNodes const * pOutlNds, int nOutlineLevel, SwOutlineNodes::size_type* nOutl )
+static SwNodePtr GetEndNode( SwOutlineNodes const * pOutlNds, int nOutlineLevel, SwOutlineNodes::size_type* nOutl )
{
SwNodePtr pNd;
@@ -117,7 +117,7 @@ SwNodePtr GetEndNode( SwOutlineNodes const * pOutlNds, int nOutlineLevel, SwOutl
}
// two helpers for collection mode
-SwNodePtr GetStartNode( const SwOutlineNodes* pOutlNds, const SwTextFormatColl* pSplitColl, SwOutlineNodes::size_type* nOutl )
+static SwNodePtr GetStartNode( const SwOutlineNodes* pOutlNds, const SwTextFormatColl* pSplitColl, SwOutlineNodes::size_type* nOutl )
{
SwNodePtr pNd;
for( ; *nOutl < pOutlNds->size(); ++(*nOutl) )
@@ -130,7 +130,7 @@ SwNodePtr GetStartNode( const SwOutlineNodes* pOutlNds, const SwTextFormatColl*
return nullptr;
}
-SwNodePtr GetEndNode( const SwOutlineNodes* pOutlNds, const SwTextFormatColl* pSplitColl, SwOutlineNodes::size_type* nOutl )
+static SwNodePtr GetEndNode( const SwOutlineNodes* pOutlNds, const SwTextFormatColl* pSplitColl, SwOutlineNodes::size_type* nOutl )
{
SwNodePtr pNd;
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 1b975dc48942..4300f5a3c2c8 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -85,7 +85,7 @@ namespace {
}
}
-inline sal_uInt8 GetUpperLvlChg( sal_uInt8 nCurLvl, sal_uInt8 nLevel, sal_uInt16 nMask )
+static inline sal_uInt8 GetUpperLvlChg( sal_uInt8 nCurLvl, sal_uInt8 nLevel, sal_uInt16 nMask )
{
if( 1 < nLevel )
{
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index e023f77f11ac..e8ad85df185d 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -107,7 +107,7 @@ void SwExtraRedlineTable::dumpAsXml(xmlTextWriterPtr pWriter) const
}
#if OSL_DEBUG_LEVEL > 0
-bool CheckPosition( const SwPosition* pStt, const SwPosition* pEnd )
+static bool CheckPosition( const SwPosition* pStt, const SwPosition* pEnd )
{
int nError = 0;
SwNode* pSttNode = &pStt->nNode.GetNode();
diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx
index aeab4b21521a..55e00d45e104 100644
--- a/sw/source/core/doc/gctable.cxx
+++ b/sw/source/core/doc/gctable.cxx
@@ -25,7 +25,7 @@
using namespace ::editeng;
-inline const SvxBorderLine* GetLineTB( const SvxBoxItem* pBox, bool bTop )
+static inline const SvxBorderLine* GetLineTB( const SvxBoxItem* pBox, bool bTop )
{
return bTop ? pBox->GetTop() : pBox->GetBottom();
}
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 5755a37472bc..b0c228967859 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -83,7 +83,7 @@
using namespace com::sun::star;
-inline bool GetRealURL( const SwGrfNode& rNd, OUString& rText )
+static inline bool GetRealURL( const SwGrfNode& rNd, OUString& rText )
{
bool bRet = rNd.GetFileFilterNms( &rText, nullptr );
if( bRet )
@@ -880,7 +880,7 @@ static void lcl_correctlyAlignRect( SwRect& rAlignedGrfArea, const SwRect& rInAr
}
}
-bool paintUsingPrimitivesHelper(
+static bool paintUsingPrimitivesHelper(
vcl::RenderContext& rOutputDevice,
const drawinglayer::primitive2d::Primitive2DContainer& rSequence,
const basegfx::B2DRange& rSourceRange,
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 9551e4480f9d..384ae1e3adbe 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -469,7 +469,7 @@ static void lcl_InsCol( FndLine_* pFndLn, CpyPara& rCpyPara, sal_uInt16 nCpyCnt,
}
}
-SwRowFrame* GetRowFrame( SwTableLine& rLine )
+static SwRowFrame* GetRowFrame( SwTableLine& rLine )
{
SwIterator<SwRowFrame,SwFormat> aIter( *rLine.GetFrameFormat() );
for( SwRowFrame* pFrame = aIter.First(); pFrame; pFrame = aIter.Next() )
@@ -2825,7 +2825,7 @@ static bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
// SwComparePosition::Equal, // Box and start/end are the same
// SwComparePosition::OverlapBefore, // Box overlapps the start
// SwComparePosition::OverlapBehind // Box overlapps the end
-SwComparePosition CheckBoxInRange( sal_uInt16 nStt, sal_uInt16 nEnd,
+static SwComparePosition CheckBoxInRange( sal_uInt16 nStt, sal_uInt16 nEnd,
sal_uInt16 nBoxStt, sal_uInt16 nBoxEnd )
{
// Still treat COLFUZZY!
@@ -3898,7 +3898,7 @@ static FndBox_* lcl_SaveInsDelData( CR_SetLineHeight& rParam, SwUndo** ppUndo,
return pFndBox;
}
-void SetLineHeight( SwTableLine& rLine, SwTwips nOldHeight, SwTwips nNewHeight,
+static void SetLineHeight( SwTableLine& rLine, SwTwips nOldHeight, SwTwips nNewHeight,
bool bMinSize )
{
SwLayoutFrame* pLineFrame = GetRowFrame( rLine );
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index acd112c17c2b..45fce1328985 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -258,7 +258,7 @@ SwFrameFormat* SwTextBoxHelper::getOtherTextBoxFormat(uno::Reference<drawing::XS
return getOtherTextBoxFormat(pFormat, RES_DRAWFRMFMT);
}
-template <typename T> void lcl_queryInterface(SwFrameFormat* pShape, uno::Any& rAny)
+template <typename T> static void lcl_queryInterface(SwFrameFormat* pShape, uno::Any& rAny)
{
if (SwFrameFormat* pFormat = SwTextBoxHelper::getOtherTextBoxFormat(pShape, RES_DRAWFRMFMT))
{