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

11 files changed, 22 insertions, 22 deletions

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: