summaryrefslogtreecommitdiff
path: root/sc/source/filter/excel
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter/excel')
-rw-r--r--sc/source/filter/excel/xechart.cxx4
-rw-r--r--sc/source/filter/excel/xeescher.cxx2
-rw-r--r--sc/source/filter/excel/xeformula.cxx38
-rw-r--r--sc/source/filter/excel/xehelper.cxx2
-rw-r--r--sc/source/filter/excel/xelink.cxx2
-rw-r--r--sc/source/filter/excel/xestring.cxx2
-rw-r--r--sc/source/filter/excel/xichart.cxx2
-rw-r--r--sc/source/filter/excel/xihelper.cxx2
-rw-r--r--sc/source/filter/excel/xilink.cxx2
-rw-r--r--sc/source/filter/excel/xlformula.cxx2
10 files changed, 29 insertions, 29 deletions
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index 828e028c2942..7a1bf06e0ac4 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -128,7 +128,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclChRectangle& rRect )
return rStrm << rRect.mnX << rRect.mnY << rRect.mnWidth << rRect.mnHeight;
}
-inline void lclSaveRecord( XclExpStream& rStrm, XclExpRecordRef const & xRec )
+void lclSaveRecord( XclExpStream& rStrm, XclExpRecordRef const & xRec )
{
if( xRec )
xRec->Save( rStrm );
@@ -164,7 +164,7 @@ void lclWriteChFrBlockRecord( XclExpStream& rStrm, const XclChFrBlock& rFrBlock,
}
template< typename Type >
-inline bool lclIsAutoAnyOrGetValue( Type& rValue, const Any& rAny )
+bool lclIsAutoAnyOrGetValue( Type& rValue, const Any& rAny )
{
return !rAny.hasValue() || !(rAny >>= rValue);
}
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 131fbd000be8..81aab4194e24 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -108,7 +108,7 @@ using namespace oox;
namespace
{
-inline long lcl_hmm2px(long nPixel)
+long lcl_hmm2px(long nPixel)
{
return static_cast<long>(nPixel*PIXEL_PER_INCH/1000.0/CM_PER_INCH + 0.5);
}
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 9214f5c1e3bf..8a7f69f3dc1b 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -832,7 +832,7 @@ XclExpScToken XclExpFmlaCompImpl::GetNextToken()
namespace {
/** Returns the Excel token ID of a comparison operator or EXC_TOKID_NONE. */
-inline sal_uInt8 lclGetCompareTokenId( OpCode eOpCode )
+sal_uInt8 lclGetCompareTokenId( OpCode eOpCode )
{
switch( eOpCode )
{
@@ -848,13 +848,13 @@ inline sal_uInt8 lclGetCompareTokenId( OpCode eOpCode )
}
/** Returns the Excel token ID of a string concatenation operator or EXC_TOKID_NONE. */
-inline sal_uInt8 lclGetConcatTokenId( OpCode eOpCode )
+sal_uInt8 lclGetConcatTokenId( OpCode eOpCode )
{
return (eOpCode == ocAmpersand) ? EXC_TOKID_CONCAT : EXC_TOKID_NONE;
}
/** Returns the Excel token ID of an addition/subtraction operator or EXC_TOKID_NONE. */
-inline sal_uInt8 lclGetAddSubTokenId( OpCode eOpCode )
+sal_uInt8 lclGetAddSubTokenId( OpCode eOpCode )
{
switch( eOpCode )
{
@@ -866,7 +866,7 @@ inline sal_uInt8 lclGetAddSubTokenId( OpCode eOpCode )
}
/** Returns the Excel token ID of a multiplication/division operator or EXC_TOKID_NONE. */
-inline sal_uInt8 lclGetMulDivTokenId( OpCode eOpCode )
+sal_uInt8 lclGetMulDivTokenId( OpCode eOpCode )
{
switch( eOpCode )
{
@@ -878,19 +878,19 @@ inline sal_uInt8 lclGetMulDivTokenId( OpCode eOpCode )
}
/** Returns the Excel token ID of a power operator or EXC_TOKID_NONE. */
-inline sal_uInt8 lclGetPowTokenId( OpCode eOpCode )
+sal_uInt8 lclGetPowTokenId( OpCode eOpCode )
{
return (eOpCode == ocPow) ? EXC_TOKID_POWER : EXC_TOKID_NONE;
}
/** Returns the Excel token ID of a trailing unary operator or EXC_TOKID_NONE. */
-inline sal_uInt8 lclGetUnaryPostTokenId( OpCode eOpCode )
+sal_uInt8 lclGetUnaryPostTokenId( OpCode eOpCode )
{
return (eOpCode == ocPercentSign) ? EXC_TOKID_PERCENT : EXC_TOKID_NONE;
}
/** Returns the Excel token ID of a leading unary operator or EXC_TOKID_NONE. */
-inline sal_uInt8 lclGetUnaryPreTokenId( OpCode eOpCode )
+sal_uInt8 lclGetUnaryPreTokenId( OpCode eOpCode )
{
switch( eOpCode )
{
@@ -903,19 +903,19 @@ inline sal_uInt8 lclGetUnaryPreTokenId( OpCode eOpCode )
}
/** Returns the Excel token ID of a reference list operator or EXC_TOKID_NONE. */
-inline sal_uInt8 lclGetListTokenId( OpCode eOpCode, bool bStopAtSep )
+sal_uInt8 lclGetListTokenId( OpCode eOpCode, bool bStopAtSep )
{
return ((eOpCode == ocUnion) || (!bStopAtSep && (eOpCode == ocSep))) ? EXC_TOKID_LIST : EXC_TOKID_NONE;
}
/** Returns the Excel token ID of a reference intersection operator or EXC_TOKID_NONE. */
-inline sal_uInt8 lclGetIntersectTokenId( OpCode eOpCode )
+sal_uInt8 lclGetIntersectTokenId( OpCode eOpCode )
{
return (eOpCode == ocIntersect) ? EXC_TOKID_ISECT : EXC_TOKID_NONE;
}
/** Returns the Excel token ID of a reference range operator or EXC_TOKID_NONE. */
-inline sal_uInt8 lclGetRangeTokenId( OpCode eOpCode )
+sal_uInt8 lclGetRangeTokenId( OpCode eOpCode )
{
return (eOpCode == ocRange) ? EXC_TOKID_RANGE : EXC_TOKID_NONE;
}
@@ -1218,7 +1218,7 @@ void XclExpFmlaCompImpl::ProcessBoolean( const XclExpScToken& rTokData )
namespace {
-inline bool lclGetTokenString( OUString& rString, const XclExpScToken& rTokData )
+bool lclGetTokenString( OUString& rString, const XclExpScToken& rTokData )
{
bool bIsStr = (rTokData.GetType() == svString) && (rTokData.GetOpCode() == ocPush);
if( bIsStr )
@@ -1771,22 +1771,22 @@ void XclExpFmlaCompImpl::AppendTrailingParam( XclExpFuncData& rFuncData )
namespace {
-inline bool lclIsRefRel2D( const ScSingleRefData& rRefData )
+bool lclIsRefRel2D( const ScSingleRefData& rRefData )
{
return rRefData.IsColRel() || rRefData.IsRowRel();
}
-inline bool lclIsRefDel2D( const ScSingleRefData& rRefData )
+bool lclIsRefDel2D( const ScSingleRefData& rRefData )
{
return rRefData.IsColDeleted() || rRefData.IsRowDeleted();
}
-inline bool lclIsRefRel2D( const ScComplexRefData& rRefData )
+bool lclIsRefRel2D( const ScComplexRefData& rRefData )
{
return lclIsRefRel2D( rRefData.Ref1 ) || lclIsRefRel2D( rRefData.Ref2 );
}
-inline bool lclIsRefDel2D( const ScComplexRefData& rRefData )
+bool lclIsRefDel2D( const ScComplexRefData& rRefData )
{
return lclIsRefDel2D( rRefData.Ref1 ) || lclIsRefDel2D( rRefData.Ref2 );
}
@@ -2204,25 +2204,25 @@ sal_uInt16 XclExpFmlaCompImpl::PopOperandPos()
namespace {
-inline void lclAppend( ScfUInt8Vec& orVector, sal_uInt16 nData )
+void lclAppend( ScfUInt8Vec& orVector, sal_uInt16 nData )
{
orVector.resize( orVector.size() + 2 );
ShortToSVBT16( nData, &*(orVector.end() - 2) );
}
-inline void lclAppend( ScfUInt8Vec& orVector, sal_uInt32 nData )
+void lclAppend( ScfUInt8Vec& orVector, sal_uInt32 nData )
{
orVector.resize( orVector.size() + 4 );
UInt32ToSVBT32( nData, &*(orVector.end() - 4) );
}
-inline void lclAppend( ScfUInt8Vec& orVector, double fData )
+void lclAppend( ScfUInt8Vec& orVector, double fData )
{
orVector.resize( orVector.size() + 8 );
DoubleToSVBT64( fData, &*(orVector.end() - 8) );
}
-inline void lclAppend( ScfUInt8Vec& orVector, const XclExpRoot& rRoot, const OUString& rString, XclStrFlags nStrFlags )
+void lclAppend( ScfUInt8Vec& orVector, const XclExpRoot& rRoot, const OUString& rString, XclStrFlags nStrFlags )
{
XclExpStringRef xXclStr = XclExpStringHelper::CreateString( rRoot, rString, nStrFlags, EXC_TOK_STR_MAXLEN );
size_t nSize = orVector.size();
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 4c752f0f0b9f..f7d629ce3cd7 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -144,7 +144,7 @@ void XclExpProgressBar::Progress()
namespace {
/** Fills the passed Excel address with the passed Calc cell coordinates without checking any limits. */
-inline void lclFillAddress( XclAddress& rXclPos, SCCOL nScCol, SCROW nScRow )
+void lclFillAddress( XclAddress& rXclPos, SCCOL nScCol, SCROW nScRow )
{
rXclPos.mnCol = static_cast< sal_uInt16 >( nScCol );
rXclPos.mnRow = static_cast< sal_uInt32 >( nScRow );
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 401d052706c6..c530980aa2df 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -388,7 +388,7 @@ struct XclExpXti
{ rStrm << mnSupbook << mnFirstSBTab << mnLastSBTab; }
};
-static inline bool operator==( const XclExpXti& rLeft, const XclExpXti& rRight )
+static bool operator==( const XclExpXti& rLeft, const XclExpXti& rRight )
{
return
(rLeft.mnSupbook == rRight.mnSupbook) &&
diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx
index b0e929e05e6e..38e781d579f2 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -88,7 +88,7 @@ sal_uInt16 lclHashVector( const ::std::vector< Type >& rVec, const ValueHasher&
/** Calculates a hash value from a vector. Uses XclDirectHasher to hash the vector elements. */
template< typename Type >
-inline sal_uInt16 lclHashVector( const ::std::vector< Type >& rVec )
+sal_uInt16 lclHashVector( const ::std::vector< Type >& rVec )
{
return lclHashVector( rVec, XclDirectHasher< Type >() );
}
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 739215a6efbe..fbe65d55f897 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -143,7 +143,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclChRectangle& rRect )
return rStrm;
}
-inline void lclSetValueOrClearAny( Any& rAny, double fValue, bool bClear )
+void lclSetValueOrClearAny( Any& rAny, double fValue, bool bClear )
{
if( bClear )
rAny.clear();
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index 2da87f235a8a..93287121b554 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -46,7 +46,7 @@
namespace {
/** Fills the passed Calc address with the passed Excel cell coordinates without checking any limits. */
-inline void lclFillAddress( ScAddress& rScPos, sal_uInt16 nXclCol, sal_uInt32 nXclRow, SCTAB nScTab )
+void lclFillAddress( ScAddress& rScPos, sal_uInt16 nXclCol, sal_uInt32 nXclRow, SCTAB nScTab )
{
rScPos.SetCol( static_cast< SCCOL >( nXclCol ) );
rScPos.SetRow( static_cast< SCROW >( nXclRow ) );
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index f7960c40e3c2..ce811f2471e9 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -148,7 +148,7 @@ struct XclImpXti
explicit XclImpXti() : mnSupbook( SAL_MAX_UINT16 ), mnSBTabFirst( SAL_MAX_UINT16 ), mnSBTabLast( SAL_MAX_UINT16 ) {}
};
-static inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpXti& rXti )
+static XclImpStream& operator>>( XclImpStream& rStrm, XclImpXti& rXti )
{
rXti.mnSupbook = rStrm.ReaduInt16();
rXti.mnSBTabFirst = rStrm.ReaduInt16();
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 4d1774d9aed7..644a806dc8f3 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -923,7 +923,7 @@ void XclTokenArrayHelper::ConvertStringToList(
namespace {
-inline bool lclGetAddress( ScAddress& rAddress, const FormulaToken& rToken, const ScAddress& rPos )
+bool lclGetAddress( ScAddress& rAddress, const FormulaToken& rToken, const ScAddress& rPos )
{
OpCode eOpCode = rToken.GetOpCode();
bool bIsSingleRef = (eOpCode == ocPush) && (rToken.GetType() == svSingleRef);