[Libreoffice-commits] core.git: toolkit/source tools/source ucb/source writerfilter/source
Takeshi Abe
tabe at fixedpoint.jp
Wed Jul 17 00:55:13 PDT 2013
toolkit/source/awt/vclxtoolkit.cxx | 2 +-
tools/source/generic/color.cxx | 2 +-
ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx | 6 +++---
writerfilter/source/dmapper/GraphicHelpers.cxx | 8 ++++----
writerfilter/source/dmapper/NumberingManager.cxx | 2 +-
writerfilter/source/dmapper/PropertyMap.cxx | 2 +-
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 +-
writerfilter/source/rtftok/rtfsdrimport.cxx | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 029c630a66ae8225e3a7e904d3085dbf79f0d64f
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Wed Jul 17 14:58:15 2013 +0900
Mark as const
Change-Id: I59ac01eacf31061093b83ab3057963de7ea4a2e7
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 881e41b..f04e9f8 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -375,7 +375,7 @@ namespace
sal_Int32 nLen;
};
- static MessageBoxTypeInfo aMessageBoxTypeInfo[] =
+ static const MessageBoxTypeInfo aMessageBoxTypeInfo[] =
{
{ css::awt::MessageBoxType_MESSAGEBOX, RTL_CONSTASCII_STRINGPARAM("messbox") },
{ css::awt::MessageBoxType_INFOBOX, RTL_CONSTASCII_STRINGPARAM("infobox") },
diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx
index 871c4d1..d1ae802 100644
--- a/tools/source/generic/color.cxx
+++ b/tools/source/generic/color.cxx
@@ -256,7 +256,7 @@ SvStream& operator>>( SvStream& rIStream, Color& rColor )
}
else
{
- static ColorData aColAry[] =
+ static const ColorData aColAry[] =
{
COL_BLACK, // COL_BLACK
COL_BLUE, // COL_BLUE
diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
index 5143a2c..032c107 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
@@ -221,7 +221,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
if ( isReadOnly() )
{
- static beans::Property aFolderPropertyInfoTable[] =
+ static const beans::Property aFolderPropertyInfoTable[] =
{
///////////////////////////////////////////////////////////
// Required properties
@@ -273,7 +273,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
}
else
{
- static beans::Property aFolderPropertyInfoTable[] =
+ static const beans::Property aFolderPropertyInfoTable[] =
{
///////////////////////////////////////////////////////////
// Required properties
@@ -334,7 +334,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
// Currently no difference between reonly /read-write
// -> all props ar read-only
- static beans::Property aRootFolderPropertyInfoTable[] =
+ static const beans::Property aRootFolderPropertyInfoTable[] =
{
///////////////////////////////////////////////////////////////
// Required properties
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 9a259b9..d2e64d2 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -73,7 +73,7 @@ void PositionHandler::lcl_attribute( Id aName, Value& rVal )
case NS_ooxml::LN_CT_PosV_relativeFrom:
{
// TODO There are some other unhandled values
- static Id pVertRelValues[] =
+ static const Id pVertRelValues[] =
{
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromV_margin,
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromV_page,
@@ -81,7 +81,7 @@ void PositionHandler::lcl_attribute( Id aName, Value& rVal )
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromV_line
};
- static sal_Int16 pVertRelations[] =
+ static const sal_Int16 pVertRelations[] =
{
text::RelOrientation::PAGE_PRINT_AREA,
text::RelOrientation::PAGE_FRAME,
@@ -99,7 +99,7 @@ void PositionHandler::lcl_attribute( Id aName, Value& rVal )
case NS_ooxml::LN_CT_PosH_relativeFrom:
{
// TODO There are some other unhandled values
- static Id pHoriRelValues[] =
+ static const Id pHoriRelValues[] =
{
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromH_margin,
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromH_page,
@@ -107,7 +107,7 @@ void PositionHandler::lcl_attribute( Id aName, Value& rVal )
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromH_character
};
- static sal_Int16 pHoriRelations[] =
+ static const sal_Int16 pHoriRelations[] =
{
text::RelOrientation::PAGE_PRINT_AREA,
text::RelOrientation::PAGE_FRAME,
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 97cbb4f..587f8b3 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -1029,7 +1029,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
break;
case NS_ooxml::LN_CT_Lvl_lvlJc:
{
- static sal_Int16 aWWAlignments[ ] =
+ static const sal_Int16 aWWAlignments[ ] =
{
text::HoriOrientation::LEFT,
text::HoriOrientation::CENTER,
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index f526bc1..de0e3ad 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -667,7 +667,7 @@ void SectionPropertyMap::CopyLastHeaderFooter( bool bFirstPage, DomainMapper_Imp
try {
// Loop over the Header and Footer properties to copy them
- static PropertyIds aProperties[] =
+ static const PropertyIds aProperties[] =
{
PROP_HEADER_TEXT,
PROP_FOOTER_TEXT,
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 77a5d31..1f09135 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4922,7 +4922,7 @@ RTFSprms RTFFrame::getSprms()
{
RTFSprms sprms;
- static Id pNames[] =
+ static const Id pNames[] =
{
NS_ooxml::LN_CT_FramePr_x,
NS_ooxml::LN_CT_FramePr_y,
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 0494ac0..78c34d9 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -530,7 +530,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose)
}
else
{
- static OUString aBorders[] = {
+ static const OUString aBorders[] = {
OUString("TopBorder"), OUString("LeftBorder"), OUString("BottomBorder"), OUString("RightBorder")
};
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aBorders); ++i)
More information about the Libreoffice-commits
mailing list