New loplugin:external

...warning about (for now only) functions and variables with external linkage
that likely don't need it.

The problems with moving entities into unnamed namespacs and breaking ADL
(as alluded to in comments in compilerplugins/clang/external.cxx) are
illustrated by the fact that while

  struct S1 { int f() { return 0; } };
  int f(S1 s) { return s.f(); }
  namespace N {
    struct S2: S1 { int f() { return 1; } };
    int f(S2 s) { return s.f(); }
  }
  int main() { return f(N::S2()); }

returns 1, both moving just the struct S2 into an nunnamed namespace,

  struct S1 { int f() { return 0; } };
  int f(S1 s) { return s.f(); }
  namespace N {
    namespace { struct S2: S1 { int f() { return 1; } }; }
    int f(S2 s) { return s.f(); }
  }
  int main() { return f(N::S2()); }

as well as moving just the function f overload into an unnamed namespace,

  struct S1 { int f() { return 0; } };
  int f(S1 s) { return s.f(); }
  namespace N {
    struct S2: S1 { int f() { return 1; } };
    namespace { int f(S2 s) { return s.f(); } }
  }
  int main() { return f(N::S2()); }

would each change the program to return 0 instead.

Change-Id: I4d09f7ac5e8f9bcd6e6bde4712608444b642265c
Reviewed-on: https://gerrit.libreoffice.org/60539
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

12 files changed, 60 insertions, 60 deletions

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 08e13d857eae..c404b7b893c6 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -497,7 +497,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const OUString& rBaseURL, Star
     }
 }
 
-void copyToLibraryContainer( StarBASIC* pBasic, const LibraryContainerInfo& rInfo )
+static void copyToLibraryContainer( StarBASIC* pBasic, const LibraryContainerInfo& rInfo )
 {
     uno::Reference< script::XLibraryContainer > xScriptCont( rInfo.mxScriptCont.get() );
     if ( !xScriptCont.is() )
@@ -1771,7 +1771,7 @@ void ModuleContainer_Impl::removeByName( const OUString& Name )
 }
 
 
-uno::Sequence< sal_Int8 > implGetDialogData( SbxObject* pDialog )
+static uno::Sequence< sal_Int8 > implGetDialogData( SbxObject* pDialog )
 {
     SvMemoryStream aMemStream;
     pDialog->Store( aMemStream );
@@ -1784,7 +1784,7 @@ uno::Sequence< sal_Int8 > implGetDialogData( SbxObject* pDialog )
     return aData;
 }
 
-SbxObject* implCreateDialog( const uno::Sequence< sal_Int8 >& aData )
+static SbxObject* implCreateDialog( const uno::Sequence< sal_Int8 >& aData )
 {
     sal_Int8* pData = const_cast< uno::Sequence< sal_Int8 >& >(aData).getArray();
     SvMemoryStream aMemStream( pData, aData.getLength(), StreamMode::READ );
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index a2a340a84eb4..28667187513e 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -68,13 +68,13 @@ void SbiImage::Clear()
     bError     = false;
 }
 
-bool SbiGood( SvStream const & r )
+static bool SbiGood( SvStream const & r )
 {
     return r.good();
 }
 
 // Open Record
-sal_uInt64 SbiOpenRecord( SvStream& r, FileOffset nSignature, sal_uInt16 nElem )
+static sal_uInt64 SbiOpenRecord( SvStream& r, FileOffset nSignature, sal_uInt16 nElem )
 {
     sal_uInt64 nPos = r.Tell();
     r.WriteUInt16( static_cast<sal_uInt16>( nSignature ) )
@@ -83,7 +83,7 @@ sal_uInt64 SbiOpenRecord( SvStream& r, FileOffset nSignature, sal_uInt16 nElem )
 }
 
 // Close Record
-void SbiCloseRecord( SvStream& r, sal_uInt64 nOff )
+static void SbiCloseRecord( SvStream& r, sal_uInt64 nOff )
 {
     sal_uInt64 nPos = r.Tell();
     r.Seek( nOff + 2 );
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index a83bcd3c3961..3e9df83c4df7 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -160,14 +160,14 @@ void SetSbUnoObjectDfltPropName( SbxObject* pObj )
 }
 
 // save CoreReflection statically
