diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-17 15:28:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-18 08:04:47 +0200 |
| commit | 1aafe4950c04024907076e1420ddfd02181eb278 (patch) | |
| tree | 2d014582c2a5ddd5139808f20eb70fa2817f75fe /oox | |
| parent | 6626281b4a123cfb5e2c8f449b55f4acd46ee198 (diff) | |
loplugin:staticvar in hwpfilter..sal
Change-Id: I8bf3509637cb295847e0dd667c1862269a192bbe
Reviewed-on: https://gerrit.libreoffice.org/61881
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/shapes.cxx | 2 | ||||
| -rw-r--r-- | oox/source/ole/olehelper.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 3f7e0912bf56..fabaa43a3f54 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -233,7 +233,7 @@ static uno::Reference<io::XInputStream> lcl_StoreOwnAsOOXML( char const* pMediaType; char const* pProgID; char const* pSuffix; - } s_Mapping[] = { + } const s_Mapping[] = { { {SO3_SW_CLASSID_60}, "MS Word 2007 XML", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "Word.Document.12", "docx" }, { {SO3_SC_CLASSID_60}, "Calc MS Excel 2007 XML", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "Excel.Sheet.12", "xlsx" }, { {SO3_SIMPRESS_CLASSID_60}, "Impress MS PowerPoint 2007 XML", "application/vnd.openxmlformats-officedocument.presentationml.presentation", "PowerPoint.Show.12", "pptx" }, diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 55d626279476..d2dd4899d2e6 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -114,7 +114,7 @@ public: classIdToGUIDCNamePairMap::classIdToGUIDCNamePairMap() { - IdCntrlData initialCntrlData[] = + static IdCntrlData const initialCntrlData[] = { // Command button MUST be at index 0 { FormComponentType::COMMANDBUTTON, @@ -174,7 +174,7 @@ classIdToGUIDCNamePairMap::classIdToGUIDCNamePairMap() } }; int const length = SAL_N_ELEMENTS( initialCntrlData ); - IdCntrlData* pData = initialCntrlData; + IdCntrlData const * pData = initialCntrlData; for ( int index = 0; index < length; ++index, ++pData ) mnIdToGUIDCNamePairMap[ pData->nId ] = pData->aData; }; |