summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-10-17 09:31:51 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-17 12:07:46 +0200
commitef5b895afe63eae029363ddb5d7960d7e34e5e35 (patch)
tree872cd53623c1c29b6b9ae5080ee92d8c4d50a307 /forms
parent48b41d73cb62dc89fc0594ccfd6fa664a460d142 (diff)
loplugin:staticvar in editeng..framework
Change-Id: I8e555a98f74f61e6e40122564b7ad19ca07a8a91 Reviewed-on: https://gerrit.libreoffice.org/61866 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'forms')
-rw-r--r--forms/source/richtext/richtextvclcontrol.cxx4
-rw-r--r--forms/source/solar/control/navtoolbar.cxx8
2 files changed, 6 insertions, 6 deletions
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index dbfa228d7c14..8d16ce737fc6 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -220,12 +220,12 @@ namespace frm
)
{
bool bLoad = KEY_F11 == nCode;
- struct
+ static struct
{
const sal_Char* pDescription;
const sal_Char* pExtension;
EETextFormat eFormat;
- } aExportFormats[] =
+ } const aExportFormats[] =
{
{ "OASIS OpenDocument (*.xml)", "*.xml", EETextFormat::Xml },
{ "HyperText Markup Language (*.html)", "*.html", EETextFormat::Html },
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index af5428305c70..74c3461d47c9 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -238,12 +238,12 @@ namespace frm
// items. We could duplicate all the information here in our lib
// (such as the item text and the image), but why should we?
- struct FeatureDescription
+ static struct FeatureDescription
{
sal_uInt16 nId;
bool bRepeat;
bool bItemWindow;
- } aSupportedFeatures[] =
+ } const aSupportedFeatures[] =
{
{ LID_RECORD_LABEL, false, true },
{ FormFeature::MoveAbsolute, false, true },
@@ -270,8 +270,8 @@ namespace frm
{ FormFeature::RemoveFilterAndSort, false, false },
};
- FeatureDescription* pSupportedFeatures = aSupportedFeatures;
- FeatureDescription* pSupportedFeaturesEnd = aSupportedFeatures + SAL_N_ELEMENTS( aSupportedFeatures );
+ FeatureDescription const * pSupportedFeatures = aSupportedFeatures;
+ FeatureDescription const * pSupportedFeaturesEnd = aSupportedFeatures + SAL_N_ELEMENTS( aSupportedFeatures );
for ( ; pSupportedFeatures < pSupportedFeaturesEnd; ++pSupportedFeatures )
{
if ( pSupportedFeatures->nId )