[Libreoffice-commits] .: 4 commits - compilerplugins/clang sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Oct 12 07:57:27 PDT 2012
compilerplugins/clang/compileplugin.hxx | 2
compilerplugins/clang/unusedvariablecheck.cxx | 6
sw/inc/anchoredobject.hxx | 4
sw/inc/index.hxx | 2
sw/inc/unotbl.hxx | 6
sw/source/core/access/accpara.cxx | 2
sw/source/core/bastyp/calc.cxx | 2
sw/source/core/crsr/callnk.cxx | 2
sw/source/core/crsr/crsrsh.cxx | 20 -
sw/source/core/crsr/crstrvl.cxx | 2
sw/source/core/crsr/findattr.cxx | 10
sw/source/core/crsr/findtxt.cxx | 2
sw/source/core/crsr/pam.cxx | 6
sw/source/core/crsr/swcrsr.cxx | 6
sw/source/core/crsr/trvltbl.cxx | 6
sw/source/core/doc/dbgoutsw.cxx | 66 +---
sw/source/core/doc/doc.cxx | 8
sw/source/core/doc/docdesc.cxx | 2
sw/source/core/doc/docdraw.cxx | 2
sw/source/core/doc/docedt.cxx | 42 +--
sw/source/core/doc/docfld.cxx | 6
sw/source/core/doc/docfly.cxx | 2
sw/source/core/doc/docfmt.cxx | 10
sw/source/core/doc/doclay.cxx | 2
sw/source/core/doc/docnum.cxx | 12
sw/source/core/doc/docredln.cxx | 20 -
sw/source/core/doc/doctxm.cxx | 8
sw/source/core/doc/docxforms.cxx | 2
sw/source/core/doc/gctable.cxx | 14 -
sw/source/core/doc/notxtfrm.cxx | 8
sw/source/core/doc/poolfmt.cxx | 14 -
sw/source/core/doc/tblcpy.cxx | 4
sw/source/core/doc/tblrwcl.cxx | 84 +++---
sw/source/core/docnode/ndcopy.cxx | 12
sw/source/core/docnode/ndsect.cxx | 8
sw/source/core/docnode/ndtbl.cxx | 46 +--
sw/source/core/docnode/ndtbl1.cxx | 26 -
sw/source/core/docnode/section.cxx | 12
sw/source/core/docnode/swbaslnk.cxx | 2
sw/source/core/draw/dcontact.cxx | 4
sw/source/core/draw/dview.cxx | 6
sw/source/core/edit/edattr.cxx | 4
sw/source/core/edit/edfld.cxx | 2
sw/source/core/edit/edlingu.cxx | 10
sw/source/core/edit/ednumber.cxx | 2
sw/source/core/edit/edredln.cxx | 2
sw/source/core/edit/edsect.cxx | 2
sw/source/core/edit/edundo.cxx | 4
sw/source/core/fields/authfld.cxx | 2
sw/source/core/fields/cellfml.cxx | 16 -
sw/source/core/fields/dbfld.cxx | 2
sw/source/core/fields/docufld.cxx | 6
sw/source/core/fields/expfld.cxx | 4
sw/source/core/fields/fldbas.cxx | 2
sw/source/core/fields/reffld.cxx | 2
sw/source/core/frmedt/fecopy.cxx | 6
sw/source/core/frmedt/fefly1.cxx | 10
sw/source/core/frmedt/feshview.cxx | 6
sw/source/core/frmedt/fetab.cxx | 14 -
sw/source/core/frmedt/fews.cxx | 2
sw/source/core/frmedt/tblsel.cxx | 18 -
sw/source/core/graphic/grfatr.cxx | 4
sw/source/core/inc/frame.hxx | 2
sw/source/core/inc/tblrwcl.hxx | 10
sw/source/core/inc/txtfrm.hxx | 2
sw/source/core/layout/atrfrm.cxx | 10
sw/source/core/layout/calcmove.cxx | 10
sw/source/core/layout/colfrm.cxx | 8
sw/source/core/layout/dbg_lay.cxx | 8
sw/source/core/layout/findfrm.cxx | 10
sw/source/core/layout/flowfrm.cxx | 4
sw/source/core/layout/fly.cxx | 2
sw/source/core/layout/flycnt.cxx | 8
sw/source/core/layout/frmtool.cxx | 26 -
sw/source/core/layout/ftnfrm.cxx | 14 -
sw/source/core/layout/laycache.cxx | 4
sw/source/core/layout/objectformattertxtfrm.cxx | 2
sw/source/core/layout/pagechg.cxx | 12
sw/source/core/layout/paintfrm.cxx | 54 +--
sw/source/core/layout/sectfrm.cxx | 12
sw/source/core/layout/tabfrm.cxx | 68 ++---
sw/source/core/layout/trvlfrm.cxx | 12
sw/source/core/layout/wsfrm.cxx | 14 -
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 2
sw/source/core/table/swnewtable.cxx | 26 -
sw/source/core/table/swtable.cxx | 30 +-
sw/source/core/text/atrstck.cxx | 2
sw/source/core/text/frmcrsr.cxx | 14 -
sw/source/core/text/inftxt.cxx | 2
sw/source/core/text/itradj.cxx | 4
sw/source/core/text/itratr.cxx | 2
sw/source/core/text/itrcrsr.cxx | 2
sw/source/core/text/itrform2.cxx | 2
sw/source/core/text/itrtxt.cxx | 2
sw/source/core/text/porlay.cxx | 2
sw/source/core/text/pormulti.cxx | 8
sw/source/core/text/portxt.cxx | 4
sw/source/core/text/txtdrop.cxx | 2
sw/source/core/text/txtfld.cxx | 4
sw/source/core/text/txtfrm.cxx | 16 -
sw/source/core/text/txtftn.cxx | 2
sw/source/core/tox/tox.cxx | 2
sw/source/core/txtnode/fntcache.cxx | 10
sw/source/core/txtnode/fntcap.cxx | 8
sw/source/core/txtnode/ndtxt.cxx | 6
sw/source/core/txtnode/thints.cxx | 8
sw/source/core/txtnode/txtedt.cxx | 4
sw/source/core/undo/undel.cxx | 4
sw/source/core/undo/undraw.cxx | 6
sw/source/core/undo/unredln.cxx | 8
sw/source/core/undo/unsect.cxx | 2
sw/source/core/undo/untbl.cxx | 8
sw/source/core/unocore/unochart.cxx | 106 +++----
sw/source/core/unocore/unocoll.cxx | 8
sw/source/core/unocore/unofield.cxx | 10
sw/source/core/unocore/unoframe.cxx | 16 -
sw/source/core/unocore/unoidx.cxx | 21 -
sw/source/core/unocore/unoparagraph.cxx | 4
sw/source/core/unocore/unoportenum.cxx | 2
sw/source/core/unocore/unosett.cxx | 8
sw/source/core/unocore/unostyle.cxx | 14 -
sw/source/core/unocore/unotbl.cxx | 136 +++++-----
sw/source/core/unocore/unotextmarkup.cxx | 2
sw/source/core/view/printdata.cxx | 4
sw/source/core/view/viewpg.cxx | 6
sw/source/core/view/viewsh.cxx | 4
sw/source/core/view/vprint.cxx | 4
sw/source/filter/html/css1atr.cxx | 10
sw/source/filter/html/htmlcss1.cxx | 8
sw/source/filter/html/htmlfldw.cxx | 4
sw/source/filter/html/htmlforw.cxx | 4
sw/source/filter/html/htmlftn.cxx | 4
sw/source/filter/html/swhtml.cxx | 6
sw/source/filter/html/wrthtml.cxx | 10
sw/source/filter/rtf/rtffld.cxx | 2
sw/source/filter/rtf/rtffly.cxx | 4
sw/source/filter/rtf/rtfnum.cxx | 4
sw/source/filter/rtf/swparrtf.cxx | 4
sw/source/filter/ww8/rtfattributeoutput.cxx | 2
sw/source/filter/ww8/rtfsdrexport.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 2
sw/source/filter/ww8/wrtw8nds.cxx | 4
sw/source/filter/ww8/wrtww8.cxx | 2
sw/source/filter/ww8/ww8atr.cxx | 8
sw/source/filter/ww8/ww8par.cxx | 4
sw/source/filter/ww8/ww8par3.cxx | 2
sw/source/filter/ww8/ww8par5.cxx | 8
sw/source/filter/ww8/ww8par6.cxx | 8
sw/source/filter/ww8/ww8scan.cxx | 2
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 4
sw/source/filter/xml/swxml.cxx | 6
sw/source/filter/xml/xmlexpit.cxx | 2
sw/source/filter/xml/xmlimp.cxx | 2
sw/source/filter/xml/xmlimpit.cxx | 28 +-
sw/source/filter/xml/xmlithlp.cxx | 18 -
sw/source/filter/xml/xmlithlp.hxx | 14 -
sw/source/filter/xml/xmltble.cxx | 8
sw/source/filter/xml/xmltbli.cxx | 4
sw/source/filter/xml/xmltexte.cxx | 6
sw/source/filter/xml/xmltexti.cxx | 2
sw/source/ui/app/appenv.cxx | 2
sw/source/ui/app/apphdl.cxx | 2
sw/source/ui/app/applab.cxx | 4
sw/source/ui/app/docsh.cxx | 2
sw/source/ui/app/docsh2.cxx | 2
sw/source/ui/app/docstyle.cxx | 16 -
sw/source/ui/app/swmodul1.cxx | 4
sw/source/ui/config/barcfg.cxx | 2
sw/source/ui/config/fontcfg.cxx | 2
sw/source/ui/config/modcfg.cxx | 8
sw/source/ui/config/optpage.cxx | 6
sw/source/ui/dbui/addresslistdialog.cxx | 2
sw/source/ui/dbui/dbmgr.cxx | 16 -
sw/source/ui/dbui/dbui.cxx | 4
sw/source/ui/dbui/mailmergechildwindow.cxx | 2
sw/source/ui/dbui/mmaddressblockpage.cxx | 2
sw/source/ui/dbui/mmconfigitem.cxx | 8
sw/source/ui/dbui/mmgreetingspage.cxx | 8
sw/source/ui/dbui/mmoutputpage.cxx | 4
sw/source/ui/dialog/SwSpellDialogChildWindow.cxx | 2
sw/source/ui/dialog/uiregionsw.cxx | 4
sw/source/ui/docvw/edtdd.cxx | 8
sw/source/ui/docvw/edtwin.cxx | 10
sw/source/ui/docvw/srcedtw.cxx | 2
sw/source/ui/envelp/label1.cxx | 6
sw/source/ui/envelp/labelcfg.cxx | 8
sw/source/ui/envelp/mailmrge.cxx | 6
sw/source/ui/frmdlg/cption.cxx | 2
sw/source/ui/frmdlg/frmpage.cxx | 4
sw/source/ui/inc/view.hxx | 6
sw/source/ui/index/cntex.cxx | 8
sw/source/ui/index/cnttab.cxx | 10
sw/source/ui/lingu/olmenu.cxx | 8
sw/source/ui/misc/docfnote.cxx | 2
sw/source/ui/misc/glosdoc.cxx | 4
sw/source/ui/misc/glossary.cxx | 2
sw/source/ui/misc/glshell.cxx | 6
sw/source/ui/misc/outline.cxx | 6
sw/source/ui/misc/srtdlg.cxx | 4
sw/source/ui/shells/basesh.cxx | 4
sw/source/ui/shells/frmsh.cxx | 6
sw/source/ui/shells/listsh.cxx | 2
sw/source/ui/shells/textfld.cxx | 2
sw/source/ui/shells/textsh.cxx | 2
sw/source/ui/shells/textsh1.cxx | 8
sw/source/ui/uiview/formatclipboard.cxx | 4
sw/source/ui/uiview/pview.cxx | 4
sw/source/ui/uiview/srcview.cxx | 6
sw/source/ui/uiview/view.cxx | 4
sw/source/ui/uiview/view0.cxx | 6
sw/source/ui/uiview/view2.cxx | 6
sw/source/ui/uiview/viewport.cxx | 2
sw/source/ui/uiview/viewtab.cxx | 8
sw/source/ui/uno/SwXDocumentSettings.cxx | 2
sw/source/ui/uno/unoatxt.cxx | 2
sw/source/ui/uno/unotxdoc.cxx | 16 -
sw/source/ui/uno/unotxvw.cxx | 2
sw/source/ui/utlui/content.cxx | 2
sw/source/ui/utlui/navipi.cxx | 2
sw/source/ui/vba/vbaaddins.cxx | 2
sw/source/ui/vba/vbadocumentproperties.cxx | 2
sw/source/ui/vba/vbafield.cxx | 2
sw/source/ui/vba/vbatables.cxx | 6
sw/source/ui/vba/vbatabstops.cxx | 4
sw/source/ui/vba/vbatemplate.cxx | 2
sw/source/ui/wrtsh/wrtsh1.cxx | 2
226 files changed, 966 insertions(+), 995 deletions(-)
New commits:
commit 21d10c6f3266d4fac9c91f9d0fab529a6841b39e
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Fri Oct 12 16:49:40 2012 +0200
mark lcl_ functions static or rename them if they are not local at all
http://lists.freedesktop.org/archives/libreoffice/2012-October/039639.html
Change-Id: I21e12d6a4dfb9697d2346a4e564e96af0ad03f96
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index 247717e..0aad748 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -175,9 +175,9 @@ class SW_DLLPUBLIC SwAnchoredObject
void _CheckTopOfLine( const SwFmtAnchor& _rAnch,
const SwTxtFrm& _rAnchorCharFrm );
- // method <lcl_HideObj(..)> sets needed data structure values for the
+ // method <sw_HideObj(..)> sets needed data structure values for the
// object positioning
- friend bool lcl_HideObj( const SwTxtFrm& _rFrm,
+ friend bool sw_HideObj( const SwTxtFrm& _rFrm,
const RndStdIds _eAnchorType,
const xub_StrLen _nObjAnchorPos,
SwAnchoredObject* _pAnchoredObj );
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index a47bbaf..dc8c5db 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -121,7 +121,7 @@ public:
class SwIndexReg
{
friend class SwIndex;
- friend bool lcl_PosOk(const SwPosition & aPos);
+ friend bool sw_PosOk(const SwPosition & aPos);
const SwIndex * m_pFirst;
const SwIndex * m_pLast;
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 18a0029..f81830e 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -87,10 +87,10 @@ class SwXCell : public SwXCellBaseClass,
public SwXText,
public SwClient
{
- friend void lcl_setString( SwXCell &rCell, const rtl::OUString &rTxt,
+ friend void sw_setString( SwXCell &rCell, const rtl::OUString &rTxt,
sal_Bool bKeepNumberFmt = sal_False );
- friend double lcl_getValue( SwXCell &rCell );
- friend void lcl_setValue( SwXCell &rCell, double nVal );
+ friend double sw_getValue( SwXCell &rCell );
+ friend void sw_setValue( SwXCell &rCell, double nVal );
const SfxItemPropertySet* m_pPropSet;
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 0ae229a..e9a14bb 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -917,7 +917,7 @@ void SAL_CALL SwAccessibleParagraph::grabFocus()
}
// #i71385#
-bool lcl_GetBackgroundColor( Color & rColor,
+static bool lcl_GetBackgroundColor( Color & rColor,
const SwFrm* pFrm,
SwCrsrShell* pCrsrSh )
{
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 8de93ef..450d290 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -229,7 +229,7 @@ inline LanguageType GetDocAppScriptLang( SwDoc& rDoc )
)).GetLanguage();
}
-double lcl_ConvertToDateValue( SwDoc& rDoc, sal_Int32 nDate )
+static double lcl_ConvertToDateValue( SwDoc& rDoc, sal_Int32 nDate )
{
double nRet = 0;
SvNumberFormatter* pFormatter = rDoc.GetNumberFormatter();
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index 29ae8cb..e1a749c 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -85,7 +85,7 @@ SwCallLink::SwCallLink( SwCrsrShell & rSh )
}
}
-void lcl_notifyRow(const SwCntntNode* pNode, SwCrsrShell& rShell)
+static void lcl_notifyRow(const SwCntntNode* pNode, SwCrsrShell& rShell)
{
if ( pNode != NULL )
{
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 8dfc238..2e4b709 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -607,7 +607,7 @@ sal_Bool SwCrsrShell::MoveSection( SwWhichSection fnWhichSect,
// position cursor
-SwFrm* lcl_IsInHeaderFooter( const SwNodeIndex& rIdx, Point& rPt )
+static SwFrm* lcl_IsInHeaderFooter( const SwNodeIndex& rIdx, Point& rPt )
{
SwFrm* pFrm = 0;
SwCntntNode* pCNd = rIdx.GetNode().GetCntntNode();
@@ -3113,7 +3113,7 @@ void SwCrsrShell::SetSelection( const SwPaM& rCrsr )
EndAction();
}
-void lcl_RemoveMark( SwPaM* pPam )
+static void lcl_RemoveMark( SwPaM* pPam )
{
OSL_ENSURE( pPam->HasMark(), "Don't remove pPoint!" );
pPam->GetMark()->nContent.Assign( 0, 0 );
@@ -3121,7 +3121,7 @@ void lcl_RemoveMark( SwPaM* pPam )
pPam->DeleteMark();
}
-const SwStartNode* lcl_NodeContext( const SwNode& rNode )
+static const SwStartNode* lcl_NodeContext( const SwNode& rNode )
{
const SwStartNode *pRet = rNode.StartOfSectionNode();
while( pRet->IsSectionNode() || pRet->IsTableNode() ||
@@ -3138,7 +3138,7 @@ const SwStartNode* lcl_NodeContext( const SwNode& rNode )
@param aPos the position to check.
*/
-bool lcl_PosOk(const SwPosition & aPos)
+bool sw_PosOk(const SwPosition & aPos)
{
return NULL != aPos.nNode.GetNode().GetCntntNode() &&
aPos.nContent.GetIdxReg();
@@ -3152,8 +3152,8 @@ bool lcl_PosOk(const SwPosition & aPos)
*/
static bool lcl_CrsrOk(SwPaM & aPam)
{
- return lcl_PosOk(*aPam.GetPoint()) && (! aPam.HasMark()
- || lcl_PosOk(*aPam.GetMark()));
+ return sw_PosOk(*aPam.GetPoint()) && (! aPam.HasMark()
+ || sw_PosOk(*aPam.GetMark()));
}
void SwCrsrShell::ClearUpCrsrs()
@@ -3181,12 +3181,12 @@ void SwCrsrShell::ClearUpCrsrs()
pCrsr = pTmpCrsr;
}
- if( pStartCrsr->HasMark() && !lcl_PosOk( *pStartCrsr->GetMark() ) )
+ if( pStartCrsr->HasMark() && !sw_PosOk( *pStartCrsr->GetMark() ) )
{
lcl_RemoveMark( pStartCrsr );
bChanged = true;
}
- if( !lcl_PosOk( *pStartCrsr->GetPoint() ) )
+ if( !sw_PosOk( *pStartCrsr->GetPoint() ) )
{
SwNodes & aNodes = GetDoc()->GetNodes();
const SwNode* pStart = lcl_NodeContext( pStartCrsr->GetPoint()->nNode.GetNode() );
@@ -3235,7 +3235,7 @@ String SwCrsrShell::GetCrsrDescr() const
// SMARTTAGS
-void lcl_FillRecognizerData( uno::Sequence< rtl::OUString >& rSmartTagTypes,
+static void lcl_FillRecognizerData( uno::Sequence< rtl::OUString >& rSmartTagTypes,
uno::Sequence< uno::Reference< container::XStringKeyMap > >& rStringKeyMaps,
const SwWrongList& rSmartTagList, xub_StrLen nCurrent )
{
@@ -3276,7 +3276,7 @@ void lcl_FillRecognizerData( uno::Sequence< rtl::OUString >& rSmartTagTypes,
}
}
-void lcl_FillTextRange( uno::Reference<text::XTextRange>& rRange,
+static void lcl_FillTextRange( uno::Reference<text::XTextRange>& rRange,
SwTxtNode& rNode, xub_StrLen nBegin, xub_StrLen nLen )
{
// create SwPosition for nStartIndex
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 7a5218d..2e44aea 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -599,7 +599,7 @@ const SwTOXMark& SwCrsrShell::GotoTOXMark( const SwTOXMark& rStart,
}
/// jump to next/previous field type
-void lcl_MakeFldLst( _SetGetExpFlds& rLst, const SwFieldType& rFldType,
+static void lcl_MakeFldLst( _SetGetExpFlds& rLst, const SwFieldType& rFldType,
sal_uInt16 nSubType, sal_Bool bInReadOnly,
sal_Bool bChkInpFlag = sal_False )
{
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 8572f9c..9490c41 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -106,7 +106,7 @@ const SwTxtAttr* GetBkwrdTxtHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
return 0; // invalid text attribute
}
-void lcl_SetAttrPam( SwPaM& rPam, xub_StrLen nStart, const xub_StrLen* pEnd,
+static void lcl_SetAttrPam( SwPaM& rPam, xub_StrLen nStart, const xub_StrLen* pEnd,
const sal_Bool bSaveMark )
{
xub_StrLen nCntntPos;
@@ -144,7 +144,7 @@ void lcl_SetAttrPam( SwPaM& rPam, xub_StrLen nStart, const xub_StrLen* pEnd,
@param bValue ???
@return Returns <true> if found, <false> otherwise.
*/
-sal_Bool lcl_Search( const SwTxtNode& rTxtNd, SwPaM& rPam,
+static sal_Bool lcl_Search( const SwTxtNode& rTxtNd, SwPaM& rPam,
const SfxPoolItem& rCmpItem,
SwMoveFn fnMove, sal_Bool bValue )
{
@@ -680,7 +680,7 @@ int SwAttrCheckArr::CheckStack()
-int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
+static int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
SwPaM& rPam )
{
xub_StrLen nEndPos, nSttPos;
@@ -751,7 +751,7 @@ int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
}
-int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
+static int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
SwPaM& rPam )
{
xub_StrLen nEndPos, nSttPos;
@@ -827,7 +827,7 @@ int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
}
-int lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, sal_Bool bNoColls )
+static int lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, sal_Bool bNoColls )
{
// search only hard attribution?
if( bNoColls && !rCNd.HasSwAttrSet() )
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index ade7b39..76c843b 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -58,7 +58,7 @@ using namespace util;
String *ReplaceBackReferences( const SearchOptions& rSearchOpt, SwPaM* pPam );
-String& lcl_CleanStr( const SwTxtNode& rNd, xub_StrLen nStart, xub_StrLen& rEnd,
+static String& lcl_CleanStr( const SwTxtNode& rNd, xub_StrLen nStart, xub_StrLen& rEnd,
std::vector<sal_uLong> &rArr, String& rRet,
bool bRemoveSoftHyphen )
{
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 81ac674..1ef6f04 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -210,7 +210,7 @@ SwDoc * SwPosition::GetDoc() const
enum CHKSECTION { Chk_Both, Chk_One, Chk_None };
-CHKSECTION lcl_TstIdx( sal_uLong nSttIdx, sal_uLong nEndIdx, const SwNode& rEndNd )
+static CHKSECTION lcl_TstIdx( sal_uLong nSttIdx, sal_uLong nEndIdx, const SwNode& rEndNd )
{
sal_uLong nStt = rEndNd.StartOfSectionIndex(), nEnd = rEndNd.GetIndex();
CHKSECTION eSec = nStt < nSttIdx && nEnd >= nSttIdx ? Chk_One : Chk_None;
@@ -220,7 +220,7 @@ CHKSECTION lcl_TstIdx( sal_uLong nSttIdx, sal_uLong nEndIdx, const SwNode& rEndN
}
-sal_Bool lcl_ChkOneRange( CHKSECTION eSec, sal_Bool bChkSections,
+static sal_Bool lcl_ChkOneRange( CHKSECTION eSec, sal_Bool bChkSections,
const SwNode& rBaseEnd, sal_uLong nStt, sal_uLong nEnd )
{
if( eSec != Chk_Both )
@@ -573,7 +573,7 @@ sal_uInt16 SwPaM::GetPageNum( sal_Bool bAtPoint, const Point* pLayPos )
}
// Formular view - See also SwCrsrShell::IsCrsrReadonly()
-const SwFrm* lcl_FindEditInReadonlyFrm( const SwFrm& rFrm )
+static const SwFrm* lcl_FindEditInReadonlyFrm( const SwFrm& rFrm )
{
const SwFrm* pRet = 0;
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index fa15093..434bf34 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -711,7 +711,7 @@ SwMoveFnCollection* SwCursor::MakeFindRange( SwDocPositions nStart,
}
-sal_uLong lcl_FindSelection( SwFindParas& rParas, SwCursor* pCurCrsr,
+static sal_uLong lcl_FindSelection( SwFindParas& rParas, SwCursor* pCurCrsr,
SwMoveFn fnMove, SwCursor*& pFndRing,
SwPaM& aRegion, FindRanges eFndRngs,
sal_Bool bInReadOnly, sal_Bool& bCancel )
@@ -836,7 +836,7 @@ sal_uLong lcl_FindSelection( SwFindParas& rParas, SwCursor* pCurCrsr,
}
-int lcl_MakeSelFwrd( const SwNode& rSttNd, const SwNode& rEndNd,
+static int lcl_MakeSelFwrd( const SwNode& rSttNd, const SwNode& rEndNd,
SwPaM& rPam, int bFirst )
{
if( rSttNd.GetIndex() + 1 == rEndNd.GetIndex() )
@@ -869,7 +869,7 @@ int lcl_MakeSelFwrd( const SwNode& rSttNd, const SwNode& rEndNd,
}
-int lcl_MakeSelBkwrd( const SwNode& rSttNd, const SwNode& rEndNd,
+static int lcl_MakeSelBkwrd( const SwNode& rSttNd, const SwNode& rEndNd,
SwPaM& rPam, int bFirst )
{
if( rEndNd.GetIndex() + 1 == rSttNd.GetIndex() )
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index 84804f6..07fc9a4 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -125,7 +125,7 @@ sal_Bool SwCrsrShell::GoPrevCell()
return bRet;
}
-const SwFrm* lcl_FindMostUpperCellFrm( const SwFrm* pFrm )
+static const SwFrm* lcl_FindMostUpperCellFrm( const SwFrm* pFrm )
{
while ( pFrm &&
( !pFrm->IsCellFrm() ||
@@ -355,7 +355,7 @@ sal_Bool SwCrsrShell::SelTblBox()
@return <false> if no suitable cell could be found, otherwise <rIdx> points
to content in a suitable cell and <true> is returned.
*/
-bool lcl_FindNextCell( SwNodeIndex& rIdx, sal_Bool bInReadOnly )
+static bool lcl_FindNextCell( SwNodeIndex& rIdx, sal_Bool bInReadOnly )
{
// check protected cells
SwNodeIndex aTmp( rIdx, 2 ); // TableNode + StartNode
@@ -434,7 +434,7 @@ bool lcl_FindNextCell( SwNodeIndex& rIdx, sal_Bool bInReadOnly )
}
/// see lcl_FindNextCell()
-bool lcl_FindPrevCell( SwNodeIndex& rIdx, sal_Bool bInReadOnly )
+static bool lcl_FindPrevCell( SwNodeIndex& rIdx, sal_Bool bInReadOnly )
{
SwNodeIndex aTmp( rIdx, -2 ); // TableNode + EndNode
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 3719ef5..334ee88 100755
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -68,7 +68,7 @@ char* db_pretty_print(const String* str, int flags, char* fmt)
}
template<class T>
-String lcl_dbg_out_SvPtrArr(const T & rArr)
+static String lcl_dbg_out_SvPtrArr(const T & rArr)
{
String aStr("[ ", RTL_TEXTENCODING_ASCII_US);
@@ -259,7 +259,7 @@ map<sal_uInt16,String,CompareUShort> & GetItemWhichMap()
return aItemWhichMap;
}
-const String lcl_dbg_out(const SfxPoolItem & rItem)
+static const String lcl_dbg_out(const SfxPoolItem & rItem)
{
String aStr("[ ", RTL_TEXTENCODING_ASCII_US);
@@ -284,7 +284,7 @@ SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem * pItem)
String("(nil)", RTL_TEXTENCODING_ASCII_US));
}
-SW_DLLPUBLIC const String lcl_dbg_out(const SfxItemSet & rSet)
+SW_DLLPUBLIC static const String lcl_dbg_out(const SfxItemSet & rSet)
{
SfxItemIter aIter(rSet);
const SfxPoolItem * pItem;
@@ -318,7 +318,7 @@ SW_DLLPUBLIC const char * dbg_out(const SfxItemSet & rSet)
return dbg_out(lcl_dbg_out(rSet));
}
-const String lcl_dbg_out(const SwTxtAttr & rAttr)
+static const String lcl_dbg_out(const SwTxtAttr & rAttr)
{
String aStr("[ ", RTL_TEXTENCODING_ASCII_US);
@@ -338,7 +338,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwTxtAttr & rAttr)
return dbg_out(lcl_dbg_out(rAttr));
}
-const String lcl_dbg_out(const SwpHints & rHints)
+static const String lcl_dbg_out(const SwpHints & rHints)
{
String aStr("[ SwpHints\n", RTL_TEXTENCODING_ASCII_US);
@@ -359,7 +359,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwpHints &rHints)
return dbg_out(lcl_dbg_out(rHints));
}
-String lcl_dbg_out(const SwPosition & rPos)
+static String lcl_dbg_out(const SwPosition & rPos)
{
String aStr("( ", RTL_TEXTENCODING_ASCII_US);
@@ -380,7 +380,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwPosition & rPos)
return dbg_out(lcl_dbg_out(rPos));
}
-String lcl_dbg_out(const SwPaM & rPam)
+static String lcl_dbg_out(const SwPaM & rPam)
{
String aStr("[ Pt: ", RTL_TEXTENCODING_ASCII_US);
@@ -402,7 +402,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwPaM & rPam)
return dbg_out(lcl_dbg_out(rPam));
}
-String lcl_dbg_out(const SwNodeNum & )
+static String lcl_dbg_out(const SwNodeNum & )
{
return String();/*rNum.ToString();*/
}
@@ -412,7 +412,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwNodeNum & rNum)
return dbg_out(lcl_dbg_out(rNum));
}
-String lcl_dbg_out(const SwRect & rRect)
+static String lcl_dbg_out(const SwRect & rRect)
{
String aResult("[ [", RTL_TEXTENCODING_ASCII_US);
@@ -434,7 +434,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwRect & rRect)
return dbg_out(lcl_dbg_out(rRect));
}
-String lcl_dbg_out(const SwFrmFmt & rFrmFmt)
+static String lcl_dbg_out(const SwFrmFmt & rFrmFmt)
{
String aResult("[ ", RTL_TEXTENCODING_ASCII_US);
@@ -461,7 +461,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwFrmFmt & rFrmFmt)
return dbg_out(lcl_dbg_out(rFrmFmt));
}
-const String lcl_AnchoredFrames(const SwNode & rNode)
+static const String lcl_AnchoredFrames(const SwNode & rNode)
{
String aResult("[", RTL_TEXTENCODING_ASCII_US);
@@ -497,7 +497,7 @@ const String lcl_AnchoredFrames(const SwNode & rNode)
return aResult;
}
-String lcl_dbg_out_NumType(sal_Int16 nType)
+static String lcl_dbg_out_NumType(sal_Int16 nType)
{
String aTmpStr;
@@ -542,7 +542,7 @@ String lcl_dbg_out_NumType(sal_Int16 nType)
return aTmpStr;
}
-String lcl_dbg_out(const SwNode & rNode)
+static String lcl_dbg_out(const SwNode & rNode)
{
String aTmpStr;
@@ -722,19 +722,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwTxtNode * pNode)
return NULL;
}
-bool lcl_dbg_add_node(const SwNodePtr & pNode, void * pArgs)
-{
- if (pNode)
- {
- (*((String *) pArgs)) += lcl_dbg_out(*pNode);
- (*((String *) pArgs)) += String("\n", RTL_TEXTENCODING_ASCII_US);
- }
-
- //MBA: this code didn't compile, needed to add a return value
- return true;
-}
-
-void lcl_dbg_nodes_inner(String & aStr, SwNodes & rNodes, sal_uLong & nIndex)
+static void lcl_dbg_nodes_inner(String & aStr, SwNodes & rNodes, sal_uLong & nIndex)
{
SwNode * pNode = rNodes[nIndex];
SwStartNode * pStartNode = dynamic_cast<SwStartNode *> (pNode);
@@ -783,7 +771,7 @@ void lcl_dbg_nodes_inner(String & aStr, SwNodes & rNodes, sal_uLong & nIndex)
aStr += String(">\n", RTL_TEXTENCODING_ASCII_US);
}
-String lcl_dbg_out(SwNodes & rNodes)
+static String lcl_dbg_out(SwNodes & rNodes)
{
String aStr("<nodes-array>", RTL_TEXTENCODING_ASCII_US);
@@ -805,7 +793,7 @@ SW_DLLPUBLIC const char * dbg_out(SwNodes & rNodes)
return dbg_out(lcl_dbg_out(rNodes));
}
-String lcl_dbg_out(const SwUndo & rUndo)
+static String lcl_dbg_out(const SwUndo & rUndo)
{
String aStr("[ ", RTL_TEXTENCODING_ASCII_US);
@@ -824,7 +812,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwUndo & rUndo)
return dbg_out(lcl_dbg_out(rUndo));
}
-String lcl_dbg_out(SwOutlineNodes & rNodes)
+static String lcl_dbg_out(SwOutlineNodes & rNodes)
{
String aStr("[\n", RTL_TEXTENCODING_ASCII_US);
@@ -844,7 +832,7 @@ SW_DLLPUBLIC const char * dbg_out(SwOutlineNodes & rNodes)
return dbg_out(lcl_dbg_out(rNodes));
}
-String lcl_dbg_out(const SwRewriter & rRewriter)
+static String lcl_dbg_out(const SwRewriter & rRewriter)
{
(void) rRewriter;
String aResult;
@@ -859,7 +847,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwRewriter & rRewriter)
return dbg_out(lcl_dbg_out(rRewriter));
}
-String lcl_dbg_out(const SvxNumberFormat & rFmt)
+static String lcl_dbg_out(const SvxNumberFormat & rFmt)
{
String aResult;
@@ -868,7 +856,7 @@ String lcl_dbg_out(const SvxNumberFormat & rFmt)
return aResult;
}
-String lcl_dbg_out(const SwNumRule & rRule)
+static String lcl_dbg_out(const SwNumRule & rRule)
{
String aResult("[ ", RTL_TEXTENCODING_ASCII_US);
@@ -895,7 +883,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwNumRule & rRule)
return dbg_out(lcl_dbg_out(rRule));
}
-String lcl_dbg_out(const SwTxtFmtColl & rFmt)
+static String lcl_dbg_out(const SwTxtFmtColl & rFmt)
{
String aResult(rFmt.GetName());
@@ -911,7 +899,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwTxtFmtColl & rFmt)
return dbg_out(lcl_dbg_out(rFmt));
}
-String lcl_dbg_out(const SwFrmFmts & rFrmFmts)
+static String lcl_dbg_out(const SwFrmFmts & rFrmFmts)
{
return lcl_dbg_out_SvPtrArr<SwFrmFmts>(rFrmFmts);
}
@@ -921,7 +909,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwFrmFmts & rFrmFmts)
return dbg_out(lcl_dbg_out(rFrmFmts));
}
-String lcl_dbg_out(const SwNumRuleTbl & rTbl)
+static String lcl_dbg_out(const SwNumRuleTbl & rTbl)
{
String aResult("[", RTL_TEXTENCODING_ASCII_US);
@@ -947,7 +935,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwNumRuleTbl & rTbl)
return dbg_out(lcl_dbg_out(rTbl));
}
-String lcl_TokenType2Str(FormTokenType nType)
+static String lcl_TokenType2Str(FormTokenType nType)
{
switch(nType)
{
@@ -979,7 +967,7 @@ String lcl_TokenType2Str(FormTokenType nType)
}
}
-String lcl_dbg_out(const SwFormToken & rToken)
+static String lcl_dbg_out(const SwFormToken & rToken)
{
return rToken.GetString();
}
@@ -989,7 +977,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwFormToken & rToken)
return dbg_out(lcl_dbg_out(rToken));
}
-String lcl_dbg_out(const SwFormTokens & rTokens)
+static String lcl_dbg_out(const SwFormTokens & rTokens)
{
String aStr("[", RTL_TEXTENCODING_ASCII_US);
@@ -1015,7 +1003,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwFormTokens & rTokens)
return dbg_out(lcl_dbg_out(rTokens));
}
-String lcl_dbg_out(const SwNodeRange & rRange)
+static String lcl_dbg_out(const SwNodeRange & rRange)
{
String aStr("[", RTL_TEXTENCODING_ASCII_US);
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 2a67f67..fc7b9bf 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1224,7 +1224,7 @@ sal_uInt16 _PostItFld::GetPageNo(
return 0;
}
-bool lcl_GetPostIts(
+bool sw_GetPostIts(
IDocumentFieldsAccess* pIDFA,
_SetGetExpFlds * pSrtLst )
{
@@ -1979,7 +1979,7 @@ void SwDoc::ReRead( SwPaM& rPam, const String& rGrfName,
}
}
-sal_Bool lcl_SpellAndGrammarAgain( const SwNodePtr& rpNd, void* pArgs )
+static sal_Bool lcl_SpellAndGrammarAgain( const SwNodePtr& rpNd, void* pArgs )
{
SwTxtNode *pTxtNode = (SwTxtNode*)rpNd->GetTxtNode();
sal_Bool bOnlyWrong = *(sal_Bool*)pArgs;
@@ -2007,7 +2007,7 @@ sal_Bool lcl_SpellAndGrammarAgain( const SwNodePtr& rpNd, void* pArgs )
return sal_True;
}
-sal_Bool lcl_CheckSmartTagsAgain( const SwNodePtr& rpNd, void* )
+static sal_Bool lcl_CheckSmartTagsAgain( const SwNodePtr& rpNd, void* )
{
SwTxtNode *pTxtNode = (SwTxtNode*)rpNd->GetTxtNode();
// sal_Bool bOnlyWrong = *(sal_Bool*)pArgs;
@@ -2499,7 +2499,7 @@ bool SwDoc::LinksUpdated() const
}
// embedded alle lokalen Links (Bereiche/Grafiken)
-::sfx2::SvBaseLink* lcl_FindNextRemovableLink( const ::sfx2::SvBaseLinks& rLinks, sfx2::LinkManager& rLnkMgr )
+static ::sfx2::SvBaseLink* lcl_FindNextRemovableLink( const ::sfx2::SvBaseLinks& rLinks, sfx2::LinkManager& rLnkMgr )
{
for( sal_uInt16 n = 0; n < rLinks.size(); ++n )
{
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 62691a1..6319d42 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -129,7 +129,7 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
|*
|*************************************************************************/
-void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest,
+static void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest,
const sal_Bool bPage = sal_True )
{
// We should actually use ItemSet's Intersect here, but that doesn't work
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 51d91ef..25b81e0 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -85,7 +85,7 @@ using namespace ::com::sun::star::linguistic2;
// alignment attributes for a drawing object, which is newly connected to
// the layout. Used for a newly formed group object <SwDoc::GroupSelection(..)>
// and the members of a destroyed group <SwDoc::UnGroupSelection(..)>
-void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
+static void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
const SdrObject& _rSdrObj )
{
const SwContact* pContact = GetUserCall( &_rSdrObj );
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 14ef5ae..ad53369 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -165,14 +165,14 @@ struct _SaveRedline
typedef boost::ptr_vector< _SaveRedline > _SaveRedlines;
-bool lcl_MayOverwrite( const SwTxtNode *pNode, const xub_StrLen nPos )
+static bool lcl_MayOverwrite( const SwTxtNode *pNode, const xub_StrLen nPos )
{
sal_Unicode cChr = pNode->GetTxt().GetChar( nPos );
return !( ( CH_TXTATR_BREAKWORD == cChr || CH_TXTATR_INWORD == cChr ) &&
(0 != pNode->GetTxtAttrForCharAt( nPos ) ) );
}
-void lcl_SkipAttr( const SwTxtNode *pNode, SwIndex &rIdx, xub_StrLen &rStart )
+static void lcl_SkipAttr( const SwTxtNode *pNode, SwIndex &rIdx, xub_StrLen &rStart )
{
if( !lcl_MayOverwrite( pNode, rStart ) )
{
@@ -354,7 +354,7 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
}
}
-bool lcl_SaveFtn( const SwNodeIndex& rSttNd, const SwNodeIndex& rEndNd,
+static bool lcl_SaveFtn( const SwNodeIndex& rSttNd, const SwNodeIndex& rEndNd,
const SwNodeIndex& rInsPos,
SwFtnIdxs& rFtnArr, SwFtnIdxs& rSaveArr,
const SwIndex* pSttCnt = 0, const SwIndex* pEndCnt = 0 )
@@ -469,7 +469,7 @@ bool lcl_SaveFtn( const SwNodeIndex& rSttNd, const SwNodeIndex& rEndNd,
return bUpdateFtn;
}
-void lcl_SaveRedlines( const SwPaM& aPam, _SaveRedlines& rArr )
+static void lcl_SaveRedlines( const SwPaM& aPam, _SaveRedlines& rArr )
{
SwDoc* pDoc = aPam.GetNode()->GetDoc();
@@ -537,7 +537,7 @@ void lcl_SaveRedlines( const SwPaM& aPam, _SaveRedlines& rArr )
pDoc->SetRedlineMode_intern( eOld );
}
-void lcl_RestoreRedlines( SwDoc* pDoc, const SwPosition& rPos, _SaveRedlines& rArr )
+static void lcl_RestoreRedlines( SwDoc* pDoc, const SwPosition& rPos, _SaveRedlines& rArr )
{
RedlineMode_t eOld = pDoc->GetRedlineMode();
pDoc->SetRedlineMode_intern( (RedlineMode_t)(( eOld & ~nsRedlineMode_t::REDLINE_IGNORE) | nsRedlineMode_t::REDLINE_ON ));
@@ -551,7 +551,7 @@ void lcl_RestoreRedlines( SwDoc* pDoc, const SwPosition& rPos, _SaveRedlines& rA
pDoc->SetRedlineMode_intern( eOld );
}
-void lcl_SaveRedlines( const SwNodeRange& rRg, _SaveRedlines& rArr )
+static void lcl_SaveRedlines( const SwNodeRange& rRg, _SaveRedlines& rArr )
{
SwDoc* pDoc = rRg.aStart.GetNode().GetDoc();
sal_uInt16 nRedlPos;
@@ -637,7 +637,7 @@ void lcl_SaveRedlines( const SwNodeRange& rRg, _SaveRedlines& rArr )
pDoc->SetRedlineMode_intern( eOld );
}
-void lcl_RestoreRedlines( SwDoc* pDoc, sal_uInt32 nInsPos, _SaveRedlines& rArr )
+static void lcl_RestoreRedlines( SwDoc* pDoc, sal_uInt32 nInsPos, _SaveRedlines& rArr )
{
RedlineMode_t eOld = pDoc->GetRedlineMode();
pDoc->SetRedlineMode_intern( (RedlineMode_t)(( eOld & ~nsRedlineMode_t::REDLINE_IGNORE) | nsRedlineMode_t::REDLINE_ON ));
@@ -1233,7 +1233,7 @@ bool SwDoc::MoveNodeRange( SwNodeRange& rRange, SwNodeIndex& rPos,
}
// Convert list of ranges of whichIds to a corresponding list of whichIds
-std::vector<sal_uInt16> * lcl_RangesToVector(sal_uInt16 * pRanges)
+static std::vector<sal_uInt16> * lcl_RangesToVector(sal_uInt16 * pRanges)
{
std::vector<sal_uInt16> * pResult = new std::vector<sal_uInt16>();
@@ -1251,7 +1251,7 @@ std::vector<sal_uInt16> * lcl_RangesToVector(sal_uInt16 * pRanges)
return pResult;
}
-bool lcl_StrLenOverFlow( const SwPaM& rPam )
+static bool lcl_StrLenOverFlow( const SwPaM& rPam )
{
// If we try to merge two paragraph we have to test if afterwards
// the string doesn't exceed the allowed string length
@@ -1271,7 +1271,7 @@ bool lcl_StrLenOverFlow( const SwPaM& rPam )
return bRet;
}
-void lcl_GetJoinFlags( SwPaM& rPam, sal_Bool& rJoinTxt, sal_Bool& rJoinPrev )
+void sw_GetJoinFlags( SwPaM& rPam, sal_Bool& rJoinTxt, sal_Bool& rJoinPrev )
{
rJoinTxt = sal_False;
rJoinPrev = sal_False;
@@ -1296,13 +1296,13 @@ void lcl_GetJoinFlags( SwPaM& rPam, sal_Bool& rJoinTxt, sal_Bool& rJoinPrev )
pEndNd->GetTxt().Len() != pEnd->nContent.GetIndex()
? rPam.GetPoint()->nNode < rPam.GetMark()->nNode
: rPam.GetPoint()->nNode > rPam.GetMark()->nNode,
- "lcl_GetJoinFlags");
+ "sw_GetJoinFlags");
}
}
}
}
-void lcl_JoinText( SwPaM& rPam, sal_Bool bJoinPrev )
+void sw_JoinText( SwPaM& rPam, sal_Bool bJoinPrev )
{
SwNodeIndex aIdx( rPam.GetPoint()->nNode );
SwTxtNode *pTxtNd = aIdx.GetNode().GetTxtNode();
@@ -1316,7 +1316,7 @@ void lcl_JoinText( SwPaM& rPam, sal_Bool bJoinPrev )
{
// We do not need to handle xmlids in this case, because
// it is only invoked if one paragraph is completely empty
- // (see lcl_GetJoinFlags)
+ // (see sw_GetJoinFlags)
{
// If PageBreaks are deleted/set, it must not be added to the Undo history!
// Also, deleteing the Node is not added to the Undo histroy!
@@ -1456,7 +1456,7 @@ lcl_CalcBreaks( ::std::vector<xub_StrLen> & rBreaks, SwPaM const & rPam )
}
}
-bool lcl_DoWithBreaks(SwDoc & rDoc, SwPaM & rPam,
+static bool lcl_DoWithBreaks(SwDoc & rDoc, SwPaM & rPam,
bool (SwDoc::*pFunc)(SwPaM&, bool), const bool bForceJoinNext = false)
{
::std::vector<xub_StrLen> Breaks;
@@ -1564,7 +1564,7 @@ bool SwDoc::DeleteAndJoinImpl( SwPaM & rPam,
const bool bForceJoinNext )
{
sal_Bool bJoinTxt, bJoinPrev;
- lcl_GetJoinFlags( rPam, bJoinTxt, bJoinPrev );
+ sw_GetJoinFlags( rPam, bJoinTxt, bJoinPrev );
// #i100466#
if ( bForceJoinNext )
{
@@ -1579,7 +1579,7 @@ bool SwDoc::DeleteAndJoinImpl( SwPaM & rPam,
if( bJoinTxt )
{
- lcl_JoinText( rPam, bJoinPrev );
+ sw_JoinText( rPam, bJoinPrev );
}
return true;
@@ -1820,7 +1820,7 @@ bool SwDoc::DeleteRange( SwPaM & rPam )
}
-void lcl_syncGrammarError( SwTxtNode &rTxtNode, linguistic2::ProofreadingResult& rResult,
+static void lcl_syncGrammarError( SwTxtNode &rTxtNode, linguistic2::ProofreadingResult& rResult,
xub_StrLen /*nBeginGrammarCheck*/, const ModelToViewHelper &rConversionMap )
{
if( rTxtNode.IsGrammarCheckDirty() )
@@ -2100,7 +2100,7 @@ void SwHyphArgs::SetPam( SwPaM *pPam ) const
}
// Returns sal_True if we can proceed.
-sal_Bool lcl_HyphenateNode( const SwNodePtr& rpNd, void* pArgs )
+static sal_Bool lcl_HyphenateNode( const SwNodePtr& rpNd, void* pArgs )
{
// Hyphenate returns true if there is a hyphenation point and sets pPam
SwTxtNode *pNode = rpNd->GetTxtNode();
@@ -2154,7 +2154,7 @@ uno::Reference< XHyphenatedWord > SwDoc::Hyphenate(
return aHyphArg.GetHyphWord(); // will be set by lcl_HyphenateNode
}
-sal_Bool lcl_GetTokenToParaBreak( String& rStr, String& rRet, sal_Bool bRegExpRplc )
+static sal_Bool lcl_GetTokenToParaBreak( String& rStr, String& rRet, sal_Bool bRegExpRplc )
{
sal_Bool bRet = sal_False;
if( bRegExpRplc )
@@ -2271,7 +2271,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr,
return false;
sal_Bool bJoinTxt, bJoinPrev;
- lcl_GetJoinFlags( rPam, bJoinTxt, bJoinPrev );
+ sw_GetJoinFlags( rPam, bJoinTxt, bJoinPrev );
{
// Create a copy of the Cursor in order to move all Pams from
@@ -2489,7 +2489,7 @@ SetRedlineMode( eOld );
}
if( bJoinTxt )
- lcl_JoinText( rPam, bJoinPrev );
+ sw_JoinText( rPam, bJoinPrev );
SetModified();
return true;
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index d68fd40..2e277a5 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1020,7 +1020,7 @@ void LookString( SwHash** ppTbl, sal_uInt16 nSize, const String& rName,
rRet.Erase();
}
-String lcl_GetDBVarName( SwDoc& rDoc, SwDBNameInfField& rDBFld )
+static String lcl_GetDBVarName( SwDoc& rDoc, SwDBNameInfField& rDBFld )
{
SwDBData aDBData( rDBFld.GetDBData( &rDoc ));
String sDBNumNm;
@@ -1038,7 +1038,7 @@ String lcl_GetDBVarName( SwDoc& rDoc, SwDBNameInfField& rDBFld )
return sDBNumNm;
}
-void lcl_CalcFld( SwDoc& rDoc, SwCalc& rCalc, const _SetGetExpFld& rSGEFld,
+static void lcl_CalcFld( SwDoc& rDoc, SwCalc& rCalc, const _SetGetExpFld& rSGEFld,
SwNewDBMgr* pMgr )
{
const SwTxtFld* pTxtFld = rSGEFld.GetFld();
@@ -1684,7 +1684,7 @@ void SwDoc::SetInitDBFields( sal_Bool b )
/*--------------------------------------------------------------------
Description: Get all databases that are used by fields
--------------------------------------------------------------------*/
-String lcl_DBDataToString(const SwDBData& rData)
+static String lcl_DBDataToString(const SwDBData& rData)
{
String sRet = rData.sDataSource;
sRet += DB_DELIM;
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index f57fcec..2dc8f3e 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -152,7 +152,7 @@ SwFrmFmt* SwDoc::GetFlyNum( sal_uInt16 nIdx, FlyCntType eType )
return pRetFmt;
}
-Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
+static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
const SwFrmFmt* pFlyFmt )
{
Point aRet;
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index ea14782..833ece4 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -143,7 +143,7 @@ struct ParaRstFmt
* Is need for selections at the beginning/end and with no SSelection.
*/
-sal_Bool lcl_RstTxtAttr( const SwNodePtr& rpNd, void* pArgs )
+static sal_Bool lcl_RstTxtAttr( const SwNodePtr& rpNd, void* pArgs )
{
ParaRstFmt* pPara = (ParaRstFmt*)pArgs;
SwTxtNode * pTxtNode = (SwTxtNode*)rpNd->GetTxtNode();
@@ -176,7 +176,7 @@ sal_Bool lcl_RstTxtAttr( const SwNodePtr& rpNd, void* pArgs )
return sal_True;
}
-sal_Bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
+static sal_Bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
{
ParaRstFmt* pPara = (ParaRstFmt*)pArgs;
SwCntntNode* pNode = (SwCntntNode*)rpNd->GetCntntNode();
@@ -1121,7 +1121,7 @@ void SwDoc::ResetAttrAtFormat( const sal_uInt16 nWhichId,
delete pUndo;
}
-int lcl_SetNewDefTabStops( SwTwips nOldWidth, SwTwips nNewWidth,
+static int lcl_SetNewDefTabStops( SwTwips nOldWidth, SwTwips nNewWidth,
SvxTabStopItem& rChgTabStop )
{
// Set the default values of all TabStops to the new value.
@@ -1611,7 +1611,7 @@ void SwDoc::DelTxtFmtColl( SwTxtFmtColl *pColl, sal_Bool bBroadcast )
DelTxtFmtColl( nFmt, bBroadcast );
}
-sal_Bool lcl_SetTxtFmtColl( const SwNodePtr& rpNode, void* pArgs )
+static sal_Bool lcl_SetTxtFmtColl( const SwNodePtr& rpNode, void* pArgs )
{
// ParaSetFmtColl * pPara = (ParaSetFmtColl*)pArgs;
SwCntntNode* pCNd = (SwCntntNode*)rpNode->GetTxtNode();
@@ -1873,7 +1873,7 @@ SwGrfFmtColl* SwDoc::CopyGrfColl( const SwGrfFmtColl& rColl )
return pNewColl;
}
-SwPageDesc* lcl_FindPageDesc( const SwPageDescs& rArr, const String& rName )
+static SwPageDesc* lcl_FindPageDesc( const SwPageDescs& rArr, const String& rName )
{
for( sal_uInt16 n = rArr.size(); n; )
{
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 33e7d56..3215bb2 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1124,7 +1124,7 @@ void SwDoc::GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts,
Otherwise the new set will not be changed.
*/
-void lcl_CpyAttr( SfxItemSet &rNewSet, const SfxItemSet &rOldSet, sal_uInt16 nWhich )
+static void lcl_CpyAttr( SfxItemSet &rNewSet, const SfxItemSet &rOldSet, sal_uInt16 nWhich )
{
const SfxPoolItem *pOldItem = NULL, *pNewItem = NULL;
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 6ac2c6a..67dee01 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -577,7 +577,7 @@ sal_Bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
return MoveParagraph( aPam, nOffs, sal_True );
}
-sal_uInt16 lcl_FindOutlineName( const SwNodes& rNds, const String& rName,
+static sal_uInt16 lcl_FindOutlineName( const SwNodes& rNds, const String& rName,
sal_Bool bExact )
{
sal_uInt16 nSavePos = USHRT_MAX;
@@ -603,7 +603,7 @@ sal_uInt16 lcl_FindOutlineName( const SwNodes& rNds, const String& rName,
return nSavePos;
}
-sal_uInt16 lcl_FindOutlineNum( const SwNodes& rNds, String& rName )
+static sal_uInt16 lcl_FindOutlineNum( const SwNodes& rNds, String& rName )
{
// Valid numbers are (always just offsets!):
// ([Number]+\.)+ (as a regular expression!)
@@ -770,7 +770,7 @@ sal_Bool SwDoc::GotoOutline( SwPosition& rPos, const String& rName ) const
return sal_False;
}
-void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
+static void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
{
SwNumRule* pOld = rDoc.FindNumRulePtr( rRule.GetName() );
OSL_ENSURE( pOld, "we cannot proceed without the old NumRule" );
@@ -1390,7 +1390,7 @@ void SwDoc::InvalidateNumRules()
}
// To the next/preceding Bullet at the same Level
-sal_Bool lcl_IsNumOk( sal_uInt8 nSrchNum, sal_uInt8& rLower, sal_uInt8& rUpper,
+static sal_Bool lcl_IsNumOk( sal_uInt8 nSrchNum, sal_uInt8& rLower, sal_uInt8& rUpper,
sal_Bool bOverUpper, sal_uInt8 nNumber )
{
OSL_ENSURE( nNumber < MAXLEVEL,
@@ -1408,7 +1408,7 @@ sal_Bool lcl_IsNumOk( sal_uInt8 nSrchNum, sal_uInt8& rLower, sal_uInt8& rUpper,
return bRet;
}
-sal_Bool lcl_IsValidPrevNextNumNode( const SwNodeIndex& rIdx )
+static sal_Bool lcl_IsValidPrevNextNumNode( const SwNodeIndex& rIdx )
{
sal_Bool bRet = sal_False;
const SwNode& rNd = rIdx.GetNode();
@@ -1430,7 +1430,7 @@ sal_Bool lcl_IsValidPrevNextNumNode( const SwNodeIndex& rIdx )
return bRet;
}
-sal_Bool lcl_GotoNextPrevNum( SwPosition& rPos, sal_Bool bNext,
+static sal_Bool lcl_GotoNextPrevNum( SwPosition& rPos, sal_Bool bNext,
sal_Bool bOverUpper, sal_uInt8* pUpper, sal_uInt8* pLower )
{
const SwTxtNode* pNd = rPos.nNode.GetNode().GetTxtNode();
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index ee4babf..743fff3 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -62,7 +62,7 @@ TYPEINIT1(SwRedlineHint, SfxHint);
// 1. make sure that pPos->nContent points into pPos->nNode
// (or into the 'special' no-content-node-IndexReg)
// 2. check that position is valid and doesn't point behind text
- void lcl_CheckPosition( const SwPosition* pPos )
+ static void lcl_CheckPosition( const SwPosition* pPos )
{
SwPosition aComparePos( *pPos );
aComparePos.nContent.Assign(
@@ -85,7 +85,7 @@ TYPEINIT1(SwRedlineHint, SfxHint);
}
}
- void lcl_CheckPam( const SwPaM* pPam )
+ static void lcl_CheckPam( const SwPaM* pPam )
{
OSL_ENSURE( pPam != NULL, _ERROR_PREFIX "illegal argument" );
lcl_CheckPosition( pPam->GetPoint() );
@@ -94,7 +94,7 @@ TYPEINIT1(SwRedlineHint, SfxHint);
// check validity of the redline table. Checks redline bounds, and make
// sure the redlines are sorted and non-overlapping.
- void lcl_CheckRedline( const SwDoc* pDoc )
+ static void lcl_CheckRedline( const SwDoc* pDoc )
{
const SwRedlineTbl& rTbl = pDoc->GetRedlineTbl();
@@ -128,7 +128,7 @@ TYPEINIT1(SwRedlineHint, SfxHint);
#define _CHECK_REDLINE( pDoc ) lcl_CheckRedline( pDoc );
- void lcl_DebugRedline( const SwDoc* pDoc )
+ void sw_DebugRedline( const SwDoc* pDoc )
{
static sal_uInt16 nWatch = 0;
const SwRedlineTbl& rTbl = pDoc->GetRedlineTbl();
@@ -144,7 +144,7 @@ TYPEINIT1(SwRedlineHint, SfxHint);
}
}
- #define _DEBUG_REDLINE( pDoc ) lcl_DebugRedline( pDoc );
+ #define _DEBUG_REDLINE( pDoc ) sw_DebugRedline( pDoc );
#else
@@ -1570,7 +1570,7 @@ typedef sal_Bool (*Fn_AcceptReject)( SwRedlineTbl& rArr, sal_uInt16& rPos,
const SwPosition* pSttRng,
const SwPosition* pEndRng);
-sal_Bool lcl_AcceptRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
+static sal_Bool lcl_AcceptRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
sal_Bool bCallDelete,
const SwPosition* pSttRng = 0,
const SwPosition* pEndRng = 0 )
@@ -1729,7 +1729,7 @@ sal_Bool lcl_AcceptRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
return bRet;
}
-sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
+static sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
sal_Bool bCallDelete,
const SwPosition* pSttRng = 0,
const SwPosition* pEndRng = 0 )
@@ -1934,7 +1934,7 @@ sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
}
-const SwRedline* lcl_FindCurrRedline( const SwPosition& rSttPos,
+static const SwRedline* lcl_FindCurrRedline( const SwPosition& rSttPos,
sal_uInt16& rPos,
sal_Bool bNext = sal_True )
{
@@ -1963,7 +1963,7 @@ const SwRedline* lcl_FindCurrRedline( const SwPosition& rSttPos,
return pFnd;
}
-int lcl_AcceptRejectRedl( Fn_AcceptReject fn_AcceptReject,
+static int lcl_AcceptRejectRedl( Fn_AcceptReject fn_AcceptReject,
SwRedlineTbl& rArr, sal_Bool bCallDelete,
const SwPaM& rPam)
{
@@ -2008,7 +2008,7 @@ int lcl_AcceptRejectRedl( Fn_AcceptReject fn_AcceptReject,
return nCount;
}
-void lcl_AdjustRedlineRange( SwPaM& rPam )
+static void lcl_AdjustRedlineRange( SwPaM& rPam )
{
// The Selection is only in the ContentSection. If there are Redlines
// to Non-ContentNodes before or after that, then the Selections
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index d9f9124..180db61 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -697,7 +697,7 @@ sal_Bool SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName)
return bRet;
}
-const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl = 0 )
+static const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl = 0 )
{
const SwNode* pNd = &rNd;
if( pNd->GetNodes().GetEndOfExtras().GetIndex() > pNd->GetIndex() )
@@ -1346,7 +1346,7 @@ void SwTOXBaseSection::UpdateAuthorities( const SwTOXInternational& rIntl )
}
}
-long lcl_IsSOObject( const SvGlobalName& rFactoryNm )
+static long lcl_IsSOObject( const SvGlobalName& rFactoryNm )
{
static struct _SoObjType {
long nFlag;
@@ -1547,7 +1547,7 @@ void SwTOXBaseSection::UpdateTable( const SwTxtNode* pOwnChapterNode )
Description: Generate String according to the Form and remove the
special characters 0-31 and 255
--------------------------------------------------------------------*/
-String lcl_GetNumString( const SwTOXSortTabBase& rBase, sal_Bool bUsePrefix, sal_uInt8 nLevel )
+static String lcl_GetNumString( const SwTOXSortTabBase& rBase, sal_Bool bUsePrefix, sal_uInt8 nLevel )
{
String sRet;
@@ -1966,7 +1966,7 @@ void SwTOXBaseSection::UpdatePageNum()
Description: Replace the PageNumber place holders
--------------------------------------------------------------------*/
// search for the page no in the array of main entry page numbers
-sal_Bool lcl_HasMainEntry( const std::vector<sal_uInt16>* pMainEntryNums, sal_uInt16 nToFind )
+static sal_Bool lcl_HasMainEntry( const std::vector<sal_uInt16>* pMainEntryNums, sal_uInt16 nToFind )
{
for(sal_uInt16 i = 0; pMainEntryNums && i < pMainEntryNums->size(); ++i)
if(nToFind == (*pMainEntryNums)[i])
diff --git a/sw/source/core/doc/docxforms.cxx b/sw/source/core/doc/docxforms.cxx
index 8402a83..53f2c1d 100644
--- a/sw/source/core/doc/docxforms.cxx
+++ b/sw/source/core/doc/docxforms.cxx
@@ -62,7 +62,7 @@ bool SwDoc::isXForms() const
return xXForms.is();
}
-Reference<XInterface> lcl_createInstance( const sal_Char* pServiceName )
+static Reference<XInterface> lcl_createInstance( const sal_Char* pServiceName )
{
OSL_ENSURE( pServiceName != NULL, "no service name" );
return comphelper::getProcessServiceFactory()->createInstance(
diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx
index 6581000..a039c70 100644
--- a/sw/source/core/doc/gctable.cxx
+++ b/sw/source/core/doc/gctable.cxx
@@ -103,7 +103,7 @@ static void lcl_GCBorder_GetLastBox_B( const SwTableBox* pBox, SwTableBoxes* pPa
}
// Find the "end" of the passed BorderLine. Returns the "Layout"Pos!
-sal_uInt16 lcl_FindEndPosOfBorder( const SwCollectTblLineBoxes& rCollTLB,
+static sal_uInt16 lcl_FindEndPosOfBorder( const SwCollectTblLineBoxes& rCollTLB,
const SvxBorderLine& rBrdLn, sal_uInt16& rStt, sal_Bool bTop )
{
sal_uInt16 nPos, nLastPos = 0;
@@ -122,7 +122,7 @@ sal_uInt16 lcl_FindEndPosOfBorder( const SwCollectTblLineBoxes& rCollTLB,
return nLastPos;
}
-inline const SvxBorderLine* lcl_GCBorder_GetBorder( const SwTableBox& rBox,
+static inline const SvxBorderLine* lcl_GCBorder_GetBorder( const SwTableBox& rBox,
sal_Bool bTop,
const SfxPoolItem** ppItem )
{
@@ -131,7 +131,7 @@ inline const SvxBorderLine* lcl_GCBorder_GetBorder( const SwTableBox& rBox,
: 0;
}
-void lcl_GCBorder_DelBorder( const SwCollectTblLineBoxes& rCollTLB,
+static void lcl_GCBorder_DelBorder( const SwCollectTblLineBoxes& rCollTLB,
sal_uInt16& rStt, sal_Bool bTop,
const SvxBorderLine& rLine,
const SfxPoolItem* pItem,
@@ -171,7 +171,7 @@ void lcl_GCBorder_DelBorder( const SwCollectTblLineBoxes& rCollTLB,
static void lcl_GC_Box_Border( const SwTableBox* pBox, _SwGCLineBorder* pPara );
-void lcl_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara )
+void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara )
{
// First the right edge with the left edge of the succeeding Box within this Line
{
@@ -220,10 +220,10 @@ void lcl_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara )
SwCollectTblLineBoxes aBottom( sal_False );
SwCollectTblLineBoxes aTop( sal_True );
- ::lcl_Line_CollectBox( pLine, &aBottom );
+ sw_Line_CollectBox( pLine, &aBottom );
const SwTableLine* pNextLine = (*pGCPara->pLines)[ pGCPara->nLinePos+1 ];
- ::lcl_Line_CollectBox( pNextLine, &aTop );
+ sw_Line_CollectBox( pNextLine, &aTop );
// remove all "duplicated" Lines that are the same
sal_uInt16 nBtmPos, nTopPos,
@@ -322,7 +322,7 @@ static void lcl_GC_Box_Border( const SwTableBox* pBox, _SwGCLineBorder* pPara )
_SwGCLineBorder aPara( *pBox );
aPara.pShareFmts = pPara->pShareFmts;
BOOST_FOREACH( const SwTableLine* pLine, pBox->GetTabLines() )
- lcl_GC_Line_Border( pLine, &aPara );
+ sw_GC_Line_Border( pLine, &aPara );
}
}
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index d54c90f..c4f0ad5 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -92,7 +92,7 @@ inline sal_Bool GetRealURL( const SwGrfNode& rNd, String& rTxt )
return bRet;
}
-void lcl_PaintReplacement( const SwRect &rRect, const String &rText,
+static void lcl_PaintReplacement( const SwRect &rRect, const String &rText,
const ViewShell &rSh, const SwNoTxtFrm *pFrm,
sal_Bool bDefect )
{
@@ -204,7 +204,7 @@ void SetOutDev( ViewShell *pSh, OutputDevice *pOut )
-void lcl_ClearArea( const SwFrm &rFrm,
+static void lcl_ClearArea( const SwFrm &rFrm,
OutputDevice &rOut, const SwRect& rPtArea,
const SwRect &rGrfArea )
{
@@ -349,7 +349,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
*************************************************************************/
-void lcl_CalcRect( Point& rPt, Size& rDim, sal_uInt16 nMirror )
+static void lcl_CalcRect( Point& rPt, Size& rDim, sal_uInt16 nMirror )
{
if( nMirror == RES_MIRROR_GRAPH_VERT || nMirror == RES_MIRROR_GRAPH_BOTH )
{
@@ -745,7 +745,7 @@ void SwNoTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
}
}
-void lcl_correctlyAlignRect( SwRect& rAlignedGrfArea, const SwRect& rInArea, OutputDevice* pOut )
+static void lcl_correctlyAlignRect( SwRect& rAlignedGrfArea, const SwRect& rInArea, OutputDevice* pOut )
{
if(!pOut)
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 9343ef3..948df56 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -103,7 +103,7 @@ static const sal_uInt16 aHeadlineSizes[ 2 * MAXLEVEL ] = {
PT_7, PT_7, PT_7, PT_7, PT_7 // HTML mode
};
-long lcl_GetRightMargin( SwDoc& rDoc )
+static long lcl_GetRightMargin( SwDoc& rDoc )
{
// Make sure that the printer settings are taken over to the standard
// page template
@@ -144,7 +144,7 @@ void SetAllScriptItem( SfxItemSet& rSet, const SfxPoolItem& rItem )
rSet.Put( rItem, nWhCTL );
}
-void lcl_SetDfltFont( sal_uInt16 nFntType, SfxItemSet& rSet )
+static void lcl_SetDfltFont( sal_uInt16 nFntType, SfxItemSet& rSet )
{
static struct {
sal_uInt16 nResLngId;
@@ -167,7 +167,7 @@ void lcl_SetDfltFont( sal_uInt16 nFntType, SfxItemSet& rSet )
}
}
-void lcl_SetDfltFont( sal_uInt16 nLatinFntType, sal_uInt16 nCJKFntType,
+static void lcl_SetDfltFont( sal_uInt16 nLatinFntType, sal_uInt16 nCJKFntType,
sal_uInt16 nCTLFntType, SfxItemSet& rSet )
{
static struct {
@@ -196,7 +196,7 @@ void lcl_SetDfltFont( sal_uInt16 nLatinFntType, sal_uInt16 nCJKFntType,
}
}
-void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl,
+static void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl,
SfxItemSet& rSet,
sal_uInt16 nOutLvlBits, sal_uInt8 nLevel, sal_Bool bItalic )
{
@@ -256,7 +256,7 @@ void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl,
-void lcl_SetRegister( SwDoc* pDoc, SfxItemSet& rSet, sal_uInt16 nFact,
+static void lcl_SetRegister( SwDoc* pDoc, SfxItemSet& rSet, sal_uInt16 nFact,
sal_Bool bHeader, sal_Bool bTab )
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
@@ -282,7 +282,7 @@ void lcl_SetRegister( SwDoc* pDoc, SfxItemSet& rSet, sal_uInt16 nFact,
-void lcl_SetNumBul( SwDoc* pDoc, SwTxtFmtColl* pColl,
+static void lcl_SetNumBul( SwDoc* pDoc, SwTxtFmtColl* pColl,
SfxItemSet& rSet,
sal_uInt16 nNxt, SwTwips nEZ, SwTwips nLeft,
SwTwips nUpper, SwTwips nLower )
@@ -1418,7 +1418,7 @@ bool SwDoc::IsPoolFmtUsed( sal_uInt16 nId ) const
-void lcl_GetStdPgSize( SwDoc* pDoc, SfxItemSet& rSet )
+static void lcl_GetStdPgSize( SwDoc* pDoc, SfxItemSet& rSet )
{
SwPageDesc* pStdPgDsc = pDoc->GetPageDescFromPool( RES_POOLPAGE_STANDARD );
SwFmtFrmSize aFrmSz( pStdPgDsc->GetMaster().GetFrmSize() );
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 8c5858f..4fd021b 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -51,7 +51,7 @@
#include <list>
#include <boost/foreach.hpp>
-void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
+static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
SwTable& rDstTbl, SwTableBox* pDstBox,
sal_Bool bDelCntnt, SwUndoTblCpyTbl* pUndo );
@@ -517,7 +517,7 @@ namespace
// a "BaseLine".
// If there's no Line anymore, put it also into the last Box
// of a "BaseLine".
-void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
+static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
SwTable& rDstTbl, SwTableBox* pDstBox,
sal_Bool bDelCntnt, SwUndoTblCpyTbl* pUndo )
{
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 4a5876f..d4c54b4 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -168,17 +168,17 @@ struct CR_SetBoxWidth
}
};
-sal_Bool lcl_SetSelBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
+static sal_Bool lcl_SetSelBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
SwTwips nDist, sal_Bool bCheck );
-sal_Bool lcl_SetOtherBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
+static sal_Bool lcl_SetOtherBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
SwTwips nDist, sal_Bool bCheck );
-sal_Bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
+static sal_Bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
SwTwips nDist, sal_Bool bCheck );
-sal_Bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
+static sal_Bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
SwTwips nDist, sal_Bool bCheck );
-sal_Bool lcl_DelSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
+static sal_Bool lcl_DelSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
SwTwips nDist, sal_Bool bCheck );
-sal_Bool lcl_DelOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
+static sal_Bool lcl_DelOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
SwTwips nDist, sal_Bool bCheck );
typedef sal_Bool (*FN_lcl_SetBoxWidth)(SwTableLine*, CR_SetBoxWidth&, SwTwips, sal_Bool );
@@ -254,11 +254,11 @@ struct CR_SetLineHeight
}
};
-sal_Bool lcl_SetSelLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
+static sal_Bool lcl_SetSelLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
SwTwips nDist, sal_Bool bCheck );
-sal_Bool lcl_SetOtherLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
+static sal_Bool lcl_SetOtherLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
SwTwips nDist, sal_Bool bCheck );
-sal_Bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam,
+static sal_Bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam,
SwTwips nDist, sal_Bool bCheck );
typedef sal_Bool (*FN_lcl_SetLineHeight)(SwTableLine*, CR_SetLineHeight&, SwTwips, sal_Bool );
@@ -474,7 +474,7 @@ static void lcl_CopyRow(_FndLine& rFndLine, _CpyPara *const pCpyPara)
pCpyPara->nDelBorderFlag &= 0xf8;
}
-void lcl_InsCol( _FndLine* pFndLn, _CpyPara& rCpyPara, sal_uInt16 nCpyCnt,
+static void lcl_InsCol( _FndLine* pFndLn, _CpyPara& rCpyPara, sal_uInt16 nCpyCnt,
sal_Bool bBehind )
{
// Bug 29124: Not only copy in the BaseLines. If possible, we go down as far as possible
@@ -767,10 +767,10 @@ sal_Bool SwTable::AppendRow( SwDoc* pDoc, sal_uInt16 nCnt )
return sal_True;
}
-void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset,
+static void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset,
sal_Bool bFirst, SwShareBoxFmts& rShareFmts );
-void lcl_LastBoxSetWidthLine( SwTableLines &rLines, const long nOffset,
+static void lcl_LastBoxSetWidthLine( SwTableLines &rLines, const long nOffset,
sal_Bool bFirst, SwShareBoxFmts& rShareFmts )
{
for ( sal_uInt16 i = 0; i < rLines.size(); ++i )
@@ -778,7 +778,7 @@ void lcl_LastBoxSetWidthLine( SwTableLines &rLines, const long nOffset,
rShareFmts );
}
-void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset,
+static void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset,
sal_Bool bFirst, SwShareBoxFmts& rShareFmts )
{
SwTableBox& rBox = *(bFirst ? rBoxes.front() : rBoxes.back());
@@ -1413,7 +1413,7 @@ sal_Bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nC
----------------------- >> MERGE << ------------------------
*/
-void lcl_CpyLines( sal_uInt16 nStt, sal_uInt16 nEnd,
+static void lcl_CpyLines( sal_uInt16 nStt, sal_uInt16 nEnd,
SwTableLines& rLines,
SwTableBox* pInsBox,
sal_uInt16 nPos = USHRT_MAX )
@@ -1427,7 +1427,7 @@ void lcl_CpyLines( sal_uInt16 nStt, sal_uInt16 nEnd,
rLines.erase( rLines.begin() + nStt, rLines.begin() + nEnd );
}
-void lcl_CpyBoxes( sal_uInt16 nStt, sal_uInt16 nEnd,
+static void lcl_CpyBoxes( sal_uInt16 nStt, sal_uInt16 nEnd,
SwTableBoxes& rBoxes,
SwTableLine* pInsLine,
sal_uInt16 nPos = USHRT_MAX )
@@ -1441,7 +1441,7 @@ void lcl_CpyBoxes( sal_uInt16 nStt, sal_uInt16 nEnd,
rBoxes.erase( rBoxes.begin() + nStt, rBoxes.begin() + nEnd );
}
-void lcl_CalcWidth( SwTableBox* pBox )
+static void lcl_CalcWidth( SwTableBox* pBox )
{
// Assertion: Every Line in the Box is as large
SwFrmFmt* pFmt = pBox->ClaimFrmFmt();
@@ -1854,7 +1854,7 @@ sal_Bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
return sal_True;
}
-void lcl_CheckRowSpan( SwTable &rTbl )
+static void lcl_CheckRowSpan( SwTable &rTbl )
{
sal_uInt16 nLineCount = rTbl.GetTabLines().size();
sal_uInt16 nMaxSpan = nLineCount;
@@ -1876,7 +1876,7 @@ void lcl_CheckRowSpan( SwTable &rTbl )
}
}
-sal_uInt16 lcl_GetBoxOffset( const _FndBox& rBox )
+static sal_uInt16 lcl_GetBoxOffset( const _FndBox& rBox )
{
// Find the first Box
const _FndBox* pFirstBox = &rBox;
@@ -1896,7 +1896,7 @@ sal_uInt16 lcl_GetBoxOffset( const _FndBox& rBox )
return nRet;
}
-sal_uInt16 lcl_GetLineWidth( const _FndLine& rLine )
+static sal_uInt16 lcl_GetLineWidth( const _FndLine& rLine )
{
sal_uInt16 nRet = 0;
for( sal_uInt16 n = rLine.GetBoxes().size(); n; )
@@ -1907,7 +1907,7 @@ sal_uInt16 lcl_GetLineWidth( const _FndLine& rLine )
return nRet;
}
-void lcl_CalcNewWidths( const _FndLines& rFndLines, _CpyPara& rPara )
+static void lcl_CalcNewWidths( const _FndLines& rFndLines, _CpyPara& rPara )
{
rPara.pWidths.reset();
sal_uInt16 nLineCount = rFndLines.size();
@@ -2321,7 +2321,7 @@ sal_Bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
pLn = GetTabLines()[ nLnPos - 1 ];
for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
it != pLn->GetTabBoxes().end(); ++it)
- lcl_Box_CollectBox( *it, &aLnPara );
+ sw_Box_CollectBox( *it, &aLnPara );
if( aLnPara.Resize( lcl_GetBoxOffset( aFndBox ),
lcl_GetLineWidth( *pFndLn )) )
@@ -2330,7 +2330,7 @@ sal_Bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
pLn = pNewTbl->GetTabLines()[ 0 ];
for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
it != pLn->GetTabBoxes().end(); ++it)
- lcl_BoxSetSplitBoxFmts(*it, &aLnPara );
+ sw_BoxSetSplitBoxFmts(*it, &aLnPara );
}
}
@@ -2346,7 +2346,7 @@ sal_Bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
pLn = GetTabLines()[ nLnPos + 1 ];
for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
it != pLn->GetTabBoxes().end(); ++it)
- lcl_Box_CollectBox( *it, &aLnPara );
+ sw_Box_CollectBox( *it, &aLnPara );
if( aLnPara.Resize( lcl_GetBoxOffset( aFndBox ),
lcl_GetLineWidth( *pFndLn )) )
@@ -2355,7 +2355,7 @@ sal_Bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
pLn = pNewTbl->GetTabLines().back();
for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
it != pLn->GetTabBoxes().end(); ++it)
- lcl_BoxSetSplitBoxFmts(*it, &aLnPara );
+ sw_BoxSetSplitBoxFmts(*it, &aLnPara );
}
}
}
@@ -2507,16 +2507,16 @@ static void lcl_BoxSetHeadCondColl( const SwTableBox* pBox )
pSttNd->CheckSectionCondColl();
else
BOOST_FOREACH( const SwTableLine* pLine, pBox->GetTabLines() )
- lcl_LineSetHeadCondColl( pLine );
+ sw_LineSetHeadCondColl( pLine );
}
-void lcl_LineSetHeadCondColl( const SwTableLine* pLine )
+void sw_LineSetHeadCondColl( const SwTableLine* pLine )
{
BOOST_FOREACH( const SwTableBox* pBox, pLine->GetTabBoxes() )
lcl_BoxSetHeadCondColl(pBox);
}
-SwTwips lcl_GetDistance( SwTableBox* pBox, sal_Bool bLeft )
+static SwTwips lcl_GetDistance( SwTableBox* pBox, sal_Bool bLeft )
{
sal_Bool bFirst = sal_True;
SwTwips nRet = 0;
@@ -2537,7 +2537,7 @@ SwTwips lcl_GetDistance( SwTableBox* pBox, sal_Bool bLeft )
return nRet;
}
-sal_Bool lcl_SetSelBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
+static sal_Bool lcl_SetSelBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
SwTwips nDist, sal_Bool bCheck )
{
SwTableBoxes& rBoxes = pLine->GetTabBoxes();
@@ -2638,7 +2638,7 @@ sal_Bool lcl_SetSelBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
return sal_True;
}
-sal_Bool lcl_SetOtherBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
+static sal_Bool lcl_SetOtherBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
SwTwips nDist, sal_Bool bCheck )
{
SwTableBoxes& rBoxes = pLine->GetTabBoxes();
@@ -2732,7 +2732,7 @@ sal_Bool lcl_SetOtherBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
return sal_True;
}
-sal_Bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
+static sal_Bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
SwTwips nDist, sal_Bool bCheck )
{
SwTableBoxes& rBoxes = pLine->GetTabBoxes();
@@ -2867,7 +2867,7 @@ sal_Bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
return sal_True;
}
-sal_Bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
+static sal_Bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
SwTwips nDist, sal_Bool bCheck )
{
// Special case: There is no space in the other Boxes, but in the cell
@@ -3060,7 +3060,7 @@ SwComparePosition _CheckBoxInRange( sal_uInt16 nStt, sal_uInt16 nEnd,
return nRet;
}
-void lcl_DelSelBox_CorrLowers( SwTableLine& rLine, CR_SetBoxWidth& rParam,
+static void lcl_DelSelBox_CorrLowers( SwTableLine& rLine, CR_SetBoxWidth& rParam,
SwTwips nWidth )
{
// 1. step: Calculate own width
@@ -3096,7 +3096,7 @@ void lcl_DelSelBox_CorrLowers( SwTableLine& rLine, CR_SetBoxWidth& rParam,
}
}
-void lcl_ChgBoxSize( SwTableBox& rBox, CR_SetBoxWidth& rParam,
+static void lcl_ChgBoxSize( SwTableBox& rBox, CR_SetBoxWidth& rParam,
const SwFmtFrmSize& rOldSz,
sal_uInt16& rDelWidth, SwTwips nDist )
{
@@ -3155,7 +3155,7 @@ void lcl_ChgBoxSize( SwTableBox& rBox, CR_SetBoxWidth& rParam,
}
}
-sal_Bool lcl_DeleteBox_Rekursiv( CR_SetBoxWidth& rParam, SwTableBox& rBox,
+static sal_Bool lcl_DeleteBox_Rekursiv( CR_SetBoxWidth& rParam, SwTableBox& rBox,
sal_Bool bCheck )
{
sal_Bool bRet = sal_True;
@@ -3191,7 +3191,7 @@ sal_Bool lcl_DeleteBox_Rekursiv( CR_SetBoxWidth& rParam, SwTableBox& rBox,
return bRet;
}
-sal_Bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
+static sal_Bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
SwTwips nDist, sal_Bool bCheck )
{
SwTableBoxes& rBoxes = pTabLine->GetTabBoxes();
@@ -3461,12 +3461,12 @@ sal_Bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
}
// Dummy function for the method SetColWidth
-sal_Bool lcl_DelOtherBox( SwTableLine* , CR_SetBoxWidth& , SwTwips , sal_Bool )
+static sal_Bool lcl_DelOtherBox( SwTableLine* , CR_SetBoxWidth& , SwTwips , sal_Bool )
{
return sal_True;
}
-void lcl_AjustLines( SwTableLine* pLine, CR_SetBoxWidth& rParam )
+static void lcl_AjustLines( SwTableLine* pLine, CR_SetBoxWidth& rParam )
{
SwTableBoxes& rBoxes = pLine->GetTabBoxes();
for( sal_uInt16 n = 0; n < rBoxes.size(); ++n )
@@ -3510,7 +3510,7 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize )
}
#endif
-_FndBox* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo,
+static _FndBox* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo,
SwTableSortBoxes& rTmpLst, SwTwips nDistStt )
{
// Find all Boxes/Lines
@@ -4048,7 +4048,7 @@ sal_Bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
return bRet;
}
-_FndBox* lcl_SaveInsDelData( CR_SetLineHeight& rParam, SwUndo** ppUndo,
+static _FndBox* lcl_SaveInsDelData( CR_SetLineHeight& rParam, SwUndo** ppUndo,
SwTableSortBoxes& rTmpLst )
{
// Find all Boxes/Lines
@@ -4122,7 +4122,7 @@ void SetLineHeight( SwTableLine& rLine, SwTwips nOldHeight, SwTwips nNewHeight,
}
}
-sal_Bool lcl_SetSelLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
+static sal_Bool lcl_SetSelLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
SwTwips nDist, sal_Bool bCheck )
{
sal_Bool bRet = sal_True;
@@ -4144,7 +4144,7 @@ sal_Bool lcl_SetSelLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
return bRet;
}
-sal_Bool lcl_SetOtherLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
+static sal_Bool lcl_SetOtherLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
SwTwips nDist, sal_Bool bCheck )
{
sal_Bool bRet = sal_True;
@@ -4194,7 +4194,7 @@ sal_Bool lcl_SetOtherLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
return bRet;
}
-sal_Bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam,
+static sal_Bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam,
SwTwips nDist, sal_Bool bCheck )
{
sal_Bool bRet = sal_True;
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index d8b448e..20fe09f 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -533,7 +533,7 @@ void SwTxtNode::CopyCollFmt( SwTxtNode& rDestNd )
// Copy method from SwDoc
// Prevent copying in Flys that are anchored in the area
-sal_Bool lcl_ChkFlyFly( SwDoc* pDoc, sal_uLong nSttNd, sal_uLong nEndNd,
+static sal_Bool lcl_ChkFlyFly( SwDoc* pDoc, sal_uLong nSttNd, sal_uLong nEndNd,
sal_uLong nInsNd )
{
const SwFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts();
@@ -572,7 +572,7 @@ sal_Bool lcl_ChkFlyFly( SwDoc* pDoc, sal_uLong nSttNd, sal_uLong nEndNd,
return sal_False;
}
-void lcl_DeleteRedlines( const SwPaM& rPam, SwPaM& rCpyPam )
+static void lcl_DeleteRedlines( const SwPaM& rPam, SwPaM& rCpyPam )
{
const SwDoc* pSrcDoc = rPam.GetDoc();
const SwRedlineTbl& rTbl = pSrcDoc->GetRedlineTbl();
@@ -653,7 +653,7 @@ void lcl_DeleteRedlines( const SwPaM& rPam, SwPaM& rCpyPam )
}
}
-void lcl_DeleteRedlines( const SwNodeRange& rRg, SwNodeRange& rCpyRg )
+static void lcl_DeleteRedlines( const SwNodeRange& rRg, SwNodeRange& rCpyRg )
{
SwDoc* pSrcDoc = rRg.aStart.GetNode().GetDoc();
if( !pSrcDoc->GetRedlineTbl().empty() )
@@ -799,7 +799,7 @@ SwDoc::CopyRange( SwPaM& rPam, SwPosition& rPos, const bool bCopyAll ) const
return bRet;
}
-bool lcl_MarksWholeNode(const SwPaM & rPam)
+static bool lcl_MarksWholeNode(const SwPaM & rPam)
{
bool bResult = false;
const SwPosition* pStt = rPam.Start();
@@ -822,7 +822,7 @@ bool lcl_MarksWholeNode(const SwPaM & rPam)
}
// #i86492#
-bool lcl_ContainsOnlyParagraphsInList( const SwPaM& rPam )
+static bool lcl_ContainsOnlyParagraphsInList( const SwPaM& rPam )
{
bool bRet = false;
@@ -1371,7 +1371,7 @@ void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndConte
pDest->GetNodes()._DelDummyNodes( aCpyRange );
}
-void lcl_ChainFmts( SwFlyFrmFmt *pSrc, SwFlyFrmFmt *pDest )
+static void lcl_ChainFmts( SwFlyFrmFmt *pSrc, SwFlyFrmFmt *pDest )
{
SwFmtChain aSrc( pSrc->GetChain() );
if ( !aSrc.GetNext() )
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 2197ca6..27c1b7f 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -68,7 +68,7 @@
// #i21457# - new implementation of local method <lcl_IsInSameTblBox(..)>.
// Method now determines the previous/next on its own. Thus, it can be controlled,
// for which previous/next is checked, if it's visible.
-bool lcl_IsInSameTblBox( SwNodes& _rNds,
+static bool lcl_IsInSameTblBox( SwNodes& _rNds,
const SwNode& _rNd,
const bool _bPrev )
{
@@ -135,7 +135,7 @@ bool lcl_IsInSameTblBox( SwNodes& _rNds,
return true;
}
-void lcl_CheckEmptyLayFrm( SwNodes& rNds, SwSectionData& rSectionData,
+static void lcl_CheckEmptyLayFrm( SwNodes& rNds, SwSectionData& rSectionData,
const SwNode& rStt, const SwNode& rEnd )
{
SwNodeIndex aIdx( rStt );
@@ -768,7 +768,7 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData,
* --------------------------------------------------*/
// und dann waren da noch die Fussnoten:
-void lcl_DeleteFtn( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd )
+void sw_DeleteFtn( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd )
{
SwFtnIdxs& rFtnArr = pNd->GetDoc()->GetFtnIdxs();
if( rFtnArr.size() )
@@ -967,7 +967,7 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
((SwCntntNode*)pNd)->DelFrms();
}
- lcl_DeleteFtn( pSectNd, nStart, nEnde );
+ sw_DeleteFtn( pSectNd, nStart, nEnde );
if( bInsFrm )
{
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index e979768..228aa68 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -110,9 +110,9 @@ const sal_Unicode T2T_PARA = 0x0a;
extern void ClearFEShellTabCols();
// steht im gctable.cxx
-extern sal_Bool lcl_GC_Line_Border( const SwTableLine*& , void* pPara );
+extern sal_Bool sw_GC_Line_Border( const SwTableLine*& , void* pPara );
-void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8 nId )
+static void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8 nId )
{
sal_Bool bTop = sal_False, bBottom = sal_False, bLeft = sal_False, bRight = sal_False;
switch ( nId )
@@ -183,7 +183,7 @@ lcl_SetDfltBoxAttr(SwTableBox& rBox, DfltBoxAttrList_t & rBoxFmtArr,
rBox.ChgFrmFmt( pNewTableBoxFmt );
}
-SwTableBoxFmt *lcl_CreateDfltBoxFmt( SwDoc &rDoc, std::vector<SwTableBoxFmt*> &rBoxFmtArr,
+static SwTableBoxFmt *lcl_CreateDfltBoxFmt( SwDoc &rDoc, std::vector<SwTableBoxFmt*> &rBoxFmtArr,
sal_uInt16 nCols, sal_uInt8 nId )
{
if ( !rBoxFmtArr[nId] )
@@ -198,7 +198,7 @@ SwTableBoxFmt *lcl_CreateDfltBoxFmt( SwDoc &rDoc, std::vector<SwTableBoxFmt*> &r
return rBoxFmtArr[nId];
}
-SwTableBoxFmt *lcl_CreateAFmtBoxFmt( SwDoc &rDoc, std::vector<SwTableBoxFmt*> &rBoxFmtArr,
+static SwTableBoxFmt *lcl_CreateAFmtBoxFmt( SwDoc &rDoc, std::vector<SwTableBoxFmt*> &rBoxFmtArr,
const SwTableAutoFmt& rAutoFmt,
sal_uInt16 nCols, sal_uInt8 nId )
{
@@ -2549,7 +2549,7 @@ bool FuzzyCompare::operator() ( long s1, long s2 ) const
return ( s1 < s2 && abs( s1 - s2 ) > ROWFUZZY );
}
-bool lcl_IsFrmInColumn( const SwCellFrm& rFrm, SwSelBoxes& rBoxes )
+static bool lcl_IsFrmInColumn( const SwCellFrm& rFrm, SwSelBoxes& rBoxes )
{
for (size_t i = 0; i < rBoxes.size(); ++i)
{
@@ -3017,21 +3017,21 @@ sal_Bool SwCollectTblLineBoxes::Resize( sal_uInt16 nOffset, sal_uInt16 nOldWidth
return !aPosArr.empty();
}
-sal_Bool lcl_Line_CollectBox( const SwTableLine*& rpLine, void* pPara )
+sal_Bool sw_Line_CollectBox( const SwTableLine*& rpLine, void* pPara )
{
SwCollectTblLineBoxes* pSplPara = (SwCollectTblLineBoxes*)pPara;
if( pSplPara->IsGetValues() )
for( SwTableBoxes::iterator it = ((SwTableLine*)rpLine)->GetTabBoxes().begin();
it != ((SwTableLine*)rpLine)->GetTabBoxes().end(); ++it)
- lcl_Box_CollectBox(*it, pSplPara );
+ sw_Box_CollectBox(*it, pSplPara );
else
for( SwTableBoxes::iterator it = ((SwTableLine*)rpLine)->GetTabBoxes().begin();
it != ((SwTableLine*)rpLine)->GetTabBoxes().end(); ++it)
- lcl_BoxSetSplitBoxFmts(*it, pSplPara );
+ sw_BoxSetSplitBoxFmts(*it, pSplPara );
return sal_True;
}
-void lcl_Box_CollectBox( const SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara )
+void sw_Box_CollectBox( const SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara )
{
sal_uInt16 nLen = pBox->GetTabLines().size();
if( nLen )
@@ -3043,13 +3043,13 @@ void lcl_Box_CollectBox( const SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara
--nLen;
const SwTableLine* pLn = pBox->GetTabLines()[ nLen ];
- lcl_Line_CollectBox( pLn, pSplPara );
+ sw_Line_CollectBox( pLn, pSplPara );
}
else
pSplPara->AddBox( *pBox );
}
-void lcl_BoxSetSplitBoxFmts( SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara )
+void sw_BoxSetSplitBoxFmts( SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara )
{
sal_uInt16 nLen = pBox->GetTabLines().size();
if( nLen )
@@ -3061,7 +3061,7 @@ void lcl_BoxSetSplitBoxFmts( SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara )
--nLen;
const SwTableLine* pLn = pBox->GetTabLines()[ nLen ];
- lcl_Line_CollectBox( pLn, pSplPara );
+ sw_Line_CollectBox( pLn, pSplPara );
}
else
{
@@ -3192,13 +3192,13 @@ sal_Bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
rTbl.GetTabLines().size() - 1 ];
for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
it != pLn->GetTabBoxes().end(); ++it)
- lcl_Box_CollectBox(*it, &aPara );
+ sw_Box_CollectBox(*it, &aPara );
aPara.SetValues( sal_True );
pLn = pNew->GetTable().GetTabLines()[ 0 ];
for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
it != pLn->GetTabBoxes().end(); ++it)
- lcl_BoxSetSplitBoxFmts(*it, &aPara );
+ sw_BoxSetSplitBoxFmts(*it, &aPara );
// Kopfzeile wiederholen abschalten
pNew->GetTable().SetRowsToRepeat( 0 );
@@ -3217,13 +3217,13 @@ sal_Bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
SwTableLine* pLn = rTbl.GetTabLines()[ 0 ];
for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
it != pLn->GetTabBoxes().end(); ++it)
- lcl_Box_CollectBox(*it, &aPara );
+ sw_Box_CollectBox(*it, &aPara );
aPara.SetValues( sal_True );
pLn = pNew->GetTable().GetTabLines()[ 0 ];
for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
it != pLn->GetTabBoxes().end(); ++it)
- lcl_BoxSetSplitBoxFmts(*it, &aPara );
+ sw_BoxSetSplitBoxFmts(*it, &aPara );
}
break;
@@ -3260,7 +3260,7 @@ sal_Bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
return 0 != pNew;
}
-sal_Bool lcl_ChgTblSize( SwTable& rTbl )
+static sal_Bool lcl_ChgTblSize( SwTable& rTbl )
{
// das Attribut darf nicht ueber das Modify an der
// Tabelle gesetzt werden, denn sonst werden alle
@@ -3625,7 +3625,7 @@ sal_Bool SwNodes::MergeTable( const SwNodeIndex& rPos, sal_Bool bWithPrev,
// Header-Vorlagen in der Zeile setzen
// und ggfs. in der History speichern fuers Undo!!!
}
- lcl_LineSetHeadCondColl( pFirstLn );
+ sw_LineSetHeadCondColl( pFirstLn );
// und die Borders "aufrauemen"
if( nOldSize )
@@ -3633,7 +3633,7 @@ sal_Bool SwNodes::MergeTable( const SwNodeIndex& rPos, sal_Bool bWithPrev,
_SwGCLineBorder aPara( rTbl );
aPara.nLinePos = --nOldSize;
pFirstLn = rTbl.GetTabLines()[ nOldSize ];
- lcl_GC_Line_Border( pFirstLn, &aPara );
+ sw_GC_Line_Border( pFirstLn, &aPara );
}
//Layout updaten
@@ -3661,10 +3661,10 @@ struct _SetAFmtTabPara
// forward deklarieren damit sich die Lines und Boxen rekursiv aufrufen
// koennen.
-sal_Bool lcl_SetAFmtBox(_FndBox &, _SetAFmtTabPara *pSetPara);
-sal_Bool lcl_SetAFmtLine(_FndLine &, _SetAFmtTabPara *pPara);
+static sal_Bool lcl_SetAFmtBox(_FndBox &, _SetAFmtTabPara *pSetPara);
+static sal_Bool lcl_SetAFmtLine(_FndLine &, _SetAFmtTabPara *pPara);
-sal_Bool lcl_SetAFmtLine(_FndLine & rLine, _SetAFmtTabPara *pPara)
+static sal_Bool lcl_SetAFmtLine(_FndLine & rLine, _SetAFmtTabPara *pPara)
{
for (_FndBoxes::iterator it = rLine.GetBoxes().begin();
it != rLine.GetBoxes().end(); ++it)
@@ -3674,7 +3674,7 @@ sal_Bool lcl_SetAFmtLine(_FndLine & rLine, _SetAFmtTabPara *pPara)
return sal_True;
}
-sal_Bool lcl_SetAFmtBox( _FndBox & rBox, _SetAFmtTabPara *pSetPara )
+static sal_Bool lcl_SetAFmtBox( _FndBox & rBox, _SetAFmtTabPara *pSetPara )
{
if (!rBox.GetUpper()->GetUpper()) // Box on first level?
{
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index 024fd77..a0f59b7 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -106,7 +106,7 @@ void SwTblFmtCmp::Delete( std::vector<SwTblFmtCmp*> &rArr )
delete rArr[i];
}
-void lcl_GetStartEndCell( const SwCursor& rCrsr,
+static void lcl_GetStartEndCell( const SwCursor& rCrsr,
SwLayoutFrm *&prStart, SwLayoutFrm *&prEnd )
{
OSL_ENSURE( rCrsr.GetCntntNode() && rCrsr.GetCntntNode( sal_False ),
@@ -131,7 +131,7 @@ void lcl_GetStartEndCell( const SwCursor& rCrsr,
prEnd = pMarkFrm ? pMarkFrm->GetUpper() : 0;
}
-sal_Bool lcl_GetBoxSel( const SwCursor& rCursor, SwSelBoxes& rBoxes,
+static sal_Bool lcl_GetBoxSel( const SwCursor& rCursor, SwSelBoxes& rBoxes,
sal_Bool bAllCrsr = sal_False )
{
const SwTableCursor* pTblCrsr =
@@ -176,7 +176,7 @@ inline void InsertLine( std::vector<SwTableLine*>& rLineArr, SwTableLine* pLine
//-----------------------------------------------------------------------------
-sal_Bool lcl_IsAnLower( const SwTableLine *pLine, const SwTableLine *pAssumed )
+static sal_Bool lcl_IsAnLower( const SwTableLine *pLine, const SwTableLine *pAssumed )
{
const SwTableLine *pTmp = pAssumed->GetUpper() ?
pAssumed->GetUpper()->GetUpper() : 0;
@@ -243,7 +243,7 @@ sal_Bool _FindLine( _FndLine& rLine, LinesAndTable* pPara )
return sal_True;
}
-void lcl_CollectLines( std::vector<SwTableLine*> &rArr, const SwCursor& rCursor, bool bRemoveLines )
+static void lcl_CollectLines( std::vector<SwTableLine*> &rArr, const SwCursor& rCursor, bool bRemoveLines )
{
//Zuerst die selektierten Boxen einsammeln.
SwSelBoxes aBoxes;
@@ -285,7 +285,7 @@ void lcl_CollectLines( std::vector<SwTableLine*> &rArr, const SwCursor& rCursor,
//-----------------------------------------------------------------------------
-void lcl_ProcessRowAttr( std::vector<SwTblFmtCmp*>& rFmtCmp, SwTableLine* pLine, const SfxPoolItem& rNew )
+static void lcl_ProcessRowAttr( std::vector<SwTblFmtCmp*>& rFmtCmp, SwTableLine* pLine, const SfxPoolItem& rNew )
{
SwFrmFmt *pNewFmt;
if ( 0 != (pNewFmt = SwTblFmtCmp::FindNewFmt( rFmtCmp, pLine->GetFrmFmt(), 0 )))
@@ -301,9 +301,9 @@ void lcl_ProcessRowAttr( std::vector<SwTblFmtCmp*>& rFmtCmp, SwTableLine* pLine,
//-----------------------------------------------------------------------------
-void lcl_ProcessBoxSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableBox *pBox, const SwFmtFrmSize &rNew );
+static void lcl_ProcessBoxSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableBox *pBox, const SwFmtFrmSize &rNew );
-void lcl_ProcessRowSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableLine *pLine, const SwFmtFrmSize &rNew )
+static void lcl_ProcessRowSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableLine *pLine, const SwFmtFrmSize &rNew )
{
lcl_ProcessRowAttr( rFmtCmp, pLine, rNew );
SwTableBoxes &rBoxes = pLine->GetTabBoxes();
@@ -313,7 +313,7 @@ void lcl_ProcessRowSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableLine *pLine,
//-----------------------------------------------------------------------------
-void lcl_ProcessBoxSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableBox *pBox, const SwFmtFrmSize &rNew )
+static void lcl_ProcessBoxSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableBox *pBox, const SwFmtFrmSize &rNew )
{
SwTableLines &rLines = pBox->GetTabLines();
if ( !rLines.empty() )
@@ -562,7 +562,7 @@ inline void InsertCell( std::vector<SwCellFrm*>& rCellArr, SwCellFrm* pCellFrm )
}
//-----------------------------------------------------------------------------
-void lcl_CollectCells( std::vector<SwCellFrm*> &rArr, const SwRect &rUnion,
+static void lcl_CollectCells( std::vector<SwCellFrm*> &rArr, const SwRect &rUnion,
SwTabFrm *pTab )
{
SwLayoutFrm *pCell = pTab->FirstCell();
@@ -813,7 +813,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
}
}
-void lcl_SetLineStyle( SvxBorderLine *pToSet,
+static void lcl_SetLineStyle( SvxBorderLine *pToSet,
const Color *pColor, const SvxBorderLine *pBorderLine)
{
if ( pBorderLine )
@@ -1275,7 +1275,7 @@ sal_uInt16 SwDoc::GetBoxAlign( const SwCursor& rCursor ) const
#* Class : SwDoc
#* Methoden : AdjustCellWidth()
#***********************************************************************/
-sal_uInt16 lcl_CalcCellFit( const SwLayoutFrm *pCell )
+static sal_uInt16 lcl_CalcCellFit( const SwLayoutFrm *pCell )
{
SwTwips nRet = 0;
const SwFrm *pFrm = pCell->Lower(); //Die ganze Zelle.
@@ -1315,7 +1315,7 @@ sal_uInt16 lcl_CalcCellFit( const SwLayoutFrm *pCell )
*dieser erhalten, kleinere Wuensche werden ueberschrieben.
*/
-void lcl_CalcSubColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols &rCols,
+static void lcl_CalcSubColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols &rCols,
const SwLayoutFrm *pCell, const SwLayoutFrm *pTab,
sal_Bool bWishValues )
{
@@ -1375,7 +1375,7 @@ void lcl_CalcSubColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols &rC
* schneidet wird der Minimalwert ermittelt.
*/
-void lcl_CalcColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols &rCols,
+static void lcl_CalcColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols &rCols,
const SwLayoutFrm *pStart, const SwLayoutFrm *pEnd,
sal_Bool bWishValues )
{
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 8549958..c21e4c5 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -698,7 +698,7 @@ SwSection * SwSectionFmt::GetSection() const
return SwIterator<SwSection,SwSectionFmt>::FirstElement( *this );
}
-extern void lcl_DeleteFtn( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd );
+extern void sw_DeleteFtn( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd );
//Vernichtet alle Frms in aDepend (Frms werden per PTR_CAST erkannt).
void SwSectionFmt::DelFrms()
@@ -724,7 +724,7 @@ void SwSectionFmt::DelFrms()
sal_uLong nEnde = pSectNd->EndOfSectionIndex();
sal_uLong nStart = pSectNd->GetIndex()+1;
- lcl_DeleteFtn( pSectNd, nStart, nEnde );
+ sw_DeleteFtn( pSectNd, nStart, nEnde );
}
if( pIdx )
{
@@ -1113,7 +1113,7 @@ SwSectionFmt::MakeUnoObject()
// Method to break section links inside a linked section
-void lcl_BreakSectionLinksInSect( const SwSectionNode& rSectNd )
+static void lcl_BreakSectionLinksInSect( const SwSectionNode& rSectNd )
{
if ( !rSectNd.GetDoc() )
{
@@ -1147,7 +1147,7 @@ void lcl_BreakSectionLinksInSect( const SwSectionNode& rSectNd )
}
}
-void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
+static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
{
SwDoc* pDoc = rSectNd.GetDoc();
SwDocShell* pDShell = pDoc->GetDocShell();
@@ -1202,7 +1202,7 @@ void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
// 1 - DocShell ist ein existieren Document
// 2 - DocShell wurde neu angelegt, muss also wieder geschlossen werden ( will be assigned to xLockRef additionaly )
-int lcl_FindDocShell( SfxObjectShellRef& xDocSh,
+int sw_FindDocShell( SfxObjectShellRef& xDocSh,
SfxObjectShellLock& xLockRef,
const String& rFileName,
const String& rPasswd,
@@ -1397,7 +1397,7 @@ int lcl_FindDocShell( SfxObjectShellRef& xDocSh,
}
else
{
- nRet = lcl_FindDocShell( xDocSh, xLockRef, sFileName,
+ nRet = sw_FindDocShell( xDocSh, xLockRef, sFileName,
rSection.GetLinkFilePassword(),
sFilter, 0, pDoc->GetDocShell() );
if( nRet )
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 1a797f3..b4ffc38 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -68,7 +68,7 @@ TYPEINIT1( SwBaseLink, ::sfx2::SvBaseLink );
SV_IMPL_REF( SwServerObject )
-void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
+static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
{
//call fist all not SwNoTxtFrames, then the SwNoTxtFrames.
// The reason is, that in the SwNoTxtFrames the Graphic
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 6f72799..bce18be 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1059,7 +1059,7 @@ void SwDrawContact::NotifyBackgrdOfAllVirtObjs( const Rectangle* pOldBoundRect )
}
// OD 2004-04-08 #i26791# - local method to notify the background for a drawing object
-void lcl_NotifyBackgroundOfObj( SwDrawContact& _rDrawContact,
+static void lcl_NotifyBackgroundOfObj( SwDrawContact& _rDrawContact,
const SdrObject& _rObj,
const Rectangle* _pOldObjRect )
{
@@ -1754,7 +1754,7 @@ void SwDrawContact::DisconnectObjFromLayout( SdrObject* _pDrawObj )
|* SwDrawContact::ConnectToLayout()
|*
|*************************************************************************/
-SwTxtFrm* lcl_GetFlyInCntntAnchor( SwTxtFrm* _pProposedAnchorFrm,
+static SwTxtFrm* lcl_GetFlyInCntntAnchor( SwTxtFrm* _pProposedAnchorFrm,
const xub_StrLen _nTxtOfs )
{
SwTxtFrm* pAct = _pProposedAnchorFrm;
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 46260de..b4a8058 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -82,7 +82,7 @@ sal_Bool SwSdrHdl::IsFocusHdl() const
return SdrHdl::IsFocusHdl();
}
-const SwFrm *lcl_FindAnchor( const SdrObject *pObj, sal_Bool bAll )
+static const SwFrm *lcl_FindAnchor( const SdrObject *pObj, sal_Bool bAll )
{
const SwVirtFlyDrawObj *pVirt = pObj->ISA(SwVirtFlyDrawObj) ?
(SwVirtFlyDrawObj*)pObj : 0;
@@ -354,7 +354,7 @@ SdrObject* SwDrawView::GetMaxToBtmObj(SdrObject* pObj) const
|*
*************************************************************************/
-inline sal_Bool lcl_IsChild( SdrObject *pParent, SdrObject *pChild )
+static inline sal_Bool lcl_IsChild( SdrObject *pParent, SdrObject *pChild )
{
if ( pParent->ISA(SwVirtFlyDrawObj) )
{
@@ -367,7 +367,7 @@ inline sal_Bool lcl_IsChild( SdrObject *pParent, SdrObject *pChild )
return sal_False;
}
-inline SdrObject *lcl_FindParent( SdrObject *pObj )
+static inline SdrObject *lcl_FindParent( SdrObject *pObj )
{
const SwFrm *pAnch = lcl_FindAnchor( pObj, sal_False );
if ( pAnch && pAnch->IsInFly() )
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index b1dcfe2..71f7127 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -448,7 +448,7 @@ void SwEditShell::MoveLeftMargin( sal_Bool bRight, sal_Bool bModulus )
}
-inline sal_uInt16 lcl_SetScriptFlags( sal_uInt16 nType )
+static inline sal_uInt16 lcl_SetScriptFlags( sal_uInt16 nType )
{
sal_uInt16 nRet;
switch( nType )
@@ -461,7 +461,7 @@ inline sal_uInt16 lcl_SetScriptFlags( sal_uInt16 nType )
return nRet;
}
-sal_Bool lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, xub_StrLen nPos,
+static sal_Bool lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, xub_StrLen nPos,
sal_uInt16 &rScrpt, sal_Bool bInSelection, sal_Bool bNum )
{
sal_Bool bRet = sal_False;
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index cc4126d..08b6b78 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -297,7 +297,7 @@ SwField* SwEditShell::GetCurFld() const
|* Beschreibung Stehen die PaMs auf Feldern ?
|*
*************************************************************************/
-SwTxtFld* lcl_FindInputFld( SwDoc* pDoc, SwField& rFld )
+static SwTxtFld* lcl_FindInputFld( SwDoc* pDoc, SwField& rFld )
{
// suche das Feld ueber seine Addresse. Muss fuer InputFelder in
// geschuetzten Feldern erfolgen
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 03b45d2..f986e75 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -1246,7 +1246,7 @@ void SwEditShell::PutSpellingToSentenceStart()
pSpellIter->ToSentenceStart();
}
-sal_uInt32 lcl_CountRedlines(
+static sal_uInt32 lcl_CountRedlines(
const ::svx::SpellPortions& rLastPortions)
{
sal_uInt32 nRet = 0;
@@ -1426,7 +1426,7 @@ void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions,
collect all deleted redlines of the current text node beginning at the
start of the cursor position
-----------------------------------------------------------------------*/
-SpellContentPositions lcl_CollectDeletedRedlines(SwEditShell* pSh)
+static SpellContentPositions lcl_CollectDeletedRedlines(SwEditShell* pSh)
{
SpellContentPositions aRedlines;
SwDoc* pDoc = pSh->GetDoc();
@@ -1465,7 +1465,7 @@ SpellContentPositions lcl_CollectDeletedRedlines(SwEditShell* pSh)
/*-------------------------------------------------------------------------
remove the redline positions after the current selection
-----------------------------------------------------------------------*/
-void lcl_CutRedlines( SpellContentPositions& aDeletedRedlines, SwEditShell* pSh )
+static void lcl_CutRedlines( SpellContentPositions& aDeletedRedlines, SwEditShell* pSh )
{
if(!aDeletedRedlines.empty())
{
@@ -1480,7 +1480,7 @@ void lcl_CutRedlines( SpellContentPositions& aDeletedRedlines, SwEditShell* pSh
}
}
-SpellContentPosition lcl_FindNextDeletedRedline(
+static SpellContentPosition lcl_FindNextDeletedRedline(
const SpellContentPositions& rDeletedRedlines,
xub_StrLen nSearchFrom )
{
@@ -1707,7 +1707,7 @@ void SwSpellIter::ToSentenceStart()
bBackToStartOfSentence = true;
}
-LanguageType lcl_GetLanguage(SwEditShell& rSh)
+static LanguageType lcl_GetLanguage(SwEditShell& rSh)
{
sal_uInt16 nScriptType = rSh.GetScriptType();
sal_uInt16 nLangWhichId = RES_CHRATR_LANGUAGE;
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index f2273e6..2597538 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -577,7 +577,7 @@ sal_Bool SwEditShell::IsProtectedOutlinePara() const
* 2) outline must not be within table
* 3) if bCopy is set, outline must not be write protected
*/
-sal_Bool lcl_IsOutlineMoveAndCopyable( const SwDoc* pDoc, sal_uInt16 nIdx, bool bCopy )
+static sal_Bool lcl_IsOutlineMoveAndCopyable( const SwDoc* pDoc, sal_uInt16 nIdx, bool bCopy )
{
const SwNodes& rNds = pDoc->GetNodes();
const SwNode* pNd = rNds.GetOutLineNds()[ nIdx ];
diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx
index 19e9c06..abc6a34 100644
--- a/sw/source/core/edit/edredln.cxx
+++ b/sw/source/core/edit/edredln.cxx
@@ -58,7 +58,7 @@ const SwRedline& SwEditShell::GetRedline( sal_uInt16 nPos ) const
return *GetDoc()->GetRedlineTbl()[ nPos ];
}
-void lcl_InvalidateAll( ViewShell* pSh )
+static void lcl_InvalidateAll( ViewShell* pSh )
{
ViewShell *pStop = pSh;
do
diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index 86ce8b4..cc69005 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -320,7 +320,7 @@ sal_uInt16 SwEditShell::GetFullSelectedSectionCount() const
*
* If a suitable node is found, an SwNode* is returned; else it is NULL.
*/
-const SwNode* lcl_SpecialInsertNode(const SwPosition* pCurrentPos)
+static const SwNode* lcl_SpecialInsertNode(const SwPosition* pCurrentPos)
{
const SwNode* pReturn = NULL;
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index 8341cd2..8a701c0 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -46,7 +46,7 @@
/** helper function to select all objects in an SdrMarkList;
* implementation: see below */
-void lcl_SelectSdrMarkList( SwEditShell* pShell,
+static void lcl_SelectSdrMarkList( SwEditShell* pShell,
const SdrMarkList* pSdrMarkList );
bool SwEditShell::CursorsLocked() const
@@ -239,7 +239,7 @@ bool SwEditShell::Repeat(sal_uInt16 const nCount)
}
-void lcl_SelectSdrMarkList( SwEditShell* pShell,
+static void lcl_SelectSdrMarkList( SwEditShell* pShell,
const SdrMarkList* pSdrMarkList )
{
OSL_ENSURE( pShell != NULL, "need shell!" );
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 6c15b8b..311e59e 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -658,7 +658,7 @@ bool SwAuthorityField::QueryValue( Any& rAny, sal_uInt16 /*nWhichId*/ ) const
return false;
}
-sal_Int16 lcl_Find(const OUString& rFieldName)
+static sal_Int16 lcl_Find(const OUString& rFieldName)
{
for(sal_Int16 i = 0; i < AUTH_FIELD_END; i++)
if(!rFieldName.compareToAscii(aFieldNames[i]))
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 430067f..d3b3e11 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -54,10 +54,10 @@ const sal_Unicode cRelKennung = ''; // CTRL-R
const sal_uInt16 cMAXSTACKSIZE = 50;
-const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox );
-long lcl_GetLongBoxNum( String& rStr );
-const SwTableBox* lcl_RelToBox( const SwTable&, const SwTableBox*, const String& );
-String lcl_BoxNmToRel( const SwTable&, const SwTableNode&,
+static const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox );
+static long lcl_GetLongBoxNum( String& rStr );
+static const SwTableBox* lcl_RelToBox( const SwTable&, const SwTableBox*, const String& );
+static String lcl_BoxNmToRel( const SwTable&, const SwTableNode&,
const String& , const String& , bool );
@@ -713,7 +713,7 @@ const SwTable* SwTableFormula::FindTable( SwDoc& rDoc, const String& rNm ) const
return pRet;
}
-const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox )
+static const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox )
{
SwNodeIndex aIdx( *rBox.GetSttNd() );
SwCntntNode* pCNd = aIdx.GetNodes().GoNext( &aIdx );
@@ -722,7 +722,7 @@ const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox )
return pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, NULL, sal_False );
}
-long lcl_GetLongBoxNum( String& rStr )
+static long lcl_GetLongBoxNum( String& rStr )
{
sal_uInt16 nPos;
long nRet;
@@ -739,7 +739,7 @@ long lcl_GetLongBoxNum( String& rStr )
return nRet;
}
-const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
+static const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
const SwTableBox* pRefBox,
const String& rGetName )
{
@@ -825,7 +825,7 @@ const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
return pBox;
}
-String lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd,
+static String lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd,
const String& rRefBoxNm, const String& rGetStr,
bool bExtrnlNm )
{
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index 8e8d219..713684b 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -57,7 +57,7 @@ using ::rtl::OUString;
Beschreibung: Datenbanktrenner durch Punkte fuer Anzeige ersetzen
--------------------------------------------------------------------*/
-String lcl_DBTrennConv(const String& aContent)
+static String lcl_DBTrennConv(const String& aContent)
{
String sTmp(aContent);
sal_Unicode* pStr = sTmp.GetBufferAccess();
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index de0ca82..181f474 100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list