summaryrefslogtreecommitdiff
path: root/sc/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter')
-rw-r--r--sc/source/filter/excel/xelink.cxx2
-rw-r--r--sc/source/filter/excel/xename.cxx2
-rw-r--r--sc/source/filter/excel/xetable.cxx2
-rw-r--r--sc/source/filter/excel/xilink.cxx2
-rw-r--r--sc/source/filter/html/htmlpars.cxx2
-rw-r--r--sc/source/filter/lotus/filter.cxx2
-rw-r--r--sc/source/filter/oox/sheetdatabuffer.cxx4
-rw-r--r--sc/source/filter/oox/stylesbuffer.cxx2
8 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 469731a65467..ea51929c60b6 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -384,7 +384,7 @@ struct XclExpXti
{ rStrm << mnSupbook << mnFirstSBTab << mnLastSBTab; }
};
-inline bool operator==( const XclExpXti& rLeft, const XclExpXti& rRight )
+static inline bool operator==( const XclExpXti& rLeft, const XclExpXti& rRight )
{
return
(rLeft.mnSupbook == rRight.mnSupbook) &&
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index 62181ef8eee2..6e0ec1372973 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -337,7 +337,7 @@ void XclExpName::WriteBody( XclExpStream& rStrm )
/** Returns true (needed fixing) if FormulaToken was not absolute and 3D.
So, regardless of whether the fix was successful or not, true is still returned since a fix was required.*/
-bool lcl_EnsureAbs3DToken( const SCTAB nTab, formula::FormulaToken* pTok, const bool bFix = true )
+static bool lcl_EnsureAbs3DToken( const SCTAB nTab, formula::FormulaToken* pTok, const bool bFix = true )
{
bool bFixRequired = false;
if ( !pTok || ( pTok->GetType() != formula::svSingleRef && pTok->GetType() != formula::svDoubleRef ) )
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index c94145737fc9..c73a0a8b42d4 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -1800,7 +1800,7 @@ XclExpDefaultRowData::XclExpDefaultRowData( const XclExpRow& rRow ) :
::set_flag( mnFlags, EXC_DEFROW_UNSYNCED, rRow.IsUnsynced() );
}
-bool operator<( const XclExpDefaultRowData& rLeft, const XclExpDefaultRowData& rRight )
+static bool operator<( const XclExpDefaultRowData& rLeft, const XclExpDefaultRowData& rRight )
{
return (rLeft.mnHeight < rRight.mnHeight) ||
((rLeft.mnHeight == rRight.mnHeight) && (rLeft.mnFlags < rRight.mnFlags));
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index b5e0b7ecbb99..02f0562f7fec 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -147,7 +147,7 @@ struct XclImpXti
explicit XclImpXti() : mnSupbook( SAL_MAX_UINT16 ), mnSBTabFirst( SAL_MAX_UINT16 ), mnSBTabLast( SAL_MAX_UINT16 ) {}
};
-inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpXti& rXti )
+static inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpXti& rXti )
{
rXti.mnSupbook = rStrm.ReaduInt16();
rXti.mnSBTabFirst = rStrm.ReaduInt16();
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 401475d9fe0c..ec86f6ec778e 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1646,7 +1646,7 @@ void ScHTMLLayoutParser::ProcToken( HtmlImportInfo* pInfo )
// HTML DATA QUERY PARSER
template< typename Type >
-inline Type getLimitedValue( const Type& rValue, const Type& rMin, const Type& rMax )
+static inline Type getLimitedValue( const Type& rValue, const Type& rMin, const Type& rMax )
{ return std::max( std::min( rValue, rMax ), rMin ); }
ScHTMLEntry::ScHTMLEntry( const SfxItemSet& rItemSet, ScHTMLTableId nTableId ) :
diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx
index ca3a33c4b13b..16ab8fe57bf3 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -131,7 +131,7 @@ generate_Opcodes(LotusContext &rContext, SvStream& aStream,
return nErr;
}
-WKTYP ScanVersion(SvStream& aStream)
+static WKTYP ScanVersion(SvStream& aStream)
{
// PREC: pWKFile: pointer to open file
// POST: return: type of file
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index a4e764bbe538..cdd4d8ce6e07 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -323,7 +323,7 @@ void SheetDataBuffer::setMergedRange( const ScRange& rRange )
typedef std::pair<sal_Int32, sal_Int32> FormatKeyPair;
-void addIfNotInMyMap( const StylesBuffer& rStyles, std::map< FormatKeyPair, ScRangeList >& rMap, sal_Int32 nXfId, sal_Int32 nFormatId, const ScRangeList& rRangeList )
+static void addIfNotInMyMap( const StylesBuffer& rStyles, std::map< FormatKeyPair, ScRangeList >& rMap, sal_Int32 nXfId, sal_Int32 nFormatId, const ScRangeList& rRangeList )
{
Xf* pXf1 = rStyles.getCellXf( nXfId ).get();
if ( pXf1 )
@@ -718,7 +718,7 @@ void SheetDataBuffer::setCellFormat( const CellModel& rModel )
}
}
-void lcl_SetBorderLine( ScDocument& rDoc, const ScRange& rRange, SCTAB nScTab, SvxBoxItemLine nLine )
+static void lcl_SetBorderLine( ScDocument& rDoc, const ScRange& rRange, SCTAB nScTab, SvxBoxItemLine nLine )
{
SCCOL nFromScCol = (nLine == SvxBoxItemLine::RIGHT) ? rRange.aEnd.Col() : rRange.aStart.Col();
SCROW nFromScRow = (nLine == SvxBoxItemLine::BOTTOM) ? rRange.aEnd.Row() : rRange.aStart.Row();
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index b923e3b5d01e..b0ee21d7461a 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -833,7 +833,7 @@ bool Font::needsRichTextFormat() const
return maApiData.mnEscapement != API_ESCAPE_NONE;
}
-::FontFamily lcl_getFontFamily( sal_Int32 nFamily )
+static ::FontFamily lcl_getFontFamily( sal_Int32 nFamily )
{
::FontFamily eScFamily = FAMILY_DONTKNOW;
switch( nFamily )