diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-10-12 16:49:40 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-10-12 16:56:54 +0200 |
| commit | 21d10c6f3266d4fac9c91f9d0fab529a6841b39e (patch) | |
| tree | d4436c5d48e16d81518906f5337bd16ae1dec823 | |
| parent | 908794d36f489c60835bfa8a17ac6bd9c256c7df (diff) | |
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
224 files changed, 961 insertions, 973 deletions
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index 247717e12c91..0aad748dc17f 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 a47bbaf40f10..dc8c5db4deaa 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 18a00290d93d..f81830e47e70 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 0ae229aefcb8..e9a14bb10e93 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 8de93ef8b364..450d29070267 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 29ae8cb48fcc..e1a749ca37e1 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 8dfc238133a3..2e4b70905588 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 7a5218d68e08..2e44aeabca9c 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 8572f9c60aea..9490c410d6fb 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 ade7b397cc90..76c843bc8de6 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 81ac674a4626..1ef6f04f75cd 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 fa1509366584..434bf3473387 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 84804f6998fd..07fc9a4b8ab4 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 3719ef581442..334ee88f48ea 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 2a67f675b864..fc7b9bf9920d 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 62691a1b3b3f..6319d4248d89 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 51d91efe1f44..25b81e071626 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 14ef5ae8ab92..ad533694f48c 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 d68fd40b38bc..2e277a50f70d 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 f57fcecc7008..2dc8f3ebd25b 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 ea14782d1ad7..833ece4c1fe1 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 33e7d5646021..3215bb2004c7 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 6ac2c6ad6cb7..67dee01c8a4c 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 ee4babf76605..743fff315ee9 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 d9f91248439c..180db6130c81 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 8402a83c8ad4..53f2c1da9002 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 6581000483f7..a039c706833a 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 d54c90f5309f..c4f0ad5b6cb6 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 9343ef31182e..948df56df0ab 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 8c5858f71a4f..4fd021b38eaf 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 4a5876ff487f..d4c54b47d33b 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 d8b448ed2a41..20fe09fdf83a 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 2197ca6d5931..27c1b7ff952b 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 e979768de6b6..228aa68d309d 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 024fd77e1107..a0f59b79cbe3 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 854995816a11..c21e4c5b0e49 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 1a797f36da64..b4ffc38ae8dd 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 6f72799d998d..bce18be04207 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 46260deb68c5..b4a8058794da 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 b1dcfe22d413..71f7127eb438 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 cc4126de2a73..08b6b786b6a7 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 03b45d2315df..f986e756735c 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 f2273e619a09..2597538e9a39 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 19e9c0664a22..abc6a341ecaf 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 86ce8b4160fa..cc6900500a03 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 8341cd256e68..8a701c0d0dfa 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 6c15b8b0f0cf..311e59e930b4 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 430067fbe292..d3b3e1120188 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 8e8d21950be9..713684b54c46 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 de0ca82641df..181f474a1038 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -886,7 +886,7 @@ SwFieldType* SwDocInfoFieldType::Copy() const return pTyp; } -void lcl_GetLocalDataWrapper( sal_uLong nLang, +static void lcl_GetLocalDataWrapper( sal_uLong nLang, const LocaleDataWrapper **ppAppLocalData, const LocaleDataWrapper **ppLocalData ) { @@ -1061,14 +1061,14 @@ SwDocInfoField::SwDocInfoField(SwDocInfoFieldType* pTyp, sal_uInt16 nSub, const template<class T> -double lcl_TimeToDouble( const T& rTime ) +static double lcl_TimeToDouble( const T& rTime ) { const double fMilliSecondsPerDay = 86400000.0; return ((rTime.Hours*3600000)+(rTime.Minutes*60000)+(rTime.Seconds*1000)+(rTime.HundredthSeconds*10)) / fMilliSecondsPerDay; } template<class D> -double lcl_DateToDouble( const D& rDate, const Date& rNullDate ) +static double lcl_DateToDouble( const D& rDate, const Date& rNullDate ) { long nDate = Date::DateToDays( rDate.Day, rDate.Month, rDate.Year ); long nNullDate = Date::DateToDays( rNullDate.GetDay(), rNullDate.GetMonth(), rNullDate.GetYear() ); diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index acf402a930d5..5701f0139482 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -69,7 +69,7 @@ using namespace ::com::sun::star::text; using ::rtl::OUString; //----------------------------------------------------------------------------- -sal_Int16 lcl_SubTypeToAPI(sal_uInt16 nSubType) +static sal_Int16 lcl_SubTypeToAPI(sal_uInt16 nSubType) { sal_Int16 nRet = 0; switch(nSubType) @@ -90,7 +90,7 @@ sal_Int16 lcl_SubTypeToAPI(sal_uInt16 nSubType) return nRet; } //----------------------------------------------------------------------------- -sal_Int32 lcl_APIToSubType(const uno::Any& rAny) +static sal_Int32 lcl_APIToSubType(const uno::Any& rAny) { sal_Int16 nVal = 0; rAny >>= nVal; diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 2a693ea48810..38bcee9173ce 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -56,7 +56,7 @@ using namespace ::com::sun::star; using namespace nsSwDocInfoSubType; -sal_uInt16 lcl_GetLanguageOfFormat( sal_uInt16 nLng, sal_uLong nFmt, +static sal_uInt16 lcl_GetLanguageOfFormat( sal_uInt16 nLng, sal_uLong nFmt, const SvNumberFormatter& rFormatter ) { if( nLng == LANGUAGE_NONE ) // wegen Bug #60010 diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 5b8094f67f96..e811cfd42417 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -78,7 +78,7 @@ using ::rtl::OUString; extern void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx, sal_uInt16* pInsPos = 0 ); -void lcl_GetLayTree( const SwFrm* pFrm, std::vector<const SwFrm*>& rArr ) +static void lcl_GetLayTree( const SwFrm* pFrm, std::vector<const SwFrm*>& rArr ) { while( pFrm ) { diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index e9d430d38fa1..d3326a987d23 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -235,7 +235,7 @@ sal_Bool SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt ) return bRet; } -const Point &lcl_FindBasePos( const SwFrm *pFrm, const Point &rPt ) +static const Point &lcl_FindBasePos( const SwFrm *pFrm, const Point &rPt ) { const SwFrm *pF = pFrm; while ( pF && !pF->Frm().IsInside( rPt ) ) @@ -251,7 +251,7 @@ const Point &lcl_FindBasePos( const SwFrm *pFrm, const Point &rPt ) return pFrm->Frm().Pos(); } -sal_Bool lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyFrm* pFly, +static sal_Bool lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyFrm* pFly, const Point& rInsPt, SwFEShell& rDestShell, SwFmtAnchor& rAnchor, Point& rNewPos, sal_Bool bCheckFlyRecur ) { @@ -1303,7 +1303,7 @@ sal_Bool SwFEShell::GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const // #i50824# // replace method <lcl_RemoveOleObjsFromSdrModel> by <lcl_ConvertSdrOle2ObjsToSdrGrafObjs> -void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SdrModel* _pModel ) +static void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SdrModel* _pModel ) { for ( sal_uInt16 nPgNum = 0; nPgNum < _pModel->GetPageCount(); ++nPgNum ) { diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 8c575f4dba4b..a6e73a1518de 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -92,7 +92,7 @@ void RegistFlys( SwPageFrm*, const SwLayoutFrm* ); #* will be made, to fit to the format #***********************************************************************/ -sal_Bool lcl_SetNewFlyPos( const SwNode& rNode, SwFmtAnchor& rAnchor, +static sal_Bool lcl_SetNewFlyPos( const SwNode& rNode, SwFmtAnchor& rAnchor, const Point& rPt ) { sal_Bool bRet = sal_False; @@ -115,7 +115,7 @@ sal_Bool lcl_SetNewFlyPos( const SwNode& rNode, SwFmtAnchor& rAnchor, return bRet; } -sal_Bool lcl_FindAnchorPos( SwDoc& rDoc, const Point& rPt, const SwFrm& rFrm, +static sal_Bool lcl_FindAnchorPos( SwDoc& rDoc, const Point& rPt, const SwFrm& rFrm, SfxItemSet& rSet ) { sal_Bool bRet = sal_True; @@ -202,7 +202,7 @@ sal_Bool lcl_FindAnchorPos( SwDoc& rDoc, const Point& rPt, const SwFrm& rFrm, // //! also used in unoframe.cxx // -sal_Bool lcl_ChkAndSetNewAnchor( const SwFlyFrm& rFly, SfxItemSet& rSet ) +sal_Bool sw_ChkAndSetNewAnchor( const SwFlyFrm& rFly, SfxItemSet& rSet ) { const SwFrmFmt& rFmt = *rFly.GetFmt(); const SwFmtAnchor &rOldAnch = rFmt.GetAnchor(); @@ -1091,7 +1091,7 @@ sal_Bool SwFEShell::SetFlyFrmAttr( SfxItemSet& rSet ) const Point aPt( pFly->Frm().Pos() ); if( SFX_ITEM_SET == rSet.GetItemState( RES_ANCHOR, sal_False )) - ::lcl_ChkAndSetNewAnchor( *pFly, rSet ); + sw_ChkAndSetNewAnchor( *pFly, rSet ); SwFlyFrmFmt* pFlyFmt = (SwFlyFrmFmt*)pFly->GetFmt(); if( GetDoc()->SetFlyFrmAttr( *pFlyFmt, rSet )) @@ -1249,7 +1249,7 @@ void SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, sal_Bool bKeepOrient, Point* pDocP { pSet = new SfxItemSet( GetDoc()->GetAttrPool(), aFrmFmtSetRange ); pSet->Put( *pItem ); - if( !::lcl_ChkAndSetNewAnchor( *pFly, *pSet )) + if( !sw_ChkAndSetNewAnchor( *pFly, *pSet )) delete pSet, pSet = 0; } diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index ccd1d00d75b1..e12430a324ee 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -111,7 +111,7 @@ SwFlyFrm *GetFlyFromMarked( const SdrMarkList *pLst, ViewShell *pSh ) return 0; } -void lcl_GrabCursor( SwFEShell* pSh, SwFlyFrm* pOldSelFly) +static void lcl_GrabCursor( SwFEShell* pSh, SwFlyFrm* pOldSelFly) { const SwFrmFmt *pFlyFmt = pSh->SelFlyGrabCrsr(); if( pFlyFmt && !pSh->ActionPend() && @@ -770,7 +770,7 @@ const SwFrmFmt* SwFEShell::SelFlyGrabCrsr() |* *************************************************************************/ -void lcl_NotifyNeighbours( const SdrMarkList *pLst ) +static void lcl_NotifyNeighbours( const SdrMarkList *pLst ) { // Rules for evasion have changed. // 1. The environment of the fly and everything inside should be notified @@ -1252,7 +1252,7 @@ sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt) * Does the object include a control or groups, * which comprise only controls * --------------------------------------------------*/ -sal_Bool lcl_IsControlGroup( const SdrObject *pObj ) +static sal_Bool lcl_IsControlGroup( const SdrObject *pObj ) { sal_Bool bRet = sal_False; if(pObj->ISA(SdrUnoObj)) diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 24d6dc55ae4c..e66851fc3084 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -1104,7 +1104,7 @@ void SwFEShell::SetRowsToRepeat( sal_uInt16 nSet ) /*------------------------------------------------------------------------- returns the number of rows consecutively selected from top -----------------------------------------------------------------------*/ -sal_uInt16 lcl_GetRowNumber( const SwPosition& rPos ) +static sal_uInt16 lcl_GetRowNumber( const SwPosition& rPos ) { sal_uInt16 nRet = USHRT_MAX; Point aTmpPt; @@ -1445,7 +1445,7 @@ sal_uInt16 SwFEShell::GetCurTabColNum() const |* |*************************************************************************/ -const SwFrm *lcl_FindFrmInTab( const SwLayoutFrm *pLay, const Point &rPt, SwTwips nFuzzy ) +static const SwFrm *lcl_FindFrmInTab( const SwLayoutFrm *pLay, const Point &rPt, SwTwips nFuzzy ) { const SwFrm *pFrm = pLay->Lower(); @@ -1469,7 +1469,7 @@ const SwFrm *lcl_FindFrmInTab( const SwLayoutFrm *pLay, const Point &rPt, SwTwip return 0; } -const SwCellFrm *lcl_FindFrm( const SwLayoutFrm *pLay, const Point &rPt, +static const SwCellFrm *lcl_FindFrm( const SwLayoutFrm *pLay, const Point &rPt, SwTwips nFuzzy, bool* pbRow, bool* pbCol ) { // bMouseMoveRowCols : @@ -1711,7 +1711,7 @@ const SwFrm* SwFEShell::GetBox( const Point &rPt, bool* pbRow, bool* pbCol ) con /* Helper function*/ /* calculated the distance between Point rC and Line Segment (rA, rB) */ -double lcl_DistancePoint2Segment( const Point& rA, const Point& rB, const Point& rC ) +static double lcl_DistancePoint2Segment( const Point& rA, const Point& rB, const Point& rC ) { double nRet = 0; @@ -1740,7 +1740,7 @@ double lcl_DistancePoint2Segment( const Point& rA, const Point& rB, const Point& } /* Helper function*/ -Point lcl_ProjectOntoClosestTableFrm( const SwTabFrm& rTab, const Point& rPoint, bool bRowDrag ) +static Point lcl_ProjectOntoClosestTableFrm( const SwTabFrm& rTab, const Point& rPoint, bool bRowDrag ) { Point aRet( rPoint ); const SwTabFrm* pCurrentTab = &rTab; @@ -2200,7 +2200,7 @@ void SwFEShell::SetTblAttr( const SfxItemSet &rNew ) * @param bUp true: move up, false: move down * @returns true if successful */ -bool lcl_GoTableRow( SwCrsrShell* pShell, bool bUp ) +static bool lcl_GoTableRow( SwCrsrShell* pShell, bool bUp ) { OSL_ENSURE( pShell != NULL, "need shell" ); @@ -2333,7 +2333,7 @@ sal_Bool SwFEShell::SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff ) return bRet; } -sal_Bool lcl_IsFormulaSelBoxes( const SwTable& rTbl, const SwTblBoxFormula& rFml, +static sal_Bool lcl_IsFormulaSelBoxes( const SwTable& rTbl, const SwTblBoxFormula& rFml, SwCellFrms& rCells ) { SwTblBoxFormula aTmp( rFml ); diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index 560bb5ea82a4..4c2e798c484f 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -376,7 +376,7 @@ sal_uInt16 SwFEShell::GetVirtPageNum( const sal_Bool bCalcFrm ) |* *************************************************************************/ -void lcl_SetAPageOffset( sal_uInt16 nOffset, SwPageFrm* pPage, SwFEShell* pThis ) +static void lcl_SetAPageOffset( sal_uInt16 nOffset, SwPageFrm* pPage, SwFEShell* pThis ) { pThis->StartAllAction(); OSL_ENSURE( pPage->FindFirstBodyCntnt(), diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index f639f83e5c76..abc8aad73147 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -114,14 +114,14 @@ struct _Sort_CellFrm typedef std::deque< _Sort_CellFrm > _Sort_CellFrms; -const SwLayoutFrm *lcl_FindCellFrm( const SwLayoutFrm *pLay ) +static const SwLayoutFrm *lcl_FindCellFrm( const SwLayoutFrm *pLay ) { while ( pLay && !pLay->IsCellFrm() ) pLay = pLay->GetUpper(); return pLay; } -const SwLayoutFrm *lcl_FindNextCellFrm( const SwLayoutFrm *pLay ) +static const SwLayoutFrm *lcl_FindNextCellFrm( const SwLayoutFrm *pLay ) { // ensure we leave the cell (sections) const SwLayoutFrm *pTmp = pLay; @@ -866,7 +866,7 @@ _CmpLPt::_CmpLPt( const Point& rPt, const SwTableBox* pBox, sal_Bool bVertical ) : aPos( rPt ), pSelBox( pBox ), bVert( bVertical ) {} -void lcl_InsTblBox( SwTableNode* pTblNd, SwDoc* pDoc, SwTableBox* pBox, +static void lcl_InsTblBox( SwTableNode* pTblNd, SwDoc* pDoc, SwTableBox* pBox, sal_uInt16 nInsPos, sal_uInt16 nCnt = 1 ) { OSL_ENSURE( pBox->GetSttNd(), "Box without Start-Node" ); @@ -1507,7 +1507,7 @@ sal_uInt16 CheckMergeSel( const SwSelBoxes& rBoxes ) return eRet; } -SwTwips lcl_CalcWish( const SwLayoutFrm *pCell, long nWish, +static SwTwips lcl_CalcWish( const SwLayoutFrm *pCell, long nWish, const long nAct ) { const SwLayoutFrm *pTmp = pCell; @@ -1534,7 +1534,7 @@ SwTwips lcl_CalcWish( const SwLayoutFrm *pCell, long nWish, return nRet; } -void lcl_FindStartEndRow( const SwLayoutFrm *&rpStart, +static void lcl_FindStartEndRow( const SwLayoutFrm *&rpStart, const SwLayoutFrm *&rpEnd, const int bChkProtected ) { @@ -1605,7 +1605,7 @@ void lcl_FindStartEndRow( const SwLayoutFrm *&rpStart, } -void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart, +static void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart, const SwLayoutFrm *&rpEnd, const int bChkProtected ) { @@ -2041,7 +2041,7 @@ sal_Bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv, // into a new structure, retaining the table structure // new: SS for targeted erasing/restoring of the layout -void lcl_InsertRow( SwTableLine &rLine, SwLayoutFrm *pUpper, SwFrm *pSibling ) +static void lcl_InsertRow( SwTableLine &rLine, SwLayoutFrm *pUpper, SwFrm *pSibling ) { SwRowFrm *pRow = new SwRowFrm( rLine, pUpper ); if ( pUpper->IsTabFrm() && ((SwTabFrm*)pUpper)->IsFollow() ) @@ -2292,7 +2292,7 @@ void _FndBox::DelFrms( SwTable &rTable ) } } -sal_Bool lcl_IsLineOfTblFrm( const SwTabFrm& rTable, const SwFrm& rChk ) +static sal_Bool lcl_IsLineOfTblFrm( const SwTabFrm& rTable, const SwFrm& rChk ) { const SwTabFrm* pTblFrm = rChk.FindTabFrm(); if( pTblFrm->IsFollow() ) @@ -2303,7 +2303,7 @@ sal_Bool lcl_IsLineOfTblFrm( const SwTabFrm& rTable, const SwFrm& rChk ) /* * lcl_UpdateRepeatedHeadlines */ -void lcl_UpdateRepeatedHeadlines( SwTabFrm& rTabFrm, bool bCalcLowers ) +static void lcl_UpdateRepeatedHeadlines( SwTabFrm& rTabFrm, bool bCalcLowers ) { OSL_ENSURE( rTabFrm.IsFollow(), "lcl_UpdateRepeatedHeadlines called for non-follow tab" ); diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx index 4f7813d87a12..41f649ab0f2a 100644 --- a/sw/source/core/graphic/grfatr.cxx +++ b/sw/source/core/graphic/grfatr.cxx @@ -72,13 +72,13 @@ int SwMirrorGrf::operator==( const SfxPoolItem& rItem) const ((SwMirrorGrf&)rItem).IsGrfToggle() == IsGrfToggle(); } -sal_Bool lcl_IsHoriOnEvenPages(int nEnum, sal_Bool bToggle) +static sal_Bool lcl_IsHoriOnEvenPages(int nEnum, sal_Bool bToggle) { sal_Bool bEnum = nEnum == RES_MIRROR_GRAPH_VERT || nEnum == RES_MIRROR_GRAPH_BOTH; return bEnum != bToggle; } -sal_Bool lcl_IsHoriOnOddPages(int nEnum) +static sal_Bool lcl_IsHoriOnOddPages(int nEnum) { sal_Bool bEnum = nEnum == RES_MIRROR_GRAPH_VERT || nEnum == RES_MIRROR_GRAPH_BOTH; diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index bc3bcb738cfc..784c5a4c1a7c 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -391,7 +391,7 @@ protected: // Format next frame of table frame to assure keeping attributes. // In case of nested tables method <SwFrm::MakeAll()> is called to // avoid formating of superior table frame. - friend SwFrm* lcl_FormatNextCntntForKeep( SwTabFrm* pTabFrm ); + friend SwFrm* sw_FormatNextCntntForKeep( SwTabFrm* pTabFrm ); virtual void MakeAll() = 0; // adjust frames of a page diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index 3832901536ac..e50098d31879 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -48,7 +48,7 @@ class SwFmtFrmSize; struct _CpyPara; struct _InsULPara; -void lcl_LineSetHeadCondColl( const SwTableLine* pLine ); +void sw_LineSetHeadCondColl( const SwTableLine* pLine ); #ifdef DBG_UTIL @@ -108,10 +108,10 @@ public: sal_Bool Resize( sal_uInt16 nOffset, sal_uInt16 nWidth ); }; -void lcl_Box_CollectBox( const SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara ); -sal_Bool lcl_Line_CollectBox( const SwTableLine*& rpLine, void* pPara ); +void sw_Box_CollectBox( const SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara ); +sal_Bool sw_Line_CollectBox( const SwTableLine*& rpLine, void* pPara ); -void lcl_BoxSetSplitBoxFmts( SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara ); +void sw_BoxSetSplitBoxFmts( SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara ); // This structure is needed by Undo to restore row span attributes // when a table has been splitted into two tables @@ -153,7 +153,7 @@ public: sal_Bool IsAnyBorderFound() const { return bAnyBorderFnd; } }; -void lcl_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara ); +void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara ); class SwShareBoxFmt diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index fc292b5662c4..f056fd717384 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -61,7 +61,7 @@ class SwTxtFrm: public SwCntntFrm friend class SwTestFormat; friend class WidowsAndOrphans; friend class SwTxtFrmLocker; // duerfen Lock()/Unlock() - friend sal_Bool lcl_ChangeOffset( SwTxtFrm* pFrm, sal_uInt16 nNew ); + friend sal_Bool sw_ChangeOffset( SwTxtFrm* pFrm, sal_uInt16 nNew ); static SwCache *pTxtCache; //Pointer auf den Line-Cache static long nMinPrtLine; //Diese Linie darf beim Drucken nicht diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 691586634b33..da3abe4a3093 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -121,7 +121,7 @@ TYPEINIT1_AUTOFACTORY(SwFmtLineNumber, SfxPoolItem); /* -------------------------------------------------- * Conversation for QueryValue * --------------------------------------------------*/ -sal_Int16 lcl_RelToINT(sal_Int16 eRelation) +static sal_Int16 lcl_RelToINT(sal_Int16 eRelation) { sal_Int16 nRet = text::RelOrientation::FRAME; switch(eRelation) @@ -141,7 +141,7 @@ sal_Int16 lcl_RelToINT(sal_Int16 eRelation) return nRet; } -sal_Int16 lcl_IntToRelation(const uno::Any& rVal) +static sal_Int16 lcl_IntToRelation(const uno::Any& rVal) { sal_Int16 eRet = text::RelOrientation::FRAME; sal_Int16 nVal = 0; @@ -1752,7 +1752,7 @@ void SwFmtURL::SetMap( const ImageMap *pM ) delete pMap; pMap = pM ? new ImageMap( *pM ) : 0; } -extern const SvEventDescription* lcl_GetSupportedMacroItems(); +extern const SvEventDescription* sw_GetSupportedMacroItems(); bool SwFmtURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { @@ -1781,12 +1781,12 @@ bool SwFmtURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const uno::Reference< uno::XInterface > xInt; if(pMap) { - xInt = SvUnoImageMap_createInstance( *pMap, lcl_GetSupportedMacroItems() ); + xInt = SvUnoImageMap_createInstance( *pMap, sw_GetSupportedMacroItems() ); } else { ImageMap aEmptyMap; - xInt = SvUnoImageMap_createInstance( aEmptyMap, lcl_GetSupportedMacroItems() ); + xInt = SvUnoImageMap_createInstance( aEmptyMap, sw_GetSupportedMacroItems() ); } uno::Reference< container::XIndexContainer > xCont(xInt, uno::UNO_QUERY); rVal <<= xCont; diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 97f9b0e930c4..12ac81010096 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -268,7 +268,7 @@ inline void PrepareUnlock( SwFlowFrm *pTab ) } // hopefully, one day this function simply will return 'false' -bool lcl_IsCalcUpperAllowed( const SwFrm& rFrm ) +static bool lcl_IsCalcUpperAllowed( const SwFrm& rFrm ) { return !rFrm.GetUpper()->IsSctFrm() && !rFrm.GetUpper()->IsFooterFrm() && @@ -490,7 +490,7 @@ void SwFrm::PrepareCrsr() |*************************************************************************/ // Here we return GetPrev(); however we will ignore empty SectionFrms -SwFrm* lcl_Prev( SwFrm* pFrm, sal_Bool bSectPrv = sal_True ) +static SwFrm* lcl_Prev( SwFrm* pFrm, sal_Bool bSectPrv = sal_True ) { SwFrm* pRet = pFrm->GetPrev(); if( !pRet && pFrm->GetUpper() && pFrm->GetUpper()->IsSctFrm() && @@ -502,7 +502,7 @@ SwFrm* lcl_Prev( SwFrm* pFrm, sal_Bool bSectPrv = sal_True ) return pRet; } -SwFrm* lcl_NotHiddenPrev( SwFrm* pFrm ) +static SwFrm* lcl_NotHiddenPrev( SwFrm* pFrm ) { SwFrm *pRet = pFrm; do @@ -656,7 +656,7 @@ void SwFrm::MakePos() |* |*************************************************************************/ // #i28701# - new type <SwSortedObjs> -void lcl_CheckObjects( SwSortedObjs* pSortedObjs, SwFrm* pFrm, long& rBot ) +static void lcl_CheckObjects( SwSortedObjs* pSortedObjs, SwFrm* pFrm, long& rBot ) { // And then there can be paragraph anchored frames that sit below their paragraph. long nMax = 0; @@ -1813,7 +1813,7 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt ) // This routine checks whether there are no other FtnBosses // between the pFrm's FtnBoss and the pNxt's FtnBoss. -sal_Bool lcl_IsNextFtnBoss( const SwFrm *pFrm, const SwFrm* pNxt ) +static sal_Bool lcl_IsNextFtnBoss( const SwFrm *pFrm, const SwFrm* pNxt ) { OSL_ENSURE( pFrm && pNxt, "lcl_IsNextFtnBoss: No Frames?" ); pFrm = pFrm->FindFtnBossFrm(); diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx index 99a5885c40fe..0a1d51255658 100644 --- a/sw/source/core/layout/colfrm.cxx +++ b/sw/source/core/layout/colfrm.cxx @@ -47,7 +47,7 @@ #include "switerator.hxx" // ftnfrm.cxx: -void lcl_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes ); +void sw_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes ); /************************************************************************* @@ -83,13 +83,13 @@ SwColumnFrm::~SwColumnFrm() |* |*************************************************************************/ -void lcl_RemoveColumns( SwLayoutFrm *pCont, sal_uInt16 nCnt ) +static void lcl_RemoveColumns( SwLayoutFrm *pCont, sal_uInt16 nCnt ) { OSL_ENSURE( pCont && pCont->Lower() && pCont->Lower()->IsColumnFrm(), "Keine Spalten zu entfernen." ); SwColumnFrm *pColumn = (SwColumnFrm*)pCont->Lower(); - ::lcl_RemoveFtns( pColumn, sal_True, sal_True ); + sw_RemoveFtns( pColumn, sal_True, sal_True ); while ( pColumn->GetNext() ) { OSL_ENSURE( pColumn->GetNext()->IsColumnFrm(), @@ -105,7 +105,7 @@ void lcl_RemoveColumns( SwLayoutFrm *pCont, sal_uInt16 nCnt ) } } -SwLayoutFrm * lcl_FindColumns( SwLayoutFrm *pLay, sal_uInt16 nCount ) +static SwLayoutFrm * lcl_FindColumns( SwLayoutFrm *pLay, sal_uInt16 nCount ) { SwFrm *pCol = pLay->Lower(); if ( pLay->IsPageFrm() ) diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index fb9f94c77d23..de78d6d8f9fb 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -176,7 +176,7 @@ sal_uLong SwProtocol::nRecord = 0; SwImplProtocol* SwProtocol::pImpl = NULL; -sal_uLong lcl_GetFrameId( const SwFrm* pFrm ) +static sal_uLong lcl_GetFrameId( const SwFrm* pFrm ) { #if OSL_DEBUG_LEVEL > 1 static sal_Bool bFrameId = sal_False; @@ -496,7 +496,7 @@ void SwImplProtocol::FileInit() * lcl_Start enables indentation by two spaces during ACT_START and disables * it again at ACT_END. * --------------------------------------------------*/ -void lcl_Start(rtl::OStringBuffer& rOut, rtl::OStringBuffer& rLay, sal_uLong nAction) +static void lcl_Start(rtl::OStringBuffer& rOut, rtl::OStringBuffer& rLay, sal_uLong nAction) { if( nAction == ACT_START ) { @@ -519,7 +519,7 @@ void lcl_Start(rtl::OStringBuffer& rOut, rtl::OStringBuffer& rLay, sal_uLong nAc * of the frame; "+" stands for valid, "-" stands for invalid. * --------------------------------------------------*/ -void lcl_Flags(rtl::OStringBuffer& rOut, const SwFrm* pFrm) +static void lcl_Flags(rtl::OStringBuffer& rOut, const SwFrm* pFrm) { rOut.append(RTL_CONSTASCII_STRINGPARAM(" Sz")); rOut.append(pFrm->GetValidSizeFlag() ? '+' : '-'); @@ -533,7 +533,7 @@ void lcl_Flags(rtl::OStringBuffer& rOut, const SwFrm* pFrm) * lcl_FrameType outputs the type of the frame as clear text. * --------------------------------------------------*/ -void lcl_FrameType( rtl::OStringBuffer& rOut, const SwFrm* pFrm ) +static void lcl_FrameType( rtl::OStringBuffer& rOut, const SwFrm* pFrm ) { if( pFrm->IsTxtFrm() ) rOut.append(RTL_CONSTASCII_STRINGPARAM("Txt ")); diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 1cbf7ab16327..555ac8acf807 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -293,7 +293,7 @@ bool SwLayoutFrm::IsBefore( const SwLayoutFrm* _pCheckRefLayFrm ) const // Local helper functions for GetNextLayoutLeaf // -const SwFrm* lcl_FindLayoutFrame( const SwFrm* pFrm, bool bNext ) +static const SwFrm* lcl_FindLayoutFrame( const SwFrm* pFrm, bool bNext ) { const SwFrm* pRet = 0; if ( pFrm->IsFlyFrm() ) @@ -304,7 +304,7 @@ const SwFrm* lcl_FindLayoutFrame( const SwFrm* pFrm, bool bNext ) return pRet; } -const SwFrm* lcl_GetLower( const SwFrm* pFrm, bool bFwd ) +static const SwFrm* lcl_GetLower( const SwFrm* pFrm, bool bFwd ) { if ( !pFrm->IsLayoutFrm() ) return 0; @@ -654,7 +654,7 @@ const SwAttrSet* SwFrm::GetAttrSet() const // This helper function is an equivalent to the ImplGetNextCntntFrm() method, // besides ContentFrames this function also returns TabFrms and SectionFrms. -SwFrm* lcl_NextFrm( SwFrm* pFrm ) +static SwFrm* lcl_NextFrm( SwFrm* pFrm ) { SwFrm *pRet = 0; sal_Bool bGoingUp = sal_False; @@ -1248,7 +1248,7 @@ void SwFrm::InvalidateNextPrtArea() |* but not if it sits in a table which itself sits in a section with columns. |*************************************************************************/ -sal_Bool lcl_IsInColSct( const SwFrm *pUp ) +static sal_Bool lcl_IsInColSct( const SwFrm *pUp ) { sal_Bool bRet = sal_False; while( pUp ) @@ -1454,7 +1454,7 @@ SwLayoutFrm* SwFrm::GetPrevCellLeaf( MakePageType ) return ((SwCellFrm*)pTmpFrm)->GetPreviousCell(); } -SwCellFrm* lcl_FindCorrespondingCellFrm( const SwRowFrm& rOrigRow, +static SwCellFrm* lcl_FindCorrespondingCellFrm( const SwRowFrm& rOrigRow, const SwCellFrm& rOrigCell, const SwRowFrm& rCorrRow, bool bInFollow ) diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index a5baf314c267..cfe58374cf75 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -1430,7 +1430,7 @@ const SwFrm* SwFlowFrm::_GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPre } /// Compare styles attached to these text frames. -bool lcl_IdenticalStyles(const SwFrm* pPrevFrm, const SwFrm* pFrm) +static bool lcl_IdenticalStyles(const SwFrm* pPrevFrm, const SwFrm* pFrm) { SwTxtFmtColl *pPrevFmtColl = 0; if (pPrevFrm && pPrevFrm->IsTxtFrm()) @@ -1449,7 +1449,7 @@ bool lcl_IdenticalStyles(const SwFrm* pPrevFrm, const SwFrm* pFrm) return bIdenticalStyles; } -bool lcl_getContextualSpacing(const SwFrm* pPrevFrm) +static bool lcl_getContextualSpacing(const SwFrm* pPrevFrm) { bool bRet; SwBorderAttrAccess *pAccess = new SwBorderAttrAccess( SwFrm::GetCache(), pPrevFrm ); diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index bb40da1762c4..2172dbe8ec10 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -2547,7 +2547,7 @@ Size SwFlyFrm::CalcRel( const SwFmtFrmSize &rSz ) const |* |*************************************************************************/ -SwTwips lcl_CalcAutoWidth( const SwLayoutFrm& rFrm ) +static SwTwips lcl_CalcAutoWidth( const SwLayoutFrm& rFrm ) { SwTwips nRet = 0; SwTwips nMin = 0; diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index b6e0d591b06c..c7017187bffb 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -581,7 +581,7 @@ public: !rTwo.nSub || nSub <= rTwo.nSub ) ); } }; -const SwFrm * lcl_CalcDownDist( SwDistance &rRet, +static const SwFrm * lcl_CalcDownDist( SwDistance &rRet, const Point &rPt, const SwCntntFrm *pCnt ) { @@ -896,7 +896,7 @@ const SwFrm * lcl_CalcDownDist( SwDistance &rRet, return 0; } -sal_uLong lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay, +static sal_uLong lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay, const SwCntntFrm *& rpCnt, const sal_Bool bBody, const sal_Bool bFtn ) { @@ -961,7 +961,7 @@ sal_uLong lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay, return nDistance; } -const SwCntntFrm * lcl_FindCnt( const Point &rPt, const SwCntntFrm *pCnt, +static const SwCntntFrm * lcl_FindCnt( const Point &rPt, const SwCntntFrm *pCnt, const sal_Bool bBody, const sal_Bool bFtn ) { //Starting from pCnt searches the CntntFrm whose left upper corner is the @@ -1044,7 +1044,7 @@ const SwCntntFrm * lcl_FindCnt( const Point &rPt, const SwCntntFrm *pCnt, return pRet; } -void lcl_PointToPrt( Point &rPoint, const SwFrm *pFrm ) +static void lcl_PointToPrt( Point &rPoint, const SwFrm *pFrm ) { SwRect aTmp( pFrm->Prt() ); aTmp += pFrm->Frm().Pos(); diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 815ffcdd6d8c..96139b1786ae 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -85,7 +85,7 @@ #include <switerator.hxx> // ftnfrm.cxx: -void lcl_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes ); +void sw_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes ); using namespace ::com::sun::star; @@ -437,7 +437,7 @@ SwLayNotify::SwLayNotify( SwLayoutFrm *pLayFrm ) : // OD 2004-05-11 #i28701# - local method to invalidate the position of all // frames inclusive its floating screen objects, which are lowers of the given // layout frame -void lcl_InvalidatePosOfLowers( SwLayoutFrm& _rLayoutFrm ) +static void lcl_InvalidatePosOfLowers( SwLayoutFrm& _rLayoutFrm ) { if( _rLayoutFrm.IsFlyFrm() && _rLayoutFrm.GetDrawObjs() ) { @@ -1105,7 +1105,7 @@ void AppendObjs( const SwFrmFmts *pTbl, sal_uLong nIndex, } } -bool lcl_ObjConnected( SwFrmFmt *pFmt, const SwFrm* pSib ) +static bool lcl_ObjConnected( SwFrmFmt *pFmt, const SwFrm* pSib ) { SwIterator<SwFlyFrm,SwFmt> aIter( *pFmt ); if ( RES_FLYFRMFMT == pFmt->Which() ) @@ -1134,7 +1134,7 @@ bool lcl_ObjConnected( SwFrmFmt *pFmt, const SwFrm* pSib ) @author OD */ -bool lcl_InHeaderOrFooter( SwFrmFmt& _rFmt ) +static bool lcl_InHeaderOrFooter( SwFrmFmt& _rFmt ) { bool bRetVal = false; @@ -1203,7 +1203,7 @@ void AppendAllObjs( const SwFrmFmts *pTbl, const SwFrm* pSib ) @author OD */ -void lcl_SetPos( SwFrm& _rNewFrm, +static void lcl_SetPos( SwFrm& _rNewFrm, const SwLayoutFrm& _rLayFrm ) { SWRECTFN( (&_rLayFrm) ) @@ -1929,7 +1929,7 @@ long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) const } /// Tries to detect if this paragraph has a floating table attached. -bool lcl_hasTabFrm(const SwTxtFrm* pTxtFrm) +static bool lcl_hasTabFrm(const SwTxtFrm* pTxtFrm) { if (pTxtFrm->GetDrawObjs()) { @@ -2405,7 +2405,7 @@ const SdrObject *SwOrderIter::Prev() // #115759# - 'remove' also drawing object from page and // at-fly anchored objects from page -void lcl_RemoveObjsFromPage( SwFrm* _pFrm ) +static void lcl_RemoveObjsFromPage( SwFrm* _pFrm ) { OSL_ENSURE( _pFrm->GetDrawObjs(), "Keine DrawObjs fuer lcl_RemoveFlysFromPage." ); SwSortedObjs &rObjs = *_pFrm->GetDrawObjs(); @@ -2458,7 +2458,7 @@ void lcl_RemoveObjsFromPage( SwFrm* _pFrm ) SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart ) { if( pLay->IsSctFrm() && pLay->Lower() && pLay->Lower()->IsColumnFrm() ) - lcl_RemoveFtns( (SwColumnFrm*)pLay->Lower(), sal_True, sal_True ); + sw_RemoveFtns( (SwColumnFrm*)pLay->Lower(), sal_True, sal_True ); SwFrm *pSav; if ( 0 == (pSav = pLay->ContainsAny()) ) @@ -2568,7 +2568,7 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart ) // #115759# - add also drawing objects to page and at-fly // anchored objects to page -void lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage ) +static void lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage ) { OSL_ENSURE( _pFrm->GetDrawObjs(), "Keine DrawObjs fuer lcl_AddFlysToPage." ); SwSortedObjs &rObjs = *_pFrm->GetDrawObjs(); @@ -2799,7 +2799,7 @@ SwPageFrm * InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper, |* |*************************************************************************/ -void lcl_Regist( SwPageFrm *pPage, const SwFrm *pAnch ) +static void lcl_Regist( SwPageFrm *pPage, const SwFrm *pAnch ) { SwSortedObjs *pObjs = (SwSortedObjs*)pAnch->GetDrawObjs(); for ( sal_uInt16 i = 0; i < pObjs->Count(); ++i ) @@ -2946,7 +2946,7 @@ void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld, /*************************************************************************/ -void lcl_CheckFlowBack( SwFrm* pFrm, const SwRect &rRect ) +static void lcl_CheckFlowBack( SwFrm* pFrm, const SwRect &rRect ) { SwTwips nBottom = rRect.Bottom(); while( pFrm ) @@ -2967,7 +2967,7 @@ void lcl_CheckFlowBack( SwFrm* pFrm, const SwRect &rRect ) } } -void lcl_NotifyCntnt( const SdrObject *pThis, SwCntntFrm *pCnt, +static void lcl_NotifyCntnt( const SdrObject *pThis, SwCntntFrm *pCnt, const SwRect &rRect, const PrepareHint eHint ) { if ( pCnt->IsTxtFrm() ) @@ -3299,7 +3299,7 @@ sal_Bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm ) //--------------------------------- -SwTwips lcl_CalcCellRstHeight( SwLayoutFrm *pCell ) +static SwTwips lcl_CalcCellRstHeight( SwLayoutFrm *pCell ) { if ( pCell->Lower()->IsCntntFrm() || pCell->Lower()->IsSctFrm() ) { diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index db49c97e05bb..ad5ae9e43c38 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -61,7 +61,7 @@ #define ENDNOTE 0x80000000 -sal_uLong lcl_FindFtnPos( const SwDoc *pDoc, const SwTxtFtn *pAttr ) +static sal_uLong lcl_FindFtnPos( const SwDoc *pDoc, const SwTxtFtn *pAttr ) { const SwFtnIdxs &rFtnIdxs = pDoc->GetFtnIdxs(); @@ -95,7 +95,7 @@ sal_Bool SwFtnFrm::operator<( const SwTxtFtn* pTxtFtn ) const |* |*************************************************************************/ -sal_Bool lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage, +static sal_Bool lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage, sal_Bool bDontLeave ) { if( rpBoss->IsColumnFrm() ) @@ -144,7 +144,7 @@ sal_Bool lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage, |* |*************************************************************************/ -sal_uInt16 lcl_ColumnNum( const SwFrm* pBoss ) +static sal_uInt16 lcl_ColumnNum( const SwFrm* pBoss ) { sal_uInt16 nRet = 0; if( !pBoss->IsColumnFrm() ) @@ -189,7 +189,7 @@ SwFtnContFrm::SwFtnContFrm( SwFrmFmt *pFmt, SwFrm* pSib ): // lcl_Undersize(..) klappert einen SwFrm und dessen Inneres ab // und liefert die Summe aller TxtFrm-Vergroesserungswuensche -long lcl_Undersize( const SwFrm* pFrm ) +static long lcl_Undersize( const SwFrm* pFrm ) { long nRet = 0; SWRECTFN( pFrm ) @@ -964,7 +964,7 @@ void SwRootFrm::UpdateFtnNums() |* |*************************************************************************/ -void lcl_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes ) +void sw_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes ) { do { @@ -1007,7 +1007,7 @@ void lcl_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes ((SwSectionFrm*)pLow)->IsAnyNoteAtEnd() ) && ((SwSectionFrm*)pLow)->Lower() && ((SwSectionFrm*)pLow)->Lower()->IsColumnFrm() ) - lcl_RemoveFtns( (SwColumnFrm*)((SwSectionFrm*)pLow)->Lower(), + sw_RemoveFtns( (SwColumnFrm*)((SwSectionFrm*)pLow)->Lower(), bPageOnly, bEndNotes ); pLow = pLow->GetNext(); } @@ -1031,7 +1031,7 @@ void SwRootFrm::RemoveFtns( SwPageFrm *pPage, sal_Bool bPageOnly, sal_Bool bEndN pBoss = (SwFtnBossFrm*)pBody->Lower(); // die erste Spalte else pBoss = pPage; // keine Spalten - lcl_RemoveFtns( pBoss, bPageOnly, bEndNotes ); + sw_RemoveFtns( pBoss, bPageOnly, bEndNotes ); if ( !bPageOnly ) { if ( pPage->IsFtnPage() && diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index ee6a02d24f8f..f639d7a818a2 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -682,7 +682,7 @@ sal_Bool SwLayHelper::CheckInsertPage() } // -bool lcl_HasTextFrmAnchoredObjs( SwTxtFrm* p_pTxtFrm ) +static bool lcl_HasTextFrmAnchoredObjs( SwTxtFrm* p_pTxtFrm ) { bool bHasTextFrmAnchoredObjs( false ); @@ -705,7 +705,7 @@ bool lcl_HasTextFrmAnchoredObjs( SwTxtFrm* p_pTxtFrm ) return bHasTextFrmAnchoredObjs; } -void lcl_ApplyWorkaroundForB6375613( SwFrm* p_pFirstFrmOnNewPage ) +static void lcl_ApplyWorkaroundForB6375613( SwFrm* p_pFirstFrmOnNewPage ) { SwTxtFrm* pFirstTextFrmOnNewPage = dynamic_cast<SwTxtFrm*>(p_pFirstFrmOnNewPage); // diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx index c1d8eb844b91..e5728229158c 100644 --- a/sw/source/core/layout/objectformattertxtfrm.cxx +++ b/sw/source/core/layout/objectformattertxtfrm.cxx @@ -653,7 +653,7 @@ bool SwObjectFormatterTxtFrm::CheckMovedFwdCondition( // #i40140# - helper method to format layout frames used by // method <SwObjectFormatterTxtFrm::_FormatAnchorFrmForCheckMoveFwd()> // #i44049# - format till a certain lower frame, if provided. -void lcl_FormatCntntOfLayoutFrm( SwLayoutFrm* pLayFrm, +static void lcl_FormatCntntOfLayoutFrm( SwLayoutFrm* pLayFrm, SwFrm* pLastLowerFrm = 0L ) { SwFrm* pLowerFrm = pLayFrm->GetLower(); diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index cf1d64b6bca8..53a329f5e7cf 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -405,7 +405,7 @@ void SwPageFrm::CheckDirection( sal_Bool bVert ) |* generischen Cntnt |* |*************************************************************************/ -void lcl_FormatLay( SwLayoutFrm *pLay ) +static void lcl_FormatLay( SwLayoutFrm *pLay ) { //Alle LayoutFrms - nicht aber Tables, Flys o.ae. - formatieren. @@ -420,7 +420,7 @@ void lcl_FormatLay( SwLayoutFrm *pLay ) pLay->Calc(); } -void lcl_MakeObjs( const SwFrmFmts &rTbl, SwPageFrm *pPage ) +static void lcl_MakeObjs( const SwFrmFmts &rTbl, SwPageFrm *pPage ) { //Anlegen bzw. registrieren von Flys und Drawobjekten. //Die Formate stehen in der SpzTbl (vom Dokument). @@ -1011,7 +1011,7 @@ void SwPageFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) |* SwPageFrm::PrepareRegisterChg() |* |*************************************************************************/ -void lcl_PrepFlyInCntRegister( SwCntntFrm *pFrm ) +static void lcl_PrepFlyInCntRegister( SwCntntFrm *pFrm ) { pFrm->Prepare( PREP_REGISTER ); if( pFrm->GetDrawObjs() ) @@ -1970,9 +1970,9 @@ void SwRootFrm::UnoRestoreAllActions() } // PAGES01: Helper functions for SwRootFrm::CheckViewLayout -void lcl_MoveAllLowers( SwFrm* pFrm, const Point& rOffset ); +static void lcl_MoveAllLowers( SwFrm* pFrm, const Point& rOffset ); -void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset ) +static void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset ) { SwSortedObjs* pSortedObj = 0; const bool bPage = pFrm->IsPageFrm(); @@ -2056,7 +2056,7 @@ void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset ) } } -void lcl_MoveAllLowers( SwFrm* pFrm, const Point& rOffset ) +static void lcl_MoveAllLowers( SwFrm* pFrm, const Point& rOffset ) { const SwRect aFrm( pFrm->Frm() ); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 54348d647e35..2721e5c3ebc1 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -912,7 +912,7 @@ void SwLineRects::LockLines( sal_Bool bLock ) (*it).Lock( bLock ); } -void lcl_DrawDashedRect( OutputDevice * pOut, SwLineRect & rLRect ) +static void lcl_DrawDashedRect( OutputDevice * pOut, SwLineRect & rLRect ) { double nHalfLWidth = rLRect.Height( ); if ( nHalfLWidth > 1 ) @@ -1281,7 +1281,7 @@ void SwAlignRect( SwRect &rRect, const ViewShell *pSh ) @author OD */ -void lcl_CompPxPosAndAdjustPos( const OutputDevice& _rOut, +static void lcl_CompPxPosAndAdjustPos( const OutputDevice& _rOut, const Point& _rRefPt, Point& _rCompPt, const sal_Bool _bChkXPos, @@ -1331,7 +1331,7 @@ void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut ) pGrfRect->SSize( rOut.PixelToLogic( aPxRect.GetSize() ) ); } -long lcl_AlignWidth( const long nWidth ) +static long lcl_AlignWidth( const long nWidth ) { if ( nWidth ) { @@ -1343,7 +1343,7 @@ long lcl_AlignWidth( const long nWidth ) return nWidth; } -long lcl_AlignHeight( const long nHeight ) +static long lcl_AlignHeight( const long nHeight ) { if ( nHeight ) { @@ -1355,14 +1355,14 @@ long lcl_AlignHeight( const long nHeight ) return nHeight; } -long lcl_MinHeightDist( const long nDist ) +static long lcl_MinHeightDist( const long nDist ) { if ( aScaleX < aMinDistScale || aScaleY < aMinDistScale ) return nDist; return ::lcl_AlignHeight( Max( nDist, nMinDistPixelH )); } -long lcl_MinWidthDist( const long nDist ) +static long lcl_MinWidthDist( const long nDist ) { if ( aScaleX < aMinDistScale || aScaleY < aMinDistScale ) return nDist; @@ -1370,7 +1370,7 @@ long lcl_MinWidthDist( const long nDist ) } //Calculate PrtArea plus surrounding plus shadow. -void lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm, +static void lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm, const SwBorderAttrs &rAttrs, const sal_Bool bShadow ) { @@ -1465,7 +1465,7 @@ void lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm, ::SwAlignRect( rRect, pGlobalShell ); } -void lcl_ExtendLeftAndRight( SwRect& _rRect, +static void lcl_ExtendLeftAndRight( SwRect& _rRect, const SwFrm& _rFrm, const SwBorderAttrs& _rAttrs, const SwRectFn& _rRectFn ) @@ -1484,7 +1484,7 @@ void lcl_ExtendLeftAndRight( SwRect& _rRect, } } -void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, +static void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, const SwRect &rRect, SwRegionRects &rRegion ) { const SwSortedObjs& rObjs = *pPage->GetSortedObjs(); @@ -1687,7 +1687,7 @@ void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, @param _bBackgrdAlreadyDrawn boolean (optional; default: false) indicating, if the background is already drawn. */ -void lcl_implDrawGraphicBackgrd( const SvxBrushItem& _rBackgrdBrush, +static void lcl_implDrawGraphicBackgrd( const SvxBrushItem& _rBackgrdBrush, OutputDevice* _pOut, const SwRect& _rAlignedPaintRect, const GraphicObject& _rGraphicObj ) @@ -1736,7 +1736,7 @@ void lcl_implDrawGraphicBackgrd( const SvxBrushItem& _rBackgrdBrush, } } -inline void lcl_DrawGraphicBackgrd( const SvxBrushItem& _rBackgrdBrush, +static inline void lcl_DrawGraphicBackgrd( const SvxBrushItem& _rBackgrdBrush, OutputDevice* _pOut, const SwRect& _rAlignedPaintRect, const GraphicObject& _rGraphicObj, @@ -1766,7 +1766,7 @@ inline void lcl_DrawGraphicBackgrd( const SvxBrushItem& _rBackgrdBrush, /// Outsource code for drawing background of the graphic /// with a background color in method <lcl_DrawGraphicBackgrd> /// Also, change type of <bGrfNum> and <bClip> from <sal_Bool> to <bool>. -void lcl_DrawGraphic( const SvxBrushItem& rBrush, OutputDevice *pOut, +static void lcl_DrawGraphic( const SvxBrushItem& rBrush, OutputDevice *pOut, ViewShell &rSh, const SwRect &rGrf, const SwRect &rOut, bool bClip, bool bGrfNum, bool bBackgrdAlreadyDrawn = false ) @@ -2136,7 +2136,7 @@ void DrawGraphic( const SvxBrushItem *pBrush, @author OD */ -void lcl_AdjustRectToPixelSize( SwRect& io_aSwRect, const OutputDevice &aOut ) +static void lcl_AdjustRectToPixelSize( SwRect& io_aSwRect, const OutputDevice &aOut ) { /// local constant object of class <Size> to determine number of Twips /// representing a pixel. @@ -3285,7 +3285,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const |* |*************************************************************************/ -void lcl_EmergencyFormatFtnCont( SwFtnContFrm *pCont ) +static void lcl_EmergencyFormatFtnCont( SwFtnContFrm *pCont ) { //It's possible that the Cont will get destroyed. SwCntntFrm *pCnt = pCont->ContainsCntnt(); @@ -3457,7 +3457,7 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const } } -drawinglayer::primitive2d::Primitive2DSequence lcl_CreateDashedIndicatorPrimitive( +static drawinglayer::primitive2d::Primitive2DSequence lcl_CreateDashedIndicatorPrimitive( basegfx::B2DPoint aStart, basegfx::B2DPoint aEnd, basegfx::BColor aColor ) { @@ -4437,7 +4437,7 @@ void SwFrm::PaintBorderLine( const SwRect& rRect, // printer output device. // NOTE: For printer output device left/right border rectangle <_iorRect> // has to be already non-overlapping the outer top/bottom border rectangle. -void lcl_SubTopBottom( SwRect& _iorRect, +static void lcl_SubTopBottom( SwRect& _iorRect, const SvxBoxItem& _rBox, const SwBorderAttrs& _rAttrs, const SwFrm& _rFrm, @@ -4546,7 +4546,7 @@ void lcl_SubTopBottom( SwRect& _iorRect, } } -sal_uInt16 lcl_GetLineWidth( const SvxBorderLine* pLine ) +static sal_uInt16 lcl_GetLineWidth( const SvxBorderLine* pLine ) { sal_uInt16 result = 0; @@ -4556,7 +4556,7 @@ sal_uInt16 lcl_GetLineWidth( const SvxBorderLine* pLine ) return result; } -double lcl_GetExtent( const SvxBorderLine* pSideLine, const SvxBorderLine* pOppositeLine ) +static double lcl_GetExtent( const SvxBorderLine* pSideLine, const SvxBorderLine* pOppositeLine ) { double nExtent = 0.0; @@ -4662,7 +4662,7 @@ lcl_MakeBorderLine(SwRect const& rRect, // OD 19.05.2003 #109667# - merge <lcl_PaintLeftLine> and <lcl_PaintRightLine> // into new method <lcl_PaintLeftRightLine(..)> -void lcl_PaintLeftRightLine( const sal_Bool _bLeft, +static void lcl_PaintLeftRightLine( const sal_Bool _bLeft, const SwFrm& _rFrm, const SwPageFrm& /*_rPage*/, const SwRect& _rOutRect, @@ -4731,7 +4731,7 @@ void lcl_PaintLeftRightLine( const sal_Bool _bLeft, // OD 19.05.2003 #109667# - merge <lcl_PaintTopLine> and <lcl_PaintBottomLine> // into <lcl_PaintTopLine> -void lcl_PaintTopBottomLine( const sal_Bool _bTop, +static void lcl_PaintTopBottomLine( const sal_Bool _bTop, const SwFrm& , const SwPageFrm& /*_rPage*/, const SwRect& _rOutRect, @@ -4784,7 +4784,7 @@ void lcl_PaintTopBottomLine( const sal_Bool _bTop, |* |*************************************************************************/ -const SwFrm* lcl_HasNextCell( const SwFrm& rFrm ) +static const SwFrm* lcl_HasNextCell( const SwFrm& rFrm ) { OSL_ENSURE( rFrm.IsCellFrm(), "lcl_HasNextCell( const SwFrm& rFrm ) should be called with SwCellFrm" ); @@ -4832,7 +4832,7 @@ const SwFrm* lcl_HasNextCell( const SwFrm& rFrm ) @return constant pointer to cell frame, for which the border attributes has to be used */ -const SwFrm* lcl_GetCellFrmForBorderAttrs( const SwFrm* _pCellFrm, +static const SwFrm* lcl_GetCellFrmForBorderAttrs( const SwFrm* _pCellFrm, const SwBorderAttrs& _rCellBorderAttrs, const bool _bTop ) { @@ -5680,7 +5680,7 @@ sal_Bool SwPageFrm::IsLeftShadowNeeded() const enum PaintArea {LEFT, RIGHT, TOP, BOTTOM}; /// Wrapper around pOut->DrawBitmapEx. -void lcl_paintBitmapExToRect(OutputDevice *pOut, Point aPoint, BitmapEx& rBitmapEx, PaintArea eArea) +static void lcl_paintBitmapExToRect(OutputDevice *pOut, Point aPoint, BitmapEx& rBitmapEx, PaintArea eArea) { // The problem is that if we get called multiple times and the color is // partly transparent, then the result will get darker and darker. To avoid @@ -6354,7 +6354,7 @@ SizePtr pWidth = &Size::nA; SizePtr pHeight = &Size::nB; // OD 18.11.2002 #99672# - new parameter <_pSubsLines> -void lcl_RefreshLine( const SwLayoutFrm *pLay, +static void lcl_RefreshLine( const SwLayoutFrm *pLay, const SwPageFrm *pPage, const Point &rP1, const Point &rP2, @@ -6453,7 +6453,7 @@ void lcl_RefreshLine( const SwLayoutFrm *pLay, } } -drawinglayer::primitive2d::Primitive2DSequence lcl_CreatePageAreaDelimiterPrimitives( +static drawinglayer::primitive2d::Primitive2DSequence lcl_CreatePageAreaDelimiterPrimitives( const SwRect& rRect ) { drawinglayer::primitive2d::Primitive2DSequence aSeq( 4 ); @@ -6487,7 +6487,7 @@ drawinglayer::primitive2d::Primitive2DSequence lcl_CreatePageAreaDelimiterPrimit return aSeq; } -drawinglayer::primitive2d::Primitive2DSequence lcl_CreateRectangleDelimiterPrimitives ( +static drawinglayer::primitive2d::Primitive2DSequence lcl_CreateRectangleDelimiterPrimitives ( const SwRect& rRect ) { drawinglayer::primitive2d::Primitive2DSequence aSeq( 1 ); @@ -6508,7 +6508,7 @@ drawinglayer::primitive2d::Primitive2DSequence lcl_CreateRectangleDelimiterPrimi return aSeq; } -drawinglayer::primitive2d::Primitive2DSequence lcl_CreateColumnAreaDelimiterPrimitives( +static drawinglayer::primitive2d::Primitive2DSequence lcl_CreateColumnAreaDelimiterPrimitives( const SwRect& rRect ) { drawinglayer::primitive2d::Primitive2DSequence aSeq( 4 ); diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index ae2aa34ede36..a0f14130a8dd 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -572,7 +572,7 @@ sal_Bool SwSectionFrm::SplitSect( SwFrm* pFrm, sal_Bool bApres ) // If a multi-column section is cancelled, the ContentFrms have to be // invalidated -void lcl_InvalidateInfFlags( SwFrm* pFrm, bool bInva ) +static void lcl_InvalidateInfFlags( SwFrm* pFrm, bool bInva ) { while ( pFrm ) { @@ -593,7 +593,7 @@ void lcl_InvalidateInfFlags( SwFrm* pFrm, bool bInva ) // // Works like SwCntntFrm::ImplGetNextCntntFrm, but starts with a LayoutFrm // -SwCntntFrm* lcl_GetNextCntntFrm( const SwLayoutFrm* pLay, bool bFwd ) +static SwCntntFrm* lcl_GetNextCntntFrm( const SwLayoutFrm* pLay, bool bFwd ) { if ( bFwd ) { @@ -828,7 +828,7 @@ const SwSectionFmt* SwSectionFrm::_GetEndSectFmt() const return pFmt; } -void lcl_FindCntntFrm( SwCntntFrm* &rpCntntFrm, SwFtnFrm* &rpFtnFrm, +static void lcl_FindCntntFrm( SwCntntFrm* &rpCntntFrm, SwFtnFrm* &rpFtnFrm, SwFrm* pFrm, sal_Bool &rbChkFtn ) { if( pFrm ) @@ -918,7 +918,7 @@ sal_Bool SwSectionFrm::CalcMinDiff( SwTwips& rMinDiff ) const * *************************************************************************/ -SwFtnFrm* lcl_FindEndnote( SwSectionFrm* &rpSect, sal_Bool &rbEmpty, +static SwFtnFrm* lcl_FindEndnote( SwSectionFrm* &rpSect, sal_Bool &rbEmpty, SwLayouter *pLayouter ) { // if rEmpty is set, the rpSect is already searched @@ -965,7 +965,7 @@ SwFtnFrm* lcl_FindEndnote( SwSectionFrm* &rpSect, sal_Bool &rbEmpty, return NULL; } -void lcl_ColumnRefresh( SwSectionFrm* pSect, sal_Bool bFollow ) +static void lcl_ColumnRefresh( SwSectionFrm* pSect, sal_Bool bFollow ) { while( pSect ) { @@ -1939,7 +1939,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType ) return pLayLeaf; } -SwTwips lcl_DeadLine( const SwFrm* pFrm ) +static SwTwips lcl_DeadLine( const SwFrm* pFrm ) { const SwLayoutFrm* pUp = pFrm->GetUpper(); while( pUp && pUp->IsInSct() ) diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index fa1e75a85df8..57b880113787 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -198,26 +198,26 @@ void SwTabFrm::RegistFlys() |* Some prototypes |*************************************************************************/ void SwInvalidateAll( SwFrm *pFrm, long nBottom ); -void lcl_RecalcRow( SwRowFrm& rRow, long nBottom ); -sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ); +static void lcl_RecalcRow( SwRowFrm& rRow, long nBottom ); +static sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ); // #i26945# - add parameter <_bOnlyRowsAndCells> to control // that only row and cell frames are formatted. -sal_Bool lcl_InnerCalcLayout( SwFrm *pFrm, +static sal_Bool lcl_InnerCalcLayout( SwFrm *pFrm, long nBottom, bool _bOnlyRowsAndCells = false ); // OD 2004-02-18 #106629# - correct type of 1st parameter // #i26945# - add parameter <_bConsiderObjs> in order to // control, if floating screen objects have to be considered for the minimal // cell height. -SwTwips lcl_CalcMinRowHeight( const SwRowFrm *pRow, +static SwTwips lcl_CalcMinRowHeight( const SwRowFrm *pRow, const sal_Bool _bConsiderObjs ); -SwTwips lcl_CalcTopAndBottomMargin( const SwLayoutFrm&, const SwBorderAttrs& ); +static SwTwips lcl_CalcTopAndBottomMargin( const SwLayoutFrm&, const SwBorderAttrs& ); /************************************************************************* |* START: local helper functions for repeated headlines |*************************************************************************/ -SwTwips lcl_GetHeightOfRows( const SwFrm* pStart, long nCount ) +static SwTwips lcl_GetHeightOfRows( const SwFrm* pStart, long nCount ) { if ( !nCount || !pStart) return 0; @@ -245,7 +245,7 @@ SwTwips lcl_GetHeightOfRows( const SwFrm* pStart, long nCount ) // // Local helper function to insert a new follow flow line // -SwRowFrm* lcl_InsertNewFollowFlowLine( SwTabFrm& rTab, const SwFrm& rTmpRow, bool bRowSpanLine ) +static SwRowFrm* lcl_InsertNewFollowFlowLine( SwTabFrm& rTab, const SwFrm& rTmpRow, bool bRowSpanLine ) { OSL_ENSURE( rTmpRow.IsRowFrm(), "No row frame to copy for FollowFlowLine" ); const SwRowFrm& rRow = (SwRowFrm&)rTmpRow; @@ -261,7 +261,7 @@ SwRowFrm* lcl_InsertNewFollowFlowLine( SwTabFrm& rTab, const SwFrm& rTmpRow, boo // #i26945# - local helper function to invalidate all lower // objects. By parameter <_bMoveObjsOutOfRange> it can be controlled, if // additionally the objects are moved 'out of range'. -void lcl_InvalidateLowerObjs( SwLayoutFrm& _rLayoutFrm, +static void lcl_InvalidateLowerObjs( SwLayoutFrm& _rLayoutFrm, const bool _bMoveObjsOutOfRange = false, SwPageFrm* _pPageFrm = 0L ) { @@ -340,7 +340,7 @@ void lcl_InvalidateLowerObjs( SwLayoutFrm& _rLayoutFrm, // // Local helper function to shrink all lowers of rRow to 0 height // -void lcl_ShrinkCellsAndAllContent( SwRowFrm& rRow ) +static void lcl_ShrinkCellsAndAllContent( SwRowFrm& rRow ) { SwCellFrm* pCurrMasterCell = static_cast<SwCellFrm*>(rRow.Lower()); SWRECTFN( pCurrMasterCell ) @@ -407,7 +407,7 @@ void lcl_ShrinkCellsAndAllContent( SwRowFrm& rRow ) // The content is inserted behind the last content in the corresponding // cell in rDestLine. // -void lcl_MoveRowContent( SwRowFrm& rSourceLine, SwRowFrm& rDestLine ) +static void lcl_MoveRowContent( SwRowFrm& rSourceLine, SwRowFrm& rDestLine ) { SwCellFrm* pCurrDestCell = (SwCellFrm*)rDestLine.Lower(); SwCellFrm* pCurrSourceCell = (SwCellFrm*)rSourceLine.Lower(); @@ -473,7 +473,7 @@ void lcl_MoveRowContent( SwRowFrm& rSourceLine, SwRowFrm& rDestLine ) // Local helper function to move all footnotes in rRowFrm from // the footnote boss of rSource to the footnote boss of rDest. // -void lcl_MoveFootnotes( SwTabFrm& rSource, SwTabFrm& rDest, SwLayoutFrm& rRowFrm ) +static void lcl_MoveFootnotes( SwTabFrm& rSource, SwTabFrm& rDest, SwLayoutFrm& rRowFrm ) { if ( !rSource.GetFmt()->GetDoc()->GetFtnIdxs().empty() ) { @@ -486,7 +486,7 @@ void lcl_MoveFootnotes( SwTabFrm& rSource, SwTabFrm& rDest, SwLayoutFrm& rRowFrm // // Local helper function to handle nested table cells before the split process // -void lcl_PreprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine, +static void lcl_PreprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine, SwRowFrm& rFollowFlowLine, SwTwips nRemain ) { SwCellFrm* pCurrLastLineCell = (SwCellFrm*)rLastLine.Lower(); @@ -608,7 +608,7 @@ void lcl_PreprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine, // // Local helper function to handle nested table cells after the split process // -void lcl_PostprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine ) +static void lcl_PostprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine ) { SwCellFrm* pCurrMasterCell = (SwCellFrm*)rLastLine.Lower(); while ( pCurrMasterCell ) @@ -645,7 +645,7 @@ void lcl_PostprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine ) inline void TableSplitRecalcLock( SwFlowFrm *pTab ) { pTab->LockJoin(); } inline void TableSplitRecalcUnlock( SwFlowFrm *pTab ) { pTab->UnlockJoin(); } -bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, +static bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, SwTwips nRemainingSpaceForLastRow ) { bool bRet = true; @@ -813,7 +813,7 @@ bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, // // Sets the correct height for all spanned cells // -void lcl_AdjustRowSpanCells( SwRowFrm* pRow ) +static void lcl_AdjustRowSpanCells( SwRowFrm* pRow ) { SWRECTFN( pRow ) SwCellFrm* pCellFrm = static_cast<SwCellFrm*>(pRow->GetLower()); @@ -836,7 +836,7 @@ void lcl_AdjustRowSpanCells( SwRowFrm* pRow ) // // Returns the maximum layout row span of the row // Looking for the next row that contains no covered cells: -long lcl_GetMaximumLayoutRowSpan( const SwRowFrm& rRow ) +static long lcl_GetMaximumLayoutRowSpan( const SwRowFrm& rRow ) { long nRet = 1; @@ -945,7 +945,7 @@ bool SwTabFrm::RemoveFollowFlowLine() } // #i26945# - Floating screen objects are no longer searched. -bool lcl_FindSectionsInRow( const SwRowFrm& rRow ) +static bool lcl_FindSectionsInRow( const SwRowFrm& rRow ) { bool bRet = false; SwCellFrm* pLower = (SwCellFrm*)rRow.Lower(); @@ -1441,7 +1441,7 @@ void SwInvalidateAll( SwFrm *pFrm, long nBottom ) } // #i29550# -void lcl_InvalidateAllLowersPrt( SwLayoutFrm* pLayFrm ) +static void lcl_InvalidateAllLowersPrt( SwLayoutFrm* pLayFrm ) { pLayFrm->_InvalidatePrt(); pLayFrm->_InvalidateSize(); @@ -1556,7 +1556,7 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, // #i26945# - add parameter <_bOnlyRowsAndCells> to control // that only row and cell frames are formatted. -sal_Bool lcl_InnerCalcLayout( SwFrm *pFrm, +static sal_Bool lcl_InnerCalcLayout( SwFrm *pFrm, long nBottom, bool _bOnlyRowsAndCells ) { @@ -1599,7 +1599,7 @@ sal_Bool lcl_InnerCalcLayout( SwFrm *pFrm, return bRet; } -void lcl_RecalcRow( SwRowFrm& rRow, long nBottom ) +static void lcl_RecalcRow( SwRowFrm& rRow, long nBottom ) { // #i26945# - For correct appliance of the 'straightforward // object positioning process, it's needed to notify that the page frame, @@ -1696,7 +1696,7 @@ void lcl_RecalcRow( SwRowFrm& rRow, long nBottom ) pPageFrm->SetLayoutInProgress( false ); } -void lcl_RecalcTable( SwTabFrm& rTab, +static void lcl_RecalcTable( SwTabFrm& rTab, SwLayoutFrm *pFirstRow, SwLayNotify &rNotify ) { @@ -1715,7 +1715,7 @@ void lcl_RecalcTable( SwTabFrm& rTab, // This is a new function to check the first condition whether // a tab frame may move backward. It replaces the formerly used // GetIndPrev(), which did not work correctly for #i5947# -bool lcl_NoPrev( const SwFrm& rFrm ) +static bool lcl_NoPrev( const SwFrm& rFrm ) { // #i79774# // skip empty sections on investigation of direct previous frame. @@ -1770,7 +1770,7 @@ bool lcl_NoPrev( const SwFrm& rFrm ) // a table frame and format it to assure keep attribute. // method return true, if a next content frame is formatted. // Precondition: The given table frame hasn't a follow and isn't a follow. -SwFrm* lcl_FormatNextCntntForKeep( SwTabFrm* pTabFrm ) +SwFrm* sw_FormatNextCntntForKeep( SwTabFrm* pTabFrm ) { // find next content, table or section SwFrm* pNxt = pTabFrm->FindNext(); @@ -2090,7 +2090,7 @@ void SwTabFrm::MakeAll() // Thus, find next content, table or section // and, if a section is found, get its first // content. - if ( 0 != lcl_FormatNextCntntForKeep( this ) && !GetNext() ) + if ( 0 != sw_FormatNextCntntForKeep( this ) && !GetNext() ) { bValidPos = sal_False; } @@ -2259,7 +2259,7 @@ void SwTabFrm::MakeAll() // it has to be avoided, that superior table is formatted. // Thus, find next content, table or section and, if a section // is found, get its first content. - const SwFrm* pTmpNxt = lcl_FormatNextCntntForKeep( this ); + const SwFrm* pTmpNxt = sw_FormatNextCntntForKeep( this ); pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this ); pAttrs = pAccess->Get(); @@ -3867,7 +3867,7 @@ long CalcHeightWidthFlys( const SwFrm *pFrm ) return nHeight; } -SwTwips lcl_CalcTopAndBottomMargin( const SwLayoutFrm& rCell, const SwBorderAttrs& rAttrs ) +static SwTwips lcl_CalcTopAndBottomMargin( const SwLayoutFrm& rCell, const SwBorderAttrs& rAttrs ) { const SwTabFrm* pTab = rCell.FindTabFrm(); SwTwips nTopSpace = 0; @@ -3901,7 +3901,7 @@ SwTwips lcl_CalcTopAndBottomMargin( const SwLayoutFrm& rCell, const SwBorderAttr // #i26945# - add parameter <_bConsiderObjs> in order to // control, if floating screen objects have to be considered for the minimal // cell height. -SwTwips lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell, +static SwTwips lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell, const sal_Bool _bConsiderObjs, const SwBorderAttrs *pAttrs = 0 ) { @@ -3958,7 +3958,7 @@ SwTwips lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell, // OD 2004-02-18 #106629# - correct type of 1st parameter // #i26945# - add parameter <_bConsiderObjs> in order to control, // if floating screen objects have to be considered for the minimal cell height -SwTwips lcl_CalcMinRowHeight( const SwRowFrm* _pRow, +static SwTwips lcl_CalcMinRowHeight( const SwRowFrm* _pRow, const sal_Bool _bConsiderObjs ) { SWRECTFN( _pRow ) @@ -4016,7 +4016,7 @@ SwTwips lcl_CalcMinRowHeight( const SwRowFrm* _pRow, // #i29550# // Calculate the maximum of (TopLineSize + TopLineDist) over all lowers: -sal_uInt16 lcl_GetTopSpace( const SwRowFrm& rRow ) +static sal_uInt16 lcl_GetTopSpace( const SwRowFrm& rRow ) { sal_uInt16 nTopSpace = 0; for ( SwCellFrm* pCurrLower = (SwCellFrm*)rRow.Lower(); pCurrLower; @@ -4037,7 +4037,7 @@ sal_uInt16 lcl_GetTopSpace( const SwRowFrm& rRow ) } // Calculate the maximum of TopLineDist over all lowers: -sal_uInt16 lcl_GetTopLineDist( const SwRowFrm& rRow ) +static sal_uInt16 lcl_GetTopLineDist( const SwRowFrm& rRow ) { sal_uInt16 nTopLineDist = 0; for ( SwCellFrm* pCurrLower = (SwCellFrm*)rRow.Lower(); pCurrLower; @@ -4058,7 +4058,7 @@ sal_uInt16 lcl_GetTopLineDist( const SwRowFrm& rRow ) } // Calculate the maximum of BottomLineSize over all lowers: -sal_uInt16 lcl_GetBottomLineSize( const SwRowFrm& rRow ) +static sal_uInt16 lcl_GetBottomLineSize( const SwRowFrm& rRow ) { sal_uInt16 nBottomLineSize = 0; for ( SwCellFrm* pCurrLower = (SwCellFrm*)rRow.Lower(); pCurrLower; @@ -4083,7 +4083,7 @@ sal_uInt16 lcl_GetBottomLineSize( const SwRowFrm& rRow ) } // Calculate the maximum of BottomLineDist over all lowers: -sal_uInt16 lcl_GetBottomLineDist( const SwRowFrm& rRow ) +static sal_uInt16 lcl_GetBottomLineDist( const SwRowFrm& rRow ) { sal_uInt16 nBottomLineDist = 0; for ( SwCellFrm* pCurrLower = (SwCellFrm*)rRow.Lower(); pCurrLower; @@ -4686,7 +4686,7 @@ SwCellFrm::~SwCellFrm() |* SwCellFrm::Format() |* |*************************************************************************/ -sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) +static sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) { sal_Bool bRet = sal_False; SwFrm *pFrm = pLay->Lower(); @@ -5369,7 +5369,7 @@ bool SwTabFrm::IsCollapsingBorders() const // // Local helper function to calculate height of first text row // -SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine ) +static SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine ) { // Find corresponding split line in master table const SwTabFrm* pTab = rSourceLine.FindTabFrm(); diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 7fb7d30a9476..557894686304 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -589,12 +589,12 @@ sal_Bool SwCntntFrm::RightMargin(SwPaM *pPam, sal_Bool) const return sal_True; } -const SwCntntFrm *lcl_GetNxtCnt( const SwCntntFrm* pCnt ) +static const SwCntntFrm *lcl_GetNxtCnt( const SwCntntFrm* pCnt ) { return pCnt->GetNextCntntFrm(); } -const SwCntntFrm *lcl_GetPrvCnt( const SwCntntFrm* pCnt ) +static const SwCntntFrm *lcl_GetPrvCnt( const SwCntntFrm* pCnt ) { return pCnt->GetPrevCntntFrm(); } @@ -602,7 +602,7 @@ const SwCntntFrm *lcl_GetPrvCnt( const SwCntntFrm* pCnt ) typedef const SwCntntFrm *(*GetNxtPrvCnt)( const SwCntntFrm* ); //Frame in wiederholter Headline? -sal_Bool lcl_IsInRepeatedHeadline( const SwFrm *pFrm, +static sal_Bool lcl_IsInRepeatedHeadline( const SwFrm *pFrm, const SwTabFrm** ppTFrm = 0 ) { const SwTabFrm *pTab = pFrm->FindTabFrm(); @@ -616,7 +616,7 @@ sal_Bool lcl_IsInRepeatedHeadline( const SwFrm *pFrm, //Ueberspringen von wiederholten Headlines. //MA 26. Jan. 98: Chg auch andere Geschuetzte Bereiche ueberspringen. // FME: Skip follow flow cells -const SwCntntFrm * lcl_MissProtectedFrames( const SwCntntFrm *pCnt, +static const SwCntntFrm * lcl_MissProtectedFrames( const SwCntntFrm *pCnt, GetNxtPrvCnt fnNxtPrv, sal_Bool bMissHeadline, sal_Bool bInReadOnly, @@ -647,7 +647,7 @@ const SwCntntFrm * lcl_MissProtectedFrames( const SwCntntFrm *pCnt, return pCnt; } -sal_Bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, +static sal_Bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, GetNxtPrvCnt fnNxtPrv, sal_Bool bInReadOnly ) { OSL_ENSURE( pPam->GetNode() == (SwCntntNode*)pStart->GetNode(), @@ -1165,7 +1165,7 @@ sal_uLong CalcDiff( const Point &rPt1, const Point &rPt2 ) // eher akzeptiert wird als ein anderer, der nicht dort liegt, auch wenn // dessen Abstand zum Punkt geringer ist. -const SwLayoutFrm* lcl_Inside( const SwCntntFrm *pCnt, Point& rPt ) +static const SwLayoutFrm* lcl_Inside( const SwCntntFrm *pCnt, Point& rPt ) { const SwLayoutFrm* pUp = pCnt->GetUpper(); while( pUp ) diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index eb7d548ccbcd..b445f6f27413 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -3285,7 +3285,7 @@ long SwLayoutFrm::CalcRel( const SwFmtFrmSize &rSz, sal_Bool ) const /************************************************************************* |* Local helpers for SwLayoutFrm::FormatWidthCols() |*************************************************************************/ -long lcl_CalcMinColDiff( SwLayoutFrm *pLayFrm ) +static long lcl_CalcMinColDiff( SwLayoutFrm *pLayFrm ) { long nDiff = 0, nFirstDiff = 0; SwLayoutFrm *pCol = (SwLayoutFrm*)pLayFrm->Lower(); @@ -3316,7 +3316,7 @@ long lcl_CalcMinColDiff( SwLayoutFrm *pLayFrm ) return nDiff ? nDiff : nFirstDiff ? nFirstDiff : 240; } -sal_Bool lcl_IsFlyHeightClipped( SwLayoutFrm *pLay ) +static sal_Bool lcl_IsFlyHeightClipped( SwLayoutFrm *pLay ) { SwFrm *pFrm = pLay->ContainsCntnt(); while ( pFrm ) @@ -3711,7 +3711,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, |* |*************************************************************************/ -SwCntntFrm* lcl_InvalidateSection( SwFrm *pCnt, sal_uInt8 nInv ) +static SwCntntFrm* lcl_InvalidateSection( SwFrm *pCnt, sal_uInt8 nInv ) { SwSectionFrm* pSect = pCnt->FindSctFrm(); // If our CntntFrm is placed inside a table or a footnote, only sections @@ -3734,7 +3734,7 @@ SwCntntFrm* lcl_InvalidateSection( SwFrm *pCnt, sal_uInt8 nInv ) return pRet; } -SwCntntFrm* lcl_InvalidateTable( SwTabFrm *pTable, sal_uInt8 nInv ) +static SwCntntFrm* lcl_InvalidateTable( SwTabFrm *pTable, sal_uInt8 nInv ) { if( ( nInv & INV_SECTION ) && pTable->IsInSct() ) lcl_InvalidateSection( pTable, nInv ); @@ -3747,9 +3747,9 @@ SwCntntFrm* lcl_InvalidateTable( SwTabFrm *pTable, sal_uInt8 nInv ) return pTable->FindLastCntnt(); } -void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ); +static void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ); -void lcl_InvalidateCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ) +static void lcl_InvalidateCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ) { SwCntntFrm *pLastTabCnt = NULL; SwCntntFrm *pLastSctCnt = NULL; @@ -3812,7 +3812,7 @@ void lcl_InvalidateCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ) } } -void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ) +static void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ) { SwSortedObjs &rObjs = *pCnt->GetDrawObjs(); for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx index dd2ddc0b66f3..56dd9e696802 100644 --- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx @@ -101,7 +101,7 @@ SwTxtFrm& SwToCntntAnchoredObjectPosition::GetAnchorTxtFrm() const } // #i23512# -bool lcl_DoesVertPosFits( const SwTwips _nRelPosY, +static bool lcl_DoesVertPosFits( const SwTwips _nRelPosY, const SwTwips _nAvail, const SwLayoutFrm* _pUpperOfOrientFrm, const bool _bBrowse, diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx index 12f60e34c7b9..553e5dfcdc1e 100644 --- a/sw/source/core/table/swnewtable.cxx +++ b/sw/source/core/table/swnewtable.cxx @@ -126,7 +126,7 @@ if bSet is true, rMin and rMax will be set to the left and right border of the b */ -void lcl_CheckMinMax( long& rMin, long& rMax, const SwTableLine& rLine, sal_uInt16 nCheck, bool bSet ) +static void lcl_CheckMinMax( long& rMin, long& rMax, const SwTableLine& rLine, sal_uInt16 nCheck, bool bSet ) { ++nCheck; if( rLine.GetTabBoxes().size() < nCheck ) @@ -164,7 +164,7 @@ is the requested table box */ -long lcl_Box2LeftBorder( const SwTableBox& rBox ) +static long lcl_Box2LeftBorder( const SwTableBox& rBox ) { if( !rBox.GetUpper() ) return 0; @@ -199,7 +199,7 @@ the row (table line) to be scanned */ -SwTableBox* lcl_LeftBorder2Box( long nLeft, const SwTableLine* pLine ) +static SwTableBox* lcl_LeftBorder2Box( long nLeft, const SwTableLine* pLine ) { if( !pLine ) return 0; @@ -249,7 +249,7 @@ false is also needed for deleted rows */ -void lcl_ChangeRowSpan( const SwTable& rTable, const long nDiff, +static void lcl_ChangeRowSpan( const SwTable& rTable, const long nDiff, sal_uInt16 nRowIdx, const bool bSingle ) { if( !nDiff || nRowIdx >= rTable.GetTabLines().size() ) @@ -587,7 +587,7 @@ SwBoxSelection* SwTable::CollectBoxSelection( const SwPaM& rPam ) const to initiate a reformatting */ -void lcl_InvalidateCellFrm( const SwTableBox& rBox ) +static void lcl_InvalidateCellFrm( const SwTableBox& rBox ) { SwIterator<SwCellFrm,SwFmt> aIter( *rBox.GetFrmFmt() ); for( SwCellFrm* pCell = aIter.First(); pCell; pCell = aIter.Next() ) @@ -606,7 +606,7 @@ void lcl_InvalidateCellFrm( const SwTableBox& rBox ) when a selection of cells is given and returns the average cell widths */ -long lcl_InsertPosition( SwTable &rTable, std::vector<sal_uInt16>& rInsPos, +static long lcl_InsertPosition( SwTable &rTable, std::vector<sal_uInt16>& rInsPos, const SwSelBoxes& rBoxes, sal_Bool bBehind ) { sal_Int32 nAddWidth = 0; @@ -1065,7 +1065,7 @@ SwTableBox& SwTableBox::FindEndOfRowSpan( const SwTable& rTable, sal_uInt16 nMax /** lcl_getAllMergedBoxes(..) collects all overlapped boxes to a given (master) box */ -void lcl_getAllMergedBoxes( const SwTable& rTable, SwSelBoxes& rBoxes, SwTableBox& rBox ) +static void lcl_getAllMergedBoxes( const SwTable& rTable, SwSelBoxes& rBoxes, SwTableBox& rBox ) { SwTableBox* pBox = &rBox; OSL_ENSURE( pBox == &rBox.FindStartOfRowSpan( rTable, USHRT_MAX ), "Not a master box" ); @@ -1088,7 +1088,7 @@ void lcl_getAllMergedBoxes( const SwTable& rTable, SwSelBoxes& rBoxes, SwTableBo and its overlapped cells to split them into several pieces. */ -void lcl_UnMerge( const SwTable& rTable, SwTableBox& rBox, size_t nCnt, +static void lcl_UnMerge( const SwTable& rTable, SwTableBox& rBox, size_t nCnt, sal_Bool bSameHeight ) { SwSelBoxes aBoxes; @@ -1141,7 +1141,7 @@ void lcl_UnMerge( const SwTable& rTable, SwTableBox& rBox, size_t nCnt, /** lcl_FillSelBoxes(..) puts all boxes of a given line into the selection structure */ -void lcl_FillSelBoxes( SwSelBoxes &rBoxes, SwTableLine &rLine ) +static void lcl_FillSelBoxes( SwSelBoxes &rBoxes, SwTableLine &rLine ) { sal_uInt16 nBoxCount = rLine.GetTabBoxes().size(); for( sal_uInt16 i = 0; i < nBoxCount; ++i ) @@ -1202,7 +1202,7 @@ Output ******************************************************************************/ -void lcl_SophisticatedFillLineIndices( SwLineOffsetArray &rArr, +static void lcl_SophisticatedFillLineIndices( SwLineOffsetArray &rArr, const SwTable& rTable, const SwSelBoxes& rBoxes, sal_uInt16 nCnt ) { std::list< SwLineOffset > aBoxes; @@ -1297,7 +1297,7 @@ typedef std::set< SwTwips > SwSplitLines; to be splitted to fulfill the requested "split same height" */ -sal_uInt16 lcl_CalculateSplitLineHeights( SwSplitLines &rCurr, SwSplitLines &rNew, +static sal_uInt16 lcl_CalculateSplitLineHeights( SwSplitLines &rCurr, SwSplitLines &rNew, const SwTable& rTable, const SwSelBoxes& rBoxes, sal_uInt16 nCnt ) { if( nCnt < 2 ) @@ -1358,7 +1358,7 @@ sal_uInt16 lcl_CalculateSplitLineHeights( SwSplitLines &rCurr, SwSplitLines &rNe the box selection. */ -sal_uInt16 lcl_LineIndex( const SwTable& rTable, const SwSelBoxes& rBoxes, +static sal_uInt16 lcl_LineIndex( const SwTable& rTable, const SwSelBoxes& rBoxes, bool bBehind ) { sal_uInt16 nDirect = USHRT_MAX; @@ -1602,7 +1602,7 @@ void SwTable::PrepareDelBoxes( const SwSelBoxes& rBoxes ) if it overlaps with the given x-position range */ -void lcl_SearchSelBox( const SwTable &rTable, SwSelBoxes& rBoxes, long nMin, long nMax, +static void lcl_SearchSelBox( const SwTable &rTable, SwSelBoxes& rBoxes, long nMin, long nMax, SwTableLine& rLine, bool bChkProtected, bool bColumn ) { long nLeft = 0; diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 5310ae2e0efb..f51d9c6d9e3d 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -173,7 +173,7 @@ void SwTableBox::setDummyFlag( bool bDummy ) } //JP 15.09.98: Bug 55741 - Keep tabs (front and rear) -String& lcl_TabToBlankAtSttEnd( String& rTxt ) +static String& lcl_TabToBlankAtSttEnd( String& rTxt ) { sal_Unicode c; xub_StrLen n; @@ -187,7 +187,7 @@ String& lcl_TabToBlankAtSttEnd( String& rTxt ) return rTxt; } -String& lcl_DelTabsAtSttEnd( String& rTxt ) +static String& lcl_DelTabsAtSttEnd( String& rTxt ) { sal_Unicode c; xub_StrLen n; @@ -438,7 +438,7 @@ void SwTable::AdjustWidths( const long nOld, const long nNew ) |* SwTable::GetTabCols() |* |*************************************************************************/ -void lcl_RefreshHidden( SwTabCols &rToFill, sal_uInt16 nPos ) +static void lcl_RefreshHidden( SwTabCols &rToFill, sal_uInt16 nPos ) { for ( sal_uInt16 i = 0; i < rToFill.Count(); ++i ) { @@ -450,7 +450,7 @@ void lcl_RefreshHidden( SwTabCols &rToFill, sal_uInt16 nPos ) } } -void lcl_SortedTabColInsert( SwTabCols &rToFill, const SwTableBox *pBox, +static void lcl_SortedTabColInsert( SwTabCols &rToFill, const SwTableBox *pBox, const SwFrmFmt *pTabFmt, const sal_Bool bHidden, const bool bRefreshHidden ) { @@ -560,7 +560,7 @@ void lcl_SortedTabColInsert( SwTabCols &rToFill, const SwTableBox *pBox, } } -void lcl_ProcessBoxGet( const SwTableBox *pBox, SwTabCols &rToFill, +static void lcl_ProcessBoxGet( const SwTableBox *pBox, SwTabCols &rToFill, const SwFrmFmt *pTabFmt, bool bRefreshHidden ) { if ( !pBox->GetTabLines().empty() ) @@ -576,7 +576,7 @@ void lcl_ProcessBoxGet( const SwTableBox *pBox, SwTabCols &rToFill, ::lcl_SortedTabColInsert( rToFill, pBox, pTabFmt, sal_False, bRefreshHidden ); } -void lcl_ProcessLineGet( const SwTableLine *pLine, SwTabCols &rToFill, +static void lcl_ProcessLineGet( const SwTableLine *pLine, SwTabCols &rToFill, const SwFrmFmt *pTabFmt ) { for ( sal_uInt16 i = 0; i < pLine->GetTabBoxes().size(); ++i ) @@ -695,16 +695,16 @@ struct Parm {} }; -void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm ); +static void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm ); -void lcl_ProcessLine( SwTableLine *pLine, Parm &rParm ) +static void lcl_ProcessLine( SwTableLine *pLine, Parm &rParm ) { SwTableBoxes &rBoxes = pLine->GetTabBoxes(); for ( int i = rBoxes.size()-1; i >= 0; --i ) ::lcl_ProcessBoxSet( rBoxes[ static_cast< sal_uInt16 >(i) ], rParm ); } -void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm ) +static void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm ) { if ( !pBox->GetTabLines().empty() ) { SwTableLines &rLines = pBox->GetTabLines(); @@ -848,7 +848,7 @@ void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm ) } } -void lcl_ProcessBoxPtr( SwTableBox *pBox, std::deque<SwTableBox*> &rBoxArr, +static void lcl_ProcessBoxPtr( SwTableBox *pBox, std::deque<SwTableBox*> &rBoxArr, sal_Bool bBefore ) { if ( !pBox->GetTabLines().empty() ) @@ -867,9 +867,9 @@ void lcl_ProcessBoxPtr( SwTableBox *pBox, std::deque<SwTableBox*> &rBoxArr, rBoxArr.push_back( pBox ); } -void lcl_AdjustBox( SwTableBox *pBox, const long nDiff, Parm &rParm ); +static void lcl_AdjustBox( SwTableBox *pBox, const long nDiff, Parm &rParm ); -void lcl_AdjustLines( SwTableLines &rLines, const long nDiff, Parm &rParm ) +static void lcl_AdjustLines( SwTableLines &rLines, const long nDiff, Parm &rParm ) { for ( sal_uInt16 i = 0; i < rLines.size(); ++i ) { @@ -879,7 +879,7 @@ void lcl_AdjustLines( SwTableLines &rLines, const long nDiff, Parm &rParm ) } } -void lcl_AdjustBox( SwTableBox *pBox, const long nDiff, Parm &rParm ) +static void lcl_AdjustBox( SwTableBox *pBox, const long nDiff, Parm &rParm ) { if ( !pBox->GetTabLines().empty() ) ::lcl_AdjustLines( pBox->GetTabLines(), nDiff, rParm ); @@ -1875,7 +1875,7 @@ void SwTableBox::ChgFrmFmt( SwTableBoxFmt* pNewFmt ) |* resulting from the position in the lines/boxes/tables. |* |*************************************************************************/ -void lcl_GetTblBoxColStr( sal_uInt16 nCol, String& rNm ) +void sw_GetTblBoxColStr( sal_uInt16 nCol, String& rNm ) { const sal_uInt16 coDiff = 52; // 'A'-'Z' 'a' - 'z' sal_uInt16 nCalc; @@ -1923,7 +1923,7 @@ String SwTableBox::GetName() const if( 0 != ( pBox = pLine->GetUpper()) ) sNm.Insert( aDotStr, 0 ).Insert( sTmp, 0 ); else - ::lcl_GetTblBoxColStr( nPos, sNm ); + sw_GetTblBoxColStr( nPos, sNm ); } while( pBox ); return sNm; diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index 2e2b19601c11..f0802274ee3e 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -215,7 +215,7 @@ sal_Bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr ) * 2. The user has choosen to override these colors in the view options *************************************************************************/ -bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr, +static bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr, const SfxPoolItem& rItem, const ViewShell* pShell, Color* pColor ) diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx index 3210de660f87..9562f1609808 100644 --- a/sw/source/core/text/frmcrsr.cxx +++ b/sw/source/core/text/frmcrsr.cxx @@ -89,7 +89,7 @@ SwTxtFrm *GetAdjFrmAtPos( SwTxtFrm *pFrm, const SwPosition &rPos, nNew = 0; else nNew -= MIN_OFFSET_STEP; - lcl_ChangeOffset( pFrmAtPos, nNew ); + sw_ChangeOffset( pFrmAtPos, nNew ); } } while( pFrm != pFrmAtPos ) @@ -112,7 +112,7 @@ SwTxtFrm *GetAdjFrmAtPos( SwTxtFrm *pFrm, const SwPosition &rPos, return pFrmAtPos ? pFrmAtPos : pFrm; } -sal_Bool lcl_ChangeOffset( SwTxtFrm* pFrm, xub_StrLen nNew ) +sal_Bool sw_ChangeOffset( SwTxtFrm* pFrm, xub_StrLen nNew ) { // Do not scroll in areas and outside of flies OSL_ENSURE( !pFrm->IsFollow(), "Illegal Scrolling by Follow!" ); @@ -305,7 +305,7 @@ sal_Bool SwTxtFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos, pFrm->GetOfst() < nOffset && !pFrm->IsFollow() && !bNoScroll && pFrm->GetTxtNode()->GetTxt().Len() != nNextOfst ) - bGoOn = lcl_ChangeOffset( pFrm, nNextOfst ); + bGoOn = sw_ChangeOffset( pFrm, nNextOfst ); else bGoOn = sal_False; } while ( bGoOn ); @@ -724,7 +724,7 @@ sal_Bool SwTxtFrm::LeftMargin(SwPaM *pPam) const nIndx = aLine.GetStart(); if( pFrm->GetOfst() && !pFrm->IsFollow() && !aLine.GetPrev() ) { - lcl_ChangeOffset( pFrm, 0 ); + sw_ChangeOffset( pFrm, 0 ); nIndx = 0; } } @@ -821,7 +821,7 @@ sal_Bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset, do { if( nFormat != STRING_LEN && !IsFollow() ) - lcl_ChangeOffset( ((SwTxtFrm*)this), nFormat ); + sw_ChangeOffset( ((SwTxtFrm*)this), nFormat ); SwTxtSizeInfo aInf( (SwTxtFrm*)this ); SwTxtCursor aLine( ((SwTxtFrm*)this), &aInf ); @@ -938,7 +938,7 @@ sal_Bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset, // nPos: the new visual position // bLeft: whether the break iterator has to add or subtract from the // current position -void lcl_VisualMoveRecursion( const SwLineLayout& rCurrLine, xub_StrLen nIdx, +static void lcl_VisualMoveRecursion( const SwLineLayout& rCurrLine, xub_StrLen nIdx, xub_StrLen& nPos, sal_Bool& bRight, sal_uInt8& nCrsrLevel, sal_uInt8 nDefaultDir ) { @@ -1218,7 +1218,7 @@ sal_Bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset, do { if( nFormat != STRING_LEN && !IsFollow() && - !lcl_ChangeOffset( ((SwTxtFrm*)this), nFormat ) ) + !sw_ChangeOffset( ((SwTxtFrm*)this), nFormat ) ) break; SwTxtSizeInfo aInf( (SwTxtFrm*)this ); diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index a02ab3b28647..32bb3ab29fbd 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -516,7 +516,7 @@ extern Color aGlobalRetoucheColor; * Returns if the current background color is dark. *************************************************************************/ -sal_Bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf ) +static sal_Bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf ) { const Color* pCol = rInf.GetFont()->GetBackColor(); if( ! pCol || COL_TRANSPARENT == pCol->GetColor() ) diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx index adef28acc874..2af72b3a726b 100644 --- a/sw/source/core/text/itradj.cxx +++ b/sw/source/core/text/itradj.cxx @@ -125,7 +125,7 @@ void SwTxtAdjuster::FormatBlock( ) /************************************************************************* * lcl_CheckKashidaPositions() *************************************************************************/ -bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, SwTxtSizeInfo& rInf, SwTxtIter& rItr, +static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, SwTxtSizeInfo& rInf, SwTxtIter& rItr, xub_StrLen& nKashidas, xub_StrLen& nGluePortion ) { // i60594 validate Kashida justification @@ -203,7 +203,7 @@ bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, SwTxtSizeInfo& rInf, SwTxtIte /************************************************************************* * lcl_CheckKashidaWidth() *************************************************************************/ -bool lcl_CheckKashidaWidth ( SwScriptInfo& rSI, SwTxtSizeInfo& rInf, SwTxtIter& rItr, xub_StrLen& nKashidas, +static bool lcl_CheckKashidaWidth ( SwScriptInfo& rSI, SwTxtSizeInfo& rInf, SwTxtIter& rItr, xub_StrLen& nKashidas, xub_StrLen& nGluePortion, const long nGluePortionWidth, long& nSpaceAdd ) { // check kashida width diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index 989b9f608105..bc043b7cf6a4 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -363,7 +363,7 @@ public: void NewWord() { nWordAdd = nWordWidth = 0; } }; -sal_Bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const XubString &rTxt, +static sal_Bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const XubString &rTxt, xub_StrLen nIdx, xub_StrLen nEnd ) { sal_Bool bRet = sal_False; diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 5d0a1542d32e..6b540fa26e3e 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -69,7 +69,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False; * this function allows to find the coordinates of a position (defined * in pCMS->pSpecialPos) inside a special portion (e.g., a field) *************************************************************************/ -void lcl_GetCharRectInsideField( SwTxtSizeInfo& rInf, SwRect& rOrig, +static void lcl_GetCharRectInsideField( SwTxtSizeInfo& rInf, SwRect& rOrig, const SwCrsrMoveState& rCMS, const SwLinePortion& rPor ) { diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 8cf1e079fa91..763f459402e9 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -1117,7 +1117,7 @@ SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf) return pPor; } -sal_Bool lcl_OldFieldRest( const SwLineLayout* pCurr ) +static sal_Bool lcl_OldFieldRest( const SwLineLayout* pCurr ) { if( !pCurr->GetNext() ) return sal_False; diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx index a2ab50eee7b8..9f76b781e55d 100644 --- a/sw/source/core/text/itrtxt.cxx +++ b/sw/source/core/text/itrtxt.cxx @@ -377,7 +377,7 @@ const SwLineLayout *SwTxtIter::TwipsToLine( const SwTwips y) // // Local helper function to check, if pCurr needs a field rest portion: // -sal_Bool lcl_NeedsFieldRest( const SwLineLayout* pCurr ) +static sal_Bool lcl_NeedsFieldRest( const SwLineLayout* pCurr ) { const SwLinePortion *pPor = pCurr->GetPortion(); sal_Bool bRet = sal_False; diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index f1205dc5bcf4..aa135949865f 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -272,7 +272,7 @@ void SwLineLayout::CreateSpaceAdd( const long nInit ) * in [nStt, nEnd[ *************************************************************************/ -bool lcl_HasOnlyBlanks( const XubString& rTxt, xub_StrLen nStt, xub_StrLen nEnd ) +static bool lcl_HasOnlyBlanks( const XubString& rTxt, xub_StrLen nStt, xub_StrLen nEnd ) { bool bBlankOnly = true; while ( nStt < nEnd ) diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 20b428a127da..5f5ec1fecdcf 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -825,7 +825,7 @@ void SwRubyPortion::CalcRubyOffset() * the 2-line-formats has the same brackets. * --------------------------------------------------*/ -sal_Bool lcl_Has2Lines( const SwTxtAttr& rAttr, const SvxTwoLinesItem* &rpRef, +static sal_Bool lcl_Has2Lines( const SwTxtAttr& rAttr, const SvxTwoLinesItem* &rpRef, sal_Bool &rValue ) { const SfxPoolItem* pItem = CharFmt::GetItem( rAttr, RES_CHRATR_TWO_LINES ); @@ -855,7 +855,7 @@ sal_Bool lcl_Has2Lines( const SwTxtAttr& rAttr, const SvxTwoLinesItem* &rpRef, * to the charrotate-format's value. * --------------------------------------------------*/ -sal_Bool lcl_HasRotation( const SwTxtAttr& rAttr, +static sal_Bool lcl_HasRotation( const SwTxtAttr& rAttr, const SvxCharRotateItem* &rpRef, sal_Bool &rValue ) { const SfxPoolItem* pItem = CharFmt::GetItem( rAttr, RES_CHRATR_ROTATE ); @@ -1684,7 +1684,7 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint, SetPropFont( 0 ); } -sal_Bool lcl_ExtractFieldFollow( SwLineLayout* pLine, SwLinePortion* &rpFld ) +static sal_Bool lcl_ExtractFieldFollow( SwLineLayout* pLine, SwLinePortion* &rpFld ) { SwLinePortion* pLast = pLine; rpFld = pLine->GetPortion(); @@ -1715,7 +1715,7 @@ sal_Bool lcl_ExtractFieldFollow( SwLineLayout* pLine, SwLinePortion* &rpFld ) * the rest of the remaining multi portion * --------------------------------------------------*/ -void lcl_TruncateMultiPortion( SwMultiPortion& rMulti, SwTxtFormatInfo& rInf, +static void lcl_TruncateMultiPortion( SwMultiPortion& rMulti, SwTxtFormatInfo& rInf, xub_StrLen nStartIdx ) { rMulti.GetRoot().Truncate(); diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index a6391f54aba6..0a8212b57b05 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star::i18n::ScriptType; * (for justified alignment). *************************************************************************/ -sal_uInt16 lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr, +static sal_uInt16 lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr, const SwLinePortion& rPor ) { xub_StrLen nPos, nEnd; @@ -295,7 +295,7 @@ void SwTxtPortion::BreakUnderflow( SwTxtFormatInfo &rInf ) * SwTxtPortion::_Format() *************************************************************************/ -sal_Bool lcl_HasContent( const SwFldPortion& rFld, SwTxtFormatInfo &rInf ) +static sal_Bool lcl_HasContent( const SwFldPortion& rFld, SwTxtFormatInfo &rInf ) { String aTxt; return rFld.GetExpTxt( rInf, aTxt ) && aTxt.Len(); diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index 1753ababf170..a75cfa483970 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star; * the position is calculated from the values in rInf *************************************************************************/ -sal_Bool lcl_IsDropFlyInter( const SwTxtFormatInfo &rInf, +static sal_Bool lcl_IsDropFlyInter( const SwTxtFormatInfo &rInf, sal_uInt16 nWidth, sal_uInt16 nHeight ) { const SwTxtFly *pTxtFly = rInf.GetTxtFly(); diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx index cc755f529616..7e831542b90d 100644 --- a/sw/source/core/text/txtfld.cxx +++ b/sw/source/core/text/txtfld.cxx @@ -64,7 +64,7 @@ *************************************************************************/ -sal_Bool lcl_IsInBody( SwFrm *pFrm ) +static sal_Bool lcl_IsInBody( SwFrm *pFrm ) { if ( pFrm->IsInDocBody() ) return sal_True; @@ -294,7 +294,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, * SwTxtFormatter::TryNewNoLengthPortion() *************************************************************************/ -SwFldPortion * lcl_NewMetaPortion(SwTxtAttr & rHint, const bool bPrefix) +static SwFldPortion * lcl_NewMetaPortion(SwTxtAttr & rHint, const bool bPrefix) { ::sw::Meta *const pMeta( static_cast<SwFmtMeta &>(rHint.GetAttr()).GetMeta() ); diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index c8a7b829d606..bc47cf41fa50 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -503,7 +503,7 @@ void SwTxtFrm::HideFootnotes( xub_StrLen nStart, xub_StrLen nEnd ) // checked by checking certain compatibility options -, // (b) the paragraph is the last content in the document and // (c) the anchor character is an as-character anchored graphic. -bool lcl_HideObj( const SwTxtFrm& _rFrm, +bool sw_HideObj( const SwTxtFrm& _rFrm, const RndStdIds _eAnchorType, const xub_StrLen _nObjAnchorPos, SwAnchoredObject* _pAnchoredObj ) @@ -581,7 +581,7 @@ void SwTxtFrm::HideAndShowObjects() const RndStdIds eAnchorType( pContact->GetAnchorId() ); const xub_StrLen nObjAnchorPos = pContact->GetCntntAnchorIndex().GetIndex(); if ((eAnchorType != FLY_AT_CHAR) || - lcl_HideObj( *this, eAnchorType, nObjAnchorPos, + sw_HideObj( *this, eAnchorType, nObjAnchorPos, (*GetDrawObjs())[i] )) { pContact->MoveObjToInvisibleLayer( pObj ); @@ -621,7 +621,7 @@ void SwTxtFrm::HideAndShowObjects() // #120729# - hotfix // under certain conditions if ( nHiddenStart != STRING_LEN && bShouldBeHidden && - lcl_HideObj( *this, eAnchorType, nObjAnchorPos, (*GetDrawObjs())[i] ) ) + sw_HideObj( *this, eAnchorType, nObjAnchorPos, (*GetDrawObjs())[i] ) ) pContact->MoveObjToInvisibleLayer( pObj ); else pContact->MoveObjToVisibleLayer( pObj ); @@ -831,7 +831,7 @@ void SwTxtFrm::CalcLineSpace() lcl_SetWrong( *this, nPos, nCnt, bMove ); \ } -void lcl_SetWrong( SwTxtFrm& rFrm, xub_StrLen nPos, long nCnt, bool bMove ) +static void lcl_SetWrong( SwTxtFrm& rFrm, xub_StrLen nPos, long nCnt, bool bMove ) { if ( !rFrm.IsFollow() ) { @@ -904,13 +904,13 @@ void lcl_SetWrong( SwTxtFrm& rFrm, xub_StrLen nPos, long nCnt, bool bMove ) #define SET_SCRIPT_INVAL( nPos )\ lcl_SetScriptInval( *this, nPos ); -void lcl_SetScriptInval( SwTxtFrm& rFrm, xub_StrLen nPos ) +static void lcl_SetScriptInval( SwTxtFrm& rFrm, xub_StrLen nPos ) { if( rFrm.GetPara() ) rFrm.GetPara()->GetScriptInfo().SetInvalidity( nPos ); } -void lcl_ModifyOfst( SwTxtFrm* pFrm, xub_StrLen nPos, xub_StrLen nLen ) +static void lcl_ModifyOfst( SwTxtFrm* pFrm, xub_StrLen nPos, xub_StrLen nLen ) { while( pFrm && pFrm->GetOfst() <= nPos ) pFrm = pFrm->GetFollow(); @@ -1448,7 +1448,7 @@ void SwTxtFrm::PrepWidows( const MSHORT nNeed, sal_Bool bNotify ) * SwTxtFrm::Prepare *************************************************************************/ -sal_Bool lcl_ErgoVadis( SwTxtFrm* pFrm, xub_StrLen &rPos, const PrepareHint ePrep ) +static sal_Bool lcl_ErgoVadis( SwTxtFrm* pFrm, xub_StrLen &rPos, const PrepareHint ePrep ) { const SwFtnInfo &rFtnInfo = pFrm->GetNode()->GetDoc()->GetFtnInfo(); if( ePrep == PREP_ERGOSUM ) @@ -2626,7 +2626,7 @@ const SwScriptInfo* SwTxtFrm::GetScriptInfo() const * Helper function for SwTxtFrm::CalcBasePosForFly() *************************************************************************/ -SwTwips lcl_CalcFlyBasePos( const SwTxtFrm& rFrm, SwRect aFlyRect, +static SwTwips lcl_CalcFlyBasePos( const SwTxtFrm& rFrm, SwRect aFlyRect, SwTxtFly& rTxtFly ) { SWRECTFN( (&rFrm) ) diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index eb2c365854f0..9f24123fa791 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -187,7 +187,7 @@ sal_Bool SwTxtFrm::CalcPrepFtnAdjust() * for the footnote. *************************************************************************/ -SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower ) +static SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower ) { // nLower is an absolute value. It denotes the bottom of the line // containing the footnote. diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index ff7f3070ae11..54463665e947 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -114,7 +114,7 @@ const PatternIni aPatternIni[] = {USHRT_MAX, USHRT_MAX, USHRT_MAX, USHRT_MAX, USHRT_MAX} }; -SwFormTokens lcl_GetAuthPattern(sal_uInt16 nTypeId) +static SwFormTokens lcl_GetAuthPattern(sal_uInt16 nTypeId) { SwFormTokens aRet; diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 6442bea1587a..e7e1e1855c16 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -179,7 +179,7 @@ void SwFntObj::CreatePrtFont( const OutputDevice& rPrt ) * *************************************************************************/ -bool lcl_IsFontAdjustNecessary( const OutputDevice& rOutDev, +static bool lcl_IsFontAdjustNecessary( const OutputDevice& rOutDev, const OutputDevice& rRefDev ) { return &rRefDev != &rOutDev && @@ -220,7 +220,7 @@ struct CalcLinePosData from the DrawText-method (for underlining misspelled words or smarttag terms). */ -void lcl_calcLinePos( const CalcLinePosData &rData, +static void lcl_calcLinePos( const CalcLinePosData &rData, Point &rStart, Point &rEnd, xub_StrLen nStart, xub_StrLen nWrLen ) { long nBlank = 0; @@ -632,7 +632,7 @@ void SwFntObj::SetDevFont( const ViewShell *pSh, OutputDevice& rOut ) * *************************************************************************/ -sal_uInt8 lcl_WhichPunctuation( xub_Unicode cChar ) +static sal_uInt8 lcl_WhichPunctuation( xub_Unicode cChar ) { if ( ( cChar < 0x3001 || cChar > 0x3002 ) && ( cChar < 0x3008 || cChar > 0x3011 ) && @@ -2333,7 +2333,7 @@ SwCacheObj *SwFntAccess::NewObj( ) return new SwFntObj( *(SwSubFont *)pOwner, ++pMagicNo, pShell ); } -extern xub_StrLen lcl_CalcCaseMap( const SwFont& rFnt, +extern xub_StrLen sw_CalcCaseMap( const SwFont& rFnt, const XubString& rOrigString, xub_StrLen nOfst, xub_StrLen nLen, @@ -2481,7 +2481,7 @@ xub_StrLen SwFont::GetTxtBreak( SwDrawTextInfo& rInf, long nTextWidth ) if ( bTextReplaced && STRING_LEN != nTxtBreak ) { if ( nTmpLen != nLn ) - nTxtBreak = lcl_CalcCaseMap( *this, rInf.GetText(), + nTxtBreak = sw_CalcCaseMap( *this, rInf.GetText(), rInf.GetIdx(), nLn, nTxtBreak ); else nTxtBreak = nTxtBreak + rInf.GetIdx(); diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index c96c3a7e1bd4..8cd2cce2b022 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -63,7 +63,7 @@ public: }; /************************************************************************* - * xub_StrLen lcl_CalcCaseMap() + * xub_StrLen sw_CalcCaseMap() * * rFnt: required for CalcCaseMap * rOrigString: The original string @@ -73,7 +73,7 @@ public: * to a position in rOrigString *************************************************************************/ -xub_StrLen lcl_CalcCaseMap( const SwFont& rFnt, +xub_StrLen sw_CalcCaseMap( const SwFont& rFnt, const XubString& rOrigString, xub_StrLen nOfst, xub_StrLen nLen, @@ -81,7 +81,7 @@ xub_StrLen lcl_CalcCaseMap( const SwFont& rFnt, { int j = 0; const xub_StrLen nEnd = nOfst + nLen; - OSL_ENSURE( nEnd <= rOrigString.Len(), "lcl_CalcCaseMap: Wrong parameters" ); + OSL_ENSURE( nEnd <= rOrigString.Len(), "sw_CalcCaseMap: Wrong parameters" ); // special case for title case: const bool bTitle = SVX_CASEMAP_TITEL == rFnt.GetCaseMap() && @@ -236,7 +236,7 @@ void SwDoGetCapitalBreak::Do() if ( GetCapInf() ) { if ( GetCapInf()->nLen != rInf.GetLen() ) - nBreak = lcl_CalcCaseMap( *rInf.GetFont(), + nBreak = sw_CalcCaseMap( *rInf.GetFont(), GetCapInf()->rString, GetCapInf()->nIdx, GetCapInf()->nLen, nBreak ); diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 32aae4d790b3..44fe54d81ae6 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -287,7 +287,7 @@ xub_StrLen SwTxtNode::Len() const * ftnfrms. * --------------------------------------------------------------------------*/ -void lcl_ChangeFtnRef( SwTxtNode &rNode ) +static void lcl_ChangeFtnRef( SwTxtNode &rNode ) { SwpHints *pSwpHints = rNode.GetpSwpHints(); if( pSwpHints && rNode.GetDoc()->GetCurrentViewShell() ) //swmod 071108//swmod 071225 @@ -1251,7 +1251,7 @@ SwTxtNode::GetTxtAttrAt(xub_StrLen const nIndex, RES_TXTATR const nWhich, * CopyHint() *************************************************************************/ -SwCharFmt* lcl_FindCharFmt( const SwCharFmts* pCharFmts, const XubString& rName ) +static SwCharFmt* lcl_FindCharFmt( const SwCharFmts* pCharFmts, const XubString& rName ) { if( rName.Len() ) { @@ -1267,7 +1267,7 @@ SwCharFmt* lcl_FindCharFmt( const SwCharFmts* pCharFmts, const XubString& rName return NULL; } -void lcl_CopyHint( const sal_uInt16 nWhich, const SwTxtAttr * const pHt, +static void lcl_CopyHint( const sal_uInt16 nWhich, const SwTxtAttr * const pHt, SwTxtAttr *const pNewHt, SwDoc *const pOtherDoc, SwTxtNode *const pDest ) { OSL_ENSURE( nWhich == pHt->Which(), "Falsche Hint-Id" ); diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 367884ac9113..10a78df2fdb6 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -1728,7 +1728,7 @@ sal_Bool SwTxtNode::SetAttr( const SfxItemSet& rSet, xub_StrLen nStt, return nCount ? sal_True : sal_False; } -void lcl_MergeAttr( SfxItemSet& rSet, const SfxPoolItem& rAttr ) +static void lcl_MergeAttr( SfxItemSet& rSet, const SfxPoolItem& rAttr ) { if ( RES_TXTATR_AUTOFMT == rAttr.Which() ) { @@ -1750,7 +1750,7 @@ void lcl_MergeAttr( SfxItemSet& rSet, const SfxPoolItem& rAttr ) rSet.Put( rAttr ); } -void lcl_MergeAttr_ExpandChrFmt( SfxItemSet& rSet, const SfxPoolItem& rAttr ) +static void lcl_MergeAttr_ExpandChrFmt( SfxItemSet& rSet, const SfxPoolItem& rAttr ) { if( RES_TXTATR_CHARFMT == rAttr.Which() || RES_TXTATR_INETFMT == rAttr.Which() || @@ -1795,7 +1795,7 @@ public: SwPoolItemEndPair() : mpItem( 0 ), mnEndPos( 0 ) {}; }; -void lcl_MergeListLevelIndentAsLRSpaceItem( const SwTxtNode& rTxtNode, +static void lcl_MergeListLevelIndentAsLRSpaceItem( const SwTxtNode& rTxtNode, SfxItemSet& rSet ) { if ( rTxtNode.AreListLevelIndentsApplicable() ) @@ -2521,7 +2521,7 @@ bool SwpHints::MergePortions( SwTxtNode& rNode ) } // check if there is already a character format and adjust the sort numbers -void lcl_CheckSortNumber( const SwpHints& rHints, SwTxtCharFmt& rNewCharFmt ) +static void lcl_CheckSortNumber( const SwpHints& rHints, SwTxtCharFmt& rNewCharFmt ) { const xub_StrLen nHtStart = *rNewCharFmt.GetStart(); const xub_StrLen nHtEnd = *rNewCharFmt.GetEnd(); diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 40e6dc28f42a..97e680aa4abe 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -103,7 +103,7 @@ extern SwTxtFrm *pLinguFrm; * only for deleted redlines */ -sal_uInt16 lcl_MaskRedlines( const SwTxtNode& rNode, XubString& rText, +static sal_uInt16 lcl_MaskRedlines( const SwTxtNode& rNode, XubString& rText, const xub_StrLen nStt, const xub_StrLen nEnd, const xub_Unicode cChar ) { @@ -148,7 +148,7 @@ sal_uInt16 lcl_MaskRedlines( const SwTxtNode& rNode, XubString& rText, * Used for spell checking. Deleted redlines and hidden characters are masked */ -sal_uInt16 lcl_MaskRedlinesAndHiddenText( const SwTxtNode& rNode, XubString& rText, +static sal_uInt16 lcl_MaskRedlinesAndHiddenText( const SwTxtNode& rNode, XubString& rText, const xub_StrLen nStt, const xub_StrLen nEnd, const xub_Unicode cChar = CH_TXTATR_INWORD, bool bCheckShowHiddenChar = true ) diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index 604921e8b21d..941b350aab56 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -57,7 +57,7 @@ ( == AUTO ), if the anchor frame has be moved via _MoveNodes(..) and DelFrms(..) */ -void lcl_MakeAutoFrms( const SwFrmFmts& rSpzArr, sal_uLong nMovedIndex ) +static void lcl_MakeAutoFrms( const SwFrmFmts& rSpzArr, sal_uLong nMovedIndex ) { if( !rSpzArr.empty() ) { @@ -711,7 +711,7 @@ SwRewriter SwUndoDelete::GetRewriter() const } // Every object, anchored "AtCntnt" will be reanchored at rPos -void lcl_ReAnchorAtCntntFlyFrames( const SwFrmFmts& rSpzArr, SwPosition &rPos, sal_uLong nOldIdx ) +static void lcl_ReAnchorAtCntntFlyFrames( const SwFrmFmts& rSpzArr, SwPosition &rPos, sal_uLong nOldIdx ) { if( !rSpzArr.empty() ) { diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index e2b97ae2b66b..5191c5f8fbe1 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -123,13 +123,13 @@ rtl::OUString SwSdrUndo::GetComment() const //-------------------------------------------- -void lcl_SendRemoveToUno( SwFmt& rFmt ) +static void lcl_SendRemoveToUno( SwFmt& rFmt ) { SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, &rFmt ); rFmt.ModifyNotification( &aMsgHint, &aMsgHint ); } -void lcl_SaveAnchor( SwFrmFmt* pFmt, sal_uLong& rNodePos ) +static void lcl_SaveAnchor( SwFrmFmt* pFmt, sal_uLong& rNodePos ) { const SwFmtAnchor& rAnchor = pFmt->GetAnchor(); if ((FLY_AT_PARA == rAnchor.GetAnchorId()) || @@ -167,7 +167,7 @@ void lcl_SaveAnchor( SwFrmFmt* pFmt, sal_uLong& rNodePos ) } } -void lcl_RestoreAnchor( SwFrmFmt* pFmt, sal_uLong& rNodePos ) +static void lcl_RestoreAnchor( SwFrmFmt* pFmt, sal_uLong& rNodePos ) { const SwFmtAnchor& rAnchor = pFmt->GetAnchor(); if ((FLY_AT_PARA == rAnchor.GetAnchorId()) || diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx index 2cd6a25df241..47854af40f7e 100644 --- a/sw/source/core/undo/unredln.cxx +++ b/sw/source/core/undo/unredln.cxx @@ -40,8 +40,8 @@ #include <docary.hxx> #include <sortopt.hxx> -extern void lcl_JoinText( SwPaM& rPam, sal_Bool bJoinPrev ); -extern void lcl_GetJoinFlags( SwPaM& rPam, sal_Bool& rJoinTxt, sal_Bool& rJoinPrev ); +extern void sw_JoinText( SwPaM& rPam, sal_Bool bJoinPrev ); +extern void sw_GetJoinFlags( SwPaM& rPam, sal_Bool& rJoinTxt, sal_Bool& rJoinPrev ); SwUndoRedline::SwUndoRedline( SwUndoId nUsrId, const SwPaM& rRange ) : SwUndo( UNDO_REDLINE ), SwUndRng( rRange ), @@ -429,12 +429,12 @@ void SwUndoCompDoc::UndoImpl(::sw::UndoRedoContext & rContext) pPam->Exchange(); sal_Bool bJoinTxt, bJoinPrev; - ::lcl_GetJoinFlags( *pPam, bJoinTxt, bJoinPrev ); + sw_GetJoinFlags( *pPam, bJoinTxt, bJoinPrev ); pUnDel = new SwUndoDelete( *pPam, sal_False ); if( bJoinTxt ) - ::lcl_JoinText( *pPam, bJoinPrev ); + sw_JoinText( *pPam, bJoinPrev ); if( pCSttNd && !pCEndNd) { diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx index 448660ed8104..de78f67fdb34 100644 --- a/sw/source/core/undo/unsect.cxx +++ b/sw/source/core/undo/unsect.cxx @@ -48,7 +48,7 @@ #include <calc.hxx> -SfxItemSet* lcl_GetAttrSet( const SwSection& rSect ) +static SfxItemSet* lcl_GetAttrSet( const SwSection& rSect ) { // save attributes of the format (columns, color, ...) // Cntnt and Protect items are not interesting since they are already diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index ef83b551cc63..cfe3b3c1204f 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -78,8 +78,8 @@ #endif #ifdef DBG_UTIL - void lcl_DebugRedline( const SwDoc* pDoc ); // docredln.cxx - #define _DEBUG_REDLINE( pDoc ) lcl_DebugRedline( pDoc ); + void sw_DebugRedline( const SwDoc* pDoc ); // docredln.cxx + #define _DEBUG_REDLINE( pDoc ) sw_DebugRedline( pDoc ); #else #define _DEBUG_REDLINE( pDoc ) #endif @@ -1562,7 +1562,7 @@ void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd, pNewSttNds->insert( _BoxMove(rTblBoxes[ i ]->GetSttIdx()) ); } -SwTableLine* lcl_FindTableLine( const SwTable& rTable, +static SwTableLine* lcl_FindTableLine( const SwTable& rTable, const SwTableBox& rBox ) { SwTableLine* pRet = NULL; @@ -1577,7 +1577,7 @@ SwTableLine* lcl_FindTableLine( const SwTable& rTable, return pRet; } -const SwTableLines& lcl_FindParentLines( const SwTable& rTable, +static const SwTableLines& lcl_FindParentLines( const SwTable& rTable, const SwTableBox& rBox ) { const SwTableLines& rRet = diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index a828a54d4dc2..d0ef2d838fef 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -65,15 +65,15 @@ using namespace ::com::sun::star; using ::rtl::OUString; // from unotbl.cxx -extern void lcl_GetCellPosition( const String &rCellName, sal_Int32 &rColumn, sal_Int32 &rRow); -extern String lcl_GetCellName( sal_Int32 nColumn, sal_Int32 nRow ); -extern int lcl_CompareCellsByColFirst( const String &rCellName1, const String &rCellName2 ); -extern int lcl_CompareCellsByRowFirst( const String &rCellName1, const String &rCellName2 ); -extern int lcl_CompareCellRanges( +extern void sw_GetCellPosition( const String &rCellName, sal_Int32 &rColumn, sal_Int32 &rRow); +extern String sw_GetCellName( sal_Int32 nColumn, sal_Int32 nRow ); +extern int sw_CompareCellsByColFirst( const String &rCellName1, const String &rCellName2 ); +extern int sw_CompareCellsByRowFirst( const String &rCellName1, const String &rCellName2 ); +extern int sw_CompareCellRanges( const String &rRange1StartCell, const String &rRange1EndCell, const String &rRange2StartCell, const String &rRange2EndCell, sal_Bool bCmpColsFirst ); -extern void lcl_NormalizeRange( String &rCell1, String &rCell2 ); +extern void sw_NormalizeRange( String &rCell1, String &rCell2 ); //static void SwChartHelper::DoUpdateAllCharts( SwDoc* pDoc ) @@ -230,8 +230,8 @@ sal_Bool FillRangeDescriptor( return sal_False; rDesc.nTop = rDesc.nLeft = rDesc.nBottom = rDesc.nRight = -1; - lcl_GetCellPosition( aTLName, rDesc.nLeft, rDesc.nTop ); - lcl_GetCellPosition( aBRName, rDesc.nRight, rDesc.nBottom ); + sw_GetCellPosition( aTLName, rDesc.nLeft, rDesc.nTop ); + sw_GetCellPosition( aBRName, rDesc.nRight, rDesc.nBottom ); rDesc.Normalize(); OSL_ENSURE( rDesc.nTop != -1 && rDesc.nLeft != -1 && @@ -341,7 +341,7 @@ static sal_Bool GetTableAndCellsFromRangeRep( // need to switch start and end cell ? // (does not check for normalization here) - if (bSortStartEndCells && 1 == lcl_CompareCellsByColFirst( aStartCell, aEndCell )) + if (bSortStartEndCells && 1 == sw_CompareCellsByColFirst( aStartCell, aEndCell )) { String aTmp( aStartCell ); aStartCell = aEndCell; @@ -491,7 +491,7 @@ static sal_Bool GetSubranges( const OUString &rRangeRepresentation, if (bNormalize) { - lcl_NormalizeRange( aStartCell, aEndCell ); + sw_NormalizeRange( aStartCell, aEndCell ); pRanges[nCnt] = GetRangeRepFromTableAndCells( aTableName, aStartCell, aEndCell, sal_True ); } @@ -541,7 +541,7 @@ static void SortSubranges( uno::Sequence< OUString > &rSubRanges, sal_Bool bCmpB aEndCell = aStartCell; // compare cell ranges ( is the new one smaller? ) - if (-1 == lcl_CompareCellRanges( aStartCell, aEndCell, + if (-1 == sw_CompareCellRanges( aStartCell, aEndCell, aSmallestStartCell, aSmallestEndCell, bCmpByColumn )) { nIdxOfSmallest = k; @@ -673,8 +673,8 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData aDesc.nTop -= 1; aDesc.nBottom -= 1; - String aNewStartCell( lcl_GetCellName( aDesc.nLeft, aDesc.nTop ) ); - String aNewEndCell( lcl_GetCellName( aDesc.nRight, aDesc.nBottom ) ); + String aNewStartCell( sw_GetCellName( aDesc.nLeft, aDesc.nTop ) ); + String aNewEndCell( sw_GetCellName( aDesc.nRight, aDesc.nBottom ) ); aRangeRepresentation = GetRangeRepFromTableAndCells( aChartTableName, aNewStartCell, aNewEndCell, sal_True ); bOk = GetSubranges( aRangeRepresentation, aSubRanges, sal_True ); @@ -735,8 +735,8 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData OSL_ENSURE( bOk2, "failed to get table and start/end cells" ); sal_Int32 nStartRow, nStartCol, nEndRow, nEndCol; - lcl_GetCellPosition( aStartCell, nStartCol, nStartRow ); - lcl_GetCellPosition( aEndCell, nEndCol, nEndRow ); + sw_GetCellPosition( aStartCell, nStartCol, nStartRow ); + sw_GetCellPosition( aEndCell, nEndCol, nEndRow ); OSL_ENSURE( nStartRow <= nEndRow && nStartCol <= nEndCol, "cell range not normalized"); @@ -902,18 +902,18 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData if (aLabelIdx[oi] != -1) { aLabelRange += aBaseName; - aLabelRange += lcl_GetCellName( aLabelDesc.nLeft, aLabelDesc.nTop ); + aLabelRange += sw_GetCellName( aLabelDesc.nLeft, aLabelDesc.nTop ); aLabelRange += ':'; - aLabelRange += lcl_GetCellName( aLabelDesc.nRight, aLabelDesc.nBottom ); + aLabelRange += sw_GetCellName( aLabelDesc.nRight, aLabelDesc.nBottom ); } // String aDataRange; if (aDataStartIdx[oi] != -1) { aDataRange += aBaseName; - aDataRange += lcl_GetCellName( aDataDesc.nLeft, aDataDesc.nTop ); + aDataRange += sw_GetCellName( aDataDesc.nLeft, aDataDesc.nTop ); aDataRange += ':'; - aDataRange += lcl_GetCellName( aDataDesc.nRight, aDataDesc.nBottom ); + aDataRange += sw_GetCellName( aDataDesc.nRight, aDataDesc.nBottom ); } // get cursors spanning the cell ranges for label and data @@ -1037,14 +1037,14 @@ OUString SwChartDataProvider::GetBrokenCellRangeForExport( GetTableAndCellsFromRangeRep( rCellRangeRepresentation, aTblName, aStartCell, aEndCell, sal_False ); sal_Int32 nStartCol = -1, nStartRow = -1, nEndCol = -1, nEndRow = -1; - lcl_GetCellPosition( aStartCell, nStartCol, nStartRow ); - lcl_GetCellPosition( aEndCell, nEndCol, nEndRow ); + sw_GetCellPosition( aStartCell, nStartCol, nStartRow ); + sw_GetCellPosition( aEndCell, nEndCol, nEndRow ); // get new cell names ++nStartRow; ++nEndRow; - aStartCell = lcl_GetCellName( nStartCol, nStartRow ); - aEndCell = lcl_GetCellName( nEndCol, nEndRow ); + aStartCell = sw_GetCellName( nStartCol, nStartRow ); + aEndCell = sw_GetCellName( nEndCol, nEndRow ); aRes = GetRangeRepFromTableAndCells( aTblName, aStartCell, aEndCell, sal_False ); @@ -1154,8 +1154,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume sal_Int32 nFirstCol = -1, nFirstRow = -1, nLastCol = -1, nLastRow = -1; String aCell( aLabelStartCell.Len() ? aLabelStartCell : aValuesStartCell ); OSL_ENSURE( aCell.Len() , "start cell missing?" ); - lcl_GetCellPosition( aCell, nFirstCol, nFirstRow); - lcl_GetCellPosition( aValuesEndCell, nLastCol, nLastRow); + sw_GetCellPosition( aCell, nFirstCol, nFirstRow); + sw_GetCellPosition( aValuesEndCell, nLastCol, nLastRow); // sal_Int16 nDirection = -1; // -1: not yet set, 0: columns, 1: rows, -2: failed if (nFirstCol == nLastCol && nFirstRow == nLastRow) // a single cell... @@ -1210,8 +1210,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume if (aLabelStartCell.Len() && aLabelEndCell.Len()) { sal_Int32 nStartCol = -1, nStartRow = -1, nEndCol = -1, nEndRow = -1; - lcl_GetCellPosition( aLabelStartCell, nStartCol, nStartRow ); - lcl_GetCellPosition( aLabelEndCell, nEndCol, nEndRow ); + sw_GetCellPosition( aLabelStartCell, nStartCol, nStartRow ); + sw_GetCellPosition( aLabelEndCell, nEndCol, nEndRow ); if (nStartRow < 0 || nEndRow >= nTableRows || nStartCol < 0 || nEndCol >= nTableCols) { @@ -1232,8 +1232,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume if (aValuesStartCell.Len() && aValuesEndCell.Len()) { sal_Int32 nStartCol = -1, nStartRow = -1, nEndCol = -1, nEndRow = -1; - lcl_GetCellPosition( aValuesStartCell, nStartCol, nStartRow ); - lcl_GetCellPosition( aValuesEndCell, nEndCol, nEndRow ); + sw_GetCellPosition( aValuesStartCell, nStartCol, nStartRow ); + sw_GetCellPosition( aValuesEndCell, nEndCol, nEndRow ); if (nStartRow < 0 || nEndRow >= nTableRows || nStartCol < 0 || nEndCol >= nTableCols) { @@ -1260,16 +1260,16 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume sal_Int32 nStartRow = -1, nStartCol = -1, nEndRow = -1, nEndCol = -1; if (xCurLabel.is()) { - lcl_GetCellPosition( aLabelStartCell, nStartCol, nStartRow); - lcl_GetCellPosition( aLabelEndCell, nEndCol, nEndRow); + sw_GetCellPosition( aLabelStartCell, nStartCol, nStartRow); + sw_GetCellPosition( aLabelEndCell, nEndCol, nEndRow); OSL_ENSURE( (nStartCol == nEndCol && (nEndRow - nStartRow + 1) == xCurLabel->getData().getLength()) || (nStartRow == nEndRow && (nEndCol - nStartCol + 1) == xCurLabel->getData().getLength()), "label sequence length does not match range representation!" ); } if (xCurValues.is()) { - lcl_GetCellPosition( aValuesStartCell, nStartCol, nStartRow); - lcl_GetCellPosition( aValuesEndCell, nEndCol, nEndRow); + sw_GetCellPosition( aValuesStartCell, nStartCol, nStartRow); + sw_GetCellPosition( aValuesEndCell, nEndCol, nEndRow); OSL_ENSURE( (nStartCol == nEndCol && (nEndRow - nStartRow + 1) == xCurValues->getData().getLength()) || (nStartRow == nEndRow && (nEndCol - nStartCol + 1) == xCurValues->getData().getLength()), "value sequence length does not match range representation!" ); @@ -1305,8 +1305,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume ++nColIndex1; ++nColSubLen; } - String aStartCell( lcl_GetCellName( k, i ) ); - String aEndCell( lcl_GetCellName( k + nColSubLen - 1, i + nRowSubLen - 1) ); + String aStartCell( sw_GetCellName( k, i ) ); + String aEndCell( sw_GetCellName( k + nColSubLen - 1, i + nRowSubLen - 1) ); aCurRange = aCellRangeBase; aCurRange += aStartCell; aCurRange += ':'; @@ -1694,8 +1694,8 @@ void SwChartDataProvider::AddRowCols( if (pFirstBox && pLastBox) { sal_Int32 nFirstCol = -1, nFirstRow = -1, nLastCol = -1, nLastRow = -1; - lcl_GetCellPosition( pFirstBox->GetName(), nFirstCol, nFirstRow ); - lcl_GetCellPosition( pLastBox->GetName(), nLastCol, nLastRow ); + sw_GetCellPosition( pFirstBox->GetName(), nFirstCol, nFirstRow ); + sw_GetCellPosition( pLastBox->GetName(), nLastCol, nLastRow ); bool bAddCols = false; // default; also to be used if nBoxes == 1 :-/ if (nFirstCol == nLastCol && nFirstRow != nLastRow) @@ -1800,7 +1800,7 @@ rtl::OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const rtl::OUStri throw lang::IllegalArgumentException(); sal_Int32 nCol, nRow; - lcl_GetCellPosition( aStartCell, nCol, nRow ); + sw_GetCellPosition( aStartCell, nCol, nRow ); if (nCol < 0 || nRow < 0) throw uno::RuntimeException(); @@ -1813,7 +1813,7 @@ rtl::OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const rtl::OUStri aCellRange.aUpperLeft.bIsEmpty = false; if (aStartCell != aEndCell && aEndCell.Len() != 0) { - lcl_GetCellPosition( aEndCell, nCol, nRow ); + sw_GetCellPosition( aEndCell, nCol, nRow ); if (nCol < 0 || nRow < 0) throw uno::RuntimeException(); @@ -1860,13 +1860,13 @@ rtl::OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const rtl::OUSt OUString aTmp( aCellRange.aTableName ); aTmp += OUString::valueOf((sal_Unicode) '.'); - aTmp += lcl_GetCellName( aCellRange.aUpperLeft.nColumn, + aTmp += sw_GetCellName( aCellRange.aUpperLeft.nColumn, aCellRange.aUpperLeft.nRow ); // does cell range consist of more than a single cell? if (!aCellRange.aLowerRight.bIsEmpty) { aTmp += OUString::valueOf((sal_Unicode) ':'); - aTmp += lcl_GetCellName( aCellRange.aLowerRight.nColumn, + aTmp += sw_GetCellName( aCellRange.aLowerRight.nColumn, aCellRange.aLowerRight.nRow ); } @@ -2168,7 +2168,7 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel( nCol = nCol + i; else nRow = nRow + i; - String aCellName( lcl_GetCellName( nCol, nRow ) ); + String aCellName( sw_GetCellName( nCol, nRow ) ); xub_StrLen nLen = aCellName.Len(); if (nLen) @@ -2530,8 +2530,8 @@ sal_Bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox ) String aPointCellName( pTable->GetTblBox( pPointStartNode->GetIndex() )->GetName() ); String aMarkCellName( pTable->GetTblBox( pMarkStartNode->GetIndex() )->GetName() ); - lcl_GetCellPosition( aPointCellName, nPointCol, nPointRow ); - lcl_GetCellPosition( aMarkCellName, nMarkCol, nMarkRow ); + sw_GetCellPosition( aPointCellName, nPointCol, nPointRow ); + sw_GetCellPosition( aMarkCellName, nMarkCol, nMarkRow ); OSL_ENSURE( nPointRow >= 0 && nPointCol >= 0, "invalid row and col" ); OSL_ENSURE( nMarkRow >= 0 && nMarkCol >= 0, "invalid row and col" ); @@ -2571,7 +2571,7 @@ sal_Bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox ) nRow += bMoveUp ? -1 : +1; if (bMoveHorizontal) nCol += bMoveLeft ? -1 : +1; - String aNewCellName = lcl_GetCellName( nCol, nRow ); + String aNewCellName = sw_GetCellName( nCol, nRow ); SwTableBox* pNewBox = (SwTableBox*) pTable->GetTblBox( aNewCellName ); if (pNewBox) // set new position (cell range) to use @@ -2684,8 +2684,8 @@ bool SwChartDataSequence::ExtendTo( bool bExtendCol, // new column cells adjacent to the bottom of the // current data-sequence to be added... OSL_ENSURE( aDesc.nLeft == aDesc.nRight, "data-sequence is not a column" ); - aNewStartCell = lcl_GetCellName(aDesc.nLeft, aDesc.nTop); - aNewEndCell = lcl_GetCellName(aDesc.nRight, aDesc.nBottom + nCount); + aNewStartCell = sw_GetCellName(aDesc.nLeft, aDesc.nTop); + aNewEndCell = sw_GetCellName(aDesc.nRight, aDesc.nBottom + nCount); bChanged = true; } else if (bExtendCol && aDesc.nTop - nCount == nFirstNew) @@ -2693,8 +2693,8 @@ bool SwChartDataSequence::ExtendTo( bool bExtendCol, // new column cells adjacent to the top of the // current data-sequence to be added... OSL_ENSURE( aDesc.nLeft == aDesc.nRight, "data-sequence is not a column" ); - aNewStartCell = lcl_GetCellName(aDesc.nLeft, aDesc.nTop - nCount); - aNewEndCell = lcl_GetCellName(aDesc.nRight, aDesc.nBottom); + aNewStartCell = sw_GetCellName(aDesc.nLeft, aDesc.nTop - nCount); + aNewEndCell = sw_GetCellName(aDesc.nRight, aDesc.nBottom); bChanged = true; } else if (!bExtendCol && aDesc.nRight + 1 == nFirstNew) @@ -2702,8 +2702,8 @@ bool SwChartDataSequence::ExtendTo( bool bExtendCol, // new row cells adjacent to the right of the // current data-sequence to be added... OSL_ENSURE( aDesc.nTop == aDesc.nBottom, "data-sequence is not a row" ); - aNewStartCell = lcl_GetCellName(aDesc.nLeft, aDesc.nTop); - aNewEndCell = lcl_GetCellName(aDesc.nRight + nCount, aDesc.nBottom); + aNewStartCell = sw_GetCellName(aDesc.nLeft, aDesc.nTop); + aNewEndCell = sw_GetCellName(aDesc.nRight + nCount, aDesc.nBottom); bChanged = true; } else if (!bExtendCol && aDesc.nLeft - nCount == nFirstNew) @@ -2711,8 +2711,8 @@ bool SwChartDataSequence::ExtendTo( bool bExtendCol, // new row cells adjacent to the left of the // current data-sequence to be added... OSL_ENSURE( aDesc.nTop == aDesc.nBottom, "data-sequence is not a row" ); - aNewStartCell = lcl_GetCellName(aDesc.nLeft - nCount, aDesc.nTop); - aNewEndCell = lcl_GetCellName(aDesc.nRight, aDesc.nBottom); + aNewStartCell = sw_GetCellName(aDesc.nLeft - nCount, aDesc.nTop); + aNewEndCell = sw_GetCellName(aDesc.nRight, aDesc.nBottom); bChanged = true; } diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 148d26114cc6..912bc40cef3b 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -471,7 +471,7 @@ const ProvNamesId_Type aProvNamesId[] = { CSS_TEXT_FIELDMASTER_BIBLIOGRAPHY, SW_SERVICE_FIELDMASTER_BIBLIOGRAPHY } }; -const SvEventDescription* lcl_GetSupportedMacroItems() +const SvEventDescription* sw_GetSupportedMacroItems() { static const SvEventDescription aMacroDescriptionsImpl[] = { @@ -829,13 +829,13 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16 xRet = (cppu::OWeakObject*)new SwXTextDefaults( pDoc ); break; case SW_SERVICE_IMAP_RECTANGLE : - xRet = SvUnoImageMapRectangleObject_createInstance( lcl_GetSupportedMacroItems() ); + xRet = SvUnoImageMapRectangleObject_createInstance( sw_GetSupportedMacroItems() ); break; case SW_SERVICE_IMAP_CIRCLE : - xRet = SvUnoImageMapCircleObject_createInstance( lcl_GetSupportedMacroItems() ); + xRet = SvUnoImageMapCircleObject_createInstance( sw_GetSupportedMacroItems() ); break; case SW_SERVICE_IMAP_POLYGON : - xRet = SvUnoImageMapPolygonObject_createInstance( lcl_GetSupportedMacroItems() ); + xRet = SvUnoImageMapPolygonObject_createInstance( sw_GetSupportedMacroItems() ); break; case SW_SERVICE_CHART2_DATA_PROVIDER : // #i64497# If a chart is in a temporary document during clipoard diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 72805c56078c..18ffa4c0b42e 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -190,7 +190,7 @@ static const ServiceIdResId aServiceToRes[] = {USHRT_MAX, USHRT_MAX } }; -sal_uInt16 lcl_ServiceIdToResId(sal_uInt16 nServiceId) +static sal_uInt16 lcl_ServiceIdToResId(sal_uInt16 nServiceId) { const ServiceIdResId* pMap = aServiceToRes; while( USHRT_MAX != pMap->nServiceId && nServiceId != pMap->nServiceId ) @@ -202,7 +202,7 @@ sal_uInt16 lcl_ServiceIdToResId(sal_uInt16 nServiceId) return pMap->nResId; } -sal_uInt16 lcl_GetServiceForField( const SwField& rFld ) +static sal_uInt16 lcl_GetServiceForField( const SwField& rFld ) { sal_uInt16 nWhich = rFld.Which(), nSrvId = USHRT_MAX; //special handling for some fields @@ -282,7 +282,7 @@ sal_uInt16 lcl_GetServiceForField( const SwField& rFld ) return nSrvId; } -sal_uInt16 lcl_GetPropMapIdForFieldType( sal_uInt16 nWhich ) +static sal_uInt16 lcl_GetPropMapIdForFieldType( sal_uInt16 nWhich ) { sal_uInt16 nId; switch( nWhich ) @@ -311,7 +311,7 @@ sal_uInt16 GetFieldTypeMId( const OUString& rProperty, const SwFieldType& rTyp ) return nId; } -sal_uInt16 lcl_GetPropertyMapOfService( sal_uInt16 nServiceId ) +static sal_uInt16 lcl_GetPropertyMapOfService( sal_uInt16 nServiceId ) { sal_uInt16 nRet; switch ( nServiceId) @@ -2439,7 +2439,7 @@ SwXTextFieldMasters::~SwXTextFieldMasters() Falls wir grosszuegig werden wollen, dann koennte man com.sun.star.text auch optional weglassen -----------------------------------------------------------------------*/ -sal_uInt16 lcl_GetIdByName( String& rName, String& rTypeName ) +static sal_uInt16 lcl_GetIdByName( String& rName, String& rTypeName ) { if( rName.EqualsAscii( COM_TEXT_FLDMASTER, 0, RTL_CONSTASCII_LENGTH(COM_TEXT_FLDMASTER )) || rName.EqualsAscii( COM_TEXT_FLDMASTER_CC, 0, RTL_CONSTASCII_LENGTH(COM_TEXT_FLDMASTER_CC ))) diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index fe3ead635c89..a3d2fe28ee08 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -118,7 +118,7 @@ #include <comphelper/servicehelper.hxx> // from fefly1.cxx -extern sal_Bool lcl_ChkAndSetNewAnchor( const SwFlyFrm& rFly, SfxItemSet& rSet ); +extern sal_Bool sw_ChkAndSetNewAnchor( const SwFlyFrm& rFly, SfxItemSet& rSet ); using namespace ::com::sun::star; using ::rtl::OUString; @@ -533,7 +533,7 @@ SwFrameProperties_Impl::SwFrameProperties_Impl(): { } -inline void lcl_FillCol ( SfxItemSet &rToSet, const :: SfxItemSet &rFromSet, const :: uno::Any *pAny) +static inline void lcl_FillCol ( SfxItemSet &rToSet, const :: SfxItemSet &rFromSet, const :: uno::Any *pAny) { if ( pAny ) { @@ -600,7 +600,7 @@ SwGraphicProperties_Impl::SwGraphicProperties_Impl( ) : { } -inline void lcl_FillMirror ( SfxItemSet &rToSet, const :: SfxItemSet &rFromSet, const ::uno::Any *pHEvenMirror, const ::uno::Any *pHOddMirror, const ::uno::Any *pVMirror, bool &rRet ) +static inline void lcl_FillMirror ( SfxItemSet &rToSet, const :: SfxItemSet &rFromSet, const ::uno::Any *pHEvenMirror, const ::uno::Any *pHOddMirror, const ::uno::Any *pVMirror, bool &rRet ) { if(pHEvenMirror || pHOddMirror || pVMirror ) { @@ -919,7 +919,7 @@ SdrObject *SwXFrame::GetOrCreateSdrObject( SwFlyFrmFmt *pFmt ) return pObject; } -SwFrmFmt *lcl_GetFrmFmt( const :: uno::Any& rValue, SwDoc *pDoc ) +static SwFrmFmt *lcl_GetFrmFmt( const :: uno::Any& rValue, SwDoc *pDoc ) { SwFrmFmt *pRet = 0; SwDocShell* pDocSh = pDoc->GetDocShell(); @@ -1068,7 +1068,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: SfxItemSet* pSet = 0; // #i31771#, #i25798# - No adjustment of - // anchor ( no call of method <::lcl_ChkAndSetNewAnchor(..)> ), + // anchor ( no call of method <sw_ChkAndSetNewAnchor(..)> ), // if document is currently in reading mode. if ( !pFmt->GetDoc()->IsInReading() ) { @@ -1086,7 +1086,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: { pSet = new SfxItemSet( pDoc->GetAttrPool(), aFrmFmtSetRange ); pSet->Put( *pItem ); - if ( !::lcl_ChkAndSetNewAnchor( *pFly, *pSet ) ) + if ( !sw_ChkAndSetNewAnchor( *pFly, *pSet ) ) delete pSet, pSet = 0; } } @@ -1350,7 +1350,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: } // #i31771#, #i25798# - No adjustment of - // anchor ( no call of method <::lcl_ChkAndSetNewAnchor(..)> ), + // anchor ( no call of method <sw_ChkAndSetNewAnchor(..)> ), // if document is currently in reading mode. if ( !pFmt->GetDoc()->IsInReading() ) { @@ -1364,7 +1364,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: if( SFX_ITEM_SET == aSet.GetItemState( RES_ANCHOR, false, &pItem )) { aSet.Put( *pItem ); - ::lcl_ChkAndSetNewAnchor( *pFly, aSet ); + sw_ChkAndSetNewAnchor( *pFly, aSet ); } } } diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 951f3678d1d2..9e4b49bf2d45 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -149,7 +149,7 @@ static const char cUserSuffix[] = " (user)"; #define USER_LEN 12 #define USER_AND_SUFFIXLEN 19 -void lcl_ConvertTOUNameToProgrammaticName(OUString& rTmp) +static void lcl_ConvertTOUNameToProgrammaticName(OUString& rTmp) { ShellResource* pShellRes = ViewShell::GetShellRes(); diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 6e6ed92c04b8..278202f86b4f 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -96,7 +96,7 @@ SwParaSelection::~SwParaSelection() /****************************************************************** * forward declarations ******************************************************************/ -beans::PropertyState lcl_SwXParagraph_getPropertyState( +static beans::PropertyState lcl_SwXParagraph_getPropertyState( const SwTxtNode& rTxtNode, const SwAttrSet** ppSet, const SfxItemPropertySimpleEntry& rEntry, @@ -849,7 +849,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, OSL_FAIL("SwXParagraph::removeVetoableChangeListener(): not implemented"); } -beans::PropertyState lcl_SwXParagraph_getPropertyState( +static beans::PropertyState lcl_SwXParagraph_getPropertyState( // SwUnoCrsr& rUnoCrsr, const SwTxtNode& rTxtNode, const SwAttrSet** ppSet, diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 3fd18dd523ae..86b60f639395 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -890,7 +890,7 @@ lcl_ExportHints( return xRef; } -void lcl_MoveCursor( SwUnoCrsr * const pUnoCrsr, +static void lcl_MoveCursor( SwUnoCrsr * const pUnoCrsr, const xub_StrLen nCurrentIndex, const sal_Int32 nNextFrameIndex, const sal_Int32 nNextPortionIndex, const sal_Int32 nNextAttrIndex, const sal_Int32 nNextFieldMarkIndex, diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 4a9b7c358884..7f7049825500 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -209,7 +209,7 @@ const SfxItemPropertySet* GetLineNumberingSet() return &aLineNumberingSet_Impl; } -SwCharFmt* lcl_getCharFmt(SwDoc* pDoc, const uno::Any& aValue) +static SwCharFmt* lcl_getCharFmt(SwDoc* pDoc, const uno::Any& aValue) { SwCharFmt* pRet = 0; String sStandard(SW_RES(STR_POOLCOLL_STANDARD)); @@ -230,7 +230,7 @@ SwCharFmt* lcl_getCharFmt(SwDoc* pDoc, const uno::Any& aValue) return pRet; } -SwTxtFmtColl* lcl_GetParaStyle(SwDoc* pDoc, const uno::Any& aValue) +static SwTxtFmtColl* lcl_GetParaStyle(SwDoc* pDoc, const uno::Any& aValue) { OUString uTmp; aValue >>= uTmp; @@ -246,7 +246,7 @@ SwTxtFmtColl* lcl_GetParaStyle(SwDoc* pDoc, const uno::Any& aValue) return pRet; } -SwPageDesc* lcl_GetPageDesc(SwDoc* pDoc, const uno::Any& aValue) +static SwPageDesc* lcl_GetPageDesc(SwDoc* pDoc, const uno::Any& aValue) { SwPageDesc* pRet = 0; sal_uInt16 nCount = pDoc->GetPageDescCnt(); @@ -1611,7 +1611,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( return aSeq; } -PropValData* lcl_FindProperty(const char* cName, PropValDataArr& rPropertyValues) +static PropValData* lcl_FindProperty(const char* cName, PropValDataArr& rPropertyValues) { OUString sCmp = rtl::OUString::createFromAscii(cName); for(sal_uInt16 i = 0; i < rPropertyValues.size(); i++) diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 623c1a21b721..397e27506e4e 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -116,7 +116,7 @@ using namespace ::com::sun::star; using ::rtl::OUString; //convert FN_... to RES_ in header and footer itemset -sal_uInt16 lcl_ConvertFNToRES(sal_uInt16 nFNId) +static sal_uInt16 lcl_ConvertFNToRES(sal_uInt16 nFNId) { sal_uInt16 nRes = USHRT_MAX; switch(nFNId) @@ -158,7 +158,7 @@ sal_uInt16 lcl_ConvertFNToRES(sal_uInt16 nFNId) } -SwGetPoolIdFromName lcl_GetSwEnumFromSfxEnum ( SfxStyleFamily eFamily ) +static SwGetPoolIdFromName lcl_GetSwEnumFromSfxEnum ( SfxStyleFamily eFamily ) { switch ( eFamily ) { @@ -475,7 +475,7 @@ SwXStyleFamily::~SwXStyleFamily() } -sal_Int32 lcl_GetCountOrName ( const SwDoc &rDoc, SfxStyleFamily eFamily, String *pString, sal_uInt16 nIndex = USHRT_MAX ) +static sal_Int32 lcl_GetCountOrName ( const SwDoc &rDoc, SfxStyleFamily eFamily, String *pString, sal_uInt16 nIndex = USHRT_MAX ) { sal_Int32 nCount = 0; switch( eFamily ) @@ -1514,7 +1514,7 @@ void SwXStyle::setParentStyle(const OUString& rParentStyle) throw uno::RuntimeException(); } -uno::Reference< beans::XPropertySetInfo > lcl_getPropertySetInfo( SfxStyleFamily eFamily, sal_Bool bIsConditional ) +static uno::Reference< beans::XPropertySetInfo > lcl_getPropertySetInfo( SfxStyleFamily eFamily, sal_Bool bIsConditional ) { uno::Reference< beans::XPropertySetInfo > xRet; switch( eFamily ) @@ -1676,7 +1676,7 @@ const SwPageDesc& SwStyleBase_Impl::GetOldPageDesc() return *pOldPageDesc; } -void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, +static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& rBase, @@ -2162,7 +2162,7 @@ void SwXStyle::setPropertyValues( } } -uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, +static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase, SfxStyleSheetBase* pBase, @@ -2948,7 +2948,7 @@ SwXPageStyle::~SwXPageStyle() } -void lcl_putItemToSet(const SvxSetItem* pSetItem, sal_uInt16 nRes, sal_uInt16 nItemType, const uno::Any& rVal, sal_uInt8 nMemberId, SwStyleBase_Impl& rBaseImpl) +static void lcl_putItemToSet(const SvxSetItem* pSetItem, sal_uInt16 nRes, sal_uInt16 nItemType, const uno::Any& rVal, sal_uInt8 nMemberId, SwStyleBase_Impl& rBaseImpl) { SvxSetItem* pNewSetItem = (SvxSetItem*)pSetItem->Clone(); SfxItemSet& rSetSet = pNewSetItem->GetItemSet(); diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index e66ff3d78c27..65186e0e63d6 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -112,11 +112,11 @@ using ::rtl::OUString; using ::editeng::SvxBorderLine; // from swtable.cxx -extern void lcl_GetTblBoxColStr( sal_uInt16 nCol, String& rNm ); +extern void sw_GetTblBoxColStr( sal_uInt16 nCol, String& rNm ); #define UNO_TABLE_COLUMN_SUM 10000 -sal_Bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine) +static sal_Bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine) { rSvxLine.SetColor(Color(rLine.Color)); @@ -129,7 +129,7 @@ sal_Bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLi return bRet; } -void lcl_SetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue) +static void lcl_SetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue) throw (lang::IllegalArgumentException) { //Sonderbehandlung fuer "Nicht-Items" @@ -210,7 +210,7 @@ void lcl_SetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimpleEntry* pE } } -uno::Any lcl_GetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimpleEntry* pEntry ) +static uno::Any lcl_GetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimpleEntry* pEntry ) { uno::Any aRet; switch(pEntry->nWID) @@ -319,7 +319,7 @@ uno::Any lcl_GetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimpleEntry // // Sample for naming scheme of cell in a single row (in groups a 26): // A1..Z1, a1..z1, AA1..AZ1, Aa1..Az1, BA1..BZ1, Ba1..Bz1, ... -void lcl_GetCellPosition( const String &rCellName, +void sw_GetCellPosition( const String &rCellName, sal_Int32 &rColumn, sal_Int32 &rRow) { rColumn = rRow = -1; // default return values indicating failure @@ -372,11 +372,11 @@ void lcl_GetCellPosition( const String &rCellName, // // Note: this function probably also make sense only // for cell names of non-complex tables -int lcl_CompareCellsByRowFirst( const String &rCellName1, const String &rCellName2 ) +int sw_CompareCellsByRowFirst( const String &rCellName1, const String &rCellName2 ) { sal_Int32 nCol1 = -1, nRow1 = -1, nCol2 = -1, nRow2 = -1; - lcl_GetCellPosition( rCellName1, nCol1, nRow1 ); - lcl_GetCellPosition( rCellName2, nCol2, nRow2 ); + sw_GetCellPosition( rCellName1, nCol1, nRow1 ); + sw_GetCellPosition( rCellName2, nCol2, nRow2 ); if (nRow1 < nRow2 || (nRow1 == nRow2 && nCol1 < nCol2)) return -1; @@ -394,11 +394,11 @@ int lcl_CompareCellsByRowFirst( const String &rCellName1, const String &rCellNam // // Note: this function probably also make sense only // for cell names of non-complex tables -int lcl_CompareCellsByColFirst( const String &rCellName1, const String &rCellName2 ) +int sw_CompareCellsByColFirst( const String &rCellName1, const String &rCellName2 ) { sal_Int32 nCol1 = -1, nRow1 = -1, nCol2 = -1, nRow2 = -1; - lcl_GetCellPosition( rCellName1, nCol1, nRow1 ); - lcl_GetCellPosition( rCellName2, nCol2, nRow2 ); + sw_GetCellPosition( rCellName1, nCol1, nRow1 ); + sw_GetCellPosition( rCellName2, nCol2, nRow2 ); if (nCol1 < nCol2 || (nCol1 == nCol2 && nRow1 < nRow2)) return -1; @@ -416,13 +416,13 @@ int lcl_CompareCellsByColFirst( const String &rCellName1, const String &rCellNam // // Note: this function probably also make sense only // for cell names of non-complex tables -int lcl_CompareCellRanges( +int sw_CompareCellRanges( const String &rRange1StartCell, const String &rRange1EndCell, const String &rRange2StartCell, const String &rRange2EndCell, sal_Bool bCmpColsFirst ) { int (*pCompareCells)( const String &, const String & ) = - bCmpColsFirst ? &lcl_CompareCellsByColFirst : &lcl_CompareCellsByRowFirst; + bCmpColsFirst ? &sw_CompareCellsByColFirst : &sw_CompareCellsByRowFirst; int nCmpResStartCells = pCompareCells( rRange1StartCell, rRange2StartCell ); if ((-1 == nCmpResStartCells ) || @@ -438,26 +438,26 @@ int lcl_CompareCellRanges( // returns the cell name for the cell at the specified position // (note that the indices nColumn and nRow are 0 based here) -String lcl_GetCellName( sal_Int32 nColumn, sal_Int32 nRow ) +String sw_GetCellName( sal_Int32 nColumn, sal_Int32 nRow ) { #if OSL_DEBUG_LEVEL > 0 { sal_Int32 nCol, nRow2; - lcl_GetCellPosition( rtl::OUString("z1"), nCol, nRow2); - OSL_ENSURE( nCol == 51, "lcl_GetCellPosition failed" ); - lcl_GetCellPosition( rtl::OUString("AA1"), nCol, nRow2); - OSL_ENSURE( nCol == 52, "lcl_GetCellPosition failed" ); - lcl_GetCellPosition( rtl::OUString("AB1"), nCol, nRow2); - OSL_ENSURE( nCol == 53, "lcl_GetCellPosition failed" ); - lcl_GetCellPosition( rtl::OUString("BB1"), nCol, nRow2); - OSL_ENSURE( nCol == 105, "lcl_GetCellPosition failed" ); + sw_GetCellPosition( rtl::OUString("z1"), nCol, nRow2); + OSL_ENSURE( nCol == 51, "sw_GetCellPosition failed" ); + sw_GetCellPosition( rtl::OUString("AA1"), nCol, nRow2); + OSL_ENSURE( nCol == 52, "sw_GetCellPosition failed" ); + sw_GetCellPosition( rtl::OUString("AB1"), nCol, nRow2); + OSL_ENSURE( nCol == 53, "sw_GetCellPosition failed" ); + sw_GetCellPosition( rtl::OUString("BB1"), nCol, nRow2); + OSL_ENSURE( nCol == 105, "sw_GetCellPosition failed" ); } #endif String sCellName; if (nColumn < 0 || nRow < 0) return sCellName; - lcl_GetTblBoxColStr( static_cast< sal_uInt16 >(nColumn), sCellName ); + sw_GetTblBoxColStr( static_cast< sal_uInt16 >(nColumn), sCellName ); sCellName += String::CreateFromInt32( nRow + 1 ); return sCellName; } @@ -501,17 +501,17 @@ const SwTableBox* lcl_FindCornerTableBox(const SwTableLines& rTableLines, const // I.e. from the four possible representation // A1:C5, C5:A1, A5:C1, C1:A5 // only A1:C5 is the one to use -void lcl_NormalizeRange( +void sw_NormalizeRange( String &rCell1, // will hold the upper-left cell of the range upon return String &rCell2 ) // will hold the lower-right cell of the range upon return { sal_Int32 nCol1 = -1, nRow1 = -1, nCol2 = -1, nRow2 = -1; - lcl_GetCellPosition( rCell1, nCol1, nRow1 ); - lcl_GetCellPosition( rCell2, nCol2, nRow2 ); + sw_GetCellPosition( rCell1, nCol1, nRow1 ); + sw_GetCellPosition( rCell2, nCol2, nRow2 ); if (nCol2 < nCol1 || nRow2 < nRow1) { - rCell1 = lcl_GetCellName( Min(nCol1, nCol2), Min(nRow1, nRow2) ); - rCell2 = lcl_GetCellName( Max(nCol1, nCol2), Max(nRow1, nRow2) ); + rCell1 = sw_GetCellName( Min(nCol1, nCol2), Min(nRow1, nRow2) ); + rCell2 = sw_GetCellName( Max(nCol1, nCol2), Max(nRow1, nRow2) ); } } @@ -532,10 +532,10 @@ void SwRangeDescriptor::Normalize() } } -SwXCell* lcl_CreateXCell(SwFrmFmt* pFmt, sal_Int32 nColumn, sal_Int32 nRow) +static SwXCell* lcl_CreateXCell(SwFrmFmt* pFmt, sal_Int32 nColumn, sal_Int32 nRow) { SwXCell* pXCell = 0; - String sCellName = lcl_GetCellName(nColumn, nRow); + String sCellName = sw_GetCellName(nColumn, nRow); SwTable* pTable = SwTable::FindTable( pFmt ); SwTableBox* pBox = (SwTableBox*)pTable->GetTblBox( sCellName ); if(pBox) @@ -545,7 +545,7 @@ SwXCell* lcl_CreateXCell(SwFrmFmt* pFmt, sal_Int32 nColumn, sal_Int32 nRow) return pXCell; } -void lcl_InspectLines(SwTableLines& rLines, std::vector<String*>& rAllNames) +static void lcl_InspectLines(SwTableLines& rLines, std::vector<String*>& rAllNames) { for( sal_uInt16 i = 0; i < rLines.size(); i++ ) { @@ -565,7 +565,7 @@ void lcl_InspectLines(SwTableLines& rLines, std::vector<String*>& rAllNames) } } -void lcl_FormatTable(SwFrmFmt* pTblFmt) +static void lcl_FormatTable(SwFrmFmt* pTblFmt) { SwIterator<SwFrm,SwFmt> aIter( *pTblFmt ); for( SwFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() ) @@ -581,7 +581,7 @@ void lcl_FormatTable(SwFrmFmt* pTblFmt) } } -void lcl_CrsrSelect(SwPaM* pCrsr, sal_Bool bExpand) +static void lcl_CrsrSelect(SwPaM* pCrsr, sal_Bool bExpand) { if(bExpand) { @@ -593,7 +593,7 @@ void lcl_CrsrSelect(SwPaM* pCrsr, sal_Bool bExpand) } -void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pBox, sal_Bool bRow) +static void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pBox, sal_Bool bRow) { SwTabCols aCols; aCols.SetLeftMin ( 0 ); @@ -622,7 +622,7 @@ void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pBox, sal } -void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox* pBox, sal_Bool bRow, SwDoc* pDoc) +static void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox* pBox, sal_Bool bRow, SwDoc* pDoc) { SwTabCols aOldCols; @@ -666,14 +666,14 @@ void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox* pBo } } -inline rtl::OUString lcl_getString( SwXCell &rCell ) +static inline rtl::OUString lcl_getString( SwXCell &rCell ) { // getString is a member function of the base class... return rCell.getString(); } /* non UNO function call to set string in SwXCell */ -void lcl_setString( SwXCell &rCell, const rtl::OUString &rTxt, +void sw_setString( SwXCell &rCell, const rtl::OUString &rTxt, sal_Bool bKeepNumberFmt ) { if(rCell.IsValid()) @@ -690,7 +690,7 @@ void lcl_setString( SwXCell &rCell, const rtl::OUString &rTxt, } /* non UNO function call to get value from SwXCell */ -double lcl_getValue( SwXCell &rCell ) +double sw_getValue( SwXCell &rCell ) { double fRet; if(rCell.IsValid() && !rCell.getString().isEmpty()) @@ -701,14 +701,14 @@ double lcl_getValue( SwXCell &rCell ) } /* non UNO function call to set value in SwXCell */ -void lcl_setValue( SwXCell &rCell, double nVal ) +void sw_setValue( SwXCell &rCell, double nVal ) { if(rCell.IsValid()) { // Der Text mu? zunaechst (vielleicht) geloescht werden sal_uLong nNdPos = rCell.pBox->IsValidNumTxtNd( sal_True ); if(ULONG_MAX != nNdPos) - lcl_setString( rCell, OUString(), sal_True ); // sal_True == keep number format + sw_setString( rCell, OUString(), sal_True ); // sal_True == keep number format SwDoc* pDoc = rCell.GetDoc(); UnoActionContext aAction(pDoc); SwFrmFmt* pBoxFmt = rCell.pBox->ClaimFrmFmt(); @@ -898,7 +898,7 @@ void SwXCell::setFormula(const OUString& rFormula) throw( uno::RuntimeException // Der Text mu? zunaechst (vielleicht) geloescht werden sal_uInt32 nNdPos = pBox->IsValidNumTxtNd( sal_True ); if(USHRT_MAX == nNdPos) - lcl_setString( *this, OUString(), sal_True ); + sw_setString( *this, OUString(), sal_True ); String sFml(comphelper::string::stripStart(rFormula, ' ')); if( sFml.Len() && '=' == sFml.GetChar( 0 ) ) sFml.Erase( 0, 1 ); @@ -925,7 +925,7 @@ double SwXCell::getValue(void) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; - double const fRet = lcl_getValue( *this ); + double const fRet = sw_getValue( *this ); // #i112652# a table cell may contain NaN as a value, do not filter that return fRet; } @@ -933,7 +933,7 @@ double SwXCell::getValue(void) throw( uno::RuntimeException ) void SwXCell::setValue(double rValue) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; - lcl_setValue( *this, rValue ); + sw_setValue( *this, rValue ); } table::CellContentType SwXCell::getType(void) throw( uno::RuntimeException ) @@ -957,7 +957,7 @@ table::CellContentType SwXCell::getType(void) throw( uno::RuntimeException ) void SwXCell::setString(const OUString& aString) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; - lcl_setString( *this, aString ); + sw_setString( *this, aString ); } sal_Int32 SwXCell::getError(void) throw( uno::RuntimeException ) @@ -2467,8 +2467,8 @@ uno::Reference< table::XCellRange > SwXTextTable::getCellRangeByPosition(sal_In aDesc.nBottom = nBottom; aDesc.nLeft = nLeft; aDesc.nRight = nRight; - String sTLName = lcl_GetCellName(aDesc.nLeft, aDesc.nTop); - String sBRName = lcl_GetCellName(aDesc.nRight, aDesc.nBottom); + String sTLName = sw_GetCellName(aDesc.nLeft, aDesc.nTop); + String sBRName = sw_GetCellName(aDesc.nRight, aDesc.nBottom); // please note that according to the 'if' statement at the begin // sTLName:sBRName already denotes the normalized range string @@ -2499,8 +2499,8 @@ uno::Reference< table::XCellRange > SwXTextTable::getCellRangeByName(const OUSt throw uno::RuntimeException(); SwRangeDescriptor aDesc; aDesc.nTop = aDesc.nLeft = aDesc.nBottom = aDesc.nRight = -1; - lcl_GetCellPosition(sTLName, aDesc.nLeft, aDesc.nTop ); - lcl_GetCellPosition(sBRName, aDesc.nRight, aDesc.nBottom ); + sw_GetCellPosition(sTLName, aDesc.nLeft, aDesc.nTop ); + sw_GetCellPosition(sBRName, aDesc.nRight, aDesc.nBottom ); // we should normalize the range now (e.g. A5:C1 will become A1:C5) // since (depending on what is done later) it will be troublesome @@ -2565,7 +2565,7 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXTextTable::getDataArray() if(!bIsNum/*bIsText*/) pColArray[nCol] <<= lcl_getString(*pXCell); else - pColArray[nCol] <<= lcl_getValue(*pXCell); + pColArray[nCol] <<= sw_getValue(*pXCell); } } pRowArray[nRow] = aColSeq; @@ -2626,16 +2626,16 @@ void SAL_CALL SwXTextTable::setDataArray( { const uno::Any &rAny = pColArray[nCol]; if (uno::TypeClass_STRING == rAny.getValueTypeClass()) - lcl_setString( *pXCell, *(rtl::OUString *) rAny.getValue() ); + sw_setString( *pXCell, *(rtl::OUString *) rAny.getValue() ); else { double d = 0; // #i20067# don't throw exception just do nothing if // there is no value set if( (rAny >>= d) ) - lcl_setValue( *pXCell, d ); + sw_setValue( *pXCell, d ); else - lcl_setString( *pXCell, OUString(), sal_True ); + sw_setString( *pXCell, OUString(), sal_True ); } } @@ -3758,8 +3758,8 @@ uno::Reference< table::XCellRange > SwXCellRange::getCellRangeByPosition( aNewDesc.nLeft = nLeft + aRgDesc.nLeft; aNewDesc.nRight = nRight + aRgDesc.nLeft; aNewDesc.Normalize(); - String sTLName = lcl_GetCellName(aNewDesc.nLeft, aNewDesc.nTop); - String sBRName = lcl_GetCellName(aNewDesc.nRight, aNewDesc.nBottom); + String sTLName = sw_GetCellName(aNewDesc.nLeft, aNewDesc.nTop); + String sBRName = sw_GetCellName(aNewDesc.nRight, aNewDesc.nBottom); const SwTableBox* pTLBox = pTable->GetTblBox( sTLName ); if(pTLBox) { @@ -3805,8 +3805,8 @@ uno::Reference< table::XCellRange > SwXCellRange::getCellRangeByName(const OUSt throw uno::RuntimeException(); SwRangeDescriptor aDesc; aDesc.nTop = aDesc.nLeft = aDesc.nBottom = aDesc.nRight = -1; - lcl_GetCellPosition( sTLName, aDesc.nLeft, aDesc.nTop ); - lcl_GetCellPosition( sBRName, aDesc.nRight, aDesc.nBottom ); + sw_GetCellPosition( sTLName, aDesc.nLeft, aDesc.nTop ); + sw_GetCellPosition( sBRName, aDesc.nRight, aDesc.nBottom ); aDesc.Normalize(); return getCellRangeByPosition(aDesc.nLeft - aRgDesc.nLeft, aDesc.nTop - aRgDesc.nTop, aDesc.nRight - aRgDesc.nLeft, aDesc.nBottom - aRgDesc.nTop); @@ -4128,7 +4128,7 @@ void SwXCellRange::GetDataSequence( if (!bIsNum/* && ULONG_MAX == nNdPos*/) pAnyData[nDtaCnt++] <<= lcl_getString(*pXCell); else - pAnyData[nDtaCnt++] <<= lcl_getValue(*pXCell); + pAnyData[nDtaCnt++] <<= sw_getValue(*pXCell); } else if (pTxtData) pTxtData[nDtaCnt++] = lcl_getString(*pXCell); @@ -4136,7 +4136,7 @@ void SwXCellRange::GetDataSequence( { double fVal = fNan; if (!bForceNumberResults || table::CellContentType_TEXT != pXCell->getType()) - fVal = lcl_getValue(*pXCell); + fVal = sw_getValue(*pXCell); else { OSL_ENSURE( table::CellContentType_TEXT == pXCell->getType(), @@ -4253,7 +4253,7 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXCellRange::getDataArray() if(!bIsNum/*bIsText*/) pColArray[nCol] <<= lcl_getString(*pXCell); else - pColArray[nCol] <<= lcl_getValue(*pXCell); + pColArray[nCol] <<= sw_getValue(*pXCell); } } pRowArray[nRow] = aColSeq; @@ -4311,16 +4311,16 @@ void SAL_CALL SwXCellRange::setDataArray( { const uno::Any &rAny = pColArray[nCol]; if (uno::TypeClass_STRING == rAny.getValueTypeClass()) - lcl_setString( *pXCell, *(rtl::OUString *) rAny.getValue() ); + sw_setString( *pXCell, *(rtl::OUString *) rAny.getValue() ); else { double d = 0; // #i20067# don't throw exception just do nothing if // there is no value set if( (rAny >>= d) ) - lcl_setValue( *pXCell, d ); + sw_setValue( *pXCell, d ); else - lcl_setString( *pXCell, OUString(), sal_True ); + sw_setString( *pXCell, OUString(), sal_True ); } } } @@ -4759,7 +4759,7 @@ void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno: throw aExcept; } - String sTLName = lcl_GetCellName(0, nIndex); + String sTLName = sw_GetCellName(0, nIndex); const SwTableBox* pTLBox = pTable->GetTblBox( sTLName ); sal_Bool bAppend = sal_False; if(!pTLBox) @@ -4806,7 +4806,7 @@ void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno: SwTable* pTable = SwTable::FindTable( pFrmFmt ); if(!pTable->IsTblComplex()) { - String sTLName = lcl_GetCellName(0, nIndex); + String sTLName = sw_GetCellName(0, nIndex); const SwTableBox* pTLBox = pTable->GetTblBox( sTLName ); if(pTLBox) { @@ -4820,7 +4820,7 @@ void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno: SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, true); pUnoCrsr->Move( fnMoveForward, fnGoNode ); pUnoCrsr->SetRemainInSection( sal_False ); - String sBLName = lcl_GetCellName(0, nIndex + nCount - 1); + String sBLName = sw_GetCellName(0, nIndex + nCount - 1); const SwTableBox* pBLBox = pTable->GetTblBox( sBLName ); if(pBLBox) { @@ -4971,7 +4971,7 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u throw aExcept; } - String sTLName = lcl_GetCellName(nIndex, 0); + String sTLName = sw_GetCellName(nIndex, 0); const SwTableBox* pTLBox = pTable->GetTblBox( sTLName ); sal_Bool bAppend = sal_False; if(!pTLBox) @@ -5015,7 +5015,7 @@ void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u SwTable* pTable = SwTable::FindTable( pFrmFmt ); if(!pTable->IsTblComplex()) { - String sTLName = lcl_GetCellName(nIndex, 0); + String sTLName = sw_GetCellName(nIndex, 0); const SwTableBox* pTLBox = pTable->GetTblBox( sTLName ); if(pTLBox) { @@ -5029,7 +5029,7 @@ void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, true); pUnoCrsr->Move( fnMoveForward, fnGoNode ); pUnoCrsr->SetRemainInSection( sal_False ); - String sTRName = lcl_GetCellName(nIndex + nCount - 1, 0); + String sTRName = sw_GetCellName(nIndex + nCount - 1, 0); const SwTableBox* pTRBox = pTable->GetTblBox( sTRName ); if(pTRBox) { diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx index a7cddad07a85..d1dba16e9dc5 100644 --- a/sw/source/core/unocore/unotextmarkup.cxx +++ b/sw/source/core/unocore/unotextmarkup.cxx @@ -231,7 +231,7 @@ void SAL_CALL SwXTextMarkup::commitTextMarkup( } -void lcl_commitGrammarMarkUp( +static void lcl_commitGrammarMarkUp( const ModelToViewHelper& rConversionMap, SwGrammarMarkUp* pWList, ::sal_Int32 nType, diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index a8357ced629b..00d3d461efa1 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -45,7 +45,7 @@ #include <vcl/outdev.hxx> -extern bool lcl_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds * pSrtLst ); +extern bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds * pSrtLst ); using namespace ::com::sun::star; @@ -70,7 +70,7 @@ void SwRenderData::CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, { DeletePostItData(); m_pPostItFields.reset(new _SetGetExpFlds); - lcl_GetPostIts( pDoc, m_pPostItFields.get() ); + sw_GetPostIts( pDoc, m_pPostItFields.get() ); //!! Disable spell and grammar checking in the temporary document. //!! Otherwise the grammar checker might process it and crash if we later on diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx index 2dc676c9992e..ccdc8bc08428 100644 --- a/sw/source/core/view/viewpg.cxx +++ b/sw/source/core/view/viewpg.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star; SwPageFrm const* -lcl_getPage(SwRootFrm const& rLayout, sal_Int32 const nPage); // vprint.cxx +sw_getPage(SwRootFrm const& rLayout, sal_Int32 const nPage); // vprint.cxx // OD 12.12.2002 #103492# SwPagePreviewLayout* ViewShell::PagePreviewLayout() @@ -132,11 +132,11 @@ void ViewShell::PrintProspect( const SwPageFrm *pNxtPage = 0; if (rPagesToPrint.first > 0) { - pStPage = lcl_getPage(*aShell.GetLayout(), rPagesToPrint.first); + pStPage = sw_getPage(*aShell.GetLayout(), rPagesToPrint.first); } if (rPagesToPrint.second > 0) { - pNxtPage = lcl_getPage(*aShell.GetLayout(), rPagesToPrint.second); + pNxtPage = sw_getPage(*aShell.GetLayout(), rPagesToPrint.second); } // OD 05.05.2003 #i14016# - consider empty pages on calculation diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 59c60e7cfcda..631f8d3d70b7 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -717,7 +717,7 @@ void ViewShell::LayoutIdle() } -void lcl_InvalidateAllCntnt( ViewShell& rSh, sal_uInt8 nInv ) +static void lcl_InvalidateAllCntnt( ViewShell& rSh, sal_uInt8 nInv ) { sal_Bool bCrsr = rSh.ISA(SwCrsrShell); if ( bCrsr ) @@ -737,7 +737,7 @@ void lcl_InvalidateAllCntnt( ViewShell& rSh, sal_uInt8 nInv ) * objects (Writer fly frame and drawing objects), which are anchored * to paragraph or to character. #i11860# */ -void lcl_InvalidateAllObjPos( ViewShell &_rSh ) +static void lcl_InvalidateAllObjPos( ViewShell &_rSh ) { const bool bIsCrsrShell = _rSh.ISA(SwCrsrShell); if ( bIsCrsrShell ) diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index 25511e8b706e..b80b318c4661 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -476,7 +476,7 @@ SwDoc * ViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt) // TODO: there is already a GetPageByPageNum, but it checks some physical page // number; unsure if we want that here, should find out what that is... SwPageFrm const* -lcl_getPage(SwRootFrm const& rLayout, sal_Int32 const nPage) +sw_getPage(SwRootFrm const& rLayout, sal_Int32 const nPage) { // yes this is O(n^2) but at least it does not crash... SwPageFrm const* pPage = dynamic_cast<const SwPageFrm*>(rLayout.Lower()); @@ -548,7 +548,7 @@ sal_Bool ViewShell::PrintOrPDFExport( : pShell; // a 'regular' page, not one from the post-it doc SwPageFrm const*const pStPage = - lcl_getPage(*pViewSh2->GetLayout(), abs(nPage)); + sw_getPage(*pViewSh2->GetLayout(), abs(nPage)); OSL_ENSURE( pStPage, "failed to get start page" ); if (!pStPage) { diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index c9d36f7bbd66..fd3f51151a57 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -1115,7 +1115,7 @@ const SwFmt *SwHTMLWriter::GetParentFmt( const SwFmt& rFmt, sal_uInt16 nDeep ) return pRefFmt; } -sal_Bool lcl_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 ) +sal_Bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 ) { return ((const SvxFontItem &)r1).GetFamilyName() == ((const SvxFontItem &)r2).GetFamilyName() && @@ -1185,7 +1185,7 @@ void SwHTMLWriter::SubtractItemSet( SfxItemSet& rItemSet, ((RES_CHRATR_FONT == nWhich || RES_CHRATR_CJK_FONT == nWhich || RES_CHRATR_CTL_FONT == nWhich) && - lcl_css1atr_equalFontItems( *pItem, *pRefItem )) ) ) + swhtml_css1atr_equalFontItems( *pItem, *pRefItem )) ) ) { // das Attribut ist mit dem gleichen Wert in beiden // Vorlagen vorhanden und muss nicht ausgegeben werden @@ -1332,9 +1332,9 @@ sal_Bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet, // to take care about their special HTML/CSS1 representation. if( RES_CHRATR_FONT == aWhichIds[i] ) { - if( !lcl_css1atr_equalFontItems( *pItem, *pItemCJK ) || - !lcl_css1atr_equalFontItems( *pItem, *pItemCTL ) || - !lcl_css1atr_equalFontItems( *pItemCJK, *pItemCTL ) ) + if( !swhtml_css1atr_equalFontItems( *pItem, *pItemCJK ) || + !swhtml_css1atr_equalFontItems( *pItem, *pItemCTL ) || + !swhtml_css1atr_equalFontItems( *pItemCJK, *pItemCTL ) ) return sal_True; } else diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index f3fe2b6261fd..b53bc4857010 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -77,7 +77,7 @@ using namespace ::com::sun::star; #define MAX_DROPCAP_LINES 9 #define MAX_DROPCAP_CHARS 9 -void lcl_swcss1_setEncoding( SwFmt& rFmt, rtl_TextEncoding eEnc ); +static void lcl_swcss1_setEncoding( SwFmt& rFmt, rtl_TextEncoding eEnc ); // Implementierung des SwCSS1Parsers (eigentlich swcss1.cxx) @@ -664,7 +664,7 @@ static CSS1SelectorType GetTokenAndClass( const CSS1Selector *pSelector, return eType; } -extern sal_Bool lcl_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 ); +extern sal_Bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 ); static void RemoveScriptItems( SfxItemSet& rItemSet, sal_uInt16 nScript, const SfxItemSet *pParentItemSet = 0 ) @@ -707,7 +707,7 @@ static void RemoveScriptItems( SfxItemSet& rItemSet, sal_uInt16 nScript, if( aClearItems[j] || (pParentItemSet && SFX_ITEM_SET == rItemSet.GetItemState( nWhich, sal_False, &pItem ) && - (0==i ? lcl_css1atr_equalFontItems( *pItem, pParentItemSet->Get(nWhich, sal_True ) ) + (0==i ? swhtml_css1atr_equalFontItems( *pItem, pParentItemSet->Get(nWhich, sal_True ) ) : *pItem == pParentItemSet->Get(nWhich, sal_True ) ) ) ) { rItemSet.ClearItem( nWhich ); @@ -2344,7 +2344,7 @@ void SwHTMLParser::InsertParaAttrs( const SfxItemSet& rItemSet ) } } -void lcl_swcss1_setEncoding( SwFmt& rFmt, rtl_TextEncoding eEnc ) +static void lcl_swcss1_setEncoding( SwFmt& rFmt, rtl_TextEncoding eEnc ) { if( RTL_TEXTENCODING_DONTKNOW == eEnc ) return; diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index 277b0792e958..adc4aa9b0155 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -69,7 +69,7 @@ const sal_Char *SwHTMLWriter::GetNumFormat( sal_uInt16 nFmt ) return pFmtStr; } -extern sal_Bool lcl_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 ); +extern sal_Bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 ); static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, const SwTxtNode& rTxtNd, xub_StrLen nFldPos ) { @@ -396,7 +396,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, const SfxPoolItem *pItem = aScriptItemSet.GetItem( pWhichIds[i] ); if( pRefItem && pItem && - !(0==i ? lcl_css1atr_equalFontItems( *pRefItem, *pItem ) + !(0==i ? swhtml_css1atr_equalFontItems( *pRefItem, *pItem ) : *pRefItem == *pItem) ) { Out( aHTMLAttrFnTab, *pItem, rHTMLWrt ); diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index c42e4b6571db..0793fd2a593e 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -90,7 +90,7 @@ const sal_uInt32 HTML_FRMOPTS_IMG_CONTROL_CSS1 = -void lcl_html_outEvents( SvStream& rStrm, +static void lcl_html_outEvents( SvStream& rStrm, const uno::Reference< form::XFormComponent > rFormComp, sal_Bool bCfgStarBasic, rtl_TextEncoding eDestEnc, @@ -210,7 +210,7 @@ void lcl_html_outEvents( SvStream& rStrm, } } -sal_Bool lcl_html_isHTMLControl( sal_Int16 nClassId ) +static sal_Bool lcl_html_isHTMLControl( sal_Int16 nClassId ) { sal_Bool bRet = sal_False; diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index b3a8af03aaf6..ba20f94d519e 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -493,7 +493,7 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn, HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_anchor, sal_False ); } -sal_uInt16 lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo, +static sal_uInt16 lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo, String *pParts, sal_Bool bEndNote ) { @@ -527,7 +527,7 @@ sal_uInt16 lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo, return nParts; } -void lcl_html_outFootEndNoteInfo( Writer& rWrt, String *pParts, +static void lcl_html_outFootEndNoteInfo( Writer& rWrt, String *pParts, sal_uInt16 nParts, const sal_Char *pName ) { SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt; diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 373919bd6b01..a63d7db0a2e1 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -2057,9 +2057,9 @@ void SwHTMLParser::NextToken( int nToken ) } -extern sal_Bool lcl_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 ); +extern sal_Bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 ); -void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr, +static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr, sal_Bool& rScriptDependent, sal_Bool& rFont, sal_uInt16& rScriptType ) { @@ -2363,7 +2363,7 @@ sal_Bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, sal_Bool bUpdateNu sal_Bool bFont = (nIdx % 5) == 0; const SfxPoolItem& rItem = ((const SwCntntNode *)pTxtNd)->GetAttr( nWhich ); - if( bFont ? lcl_css1atr_equalFontItems(rItem,pHt->GetAttr()) + if( bFont ? swhtml_css1atr_equalFontItems(rItem,pHt->GetAttr()) : rItem == pHt->GetAttr() ) { // The hint is the same as set in the paragraph and diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index baba51cf920f..57045f91ec56 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -479,7 +479,7 @@ sal_uLong SwHTMLWriter::WriteStream() return nWarn; } -const SwFmtCol *lcl_html_GetFmtCol( const SwHTMLWriter& rHTMLWrt, +static const SwFmtCol *lcl_html_GetFmtCol( const SwHTMLWriter& rHTMLWrt, const SwSection& rSection, const SwSectionFmt& rFmt ) { @@ -497,7 +497,7 @@ const SwFmtCol *lcl_html_GetFmtCol( const SwHTMLWriter& rHTMLWrt, return pCol; } -sal_Bool lcl_html_IsMultiColStart( const SwHTMLWriter& rHTMLWrt, sal_uLong nIndex ) +static sal_Bool lcl_html_IsMultiColStart( const SwHTMLWriter& rHTMLWrt, sal_uLong nIndex ) { sal_Bool bRet = sal_False; const SwSectionNode *pSectNd = @@ -513,7 +513,7 @@ sal_Bool lcl_html_IsMultiColStart( const SwHTMLWriter& rHTMLWrt, sal_uLong nInde return bRet; } -sal_Bool lcl_html_IsMultiColEnd( const SwHTMLWriter& rHTMLWrt, sal_uLong nIndex ) +static sal_Bool lcl_html_IsMultiColEnd( const SwHTMLWriter& rHTMLWrt, sal_uLong nIndex ) { sal_Bool bRet = sal_False; const SwEndNode *pEndNd = rHTMLWrt.pDoc->GetNodes()[nIndex]->GetEndNode(); @@ -525,7 +525,7 @@ sal_Bool lcl_html_IsMultiColEnd( const SwHTMLWriter& rHTMLWrt, sal_uLong nIndex } -void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, +static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, const SwSection& rSection, const SwSectionFmt& rFmt, const SwFmtCol *pCol, @@ -636,7 +636,7 @@ void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, rHTMLWrt.IncIndentLevel(); } -void lcl_html_OutSectionEndTag( SwHTMLWriter& rHTMLWrt, +static void lcl_html_OutSectionEndTag( SwHTMLWriter& rHTMLWrt, const SwFmtCol *pCol ) { const sal_Char *pTag = pCol ? OOO_STRING_SVTOOLS_HTML_multicol : OOO_STRING_SVTOOLS_HTML_division; diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx index b53f13af47db..5a4f5a63beab 100644 --- a/sw/source/filter/rtf/rtffld.cxx +++ b/sw/source/filter/rtf/rtffld.cxx @@ -277,7 +277,7 @@ xub_StrLen lcl_FindEndBracket( const String& rStr ) return nRet; } -void lcl_ScanEquationField( const String& rStr, RTF_EquationData& rData, +static void lcl_ScanEquationField( const String& rStr, RTF_EquationData& rData, sal_Unicode nSttKey ) { int nSubSupFlag(0); diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx index 7876c16c9c5b..08715af1189f 100644 --- a/sw/source/filter/rtf/rtffly.cxx +++ b/sw/source/filter/rtf/rtffly.cxx @@ -148,7 +148,7 @@ void SwFlySave::SetFlySize( const SwTableNode& rTblNd ) aFlySet.Put( SwFmtFrmSize( rSz.GetHeightSizeType(), nWidth, rSz.GetHeight() )); } -sal_Bool lcl_HasBreakAttrs( const SwCntntNode& rNd ) +static sal_Bool lcl_HasBreakAttrs( const SwCntntNode& rNd ) { sal_Bool bRet = sal_False; const SfxItemSet& rSet = rNd.GetSwAttrSet(); @@ -163,7 +163,7 @@ sal_Bool lcl_HasBreakAttrs( const SwCntntNode& rNd ) } -void lcl_CpyBreakAttrs( SwCntntNode* pSrcNd, SwCntntNode* pDstNd, +static void lcl_CpyBreakAttrs( SwCntntNode* pSrcNd, SwCntntNode* pDstNd, SwNodeIndex* pNewIdx ) { const SfxItemSet* pSet; diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx index a6b3498883e6..74f00b764d87 100644 --- a/sw/source/filter/rtf/rtfnum.cxx +++ b/sw/source/filter/rtf/rtfnum.cxx @@ -59,7 +59,7 @@ #define RTF_NUMRULE_NAME "RTF_Num" -void lcl_ExpandNumFmts( SwNumRule& rRule ) +static void lcl_ExpandNumFmts( SwNumRule& rRule ) { // dann noch das NumFormat in alle Ebenen setzen for( sal_uInt8 n = 1; n < MAXLEVEL; ++n ) @@ -414,7 +414,7 @@ void SwRTFParser::ReadListTable() SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet } -sal_Bool lcl_IsEqual( SwNumRule* pOrigRule, SwNumRule* pRule ) +static sal_Bool lcl_IsEqual( SwNumRule* pOrigRule, SwNumRule* pRule ) { sal_Bool bRet = 0; if( pOrigRule && pRule ) diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 35ad32b4d66b..875beef7b176 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -288,7 +288,7 @@ SvParserState SwRTFParser::CallParser() return SvxRTFParser::CallParser(); } -bool lcl_UsedPara(SwPaM &rPam) +static bool lcl_UsedPara(SwPaM &rPam) { const SwCntntNode* pCNd; const SfxItemSet* pSet; @@ -2733,7 +2733,7 @@ void SwRTFParser::MakeStyleTab() } } -sal_Bool lcl_SetFmtCol( SwFmt& rFmt, sal_uInt16 nCols, sal_uInt16 nColSpace, +static sal_Bool lcl_SetFmtCol( SwFmt& rFmt, sal_uInt16 nCols, sal_uInt16 nColSpace, const std::vector<sal_uInt16>& rColumns ) { sal_Bool bSet = sal_False; diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 38b32fa96f89..00558fe5afe0 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -3226,7 +3226,7 @@ OString RtfAttributeOutput::WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, S return aRet.makeStringAndClear(); } -void lcl_AppendSP( OStringBuffer& rBuffer, +static void lcl_AppendSP( OStringBuffer& rBuffer, const char cName[], const ::rtl::OUString& rValue, const RtfExport& rExport ) diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index 7792f978ade6..01cf11a94df5 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -435,7 +435,7 @@ void RtfSdrExport::AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Re extern const char* pShapeTypes[]; -void lcl_AppendSP( ::rtl::OStringBuffer& rRunText, const char cName[], const ::rtl::OString& rValue) +static void lcl_AppendSP( ::rtl::OStringBuffer& rRunText, const char cName[], const ::rtl::OString& rValue) { rRunText.append('{').append(OOO_STRING_SVTOOLS_RTF_SP) .append('{').append(OOO_STRING_SVTOOLS_RTF_SN " ").append(cName).append('}') diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 6d8866804d11..ae461a3ed1ee 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1642,7 +1642,7 @@ void SwBasicEscherEx::WriteBrushAttr(const SvxBrushItem &rBrush, } } -bool lcl_isInHeader(const SwFrmFmt& rFmt) +static bool lcl_isInHeader(const SwFrmFmt& rFmt) { const SwFlyFrmFmt* pFlyFrmFmt = dynamic_cast<const SwFlyFrmFmt*>(&rFmt); if (!pFlyFrmFmt) diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index efb6e2a26dfd..e0713fa5a2c9 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -135,7 +135,7 @@ static String lcl_getFieldCode( const IFieldmark* pFieldmark ) { } } -ww::eField lcl_getFieldId( const IFieldmark* pFieldmark ) { +static ww::eField lcl_getFieldId( const IFieldmark* pFieldmark ) { OSL_ENSURE(pFieldmark!=NULL, "where is my fieldmark???"); if ( !pFieldmark ) { return ww::eUNKNOWN; @@ -385,7 +385,7 @@ xub_StrLen SwWW8AttrIter::SearchNext( xub_StrLen nStartPos ) return nMinPos; } -bool lcl_isFontsizeItem( const SfxPoolItem& rItem ) +static bool lcl_isFontsizeItem( const SfxPoolItem& rItem ) { return ( rItem.Which( ) == RES_CHRATR_FONTSIZE || rItem.Which( ) == RES_CHRATR_CJK_FONTSIZE || diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 5bf9d26db013..112d4ab4b71f 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -344,7 +344,7 @@ const sal_Unicode *WW8DopTypography::GetJapanNotEndLevel1() return &aJapanNotEndLevel1[0]; } -int lcl_CmpBeginEndChars( const rtl::OUString& rSWStr, +static int lcl_CmpBeginEndChars( const rtl::OUString& rSWStr, const sal_Unicode* pMSStr, int nMSStrByteLen ) { nMSStrByteLen /= sizeof( sal_Unicode ); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 900900e65ccd..b4d08a89b97d 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -1739,7 +1739,7 @@ static void InsertSpecialChar( WW8Export& rWrt, sal_uInt8 c, rWrt.pChpPlc->AppendFkpEntry(rWrt.Strm().Tell(), aItems.size(), aItems.data()); } -String lcl_GetExpandedField(const SwField &rFld) +static String lcl_GetExpandedField(const SwField &rFld) { String sRet(rFld.ExpandField(true)); @@ -1956,7 +1956,7 @@ sal_uInt16 MSWordExportBase::GetId( const SwTOXType& rTOXType ) // 2 - TabStop before PageNum, // 3 - Text before PageNum - rTxt hold the text // 4 - no Text and no TabStop before PageNum -int lcl_CheckForm( const SwForm& rForm, sal_uInt8 nLvl, String& rText ) +static int lcl_CheckForm( const SwForm& rForm, sal_uInt8 nLvl, String& rText ) { int nRet = 4; rText.Erase(); @@ -2006,7 +2006,7 @@ int lcl_CheckForm( const SwForm& rForm, sal_uInt8 nLvl, String& rText ) return nRet; } -bool lcl_IsHyperlinked(const SwForm& rForm, sal_uInt16 nTOXLvl) +static bool lcl_IsHyperlinked(const SwForm& rForm, sal_uInt16 nTOXLvl) { bool bRes = false; for (sal_uInt16 nI = 1; nI < nTOXLvl; ++nI) @@ -4866,7 +4866,7 @@ static void ParaTabStopAdd( WW8Export& rWrt, const SvxTabStopItem& rTStops, aTab.PutAll( rWrt ); } -bool lcl_IsEqual(long nOneLeft, const SvxTabStop &rOne, +static bool lcl_IsEqual(long nOneLeft, const SvxTabStop &rOne, long nTwoLeft, const SvxTabStop &rTwo) { return( diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 5fc820f5e37c..6d785be3dde9 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -959,7 +959,7 @@ long GetListFirstLineIndent(const SwNumFmt &rFmt) return nReverseListIndented; } -long lcl_GetTrueMargin(const SvxLRSpaceItem &rLR, const SwNumFmt &rFmt, +static long lcl_GetTrueMargin(const SvxLRSpaceItem &rLR, const SwNumFmt &rFmt, long &rFirstLinePos) { OSL_ENSURE( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION, @@ -4208,7 +4208,7 @@ void SwWW8ImplReader::ReadDocInfo() } } -void lcl_createTemplateToProjectEntry( const uno::Reference< container::XNameContainer >& xPrjNameCache, const rtl::OUString& sTemplatePathOrURL, const rtl::OUString& sVBAProjName ) +static void lcl_createTemplateToProjectEntry( const uno::Reference< container::XNameContainer >& xPrjNameCache, const rtl::OUString& sTemplatePathOrURL, const rtl::OUString& sVBAProjName ) { if ( xPrjNameCache.is() ) { diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 77b81ab54538..14b0ea40e285 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -489,7 +489,7 @@ WW8LSTInfo* WW8ListManager::GetLSTByListId( sal_uInt32 nIdLst ) const return *aResult; } -void lcl_CopyGreaterEight(String &rDest, String &rSrc, +static void lcl_CopyGreaterEight(String &rDest, String &rSrc, xub_StrLen nStart, xub_StrLen nLen = STRING_LEN) { if (nLen > rSrc.Len() || nLen == STRING_LEN) diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 992549c9df48..cc9990ebf767 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2750,7 +2750,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( _ReadFieldParams& rReadParam) // Verzeichnis-Felder //----------------------------------------- -void lcl_toxMatchACSwitch( SwWW8ImplReader& /*rReader*/, +static void lcl_toxMatchACSwitch( SwWW8ImplReader& /*rReader*/, SwDoc& rDoc, SwTOXBase& rBase, _ReadFieldParams& rParam, @@ -2823,7 +2823,7 @@ static void EnsureMaxLevelForTemplates(SwTOXBase& rBase) } } -void lcl_toxMatchTSwitch(SwWW8ImplReader& rReader, SwTOXBase& rBase, +static void lcl_toxMatchTSwitch(SwWW8ImplReader& rReader, SwTOXBase& rBase, _ReadFieldParams& rParam) { xub_StrLen n = rParam.GoToTokenParam(); @@ -2915,7 +2915,7 @@ bool wwSectionManager::WillHavePageDescHere(SwNodeIndex aIdx) const return bRet; } -sal_uInt16 lcl_GetMaxValidWordTOCLevel(const SwForm &rForm) +static sal_uInt16 lcl_GetMaxValidWordTOCLevel(const SwForm &rForm) { // GetFormMax() returns level + 1, hence the -1 sal_uInt16 nRet = rForm.GetFormMax()-1; @@ -3530,7 +3530,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, String& rStr ) return FLD_TEXT; } -void lcl_ImportTox(SwDoc &rDoc, SwPaM &rPaM, const String &rStr, bool bIdx) +static void lcl_ImportTox(SwDoc &rDoc, SwPaM &rPaM, const String &rStr, bool bIdx) { TOXTypes eTox = ( !bIdx ) ? TOX_CONTENT : TOX_INDEX; // Default diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 31ebaa87b16b..042ef68cb2fa 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -121,7 +121,7 @@ using namespace nsHdFtFlags; #define MM_200 1134 // WW-Default fuer u.Seitenrand: 2.0 cm -sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRC* brc, WW8PLCFx_Cp_FKP* pPap, +static sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRC* brc, WW8PLCFx_Cp_FKP* pPap, const WW8RStyle* pSty = 0, const WW8PLCFx_SEPX* pSep = 0); @@ -440,7 +440,7 @@ void wwSectionManager::SetPage(SwPageDesc &rInPageDesc, SwFrmFmt &rFmt, SetCols(rFmt, rSection, rSection.GetTextAreaWidth()); } -sal_uInt16 lcl_MakeSafeNegativeSpacing(sal_uInt16 nIn) +static sal_uInt16 lcl_MakeSafeNegativeSpacing(sal_uInt16 nIn) { if (nIn > SHRT_MAX) nIn = 0; @@ -1225,7 +1225,7 @@ static bool _SetWW8_BRC(bool bVer67, WW8_BRC& rVar, const sal_uInt8* pS) return 0 != pS; } -sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRC* brc, WW8PLCFx_Cp_FKP* pPap, +static sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRC* brc, WW8PLCFx_Cp_FKP* pPap, const WW8RStyle* pSty, const WW8PLCFx_SEPX* pSep) { @@ -1315,7 +1315,7 @@ void Set1Border(bool bVer67, SvxBoxItem &rBox, const WW8_BRC& rBor, } -bool lcl_IsBorder(bool bVer67, const WW8_BRC* pbrc, bool bChkBtwn = false) +static bool lcl_IsBorder(bool bVer67, const WW8_BRC* pbrc, bool bChkBtwn = false) { if( bVer67 ) return ( pbrc[WW8_TOP ].aBits1[0] & 0x18 ) || // brcType != 0 diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index fcb61b7b8a8c..8bb57ba606ec 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -6186,7 +6186,7 @@ struct WW8_FFN_Ver8 : public WW8_FFN_BASE }; // #i43762# check font name for illegal characters -void lcl_checkFontname( String& sString ) +static void lcl_checkFontname( String& sString ) { // for efficiency, we'd like to use String methods as far as possible. // Hence, we will: diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index a715d25f96a6..6db35baf786d 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -64,7 +64,7 @@ using ::com::sun::star::beans::XPropertySetInfo; // a few helper functions // -SwDoc* lcl_GetDocViaTunnel( Reference<XTextCursor> & rCursor ) +static SwDoc* lcl_GetDocViaTunnel( Reference<XTextCursor> & rCursor ) { Reference<XUnoTunnel> xTunnel( rCursor, UNO_QUERY); OSL_ENSURE(xTunnel.is(), "missing XUnoTunnel for XTextCursor"); @@ -74,7 +74,7 @@ SwDoc* lcl_GetDocViaTunnel( Reference<XTextCursor> & rCursor ) return (pXCursor) ? pXCursor->GetDoc() : 0; } -SwDoc* lcl_GetDocViaTunnel( Reference<XTextRange> & rRange ) +static SwDoc* lcl_GetDocViaTunnel( Reference<XTextRange> & rRange ) { Reference<XUnoTunnel> xTunnel(rRange, UNO_QUERY); OSL_ENSURE(xTunnel.is(), "missing XUnoTunnel for XTextRange"); diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index c07cedac9075..80af530197ee 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -95,7 +95,7 @@ using namespace ::com::sun::star::lang; using ::rtl::OUString; -void lcl_EnsureValidPam( SwPaM& rPam ) +static void lcl_EnsureValidPam( SwPaM& rPam ) { if( rPam.GetCntntNode() != NULL ) { @@ -400,7 +400,7 @@ sal_Int32 ReadThroughComponent( } // #i44177# -void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc ) +static void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc ) { // array containing the names of the default outline styles ('Heading 1', // 'Heading 2', ..., 'Heading 10') @@ -479,7 +479,7 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc ) } -void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SwDoc& _rDoc ) +static void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SwDoc& _rDoc ) { if ( _rDoc.GetDrawModel() && _rDoc.GetDrawModel()->GetPage( 0 ) ) diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index e4d04769e69f..5dfcd175deb1 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -362,7 +362,7 @@ void SvXMLExportItemMapper::handleElementItem( OSL_FAIL( "element item not handled in xml export" ); } -bool lcl_isOdfDoubleLine( const SvxBorderLine* pLine ) +static bool lcl_isOdfDoubleLine( const SvxBorderLine* pLine ) { bool bIsOdfDouble = false; switch (pLine->GetBorderLineStyle()) diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index db8b993d5dce..860f6e6921c6 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -507,7 +507,7 @@ sal_Int64 SAL_CALL SwXMLImport::getSomething( const Sequence< sal_Int8 >& rId ) return SvXMLImport::getSomething( rId ); } -OTextCursorHelper *lcl_xml_GetSwXTextCursor( const Reference < XTextCursor >& rTextCursor ) +static OTextCursorHelper *lcl_xml_GetSwXTextCursor( const Reference < XTextCursor >& rTextCursor ) { Reference<XUnoTunnel> xCrsrTunnel( rTextCursor, UNO_QUERY ); OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" ); diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 1d400a877ca3..37dd60a18c14 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -474,32 +474,32 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue( Color aColor( COL_BLACK ); - if( !lcl_frmitems_parseXMLBorder( rValue, rUnitConverter, + if( !sw_frmitems_parseXMLBorder( rValue, rUnitConverter, bHasStyle, nStyle, bHasWidth, nWidth, nNamedWidth, bHasColor, aColor ) ) return sal_False; if( TOP_BORDER == nMemberId || ALL_BORDER == nMemberId ) - lcl_frmitems_setXMLBorder( pTop, + sw_frmitems_setXMLBorder( pTop, bHasStyle, nStyle, bHasWidth, nWidth, nNamedWidth, bHasColor, aColor ); if( BOTTOM_BORDER == nMemberId || ALL_BORDER == nMemberId ) - lcl_frmitems_setXMLBorder( pBottom, + sw_frmitems_setXMLBorder( pBottom, bHasStyle, nStyle, bHasWidth, nWidth, nNamedWidth, bHasColor, aColor ); if( LEFT_BORDER == nMemberId || ALL_BORDER == nMemberId ) - lcl_frmitems_setXMLBorder( pLeft, + sw_frmitems_setXMLBorder( pLeft, bHasStyle, nStyle, bHasWidth, nWidth, nNamedWidth, bHasColor, aColor ); if( RIGHT_BORDER == nMemberId || ALL_BORDER == nMemberId ) - lcl_frmitems_setXMLBorder( pRight, + sw_frmitems_setXMLBorder( pRight, bHasStyle, nStyle, bHasWidth, nWidth, nNamedWidth, bHasColor, aColor ); @@ -539,28 +539,28 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue( if( TOP_BORDER_LINE_WIDTH == nMemberId || ALL_BORDER_LINE_WIDTH == nMemberId ) - lcl_frmitems_setXMLBorder( pTop, nWidth, + sw_frmitems_setXMLBorder( pTop, nWidth, static_cast< sal_uInt16 >( nOutWidth ), static_cast< sal_uInt16 >( nInWidth ), static_cast< sal_uInt16 >( nDistance ) ); if( BOTTOM_BORDER_LINE_WIDTH == nMemberId || ALL_BORDER_LINE_WIDTH == nMemberId ) - lcl_frmitems_setXMLBorder( pBottom, nWidth, + sw_frmitems_setXMLBorder( pBottom, nWidth, static_cast< sal_uInt16 >( nOutWidth ), static_cast< sal_uInt16 >( nInWidth ), static_cast< sal_uInt16 >( nDistance ) ); if( LEFT_BORDER_LINE_WIDTH == nMemberId || ALL_BORDER_LINE_WIDTH == nMemberId ) - lcl_frmitems_setXMLBorder( pLeft, nWidth, + sw_frmitems_setXMLBorder( pLeft, nWidth, static_cast< sal_uInt16 >( nOutWidth ), static_cast< sal_uInt16 >( nInWidth ), static_cast< sal_uInt16 >( nDistance ) ); if( RIGHT_BORDER_LINE_WIDTH == nMemberId || ALL_BORDER_LINE_WIDTH == nMemberId ) - lcl_frmitems_setXMLBorder( pRight, nWidth, + sw_frmitems_setXMLBorder( pRight, nWidth, static_cast< sal_uInt16 >( nOutWidth ), static_cast< sal_uInt16 >( nInWidth ), static_cast< sal_uInt16 >( nDistance ) ); @@ -717,7 +717,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue( { eTmp = nPrc < 25 ? GPOS_LT: (nPrc < 75 ? GPOS_LM : GPOS_LB); - lcl_frmitems_MergeXMLVertPos( ePos, eTmp ); + sw_frmitems_MergeXMLVertPos( ePos, eTmp ); bVert = sal_True; } } @@ -730,9 +730,9 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue( else if( IsXMLToken( aToken, XML_CENTER ) ) { if( bHori ) - lcl_frmitems_MergeXMLVertPos( ePos, GPOS_MM ); + sw_frmitems_MergeXMLVertPos( ePos, GPOS_MM ); else if ( bVert ) - lcl_frmitems_MergeXMLHoriPos( ePos, GPOS_MM ); + sw_frmitems_MergeXMLHoriPos( ePos, GPOS_MM ); else ePos = GPOS_MM; } @@ -740,7 +740,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue( psXML_BrushHoriPos ) ) { if( bVert ) - lcl_frmitems_MergeXMLHoriPos( + sw_frmitems_MergeXMLHoriPos( ePos, (SvxGraphicPosition)nTmp ); else if( !bHori ) ePos = (SvxGraphicPosition)nTmp; @@ -752,7 +752,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue( psXML_BrushVertPos ) ) { if( bHori ) - lcl_frmitems_MergeXMLVertPos( + sw_frmitems_MergeXMLVertPos( ePos, (SvxGraphicPosition)nTmp ); else if( !bVert ) ePos = (SvxGraphicPosition)nTmp; diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index d29853e2af17..f1d43a26a82f 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -98,7 +98,7 @@ const sal_uInt16 aBorderWidths[] = DEF_LINE_WIDTH_1, }; -sal_Bool lcl_frmitems_parseXMLBorder( const OUString& rValue, +sal_Bool sw_frmitems_parseXMLBorder( const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, sal_Bool& rHasStyle, sal_uInt16& rStyle, sal_Bool& rHasWidth, sal_uInt16& rWidth, @@ -152,7 +152,7 @@ sal_Bool lcl_frmitems_parseXMLBorder( const OUString& rValue, return rHasStyle || rHasWidth || rHasColor; } -void lcl_frmitems_setXMLBorderStyle( SvxBorderLine& rLine, sal_uInt16 nStyle ) +void sw_frmitems_setXMLBorderStyle( SvxBorderLine& rLine, sal_uInt16 nStyle ) { ::editeng::SvxBorderStyle eStyle = table::BorderLineStyle::NONE; if ( nStyle != API_LINE_NONE ) @@ -160,7 +160,7 @@ void lcl_frmitems_setXMLBorderStyle( SvxBorderLine& rLine, sal_uInt16 nStyle ) rLine.SetBorderLineStyle(eStyle); } -sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine, +sal_Bool sw_frmitems_setXMLBorder( SvxBorderLine*& rpLine, sal_Bool bHasStyle, sal_uInt16 nStyle, sal_Bool bHasWidth, sal_uInt16 nWidth, sal_uInt16 nNamedWidth, @@ -220,7 +220,7 @@ sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine, rpLine->SetWidth( nWidth ); } } - lcl_frmitems_setXMLBorderStyle( *rpLine, nStyle ); + sw_frmitems_setXMLBorderStyle( *rpLine, nStyle ); } // set color @@ -230,7 +230,7 @@ sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine, return sal_True; } -void lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine, +void sw_frmitems_setXMLBorder( SvxBorderLine*& rpLine, sal_uInt16 nWidth, sal_uInt16 nOutWidth, sal_uInt16 nInWidth, sal_uInt16 nDistance ) { @@ -266,11 +266,11 @@ const struct SvXMLEnumMapEntry psXML_BrushVertPos[] = { XML_TOKEN_INVALID, 0 } }; -void lcl_frmitems_MergeXMLHoriPos( SvxGraphicPosition& ePos, +void sw_frmitems_MergeXMLHoriPos( SvxGraphicPosition& ePos, SvxGraphicPosition eHori ) { OSL_ENSURE( GPOS_LM==eHori || GPOS_MM==eHori || GPOS_RM==eHori, - "lcl_frmitems_MergeXMLHoriPos: vertical pos must be middle" ); + "sw_frmitems_MergeXMLHoriPos: vertical pos must be middle" ); switch( ePos ) { @@ -296,11 +296,11 @@ void lcl_frmitems_MergeXMLHoriPos( SvxGraphicPosition& ePos, } } -void lcl_frmitems_MergeXMLVertPos( SvxGraphicPosition& ePos, +void sw_frmitems_MergeXMLVertPos( SvxGraphicPosition& ePos, SvxGraphicPosition eVert ) { OSL_ENSURE( GPOS_MT==eVert || GPOS_MM==eVert || GPOS_MB==eVert, - "lcl_frmitems_MergeXMLVertPos: horizontal pos must be middle" ); + "sw_frmitems_MergeXMLVertPos: horizontal pos must be middle" ); switch( ePos ) { diff --git a/sw/source/filter/xml/xmlithlp.hxx b/sw/source/filter/xml/xmlithlp.hxx index 4bfb7e2d4c8e..89df67384318 100644 --- a/sw/source/filter/xml/xmlithlp.hxx +++ b/sw/source/filter/xml/xmlithlp.hxx @@ -46,34 +46,34 @@ namespace rtl { class OUString; } /** Define various helper variables and functions for xmlimpit.cxx and * xmlexpit.cxx. */ -sal_Bool lcl_frmitems_parseXMLBorder( const ::rtl::OUString& rValue, +sal_Bool sw_frmitems_parseXMLBorder( const ::rtl::OUString& rValue, const SvXMLUnitConverter& rUnitConverter, sal_Bool& rHasStyle, sal_uInt16& rStyle, sal_Bool& rHasWidth, sal_uInt16& rWidth, sal_uInt16& rNamedWidth, sal_Bool& rHasColor, Color& rColor ); -void lcl_frmitems_setXMLBorderWidth( editeng::SvxBorderLine& rLine, +void sw_frmitems_setXMLBorderWidth( editeng::SvxBorderLine& rLine, sal_uInt16 nOutWidth, sal_uInt16 nInWidth, sal_uInt16 nDistance ); -void lcl_frmitems_setXMLBorderWidth( editeng::SvxBorderLine& rLine, +void sw_frmitems_setXMLBorderWidth( editeng::SvxBorderLine& rLine, sal_uInt16 nWidth, sal_Bool bDouble ); -sal_Bool lcl_frmitems_setXMLBorder( editeng::SvxBorderLine*& rpLine, +sal_Bool sw_frmitems_setXMLBorder( editeng::SvxBorderLine*& rpLine, sal_Bool bHasStyle, sal_uInt16 nStyle, sal_Bool bHasWidth, sal_uInt16 nWidth, sal_uInt16 nNamedWidth, sal_Bool bHasColor, const Color& rColor ); -void lcl_frmitems_setXMLBorder( editeng::SvxBorderLine*& rpLine, +void sw_frmitems_setXMLBorder( editeng::SvxBorderLine*& rpLine, sal_uInt16 nWidth, sal_uInt16 nOutWidth, sal_uInt16 nInWidth, sal_uInt16 nDistance ); -void lcl_frmitems_MergeXMLHoriPos( SvxGraphicPosition& ePos, +void sw_frmitems_MergeXMLHoriPos( SvxGraphicPosition& ePos, SvxGraphicPosition eHori ); -void lcl_frmitems_MergeXMLVertPos( SvxGraphicPosition& ePos, +void sw_frmitems_MergeXMLVertPos( SvxGraphicPosition& ePos, SvxGraphicPosition eVert ); extern const sal_uInt16 aSBorderWidths[]; diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 5d499b49fc7b..dd5007074d78 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -318,8 +318,8 @@ sal_Bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt, return bInsert; } -void lcl_GetTblBoxColStr( sal_uInt16 nCol, String& rNm ); -void lcl_xmltble_appendBoxPrefix( OUStringBuffer& rBuffer, +void sw_GetTblBoxColStr( sal_uInt16 nCol, String& rNm ); +static void lcl_xmltble_appendBoxPrefix( OUStringBuffer& rBuffer, const OUString& rNamePrefix, sal_uInt32 nCol, sal_uInt32 nRow, sal_Bool bTop ) { @@ -328,7 +328,7 @@ void lcl_xmltble_appendBoxPrefix( OUStringBuffer& rBuffer, if( bTop ) { String sTmp; - lcl_GetTblBoxColStr( (sal_uInt16)nCol, sTmp ); + sw_GetTblBoxColStr( (sal_uInt16)nCol, sTmp ); rBuffer.append( sTmp ); } else @@ -640,7 +640,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines, if( bTop ) { String sTmp; - lcl_GetTblBoxColStr( nColumn, sTmp ); + sw_GetTblBoxColStr( nColumn, sTmp ); sBuffer.append( sTmp ); } else diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index b3e0d014e321..1134a13607e9 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -1147,7 +1147,7 @@ void SwXMLDDETableContext_Impl::StartElement( } // generate a new name for DDE field type (called by lcl_GetDDEFieldType below) -String lcl_GenerateFldTypeName(OUString sPrefix, SwTableNode* pTableNode) +static String lcl_GenerateFldTypeName(OUString sPrefix, SwTableNode* pTableNode) { String sPrefixStr(sPrefix); @@ -1176,7 +1176,7 @@ String lcl_GenerateFldTypeName(OUString sPrefix, SwTableNode* pTableNode) } // set table properties -SwDDEFieldType* lcl_GetDDEFieldType(SwXMLDDETableContext_Impl* pContext, +static SwDDEFieldType* lcl_GetDDEFieldType(SwXMLDDETableContext_Impl* pContext, SwTableNode* pTableNode) { // make command string diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 8f3e57756088..682f481819f1 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -250,7 +250,7 @@ static void lcl_addURL ( SvXMLExport &rExport, const String &rURL, } } -void lcl_addAspect( +static void lcl_addAspect( const svt::EmbeddedObjectRef& rObj, const XMLPropertyState **pStates, const UniReference < XMLPropertySetMapper >& rMapper ) @@ -266,7 +266,7 @@ void lcl_addAspect( } } -void lcl_addOutplaceProperties( +static void lcl_addOutplaceProperties( const svt::EmbeddedObjectRef& rObj, const XMLPropertyState **pStates, const UniReference < XMLPropertySetMapper >& rMapper ) @@ -297,7 +297,7 @@ void lcl_addOutplaceProperties( } } -void lcl_addFrameProperties( +static void lcl_addFrameProperties( const uno::Reference < embed::XEmbeddedObject >& xObj, const XMLPropertyState **pStates, const UniReference < XMLPropertySetMapper >& rMapper ) diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 97175351a5d5..f62fbe074a41 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -207,7 +207,7 @@ sal_Bool SwXMLTextImportHelper::IsInHeaderFooter() const return pDoc && pDoc->IsInHeaderFooter( pTxtCrsr->GetPaM()->GetPoint()->nNode ); } -SwOLENode *lcl_GetOLENode( const SwFrmFmt *pFrmFmt ) +static SwOLENode *lcl_GetOLENode( const SwFrmFmt *pFrmFmt ) { SwOLENode *pOLENd = 0; if( pFrmFmt ) diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index c290254d1e6f..b804019cfcf9 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -138,7 +138,7 @@ String InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const String& rText return sRet; } -void lcl_CopyCollAttr(SwWrtShell* pOldSh, SwWrtShell* pNewSh, sal_uInt16 nCollId) +static void lcl_CopyCollAttr(SwWrtShell* pOldSh, SwWrtShell* pNewSh, sal_uInt16 nCollId) { sal_uInt16 nCollCnt = pOldSh->GetTxtFmtCollCount(); SwTxtFmtColl* pColl; diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index 4244471cb2bb..3f076a0c8204 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -200,7 +200,7 @@ void SwModule::StateOther(SfxItemSet &rSet) } } -SwView* lcl_LoadDoc(SwView* pView, const String& rURL) +static SwView* lcl_LoadDoc(SwView* pView, const String& rURL) { SwView* pNewView = 0; if(rURL.Len()) diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index 1ed815e24ef5..8bd03f97b4dc 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -89,7 +89,7 @@ extern String InsertLabEnvText( SwWrtShell& , SwFldMgr& , const String& ); const char MASTER_LABEL[] = "MasterLabel"; -const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem, +static const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem, SwFrmFmt &rFmt, sal_uInt16 nCol, sal_uInt16 nRow ) { @@ -126,7 +126,7 @@ const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem, return pFmt; } -const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rItem, +static const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rItem, SwFrmFmt &rFmt, SwFldMgr& rFldMgr, sal_uInt16 nCol, sal_uInt16 nRow, sal_Bool bLast ) { diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 9dd9aadc674f..459b561a8f88 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -518,7 +518,7 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium ) /*-------------------------------------------------------------------- Description: Save all Formats --------------------------------------------------------------------*/ -SwSrcView* lcl_GetSourceView( SwDocShell* pSh ) +static SwSrcView* lcl_GetSourceView( SwDocShell* pSh ) { // are we in SourceView? SfxViewFrame* pVFrame = SfxViewFrame::GetFirst( pSh ); diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index eae4d3d52a89..2422085d4154 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -217,7 +217,7 @@ void SwDocShell::DoFlushDocInfo() } } -void lcl_processCompatibleSfxHint( const uno::Reference< script::vba::XVBAEventProcessor >& xVbaEvents, const SfxHint& rHint ) +static void lcl_processCompatibleSfxHint( const uno::Reference< script::vba::XVBAEventProcessor >& xVbaEvents, const SfxHint& rHint ) { using namespace com::sun::star::script::vba::VBAEventId; if ( rHint.ISA( SfxEventHint ) ) diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index ae984bdc9d11..43b25474488b 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -118,7 +118,7 @@ SwImplShellAction::~SwImplShellAction() possibly fill Style --------------------------------------------------------------------*/ -SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc, +static SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc, const String& rName, SwDocStyleSheet* pStyle = 0, sal_Bool bCreate = sal_True ) @@ -164,7 +164,7 @@ SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc, fill Style --------------------------------------------------------------------*/ -SwTxtFmtColl* lcl_FindParaFmt( SwDoc& rDoc, +static SwTxtFmtColl* lcl_FindParaFmt( SwDoc& rDoc, const String& rName, SwDocStyleSheet* pStyle = 0, sal_Bool bCreate = sal_True ) @@ -207,7 +207,7 @@ SwTxtFmtColl* lcl_FindParaFmt( SwDoc& rDoc, --------------------------------------------------------------------*/ -SwFrmFmt* lcl_FindFrmFmt( SwDoc& rDoc, +static SwFrmFmt* lcl_FindFrmFmt( SwDoc& rDoc, const String& rName, SwDocStyleSheet* pStyle = 0, sal_Bool bCreate = sal_True ) @@ -245,7 +245,7 @@ SwFrmFmt* lcl_FindFrmFmt( SwDoc& rDoc, --------------------------------------------------------------------*/ -const SwPageDesc* lcl_FindPageDesc( SwDoc& rDoc, +static const SwPageDesc* lcl_FindPageDesc( SwDoc& rDoc, const String& rName, SwDocStyleSheet* pStyle = 0, sal_Bool bCreate = sal_True ) @@ -279,7 +279,7 @@ const SwPageDesc* lcl_FindPageDesc( SwDoc& rDoc, return pDesc; } -const SwNumRule* lcl_FindNumRule( SwDoc& rDoc, +static const SwNumRule* lcl_FindNumRule( SwDoc& rDoc, const String& rName, SwDocStyleSheet* pStyle = 0, sal_Bool bCreate = sal_True ) @@ -311,7 +311,7 @@ const SwNumRule* lcl_FindNumRule( SwDoc& rDoc, } -sal_uInt16 lcl_FindName(const SwPoolFmtList& rLst, SfxStyleFamily eFam, +static sal_uInt16 lcl_FindName(const SwPoolFmtList& rLst, SfxStyleFamily eFam, const rtl::OUString& rName) { if(!rLst.empty()) @@ -1371,7 +1371,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, } } -void lcl_SaveStyles( sal_uInt16 nFamily, std::vector<void*>& rArr, SwDoc& rDoc ) +static void lcl_SaveStyles( sal_uInt16 nFamily, std::vector<void*>& rArr, SwDoc& rDoc ) { switch( nFamily ) { @@ -1429,7 +1429,7 @@ static bool lcl_Contains(const std::vector<void*>& rArr, const void* p) return std::find( rArr.begin(), rArr.end(), p ) != rArr.end(); } -void lcl_DeleteInfoStyles( sal_uInt16 nFamily, std::vector<void*>& rArr, SwDoc& rDoc ) +static void lcl_DeleteInfoStyles( sal_uInt16 nFamily, std::vector<void*>& rArr, SwDoc& rDoc ) { sal_uInt16 n, nCnt; switch( nFamily ) diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx index 0e0627c42556..eb98808b6aa7 100644 --- a/sw/source/ui/app/swmodul1.cxx +++ b/sw/source/ui/app/swmodul1.cxx @@ -71,7 +71,7 @@ using namespace ::com::sun::star::view; using namespace ::com::sun::star::lang; -void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView, ViewShell* pSh ) +static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView, ViewShell* pSh ) { // in FrameSets the actual visibility can differ from the ViewOption's setting sal_Bool bVScrollChanged = rPref.IsViewVScrollBar() != pSh->GetViewOptions()->IsViewVScrollBar(); @@ -444,7 +444,7 @@ sal_uInt16 SwModule::InsertRedlineAuthor(const String& rAuthor) return nPos; } -void lcl_FillAuthorAttr( sal_uInt16 nAuthor, SfxItemSet &rSet, +static void lcl_FillAuthorAttr( sal_uInt16 nAuthor, SfxItemSet &rSet, const AuthorCharAttr &rAttr ) { Color aCol( rAttr.nColor ); diff --git a/sw/source/ui/config/barcfg.cxx b/sw/source/ui/config/barcfg.cxx index b69b7ac1319c..a845e49d08c4 100644 --- a/sw/source/ui/config/barcfg.cxx +++ b/sw/source/ui/config/barcfg.cxx @@ -73,7 +73,7 @@ SwToolbarConfigItem::~SwToolbarConfigItem() { } -sal_Int32 lcl_getArrayIndex(int nSelType) +static sal_Int32 lcl_getArrayIndex(int nSelType) { sal_Int32 nRet = -1; if(nSelType & nsSelectionType::SEL_NUM) diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx index 0ae1af36e563..f1e58c13a019 100644 --- a/sw/source/ui/config/fontcfg.cxx +++ b/sw/source/ui/config/fontcfg.cxx @@ -42,7 +42,7 @@ using namespace utl; using rtl::OUString; using namespace com::sun::star::uno; -inline LanguageType lcl_LanguageOfType(sal_Int16 nType, sal_Int16 eWestern, sal_Int16 eCJK, sal_Int16 eCTL) +static inline LanguageType lcl_LanguageOfType(sal_Int16 nType, sal_Int16 eWestern, sal_Int16 eCJK, sal_Int16 eCTL) { return LanguageType( nType < FONT_STANDARD_CJK ? eWestern : diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx index 51ef2eb62ad6..7c468da99065 100644 --- a/sw/source/ui/config/modcfg.cxx +++ b/sw/source/ui/config/modcfg.cxx @@ -279,7 +279,7 @@ SwRevisionConfig::~SwRevisionConfig() { } -sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr) +static sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr) { sal_Int32 nRet = 0; switch(rAttr.nItemId) @@ -331,7 +331,7 @@ void SwRevisionConfig::Commit() PutProperties(aNames, aValues); } -void lcl_ConvertCfgToAttr(sal_Int32 nVal, AuthorCharAttr& rAttr, sal_Bool bDelete = sal_False) +static void lcl_ConvertCfgToAttr(sal_Int32 nVal, AuthorCharAttr& rAttr, sal_Bool bDelete = sal_False) { rAttr.nItemId = rAttr.nAttr = 0; switch(nVal) @@ -629,7 +629,7 @@ SwInsertConfig::~SwInsertConfig() delete pOLEMiscOpt; } -void lcl_WriteOpt(const InsCaptionOpt& rOpt, Any* pValues, sal_Int32 nProp, sal_Int32 nOffset) +static void lcl_WriteOpt(const InsCaptionOpt& rOpt, Any* pValues, sal_Int32 nProp, sal_Int32 nOffset) { switch(nOffset) { @@ -829,7 +829,7 @@ void SwInsertConfig::Commit() PutProperties(aNames, aValues); } -void lcl_ReadOpt(InsCaptionOpt& rOpt, const Any* pValues, sal_Int32 nProp, sal_Int32 nOffset) +static void lcl_ReadOpt(InsCaptionOpt& rOpt, const Any* pValues, sal_Int32 nProp, sal_Int32 nOffset) { switch(nOffset) { diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 728b0915f7d2..2cac4a23a9fd 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -630,7 +630,7 @@ SfxTabPage* SwStdFontTabPage::Create( Window* pParent, return new SwStdFontTabPage(pParent, rAttrSet); } -void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, +static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, SfxPrinter* pPrt, const String& rStyle, sal_uInt16 nFontWhich) { @@ -642,7 +642,7 @@ void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, aEmptyStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); } -void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, +static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, sal_Int32 nHeight, sal_uInt16 nFontHeightWhich) { float fSize = (float)nHeight / 10; @@ -2435,7 +2435,7 @@ IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl) #ifdef DBG_UTIL -void lcl_SetPosSize(Window& rWin, Point aPos, Size aSize) +static void lcl_SetPosSize(Window& rWin, Point aPos, Size aSize) { aPos = rWin.LogicToPixel(aPos, MAP_APPFONT); aSize = rWin.OutputDevice::LogicToPixel(aSize, MAP_APPFONT); diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 7fd0f05c1e3f..70b954e3b63f 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -100,7 +100,7 @@ struct AddressUserData_Impl {} }; -::rtl::OUString lcl_getFlatURL( uno::Reference<beans::XPropertySet>& xSourceProperties ) +static ::rtl::OUString lcl_getFlatURL( uno::Reference<beans::XPropertySet>& xSourceProperties ) { ::rtl::OUString sURL; if(xSourceProperties.is()) diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 9bd1fb12f917..8180724b5fa0 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -236,7 +236,7 @@ struct SwNewDBMgr_Impl {} }; -void lcl_InitNumberFormatter(SwDSParam& rParam, uno::Reference<XDataSource> xSource) +static void lcl_InitNumberFormatter(SwDSParam& rParam, uno::Reference<XDataSource> xSource) { uno::Reference<XComponentContext> xContext = ::comphelper::getProcessComponentContext(); rParam.xFormatter = uno::Reference<util::XNumberFormatter>(util::NumberFormatter::create(xContext), UNO_QUERY); @@ -263,7 +263,7 @@ void lcl_InitNumberFormatter(SwDSParam& rParam, uno::Reference<XDataSource> xSou } } -sal_Bool lcl_MoveAbsolute(SwDSParam* pParam, long nAbsPos) +static sal_Bool lcl_MoveAbsolute(SwDSParam* pParam, long nAbsPos) { sal_Bool bRet = sal_False; try @@ -283,7 +283,7 @@ sal_Bool lcl_MoveAbsolute(SwDSParam* pParam, long nAbsPos) return bRet; } -sal_Bool lcl_GetColumnCnt(SwDSParam* pParam, +static sal_Bool lcl_GetColumnCnt(SwDSParam* pParam, const String& rColumnName, long nLanguage, rtl::OUString& rResult, double* pNumber) { uno::Reference< XColumnsSupplier > xColsSupp( pParam->xResultSet, UNO_QUERY ); @@ -503,7 +503,7 @@ void SwNewDBMgr::ImportFromConnection( SwWrtShell* pSh ) } } -String lcl_FindColumn(const String& sFormatStr,sal_uInt16 &nUsedPos, sal_uInt8 &nSeparator) +static String lcl_FindColumn(const String& sFormatStr,sal_uInt16 &nUsedPos, sal_uInt8 &nSeparator) { String sReturn; sal_uInt16 nLen = sFormatStr.Len(); @@ -750,7 +750,7 @@ SwNewDBMgr::~SwNewDBMgr() /*-------------------------------------------------------------------- Description: save bulk letters as single documents --------------------------------------------------------------------*/ -String lcl_FindUniqueName(SwWrtShell* pTargetShell, const String& rStartingPageDesc, sal_uLong nDocNo ) +static String lcl_FindUniqueName(SwWrtShell* pTargetShell, const String& rStartingPageDesc, sal_uLong nDocNo ) { do { @@ -762,7 +762,7 @@ String lcl_FindUniqueName(SwWrtShell* pTargetShell, const String& rStartingPageD }while(true); } -void lcl_CopyDynamicDefaults( const SwDoc& rSource, SwDoc& rTarget ) +static void lcl_CopyDynamicDefaults( const SwDoc& rSource, SwDoc& rTarget ) { sal_uInt16 aRangeOfDefaults[] = { RES_FRMATR_BEGIN, RES_FRMATR_END-1, @@ -791,7 +791,7 @@ void lcl_CopyDynamicDefaults( const SwDoc& rSource, SwDoc& rTarget ) rTarget.SetDefault( aNewDefaults ); } -void lcl_CopyFollowPageDesc( +static void lcl_CopyFollowPageDesc( SwWrtShell& rTargetShell, const SwPageDesc& rSourcePageDesc, const SwPageDesc& rTargetPageDesc, @@ -814,7 +814,7 @@ void lcl_CopyFollowPageDesc( } } -void lcl_RemoveSectionLinks( SwWrtShell& rWorkShell ) +static void lcl_RemoveSectionLinks( SwWrtShell& rWorkShell ) { //reset all links of the sections of synchronized labels sal_uInt16 nSections = rWorkShell.GetSectionFmtCount(); diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/ui/dbui/dbui.cxx index 47b86ce92b35..b0aa997748e2 100644 --- a/sw/source/ui/dbui/dbui.cxx +++ b/sw/source/ui/dbui/dbui.cxx @@ -51,13 +51,13 @@ PrintMonitor::PrintMonitor( Window *pParent, PrintMonitorType eType ) FreeResource(); } -void lcl_ResizeControl( Window* pWin, long nDiff ) +static void lcl_ResizeControl( Window* pWin, long nDiff ) { Size aSize( pWin->GetSizePixel() ); aSize.Width() += nDiff; pWin->SetSizePixel( aSize ); } -void lcl_RePosControl( Window* pWin, long nDiff ) +static void lcl_RePosControl( Window* pWin, long nDiff ) { Point aPos( pWin->GetPosPixel() ); aPos.X() += nDiff; diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx index 7c57cc7f91d3..b03cdde6f8b6 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.cxx +++ b/sw/source/ui/dbui/mailmergechildwindow.cxx @@ -417,7 +417,7 @@ void SwSendMailDialog::SetDocumentCount( sal_Int32 nAllDocuments ) UpdateTransferStatus(); } -void lcl_Move(Control& rCtrl, long nYOffset) +static void lcl_Move(Control& rCtrl, long nYOffset) { Point aPos(rCtrl.GetPosPixel()); aPos.Y() += nYOffset; diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index d06fc225682c..997d63e3a593 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; -void lcl_Move(Control* pCtrl, long nYOffset) +static void lcl_Move(Control* pCtrl, long nYOffset) { Point aPos(pCtrl->GetPosPixel()); aPos.Y() += nYOffset; diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx index 98b955ceeed1..f443a14f2c65 100644 --- a/sw/source/ui/dbui/mmconfigitem.cxx +++ b/sw/source/ui/dbui/mmconfigitem.cxx @@ -369,7 +369,7 @@ void SwMailMergeConfigItem_Impl::SetCurrentAddressBlockIndex( sal_Int32 nSet ) } } -OUString lcl_CreateNodeName(Sequence<OUString>& rAssignments ) +static OUString lcl_CreateNodeName(Sequence<OUString>& rAssignments ) { const OUString* pNames = rAssignments.getConstArray(); sal_Int32 nStart = rAssignments.getLength(); @@ -398,7 +398,7 @@ OUString lcl_CreateNodeName(Sequence<OUString>& rAssignments ) return sNewName; } -void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeaders ) +static void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeaders ) { //convert the strings used for UI to numbers used for the configuration String sBlock(rBlock); @@ -415,7 +415,7 @@ void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeaders ) rBlock = sBlock; } -void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHeaders) +static void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHeaders) { //convert the numbers used for the configuration to strings used for UI to numbers //doesn't use ReplaceAll to prevent expansion of numbers inside of the headers @@ -1662,7 +1662,7 @@ sal_uInt32 SwMailMergeConfigItem::GetMergedDocumentCount() const return m_pImpl->aMergeInfos.size(); } -SwView* lcl_ExistsView(SwView* pView) +static SwView* lcl_ExistsView(SwView* pView) { const TypeId aType(TYPE(SwView)); SfxViewShell* pViewShell = SfxViewShell::GetFirst( &aType, sal_False ); diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 91857ccd541d..a8292318439c 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -43,7 +43,7 @@ using namespace svt; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -void lcl_FillGreetingsBox(ListBox& rBox, +static void lcl_FillGreetingsBox(ListBox& rBox, SwMailMergeConfigItem& rConfig, SwMailMergeConfigItem::Gender eType) { @@ -53,7 +53,7 @@ void lcl_FillGreetingsBox(ListBox& rBox, rBox.SelectEntryPos((sal_uInt16)rConfig.GetCurrentGreeting(eType)); } -void lcl_FillGreetingsBox(ComboBox& rBox, +static void lcl_FillGreetingsBox(ComboBox& rBox, SwMailMergeConfigItem& rConfig, SwMailMergeConfigItem::Gender eType) { @@ -63,7 +63,7 @@ void lcl_FillGreetingsBox(ComboBox& rBox, rBox.SelectEntryPos((sal_uInt16)rConfig.GetCurrentGreeting(eType)); } -void lcl_StoreGreetingsBox(ListBox& rBox, +static void lcl_StoreGreetingsBox(ListBox& rBox, SwMailMergeConfigItem& rConfig, SwMailMergeConfigItem::Gender eType) { @@ -75,7 +75,7 @@ void lcl_StoreGreetingsBox(ListBox& rBox, rConfig.SetCurrentGreeting(eType, rBox.GetSelectEntryPos()); } -void lcl_StoreGreetingsBox(ComboBox& rBox, +static void lcl_StoreGreetingsBox(ComboBox& rBox, SwMailMergeConfigItem& rConfig, SwMailMergeConfigItem::Gender eType) { diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 73b39c91bcb4..79fd3a6ef35f 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -80,7 +80,7 @@ using namespace svt; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -String lcl_GetExtensionForDocType(sal_uLong nDocType) +static String lcl_GetExtensionForDocType(sal_uLong nDocType) { rtl::OUString sExtension; switch( nDocType ) @@ -94,7 +94,7 @@ String lcl_GetExtensionForDocType(sal_uLong nDocType) return sExtension; } -::rtl::OUString lcl_GetColumnValueOf(const ::rtl::OUString& rColumn, Reference < container::XNameAccess>& rxColAccess ) +static ::rtl::OUString lcl_GetColumnValueOf(const ::rtl::OUString& rColumn, Reference < container::XNameAccess>& rxColAccess ) { ::rtl::OUString sRet; try diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx index 4aae060a6fee..188628d426bc 100644 --- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx @@ -144,7 +144,7 @@ struct SpellState } }; -void lcl_LeaveDrawText(SwWrtShell& rSh) +static void lcl_LeaveDrawText(SwWrtShell& rSh) { if(rSh.GetDrawView()) { diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 2d1b6f4ff375..9ff1bc82cc85 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -76,7 +76,7 @@ using namespace ::com::sun::star; static void lcl_ReadSections( SfxMedium& rMedium, ComboBox& rBox ); -void lcl_FillList( SwWrtShell& rSh, ComboBox& rSubRegions, ComboBox* pAvailNames, const SwSectionFmt* pNewFmt ) +static void lcl_FillList( SwWrtShell& rSh, ComboBox& rSubRegions, ComboBox* pAvailNames, const SwSectionFmt* pNewFmt ) { const SwSectionFmt* pFmt; if( !pNewFmt ) @@ -122,7 +122,7 @@ void lcl_FillList( SwWrtShell& rSh, ComboBox& rSubRegions, ComboBox* pAvailNames } } -void lcl_FillSubRegionList( SwWrtShell& rSh, ComboBox& rSubRegions, ComboBox* pAvailNames ) +static void lcl_FillSubRegionList( SwWrtShell& rSh, ComboBox& rSubRegions, ComboBox* pAvailNames ) { lcl_FillList( rSh, rSubRegions, pAvailNames, 0 ); IDocumentMarkAccess* const pMarkAccess = rSh.getIDocumentMarkAccess(); diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx index 01c1b9781fe7..c27f73b23895 100644 --- a/sw/source/ui/docvw/edtdd.cxx +++ b/sw/source/ui/docvw/edtdd.cxx @@ -194,15 +194,15 @@ void SwEditWin::CleanupDropUserMarker() //exhibition hack (MA,MBA) -void lcl_SelectShellForDrop( SwView &rView ) +void SwView::SelectShellForDrop() { - if ( !rView.GetCurShell() ) - rView.SelectShell(); + if ( !GetCurShell() ) + SelectShell(); } sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt ) { - ::lcl_SelectShellForDrop( GetView() ); + GetView().SelectShellForDrop(); DropCleanup(); sal_Int8 nRet = DND_ACTION_NONE; diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 711c63c4a3d1..77aadcf2d82d 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -192,7 +192,7 @@ sal_Bool SwEditWin::bTransparentBackColor = sal_False; // background not transpa extern sal_Bool bExecuteDrag; -SfxShell* lcl_GetShellFromDispatcher( SwView& rView, TypeId nType ); +static SfxShell* lcl_GetShellFromDispatcher( SwView& rView, TypeId nType ); DBG_NAME(edithdl) @@ -768,7 +768,7 @@ sal_Bool SwEditWin::IsInputSequenceCheckingRequired( const String &rText, const //return INVALID_HINT if language should not be explictly overridden, the correct //HintId to use for the eBufferLanguage otherwise -sal_uInt16 lcl_isNonDefaultLanguage(LanguageType eBufferLanguage, SwView& rView, +static sal_uInt16 lcl_isNonDefaultLanguage(LanguageType eBufferLanguage, SwView& rView, const String &rInBuffer) { sal_uInt16 nWhich = INVALID_HINT; @@ -2744,7 +2744,7 @@ void SwEditWin::RstMBDownFlags() * Determines if the current position has a clickable url over a background * frame. In that case, ctrl-click should select the url, not the frame. */ -bool lcl_urlOverBackground(SwWrtShell& rSh, const Point& rDocPos) +static bool lcl_urlOverBackground(SwWrtShell& rSh, const Point& rDocPos) { SwContentAtPos aSwContentAtPos(SwContentAtPos::SW_INETATTR); SdrObject* pSelectableObj = rSh.GetObjAt(rDocPos); @@ -2854,7 +2854,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) // After GrabFocus a shell should be pushed. That should actually // work but in practice ... - lcl_SelectShellForDrop( rView ); + rView.SelectShellForDrop(); sal_Bool bIsDocReadOnly = rView.GetDocShell()->IsReadOnly(); sal_Bool bCallBase = sal_True; @@ -5539,7 +5539,7 @@ sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ) return bRet; } -SfxShell* lcl_GetShellFromDispatcher( SwView& rView, TypeId nType ) +static SfxShell* lcl_GetShellFromDispatcher( SwView& rView, TypeId nType ) { // determine Shell SfxShell* pShell; diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index 0305d3160097..c97bef2f8385 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -807,7 +807,7 @@ void SwSrcEditWindow::GetFocus() pOutWin->GrabFocus(); } -sal_Bool lcl_GetLanguagesForEncoding(rtl_TextEncoding eEnc, LanguageType aLanguages[]) +static sal_Bool lcl_GetLanguagesForEncoding(rtl_TextEncoding eEnc, LanguageType aLanguages[]) { switch(eEnc) { diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 6f878e67245e..e9d5e531bb43 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -298,7 +298,7 @@ SwLabPage::~SwLabPage() { } -void lcl_ChgYPos(Window& rWin, long nDiff) +static void lcl_ChgYPos(Window& rWin, long nDiff) { Point aTempPos(rWin.GetPosPixel()); aTempPos.Y() += nDiff; @@ -696,7 +696,7 @@ sal_Bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet) return sal_True; } -void lcl_SelectBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName) +static void lcl_SelectBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName) { SvLBoxEntry* pEntry = rAutoTextLB.First(); while(pEntry) @@ -711,7 +711,7 @@ void lcl_SelectBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName) } } -sal_Bool lcl_FindBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName) +static sal_Bool lcl_FindBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName) { SvLBoxEntry* pEntry = rAutoTextLB.First(); while(pEntry) diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx index 39c38846f512..7fb27cf17fd3 100644 --- a/sw/source/ui/envelp/labelcfg.cxx +++ b/sw/source/ui/envelp/labelcfg.cxx @@ -57,7 +57,7 @@ void SwLabelConfig::Commit() void SwLabelConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} -Sequence<OUString> lcl_CreatePropertyNames(const OUString& rPrefix) +static Sequence<OUString> lcl_CreatePropertyNames(const OUString& rPrefix) { Sequence<OUString> aProperties(2); OUString* pProperties = aProperties.getArray(); @@ -69,7 +69,7 @@ Sequence<OUString> lcl_CreatePropertyNames(const OUString& rPrefix) return aProperties; } -SwLabRec* lcl_CreateSwLabRec(Sequence<Any>& rValues, const OUString& rManufacturer) +static SwLabRec* lcl_CreateSwLabRec(Sequence<Any>& rValues, const OUString& rManufacturer) { SwLabRec* pNewRec = new SwLabRec; const Any* pValues = rValues.getConstArray(); @@ -125,7 +125,7 @@ SwLabRec* lcl_CreateSwLabRec(Sequence<Any>& rValues, const OUString& rManufactur return pNewRec; } -Sequence<PropertyValue> lcl_CreateProperties( +static Sequence<PropertyValue> lcl_CreateProperties( Sequence<OUString>& rPropNames, const SwLabRec& rRec) { const OUString* pNames = rPropNames.getConstArray(); @@ -216,7 +216,7 @@ sal_Bool SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rt return sal_False; } -sal_Bool lcl_Exists(const OUString& rNode, const Sequence<OUString>& rLabels) +static sal_Bool lcl_Exists(const OUString& rNode, const Sequence<OUString>& rLabels) { const OUString* pLabels = rLabels.getConstArray(); for(sal_Int32 i = 0; i < rLabels.getLength(); i++) diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index e88eb548b03f..1367afc64f54 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -482,21 +482,21 @@ void SwMailMergeDlg::Apply() { } -void lcl_MoveControlY( Window* ppW, long nDiffSize ) +static void lcl_MoveControlY( Window* ppW, long nDiffSize ) { Point aPos( ppW->GetPosPixel()); aPos.Y() += nDiffSize; ppW->SetPosPixel( aPos ); } -void lcl_MoveControlX( Window* ppW, long nDiffSize ) +static void lcl_MoveControlX( Window* ppW, long nDiffSize ) { Point aPos( ppW->GetPosPixel()); aPos.X() += nDiffSize; ppW->SetPosPixel( aPos ); } -void lcl_ChangeWidth( Window* ppW, long nDiffSize ) +static void lcl_ChangeWidth( Window* ppW, long nDiffSize ) { Size aSize( ppW->GetSizePixel()); aSize.Width() += nDiffSize; diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index b74658642169..d293babd24fe 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -595,7 +595,7 @@ long SwCaptionDialog::CategoryBox::PreNotify( NotifyEvent& rNEvt ) /*------------------------------------------------------------------------- //#i61007# order of captions -----------------------------------------------------------------------*/ -void lcl_MoveH( Window& rWin, sal_Int32 nMove ) +static void lcl_MoveH( Window& rWin, sal_Int32 nMove ) { Point aPos( rWin.GetPosPixel() ); aPos.Y() += nMove; diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 887709fe121f..a4189e1ced8d 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -444,7 +444,7 @@ static size_t lcl_GetFrmMapCount( const FrmMap* pMap) return 0; } -void lcl_InsertVectors(ListBox& rBox, +static void lcl_InsertVectors(ListBox& rBox, const ::std::vector< String >& rPrev, const ::std::vector< String >& rThis, const ::std::vector< String >& rNext, const ::std::vector< String >& rRemain) { @@ -472,7 +472,7 @@ void lcl_InsertVectors(ListBox& rBox, // --> OD 2009-08-31 #mongolianlayout# // add input parameter -SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(SvxSwFramePosString::StringId eStringId, sal_Bool bVertical, sal_Bool bVerticalL2R, sal_Bool bRTL) +static SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(SvxSwFramePosString::StringId eStringId, sal_Bool bVertical, sal_Bool bVerticalL2R, sal_Bool bRTL) { //special handling of STR_FROMLEFT if ( SwFPos::FROMLEFT == eStringId ) diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 5aa8086f13c1..2a5cc3a4165e 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -159,9 +159,6 @@ struct SwApplyTemplate --------------------------------------------------------------------*/ class SW_DLLPUBLIC SwView: public SfxViewShell { - // exhibition hack (MA,MBA) - friend void lcl_SelectShellForDrop( SwView &rView ); - friend class SwHHCWrapper; friend class SwHyphWrapper; friend class SwView_Impl; @@ -657,6 +654,9 @@ public: SwPostItMgr* GetPostItMgr() { return mpPostItMgr;} const SwPostItMgr* GetPostItMgr() const { return mpPostItMgr;} + + // exhibition hack (MA,MBA) + void SelectShellForDrop(); }; // ----------------- inline Methoden ---------------------- diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index f0ae07eadf36..eade987bc4f4 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -79,7 +79,7 @@ using ::rtl::OUString; #endif #define SW_PROP_NAME_STR(nId) SwGetPropName((nId)).pName -void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo, +static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo, uno::Reference< XPropertySet > & xProps, const char* pPropName, const String& rValue) { @@ -92,14 +92,14 @@ void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo, } } -void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo, +static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo, uno::Reference< XPropertySet > & xProps, sal_uInt16 nId, const String& rValue) { lcl_SetProp( xInfo, xProps, SW_PROP_NAME_STR(nId), rValue); } -void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo, +static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo, uno::Reference< XPropertySet > & xProps, sal_uInt16 nId, sal_Int16 nValue ) { @@ -112,7 +112,7 @@ void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo, } } -void lcl_SetBOOLProp( +static void lcl_SetBOOLProp( uno::Reference< beans::XPropertySetInfo > & xInfo, uno::Reference< beans::XPropertySet > & xProps, sal_uInt16 nId, sal_Bool bValue ) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 1bf5c7a3618a..5bf5fc9e1497 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -99,7 +99,7 @@ static const sal_Unicode aDeliEnd = ']'; // for the form #define IDX_FILE_EXTENSION rtl::OUString("*.sdi") -String lcl_CreateAutoMarkFileDlg( const String& rURL, +static String lcl_CreateAutoMarkFileDlg( const String& rURL, const String& rFileString, sal_Bool bOpen ) { String sRet; @@ -1006,7 +1006,7 @@ sal_Bool SwTOXSelectTabPage::FillItemSet( SfxItemSet& ) return sal_True; } -long lcl_TOXTypesToUserData(CurTOXType eType) +static long lcl_TOXTypesToUserData(CurTOXType eType) { sal_uInt16 nRet = TOX_INDEX; switch(eType.eType) @@ -1038,7 +1038,7 @@ void SwTOXSelectTabPage::SelectType(TOXTypes eSet) TOXTypeHdl(&aTypeLB); } -CurTOXType lcl_UserData2TOXTypes(sal_uInt16 nData) +static CurTOXType lcl_UserData2TOXTypes(sal_uInt16 nData) { CurTOXType eRet; @@ -2078,14 +2078,14 @@ void SwTOXEntryTabPage::Reset( const SfxItemSet& ) aCommaSeparatedCB.Check(m_pCurrentForm->IsCommaSeparated()); } -void lcl_ChgWidth(Window& rWin, long nDiff) +static void lcl_ChgWidth(Window& rWin, long nDiff) { Size aTempSz(rWin.GetSizePixel()); aTempSz.Width() += nDiff; rWin.SetSizePixel(aTempSz); } -void lcl_ChgXPos(Window& rWin, long nDiff) +static void lcl_ChgXPos(Window& rWin, long nDiff) { Point aTempPos(rWin.GetPosPixel()); aTempPos.X() += nDiff; diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 6b51d61e9217..393585808b17 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -95,7 +95,7 @@ using namespace ::com::sun::star; using ::rtl::OUString; -extern void lcl_CharDialog( SwWrtShell &rWrtSh, sal_Bool bUseDialog, sal_uInt16 nSlot,const SfxItemSet *pArgs, SfxRequest *pReq ); +extern void sw_CharDialog( SwWrtShell &rWrtSh, sal_Bool bUseDialog, sal_uInt16 nSlot,const SfxItemSet *pArgs, SfxRequest *pReq ); @@ -191,7 +191,7 @@ static LanguageType lcl_CheckLanguage( /// selected text. Or in other words, the language a spell checker would use. /// If there is more than one language LANGUAGE_DONTKNOW will be returned. // check if nScriptType includes the script type associated to nLang -inline bool lcl_checkScriptType( sal_Int16 nScriptType, LanguageType nLang ) +static inline bool lcl_checkScriptType( sal_Int16 nScriptType, LanguageType nLang ) { return 0 != (nScriptType & SvtLanguageOptions::GetScriptTypeOfLanguage( nLang )); } @@ -899,7 +899,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) else if (nId == MN_SET_SELECTION_MORE) { //Open Format/Character Dialog - lcl_CharDialog( *pSh, true, nId, 0, 0 ); + sw_CharDialog( *pSh, true, nId, 0, 0 ); } else if (MN_SET_LANGUAGE_PARAGRAPH_START <= nId && nId <= MN_SET_LANGUAGE_PARAGRAPH_END) { @@ -931,7 +931,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) pSh->Push(); // save cursor SwLangHelper::SelectCurrentPara( *pSh ); //Open Format/Character Dialog - lcl_CharDialog( *pSh, true, nId, 0, 0 ); + sw_CharDialog( *pSh, true, nId, 0, 0 ); pSh->Pop( sal_False ); // restore cursor } } diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 1de2e1fe5d06..cb7597f0f20c 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -377,7 +377,7 @@ IMPL_LINK_NOARG_INLINE_START(SwEndNoteOptionPage, PosChapterHdl) } IMPL_LINK_NOARG_INLINE_END(SwEndNoteOptionPage, PosChapterHdl) -SwCharFmt* lcl_GetCharFormat( SwWrtShell* pSh, const String& rCharFmtName ) +static SwCharFmt* lcl_GetCharFormat( SwWrtShell* pSh, const String& rCharFmtName ) { SwCharFmt* pFmt = 0; sal_uInt16 nChCount = pSh->GetCharFmtCount(); diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx index b8d327b57393..00b6750791e6 100644 --- a/sw/source/ui/misc/glosdoc.cxx +++ b/sw/source/ui/misc/glosdoc.cxx @@ -57,7 +57,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; // PUBLIC METHODES ------------------------------------------------------- -String lcl_CheckFileName( const String& rNewFilePath, +static String lcl_CheckFileName( const String& rNewFilePath, const String& rNewGroupName ) { String sRet; @@ -408,7 +408,7 @@ SwGlossaries::SwGlossaries() /* -------------------------------------------------- * #61050# double paths cause irritation - get rid of it * --------------------------------------------------*/ -sal_Bool lcl_FindSameEntry(const std::vector<String*>& rDirArr, const String& rEntryURL) +static sal_Bool lcl_FindSameEntry(const std::vector<String*>& rDirArr, const String& rEntryURL) { for(std::vector<String*>::const_iterator it(rDirArr.begin()); it != rDirArr.end(); ++it) if( **it == rEntryURL ) diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 7f011ecc194c..7448a13f09ed 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -92,7 +92,7 @@ using namespace ::ucbhelper; using ::rtl::OUString; using namespace ::sfx2; -String lcl_GetValidShortCut( const String& rName ) +static String lcl_GetValidShortCut( const String& rName ) { const sal_uInt16 nSz = rName.Len(); diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx index 592606650a35..27a2497f939f 100644 --- a/sw/source/ui/misc/glshell.cxx +++ b/sw/source/ui/misc/glshell.cxx @@ -74,7 +74,7 @@ SFX_IMPL_INTERFACE( SwWebGlosDocShell, SwWebDocShell, SW_RES(0) ) TYPEINIT1( SwGlosDocShell, SwDocShell ); TYPEINIT1( SwWebGlosDocShell, SwWebDocShell ); -void lcl_Execute( SwDocShell& rSh, SfxRequest& rReq ) +static void lcl_Execute( SwDocShell& rSh, SfxRequest& rReq ) { if ( rReq.GetSlot() == SID_SAVEDOC ) { @@ -93,7 +93,7 @@ void lcl_Execute( SwDocShell& rSh, SfxRequest& rReq ) } } -void lcl_GetState( SwDocShell& rSh, SfxItemSet& rSet ) +static void lcl_GetState( SwDocShell& rSh, SfxItemSet& rSet ) { if( SFX_ITEM_AVAILABLE >= rSet.GetItemState( SID_SAVEDOC, sal_False )) { @@ -104,7 +104,7 @@ void lcl_GetState( SwDocShell& rSh, SfxItemSet& rSet ) } } -sal_Bool lcl_Save( SwWrtShell& rSh, const String& rGroupName, +static sal_Bool lcl_Save( SwWrtShell& rSh, const String& rGroupName, const String& rShortNm, const String& rLongNm ) { const SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get(); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index ad377365abe6..222da29e46e1 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -159,7 +159,7 @@ SwNumNamesDlg::SwNumNamesDlg(Window *pParent) SwNumNamesDlg::~SwNumNamesDlg() {} -sal_uInt16 lcl_BitToLevel(sal_uInt16 nActLevel) +static sal_uInt16 lcl_BitToLevel(sal_uInt16 nActLevel) { sal_uInt16 nTmp = nActLevel; sal_uInt16 nTmpLevel = 0; @@ -875,7 +875,7 @@ void SwOutlineSettingsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType aStartEdit.GetModifyHdl().Call(&aStartEdit); } -sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev, +static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev, const SwNumFmt& rFmt, sal_uInt16 nXStart, sal_uInt16 nYStart, const Size& rSize) { @@ -893,7 +893,7 @@ sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev, return nRet; } -sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SwNumFmt &rFmt, sal_uInt16 nXStart, +static sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SwNumFmt &rFmt, sal_uInt16 nXStart, sal_uInt16 nYStart, sal_uInt16 nDivision) { const SvxBrushItem* pBrushItem = rFmt.GetBrush(); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 419dbc29081e..e73dcff83c3a 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -76,7 +76,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using ::rtl::OUString; -void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox ) +static void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox ) { void* pDel; for( sal_uInt16 n = 0, nEnd = rLstBox.GetEntryCount(); n < nEnd; ++n ) @@ -88,7 +88,7 @@ void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox ) /*-------------------------------------------------------------------- Description: determine lines and columns for table selection --------------------------------------------------------------------*/ -sal_Bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY ) +static sal_Bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY ) { const SwTableNode* pTblNd = rSh.IsCrsrInTbl(); if( !pTblNd ) diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 0a8b6f79130a..27cf51430089 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -161,7 +161,7 @@ TYPEINIT1(SwBaseShell,SfxShell) /*-------------------------------------------------------------------- Beschreibung: statics --------------------------------------------------------------------*/ -void lcl_UpdateIMapDlg( SwWrtShell& rSh ) +static void lcl_UpdateIMapDlg( SwWrtShell& rSh ) { Graphic aGrf( rSh.GetIMapGraphic() ); GraphicType nGrfType = aGrf.GetType(); @@ -181,7 +181,7 @@ void lcl_UpdateIMapDlg( SwWrtShell& rSh ) delete pList; } -sal_Bool lcl_UpdateContourDlg( SwWrtShell &rSh, int nSel ) +static sal_Bool lcl_UpdateContourDlg( SwWrtShell &rSh, int nSel ) { Graphic aGraf( rSh.GetIMapGraphic() ); GraphicType nGrfType = aGraf.GetType(); diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index 7c13de6ee659..4d9ec90ac35c 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -90,8 +90,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; // Prototypen ------------------------------------------------------------ -void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine); -const SwFrmFmt* lcl_GetFrmFmtByName(SwWrtShell& rSh, const String& rName) +static void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine); +static const SwFrmFmt* lcl_GetFrmFmtByName(SwWrtShell& rSh, const String& rName) { sal_uInt16 nCount = rSh.GetFlyCount(FLYCNTTYPE_FRM); for( sal_uInt16 i = 0; i < nCount; i++) @@ -1072,7 +1072,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq) } -void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine) +static void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine) { if(pBorderLine->GetWidth() > rBorderLine.GetWidth()) rBorderLine.SetWidth(pBorderLine->GetWidth()); diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index 0f9fd07c2c72..0c79f0213567 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.cxx @@ -73,7 +73,7 @@ TYPEINIT1(SwListShell,SwBaseShell) // for outline numbered paragraphs should match the functions for outlines // available in the navigator. Therefore the code in the following // function is quite similar the the code in SwContentTree::ExecCommand. -void lcl_OutlineUpDownWithSubPoints( SwWrtShell& rSh, bool bMove, bool bUp ) +static void lcl_OutlineUpDownWithSubPoints( SwWrtShell& rSh, bool bMove, bool bUp ) { const sal_uInt16 nActPos = rSh.GetOutlinePos(); if ( nActPos < USHRT_MAX && rSh.IsOutlineMovable( nActPos ) ) diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index c07f57a219e9..7bc67e64980e 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -83,7 +83,7 @@ using namespace nsSwDocInfoSubType; extern sal_Bool bNoInterrupt; // in mainwn.cxx -String& lcl_AppendRedlineStr( String& rStr, sal_uInt16 nRedlId ) +static String& lcl_AppendRedlineStr( String& rStr, sal_uInt16 nRedlId ) { sal_uInt16 nResId = 0; switch( nRedlId ) diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 06ce73601b8a..40d93fc79569 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -728,7 +728,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) } } -bool lcl_IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSect ) +static bool lcl_IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSect ) { rWrtSh.SwapPam(); bool bRet = pSect == rWrtSh.GetCurrSection(); diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index d82aad7f3828..cb062a99adb2 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -126,7 +126,7 @@ using namespace ::com::sun::star; -void lcl_CharDialog( SwWrtShell &rWrtSh, sal_Bool bUseDialog, sal_uInt16 nSlot,const SfxItemSet *pArgs, SfxRequest *pReq ) +void sw_CharDialog( SwWrtShell &rWrtSh, sal_Bool bUseDialog, sal_uInt16 nSlot,const SfxItemSet *pArgs, SfxRequest *pReq ) { FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView, &rWrtSh.GetView())); SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); @@ -255,7 +255,7 @@ void lcl_CharDialog( SwWrtShell &rWrtSh, sal_Bool bUseDialog, sal_uInt16 nSlot,c delete pDlg; } -short lcl_AskRedlineMode(Window *pWin) +static short lcl_AskRedlineMode(Window *pWin) { MessBox aQBox( pWin, 0, String( SW_RES( STR_REDLINE_TITLE ) ), @@ -827,14 +827,14 @@ void SwTextShell::Execute(SfxRequest &rReq) } case SID_CHAR_DLG: { - lcl_CharDialog( rWrtSh, bUseDialog, nSlot, pArgs, &rReq ); + sw_CharDialog( rWrtSh, bUseDialog, nSlot, pArgs, &rReq ); } break; case SID_CHAR_DLG_FOR_PARAGRAPH: { rWrtSh.Push(); //save current cursor SwLangHelper::SelectCurrentPara( rWrtSh ); - lcl_CharDialog( rWrtSh, bUseDialog, nSlot, pArgs, &rReq ); + sw_CharDialog( rWrtSh, bUseDialog, nSlot, pArgs, &rReq ); rWrtSh.Pop( sal_False ); //restore old cursor } break; diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx index 8b09cbab12bc..dd6e65349ab7 100644 --- a/sw/source/ui/uiview/formatclipboard.cxx +++ b/sw/source/ui/uiview/formatclipboard.cxx @@ -444,7 +444,7 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP typedef boost::shared_ptr< SfxPoolItem > SfxPoolItemSharedPtr; typedef std::vector< SfxPoolItemSharedPtr > ItemVector; // collect all PoolItems from the applied styles -void lcl_AppendSetItems( ItemVector& rItemVector, const SfxItemSet& rStyleAttrSet ) +static void lcl_AppendSetItems( ItemVector& rItemVector, const SfxItemSet& rStyleAttrSet ) { const sal_uInt16* pRanges = rStyleAttrSet.GetRanges(); while( *pRanges ) @@ -461,7 +461,7 @@ void lcl_AppendSetItems( ItemVector& rItemVector, const SfxItemSet& rStyleAttrSe } } // remove all items that are inherited from the styles -void lcl_RemoveEqualItems( SfxItemSet& rTemplateItemSet, const ItemVector& rItemVector ) +static void lcl_RemoveEqualItems( SfxItemSet& rTemplateItemSet, const ItemVector& rItemVector ) { ItemVector::const_iterator aEnd = rItemVector.end(); ItemVector::const_iterator aIter = rItemVector.begin(); diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 4b1e31aaebd6..f91e676d39b0 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -111,7 +111,7 @@ TYPEINIT1(SwPagePreView,SfxViewShell) #define MIN_PREVIEW_ZOOM 25 #define MAX_PREVIEW_ZOOM 600 -sal_uInt16 lcl_GetNextZoomStep(sal_uInt16 nCurrentZoom, sal_Bool bZoomIn) +static sal_uInt16 lcl_GetNextZoomStep(sal_uInt16 nCurrentZoom, sal_Bool bZoomIn) { static sal_uInt16 aZoomArr[] = { @@ -133,7 +133,7 @@ sal_uInt16 lcl_GetNextZoomStep(sal_uInt16 nCurrentZoom, sal_Bool bZoomIn) return bZoomIn ? MAX_PREVIEW_ZOOM : MIN_PREVIEW_ZOOM; }; -void lcl_InvalidateZoomSlots(SfxBindings& rBindings) +static void lcl_InvalidateZoomSlots(SfxBindings& rBindings) { static sal_uInt16 const aInval[] = { diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 12b06de03604..aad2acff97c4 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -127,7 +127,7 @@ SFX_IMPL_INTERFACE( SwSrcView, SfxViewShell, SW_RES(0) ) TYPEINIT1(SwSrcView, SfxViewShell) -void lcl_PrintHeader( OutputDevice &rOutDev, sal_uInt16 nPages, sal_uInt16 nCurPage, const String& rTitle ) +static void lcl_PrintHeader( OutputDevice &rOutDev, sal_uInt16 nPages, sal_uInt16 nCurPage, const String& rTitle ) { short nLeftMargin = LMARGPRN; Size aSz = rOutDev.GetOutputSize(); @@ -181,7 +181,7 @@ void lcl_PrintHeader( OutputDevice &rOutDev, sal_uInt16 nPages, sal_uInt16 nCurP rOutDev.SetFillColor( aOldFillColor ); } -rtl_TextEncoding lcl_GetStreamCharSet(rtl_TextEncoding eLoadEncoding) +static rtl_TextEncoding lcl_GetStreamCharSet(rtl_TextEncoding eLoadEncoding) { rtl_TextEncoding eRet = eLoadEncoding; if(RTL_TEXTENCODING_DONTKNOW == eRet) @@ -194,7 +194,7 @@ rtl_TextEncoding lcl_GetStreamCharSet(rtl_TextEncoding eLoadEncoding) return eRet; } -void lcl_ConvertTabsToSpaces( String& rLine ) +static void lcl_ConvertTabsToSpaces( String& rLine ) { if ( rLine.Len() ) { diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 4993728dd569..eae63ecfb110 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -483,7 +483,7 @@ void SwView::SelectShell() extern "C" { - int lcl_CmpIds( const void *pFirst, const void *pSecond) + static int lcl_CmpIds( const void *pFirst, const void *pSecond) { return (*(sal_uInt16*)pFirst) - (*(sal_uInt16*)pSecond); } @@ -1135,7 +1135,7 @@ void SwView::WriteUserData( String &rUserData, sal_Bool bBrowse ) /*-------------------------------------------------------------------- Beschreibung: CursorPos setzen --------------------------------------------------------------------*/ -bool lcl_IsOwnDocument( SwView& rView ) +static bool lcl_IsOwnDocument( SwView& rView ) { uno::Reference<document::XDocumentPropertiesSupplier> xDPS( rView.GetDocShell()->GetModel(), uno::UNO_QUERY_THROW); diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index 3d171cad97a0..cde54d516ef4 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -160,13 +160,13 @@ sal_Bool SwView::IsMailMergeSourceView() const return pViewImpl->IsMailMergeSourceView(); } -sal_Bool lcl_IsViewMarks( const SwViewOption& rVOpt ) +static sal_Bool lcl_IsViewMarks( const SwViewOption& rVOpt ) { return rVOpt.IsHardBlank() && rVOpt.IsSoftHyph() && SwViewOption::IsFieldShadings(); } -void lcl_SetViewMarks(SwViewOption& rVOpt, sal_Bool bOn ) +static void lcl_SetViewMarks(SwViewOption& rVOpt, sal_Bool bOn ) { rVOpt.SetHardBlank(bOn); rVOpt.SetSoftHyph(bOn); @@ -174,7 +174,7 @@ void lcl_SetViewMarks(SwViewOption& rVOpt, sal_Bool bOn ) VIEWOPT_FIELD_SHADINGS, bOn, sal_True); } -void lcl_SetViewMetaChars( SwViewOption& rVOpt, sal_Bool bOn) +static void lcl_SetViewMetaChars( SwViewOption& rVOpt, sal_Bool bOn) { rVOpt.SetViewMetaChars( bOn ); if(bOn && !(rVOpt.IsParagraph() || diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index c2820ccf733f..950a03db3f63 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -1912,7 +1912,7 @@ sal_Bool SwView::JumpToSwMark( const String& rMark ) // Undo "Insert form file" crashes with documents imported from binary filter (.sdw) => disabled // Undo "Insert form file" crashes with (.odt) documents crashes if these documents contains // page styles with active header/footer => disabled for those documents -sal_uInt16 lcl_PageDescWithHeader( const SwDoc& rDoc ) +static sal_uInt16 lcl_PageDescWithHeader( const SwDoc& rDoc ) { sal_uInt16 nRet = 0; sal_uInt16 nCnt = rDoc.GetPageDescCnt(); @@ -2105,13 +2105,13 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe SfxObjectShellRef xDocSh; SfxObjectShellLock xLockRef; -extern int lcl_FindDocShell( SfxObjectShellRef& xDocSh, SfxObjectShellLock& xLockRef, + extern int sw_FindDocShell( SfxObjectShellRef& xDocSh, SfxObjectShellLock& xLockRef, const String& rFileName, const String& rPasswd, String& rFilter, sal_Int16 nVersion, SwDocShell* pDestSh ); String sFltNm; - int nRet = lcl_FindDocShell( xDocSh, xLockRef, pMedium->GetName(), aEmptyStr, + int nRet = sw_FindDocShell( xDocSh, xLockRef, pMedium->GetName(), aEmptyStr, sFltNm, nVersion, pDocSh ); if( nRet ) { diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index ca23cb7d09dc..e60273dcbeab 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -80,7 +80,7 @@ inline long GetLeftMargin( SwView &rView ) lRet + DOCUMENTBORDER + nLeftOfst; } -void lcl_GetPos(SwView* pView, +static void lcl_GetPos(SwView* pView, Point& rPos, SwScrollbar* pScrollbar, sal_Bool bBorder) diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx index c706424a9196..cbd2b17a1c6a 100644 --- a/sw/source/ui/uiview/viewtab.cxx +++ b/sw/source/ui/uiview/viewtab.cxx @@ -76,7 +76,7 @@ using namespace ::com::sun::star; /*-------------------------------------------------------------------- Beschreibung: Columns eintueten --------------------------------------------------------------------*/ -void lcl_FillSvxColumn(const SwFmtCol& rCol, +static void lcl_FillSvxColumn(const SwFmtCol& rCol, sal_uInt16 nTotalWidth, SvxColumnItem& rColItem, long nDistance) @@ -117,7 +117,7 @@ void lcl_FillSvxColumn(const SwFmtCol& rCol, /*-------------------------------------------------------------------- Beschreibung: ColumnItem in ColumnInfo ueberfuehren --------------------------------------------------------------------*/ -void lcl_ConvertToCols(const SvxColumnItem& rColItem, +static void lcl_ConvertToCols(const SvxColumnItem& rColItem, sal_uInt16 nTotalWidth, SwFmtCol& rCols) { @@ -167,7 +167,7 @@ void lcl_ConvertToCols(const SvxColumnItem& rColItem, /*-------------------------------------------------------------------- Beschreibung: Tabs loeschen --------------------------------------------------------------------*/ -void lcl_EraseDefTabs(SvxTabStopItem& rTabStops) +static void lcl_EraseDefTabs(SvxTabStopItem& rTabStops) { // Def Tabs loeschen for ( sal_uInt16 i = 0; i < rTabStops.Count(); ) @@ -203,7 +203,7 @@ void SwView::SwapPageMargin(const SwPageDesc& rDesc, SvxLRSpaceItem& rLRSpace) Beschreibung: Wenn der Rahmenrand verschoben wird, sollen die Spaltentrenner an der gleichen absoluten Position bleiben --------------------------------------------------------------------*/ -void lcl_Scale(long& nVal, long nScale) +static void lcl_Scale(long& nVal, long nScale) { nVal *= nScale; nVal >>= 8; diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index 8871cdda0a59..b60d7e40346b 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -134,7 +134,7 @@ enum SwDocumentSettingsPropertyHandles HANDLE_EMBED_SYSTEM_FONTS }; -MasterPropertySetInfo * lcl_createSettingsInfo() +static MasterPropertySetInfo * lcl_createSettingsInfo() { static PropertyInfo aWriterSettingsInfoMap[] = { diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx index 2089a79d499a..e4097ddd64d8 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -336,7 +336,7 @@ void SwXAutoTextGroup::renameByName(const OUString& aElementName, throw uno::RuntimeException(); } -sal_Bool lcl_CopySelToDoc( SwDoc* pInsDoc, OTextCursorHelper* pxCursor, SwXTextRange* pxRange) +static sal_Bool lcl_CopySelToDoc( SwDoc* pInsDoc, OTextCursorHelper* pxCursor, SwXTextRange* pxRange) { OSL_ENSURE( pInsDoc, "no InsDoc"); diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 52d989de90e7..addb0b0bff0a 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -162,9 +162,9 @@ using ::osl::FileBase; #define SW_CREATE_MARKER_TABLE 0x06 #define SW_CREATE_DRAW_DEFAULTS 0x07 -extern bool lcl_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds * pSrtLst ); +extern bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds * pSrtLst ); -SwPrintUIOptions * lcl_GetPrintUIOptions( +static SwPrintUIOptions * lcl_GetPrintUIOptions( SwDocShell * pDocShell, const SfxViewShell * pView ) { @@ -175,7 +175,7 @@ SwPrintUIOptions * lcl_GetPrintUIOptions( const bool bSwSrcView = NULL != dynamic_cast< const SwSrcView * >(pView); const SwView * pSwView = dynamic_cast< const SwView * >(pView); const bool bHasSelection = pSwView ? pSwView->HasSelection( sal_False ) : false; // check for any selection, not just text selection - const bool bHasPostIts = lcl_GetPostIts( pDocShell->GetDoc(), 0 ); + const bool bHasPostIts = sw_GetPostIts( pDocShell->GetDoc(), 0 ); // get default values to use in dialog from documents SwPrintData const SwPrintData &rPrintData = pDocShell->GetDoc()->getPrintData(); @@ -198,7 +198,7 @@ SwPrintUIOptions * lcl_GetPrintUIOptions( return new SwPrintUIOptions( nCurrentPage, bWebDoc, bSwSrcView, bHasSelection, bHasPostIts, rPrintData ); } -SwTxtFmtColl *lcl_GetParaStyle(const String& rCollName, SwDoc* pDoc) +static SwTxtFmtColl *lcl_GetParaStyle(const String& rCollName, SwDoc* pDoc) { SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName( rCollName ); if( !pColl ) @@ -210,7 +210,7 @@ SwTxtFmtColl *lcl_GetParaStyle(const String& rCollName, SwDoc* pDoc) return pColl; } -void lcl_DisposeView( SfxViewFrame* pToClose, SwDocShell* pDocShell ) +static void lcl_DisposeView( SfxViewFrame* pToClose, SwDocShell* pDocShell ) { // check if the view frame still exists SfxViewFrame* pFound = SfxViewFrame::GetFirst( pDocShell, @@ -1017,7 +1017,7 @@ Sequence< beans::PropertyValue > SwXTextDocument::getPagePrintSettings(void) return aSeq; } -sal_uInt32 lcl_Any_To_ULONG(const Any& rValue, sal_Bool& bException) +static sal_uInt32 lcl_Any_To_ULONG(const Any& rValue, sal_Bool& bException) { bException = sal_False; TypeClass eType = rValue.getValueType().getTypeClass(); @@ -1036,7 +1036,7 @@ sal_uInt32 lcl_Any_To_ULONG(const Any& rValue, sal_Bool& bException) return nRet; } -String lcl_CreateOutlineString( sal_uInt16 nIndex, +static String lcl_CreateOutlineString( sal_uInt16 nIndex, const SwOutlineNodes& rOutlineNodes, const SwNumRule* pOutlRule) { String sEntry; @@ -3608,7 +3608,7 @@ void SwXLinkNameAccessWrapper::setPropertyValue( throw UnknownPropertyException(); } -Any lcl_GetDisplayBitmap(String sLinkSuffix) +static Any lcl_GetDisplayBitmap(String sLinkSuffix) { Any aRet; if(sLinkSuffix.Len()) diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index 0a25804242cc..1aa6c1396434 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -97,7 +97,7 @@ using comphelper::HelperBaseNoState; using ::rtl::OUString; -SwPaM* lcl_createPamCopy(const SwPaM& rPam) +static SwPaM* lcl_createPamCopy(const SwPaM& rPam) { SwPaM *const pRet = new SwPaM(*rPam.GetPoint()); ::sw::DeepCopyPaM(rPam, *pRet); diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index c000e4c980d5..e07a695cc462 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -924,7 +924,7 @@ sal_Int8 SwContentTree::AcceptDrop( const AcceptDropEvent& rEvt ) /*************************************************************************** Beschreibung: Drop wird im Navigator ausgefuehrt ***************************************************************************/ -void* lcl_GetOutlineKey( SwContentTree* pTree, SwOutlineContent* pContent) +static void* lcl_GetOutlineKey( SwContentTree* pTree, SwOutlineContent* pContent) { void* key = 0; if( pTree && pContent ) diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index 1847ae927fd1..1786b13b6cf3 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -128,7 +128,7 @@ void SwNavigationPI::MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget, ------------------------------------------------------------------------*/ -void lcl_UnSelectFrm(SwWrtShell *pSh) +static void lcl_UnSelectFrm(SwWrtShell *pSh) { if (pSh->IsFrmSelected()) { diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx index 964405549817..034f6adfe4b5 100644 --- a/sw/source/ui/vba/vbaaddins.cxx +++ b/sw/source/ui/vba/vbaaddins.cxx @@ -36,7 +36,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext ) +static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext ) { XNamedObjectCollectionHelper< word::XAddin >::XNamedVec maAddins; diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index b934aacdd638..8cd8b4b48844 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -42,7 +42,7 @@ using namespace ::ooo::vba; using namespace css; -sal_Int8 lcl_toMSOPropType( const uno::Type& aType ) throw ( lang::IllegalArgumentException ) +static sal_Int8 lcl_toMSOPropType( const uno::Type& aType ) throw ( lang::IllegalArgumentException ) { sal_Int16 msoType = office::MsoDocProperties::msoPropertyTypeString; diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index e12cd591ee8f..794a77b959cc 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -276,7 +276,7 @@ bool _ReadFieldParams::GetTokenSttFromTo(sal_uInt16* pFrom, sal_uInt16* pTo, sal // *** SwVbaFields *********************************************** -uno::Any lcl_createField( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Any& aSource ) +static uno::Any lcl_createField( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Any& aSource ) { uno::Reference< text::XTextField > xTextField( aSource, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextDocument > xTextDocument( xModel, uno::UNO_QUERY_THROW ); diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index 862dd9df6338..b88c52a7e06c 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -13,7 +13,7 @@ using namespace ::ooo::vba; using namespace css; -uno::Reference< container::XIndexAccess > lcl_getTables( const uno::Reference< frame::XModel >& xDoc ) +static uno::Reference< container::XIndexAccess > lcl_getTables( const uno::Reference< frame::XModel >& xDoc ) { uno::Reference< container::XIndexAccess > xTables; uno::Reference< text::XTextTablesSupplier > xSupp( xDoc, uno::UNO_QUERY ); @@ -22,7 +22,7 @@ uno::Reference< container::XIndexAccess > lcl_getTables( const uno::Reference< f return xTables; } -uno::Any lcl_createTable( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xDocument, const uno::Any& aSource ) +static uno::Any lcl_createTable( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xDocument, const uno::Any& aSource ) { uno::Reference< text::XTextTable > xTextTable( aSource, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextDocument > xTextDocument( xDocument, uno::UNO_QUERY_THROW ); @@ -30,7 +30,7 @@ uno::Any lcl_createTable( const uno::Reference< XHelperInterface >& xParent, con return uno::makeAny( xTable ); } -sal_Bool lcl_isInHeaderFooter( const uno::Reference< text::XTextTable >& xTable ) +static sal_Bool lcl_isInHeaderFooter( const uno::Reference< text::XTextTable >& xTable ) { uno::Reference< text::XTextContent > xTextContent( xTable, uno::UNO_QUERY_THROW ); uno::Reference< text::XText > xText = xTextContent->getAnchor()->getText(); diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index 486bb2101f4f..4a05aba38f95 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -34,14 +34,14 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -uno::Sequence< style::TabStop > lcl_getTabStops( const uno::Reference< beans::XPropertySet >& xParaProps ) throw (uno::RuntimeException) +static uno::Sequence< style::TabStop > lcl_getTabStops( const uno::Reference< beans::XPropertySet >& xParaProps ) throw (uno::RuntimeException) { uno::Sequence< style::TabStop > aSeq; xParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaTabStops") ) ) >>= aSeq; return aSeq; } -void lcl_setTabStops( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Sequence< style::TabStop >& aSeq ) throw (uno::RuntimeException) +static void lcl_setTabStops( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Sequence< style::TabStop >& aSeq ) throw (uno::RuntimeException) { xParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaTabStops") ), uno::makeAny( aSeq ) ); } diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx index 0ce1817911f3..ba336a0a9da7 100644 --- a/sw/source/ui/vba/vbatemplate.cxx +++ b/sw/source/ui/vba/vbatemplate.cxx @@ -38,7 +38,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -String lcl_CheckGroupName( const String& rGroupName ) +static String lcl_CheckGroupName( const String& rGroupName ) { String sRet; //group name should contain only A-Z and a-z and spaces diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index 6af983eca410..b2145da87e81 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -144,7 +144,7 @@ using namespace com::sun::star; mbRetainSelection = sal_False; -SvxAutoCorrect* lcl_IsAutoCorr() +static SvxAutoCorrect* lcl_IsAutoCorr() { SvxAutoCorrect* pACorr = SvxAutoCorrCfg::Get().GetAutoCorrect(); if( pACorr && !pACorr->IsAutoCorrFlag( CptlSttSntnc | CptlSttWrd | |