From eea3f508c35f8f391825761ab6e1f3fbfb2fd0c1 Mon Sep 17 00:00:00 2001 From: Wastack Date: Thu, 31 Mar 2016 08:45:27 +0200 Subject: tdf#97966 Drop 'static' keywords Including no keywords from extern "C" blocks Change-Id: I87f2ed75888b51ec9e0cb75566bf7c2351b479b4 Reviewed-on: https://gerrit.libreoffice.org/23675 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- sc/source/core/data/cellvalue.cxx | 2 +- sc/source/core/data/formulacell.cxx | 18 +++++++++--------- sc/source/core/tool/interpr1.cxx | 4 ++-- sc/source/filter/xcl97/xcl97rec.cxx | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'sc') diff --git a/sc/source/core/data/cellvalue.cxx b/sc/source/core/data/cellvalue.cxx index 5da5e08e9cc5..bba0b956fed3 100644 --- a/sc/source/core/data/cellvalue.cxx +++ b/sc/source/core/data/cellvalue.cxx @@ -103,7 +103,7 @@ bool equalsWithoutFormatImpl( const _T& left, const _T& right ) return false; } -static void commitToColumn( const ScCellValue& rCell, ScColumn& rColumn, SCROW nRow ) +void commitToColumn( const ScCellValue& rCell, ScColumn& rColumn, SCROW nRow ) { switch (rCell.meType) { diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index e234bf0b4ab4..7d618a5fd7b6 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -223,24 +223,24 @@ using std::deque; typedef SCCOLROW(*DimensionSelector)(const ScAddress&, const ScSingleRefData&); -static SCCOLROW lcl_GetCol(const ScAddress& rPos, const ScSingleRefData& rData) +SCCOLROW lcl_GetCol(const ScAddress& rPos, const ScSingleRefData& rData) { return rData.toAbs(rPos).Col(); } -static SCCOLROW lcl_GetRow(const ScAddress& rPos, const ScSingleRefData& rData) +SCCOLROW lcl_GetRow(const ScAddress& rPos, const ScSingleRefData& rData) { return rData.toAbs(rPos).Row(); } -static SCCOLROW lcl_GetTab(const ScAddress& rPos, const ScSingleRefData& rData) +SCCOLROW lcl_GetTab(const ScAddress& rPos, const ScSingleRefData& rData) { return rData.toAbs(rPos).Tab(); } /** Check if both references span the same range in selected dimension. */ -static bool +bool lcl_checkRangeDimension( const ScAddress& rPos, const SingleDoubleRefProvider& rRef1, const SingleDoubleRefProvider& rRef2, const DimensionSelector aWhich) @@ -249,7 +249,7 @@ lcl_checkRangeDimension( aWhich(rPos, rRef1.Ref2) == aWhich(rPos, rRef2.Ref2); } -static bool +bool lcl_checkRangeDimensions( const ScAddress& rPos, const SingleDoubleRefProvider& rRef1, const SingleDoubleRefProvider& rRef2, bool& bCol, bool& bRow, bool& bTab) @@ -272,7 +272,7 @@ lcl_checkRangeDimensions( /** Check if references in given reference list can possibly form a range. To do that, two of their dimensions must be the same. */ -static bool +bool lcl_checkRangeDimensions( const ScAddress& rPos, const deque::const_iterator& rBegin, @@ -342,7 +342,7 @@ public: } }; -static bool +bool lcl_checkIfAdjacent( const ScAddress& rPos, const deque& rReferences, const DimensionSelector aWhich) { @@ -355,7 +355,7 @@ lcl_checkIfAdjacent( return std::equal(aBegin, aEnd, aBegin1, AdjacentByReference(rPos, aWhich)); } -static void +void lcl_fillRangeFromRefList( const ScAddress& aPos, const deque& rReferences, ScRange& rRange) { @@ -367,7 +367,7 @@ lcl_fillRangeFromRefList( rRange.aEnd = aEnd.toAbs(aPos); } -static bool +bool lcl_refListFormsOneRange( const ScAddress& rPos, deque& rReferences, ScRange& rRange) diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 8f262b7b4c0a..0a5ed78dfc17 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -4135,7 +4135,7 @@ private: /** returns -1 when the matrix value is smaller than the query value, 0 when they are equal, and 1 when the matrix value is larger than the query value. */ -static sal_Int32 lcl_CompareMatrix2Query( +sal_Int32 lcl_CompareMatrix2Query( SCSIZE i, const VectorMatrixAccessor& rMat, const ScQueryEntry& rEntry) { if (rMat.IsEmpty(i)) @@ -4173,7 +4173,7 @@ static sal_Int32 lcl_CompareMatrix2Query( /** returns the last item with the identical value as the original item value. */ -static void lcl_GetLastMatch( SCSIZE& rIndex, const VectorMatrixAccessor& rMat, +void lcl_GetLastMatch( SCSIZE& rIndex, const VectorMatrixAccessor& rMat, SCSIZE nMatCount, bool bReverse) { if (rMat.IsValue(rIndex)) diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 19a6e0eadcb8..585276ef9fb1 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -168,7 +168,7 @@ void XclExpObjList::Save( XclExpStream& rStrm ) namespace { -static bool IsVmlObject( const XclObj *rObj ) +bool IsVmlObject( const XclObj *rObj ) { switch( rObj->GetObjType() ) { @@ -179,7 +179,7 @@ static bool IsVmlObject( const XclObj *rObj ) } } -static sal_Int32 GetVmlObjectCount( XclExpObjList& rList ) +sal_Int32 GetVmlObjectCount( XclExpObjList& rList ) { sal_Int32 nNumVml = 0; @@ -232,7 +232,7 @@ bool IsValidObject( const XclObj& rObj ) return true; } -static void SaveDrawingMLObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, sal_Int32& nDrawingMLCount ) +void SaveDrawingMLObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, sal_Int32& nDrawingMLCount ) { std::vector aList; aList.reserve(rList.size()); @@ -277,7 +277,7 @@ static void SaveDrawingMLObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, rStrm.PopStream(); } -static void SaveVmlObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, sal_Int32& nVmlCount ) +void SaveVmlObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, sal_Int32& nVmlCount ) { if( GetVmlObjectCount( rList ) == 0 ) return; -- cgit