-Reference< XIdlReflection > getCoreReflection_Impl()
+static Reference< XIdlReflection > getCoreReflection_Impl()
 {
     return css::reflection::theCoreReflection::get(
         comphelper::getProcessComponentContext());
 }
 
 // save CoreReflection statically
-Reference< XHierarchicalNameAccess > const & getCoreReflection_HierarchicalNameAccess_Impl()
+static Reference< XHierarchicalNameAccess > const & getCoreReflection_HierarchicalNameAccess_Impl()
 {
     static Reference< XHierarchicalNameAccess > xCoreReflection_HierarchicalNameAccess;
 
@@ -184,7 +184,7 @@ Reference< XHierarchicalNameAccess > const & getCoreReflection_HierarchicalNameA
 }
 
 // Hold TypeProvider statically
-Reference< XHierarchicalNameAccess > const & getTypeProvider_Impl()
+static Reference< XHierarchicalNameAccess > const & getTypeProvider_Impl()
 {
     static Reference< XHierarchicalNameAccess > xAccess;
 
@@ -210,7 +210,7 @@ Reference< XHierarchicalNameAccess > const & getTypeProvider_Impl()
 }
 
 // Hold TypeConverter statically
-Reference< XTypeConverter > const & getTypeConverter_Impl()
+static Reference< XTypeConverter > const & getTypeConverter_Impl()
 {
     static Reference< XTypeConverter > xTypeConverter;
 
@@ -287,7 +287,7 @@ namespace
     }
 }
 
