diff options
26 files changed, 136 insertions, 136 deletions
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 76ec9f5a97e8..d21590a10c8c 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -1119,7 +1119,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo( SolarMutexGuard aGuard; using beans::PropertyAttribute::READONLY; - static SfxItemPropertyMapEntry aDPSourceMap_Impl[] = + static const SfxItemPropertyMapEntry aDPSourceMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_DP_COLGRAND), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_DATADESC), 0, &getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 }, @@ -1515,7 +1515,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn { SolarMutexGuard aGuard; - static SfxItemPropertyMapEntry aDPDimensionMap_Impl[] = + static const SfxItemPropertyMapEntry aDPDimensionMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_DP_FILTER), 0, &getCppuType((uno::Sequence<sheet::TableFilterField>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_FLAGS), 0, &getCppuType((sal_Int32*)0), beans::PropertyAttribute::READONLY, 0 }, @@ -2229,7 +2229,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPLevel::getPropertySetInfo() { SolarMutexGuard aGuard; - static SfxItemPropertyMapEntry aDPLevelMap_Impl[] = + static const SfxItemPropertyMapEntry aDPLevelMap_Impl[] = { //! change type of AutoShow/Layout/Sorting to API struct when available {MAP_CHAR_LEN(SC_UNO_DP_AUTOSHOW), 0, &getCppuType((sheet::DataPilotFieldAutoShowInfo*)0), 0, 0 }, @@ -2699,7 +2699,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo( { SolarMutexGuard aGuard; - static SfxItemPropertyMapEntry aDPMemberMap_Impl[] = + static const SfxItemPropertyMapEntry aDPMemberMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_DP_ISVISIBLE), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_POSITION), 0, &getCppuType((sal_Int32*)0), 0, 0 }, diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index 2a1582bf4807..eacc23511805 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -296,13 +296,13 @@ PTDataFieldModel::PTDataFieldModel() : void PTDataFieldModel::setBiffSubtotal( sal_Int32 nSubtotal ) { - static sal_Int32 spnSubtotals[] = { XML_sum, XML_count, XML_average, XML_max, XML_min, XML_product, XML_countNums, XML_stdDev, XML_stdDevp, XML_var, XML_varp }; + static const sal_Int32 spnSubtotals[] = { XML_sum, XML_count, XML_average, XML_max, XML_min, XML_product, XML_countNums, XML_stdDev, XML_stdDevp, XML_var, XML_varp }; mnSubtotal = STATIC_ARRAY_SELECT( spnSubtotals, nSubtotal, XML_TOKEN_INVALID ); } void PTDataFieldModel::setBiffShowDataAs( sal_Int32 nShowDataAs ) { - static sal_Int32 spnShowDataAs[] = { XML_normal, XML_difference, XML_percent, XML_percentDiff, XML_runTotal, XML_percentOfRow, XML_percentOfCol, XML_percentOfTotal, XML_index }; + static const sal_Int32 spnShowDataAs[] = { XML_normal, XML_difference, XML_percent, XML_percentDiff, XML_runTotal, XML_percentOfRow, XML_percentOfCol, XML_percentOfTotal, XML_index }; mnShowDataAs = STATIC_ARRAY_SELECT( spnShowDataAs, nShowDataAs, XML_TOKEN_INVALID ); } @@ -859,7 +859,7 @@ void PivotTableFilter::importPTFilter( SequenceInputStream& rStrm ) if( getFlag( nFlags, BIFF12_PTFILTER_HASSTRVALUE2 ) ) rStrm >> maModel.maStrValue2; - static sal_Int32 spnTypes[] = + static const sal_Int32 spnTypes[] = { XML_unknown, // data field top10 filter (1-3) diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 972d990d82b0..de77a8270776 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -200,7 +200,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( const SvXMLTokenMap& ScXMLImport::GetTableRowCellAttrTokenMap() { - static SvXMLTokenMapEntry aTableRowCellAttrTokenMap[] = + static const SvXMLTokenMapEntry aTableRowCellAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_ROW_CELL_ATTR_STYLE_NAME }, { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION_NAME, XML_TOK_TABLE_ROW_CELL_ATTR_CONTENT_VALIDATION_NAME }, @@ -418,7 +418,7 @@ const SvXMLTokenMap& ScXMLImport::GetDocElemTokenMap() { if( !pDocElemTokenMap ) { - static SvXMLTokenMapEntry aDocTokenMap[] = + static const SvXMLTokenMapEntry aDocTokenMap[] = { { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, @@ -443,7 +443,7 @@ const SvXMLTokenMap& ScXMLImport::GetBodyElemTokenMap() { if( !pBodyElemTokenMap ) { - static SvXMLTokenMapEntry aBodyTokenMap[] = + static const SvXMLTokenMapEntry aBodyTokenMap[] = { { XML_NAMESPACE_TABLE, XML_TRACKED_CHANGES, XML_TOK_BODY_TRACKED_CHANGES }, { XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, XML_TOK_BODY_CALCULATION_SETTINGS }, @@ -469,7 +469,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationsElemTokenMap() { if( !pContentValidationsElemTokenMap ) { - static SvXMLTokenMapEntry aContentValidationsElemTokenMap[] = + static const SvXMLTokenMapEntry aContentValidationsElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, XML_TOK_CONTENT_VALIDATION }, XML_TOKEN_MAP_END @@ -485,7 +485,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationElemTokenMap() { if( !pContentValidationElemTokenMap ) { - static SvXMLTokenMapEntry aContentValidationElemTokenMap[] = + static const SvXMLTokenMapEntry aContentValidationElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_HELP_MESSAGE, XML_TOK_CONTENT_VALIDATION_ELEM_HELP_MESSAGE }, { XML_NAMESPACE_TABLE, XML_ERROR_MESSAGE, XML_TOK_CONTENT_VALIDATION_ELEM_ERROR_MESSAGE }, @@ -504,7 +504,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationAttrTokenMap() { if( !pContentValidationAttrTokenMap ) { - static SvXMLTokenMapEntry aContentValidationAttrTokenMap[] = + static const SvXMLTokenMapEntry aContentValidationAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_CONTENT_VALIDATION_NAME }, { XML_NAMESPACE_TABLE, XML_CONDITION, XML_TOK_CONTENT_VALIDATION_CONDITION }, @@ -524,7 +524,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationMessageElemTokenMap() { if( !pContentValidationMessageElemTokenMap ) { - static SvXMLTokenMapEntry aContentValidationMessageElemTokenMap[] = + static const SvXMLTokenMapEntry aContentValidationMessageElemTokenMap[] = { { XML_NAMESPACE_TEXT, XML_P, XML_TOK_P }, XML_TOKEN_MAP_END @@ -540,7 +540,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationHelpMessageAttrTokenMap() { if( !pContentValidationHelpMessageAttrTokenMap ) { - static SvXMLTokenMapEntry aContentValidationHelpMessageAttrTokenMap[] = + static const SvXMLTokenMapEntry aContentValidationHelpMessageAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_HELP_MESSAGE_ATTR_TITLE }, { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_HELP_MESSAGE_ATTR_DISPLAY }, @@ -557,7 +557,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationErrorMessageAttrTokenMap() { if( !pContentValidationErrorMessageAttrTokenMap ) { - static SvXMLTokenMapEntry aContentValidationErrorMessageAttrTokenMap[] = + static const SvXMLTokenMapEntry aContentValidationErrorMessageAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_ERROR_MESSAGE_ATTR_TITLE }, { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_ERROR_MESSAGE_ATTR_DISPLAY }, @@ -575,7 +575,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationErrorMacroAttrTokenMap() { if( !pContentValidationErrorMacroAttrTokenMap ) { - static SvXMLTokenMapEntry aContentValidationErrorMacroAttrTokenMap[] = + static const SvXMLTokenMapEntry aContentValidationErrorMacroAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_ERROR_MACRO_ATTR_NAME }, { XML_NAMESPACE_TABLE, XML_EXECUTE, XML_TOK_ERROR_MACRO_ATTR_EXECUTE }, @@ -592,7 +592,7 @@ const SvXMLTokenMap& ScXMLImport::GetCondFormatsTokenMap() { if( !pCondFormatsTokenMap ) { - static SvXMLTokenMapEntry aCondFormatsElemTokenMap[] = + static const SvXMLTokenMapEntry aCondFormatsElemTokenMap[] = { { XML_NAMESPACE_CALC_EXT, XML_CONDITIONAL_FORMAT, XML_TOK_CONDFORMATS_CONDFORMAT }, XML_TOKEN_MAP_END @@ -608,7 +608,7 @@ const SvXMLTokenMap& ScXMLImport::GetCondFormatTokenMap() { if( !pCondFormatTokenMap ) { - static SvXMLTokenMapEntry aCondFormatElemTokenMap[] = + static const SvXMLTokenMapEntry aCondFormatElemTokenMap[] = { { XML_NAMESPACE_CALC_EXT, XML_COLOR_SCALE, XML_TOK_CONDFORMAT_COLORSCALE }, { XML_NAMESPACE_CALC_EXT, XML_DATA_BAR, XML_TOK_CONDFORMAT_DATABAR }, @@ -628,7 +628,7 @@ const SvXMLTokenMap& ScXMLImport::GetCondFormatAttrMap() { if( !pCondFormatAttrMap ) { - static SvXMLTokenMapEntry aCondFormatAttrTokenMap[] = + static const SvXMLTokenMapEntry aCondFormatAttrTokenMap[] = { { XML_NAMESPACE_CALC_EXT, XML_TARGET_RANGE_ADDRESS, XML_TOK_CONDFORMAT_TARGET_RANGE }, XML_TOKEN_MAP_END @@ -644,7 +644,7 @@ const SvXMLTokenMap& ScXMLImport::GetCondDateAttrMap() { if( !pCondDateAttrMap ) { - static SvXMLTokenMapEntry aCondDateAttrTokenMap[] = + static const SvXMLTokenMapEntry aCondDateAttrTokenMap[] = { { XML_NAMESPACE_CALC_EXT, XML_DATE, XML_TOK_COND_DATE_VALUE }, { XML_NAMESPACE_CALC_EXT, XML_STYLE, XML_TOK_COND_DATE_STYLE }, @@ -661,7 +661,7 @@ const SvXMLTokenMap& ScXMLImport::GetConditionAttrMap() { if( !pConditionAttrMap ) { - static SvXMLTokenMapEntry aConditionAttrTokenMap[] = + static const SvXMLTokenMapEntry aConditionAttrTokenMap[] = { { XML_NAMESPACE_CALC_EXT, XML_VALUE, XML_TOK_CONDITION_VALUE }, { XML_NAMESPACE_CALC_EXT, XML_APPLY_STYLE_NAME, XML_TOK_CONDITION_APPLY_STYLE_NAME }, @@ -679,7 +679,7 @@ const SvXMLTokenMap& ScXMLImport::GetColorScaleTokenMap() { if( !pColorScaleTokenMap ) { - static SvXMLTokenMapEntry aColorScaleElemTokenMap[] = + static const SvXMLTokenMapEntry aColorScaleElemTokenMap[] = { { XML_NAMESPACE_CALC_EXT, XML_COLOR_SCALE_ENTRY, XML_TOK_COLORSCALE_COLORSCALEENTRY }, XML_TOKEN_MAP_END @@ -695,7 +695,7 @@ const SvXMLTokenMap& ScXMLImport::GetColorScaleEntryAttrMap() { if( !pColorScaleEntryAttrTokenMap ) { - static SvXMLTokenMapEntry aColorScaleAttrTokenMap[] = + static const SvXMLTokenMapEntry aColorScaleAttrTokenMap[] = { { XML_NAMESPACE_CALC_EXT, XML_TYPE, XML_TOK_COLORSCALEENTRY_TYPE }, { XML_NAMESPACE_CALC_EXT, XML_VALUE, XML_TOK_COLORSCALEENTRY_VALUE }, @@ -713,7 +713,7 @@ const SvXMLTokenMap& ScXMLImport::GetFormattingTokenMap() { if( !pDataBarTokenMap ) { - static SvXMLTokenMapEntry aDataBarElemTokenMap[] = + static const SvXMLTokenMapEntry aDataBarElemTokenMap[] = { { XML_NAMESPACE_CALC_EXT, XML_DATA_BAR_ENTRY, XML_TOK_DATABAR_DATABARENTRY }, { XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, XML_TOK_FORMATTING_ENTRY }, @@ -730,7 +730,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataBarAttrMap() { if( !pDataBarAttrMap ) { - static SvXMLTokenMapEntry aDataBarAttrTokenMap[] = + static const SvXMLTokenMapEntry aDataBarAttrTokenMap[] = { { XML_NAMESPACE_CALC_EXT, XML_POSITIVE_COLOR, XML_TOK_DATABAR_POSITIVE_COLOR }, { XML_NAMESPACE_CALC_EXT, XML_NEGATIVE_COLOR, XML_TOK_DATABAR_NEGATIVE_COLOR }, @@ -751,7 +751,7 @@ const SvXMLTokenMap& ScXMLImport::GetIconSetAttrMap() { if( !pIconSetAttrMap ) { - static SvXMLTokenMapEntry aIconSetAttrTokenMap[] = + static const SvXMLTokenMapEntry aIconSetAttrTokenMap[] = { { XML_NAMESPACE_CALC_EXT, XML_ICON_SET_TYPE, XML_TOK_ICONSET_TYPE }, { XML_NAMESPACE_CALC_EXT, XML_SHOW_VALUE, XML_TOK_ICONSET_SHOWVALUE }, @@ -768,7 +768,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataBarEntryAttrMap() { if( !pFormattingEntryAttrMap ) { - static SvXMLTokenMapEntry aDataBarAttrEntryTokenMap[] = + static const SvXMLTokenMapEntry aDataBarAttrEntryTokenMap[] = { { XML_NAMESPACE_CALC_EXT, XML_TYPE, XML_TOK_DATABARENTRY_TYPE }, { XML_NAMESPACE_CALC_EXT, XML_VALUE, XML_TOK_DATABARENTRY_VALUE }, @@ -785,7 +785,7 @@ const SvXMLTokenMap& ScXMLImport::GetLabelRangesElemTokenMap() { if( !pLabelRangesElemTokenMap ) { - static SvXMLTokenMapEntry aLabelRangesElemTokenMap[] = + static const SvXMLTokenMapEntry aLabelRangesElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_LABEL_RANGE, XML_TOK_LABEL_RANGE_ELEM }, XML_TOKEN_MAP_END @@ -801,7 +801,7 @@ const SvXMLTokenMap& ScXMLImport::GetLabelRangeAttrTokenMap() { if( !pLabelRangeAttrTokenMap ) { - static SvXMLTokenMapEntry aLabelRangeAttrTokenMap[] = + static const SvXMLTokenMapEntry aLabelRangeAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_LABEL_CELL_RANGE_ADDRESS, XML_TOK_LABEL_RANGE_ATTR_LABEL_RANGE }, { XML_NAMESPACE_TABLE, XML_DATA_CELL_RANGE_ADDRESS, XML_TOK_LABEL_RANGE_ATTR_DATA_RANGE }, @@ -819,7 +819,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap() { if( !pTableElemTokenMap ) { - static SvXMLTokenMapEntry aTableTokenMap[] = + static const SvXMLTokenMapEntry aTableTokenMap[] = { { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSIONS, XML_TOK_TABLE_NAMED_EXPRESSIONS }, { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COL_GROUP }, @@ -851,7 +851,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableProtectionAttrTokenMap() { if (!pTableProtectionElemTokenMap) { - static SvXMLTokenMapEntry aTableProtectionTokenMap[] = + static const SvXMLTokenMapEntry aTableProtectionTokenMap[] = { { XML_NAMESPACE_TABLE, XML_SELECT_PROTECTED_CELLS, XML_TOK_TABLE_SELECT_PROTECTED_CELLS }, { XML_NAMESPACE_TABLE, XML_SELECT_UNPROTECTED_CELLS, XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS }, @@ -867,7 +867,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowsElemTokenMap() { if( !pTableRowsElemTokenMap ) { - static SvXMLTokenMapEntry aTableRowsElemTokenMap[] = + static const SvXMLTokenMapEntry aTableRowsElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROWS_ROW_GROUP }, { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_ROWS_HEADER_ROWS }, @@ -886,7 +886,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableColsElemTokenMap() { if( !pTableColsElemTokenMap ) { - static SvXMLTokenMapEntry aTableColsElemTokenMap[] = + static const SvXMLTokenMapEntry aTableColsElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COLS_COL_GROUP }, { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_COLS_HEADER_COLS }, @@ -905,7 +905,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableAttrTokenMap() { if( !pTableAttrTokenMap ) { - static SvXMLTokenMapEntry aTableAttrTokenMap[] = + static const SvXMLTokenMapEntry aTableAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_TABLE_NAME }, { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_STYLE_NAME }, @@ -928,7 +928,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableScenarioAttrTokenMap() { if( !pTableScenarioAttrTokenMap ) { - static SvXMLTokenMapEntry aTableScenarioAttrTokenMap[] = + static const SvXMLTokenMapEntry aTableScenarioAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_DISPLAY_BORDER, XML_TOK_TABLE_SCENARIO_ATTR_DISPLAY_BORDER }, { XML_NAMESPACE_TABLE, XML_BORDER_COLOR, XML_TOK_TABLE_SCENARIO_ATTR_BORDER_COLOR }, @@ -952,7 +952,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableColAttrTokenMap() { if( !pTableColAttrTokenMap ) { - static SvXMLTokenMapEntry aTableColAttrTokenMap[] = + static const SvXMLTokenMapEntry aTableColAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_COL_ATTR_STYLE_NAME }, { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, XML_TOK_TABLE_COL_ATTR_REPEATED }, @@ -971,7 +971,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowElemTokenMap() { if( !pTableRowElemTokenMap ) { - static SvXMLTokenMapEntry aTableRowTokenMap[] = + static const SvXMLTokenMapEntry aTableRowTokenMap[] = { { XML_NAMESPACE_TABLE, XML_TABLE_CELL, XML_TOK_TABLE_ROW_CELL }, { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, XML_TOK_TABLE_ROW_COVERED_CELL }, @@ -988,7 +988,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowAttrTokenMap() { if( !pTableRowAttrTokenMap ) { - static SvXMLTokenMapEntry aTableRowAttrTokenMap[] = + static const SvXMLTokenMapEntry aTableRowAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_ROW_ATTR_STYLE_NAME }, { XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_TOK_TABLE_ROW_ATTR_VISIBILITY }, @@ -1008,7 +1008,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTokenMap() { if( !pTableRowCellElemTokenMap ) { - static SvXMLTokenMapEntry aTableRowCellTokenMap[] = + static const SvXMLTokenMapEntry aTableRowCellTokenMap[] = { { XML_NAMESPACE_TEXT, XML_P, XML_TOK_TABLE_ROW_CELL_P }, { XML_NAMESPACE_TABLE, XML_SUB_TABLE, XML_TOK_TABLE_ROW_CELL_TABLE }, @@ -1028,7 +1028,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableAnnotationAttrTokenMap() { if( !pTableAnnotationAttrTokenMap ) { - static SvXMLTokenMapEntry aTableAnnotationAttrTokenMap[] = + static const SvXMLTokenMapEntry aTableAnnotationAttrTokenMap[] = { { XML_NAMESPACE_OFFICE, XML_AUTHOR, XML_TOK_TABLE_ANNOTATION_ATTR_AUTHOR }, { XML_NAMESPACE_OFFICE, XML_CREATE_DATE, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE }, @@ -1049,7 +1049,7 @@ const SvXMLTokenMap& ScXMLImport::GetDetectiveElemTokenMap() { if( !pDetectiveElemTokenMap ) { - static SvXMLTokenMapEntry aDetectiveElemTokenMap[]= + static const SvXMLTokenMapEntry aDetectiveElemTokenMap[]= { { XML_NAMESPACE_TABLE, XML_HIGHLIGHTED_RANGE, XML_TOK_DETECTIVE_ELEM_HIGHLIGHTED }, { XML_NAMESPACE_TABLE, XML_OPERATION, XML_TOK_DETECTIVE_ELEM_OPERATION }, @@ -1066,7 +1066,7 @@ const SvXMLTokenMap& ScXMLImport::GetDetectiveHighlightedAttrTokenMap() { if( !pDetectiveHighlightedAttrTokenMap ) { - static SvXMLTokenMapEntry aDetectiveHighlightedAttrTokenMap[]= + static const SvXMLTokenMapEntry aDetectiveHighlightedAttrTokenMap[]= { { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CELL_RANGE }, { XML_NAMESPACE_TABLE, XML_DIRECTION, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_DIRECTION }, @@ -1085,7 +1085,7 @@ const SvXMLTokenMap& ScXMLImport::GetDetectiveOperationAttrTokenMap() { if( !pDetectiveOperationAttrTokenMap ) { - static SvXMLTokenMapEntry aDetectiveOperationAttrTokenMap[]= + static const SvXMLTokenMapEntry aDetectiveOperationAttrTokenMap[]= { { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DETECTIVE_OPERATION_ATTR_NAME }, { XML_NAMESPACE_TABLE, XML_INDEX, XML_TOK_DETECTIVE_OPERATION_ATTR_INDEX }, @@ -1102,7 +1102,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableCellRangeSourceAttrTokenMap() { if( !pTableCellRangeSourceAttrTokenMap ) { - static SvXMLTokenMapEntry aTableCellRangeSourceAttrTokenMap[] = + static const SvXMLTokenMapEntry aTableCellRangeSourceAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_NAME }, { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_HREF }, @@ -1124,7 +1124,7 @@ const SvXMLTokenMap& ScXMLImport::GetNamedExpressionsElemTokenMap() { if( !pNamedExpressionsElemTokenMap ) { - static SvXMLTokenMapEntry aNamedExpressionsTokenMap[] = + static const SvXMLTokenMapEntry aNamedExpressionsTokenMap[] = { { XML_NAMESPACE_TABLE, XML_NAMED_RANGE, XML_TOK_NAMED_EXPRESSIONS_NAMED_RANGE }, { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSION, XML_TOK_NAMED_EXPRESSIONS_NAMED_EXPRESSION }, @@ -1141,7 +1141,7 @@ const SvXMLTokenMap& ScXMLImport::GetNamedRangeAttrTokenMap() { if( !pNamedRangeAttrTokenMap ) { - static SvXMLTokenMapEntry aNamedRangeAttrTokenMap[] = + static const SvXMLTokenMapEntry aNamedRangeAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_NAMED_RANGE_ATTR_NAME }, { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_NAMED_RANGE_ATTR_CELL_RANGE_ADDRESS }, @@ -1160,7 +1160,7 @@ const SvXMLTokenMap& ScXMLImport::GetNamedExpressionAttrTokenMap() { if( !pNamedExpressionAttrTokenMap ) { - static SvXMLTokenMapEntry aNamedExpressionAttrTokenMap[] = + static const SvXMLTokenMapEntry aNamedExpressionAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_NAMED_EXPRESSION_ATTR_NAME }, { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_NAMED_EXPRESSION_ATTR_BASE_CELL_ADDRESS }, @@ -1178,7 +1178,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangesElemTokenMap() { if( !pDatabaseRangesElemTokenMap ) { - static SvXMLTokenMapEntry aDatabaseRangesTokenMap[] = + static const SvXMLTokenMapEntry aDatabaseRangesTokenMap[] = { { XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, XML_TOK_DATABASE_RANGE }, XML_TOKEN_MAP_END @@ -1194,7 +1194,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeElemTokenMap() { if( !pDatabaseRangeElemTokenMap ) { - static SvXMLTokenMapEntry aDatabaseRangeTokenMap[] = + static const SvXMLTokenMapEntry aDatabaseRangeTokenMap[] = { { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATABASE_RANGE_SOURCE_SQL }, { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATABASE_RANGE_SOURCE_TABLE }, @@ -1215,7 +1215,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeAttrTokenMap() { if( !pDatabaseRangeAttrTokenMap ) { - static SvXMLTokenMapEntry aDatabaseRangeAttrTokenMap[] = + static const SvXMLTokenMapEntry aDatabaseRangeAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATABASE_RANGE_ATTR_NAME }, { XML_NAMESPACE_TABLE, XML_IS_SELECTION, XML_TOK_DATABASE_RANGE_ATTR_IS_SELECTION }, @@ -1240,7 +1240,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceSQLAttrTokenMap() { if( !pDatabaseRangeSourceSQLAttrTokenMap ) { - static SvXMLTokenMapEntry aDatabaseRangeSourceSQLAttrTokenMap[] = + static const SvXMLTokenMapEntry aDatabaseRangeSourceSQLAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME }, { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_SQL_ATTR_HREF }, @@ -1260,7 +1260,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceTableAttrTokenMap() { if( !pDatabaseRangeSourceTableAttrTokenMap ) { - static SvXMLTokenMapEntry aDatabaseRangeSourceTableAttrTokenMap[] = + static const SvXMLTokenMapEntry aDatabaseRangeSourceTableAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_TABLE_ATTR_DATABASE_NAME }, { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_TABLE_ATTR_HREF }, @@ -1279,7 +1279,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceQueryAttrTokenMap() { if( !pDatabaseRangeSourceQueryAttrTokenMap ) { - static SvXMLTokenMapEntry aDatabaseRangeSourceQueryAttrTokenMap[] = + static const SvXMLTokenMapEntry aDatabaseRangeSourceQueryAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_QUERY_ATTR_DATABASE_NAME }, { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_QUERY_ATTR_HREF }, @@ -1298,7 +1298,7 @@ const SvXMLTokenMap& ScXMLImport::GetFilterElemTokenMap() { if( !pFilterElemTokenMap ) { - static SvXMLTokenMapEntry aFilterTokenMap[] = + static const SvXMLTokenMapEntry aFilterTokenMap[] = { { XML_NAMESPACE_TABLE, XML_FILTER_AND, XML_TOK_FILTER_AND }, { XML_NAMESPACE_TABLE, XML_FILTER_OR, XML_TOK_FILTER_OR }, @@ -1316,7 +1316,7 @@ const SvXMLTokenMap& ScXMLImport::GetFilterAttrTokenMap() { if( !pFilterAttrTokenMap ) { - static SvXMLTokenMapEntry aFilterAttrTokenMap[] = + static const SvXMLTokenMapEntry aFilterAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_FILTER_ATTR_TARGET_RANGE_ADDRESS }, { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS, XML_TOK_FILTER_ATTR_CONDITION_SOURCE_RANGE_ADDRESS }, @@ -1335,7 +1335,7 @@ const SvXMLTokenMap& ScXMLImport::GetFilterConditionElemTokenMap() { if( !pFilterConditionElemTokenMap ) { - static SvXMLTokenMapEntry aTokenMap[] = + static const SvXMLTokenMapEntry aTokenMap[] = { { XML_NAMESPACE_TABLE, XML_FILTER_SET_ITEM, XML_TOK_CONDITION_FILTER_SET_ITEM }, XML_TOKEN_MAP_END @@ -1351,7 +1351,7 @@ const SvXMLTokenMap& ScXMLImport::GetFilterConditionAttrTokenMap() { if( !pFilterConditionAttrTokenMap ) { - static SvXMLTokenMapEntry aFilterConditionAttrTokenMap[] = + static const SvXMLTokenMapEntry aFilterConditionAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_CONDITION_ATTR_FIELD_NUMBER }, { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_CONDITION_ATTR_CASE_SENSITIVE }, @@ -1371,7 +1371,7 @@ const SvXMLTokenMap& ScXMLImport::GetFilterSetItemAttrTokenMap() { if( !pFilterSetItemAttrTokenMap ) { - static SvXMLTokenMapEntry aTokenMap[] = + static const SvXMLTokenMapEntry aTokenMap[] = { { XML_NAMESPACE_TABLE, XML_VALUE, XML_TOK_FILTER_SET_ITEM_ATTR_VALUE }, XML_TOKEN_MAP_END @@ -1387,7 +1387,7 @@ const SvXMLTokenMap& ScXMLImport::GetSortElemTokenMap() { if( !pSortElemTokenMap ) { - static SvXMLTokenMapEntry aSortTokenMap[] = + static const SvXMLTokenMapEntry aSortTokenMap[] = { { XML_NAMESPACE_TABLE, XML_SORT_BY, XML_TOK_SORT_SORT_BY }, XML_TOKEN_MAP_END @@ -1403,7 +1403,7 @@ const SvXMLTokenMap& ScXMLImport::GetSortAttrTokenMap() { if( !pSortAttrTokenMap ) { - static SvXMLTokenMapEntry aSortAttrTokenMap[] = + static const SvXMLTokenMapEntry aSortAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_TOK_SORT_ATTR_BIND_STYLES_TO_CONTENT }, { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_SORT_ATTR_TARGET_RANGE_ADDRESS }, @@ -1424,7 +1424,7 @@ const SvXMLTokenMap& ScXMLImport::GetSortSortByAttrTokenMap() { if( !pSortSortByAttrTokenMap ) { - static SvXMLTokenMapEntry aSortSortByAttrTokenMap[] = + static const SvXMLTokenMapEntry aSortSortByAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SORT_BY_ATTR_FIELD_NUMBER }, { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_BY_ATTR_DATA_TYPE }, @@ -1442,7 +1442,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSubTotalRulesElemTokenMap() { if( !pDatabaseRangeSubTotalRulesElemTokenMap ) { - static SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesTokenMap[] = + static const SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesTokenMap[] = { { XML_NAMESPACE_TABLE, XML_SORT_GROUPS, XML_TOK_SUBTOTAL_RULES_SORT_GROUPS }, { XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, XML_TOK_SUBTOTAL_RULES_SUBTOTAL_RULE }, @@ -1459,7 +1459,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSubTotalRulesAttrTokenMap() { if( !pDatabaseRangeSubTotalRulesAttrTokenMap ) { - static SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesAttrTokenMap[] = + static const SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_TOK_SUBTOTAL_RULES_ATTR_BIND_STYLES_TO_CONTENT }, { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_SUBTOTAL_RULES_ATTR_CASE_SENSITIVE }, @@ -1477,7 +1477,7 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSortGroupsAttrTokenMap() { if( !pSubTotalRulesSortGroupsAttrTokenMap ) { - static SvXMLTokenMapEntry aSubTotalRulesSortGroupsAttrTokenMap[] = + static const SvXMLTokenMapEntry aSubTotalRulesSortGroupsAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_GROUPS_ATTR_DATA_TYPE }, { XML_NAMESPACE_TABLE, XML_ORDER, XML_TOK_SORT_GROUPS_ATTR_ORDER }, @@ -1494,7 +1494,7 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSubTotalRuleElemTokenMap() { if( !pSubTotalRulesSubTotalRuleElemTokenMap ) { - static SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleTokenMap[] = + static const SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleTokenMap[] = { { XML_NAMESPACE_TABLE, XML_SUBTOTAL_FIELD, XML_TOK_SUBTOTAL_RULE_SUBTOTAL_FIELD }, XML_TOKEN_MAP_END @@ -1510,7 +1510,7 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSubTotalRuleAttrTokenMap() { if( !pSubTotalRulesSubTotalRuleAttrTokenMap ) { - static SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleAttrTokenMap[] = + static const SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, XML_TOK_SUBTOTAL_RULE_ATTR_GROUP_BY_FIELD_NUMBER }, XML_TOKEN_MAP_END @@ -1526,7 +1526,7 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRuleSubTotalFieldAttrTokenMap() { if( !pSubTotalRuleSubTotalFieldAttrTokenMap ) { - static SvXMLTokenMapEntry aSubTotalRuleSubTotalFieldAttrTokenMap[] = + static const SvXMLTokenMapEntry aSubTotalRuleSubTotalFieldAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SUBTOTAL_FIELD_ATTR_FIELD_NUMBER }, { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_SUBTOTAL_FIELD_ATTR_FUNCTION }, @@ -1543,7 +1543,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTablesElemTokenMap() { if( !pDataPilotTablesElemTokenMap ) { - static SvXMLTokenMapEntry aDataPilotTablesElemTokenMap[] = + static const SvXMLTokenMapEntry aDataPilotTablesElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, XML_TOK_DATA_PILOT_TABLE }, XML_TOKEN_MAP_END @@ -1559,7 +1559,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableAttrTokenMap() { if( !pDataPilotTableAttrTokenMap ) { - static SvXMLTokenMapEntry aDataPilotTableAttrTokenMap[] = + static const SvXMLTokenMapEntry aDataPilotTableAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATA_PILOT_TABLE_ATTR_NAME }, { XML_NAMESPACE_TABLE, XML_APPLICATION_DATA, XML_TOK_DATA_PILOT_TABLE_ATTR_APPLICATION_DATA }, @@ -1584,7 +1584,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableElemTokenMap() { if( !pDataPilotTableElemTokenMap ) { - static SvXMLTokenMapEntry aDataPilotTableElemTokenMap[] = + static const SvXMLTokenMapEntry aDataPilotTableElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL }, { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE }, @@ -1607,7 +1607,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceServiceAttrTokenMap() { if( !pDataPilotTableSourceServiceAttrTokenMap ) { - static SvXMLTokenMapEntry aDataPilotTableSourceServiceAttrTokenMap[] = + static const SvXMLTokenMapEntry aDataPilotTableSourceServiceAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_SOURCE_SERVICE_ATTR_NAME }, { XML_NAMESPACE_TABLE, XML_SOURCE_NAME, XML_TOK_SOURCE_SERVICE_ATTR_SOURCE_NAME }, @@ -1627,7 +1627,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotGrandTotalAttrTokenMap() { if (!pDataPilotGrandTotalAttrTokenMap) { - static SvXMLTokenMapEntry aDataPilotGrandTotalAttrTokenMap[] = + static const SvXMLTokenMapEntry aDataPilotGrandTotalAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY }, { XML_NAMESPACE_TABLE, XML_ORIENTATION, XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_ORIENTATION }, @@ -1646,7 +1646,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceCellRangeAttrTokenMap() { if( !pDataPilotTableSourceCellRangeAttrTokenMap ) { - static SvXMLTokenMapEntry aDataPilotTableSourceCellRangeAttrTokenMap[] = + static const SvXMLTokenMapEntry aDataPilotTableSourceCellRangeAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_SOURCE_CELL_RANGE_ATTR_CELL_RANGE_ADDRESS }, { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_SOURCE_CELL_RANGE_ATTR_NAME }, @@ -1663,7 +1663,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceCellRangeElemTokenMap() { if( !pDataPilotTableSourceCellRangeElemTokenMap ) { - static SvXMLTokenMapEntry aDataPilotTableSourceCellRangeElemTokenMap[] = + static const SvXMLTokenMapEntry aDataPilotTableSourceCellRangeElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_FILTER, XML_TOK_SOURCE_CELL_RANGE_ELEM_FILTER}, XML_TOKEN_MAP_END @@ -1679,7 +1679,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotFieldAttrTokenMap() { if( !pDataPilotFieldAttrTokenMap ) { - static SvXMLTokenMapEntry aDataPilotFieldAttrTokenMap[] = + static const SvXMLTokenMapEntry aDataPilotFieldAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME, XML_TOK_DATA_PILOT_FIELD_ATTR_SOURCE_FIELD_NAME }, { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, XML_TOK_DATA_PILOT_FIELD_ATTR_DISPLAY_NAME }, @@ -1702,7 +1702,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotFieldElemTokenMap() { if( !pDataPilotFieldElemTokenMap ) { - static SvXMLTokenMapEntry aDataPilotFieldElemTokenMap[] = + static const SvXMLTokenMapEntry aDataPilotFieldElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LEVEL, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LEVEL }, { XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD_REFERENCE, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_REFERENCE }, @@ -1720,7 +1720,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotLevelAttrTokenMap() { if( !pDataPilotLevelAttrTokenMap ) { - static SvXMLTokenMapEntry aDataPilotLevelAttrTokenMap[] = + static const SvXMLTokenMapEntry aDataPilotLevelAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_SHOW_EMPTY, XML_TOK_DATA_PILOT_LEVEL_ATTR_SHOW_EMPTY }, XML_TOKEN_MAP_END @@ -1736,7 +1736,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotLevelElemTokenMap() { if( !pDataPilotLevelElemTokenMap ) { - static SvXMLTokenMapEntry aDataPilotLevelElemTokenMap[] = + static const SvXMLTokenMapEntry aDataPilotLevelElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTALS, XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_SUBTOTALS }, { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBERS, XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_MEMBERS }, @@ -1756,7 +1756,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotSubTotalsElemTokenMap() { if( !pDataPilotSubTotalsElemTokenMap ) { - static SvXMLTokenMapEntry aDataPilotSubTotalsElemTokenMap[] = + static const SvXMLTokenMapEntry aDataPilotSubTotalsElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTAL, XML_TOK_DATA_PILOT_SUBTOTALS_ELEM_DATA_PILOT_SUBTOTAL }, XML_TOKEN_MAP_END @@ -1772,7 +1772,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotSubTotalAttrTokenMap() { if( !pDataPilotSubTotalAttrTokenMap ) { - static SvXMLTokenMapEntry aDataPilotSubTotalAttrTokenMap[] = + static const SvXMLTokenMapEntry aDataPilotSubTotalAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_FUNCTION }, { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_DISPLAY_NAME }, @@ -1790,7 +1790,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotMembersElemTokenMap() { if( !pDataPilotMembersElemTokenMap ) { - static SvXMLTokenMapEntry aDataPilotMembersElemTokenMap[] = + static const SvXMLTokenMapEntry aDataPilotMembersElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER }, XML_TOKEN_MAP_END @@ -1806,7 +1806,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotMemberAttrTokenMap() { if( !pDataPilotMemberAttrTokenMap ) { - static SvXMLTokenMapEntry aDataPilotMemberAttrTokenMap[] = + static const SvXMLTokenMapEntry aDataPilotMemberAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATA_PILOT_MEMBER_ATTR_NAME }, { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY_NAME }, @@ -1826,7 +1826,7 @@ const SvXMLTokenMap& ScXMLImport::GetConsolidationAttrTokenMap() { if( !pConsolidationAttrTokenMap ) { - static SvXMLTokenMapEntry aConsolidationAttrTokenMap[] = + static const SvXMLTokenMapEntry aConsolidationAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_CONSOLIDATION_ATTR_FUNCTION }, { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE_ADDRESSES, XML_TOK_CONSOLIDATION_ATTR_SOURCE_RANGES }, @@ -1846,7 +1846,7 @@ const SvXMLTokenMap& ScXMLImport::GetCellTextParaElemTokenMap() { if (!pCellTextParaElemTokenMap) { - static SvXMLTokenMapEntry aMap[] = + static const SvXMLTokenMapEntry aMap[] = { { XML_NAMESPACE_TEXT, XML_SPAN, XML_TOK_CELL_TEXT_SPAN }, { XML_NAMESPACE_TEXT, XML_SHEET_NAME, XML_TOK_CELL_TEXT_SHEET_NAME }, @@ -1865,7 +1865,7 @@ const SvXMLTokenMap& ScXMLImport::GetCellTextSpanElemTokenMap() { if (!pCellTextSpanElemTokenMap) { - static SvXMLTokenMapEntry aMap[] = + static const SvXMLTokenMapEntry aMap[] = { { XML_NAMESPACE_TEXT, XML_SHEET_NAME, XML_TOK_CELL_TEXT_SPAN_ELEM_SHEET_NAME }, { XML_NAMESPACE_TEXT, XML_DATE, XML_TOK_CELL_TEXT_SPAN_ELEM_DATE }, @@ -1883,7 +1883,7 @@ const SvXMLTokenMap& ScXMLImport::GetCellTextSpanAttrTokenMap() { if (!pCellTextSpanAttrTokenMap) { - static SvXMLTokenMapEntry aMap[] = + static const SvXMLTokenMapEntry aMap[] = { { XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_CELL_TEXT_SPAN_ATTR_STYLE_NAME }, XML_TOKEN_MAP_END @@ -1898,7 +1898,7 @@ const SvXMLTokenMap& ScXMLImport::GetCellTextURLAttrTokenMap() { if (!pCellTextURLAttrTokenMap) { - static SvXMLTokenMapEntry aMap[] = + static const SvXMLTokenMapEntry aMap[] = { { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_CELL_TEXT_URL_ATTR_UREF }, { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_CELL_TEXT_URL_ATTR_TYPE }, diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index e1595b12c821..3418d53f9a70 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -509,9 +509,9 @@ const String& ScCsvGrid::GetColumnTypeName( sal_uInt32 nColIndex ) const static sal_uInt8 lcl_GetExtColumnType( sal_Int32 nIntType ) { - static sal_uInt8 pExtTypes[] = + static const sal_uInt8 pExtTypes[] = { SC_COL_STANDARD, SC_COL_TEXT, SC_COL_DMY, SC_COL_MDY, SC_COL_YMD, SC_COL_ENGLISH, SC_COL_SKIP }; - static sal_Int32 nExtTypeCount = SAL_N_ELEMENTS(pExtTypes); + static const sal_Int32 nExtTypeCount = SAL_N_ELEMENTS(pExtTypes); return pExtTypes[ ((0 <= nIntType) && (nIntType < nExtTypeCount)) ? nIntType : 0 ]; } diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index 3b1890d9e0b1..0fe5201985dc 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -99,7 +99,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp if ( bIsRange ) { - static SfxItemPropertyMapEntry aPropertyMap[] = + static const SfxItemPropertyMapEntry aPropertyMap[] = { {MAP_CHAR_LEN(SC_UNONAME_ADDRESS), 0, &getCppuType((table::CellRangeAddress*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0, &getCppuType((OUString*)0), 0, 0 }, @@ -114,7 +114,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp } else { - static SfxItemPropertyMapEntry aPropertyMap[] = + static const SfxItemPropertyMapEntry aPropertyMap[] = { {MAP_CHAR_LEN(SC_UNONAME_ADDRESS), 0, &getCppuType((table::CellAddress*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0, &getCppuType((OUString*)0), 0, 0 }, diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 4ebb1d2cbbf6..091661cddb2e 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -71,7 +71,7 @@ using namespace ::com::sun::star; static const SfxItemPropertyMapEntry* lcl_GetAutoFormatMap() { - static SfxItemPropertyMapEntry aAutoFormatMap_Impl[] = + static const SfxItemPropertyMapEntry aAutoFormatMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_INCBACK), 0, &::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_INCBORD), 0, &::getBooleanCppuType(), 0, 0 }, @@ -89,7 +89,7 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFormatMap() static const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap() { - static SfxItemPropertyMapEntry aAutoFieldMap_Impl[] = + static const SfxItemPropertyMapEntry aAutoFieldMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &::getCppuType((const sal_Int32*)0), 0, 0 }, diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 2f4263892431..852c23897751 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -137,7 +137,7 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_crea static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap() { - static SfxItemPropertyMapEntry aSettingsPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aSettingsPropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_DOAUTOCP), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_ENTERED), 0, &getBooleanCppuType(), 0, 0}, diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 3a8f7cd2f271..d60140312156 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -153,7 +153,7 @@ public: static const SfxItemPropertySet* lcl_GetCellsPropertySet() { - static SfxItemPropertyMapEntry aCellsPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aCellsPropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, @@ -262,7 +262,7 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet() static const SfxItemPropertySet* lcl_GetRangePropertySet() { - static SfxItemPropertyMapEntry aRangePropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aRangePropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, @@ -372,7 +372,7 @@ static const SfxItemPropertySet* lcl_GetRangePropertySet() static const SfxItemPropertySet* lcl_GetCellPropertySet() { - static SfxItemPropertyMapEntry aCellPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aCellPropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, @@ -486,7 +486,7 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() static const SfxItemPropertySet* lcl_GetColumnPropertySet() { - static SfxItemPropertyMapEntry aColumnPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aColumnPropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, @@ -598,7 +598,7 @@ static const SfxItemPropertySet* lcl_GetColumnPropertySet() static const SfxItemPropertySet* lcl_GetRowPropertySet() { - static SfxItemPropertyMapEntry aRowPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aRowPropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, @@ -711,7 +711,7 @@ static const SfxItemPropertySet* lcl_GetRowPropertySet() static const SfxItemPropertySet* lcl_GetSheetPropertySet() { - static SfxItemPropertyMapEntry aSheetPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aSheetPropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, @@ -835,7 +835,7 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() static const SfxItemPropertyMapEntry* lcl_GetEditPropertyMap() { - static SfxItemPropertyMapEntry aEditPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aEditPropertyMap_Impl[] = { SVX_UNOEDIT_CHAR_PROPERTIES, SVX_UNOEDIT_FONT_PROPERTIES, diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 975953318373..e3e95623ce78 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -77,7 +77,7 @@ namespace { const SfxItemPropertyMapEntry* lcl_GetDataProviderPropertyMap() { - static SfxItemPropertyMapEntry aDataProviderPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aDataProviderPropertyMap_Impl[] = { { MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0, &getBooleanCppuType(), 0, 0 }, { MAP_CHAR_LEN(SC_UNONAME_USE_INTERNAL_DATA_PROVIDER), 0, &getBooleanCppuType(), 0, 0 }, @@ -88,7 +88,7 @@ const SfxItemPropertyMapEntry* lcl_GetDataProviderPropertyMap() const SfxItemPropertyMapEntry* lcl_GetDataSequencePropertyMap() { - static SfxItemPropertyMapEntry aDataSequencePropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aDataSequencePropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_HIDDENVALUES), 0, &getCppuType((uno::Sequence<sal_Int32>*)0 ), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ROLE), 0, &getCppuType((::com::sun::star::chart2::data::DataSequenceRole*)0), 0, 0 }, diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index a6aa3321b9b3..a6f79e308eef 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -44,7 +44,7 @@ using namespace com::sun::star; static const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() { - static SfxItemPropertyMapEntry aConfigPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aConfigPropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_SHOWZERO), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_SHOWNOTES), 0, &getBooleanCppuType(), 0, 0}, diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index 8e960e0d75bc..c5912cbd2765 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -93,7 +93,7 @@ namespace { const SfxItemPropertyMapEntry* lcl_GetDataPilotDescriptorBaseMap() { - static SfxItemPropertyMapEntry aDataPilotDescriptorBaseMap_Impl[] = + static const SfxItemPropertyMapEntry aDataPilotDescriptorBaseMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_DP_COLGRAND), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_DRILLDOWN), 0, &getBooleanCppuType(), 0, 0 }, @@ -115,7 +115,7 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotDescriptorBaseMap() const SfxItemPropertyMapEntry* lcl_GetDataPilotFieldMap() { using namespace ::com::sun::star::beans::PropertyAttribute; - static SfxItemPropertyMapEntry aDataPilotFieldMap_Impl[] = + static const SfxItemPropertyMapEntry aDataPilotFieldMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_AUTOSHOW), 0, &getCppuType((DataPilotFieldAutoShowInfo*)0), MAYBEVOID, 0 }, {MAP_CHAR_LEN(SC_UNONAME_FUNCTION), 0, &getCppuType((GeneralFunction*)0), 0, 0 }, @@ -142,7 +142,7 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotFieldMap() const SfxItemPropertyMapEntry* lcl_GetDataPilotItemMap() { - static SfxItemPropertyMapEntry aDataPilotItemMap_Impl[] = + static const SfxItemPropertyMapEntry aDataPilotItemMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_ISHIDDEN), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_POS), 0, &getCppuType((sal_Int32*)0), 0, 0 }, diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 079e97b5c002..df93ca452569 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -65,7 +65,7 @@ static const SfxItemPropertyMapEntry* lcl_GetSubTotalPropertyMap() { // some old property names are for 5.2 compatibility - static SfxItemPropertyMapEntry aSubTotalPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aSubTotalPropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_BINDFMT), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_CASE), 0, &getBooleanCppuType(), 0, 0}, @@ -86,7 +86,7 @@ static const SfxItemPropertyMapEntry* lcl_GetSubTotalPropertyMap() static const SfxItemPropertyMapEntry* lcl_GetFilterPropertyMap() { - static SfxItemPropertyMapEntry aFilterPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aFilterPropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_CONTHDR), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_COPYOUT), 0, &getBooleanCppuType(), 0, 0}, @@ -104,7 +104,7 @@ static const SfxItemPropertyMapEntry* lcl_GetFilterPropertyMap() static const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap() { - static SfxItemPropertyMapEntry aDBRangePropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aDBRangePropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_AUTOFLT), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_FLTCRT), 0, &getCppuType((table::CellRangeAddress*)0), 0, 0}, diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index 5afa88f7e900..992accaf0bfd 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star; static const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap() { - static SfxItemPropertyMapEntry aDocDefaultsMap_Impl[] = + static const SfxItemPropertyMapEntry aDocDefaultsMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index e089f3b96992..ed622056bcfd 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -105,7 +105,7 @@ using namespace com::sun::star; //! umbenennen, sind nicht mehr nur Options static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() { - static SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_APPLYFMDES), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_AREALINKS), 0, &getCppuType((uno::Reference<sheet::XAreaLinks>*)0), 0, 0}, @@ -157,7 +157,7 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() static const SfxItemPropertyMapEntry* lcl_GetColumnsPropertyMap() { - static SfxItemPropertyMapEntry aColumnsPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aColumnsPropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), 0, &getBooleanCppuType(), 0, 0 }, @@ -171,7 +171,7 @@ static const SfxItemPropertyMapEntry* lcl_GetColumnsPropertyMap() static const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap() { - static SfxItemPropertyMapEntry aRowsPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aRowsPropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_CELLHGT), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLFILT), 0, &getBooleanCppuType(), 0, 0 }, diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 24b12f3fd4c7..abbbc2a25bf2 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -53,7 +53,7 @@ namespace { const SfxItemPropertySet* getDateTimePropertySet() { - static SfxItemPropertyMapEntry aMapContent[] = + static const SfxItemPropertyMapEntry aMapContent[] = { { MAP_CHAR_LEN(SC_UNONAME_DATETIME), 0, &getCppuType((const util::DateTime*)0), 0, 0 }, { MAP_CHAR_LEN(SC_UNONAME_ISFIXED), 0, &getBooleanCppuType(), 0, 0 }, @@ -67,7 +67,7 @@ const SfxItemPropertySet* getDateTimePropertySet() const SfxItemPropertySet* getEmptyPropertySet() { - static SfxItemPropertyMapEntry aMapContent[] = + static const SfxItemPropertyMapEntry aMapContent[] = { {0,0,0,0,0,0} }; @@ -77,7 +77,7 @@ const SfxItemPropertySet* getEmptyPropertySet() const SfxItemPropertySet* lcl_GetURLPropertySet() { - static SfxItemPropertyMapEntry aURLPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aURLPropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_ANCTYPE), 0, &getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ANCTYPES), 0, &getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY, 0 }, @@ -93,7 +93,7 @@ const SfxItemPropertySet* lcl_GetURLPropertySet() const SfxItemPropertySet* lcl_GetHeaderFieldPropertySet() { - static SfxItemPropertyMapEntry aHeaderFieldPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aHeaderFieldPropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_ANCTYPE), 0, &getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ANCTYPES), 0, &getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY, 0 }, @@ -106,7 +106,7 @@ const SfxItemPropertySet* lcl_GetHeaderFieldPropertySet() const SfxItemPropertySet* lcl_GetFileFieldPropertySet() { - static SfxItemPropertyMapEntry aFileFieldPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aFileFieldPropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_ANCTYPE), 0, &getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ANCTYPES), 0, &getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY, 0 }, diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 67a2ad82323f..6b38aee605ee 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -46,7 +46,7 @@ using namespace ::formula; static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap() { - static SfxItemPropertyMapEntry aValidatePropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aValidatePropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_ERRALSTY), 0, &getCppuType((sheet::ValidationAlertStyle*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_ERRMESS), 0, &getCppuType((OUString*)0), 0, 0}, diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 0531ff96dd06..f2f16b7e1191 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -53,7 +53,7 @@ using ::std::vector; // fuer Sheet- und Area-Links benutzt: static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap() { - static SfxItemPropertyMapEntry aSheetLinkMap_Impl[] = + static const SfxItemPropertyMapEntry aSheetLinkMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_FILTER), 0, &getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_FILTOPT), 0, &getCppuType((OUString*)0), 0, 0 }, diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 659f6a49117f..0ec46ba10121 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -49,7 +49,7 @@ using ::com::sun::star::uno::Any; static const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap() { - static SfxItemPropertyMapEntry aNamedRangeMap_Impl[] = + static const SfxItemPropertyMapEntry aNamedRangeMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 }, @@ -62,7 +62,7 @@ static const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap() static const SfxItemPropertyMapEntry* lcl_GetNamedRangesMap() { - static SfxItemPropertyMapEntry aNamedRangesMap_Impl[] = + static const SfxItemPropertyMapEntry aNamedRangesMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_MODIFY_BROADCAST), 0, &getBooleanCppuType(), 0, 0 }, {0,0,0,0,0,0} diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index ad1787b055b5..be5bc1f107ef 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -42,7 +42,7 @@ using namespace com::sun::star; static const SvxItemPropertySet* lcl_GetAnnotationPropertySet() { - static SfxItemPropertyMapEntry aAnnotationPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aAnnotationPropertyMap_Impl[] = { SVX_UNOEDIT_CHAR_PROPERTIES, SVX_UNOEDIT_FONT_PROPERTIES, diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index 8efb9e3c395a..6dae636f87bb 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -31,7 +31,7 @@ using namespace com::sun::star; //------------------------------------------------------------------------ const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap() { - static SfxItemPropertyMapEntry aMap[] = + static const SfxItemPropertyMapEntry aMap[] = { {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN), PROP_UNO_CALCASSHOWN , &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_DEFTABSTOP), PROP_UNO_DEFTABSTOP , &getCppuType((sal_Int16*)0), 0, 0}, diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 8c71f3f74112..ba34f21787a7 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -53,7 +53,7 @@ static ScShapeImplementationIdMap aImplementationIdMap; static const SfxItemPropertyMapEntry* lcl_GetShapeMap() { - static SfxItemPropertyMapEntry aShapeMap_Impl[] = + static const SfxItemPropertyMapEntry aShapeMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_ANCHOR), 0, &getCppuType((uno::Reference<uno::XInterface>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_HORIPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 }, diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index db59a3444464..6e9cb8042705 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -41,7 +41,7 @@ using namespace com::sun::star; static const SfxItemPropertyMapEntry* lcl_GetSearchPropertyMap() { - static SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_SRCHBACK), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_SRCHBYROW), 0, &getBooleanCppuType(), 0, 0}, diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 246639d0c609..163c5a8aba6f 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -71,7 +71,7 @@ using namespace ::com::sun::star; static const SfxItemPropertySet* lcl_GetCellStyleSet() { - static SfxItemPropertyMapEntry aCellStyleMap_Impl[] = + static const SfxItemPropertyMapEntry aCellStyleMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, @@ -171,7 +171,7 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet() static const SfxItemPropertySet * lcl_GetPageStyleSet() { - static SfxItemPropertyMapEntry aPageStyleMap_Impl[] = + static const SfxItemPropertyMapEntry aPageStyleMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_PAGE_BACKCOLOR), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_FILTER }, @@ -292,7 +292,7 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() static const SfxItemPropertyMap* lcl_GetHeaderStyleMap() { - static SfxItemPropertyMapEntry aHeaderStyleMap_Impl[] = + static const SfxItemPropertyMapEntry aHeaderStyleMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_FILTER }, @@ -331,7 +331,7 @@ static const SfxItemPropertyMap* lcl_GetHeaderStyleMap() static const SfxItemPropertyMap* lcl_GetFooterStyleMap() { - static SfxItemPropertyMapEntry aFooterStyleMap_Impl[] = + static const SfxItemPropertyMapEntry aFooterStyleMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_FILTER }, diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index df4479931aaf..fe1de8d019cf 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -50,7 +50,7 @@ sal_uInt16 nTypeResIds[SC_LINKTARGETTYPE_COUNT] = static const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap() { - static SfxItemPropertyMapEntry aLinkTargetMap_Impl[] = + static const SfxItemPropertyMapEntry aLinkTargetMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((const uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 }, diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index bb49faf9d49d..f4d53d530a10 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star; static const SfxItemPropertyMapEntry* lcl_GetFormulaParserMap() { - static SfxItemPropertyMapEntry aFormulaParserMap_Impl[] = + static const SfxItemPropertyMapEntry aFormulaParserMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_COMPILEFAP), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_COMPILEENGLISH), 0, &getBooleanCppuType(), 0, 0 }, diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 6fc5d69ad99c..ebfc48d801fd 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -81,7 +81,7 @@ using namespace com::sun::star; static const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap() { - static SfxItemPropertyMapEntry aViewOptPropertyMap_Impl[] = + static const SfxItemPropertyMapEntry aViewOptPropertyMap_Impl[] = { {MAP_CHAR_LEN(OLD_UNO_COLROWHDR), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_GRIDCOLOR), 0, &getCppuType((sal_Int32*)0), 0, 0}, @@ -1039,7 +1039,7 @@ sal_Bool SAL_CALL ScTabViewObj::hasElements() throw(uno::RuntimeException) ScViewPaneObj* ScTabViewObj::GetObjectByIndex_Impl(sal_uInt16 nIndex) const { - static ScSplitPos ePosHV[4] = + static const ScSplitPos ePosHV[4] = { SC_SPLIT_TOPLEFT, SC_SPLIT_BOTTOMLEFT, SC_SPLIT_TOPRIGHT, SC_SPLIT_BOTTOMRIGHT }; ScTabViewShell* pViewSh = GetViewShell(); |