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

33 files changed, 99 insertions, 99 deletions

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 )