-void implAppendExceptionMsg( OUStringBuffer& _inout_rBuffer, const Exception& _e, const OUString& _rExceptionType, sal_Int32 _nLevel )
+static void implAppendExceptionMsg( OUStringBuffer& _inout_rBuffer, const Exception& _e, const OUString& _rExceptionType, sal_Int32 _nLevel )
 {
     _inout_rBuffer.append( "\n" );
     lcl_indent( _inout_rBuffer, _nLevel );
@@ -306,14 +306,14 @@ void implAppendExceptionMsg( OUStringBuffer& _inout_rBuffer, const Exception& _e
 }
 
 // construct an error message for the exception
-OUString implGetExceptionMsg( const Exception& e, const OUString& aExceptionType_ )
+static OUString implGetExceptionMsg( const Exception& e, const OUString& aExceptionType_ )
 {
     OUStringBuffer aMessageBuf;
     implAppendExceptionMsg( aMessageBuf, e, aExceptionType_, 0 );
     return aMessageBuf.makeStringAndClear();
 }
 
-OUString implGetExceptionMsg( const Any& _rCaughtException )
+static OUString implGetExceptionMsg( const Any& _rCaughtException )
 {
     auto e = o3tl::tryAccess<Exception>(_rCaughtException);
     OSL_PRECOND( e, "implGetExceptionMsg: illegal argument!" );
@@ -324,7 +324,7 @@ OUString implGetExceptionMsg( const Any& _rCaughtException )
     return implGetExceptionMsg( *e, _rCaughtException.getValueTypeName() );
 }
 
-Any convertAny( const Any& rVal, const Type& aDestType )
+static Any convertAny( const Any& rVal, const Type& aDestType )
 {
     Any aConvertedVal;
     Reference< XTypeConverter > xConverter = getTypeConverter_Impl();
@@ -352,25 +352,25 @@ Any convertAny( const Any& rVal, const Type& aDestType )
 
 
 // TODO: source out later
-Reference<XIdlClass> TypeToIdlClass( const Type& rType )
+static Reference<XIdlClass> TypeToIdlClass( const Type& rType )
 {
     return getCoreReflection_Impl()->forName(rType.getTypeName());
 }
 
 // Exception type unknown
 template< class EXCEPTION >
-OUString implGetExceptionMsg( const EXCEPTION& e )
+static OUString implGetExceptionMsg( const EXCEPTION& e )
 {
     return implGetExceptionMsg( e, cppu::UnoType<decltype(e)>::get().getTypeName() );
 }
 
-void implHandleBasicErrorException( BasicErrorException const & e )
+static void implHandleBasicErrorException( BasicErrorException const & e )
 {
     ErrCode nError = StarBASIC::GetSfxFromVBError( static_cast<sal_uInt16>(e.ErrorCode) );
     StarBASIC::Error( nError, e.ErrorMessageArgument );
 }
 
-void implHandleWrappedTargetException( const Any& _rWrappedTargetException )
+static void implHandleWrappedTargetException( const Any& _rWrappedTargetException )
 {
     Any aExamine( _rWrappedTargetException );
 
@@ -477,7 +477,7 @@ static SbxObject* lcl_getNativeObject( sal_uInt32 nIndex )
 }
 
 // convert from Uno to Sbx
-SbxDataType unoToSbxType( TypeClass eType )
+static SbxDataType unoToSbxType( TypeClass eType )
 {
     SbxDataType eRetType = SbxVOID;
 
@@ -512,7 +512,7 @@ SbxDataType unoToSbxType( TypeClass eType )
     return eRetType;
 }
 
-SbxDataType unoToSbxType( const Reference< XIdlClass >& xIdlClass )
+static SbxDataType unoToSbxType( const Reference< XIdlClass >& xIdlClass )
 {
     SbxDataType eRetType = SbxVOID;
     if( xIdlClass.is() )
@@ -812,7 +812,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
 }
 
 // Deliver the reflection for Sbx types
-Type getUnoTypeForSbxBaseType( SbxDataType eType )
+static Type getUnoTypeForSbxBaseType( SbxDataType eType )
 {
     Type aRetType = cppu::UnoType<void>::get();
     switch( eType )
@@ -848,7 +848,7 @@ Type getUnoTypeForSbxBaseType( SbxDataType eType )
 }
 
 // Converting of Sbx to Uno without a know target class for TypeClass_ANY
-Type getUnoTypeForSbxValue( const SbxValue* pVal )
+static Type getUnoTypeForSbxValue( const SbxValue* pVal )
 {
     Type aRetType = cppu::UnoType<void>::get();
     if( !pVal )
@@ -973,7 +973,7 @@ Type getUnoTypeForSbxValue( const SbxValue* pVal )
 }
 
 // converting of Sbx to Uno without known target class for TypeClass_ANY
-Any sbxToUnoValueImpl( const SbxValue* pVar, bool bBlockConversionToSmallestType = false )
+static Any sbxToUnoValueImpl( const SbxValue* pVar, bool bBlockConversionToSmallestType = false )
 {
     SbxDataType eBaseType = pVar->SbxValue::GetType();
     if( eBaseType == SbxOBJECT )
@@ -1449,7 +1449,7 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property const * pUn
     return aRetVal;
 }
 
-void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, sal_uInt32 nParamCount )
+static void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, sal_uInt32 nParamCount )
 {
     AutomationNamedArgsSbxArray* pArgNamesArray = dynamic_cast<AutomationNamedArgsSbxArray*>( pParams );
 
@@ -1498,7 +1498,7 @@ enum class INVOKETYPE
    GetProp = 0,
    Func
 };
-Any invokeAutomationMethod( const OUString& Name, Sequence< Any > const & args, SbxArray* pParams, sal_uInt32 nParamCount, Reference< XInvocation > const & rxInvocation, INVOKETYPE invokeType )
+static Any invokeAutomationMethod( const OUString& Name, Sequence< Any > const & args, SbxArray* pParams, sal_uInt32 nParamCount, Reference< XInvocation > const & rxInvocation, INVOKETYPE invokeType )
 {
     Sequence< sal_Int16 > OutParamIndex;
     Sequence< Any > OutParam;
@@ -1536,7 +1536,7 @@ Any invokeAutomationMethod( const OUString& Name, Sequence< Any > const & args,
 }
 
 // Debugging help method to readout the imlemented interfaces of an object
-OUString Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, sal_uInt16 nRekLevel )
+static OUString Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, sal_uInt16 nRekLevel )
 {
     Type aIfaceType = cppu::UnoType<XInterface>::get();
     static Reference< XIdlClass > xIfaceClass = TypeToIdlClass( aIfaceType );
@@ -1572,7 +1572,7 @@ OUString Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Referenc
     return aRetStr.makeStringAndClear();
 }
 
