From f7a24eff2d40ca30c6f299ab6534393c5c146b95 Mon Sep 17 00:00:00 2001
From: Luboš Luňák <l.lunak@suse.cz>
Date: Fri, 12 Oct 2012 13:26:46 +0200
Subject: 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: I231f0b367bf0b513c6c1ce4c4cfdb7c3dc8660d5
---
 basic/source/classes/sbunoobj.cxx | 8 ++++----
 basic/source/runtime/methods1.cxx | 6 +++---
 basic/source/runtime/step0.cxx    | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'basic')

diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 6735dfe6299c..cd43e1b4c6bd 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -494,7 +494,7 @@ void clearNativeObjectWrapperVector( void )
     GaNativeObjectWrapperVector::get().clear();
 }
 
-sal_uInt32 lcl_registerNativeObjectWrapper( SbxObject* pNativeObj )
+static sal_uInt32 lcl_registerNativeObjectWrapper( SbxObject* pNativeObj )
 {
     NativeObjectWrapperVector &rNativeObjectWrapperVector = GaNativeObjectWrapperVector::get();
     sal_uInt32 nIndex = rNativeObjectWrapperVector.size();
@@ -502,7 +502,7 @@ sal_uInt32 lcl_registerNativeObjectWrapper( SbxObject* pNativeObj )
     return nIndex;
 }
 
-SbxObject* lcl_getNativeObject( sal_uInt32 nIndex )
+static SbxObject* lcl_getNativeObject( sal_uInt32 nIndex )
 {
     SbxObjectRef xRetObj;
     NativeObjectWrapperVector &rNativeObjectWrapperVector = GaNativeObjectWrapperVector::get();
@@ -4552,7 +4552,7 @@ typedef std::vector< StarBasicDisposeItem* > DisposeItemVector;
 
 static DisposeItemVector GaDisposeItemVector;
 
-DisposeItemVector::iterator lcl_findItemForBasic( StarBASIC* pBasic )
+static DisposeItemVector::iterator lcl_findItemForBasic( StarBASIC* pBasic )
 {
     DisposeItemVector::iterator it;
     for( it = GaDisposeItemVector.begin() ; it != GaDisposeItemVector.end() ; ++it )
@@ -4564,7 +4564,7 @@ DisposeItemVector::iterator lcl_findItemForBasic( StarBASIC* pBasic )
     return GaDisposeItemVector.end();
 }
 
-StarBasicDisposeItem* lcl_getOrCreateItemForBasic( StarBASIC* pBasic )
+static StarBasicDisposeItem* lcl_getOrCreateItemForBasic( StarBASIC* pBasic )
 {
     DisposeItemVector::iterator it = lcl_findItemForBasic( pBasic );
     StarBasicDisposeItem* pItem = (it != GaDisposeItemVector.end()) ? *it : NULL;
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 4692ca49d47d..7072c09cb3d7 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -915,7 +915,7 @@ RTLFUNC(FindPropertyObject)
 
 
 
-sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
+static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
     sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray )
 {
     sal_uIntPtr nFPos = pStrm->Tell();
@@ -1001,7 +1001,7 @@ sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
     return pStrm->GetErrorCode() ? sal_False : sal_True;
 }
 
-sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
+static sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
     sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray )
 {
     (void)bBinary;
@@ -1111,7 +1111,7 @@ sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
 
 
 // nCurDim = 1...n
-sal_Bool lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
+static sal_Bool lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
     sal_Bool bBinary, short nCurDim, short* pOtherDims, sal_Bool bWrite )
 {
     DBG_ASSERT( nCurDim > 0,"Bad Dim");
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index 40d8f6982fcb..05a2759af4ef 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -43,8 +43,8 @@ Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl::
 
 // for a patch forward declaring these methods below makes sense
 // but, #FIXME lets really just move the methods to the top
-void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType );
-void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled );
+static void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType );
+static void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled );
 
 SbxVariable* getDefaultProp( SbxVariable* pRef );
 
@@ -972,7 +972,7 @@ void SbiRuntime::StepREDIMP_ERASE()
         refVar->SetType( SbxEMPTY );
 }
 
-void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType )
+static void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType )
 {
     sal_uInt16 nSavFlags = refVar->GetFlags();
     refVar->ResetFlag( SBX_FIXED );
@@ -981,7 +981,7 @@ void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType )
     refVar->Clear();
 }
 
-void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled )
+static void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled )
 {
     SbxDataType eType = refVar->GetType();
     if( eType & SbxARRAY )
-- 
cgit