diff options
Diffstat (limited to 'basic/source/runtime')
-rw-r--r-- | basic/source/runtime/methods.cxx | 12 | ||||
-rw-r--r-- | basic/source/runtime/methods1.cxx | 14 | ||||
-rw-r--r-- | basic/source/runtime/runtime.cxx | 6 |
3 files changed, 16 insertions, 16 deletions
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]; |