diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-19 15:27:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-23 09:42:23 +0200 |
| commit | 468ff4b3b6e20cab284b5f6dbd7c8aa5a1ba1264 (patch) | |
| tree | c855aa8d55122a03c40815f24c6dcb64a1d4cac2 /sc/qa/unit | |
| parent | a84c07509d9051084684987ad5ec47631afd50e5 (diff) | |
loplugin:constantfunction: sc
Change-Id: Id3268114041575d7dbb84e8d963ead566c78b928
Diffstat (limited to 'sc/qa/unit')
| -rw-r--r-- | sc/qa/unit/helper/qahelper.cxx | 7 | ||||
| -rw-r--r-- | sc/qa/unit/helper/qahelper.hxx | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index d98e43200355..7d27484b5459 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -72,7 +72,7 @@ std::ostream& operator<<(std::ostream& rStrm, const OpCode& rCode) return rStrm; } -FileFormat aFileFormats[] = { +const FileFormat ScBootstrapFixture::aFileFormats[] = { { "ods" , "calc8", "", ODS_FORMAT_TYPE }, { "xls" , "MS Excel 97", "calc_MS_EXCEL_97", XLS_FORMAT_TYPE }, { "xlsx", "Calc Office Open XML" , "Office Open XML Spreadsheet", XLSX_FORMAT_TYPE }, @@ -588,11 +588,6 @@ ScDocShellRef ScBootstrapFixture::loadDoc( return load(bReadWrite, aFileName, aFilterName, OUString(), aFilterType, nFormatType, nClipboardId, static_cast<sal_uIntPtr>(nFormatType)); } -const FileFormat* ScBootstrapFixture::getFileFormats() -{ - return aFileFormats; -} - ScBootstrapFixture::ScBootstrapFixture( const OUString& rsBaseString ) : m_aBaseString( rsBaseString ) {} ScBootstrapFixture::~ScBootstrapFixture() {} diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index e89745e1e910..460d0fca0be8 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -220,6 +220,7 @@ struct assertion_traits<ScRange> class SCQAHELPER_DLLPUBLIC ScBootstrapFixture : public test::BootstrapFixture { + static const FileFormat aFileFormats[]; protected: OUString m_aBaseString; @@ -236,7 +237,7 @@ protected: ScDocShellRef loadDoc(const OUString& rFileName, sal_Int32 nFormat, bool bReadWrite = false ); public: - static const FileFormat* getFileFormats(); + static const FileFormat* getFileFormats() { return aFileFormats; } ScBootstrapFixture( const OUString& rsBaseString ); virtual ~ScBootstrapFixture(); |