diff options
11 files changed, 16 insertions, 16 deletions
diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx b/chart2/source/controller/main/_serviceregistration_controller.cxx index f2000b02ce40..330c05121d49 100644 --- a/chart2/source/controller/main/_serviceregistration_controller.cxx +++ b/chart2/source/controller/main/_serviceregistration_controller.cxx @@ -27,7 +27,7 @@ #include "ShapeToolbarController.hxx" #include <cppuhelper/implementationentry.hxx> -static struct ::cppu::ImplementationEntry g_entries_chart2_controller[] = +static const struct ::cppu::ImplementationEntry g_entries_chart2_controller[] = { { ::chart::ChartController::create diff --git a/chart2/source/model/inc/_serviceregistration_charttypes.hxx b/chart2/source/model/inc/_serviceregistration_charttypes.hxx index 6641fabd1778..485183806af5 100644 --- a/chart2/source/model/inc/_serviceregistration_charttypes.hxx +++ b/chart2/source/model/inc/_serviceregistration_charttypes.hxx @@ -24,7 +24,7 @@ class ChartTypeEntriesForServiceRegistration { public: - static struct ::cppu::ImplementationEntry* + static const struct ::cppu::ImplementationEntry* getImplementationEntries(); }; diff --git a/chart2/source/model/main/_serviceregistration_model.cxx b/chart2/source/model/main/_serviceregistration_model.cxx index 30873a49fc26..95e4d4a3b689 100644 --- a/chart2/source/model/main/_serviceregistration_model.cxx +++ b/chart2/source/model/main/_serviceregistration_model.cxx @@ -36,7 +36,7 @@ #include "_serviceregistration_charttypes.hxx" -static struct ::cppu::ImplementationEntry g_entries_chart2_model[] = +static const struct ::cppu::ImplementationEntry g_entries_chart2_model[] = { { ::chart::ChartModel::create diff --git a/chart2/source/model/template/_serviceregistration_charttypes.cxx b/chart2/source/model/template/_serviceregistration_charttypes.cxx index 4d9854d1abe3..299f1623136b 100644 --- a/chart2/source/model/template/_serviceregistration_charttypes.cxx +++ b/chart2/source/model/template/_serviceregistration_charttypes.cxx @@ -32,7 +32,7 @@ namespace { -static struct ::cppu::ImplementationEntry g_entries_chart2_charttypes[] = +static const struct ::cppu::ImplementationEntry g_entries_chart2_charttypes[] = { { ::chart::AreaChartType::create @@ -119,7 +119,7 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_charttypes[] = } // anonymous namespace -struct ::cppu::ImplementationEntry * +const struct ::cppu::ImplementationEntry * ChartTypeEntriesForServiceRegistration::getImplementationEntries() { return g_entries_chart2_charttypes; diff --git a/chart2/source/tools/_serviceregistration_tools.cxx b/chart2/source/tools/_serviceregistration_tools.cxx index 42c38d6495b3..7870ad03aadc 100644 --- a/chart2/source/tools/_serviceregistration_tools.cxx +++ b/chart2/source/tools/_serviceregistration_tools.cxx @@ -29,7 +29,7 @@ #include "InternalDataProvider.hxx" #include "charttoolsdllapi.hxx" -static struct ::cppu::ImplementationEntry g_entries_chart2_tools[] = +static const struct ::cppu::ImplementationEntry g_entries_chart2_tools[] = { { ::chart::LabeledDataSequence::create diff --git a/chart2/source/view/main/_serviceregistration_view.cxx b/chart2/source/view/main/_serviceregistration_view.cxx index e15fedb747fc..472666e6b350 100644 --- a/chart2/source/view/main/_serviceregistration_view.cxx +++ b/chart2/source/view/main/_serviceregistration_view.cxx @@ -21,7 +21,7 @@ #include "ChartView.hxx" -static struct ::cppu::ImplementationEntry g_entries_chart2_view[] = +static const struct ::cppu::ImplementationEntry g_entries_chart2_view[] = { { ::chart::ChartView::create diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx index f8b904852c6e..410422ca35d0 100644 --- a/connectivity/source/drivers/evoab2/EApi.cxx +++ b/connectivity/source/drivers/evoab2/EApi.cxx @@ -41,7 +41,7 @@ struct ApiMap SymbolFunc *ref_value; }; -static ApiMap aCommonApiMap[] = +static const ApiMap aCommonApiMap[] = { SYM_MAP( eds_check_version ), SYM_MAP( e_contact_field_name ), @@ -64,7 +64,7 @@ static ApiMap aCommonApiMap[] = }; //< 3.6 api -static ApiMap aOldApiMap[] = +static const ApiMap aOldApiMap[] = { SYM_MAP( e_book_get_addressbooks ), SYM_MAP( e_book_get_uri ), @@ -77,7 +77,7 @@ static ApiMap aOldApiMap[] = }; //>= 3.6 api -static ApiMap aNewApiMap[] = +static const ApiMap aNewApiMap[] = { SYM_MAP( e_source_registry_list_sources ), SYM_MAP( e_source_registry_new_sync ), @@ -94,13 +94,13 @@ static ApiMap aNewApiMap[] = }; //== indirect read access (3.6 only) -static ApiMap aClientApiMap36[] = +static const ApiMap aClientApiMap36[] = { SYM_MAP( e_book_client_new ) }; //>= direct read access API (>= 3.8) -static ApiMap aClientApiMap38[] = +static const ApiMap aClientApiMap38[] = { SYM_MAP( e_book_client_connect_direct_sync ) }; diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index e085bcb236a8..e9cd423a55d1 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -732,7 +732,7 @@ void log( ConnectionSettings *settings, sal_Int32 level, const char *str ) -static struct cppu::ImplementationEntry g_entries[] = +static const struct cppu::ImplementationEntry g_entries[] = { { pq_sdbc_driver::ConnectionCreateInstance, pq_sdbc_driver::ConnectionGetImplementationName, diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index f79c33edaed4..f701e3124e5a 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -304,7 +304,7 @@ void OOneInstanceComponentFactory::disposing() } -static struct cppu::ImplementationEntry g_entries[] = +static const struct cppu::ImplementationEntry g_entries[] = { { pq_sdbc_driver::DriverCreateInstance, pq_sdbc_driver::DriverGetImplementationName, diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 6fcda8a9a864..b8cba63538c8 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -2544,7 +2544,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_setCacheSize( sal_Int32 nNewSize } -static sal_Bool s_aAssignableFromTab[11][11] = +static const sal_Bool s_aAssignableFromTab[11][11] = { /* from CH,BO,BY,SH,US,LO,UL,HY,UH,FL,DO */ /* TypeClass_CHAR */ { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx index dbbc3e0b05b3..c031fb7cbefa 100644 --- a/cppuhelper/test/cfg_test.cxx +++ b/cppuhelper/test/cfg_test.cxx @@ -189,7 +189,7 @@ static Reference< XInterface > SAL_CALL ServiceImpl1_create( } // namespace cfg_test -static struct ImplementationEntry g_entries[] = +static const struct ImplementationEntry g_entries[] = { { ::cfg_test::ServiceImpl0_create, ::cfg_test::impl0_getImplementationName, |