diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-04 13:37:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-04 14:57:16 +0100 |
| commit | b0a6bec621ad85058b2d1ac348aed338bb07ff8d (patch) | |
| tree | bac7b719b0f6980e884aed28fcd14ea591d3754b | |
| parent | 2ecce5b58b965cf69fdb98966d7e2aab09d2f030 (diff) | |
fix ODR violation
only shows up with --enable-mergedlibs and --enable-lto
Change-Id: Id769c8ed5781724835bc7e532185263964237dab
Reviewed-on: https://gerrit.libreoffice.org/82000
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | sc/source/filter/inc/qproform.hxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/qpro/qproform.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx index d57cfefca43f..fa1f2c2075a3 100644 --- a/sc/source/filter/inc/qproform.hxx +++ b/sc/source/filter/inc/qproform.hxx @@ -25,7 +25,7 @@ typedef OpCode DefTokenId; -enum FUNC_TYPE +enum QPRO_FUNC_TYPE { FT_Return, FT_FuncFix0, @@ -63,7 +63,7 @@ public: void ReadSRD( ScSingleRefData& rR, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 rRel ); void IncToken( TokenId &aParam ); static DefTokenId IndexToToken( sal_uInt16 nToken ); - static FUNC_TYPE IndexToType( sal_uInt8 nToken ); + static QPRO_FUNC_TYPE IndexToType( sal_uInt8 nToken ); static DefTokenId IndexToDLLId( sal_uInt16 nIndex ); static const sal_Char* getString( sal_uInt8 nIndex ); }; diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 0d8bc41426f2..142d09945e54 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -201,7 +201,7 @@ ConvErr QProToSc::Convert( std::unique_ptr<ScTokenArray>& pArray ) TokenId nPush; ScComplexRefData aCRD; ScSingleRefData aSRD; - FUNC_TYPE eType; + QPRO_FUNC_TYPE eType; DefTokenId eOc; double nFloatArray[ nBufSize ] = {0}; const sal_Char* pExtString = nullptr; @@ -398,7 +398,7 @@ ConvErr QProToSc::Convert( std::unique_ptr<ScTokenArray>& pArray ) static const struct { DefTokenId const nToken; - FUNC_TYPE const nType; + QPRO_FUNC_TYPE const nType; } aFuncMap[] = { { ocPush, FT_ConstFloat }, { ocPush, FT_Cref }, @@ -573,7 +573,7 @@ DefTokenId QProToSc::IndexToToken( sal_uInt16 nIndex ) return ocNoName; } -FUNC_TYPE QProToSc::IndexToType( sal_uInt8 nIndex ) +QPRO_FUNC_TYPE QProToSc::IndexToType( sal_uInt8 nIndex ) { if( nIndex < nIndexCount ) return aFuncMap[ nIndex ].nType; |