diff options
-rw-r--r-- | avmedia/source/vlc/wrapper/Common.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/EventManager.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/Instance.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/Media.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/Player.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/doceventnotifier.cxx | 2 | ||||
-rw-r--r-- | chart2/qa/extras/chart2export.cxx | 4 | ||||
-rw-r--r-- | chart2/source/controller/sidebar/ChartAxisPanel.cxx | 6 | ||||
-rw-r--r-- | chart2/source/controller/sidebar/ChartErrorBarPanel.cxx | 6 | ||||
-rw-r--r-- | chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 6 | ||||
-rw-r--r-- | connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/mysqlc/mysqlc_types.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/mysqlc/mysqlc_types.hxx | 2 |
13 files changed, 20 insertions, 20 deletions
diff --git a/avmedia/source/vlc/wrapper/Common.cxx b/avmedia/source/vlc/wrapper/Common.cxx index 66eea5fa8bc6..8eb23be81c75 100644 --- a/avmedia/source/vlc/wrapper/Common.cxx +++ b/avmedia/source/vlc/wrapper/Common.cxx @@ -25,7 +25,7 @@ namespace wrapper { bool Common::LoadSymbols() { - ApiMap const VLC_COMMON_API[] = + static ApiMap const VLC_COMMON_API[] = { SYM_MAP( libvlc_get_version ), SYM_MAP( libvlc_errmsg ) diff --git a/avmedia/source/vlc/wrapper/EventManager.cxx b/avmedia/source/vlc/wrapper/EventManager.cxx index 76259c933e15..5e7422e60dc5 100644 --- a/avmedia/source/vlc/wrapper/EventManager.cxx +++ b/avmedia/source/vlc/wrapper/EventManager.cxx @@ -47,7 +47,7 @@ void EventManager::Handler( const libvlc_event_t *event, void *pData ) bool EventManager::LoadSymbols() { - ApiMap const VLC_EVENT_MANAGER_API[] = + static ApiMap const VLC_EVENT_MANAGER_API[] = { SYM_MAP( libvlc_media_player_event_manager ), SYM_MAP( libvlc_event_attach ), diff --git a/avmedia/source/vlc/wrapper/Instance.cxx b/avmedia/source/vlc/wrapper/Instance.cxx index 6bc22ff75ec6..eb6dd99eb200 100644 --- a/avmedia/source/vlc/wrapper/Instance.cxx +++ b/avmedia/source/vlc/wrapper/Instance.cxx @@ -25,7 +25,7 @@ namespace wrapper { bool Instance::LoadSymbols() { - ApiMap const VLC_INSTANCE_API[] = + static ApiMap const VLC_INSTANCE_API[] = { SYM_MAP( libvlc_new ), SYM_MAP( libvlc_release ), diff --git a/avmedia/source/vlc/wrapper/Media.cxx b/avmedia/source/vlc/wrapper/Media.cxx index 9f23472d30f8..d884180bbd9d 100644 --- a/avmedia/source/vlc/wrapper/Media.cxx +++ b/avmedia/source/vlc/wrapper/Media.cxx @@ -46,7 +46,7 @@ namespace bool Media::LoadSymbols() { - ApiMap const VLC_MEDIA_API[] = + static ApiMap const VLC_MEDIA_API[] = { SYM_MAP( libvlc_media_new_path ), SYM_MAP( libvlc_media_release ), diff --git a/avmedia/source/vlc/wrapper/Player.cxx b/avmedia/source/vlc/wrapper/Player.cxx index 7eb33440e24d..108ec02d2100 100644 --- a/avmedia/source/vlc/wrapper/Player.cxx +++ b/avmedia/source/vlc/wrapper/Player.cxx @@ -67,7 +67,7 @@ namespace wrapper { bool Player::LoadSymbols() { - ApiMap const VLC_PLAYER_API[] = + static ApiMap const VLC_PLAYER_API[] = { SYM_MAP( libvlc_media_player_new_from_media ), SYM_MAP( libvlc_media_player_release ), diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx index b309fbd00a1b..6d0ea0c6786a 100644 --- a/basctl/source/basicide/doceventnotifier.cxx +++ b/basctl/source/basicide/doceventnotifier.cxx @@ -133,7 +133,7 @@ namespace basctl const sal_Char* pEventName; void (DocumentEventListener::*listenerMethod)( const ScriptDocument& _rDocument ); }; - EventEntry const aEvents[] = { + static EventEntry const aEvents[] = { { "OnNew", &DocumentEventListener::onDocumentCreated }, { "OnLoad", &DocumentEventListener::onDocumentOpened }, { "OnSave", &DocumentEventListener::onDocumentSave }, diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index c6efff2eaaa0..b07e98661574 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -268,7 +268,7 @@ xmlDocPtr Chart2ExportTest::parseExport(const OUString& rDir, const OUString& rF void Chart2ExportTest::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) { - struct { char const * pPrefix; char const * pURI; } aNamespaces[] = + static struct { char const * pPrefix; char const * pURI; } const aNamespaces[] = { { "w", "http://schemas.openxmlformats.org/wordprocessingml/2006/main" }, { "v", "urn:schemas-microsoft-com:vml" }, @@ -895,7 +895,7 @@ void Chart2ExportTest::testDataLabelBordersDOCX() CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aIndices[1]); */ - const Check aDataPoints[] = + static const Check aDataPoints[] = { { 0, css::drawing::LineStyle_SOLID, 0x00FFFF00 }, // solid yellow { 2, css::drawing::LineStyle_SOLID, 0x00FF0000 } // solid red diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx index 7ce06619413b..04e32abd392e 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx @@ -77,7 +77,7 @@ struct AxisLabelPosMap css::chart::ChartAxisLabelPosition ePos; }; -AxisLabelPosMap aLabelPosMap[] = { +static AxisLabelPosMap const aLabelPosMap[] = { { 0, css::chart::ChartAxisLabelPosition_NEAR_AXIS }, { 1, css::chart::ChartAxisLabelPosition_NEAR_AXIS_OTHER_SIDE }, { 2, css::chart::ChartAxisLabelPosition_OUTSIDE_START }, @@ -99,7 +99,7 @@ sal_Int32 getLabelPosition(const css::uno::Reference<css::frame::XModel>& xModel css::chart::ChartAxisLabelPosition ePos; aAny >>= ePos; - for (AxisLabelPosMap & i : aLabelPosMap) + for (AxisLabelPosMap const & i : aLabelPosMap) { if (i.ePos == ePos) return i.nPos; @@ -118,7 +118,7 @@ void setLabelPosition(const css::uno::Reference<css::frame::XModel>& xModel, return; css::chart::ChartAxisLabelPosition ePos; - for (AxisLabelPosMap & i : aLabelPosMap) + for (AxisLabelPosMap const & i : aLabelPosMap) { if (i.nPos == nPos) ePos = i.ePos; diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx index c1b3794230e1..2d1a911f69af 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx @@ -121,7 +121,7 @@ struct ErrorBarTypeMap sal_Int32 nApi; }; -ErrorBarTypeMap aErrorBarType[] = { +static ErrorBarTypeMap const aErrorBarType[] = { { 0, css::chart::ErrorBarStyle::ABSOLUTE }, { 1, css::chart::ErrorBarStyle::RELATIVE }, { 2, css::chart::ErrorBarStyle::FROM_DATA }, @@ -148,7 +148,7 @@ sal_Int32 getTypePos(const css::uno::Reference<css::frame::XModel>& xModel, sal_Int32 nApi = 0; aAny >>= nApi; - for (ErrorBarTypeMap & i : aErrorBarType) + for (ErrorBarTypeMap const & i : aErrorBarType) { if (i.nApi == nApi) return i.nPos; @@ -167,7 +167,7 @@ void setTypePos(const css::uno::Reference<css::frame::XModel>& xModel, return; sal_Int32 nApi = 0; - for (ErrorBarTypeMap & i : aErrorBarType) + for (ErrorBarTypeMap const & i : aErrorBarType) { if (i.nPos == nPos) nApi = i.nApi; diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index 3d00b4e7bde4..ec6ddb944513 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -84,7 +84,7 @@ struct LabelPlacementMap sal_Int32 nApi; }; -LabelPlacementMap aLabelPlacementMap[] = { +static LabelPlacementMap const aLabelPlacementMap[] = { { 0, css::chart::DataLabelPlacement::TOP }, { 1, css::chart::DataLabelPlacement::BOTTOM }, { 2, css::chart::DataLabelPlacement::CENTER }, @@ -109,7 +109,7 @@ sal_Int32 getDataLabelPlacement(const css::uno::Reference<css::frame::XModel>& x sal_Int32 nPlacement = 0; aAny >>= nPlacement; - for (LabelPlacementMap & i : aLabelPlacementMap) + for (LabelPlacementMap const & i : aLabelPlacementMap) { if (i.nApi == nPlacement) return i.nPos; @@ -128,7 +128,7 @@ void setDataLabelPlacement(const css::uno::Reference<css::frame::XModel>& xModel return; sal_Int32 nApi = 0; - for (LabelPlacementMap & i : aLabelPlacementMap) + for (LabelPlacementMap const & i : aLabelPlacementMap) { if (i.nPos == nPos) { diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 95bae62bed1e..e8aafb3d78a2 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -880,7 +880,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA namespace { - cppu::ImplementationEntry entries[] = { + cppu::ImplementationEntry const entries[] = { { &ODatabaseMetaDataResultSet_CreateInstance, &ODatabaseMetaDataResultSet::getImplementationName_Static, &ODatabaseMetaDataResultSet::getSupportedServiceNames_Static, &cppu::createSingleComponentFactory, nullptr, 0 }, { &ParameterSubstitution::create, &ParameterSubstitution::getImplementationName_Static, &ParameterSubstitution::getSupportedServiceNames_Static, diff --git a/connectivity/source/drivers/mysqlc/mysqlc_types.cxx b/connectivity/source/drivers/mysqlc/mysqlc_types.cxx index b79c7ce8431f..9639a4a6f381 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_types.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_types.cxx @@ -25,7 +25,7 @@ using namespace com::sun::star::sdbc; -TypeInfoDef mysqlc_types[] = { +TypeInfoDef const mysqlc_types[] = { // ------------- MySQL-Type: BIT. SDBC-Type: Bit ------------- { diff --git a/connectivity/source/drivers/mysqlc/mysqlc_types.hxx b/connectivity/source/drivers/mysqlc/mysqlc_types.hxx index 54f054d1ba6d..3aa355fb65a2 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_types.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_types.hxx @@ -39,7 +39,7 @@ struct TypeInfoDef sal_Int32 maxScale; }; -extern TypeInfoDef mysqlc_types[]; +extern TypeInfoDef const mysqlc_types[]; #endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_TYPES_HXX |