-OUString getDbgObjectNameImpl(SbUnoObject& rUnoObj)
+static OUString getDbgObjectNameImpl(SbUnoObject& rUnoObj)
 {
     OUString aName = rUnoObj.GetClassName();
     if( aName.isEmpty() )
@@ -1589,7 +1589,7 @@ OUString getDbgObjectNameImpl(SbUnoObject& rUnoObj)
     return aName;
 }
 
-OUString getDbgObjectName(SbUnoObject& rUnoObj)
+static OUString getDbgObjectName(SbUnoObject& rUnoObj)
 {
     OUString aName = getDbgObjectNameImpl(rUnoObj);
     if( aName.isEmpty() )
@@ -1711,7 +1711,7 @@ bool checkUnoObjectType(SbUnoObject& rUnoObj, const OUString& rClass)
 }
 
 // Debugging help method to readout the imlemented interfaces of an object
-OUString Impl_GetSupportedInterfaces(SbUnoObject& rUnoObj)
+static OUString Impl_GetSupportedInterfaces(SbUnoObject& rUnoObj)
 {
     Any aToInspectObj = rUnoObj.getUnoAny();
 
@@ -1762,7 +1762,7 @@ OUString Impl_GetSupportedInterfaces(SbUnoObject& rUnoObj)
 
 
 // Debugging help method SbxDataType -> String
-OUString Dbg_SbxDataType2String( SbxDataType eType )
+static OUString Dbg_SbxDataType2String( SbxDataType eType )
 {
     OUStringBuffer aRet;
     switch( +eType )
@@ -1806,7 +1806,7 @@ OUString Dbg_SbxDataType2String( SbxDataType eType )
 }
 
 // Debugging help method to display the properties of a SbUnoObjects
-OUString Impl_DumpProperties(SbUnoObject& rUnoObj)
+static OUString Impl_DumpProperties(SbUnoObject& rUnoObj)
 {
     OUStringBuffer aRet;
     aRet.append("Properties of object ");
@@ -1883,7 +1883,7 @@ OUString Impl_DumpProperties(SbUnoObject& rUnoObj)
 }
 
 // Debugging help method to display the methods of an SbUnoObjects
-OUString Impl_DumpMethods(SbUnoObject& rUnoObj)
+static OUString Impl_DumpMethods(SbUnoObject& rUnoObj)
 {
     OUStringBuffer aRet;
     aRet.append("Methods of object ");
@@ -2826,7 +2826,7 @@ Any SbUnoObject::getUnoAny()
 }
 
 // help method to create an Uno-Struct per CoreReflection
-SbUnoObject* Impl_CreateUnoStruct( const OUString& aClassName )
+static SbUnoObject* Impl_CreateUnoStruct( const OUString& aClassName )
 {
     // get CoreReflection
     Reference< XIdlReflection > xCoreReflection = getCoreReflection_Impl();
@@ -3181,7 +3181,7 @@ void RTL_Impl_EqualUnoObjects( SbxArray& rPar )
 // if it fails for whatever reason
 // returned Reference<> be null e.g. .is() will be false
 
-Reference< XTypeDescriptionEnumeration > getTypeDescriptorEnumeration( const OUString& sSearchRoot,
+static Reference< XTypeDescriptionEnumeration > getTypeDescriptorEnumeration( const OUString& sSearchRoot,
                                                                        const Sequence< TypeClass >& types,
                                                                        TypeDescriptionSearchDepth depth )
 {
@@ -3893,7 +3893,7 @@ private:
 
 
 // Function to replace AllListenerAdapterService::createAllListerAdapter
-Reference< XInterface > createAllListenerAdapter
+static Reference< XInterface > createAllListenerAdapter
 (
     const Reference< XInvocationAdapterFactory2 >& xInvocationAdapterFactory,
     const Reference< XIdlClass >& xListenerType,
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 559c1649337f..c9663ef08bd0 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -395,7 +395,7 @@ uno::Reference< frame::XModel > getDocumentModel( StarBASIC* pb )
     return xModel;
 }
 
-uno::Reference< vba::XVBACompatibility > getVBACompatibility( const uno::Reference< frame::XModel >& rxModel )
+static uno::Reference< vba::XVBACompatibility > getVBACompatibility( const uno::Reference< frame::XModel >& rxModel )
 {
     uno::Reference< vba::XVBACompatibility > xVBACompat;
     try
@@ -409,7 +409,7 @@ uno::Reference< vba::XVBACompatibility > getVBACompatibility( const uno::Referen
     return xVBACompat;
 }
 
-bool getDefaultVBAMode( StarBASIC* pb )
+static bool getDefaultVBAMode( StarBASIC* pb )
 {
     uno::Reference< frame::XModel > xModel( getDocumentModel( pb ) );
     if (!xModel.is())
@@ -929,7 +929,7 @@ static void SendHint( SbxObject* pObj, SfxHintId nId, SbMethod* p )
 
 // #57841 Clear Uno-Objects, which were helt in RTL functions,
 // at the end of the program, so that nothing were helt.
-void ClearUnoObjectsInRTL_Impl_Rek( StarBASIC* pBasic )
+static void ClearUnoObjectsInRTL_Impl_Rek( StarBASIC* pBasic )
 {
     // delete the return value of CreateUnoService
     SbxVariable* pVar = pBasic->GetRtl()->Find( "CreateUnoService", SbxClassType::Method );
@@ -969,7 +969,7 @@ void ClearUnoObjectsInRTL_Impl_Rek( StarBASIC* pBasic )
     }
 }
 
-void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic )
+static void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic )
 {
     // #67781 Delete return values of the Uno-methods
     clearUnoMethods();
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 553f9707a060..caca02573343 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -830,7 +830,7 @@ void SbiParser::Option()
     }
 }
 
-void addStringConst( SbiSymPool& rPool, const OUString& pSym, const OUString& rStr )
+static void addStringConst( SbiSymPool& rPool, const OUString& pSym, const OUString& rStr )
 {
     SbiConstDef* pConst = new SbiConstDef( pSym );
     pConst->SetType( SbxSTRING );
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index b9bdbec05748..629e3728980c 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -327,7 +327,7 @@ void SbRtl_Asc(StarBASIC *, SbxArray & rPar, bool)
     }
 }
 
-void implChr( SbxArray& rPar, bool bChrW )
+static void implChr( SbxArray& rPar, bool bChrW )
 {
     if ( rPar.Count() < 2 )
     {
@@ -631,7 +631,7 @@ void SbRtl_MkDir(StarBASIC * pBasic, SbxArray & rPar, bool bWrite)
 
 // In OSL only empty directories can be deleted
 // so we have to delete all files recursively
-void implRemoveDirRecursive( const OUString& aDirPath )
+static void implRemoveDirRecursive( const OUString& aDirPath )
 {
     DirectoryItem aItem;
     FileBase::RC nRet = DirectoryItem::get( aDirPath, aItem );
@@ -2521,7 +2521,7 @@ void SbRtl_IsMissing(StarBASIC *, SbxArray & rPar, bool)
 }
 
 // Function looks for wildcards, removes them and always returns the pure path
-OUString implSetupWildcard( const OUString& rFileParam, SbiRTLData* pRTLData )
+static OUString implSetupWildcard( const OUString& rFileParam, SbiRTLData* pRTLData )
 {
     static sal_Char cDelim1 = '/';
     static sal_Char cDelim2 = '\\';
@@ -2587,7 +2587,7 @@ OUString implSetupWildcard( const OUString& rFileParam, SbiRTLData* pRTLData )
     return aPathStr;
 }
 
-inline bool implCheckWildcard( const OUString& rName, SbiRTLData const * pRTLData )
+static inline bool implCheckWildcard( const OUString& rName, SbiRTLData const * pRTLData )
 {
     bool bMatch = true;
 
@@ -2599,7 +2599,7 @@ inline bool implCheckWildcard( const OUString& rName, SbiRTLData const * pRTLDat
 }
 
 
-bool isRootDir( const OUString& aDirURLStr )
+static bool isRootDir( const OUString& aDirURLStr )
 {
     INetURLObject aDirURLObj( aDirURLStr );
     bool bRoot = false;
@@ -3725,7 +3725,7 @@ OUString getBasicTypeName( SbxDataType eType )
     return OUString::createFromAscii(pTypeNames[nPos]);
 }
 
-OUString getObjectTypeName( SbxVariable* pVar )
+static OUString getObjectTypeName( SbxVariable* pVar )
 {
     OUString sRet( "Object" );
     if ( pVar )
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 7f5ab0233096..514c8e1e85b0 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1127,7 +1127,7 @@ static bool lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
     return true;
 }
 
-void PutGet( SbxArray& rPar, bool bPut )
+static void PutGet( SbxArray& rPar, bool bPut )
 {
     if ( rPar.Count() != 4 )
     {
@@ -1802,7 +1802,7 @@ struct IntervalInfo
     bool        mbSimple;
 };
 
-IntervalInfo const * getIntervalInfo( const OUString& rStringCode )
+static IntervalInfo const * getIntervalInfo( const OUString& rStringCode )
 {
     static IntervalInfo const aIntervalTable[] =
     {
@@ -1828,7 +1828,7 @@ IntervalInfo const * getIntervalInfo( const OUString& rStringCode )
     return nullptr;
 }
 
-inline void implGetDayMonthYear( sal_Int16& rnYear, sal_Int16& rnMonth, sal_Int16& rnDay, double dDate )
+static inline void implGetDayMonthYear( sal_Int16& rnYear, sal_Int16& rnMonth, sal_Int16& rnDay, double dDate )
 {
     rnDay   = implGetDateDay( dDate );
     rnMonth = implGetDateMonth( dDate );
@@ -1840,7 +1840,7 @@ inline void implGetDayMonthYear( sal_Int16& rnYear, sal_Int16& rnMonth, sal_Int1
     @return the year number, truncated if necessary and in that case also
             rMonth and rDay adjusted.
  */
-inline sal_Int16 limitDate( sal_Int32 n32Year, sal_Int16& rMonth, sal_Int16& rDay )
+static inline sal_Int16 limitDate( sal_Int32 n32Year, sal_Int16& rMonth, sal_Int16& rDay )
 {
     if( n32Year > SAL_MAX_INT16 )
     {
@@ -1957,7 +1957,7 @@ void SbRtl_DateAdd(StarBASIC *, SbxArray & rPar, bool)
     rPar.Get(0)->PutDate( dNewDate );
 }
 
-inline double RoundImpl( double d )
+static inline double RoundImpl( double d )
 {
     return ( d >= 0 ) ? floor( d + 0.5 ) : -floor( -d + 0.5 );
 }
@@ -2087,7 +2087,7 @@ void SbRtl_DateDiff(StarBASIC *, SbxArray & rPar, bool)
     rPar.Get(0)->PutDouble( dRet );
 }
 
-double implGetDateOfFirstDayInFirstWeek
+static double implGetDateOfFirstDayInFirstWeek
     ( sal_Int16 nYear, sal_Int16& nFirstDay, sal_Int16& nFirstWeek, bool* pbError = nullptr )
 {
     ErrCode nError = ERRCODE_NONE;
@@ -2438,7 +2438,7 @@ void SbRtl_Round(StarBASIC *, SbxArray & rPar, bool)
     rPar.Get(0)->PutDouble( dRes );
 }
 
-void CallFunctionAccessFunction( const Sequence< Any >& aArgs, const OUString& sFuncName, SbxVariable* pRet )
+static void CallFunctionAccessFunction( const Sequence< Any >& aArgs, const OUString& sFuncName, SbxVariable* pRet )
 {
     static Reference< XFunctionAccess > xFunc;
     try
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index eb94a927be03..b8d16c79578e 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1568,7 +1568,7 @@ void SbiRuntime::StepGET()
 }
 
 // #67607 copy Uno-Structs
-inline bool checkUnoStructCopy( bool bVBA, SbxVariableRef const & refVal, SbxVariableRef const & refVar )
+static inline bool checkUnoStructCopy( bool bVBA, SbxVariableRef const & refVal, SbxVariableRef const & refVar )
 {
     SbxDataType eVarType = refVar->GetType();
     SbxDataType eValType = refVal->GetType();
@@ -2155,7 +2155,7 @@ void SbiRuntime::StepREDIM()
 
 
 // Helper function for StepREDIMP
-void implCopyDimArray( SbxDimArray* pNewArray, SbxDimArray* pOldArray, short nMaxDimIndex,
+static void implCopyDimArray( SbxDimArray* pNewArray, SbxDimArray* pOldArray, short nMaxDimIndex,
     short nActualDim, sal_Int32* pActualIndices, sal_Int32* pLowerBounds, sal_Int32* pUpperBounds )
 {
     sal_Int32& ri = pActualIndices[nActualDim];
@@ -4282,7 +4282,7 @@ void SbiRuntime::StepDCREATE_REDIMP( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 
 
 // Helper function for StepDCREATE_IMPL / bRedimp = true
-void implCopyDimArray_DCREATE( SbxDimArray* pNewArray, SbxDimArray* pOldArray, short nMaxDimIndex,
+static void implCopyDimArray_DCREATE( SbxDimArray* pNewArray, SbxDimArray* pOldArray, short nMaxDimIndex,
     short nActualDim, sal_Int32* pActualIndices, sal_Int32* pLowerBounds, sal_Int32* pUpperBounds )
 {
     sal_Int32& ri = pActualIndices[nActualDim];
diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx
index 6e61a9af0ae3..69d917ae3a1f 100644
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -80,7 +80,7 @@ COMMENT: Visual-Basic treats the following (invalid) format-strings
 //          be generated. That's a StarBasic 'extension'.
 
 
-double get_number_of_digits( double dNumber )
+static double get_number_of_digits( double dNumber )
 //double floor_log10_fabs( double dNumber )
 {
     if( dNumber==0.0 )
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 081d5b4735a5..97c52b174ed0 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -66,7 +66,7 @@ void ImpGetIntntlSep( sal_Unicode& rcDecimalSep, sal_Unicode& rcThousandSep, sal
     terminating NULL character to be part of the string and returns bool
     instead of pointer, if character is 0 returns false.
  */
-bool ImpStrChr( const sal_Unicode* p, sal_Unicode c )
+static bool ImpStrChr( const sal_Unicode* p, sal_Unicode c )
 {
     if (!c)
         return false;
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 8757f01df6a9..7165a99b4fc0 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -111,7 +111,7 @@ bool SfxDialogLibraryContainer::isLibraryElementValid(const Any& rElement) const
     return SfxDialogLibrary::containsValidDialog(rElement);
 }
 
-bool writeOasis2OOoLibraryElement(
+static bool writeOasis2OOoLibraryElement(
     const Reference< XInputStream >& xInput, const Reference< XOutputStream >& xOutput )
 {
     Reference< XComponentContext > xContext(
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index f72ad68c518e..520318c92e54 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -534,7 +534,7 @@ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString&
 }
 
 
-void setStreamKey( const uno::Reference< io::XStream >& xStream, const OUString& aPass )
+static void setStreamKey( const uno::Reference< io::XStream >& xStream, const OUString& aPass )
 {
     uno::Reference< embed::XEncryptionProtectedSource > xEncrStream( xStream, uno::UNO_QUERY );
     if ( xEncrStream.is() )