[Libreoffice-commits] core.git: 2 commits - writerfilter/source xmloff/source
Takeshi Abe
tabe at fixedpoint.jp
Mon Sep 9 10:50:35 PDT 2013
writerfilter/source/filter/WriterFilter.cxx | 2
xmloff/source/chart/SchXMLAxisContext.cxx | 4
xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx | 12 -
xmloff/source/text/XMLFootnoteImportContext.cxx | 6
xmloff/source/text/XMLIndexSourceBaseContext.cxx | 2
xmloff/source/text/XMLSectionImportContext.cxx | 2
xmloff/source/text/XMLSectionSourceDDEImportContext.cxx | 2
xmloff/source/text/XMLSectionSourceImportContext.cxx | 2
xmloff/source/text/XMLTextColumnsContext.cxx | 8 -
xmloff/source/text/XMLTextListItemContext.cxx | 4
xmloff/source/text/txtdropi.cxx | 2
xmloff/source/text/txtfldi.cxx | 20 +-
xmloff/source/text/txtimp.cxx | 84 +++++------
xmloff/source/text/txtparai.cxx | 2
xmloff/source/text/txtparai.hxx | 4
xmloff/source/text/txtstyli.cxx | 2
16 files changed, 79 insertions(+), 79 deletions(-)
New commits:
commit 6509bbee4f752b2b47df2511d5004c1a23317da5
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Sep 10 02:48:41 2013 +0900
sal_Bool to bool
Change-Id: If6d39259c29e9abcb693c9b0bdfb89b94001f928
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index fde5711..b202a18 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -59,7 +59,7 @@ class XMLFootnoteConfigHelper : public SvXMLImportContext
{
OUStringBuffer sBuffer;
XMLFootnoteConfigurationImportContext& rConfig;
- sal_Bool bIsBegin;
+ bool bIsBegin;
public:
TYPEINFO();
@@ -69,7 +69,7 @@ public:
sal_uInt16 nPrfx,
const OUString& rLName,
XMLFootnoteConfigurationImportContext& rConfigImport,
- sal_Bool bBegin);
+ bool bBegin);
virtual void EndElement();
@@ -83,7 +83,7 @@ XMLFootnoteConfigHelper::XMLFootnoteConfigHelper(
sal_uInt16 nPrfx,
const OUString& rLName,
XMLFootnoteConfigurationImportContext& rConfigImport,
- sal_Bool bBegin)
+ bool bBegin)
: SvXMLImportContext(rImport, nPrfx, rLName)
, sBuffer()
, rConfig(rConfigImport)
@@ -305,14 +305,14 @@ SvXMLImportContext *XMLFootnoteConfigurationImportContext::CreateChildContext(
{
pContext = new XMLFootnoteConfigHelper(GetImport(),
nPrefix, rLocalName,
- *this, sal_False);
+ *this, false);
}
else if ( IsXMLToken( rLocalName,
XML_FOOTNOTE_CONTINUATION_NOTICE_BACKWARD ) )
{
pContext = new XMLFootnoteConfigHelper(GetImport(),
nPrefix, rLocalName,
- *this, sal_True);
+ *this, true);
}
// else: default context
}
diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx
index f1e29cf..5ea7c54 100644
--- a/xmloff/source/text/XMLFootnoteImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.cxx
@@ -85,7 +85,7 @@ void XMLFootnoteImportContext::StartElement(
if( xFactory.is() )
{
// create endnote or footnote
- sal_Bool bIsEndnote = sal_False;
+ bool bIsEndnote = false;
sal_Int16 nLength = xAttrList->getLength();
for(sal_Int16 nAttr1 = 0; nAttr1 < nLength; nAttr1++)
{
@@ -98,7 +98,7 @@ void XMLFootnoteImportContext::StartElement(
{
const OUString& rValue = xAttrList->getValueByIndex( nAttr1 );
if( IsXMLToken( rValue, XML_ENDNOTE ) )
- bIsEndnote = sal_True;
+ bIsEndnote = true;
break;
}
}
diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx
index 46378f4..0893b71 100644
--- a/xmloff/source/text/XMLTextListItemContext.cxx
+++ b/xmloff/source/text/XMLTextListItemContext.cxx
@@ -139,11 +139,11 @@ SvXMLImportContext *XMLTextListItemContext::CreateChildContext(
SvXMLImportContext *pContext = 0;
const SvXMLTokenMap& rTokenMap = rTxtImport.GetTextElemTokenMap();
- sal_Bool bHeading = sal_False;
+ bool bHeading = false;
switch( rTokenMap.Get( nPrefix, rLocalName ) )
{
case XML_TOK_TEXT_H:
- bHeading = sal_True;
+ bHeading = true;
case XML_TOK_TEXT_P:
pContext = new XMLParaContext( GetImport(),
nPrefix, rLocalName,
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 2183452..335235c 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -3066,10 +3066,10 @@ void XMLDdeFieldDeclImportContext::StartElement(
OUString sCommandItem;
sal_Bool bUpdate = sal_False;
- sal_Bool bNameOK = sal_False;
- sal_Bool bCommandApplicationOK = sal_False;
- sal_Bool bCommandTopicOK = sal_False;
- sal_Bool bCommandItemOK = sal_False;
+ bool bNameOK = false;
+ bool bCommandApplicationOK = false;
+ bool bCommandTopicOK = false;
+ bool bCommandItemOK = false;
// process attributes
sal_Int16 nLength = xAttrList->getLength();
@@ -3084,19 +3084,19 @@ void XMLDdeFieldDeclImportContext::StartElement(
{
case XML_TOK_DDEFIELD_NAME:
sName = xAttrList->getValueByIndex(i);
- bNameOK = sal_True;
+ bNameOK = true;
break;
case XML_TOK_DDEFIELD_APPLICATION:
sCommandApplication = xAttrList->getValueByIndex(i);
- bCommandApplicationOK = sal_True;
+ bCommandApplicationOK = true;
break;
case XML_TOK_DDEFIELD_TOPIC:
sCommandTopic = xAttrList->getValueByIndex(i);
- bCommandTopicOK = sal_True;
+ bCommandTopicOK = true;
break;
case XML_TOK_DDEFIELD_ITEM:
sCommandItem = xAttrList->getValueByIndex(i);
- bCommandItemOK = sal_True;
+ bCommandItemOK = true;
break;
case XML_TOK_DDEFIELD_UPDATE:
{
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 33c9c2d..644f788 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1173,7 +1173,7 @@ void XMLTextImportHelper::DeleteParagraph()
DBG_ASSERT(m_pImpl->m_xCursor.is(), "no cursor");
DBG_ASSERT(m_pImpl->m_xCursorAsRange.is(), "no range");
- sal_Bool bDelete = sal_True;
+ bool bDelete = true;
Reference < XEnumerationAccess > const xEnumAccess(
m_pImpl->m_xCursor, UNO_QUERY);
if( xEnumAccess.is() )
@@ -1187,7 +1187,7 @@ void XMLTextImportHelper::DeleteParagraph()
if( xComp.is() )
{
xComp->dispose();
- bDelete = sal_False;
+ bDelete = false;
}
}
}
@@ -1209,7 +1209,7 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars,
SvXMLImport& rImport ) const
{
OUStringBuffer sChars( rChars );
- sal_Bool bConverted = sal_False;
+ bool bConverted = false;
for( sal_Int32 j=0; j<rChars.getLength(); j++ )
{
sal_Unicode c = rChars[j];
@@ -1270,12 +1270,12 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars,
if( (rFlags & CONV_FROM_STAR_BATS ) != 0 )
{
sChars[j] = rImport.ConvStarBatsCharToStarSymbol( c );
- bConverted = sal_True;
+ bConverted = true;
}
else if( (rFlags & CONV_FROM_STAR_MATH ) != 0 )
{
sChars[j] = rImport.ConvStarMathCharToStarSymbol( c );
- bConverted = sal_True;
+ bConverted = true;
}
}
}
@@ -1289,18 +1289,18 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars,
/* Apply special case, that found list style equals the chapter numbering, also
to the found list styles of the parent styles. (#i73973#)
*/
-static sal_Bool lcl_HasListStyle( OUString sStyleName,
+static bool lcl_HasListStyle( OUString sStyleName,
const Reference < XNameContainer >& xParaStyles,
SvXMLImport& rImport,
const OUString& sNumberingStyleName,
const OUString& sOutlineStyleName )
{
- sal_Bool bRet( sal_False );
+ bool bRet( false );
if ( !xParaStyles->hasByName( sStyleName ) )
{
// error case
- return sal_True;
+ return true;
}
Reference< XPropertyState > xPropState( xParaStyles->getByName( sStyleName ),
@@ -1308,13 +1308,13 @@ static sal_Bool lcl_HasListStyle( OUString sStyleName,
if ( !xPropState.is() )
{
// error case
- return sal_False;
+ return false;
}
if ( xPropState->getPropertyState( sNumberingStyleName ) == PropertyState_DIRECT_VALUE )
{
// list style found
- bRet = sal_True;
+ bRet = true;
// special case: the set list style equals the chapter numbering
Reference< XPropertySet > xPropSet( xPropState, UNO_QUERY );
if ( xPropSet.is() )
@@ -1324,7 +1324,7 @@ static sal_Bool lcl_HasListStyle( OUString sStyleName,
if ( !sListStyle.isEmpty() &&
sListStyle == sOutlineStyleName )
{
- bRet = sal_False;
+ bRet = false;
}
}
}
@@ -1359,12 +1359,12 @@ static sal_Bool lcl_HasListStyle( OUString sStyleName,
if ( !xPropState.is() )
{
// error case
- return sal_True;
+ return true;
}
if ( xPropState->getPropertyState( sNumberingStyleName ) == PropertyState_DIRECT_VALUE )
{
// list style found
- bRet = sal_True;
+ bRet = true;
// Special case: the found list style equals the chapter numbering (#i73973#)
Reference< XPropertySet > xPropSet( xPropState, UNO_QUERY );
if ( xPropSet.is() )
@@ -1374,7 +1374,7 @@ static sal_Bool lcl_HasListStyle( OUString sStyleName,
if ( !sListStyle.isEmpty() &&
sListStyle == sOutlineStyleName )
{
- bRet = sal_False;
+ bRet = false;
}
// Special handling for text documents from OOo version prior OOo 2.4 (#i77708#)
/* Check explicitly on certain versions and on import of
@@ -1386,7 +1386,7 @@ static sal_Bool lcl_HasListStyle( OUString sStyleName,
( ( nUPD == 641 ) || ( nUPD == 645 ) || // prior OOo 2.0
( nUPD == 680 && nBuild <= 9238 ) ) ) ) ) // OOo 2.0 - OOo 2.3.1
{
- bRet = sal_False;
+ bRet = false;
}
}
break;
@@ -1521,10 +1521,10 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
if (pListBlock || pNumberedParagraph)
{
// Assure that list style of automatic paragraph style is applied at paragraph. (#i101349#)
- sal_Bool bApplyNumRules = pStyle && pStyle->IsListStyleSet();
+ bool bApplyNumRules = pStyle && pStyle->IsListStyleSet();
if ( !bApplyNumRules )
{
- sal_Bool bSameNumRules = xNewNumRules == xNumRules;
+ bool bSameNumRules = xNewNumRules == xNumRules;
if( !bSameNumRules && xNewNumRules.is() && xNumRules.is() )
{
// If the interface pointers are different then this does
@@ -2156,13 +2156,13 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
SvXMLImportContext *pContext = 0;
const SvXMLTokenMap& rTokenMap = GetTextElemTokenMap();
- sal_Bool bHeading = sal_False;
- sal_Bool bContent = sal_True;
+ bool bHeading = false;
+ bool bContent = true;
sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName );
switch( nToken )
{
case XML_TOK_TEXT_H:
- bHeading = sal_True;
+ bHeading = true;
case XML_TOK_TEXT_P:
pContext = new XMLParaContext( rImport,
nPrefix, rLocalName,
@@ -2197,7 +2197,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
{
pContext = new XMLVariableDeclsImportContext(
rImport, *this, nPrefix, rLocalName, VarTypeSequence);
- bContent = sal_False;
+ bContent = false;
}
break;
@@ -2207,7 +2207,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
{
pContext = new XMLVariableDeclsImportContext(
rImport, *this, nPrefix, rLocalName, VarTypeSimple);
- bContent = sal_False;
+ bContent = false;
}
break;
@@ -2217,7 +2217,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
{
pContext = new XMLVariableDeclsImportContext(
rImport, *this, nPrefix, rLocalName, VarTypeUserField);
- bContent = sal_False;
+ bContent = false;
}
break;
@@ -2227,7 +2227,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
{
pContext = new XMLDdeFieldDeclsImportContext(
rImport, nPrefix, rLocalName);
- bContent = sal_False;
+ bContent = false;
}
break;
@@ -2242,7 +2242,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
pContext = new XMLTextFrameContext( rImport, nPrefix,
rLocalName, xAttrList,
eAnchorType );
- bContent = sal_False;
+ bContent = false;
}
break;
@@ -2257,7 +2257,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
pContext = new XMLTextFrameHyperlinkContext( rImport, nPrefix,
rLocalName, xAttrList,
eAnchorType );
- bContent = sal_False;
+ bContent = false;
}
break;
@@ -2280,7 +2280,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
case XML_TOK_TEXT_TRACKED_CHANGES:
pContext = new XMLTrackedChangesImportContext( rImport, nPrefix,
rLocalName);
- bContent = sal_False;
+ bContent = false;
break;
case XML_TOK_TEXT_CHANGE:
@@ -2295,7 +2295,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
case XML_TOK_TEXT_FORMS:
pContext = rImport.GetFormImport()->createOfficeFormsContext(rImport, nPrefix, rLocalName);
- bContent = sal_False;
+ bContent = false;
break;
case XML_TOK_TEXT_AUTOMARK:
@@ -2303,12 +2303,12 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
{
pContext = new XMLAutoMarkFileContext(rImport, nPrefix,rLocalName);
}
- bContent = sal_False;
+ bContent = false;
break;
case XML_TOK_TEXT_CALCULATION_SETTINGS:
pContext = new XMLCalculationSettingsContext ( rImport, nPrefix, rLocalName, xAttrList);
- bContent = sal_False;
+ bContent = false;
break;
default:
@@ -2319,7 +2319,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
Reference < XShapes > xShapes;
pContext = rImport.GetShapeImport()->CreateGroupChildContext(
rImport, nPrefix, rLocalName, xAttrList, xShapes );
- bContent = sal_False;
+ bContent = false;
}
}
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index c6dd031..c73c129 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -1828,7 +1828,7 @@ XMLParaContext::XMLParaContext(
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
- sal_Bool bHead ) :
+ bool bHead ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
xStart( rImport.GetTextImport()->GetCursorAsRange()->getStart() ),
m_bHaveAbout(false),
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index e4557ad..2c43760 100644
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
@@ -49,7 +49,7 @@ class XMLParaContext : public SvXMLImportContext
// Lost outline numbering in master document (#i73509#)
sal_Bool mbOutlineLevelAttrFound;
sal_Bool bIgnoreLeadingSpace;
- sal_Bool bHeading;
+ bool bHeading;
sal_Bool bIsListHeader;
sal_Bool bIsRestart;
sal_Int16 nStartValue;
@@ -64,7 +64,7 @@ public:
const OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
- sal_Bool bHeading );
+ bool bHeading );
virtual ~XMLParaContext();
commit 396534403b5d1e399ff1438df4c85519c900199d
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Sep 10 02:48:28 2013 +0900
Mark as const / static
Change-Id: I9bcf02b270200fd146d2bfee6f15ff1f9ad8888b
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index 7e139c5..d5a9c69 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -43,7 +43,7 @@ WriterFilter::~WriterFilter()
extern "C"
{
/* 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 },
{ WriterFilterDetection_createInstance, WriterFilterDetection_getImplementationName, WriterFilterDetection_getSupportedServiceNames, ::cppu::createSingleComponentFactory, 0, 0} ,
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index 9f5a6d6..806b4a3 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -51,7 +51,7 @@ using namespace com::sun::star;
using com::sun::star::uno::Reference;
-static SvXMLEnumMapEntry aXMLAxisDimensionMap[] =
+static const SvXMLEnumMapEntry aXMLAxisDimensionMap[] =
{
{ XML_X, SCH_XML_AXIS_X },
{ XML_Y, SCH_XML_AXIS_Y },
@@ -59,7 +59,7 @@ static SvXMLEnumMapEntry aXMLAxisDimensionMap[] =
{ XML_TOKEN_INVALID, 0 }
};
-static SvXMLEnumMapEntry aXMLAxisTypeMap[] =
+static const SvXMLEnumMapEntry aXMLAxisTypeMap[] =
{
{ XML_AUTO, ::com::sun::star::chart::ChartAxisType::AUTOMATIC },
{ XML_TEXT, ::com::sun::star::chart::ChartAxisType::CATEGORY },
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index cdcba8c..fde5711 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -184,7 +184,7 @@ enum XMLFtnConfigToken
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_BODY_STYLE_NAME, XML_TOK_FTNCONFIG_ANCHOR_STYLENAME },
diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx
index 9146a9f..f1e29cf 100644
--- a/xmloff/source/text/XMLFootnoteImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.cxx
@@ -55,7 +55,7 @@ enum XMLFootnoteChildToken {
XML_TOK_FTN_NOTE_BODY
};
-static SvXMLTokenMapEntry aFootnoteChildTokenMap[] =
+static const SvXMLTokenMapEntry aFootnoteChildTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_NOTE_CITATION,
XML_TOK_FTN_NOTE_CITATION },
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
index 8f93b70..f6fba2c 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
@@ -44,7 +44,7 @@ using ::com::sun::star::xml::sax::XAttributeList;
const sal_Char sAPI_CreateFromChapter[] = "CreateFromChapter";
const sal_Char sAPI_IsRelativeTabstops[] = "IsRelativeTabstops";
-static SvXMLTokenMapEntry aIndexSourceTokenMap[] =
+static const SvXMLTokenMapEntry aIndexSourceTokenMap[] =
{
{ XML_NAMESPACE_TEXT,
XML_OUTLINE_LEVEL,
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index 689c3b7..01d744c 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -69,7 +69,7 @@ enum XMLSectionToken
XML_TOK_SECTION_IS_HIDDEN
};
-static SvXMLTokenMapEntry aSectionTokenMap[] =
+static const SvXMLTokenMapEntry aSectionTokenMap[] =
{
{ XML_NAMESPACE_XML , XML_ID, XML_TOK_SECTION_XMLID },
{ XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_SECTION_STYLE_NAME },
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
index 5e7c20e..49a4609 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
@@ -75,7 +75,7 @@ enum XMLSectionSourceDDEToken
XML_TOK_SECTION_IS_AUTOMATIC_UPDATE
};
-static SvXMLTokenMapEntry aSectionSourceDDETokenMap[] =
+static const SvXMLTokenMapEntry aSectionSourceDDETokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION,
XML_TOK_SECTION_DDE_APPLICATION },
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx
index 043725c..6ffb53f 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx
@@ -62,7 +62,7 @@ enum XMLSectionSourceToken
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_TEXT, XML_FILTER_NAME, XML_TOK_SECTION_TEXT_FILTER_NAME },
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index 2e5f1b0..e9e72f4 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -57,7 +57,7 @@ enum SvXMLSepTokenMapAttrs
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_FO, XML_START_INDENT, XML_TOK_COLUMN_MARGIN_LEFT },
@@ -65,7 +65,7 @@ static SvXMLTokenMapEntry aColAttrTokenMap[] =
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_COLOR, XML_TOK_COLUMN_SEP_COLOR },
@@ -75,7 +75,7 @@ static SvXMLTokenMapEntry aColSepAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-SvXMLEnumMapEntry const pXML_Sep_Style_Enum[] =
+static SvXMLEnumMapEntry const pXML_Sep_Style_Enum[] =
{
{ XML_NONE, 0 },
{ XML_SOLID, 1 },
@@ -84,7 +84,7 @@ SvXMLEnumMapEntry const pXML_Sep_Style_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-SvXMLEnumMapEntry const pXML_Sep_Align_Enum[] =
+static SvXMLEnumMapEntry const pXML_Sep_Align_Enum[] =
{
{ XML_TOP, VerticalAlignment_TOP },
{ XML_MIDDLE, VerticalAlignment_MIDDLE },
diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx
index f2957d2..99d8355 100644
--- a/xmloff/source/text/txtdropi.cxx
+++ b/xmloff/source/text/txtdropi.cxx
@@ -47,7 +47,7 @@ enum SvXMLTokenMapDropAttrs
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_LENGTH, XML_TOK_DROP_LENGTH },
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index d793ab6..2183452 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -2996,7 +2996,7 @@ enum DdeFieldDeclAttrs
XML_TOK_DDEFIELD_UPDATE
};
-static SvXMLTokenMapEntry aDdeDeclAttrTokenMap[] =
+static const SvXMLTokenMapEntry aDdeDeclAttrTokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_DDEFIELD_NAME },
{ XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION, XML_TOK_DDEFIELD_APPLICATION },
@@ -3369,7 +3369,7 @@ XMLBibliographyFieldImportContext::XMLBibliographyFieldImportContext(
}
// 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_BOOK, BibliographyDataType::BOOK },
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 2798ab0..33c9c2d 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -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_H, XML_TOK_TEXT_H },
@@ -113,7 +113,7 @@ static SvXMLTokenMapEntry aTextElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static SvXMLTokenMapEntry aTextPElemTokenMap[] =
+static const SvXMLTokenMapEntry aTextPElemTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_SPAN, XML_TOK_TEXT_SPAN },
{ XML_NAMESPACE_TEXT, XML_TAB, XML_TOK_TEXT_TAB_STOP },
@@ -290,7 +290,7 @@ static SvXMLTokenMapEntry aTextPElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static SvXMLTokenMapEntry aTextPAttrTokenMap[] =
+static const SvXMLTokenMapEntry aTextPAttrTokenMap[] =
{
{ XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_P_XMLID },
{ XML_NAMESPACE_XHTML, XML_ABOUT, XML_TOK_TEXT_P_ABOUT },
@@ -308,7 +308,7 @@ static SvXMLTokenMapEntry aTextPAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] =
+static const SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] =
{
{ XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_NUMBERED_PARAGRAPH_XMLID },
{ XML_NAMESPACE_TEXT, XML_LIST_ID,
@@ -323,7 +323,7 @@ static SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] =
+static const SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] =
{
{ XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_LIST_BLOCK_XMLID },
{ XML_NAMESPACE_TEXT, XML_STYLE_NAME,
@@ -335,14 +335,14 @@ static SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] =
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_ITEM, XML_TOK_TEXT_LIST_ITEM },
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_NAME, XML_TOK_TEXT_FRAME_NAME },
@@ -374,7 +374,7 @@ static SvXMLTokenMapEntry aTextFrameAttrTokenMap[] =
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_HEIGHT, XML_TOK_TEXT_CONTOUR_HEIGHT },
@@ -385,7 +385,7 @@ static SvXMLTokenMapEntry aTextContourAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] =
+static const SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXT_HYPERLINK_HREF },
{ XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_TEXT_HYPERLINK_NAME },
@@ -397,7 +397,7 @@ static SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] =
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_FOOTER, XML_TOK_TEXT_MP_FOOTER },
@@ -409,7 +409,7 @@ static SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
+static const SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_FIXED, XML_TOK_TEXTFIELD_FIXED },
{ XML_NAMESPACE_TEXT, XML_DESCRIPTION, XML_TOK_TEXTFIELD_DESCRIPTION },
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index 4f30fa5..d0b03e4 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -61,7 +61,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
using namespace ::xmloff::token;
-static SvXMLEnumMapEntry aCategoryMap[] =
+static const SvXMLEnumMapEntry aCategoryMap[] =
{
{ XML_TEXT, ParagraphStyleCategory::TEXT },
{ XML_CHAPTER, ParagraphStyleCategory::CHAPTER },
More information about the Libreoffice-commits
mailing list