Kaydet (Commit) 39653440 authored tarafından Takeshi Abe's avatar Takeshi Abe

Mark as const / static

Change-Id: I9bcf02b270200fd146d2bfee6f15ff1f9ad8888b
üst ce48c098
...@@ -43,7 +43,7 @@ WriterFilter::~WriterFilter() ...@@ -43,7 +43,7 @@ WriterFilter::~WriterFilter()
extern "C" extern "C"
{ {
/* shared lib exports implemented with helpers */ /* shared lib exports implemented with helpers */
static struct ::cppu::ImplementationEntry s_component_entries [] = static const struct ::cppu::ImplementationEntry s_component_entries [] =
{ {
{ WriterFilter_createInstance, WriterFilter_getImplementationName, WriterFilter_getSupportedServiceNames, ::cppu::createSingleComponentFactory, 0, 0 }, { WriterFilter_createInstance, WriterFilter_getImplementationName, WriterFilter_getSupportedServiceNames, ::cppu::createSingleComponentFactory, 0, 0 },
{ WriterFilterDetection_createInstance, WriterFilterDetection_getImplementationName, WriterFilterDetection_getSupportedServiceNames, ::cppu::createSingleComponentFactory, 0, 0} , { WriterFilterDetection_createInstance, WriterFilterDetection_getImplementationName, WriterFilterDetection_getSupportedServiceNames, ::cppu::createSingleComponentFactory, 0, 0} ,
......
...@@ -51,7 +51,7 @@ using namespace com::sun::star; ...@@ -51,7 +51,7 @@ using namespace com::sun::star;
using com::sun::star::uno::Reference; using com::sun::star::uno::Reference;
static SvXMLEnumMapEntry aXMLAxisDimensionMap[] = static const SvXMLEnumMapEntry aXMLAxisDimensionMap[] =
{ {
{ XML_X, SCH_XML_AXIS_X }, { XML_X, SCH_XML_AXIS_X },
{ XML_Y, SCH_XML_AXIS_Y }, { XML_Y, SCH_XML_AXIS_Y },
...@@ -59,7 +59,7 @@ static SvXMLEnumMapEntry aXMLAxisDimensionMap[] = ...@@ -59,7 +59,7 @@ static SvXMLEnumMapEntry aXMLAxisDimensionMap[] =
{ XML_TOKEN_INVALID, 0 } { XML_TOKEN_INVALID, 0 }
}; };
static SvXMLEnumMapEntry aXMLAxisTypeMap[] = static const SvXMLEnumMapEntry aXMLAxisTypeMap[] =
{ {
{ XML_AUTO, ::com::sun::star::chart::ChartAxisType::AUTOMATIC }, { XML_AUTO, ::com::sun::star::chart::ChartAxisType::AUTOMATIC },
{ XML_TEXT, ::com::sun::star::chart::ChartAxisType::CATEGORY }, { XML_TEXT, ::com::sun::star::chart::ChartAxisType::CATEGORY },
......
...@@ -184,7 +184,7 @@ enum XMLFtnConfigToken ...@@ -184,7 +184,7 @@ enum XMLFtnConfigToken
XML_TOK_FTNCONFIG_POSITION XML_TOK_FTNCONFIG_POSITION
}; };
static SvXMLTokenMapEntry aTextFieldAttrTokenMap[] = static const SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
{ {
{ XML_NAMESPACE_TEXT, XML_CITATION_STYLE_NAME, XML_TOK_FTNCONFIG_CITATION_STYLENAME }, { XML_NAMESPACE_TEXT, XML_CITATION_STYLE_NAME, XML_TOK_FTNCONFIG_CITATION_STYLENAME },
{ XML_NAMESPACE_TEXT, XML_CITATION_BODY_STYLE_NAME, XML_TOK_FTNCONFIG_ANCHOR_STYLENAME }, { XML_NAMESPACE_TEXT, XML_CITATION_BODY_STYLE_NAME, XML_TOK_FTNCONFIG_ANCHOR_STYLENAME },
......
...@@ -55,7 +55,7 @@ enum XMLFootnoteChildToken { ...@@ -55,7 +55,7 @@ enum XMLFootnoteChildToken {
XML_TOK_FTN_NOTE_BODY XML_TOK_FTN_NOTE_BODY
}; };
static SvXMLTokenMapEntry aFootnoteChildTokenMap[] = static const SvXMLTokenMapEntry aFootnoteChildTokenMap[] =
{ {
{ XML_NAMESPACE_TEXT, XML_NOTE_CITATION, { XML_NAMESPACE_TEXT, XML_NOTE_CITATION,
XML_TOK_FTN_NOTE_CITATION }, XML_TOK_FTN_NOTE_CITATION },
......
...@@ -44,7 +44,7 @@ using ::com::sun::star::xml::sax::XAttributeList; ...@@ -44,7 +44,7 @@ using ::com::sun::star::xml::sax::XAttributeList;
const sal_Char sAPI_CreateFromChapter[] = "CreateFromChapter"; const sal_Char sAPI_CreateFromChapter[] = "CreateFromChapter";
const sal_Char sAPI_IsRelativeTabstops[] = "IsRelativeTabstops"; const sal_Char sAPI_IsRelativeTabstops[] = "IsRelativeTabstops";
static SvXMLTokenMapEntry aIndexSourceTokenMap[] = static const SvXMLTokenMapEntry aIndexSourceTokenMap[] =
{ {
{ XML_NAMESPACE_TEXT, { XML_NAMESPACE_TEXT,
XML_OUTLINE_LEVEL, XML_OUTLINE_LEVEL,
......
...@@ -69,7 +69,7 @@ enum XMLSectionToken ...@@ -69,7 +69,7 @@ enum XMLSectionToken
XML_TOK_SECTION_IS_HIDDEN XML_TOK_SECTION_IS_HIDDEN
}; };
static SvXMLTokenMapEntry aSectionTokenMap[] = static const SvXMLTokenMapEntry aSectionTokenMap[] =
{ {
{ XML_NAMESPACE_XML , XML_ID, XML_TOK_SECTION_XMLID }, { XML_NAMESPACE_XML , XML_ID, XML_TOK_SECTION_XMLID },
{ XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_SECTION_STYLE_NAME }, { XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_SECTION_STYLE_NAME },
......
...@@ -75,7 +75,7 @@ enum XMLSectionSourceDDEToken ...@@ -75,7 +75,7 @@ enum XMLSectionSourceDDEToken
XML_TOK_SECTION_IS_AUTOMATIC_UPDATE XML_TOK_SECTION_IS_AUTOMATIC_UPDATE
}; };
static SvXMLTokenMapEntry aSectionSourceDDETokenMap[] = static const SvXMLTokenMapEntry aSectionSourceDDETokenMap[] =
{ {
{ XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION, { XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION,
XML_TOK_SECTION_DDE_APPLICATION }, XML_TOK_SECTION_DDE_APPLICATION },
......
...@@ -62,7 +62,7 @@ enum XMLSectionSourceToken ...@@ -62,7 +62,7 @@ enum XMLSectionSourceToken
XML_TOK_SECTION_TEXT_SECTION_NAME XML_TOK_SECTION_TEXT_SECTION_NAME
}; };
static SvXMLTokenMapEntry aSectionSourceTokenMap[] = static const SvXMLTokenMapEntry aSectionSourceTokenMap[] =
{ {
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SECTION_XLINK_HREF }, { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SECTION_XLINK_HREF },
{ XML_NAMESPACE_TEXT, XML_FILTER_NAME, XML_TOK_SECTION_TEXT_FILTER_NAME }, { XML_NAMESPACE_TEXT, XML_FILTER_NAME, XML_TOK_SECTION_TEXT_FILTER_NAME },
......
...@@ -57,7 +57,7 @@ enum SvXMLSepTokenMapAttrs ...@@ -57,7 +57,7 @@ enum SvXMLSepTokenMapAttrs
XML_TOK_COLUMN_SEP_END=XML_TOK_UNKNOWN XML_TOK_COLUMN_SEP_END=XML_TOK_UNKNOWN
}; };
static SvXMLTokenMapEntry aColAttrTokenMap[] = static const SvXMLTokenMapEntry aColAttrTokenMap[] =
{ {
{ XML_NAMESPACE_STYLE, XML_REL_WIDTH, XML_TOK_COLUMN_WIDTH }, { XML_NAMESPACE_STYLE, XML_REL_WIDTH, XML_TOK_COLUMN_WIDTH },
{ XML_NAMESPACE_FO, XML_START_INDENT, XML_TOK_COLUMN_MARGIN_LEFT }, { XML_NAMESPACE_FO, XML_START_INDENT, XML_TOK_COLUMN_MARGIN_LEFT },
...@@ -65,7 +65,7 @@ static SvXMLTokenMapEntry aColAttrTokenMap[] = ...@@ -65,7 +65,7 @@ static SvXMLTokenMapEntry aColAttrTokenMap[] =
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
static SvXMLTokenMapEntry aColSepAttrTokenMap[] = static const SvXMLTokenMapEntry aColSepAttrTokenMap[] =
{ {
{ XML_NAMESPACE_STYLE, XML_WIDTH, XML_TOK_COLUMN_SEP_WIDTH }, { XML_NAMESPACE_STYLE, XML_WIDTH, XML_TOK_COLUMN_SEP_WIDTH },
{ XML_NAMESPACE_STYLE, XML_COLOR, XML_TOK_COLUMN_SEP_COLOR }, { XML_NAMESPACE_STYLE, XML_COLOR, XML_TOK_COLUMN_SEP_COLOR },
...@@ -75,7 +75,7 @@ static SvXMLTokenMapEntry aColSepAttrTokenMap[] = ...@@ -75,7 +75,7 @@ static SvXMLTokenMapEntry aColSepAttrTokenMap[] =
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
SvXMLEnumMapEntry const pXML_Sep_Style_Enum[] = static SvXMLEnumMapEntry const pXML_Sep_Style_Enum[] =
{ {
{ XML_NONE, 0 }, { XML_NONE, 0 },
{ XML_SOLID, 1 }, { XML_SOLID, 1 },
...@@ -84,7 +84,7 @@ SvXMLEnumMapEntry const pXML_Sep_Style_Enum[] = ...@@ -84,7 +84,7 @@ SvXMLEnumMapEntry const pXML_Sep_Style_Enum[] =
{ XML_TOKEN_INVALID, 0 } { XML_TOKEN_INVALID, 0 }
}; };
SvXMLEnumMapEntry const pXML_Sep_Align_Enum[] = static SvXMLEnumMapEntry const pXML_Sep_Align_Enum[] =
{ {
{ XML_TOP, VerticalAlignment_TOP }, { XML_TOP, VerticalAlignment_TOP },
{ XML_MIDDLE, VerticalAlignment_MIDDLE }, { XML_MIDDLE, VerticalAlignment_MIDDLE },
......
...@@ -47,7 +47,7 @@ enum SvXMLTokenMapDropAttrs ...@@ -47,7 +47,7 @@ enum SvXMLTokenMapDropAttrs
XML_TOK_DROP_END=XML_TOK_UNKNOWN XML_TOK_DROP_END=XML_TOK_UNKNOWN
}; };
static SvXMLTokenMapEntry aDropAttrTokenMap[] = static const SvXMLTokenMapEntry aDropAttrTokenMap[] =
{ {
{ XML_NAMESPACE_STYLE, XML_LINES, XML_TOK_DROP_LINES }, { XML_NAMESPACE_STYLE, XML_LINES, XML_TOK_DROP_LINES },
{ XML_NAMESPACE_STYLE, XML_LENGTH, XML_TOK_DROP_LENGTH }, { XML_NAMESPACE_STYLE, XML_LENGTH, XML_TOK_DROP_LENGTH },
......
...@@ -2996,7 +2996,7 @@ enum DdeFieldDeclAttrs ...@@ -2996,7 +2996,7 @@ enum DdeFieldDeclAttrs
XML_TOK_DDEFIELD_UPDATE XML_TOK_DDEFIELD_UPDATE
}; };
static SvXMLTokenMapEntry aDdeDeclAttrTokenMap[] = static const SvXMLTokenMapEntry aDdeDeclAttrTokenMap[] =
{ {
{ XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_DDEFIELD_NAME }, { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_DDEFIELD_NAME },
{ XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION, XML_TOK_DDEFIELD_APPLICATION }, { XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION, XML_TOK_DDEFIELD_APPLICATION },
...@@ -3369,7 +3369,7 @@ XMLBibliographyFieldImportContext::XMLBibliographyFieldImportContext( ...@@ -3369,7 +3369,7 @@ XMLBibliographyFieldImportContext::XMLBibliographyFieldImportContext(
} }
// TODO: this is the same map as is used in the text field export // TODO: this is the same map as is used in the text field export
SvXMLEnumMapEntry const aBibliographyDataTypeMap[] = static SvXMLEnumMapEntry const aBibliographyDataTypeMap[] =
{ {
{ XML_ARTICLE, BibliographyDataType::ARTICLE }, { XML_ARTICLE, BibliographyDataType::ARTICLE },
{ XML_BOOK, BibliographyDataType::BOOK }, { XML_BOOK, BibliographyDataType::BOOK },
......
...@@ -79,7 +79,7 @@ using ::comphelper::UStringLess; ...@@ -79,7 +79,7 @@ using ::comphelper::UStringLess;
static SvXMLTokenMapEntry aTextElemTokenMap[] = static const SvXMLTokenMapEntry aTextElemTokenMap[] =
{ {
{ XML_NAMESPACE_TEXT, XML_P, XML_TOK_TEXT_P }, { XML_NAMESPACE_TEXT, XML_P, XML_TOK_TEXT_P },
{ XML_NAMESPACE_TEXT, XML_H, XML_TOK_TEXT_H }, { XML_NAMESPACE_TEXT, XML_H, XML_TOK_TEXT_H },
...@@ -113,7 +113,7 @@ static SvXMLTokenMapEntry aTextElemTokenMap[] = ...@@ -113,7 +113,7 @@ static SvXMLTokenMapEntry aTextElemTokenMap[] =
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
static SvXMLTokenMapEntry aTextPElemTokenMap[] = static const SvXMLTokenMapEntry aTextPElemTokenMap[] =
{ {
{ XML_NAMESPACE_TEXT, XML_SPAN, XML_TOK_TEXT_SPAN }, { XML_NAMESPACE_TEXT, XML_SPAN, XML_TOK_TEXT_SPAN },
{ XML_NAMESPACE_TEXT, XML_TAB, XML_TOK_TEXT_TAB_STOP }, { XML_NAMESPACE_TEXT, XML_TAB, XML_TOK_TEXT_TAB_STOP },
...@@ -290,7 +290,7 @@ static SvXMLTokenMapEntry aTextPElemTokenMap[] = ...@@ -290,7 +290,7 @@ static SvXMLTokenMapEntry aTextPElemTokenMap[] =
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
static SvXMLTokenMapEntry aTextPAttrTokenMap[] = static const SvXMLTokenMapEntry aTextPAttrTokenMap[] =
{ {
{ XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_P_XMLID }, { XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_P_XMLID },
{ XML_NAMESPACE_XHTML, XML_ABOUT, XML_TOK_TEXT_P_ABOUT }, { XML_NAMESPACE_XHTML, XML_ABOUT, XML_TOK_TEXT_P_ABOUT },
...@@ -308,7 +308,7 @@ static SvXMLTokenMapEntry aTextPAttrTokenMap[] = ...@@ -308,7 +308,7 @@ static SvXMLTokenMapEntry aTextPAttrTokenMap[] =
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
static SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] = static const SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] =
{ {
{ XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_NUMBERED_PARAGRAPH_XMLID }, { XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_NUMBERED_PARAGRAPH_XMLID },
{ XML_NAMESPACE_TEXT, XML_LIST_ID, { XML_NAMESPACE_TEXT, XML_LIST_ID,
...@@ -323,7 +323,7 @@ static SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] = ...@@ -323,7 +323,7 @@ static SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] =
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
static SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] = static const SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] =
{ {
{ XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_LIST_BLOCK_XMLID }, { XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_LIST_BLOCK_XMLID },
{ XML_NAMESPACE_TEXT, XML_STYLE_NAME, { XML_NAMESPACE_TEXT, XML_STYLE_NAME,
...@@ -335,14 +335,14 @@ static SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] = ...@@ -335,14 +335,14 @@ static SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] =
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
static SvXMLTokenMapEntry aTextListBlockElemTokenMap[] = static const SvXMLTokenMapEntry aTextListBlockElemTokenMap[] =
{ {
{ XML_NAMESPACE_TEXT, XML_LIST_HEADER, XML_TOK_TEXT_LIST_HEADER }, { XML_NAMESPACE_TEXT, XML_LIST_HEADER, XML_TOK_TEXT_LIST_HEADER },
{ XML_NAMESPACE_TEXT, XML_LIST_ITEM, XML_TOK_TEXT_LIST_ITEM }, { XML_NAMESPACE_TEXT, XML_LIST_ITEM, XML_TOK_TEXT_LIST_ITEM },
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
static SvXMLTokenMapEntry aTextFrameAttrTokenMap[] = static const SvXMLTokenMapEntry aTextFrameAttrTokenMap[] =
{ {
{ XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_TEXT_FRAME_STYLE_NAME }, { XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_TEXT_FRAME_STYLE_NAME },
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_TEXT_FRAME_NAME }, { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_TEXT_FRAME_NAME },
...@@ -374,7 +374,7 @@ static SvXMLTokenMapEntry aTextFrameAttrTokenMap[] = ...@@ -374,7 +374,7 @@ static SvXMLTokenMapEntry aTextFrameAttrTokenMap[] =
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
static SvXMLTokenMapEntry aTextContourAttrTokenMap[] = static const SvXMLTokenMapEntry aTextContourAttrTokenMap[] =
{ {
{ XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_TEXT_CONTOUR_WIDTH }, { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_TEXT_CONTOUR_WIDTH },
{ XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_TEXT_CONTOUR_HEIGHT }, { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_TEXT_CONTOUR_HEIGHT },
...@@ -385,7 +385,7 @@ static SvXMLTokenMapEntry aTextContourAttrTokenMap[] = ...@@ -385,7 +385,7 @@ static SvXMLTokenMapEntry aTextContourAttrTokenMap[] =
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
static SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] = static const SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] =
{ {
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXT_HYPERLINK_HREF }, { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXT_HYPERLINK_HREF },
{ XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_TEXT_HYPERLINK_NAME }, { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_TEXT_HYPERLINK_NAME },
...@@ -397,7 +397,7 @@ static SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] = ...@@ -397,7 +397,7 @@ static SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] =
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
static SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] = static const SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] =
{ {
{ XML_NAMESPACE_STYLE, XML_HEADER, XML_TOK_TEXT_MP_HEADER }, { XML_NAMESPACE_STYLE, XML_HEADER, XML_TOK_TEXT_MP_HEADER },
{ XML_NAMESPACE_STYLE, XML_FOOTER, XML_TOK_TEXT_MP_FOOTER }, { XML_NAMESPACE_STYLE, XML_FOOTER, XML_TOK_TEXT_MP_FOOTER },
...@@ -409,7 +409,7 @@ static SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] = ...@@ -409,7 +409,7 @@ static SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] =
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
static SvXMLTokenMapEntry aTextFieldAttrTokenMap[] = static const SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
{ {
{ XML_NAMESPACE_TEXT, XML_FIXED, XML_TOK_TEXTFIELD_FIXED }, { XML_NAMESPACE_TEXT, XML_FIXED, XML_TOK_TEXTFIELD_FIXED },
{ XML_NAMESPACE_TEXT, XML_DESCRIPTION, XML_TOK_TEXTFIELD_DESCRIPTION }, { XML_NAMESPACE_TEXT, XML_DESCRIPTION, XML_TOK_TEXTFIELD_DESCRIPTION },
......
...@@ -61,7 +61,7 @@ using namespace ::com::sun::star::lang; ...@@ -61,7 +61,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container; using namespace ::com::sun::star::container;
using namespace ::xmloff::token; using namespace ::xmloff::token;
static SvXMLEnumMapEntry aCategoryMap[] = static const SvXMLEnumMapEntry aCategoryMap[] =
{ {
{ XML_TEXT, ParagraphStyleCategory::TEXT }, { XML_TEXT, ParagraphStyleCategory::TEXT },
{ XML_CHAPTER, ParagraphStyleCategory::CHAPTER }, { XML_CHAPTER, ParagraphStyleCategory::CHAPTER },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment