diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-07-02 16:15:00 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-07-02 18:45:39 +0200 |
| commit | 9d6a532e49b2bdc0ee808ff0f4e17d327d79a754 (patch) | |
| tree | 62a880c0af798f870174c8fc6753e4ddd79f8c64 /xmloff | |
| parent | e6862e7828ba6bdd63bffd7eeaecc7de5d7d1c2e (diff) | |
Upcoming improved loplugin:staticanonymous -> redundantstatic: xmloff
Change-Id: I47bd2f4b6bbe47b8a6c0aa8102186bf25a3804f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97772
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmloff')
82 files changed, 621 insertions, 621 deletions
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx index ac2c7010343a..ef7300e2354a 100644 --- a/xmloff/source/chart/SchXMLAxisContext.cxx +++ b/xmloff/source/chart/SchXMLAxisContext.cxx @@ -55,7 +55,7 @@ using namespace com::sun::star; using com::sun::star::uno::Reference; -static const SvXMLEnumMapEntry<SchXMLAxisDimension> aXMLAxisDimensionMap[] = +const SvXMLEnumMapEntry<SchXMLAxisDimension> aXMLAxisDimensionMap[] = { { XML_X, SCH_XML_AXIS_X }, { XML_Y, SCH_XML_AXIS_Y }, @@ -63,7 +63,7 @@ static const SvXMLEnumMapEntry<SchXMLAxisDimension> aXMLAxisDimensionMap[] = { XML_TOKEN_INVALID, SchXMLAxisDimension(0) } }; -static const SvXMLEnumMapEntry<sal_uInt16> aXMLAxisTypeMap[] = +const SvXMLEnumMapEntry<sal_uInt16> aXMLAxisTypeMap[] = { { XML_AUTO, css::chart::ChartAxisType::AUTOMATIC }, { XML_TEXT, css::chart::ChartAxisType::CATEGORY }, diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index f500ae82046a..5205819cbb8b 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -128,7 +128,7 @@ Reference< chart2::data::XDataSequence > lcl_createNewSequenceFromCachedXMLRange namespace SchXMLTools { -static const SvXMLEnumMapEntry<SchXMLChartTypeEnum> aXMLChartClassMap[] = +const SvXMLEnumMapEntry<SchXMLChartTypeEnum> aXMLChartClassMap[] = { { XML_LINE, XML_CHART_CLASS_LINE }, { XML_AREA, XML_CHART_CLASS_AREA }, diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx index be661375cff0..8bc2a018ca7a 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.cxx +++ b/xmloff/source/chart/XMLSymbolImageContext.cxx @@ -41,7 +41,7 @@ enum SvXMLTokenMapAttrs } -static const SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] = +const SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] = { { XML_NAMESPACE_XLINK, ::xmloff::token::XML_HREF, XML_TOK_SYMBOL_IMAGE_HREF }, { XML_NAMESPACE_XLINK, ::xmloff::token::XML_TYPE, XML_TOK_SYMBOL_IMAGE_TYPE }, diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx index 5c34cfadbc6b..07a103466666 100644 --- a/xmloff/source/core/ProgressBarHelper.cxx +++ b/xmloff/source/core/ProgressBarHelper.cxx @@ -23,8 +23,8 @@ using namespace ::com::sun::star; -static const sal_Int32 nDefaultProgressBarRange = 1000000; -static const float fProgressStep = 0.5; +const sal_Int32 nDefaultProgressBarRange = 1000000; +const float fProgressStep = 0.5; ProgressBarHelper::ProgressBarHelper(const css::uno::Reference < css::task::XStatusIndicator>& xTempStatusIndicator, const bool bTempStrict) diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx index 09a615b51893..c9a4ef73ba76 100644 --- a/xmloff/source/core/SettingsExportHelper.cxx +++ b/xmloff/source/core/SettingsExportHelper.cxx @@ -45,13 +45,13 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -static const OUStringLiteral gsPrinterIndependentLayout( "PrinterIndependentLayout" ); -static const OUStringLiteral gsColorTableURL( "ColorTableURL" ); -static const OUStringLiteral gsLineEndTableURL( "LineEndTableURL" ); -static const OUStringLiteral gsHatchTableURL( "HatchTableURL" ); -static const OUStringLiteral gsDashTableURL( "DashTableURL" ); -static const OUStringLiteral gsGradientTableURL( "GradientTableURL" ); -static const OUStringLiteral gsBitmapTableURL( "BitmapTableURL" ); +const OUStringLiteral gsPrinterIndependentLayout( "PrinterIndependentLayout" ); +const OUStringLiteral gsColorTableURL( "ColorTableURL" ); +const OUStringLiteral gsLineEndTableURL( "LineEndTableURL" ); +const OUStringLiteral gsHatchTableURL( "HatchTableURL" ); +const OUStringLiteral gsDashTableURL( "DashTableURL" ); +const OUStringLiteral gsGradientTableURL( "GradientTableURL" ); +const OUStringLiteral gsBitmapTableURL( "BitmapTableURL" ); XMLSettingsExportHelper::XMLSettingsExportHelper( ::xmloff::XMLSettingsExportContext& i_rContext ) : m_rContext( i_rContext ) diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index 2a2d106a6408..5b5017c7941b 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -46,7 +46,7 @@ using namespace ::xmloff::token; * Martin 13/06/01 */ -static const OUString sEmpty; +const OUString sEmpty; SvXMLNamespaceMap::SvXMLNamespaceMap() : sXMLNS( GetXMLToken ( XML_XMLNS ) ) diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index e6492898d6a3..133613784e84 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -279,7 +279,7 @@ static int lcl_gethex( int nChar ) return 0; } -static const char aHexTab[] = "0123456789abcdef"; +const char aHexTab[] = "0123456789abcdef"; /** convert double number to string (using ::rtl::math) */ diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx index ffbb5813ccdb..78e476784ac7 100644 --- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx +++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx @@ -42,7 +42,7 @@ struct TokenTable } -static const TokenTable pTokenTableArray[] = +const TokenTable pTokenTableArray[] = { { "type", EAS_type }, { "name", EAS_name }, diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 2586d95e82fa..8d0fa86cf0b6 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -77,7 +77,7 @@ enum XMLImageMapToken: decltype(XML_TOK_UNKNOWN) } -static const SvXMLTokenMapEntry aImageMapObjectTokenMap[] = +const SvXMLTokenMapEntry aImageMapObjectTokenMap[] = { { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_IMAP_URL }, { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_IMAP_NAME }, @@ -554,7 +554,7 @@ void XMLImageMapCircleContext::Prepare( } -static const OUStringLiteral gsImageMap("ImageMap"); +const OUStringLiteral gsImageMap("ImageMap"); XMLImageMapContext::XMLImageMapContext( SvXMLImport& rImport, diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx index 30a13b6a28b1..5a9827272836 100644 --- a/xmloff/source/draw/XMLImageMapExport.cxx +++ b/xmloff/source/draw/XMLImageMapExport.cxx @@ -53,17 +53,17 @@ using ::com::sun::star::document::XEventsSupplier; using ::com::sun::star::lang::XServiceInfo; using ::com::sun::star::drawing::PointSequence; -static const OUStringLiteral gsBoundary("Boundary"); -static const OUStringLiteral gsCenter("Center"); -static const OUStringLiteral gsDescription("Description"); -static const OUStringLiteral gsImageMap("ImageMap"); -static const OUStringLiteral gsIsActive("IsActive"); -static const OUStringLiteral gsName("Name"); -static const OUStringLiteral gsPolygon("Polygon"); -static const OUStringLiteral gsRadius("Radius"); -static const OUStringLiteral gsTarget("Target"); -static const OUStringLiteral gsURL("URL"); -static const OUStringLiteral gsTitle("Title"); +const OUStringLiteral gsBoundary("Boundary"); +const OUStringLiteral gsCenter("Center"); +const OUStringLiteral gsDescription("Description"); +const OUStringLiteral gsImageMap("ImageMap"); +const OUStringLiteral gsIsActive("IsActive"); +const OUStringLiteral gsName("Name"); +const OUStringLiteral gsPolygon("Polygon"); +const OUStringLiteral gsRadius("Radius"); +const OUStringLiteral gsTarget("Target"); +const OUStringLiteral gsURL("URL"); +const OUStringLiteral gsTitle("Title"); XMLImageMapExport::XMLImageMapExport(SvXMLExport& rExp) : mrExport(rExp) diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index 7aa293e75716..76b1fa60ef6b 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -511,7 +511,7 @@ static void lcl_CopyStream( xTransaction->commit(); } -static char const s_PkgScheme[] = "vnd.sun.star.Package:"; +char const s_PkgScheme[] = "vnd.sun.star.Package:"; static OUString lcl_StoreMediaAndGetURL(SvXMLExport & rExport, OUString const& rURL) { diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index ea8022e61fcc..fb0e055d8005 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -318,18 +318,18 @@ AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirecti namespace { - static constexpr OUStringLiteral gsDimColor = "DimColor"; - static constexpr OUStringLiteral gsDimHide = "DimHide"; - static constexpr OUStringLiteral gsDimPrev = "DimPrevious"; - static constexpr OUStringLiteral gsEffect = "Effect"; - static constexpr OUStringLiteral gsPlayFull = "PlayFull"; - static constexpr OUStringLiteral gsSound = "Sound"; - static constexpr OUStringLiteral gsSoundOn = "SoundOn"; - static constexpr OUStringLiteral gsSpeed = "Speed"; - static constexpr OUStringLiteral gsTextEffect = "TextEffect"; - static constexpr OUStringLiteral gsPresShapeService = "com.sun.star.presentation.Shape"; - static constexpr OUStringLiteral gsAnimPath = "AnimationPath"; - static constexpr OUStringLiteral gsIsAnimation = "IsAnimation"; + constexpr OUStringLiteral gsDimColor = "DimColor"; + constexpr OUStringLiteral gsDimHide = "DimHide"; + constexpr OUStringLiteral gsDimPrev = "DimPrevious"; + constexpr OUStringLiteral gsEffect = "Effect"; + constexpr OUStringLiteral gsPlayFull = "PlayFull"; + constexpr OUStringLiteral gsSound = "Sound"; + constexpr OUStringLiteral gsSoundOn = "SoundOn"; + constexpr OUStringLiteral gsSpeed = "Speed"; + constexpr OUStringLiteral gsTextEffect = "TextEffect"; + constexpr OUStringLiteral gsPresShapeService = "com.sun.star.presentation.Shape"; + constexpr OUStringLiteral gsAnimPath = "AnimationPath"; + constexpr OUStringLiteral gsIsAnimation = "IsAnimation"; }; namespace { diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 3f6c1a70a817..5134a947d4c6 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -388,7 +388,7 @@ const XMLPropertyMapEntry aXMLTableShapeAttributes[] = // implementation of factory for own graphic properties -static SvXMLEnumMapEntry<drawing::LineStyle> const aXML_LineStyle_EnumMap[] = +SvXMLEnumMapEntry<drawing::LineStyle> const aXML_LineStyle_EnumMap[] = { { XML_NONE, drawing::LineStyle_NONE }, { XML_SOLID, drawing::LineStyle_SOLID }, @@ -396,7 +396,7 @@ static SvXMLEnumMapEntry<drawing::LineStyle> const aXML_LineStyle_EnumMap[] = { XML_TOKEN_INVALID, drawing::LineStyle(0) } }; -static SvXMLEnumMapEntry<drawing::LineJoint> const aXML_LineJoint_EnumMap[] = +SvXMLEnumMapEntry<drawing::LineJoint> const aXML_LineJoint_EnumMap[] = { { XML_NONE, drawing::LineJoint_NONE }, { XML_MITER, drawing::LineJoint_MITER }, @@ -406,7 +406,7 @@ static SvXMLEnumMapEntry<drawing::LineJoint> const aXML_LineJoint_EnumMap[] = { XML_TOKEN_INVALID, drawing::LineJoint(0) } }; -static SvXMLEnumMapEntry<drawing::LineCap> const aXML_LineCap_EnumMap[] = +SvXMLEnumMapEntry<drawing::LineCap> const aXML_LineCap_EnumMap[] = { { XML_BUTT, drawing::LineCap_BUTT }, { XML_ROUND, drawing::LineCap_ROUND }, @@ -425,7 +425,7 @@ SvXMLEnumMapEntry<drawing::FillStyle> const aXML_FillStyle_EnumMap[] = { XML_TOKEN_INVALID, drawing::FillStyle(0) } }; -static SvXMLEnumMapEntry<sal_Int32> const aXML_PresChange_EnumMap[] = +SvXMLEnumMapEntry<sal_Int32> const aXML_PresChange_EnumMap[] = { { XML_MANUAL, 0 }, { XML_AUTOMATIC, 1 }, @@ -433,7 +433,7 @@ static SvXMLEnumMapEntry<sal_Int32> const aXML_PresChange_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -static SvXMLEnumMapEntry<presentation::AnimationSpeed> const aXML_TransSpeed_EnumMap[] = +SvXMLEnumMapEntry<presentation::AnimationSpeed> const aXML_TransSpeed_EnumMap[] = { { XML_FAST, presentation::AnimationSpeed_FAST }, { XML_MEDIUM, presentation::AnimationSpeed_MEDIUM }, @@ -441,7 +441,7 @@ static SvXMLEnumMapEntry<presentation::AnimationSpeed> const aXML_TransSpeed_Enu { XML_TOKEN_INVALID, presentation::AnimationSpeed(0) } }; -static SvXMLEnumMapEntry<presentation::FadeEffect> const aXML_FadeEffect_EnumMap[] = +SvXMLEnumMapEntry<presentation::FadeEffect> const aXML_FadeEffect_EnumMap[] = { { XML_NONE, presentation::FadeEffect_NONE }, { XML_FADE_FROM_LEFT, presentation::FadeEffect_FADE_FROM_LEFT }, @@ -522,7 +522,7 @@ SvXMLEnumMapEntry<drawing::BitmapMode> const aXML_BitmapMode_EnumMap[] = // 3D EnumMaps -static SvXMLEnumMapEntry<drawing::NormalsKind> const aXML_NormalsKind_EnumMap[] = +SvXMLEnumMapEntry<drawing::NormalsKind> const aXML_NormalsKind_EnumMap[] = { { XML_OBJECT, drawing::NormalsKind_SPECIFIC }, { XML_FLAT, drawing::NormalsKind_FLAT }, @@ -530,7 +530,7 @@ static SvXMLEnumMapEntry<drawing::NormalsKind> const aXML_NormalsKind_EnumMap[] { XML_TOKEN_INVALID, drawing::NormalsKind(0) } }; -static SvXMLEnumMapEntry<drawing::TextureProjectionMode> const aXML_TexGenerationX_EnumMap[] = +SvXMLEnumMapEntry<drawing::TextureProjectionMode> const aXML_TexGenerationX_EnumMap[] = { { XML_OBJECT, drawing::TextureProjectionMode_OBJECTSPECIFIC }, { XML_PARALLEL, drawing::TextureProjectionMode_PARALLEL }, @@ -538,7 +538,7 @@ static SvXMLEnumMapEntry<drawing::TextureProjectionMode> const aXML_TexGenerati { XML_TOKEN_INVALID, drawing::TextureProjectionMode(0) } }; -static SvXMLEnumMapEntry<drawing::TextureProjectionMode> const aXML_TexGenerationY_EnumMap[] = +SvXMLEnumMapEntry<drawing::TextureProjectionMode> const aXML_TexGenerationY_EnumMap[] = { { XML_OBJECT, drawing::TextureProjectionMode_OBJECTSPECIFIC }, { XML_PARALLEL, drawing::TextureProjectionMode_PARALLEL }, @@ -546,14 +546,14 @@ static SvXMLEnumMapEntry<drawing::TextureProjectionMode> const aXML_TexGenerati { XML_TOKEN_INVALID, drawing::TextureProjectionMode(0) } }; -static SvXMLEnumMapEntry<drawing::TextureKind> const aXML_TexKind_EnumMap[] = +SvXMLEnumMapEntry<drawing::TextureKind> const aXML_TexKind_EnumMap[] = { { XML_LUMINANCE, drawing::TextureKind_LUMINANCE }, { XML_COLOR, drawing::TextureKind_COLOR }, { XML_TOKEN_INVALID, drawing::TextureKind(0) } }; -static SvXMLEnumMapEntry<drawing::TextureMode> const aXML_TexMode_EnumMap[] = +SvXMLEnumMapEntry<drawing::TextureMode> const aXML_TexMode_EnumMap[] = { { XML_REPLACE, drawing::TextureMode_REPLACE }, { XML_MODULATE, drawing::TextureMode_MODULATE }, @@ -584,14 +584,14 @@ SvXMLEnumMapEntry<drawing::CircleKind> const aXML_CircleKind_EnumMap[] = { XML_TOKEN_INVALID, drawing::CircleKind(0) } }; -static SvXMLEnumMapEntry<text::WritingMode> const aXML_WritingMode_EnumMap[] = +SvXMLEnumMapEntry<text::WritingMode> const aXML_WritingMode_EnumMap[] = { { XML_TB_RL, text::WritingMode_TB_RL }, { XML_LR_TB, text::WritingMode_LR_TB }, { XML_TOKEN_INVALID, text::WritingMode(0) } }; -static SvXMLEnumMapEntry<drawing::TextAnimationKind> const pXML_TextAnimation_Enum[] = +SvXMLEnumMapEntry<drawing::TextAnimationKind> const pXML_TextAnimation_Enum[] = { { XML_NONE, drawing::TextAnimationKind_NONE }, { XML_BLINKING, drawing::TextAnimationKind_BLINK }, // will be filtered @@ -601,7 +601,7 @@ static SvXMLEnumMapEntry<drawing::TextAnimationKind> const pXML_TextAnimation_En { XML_TOKEN_INVALID, drawing::TextAnimationKind(0) } }; -static SvXMLEnumMapEntry<drawing::TextAnimationKind> const pXML_TextAnimation_Blinking_Enum[] = +SvXMLEnumMapEntry<drawing::TextAnimationKind> const pXML_TextAnimation_Blinking_Enum[] = { { XML_FALSE, drawing::TextAnimationKind_NONE }, { XML_TRUE, drawing::TextAnimationKind_BLINK }, @@ -611,7 +611,7 @@ static SvXMLEnumMapEntry<drawing::TextAnimationKind> const pXML_TextAnimation_Bl { XML_TOKEN_INVALID, drawing::TextAnimationKind(0) } }; -static SvXMLEnumMapEntry<drawing::TextAnimationDirection> const pXML_TextAnimationDirection_Enum[] = +SvXMLEnumMapEntry<drawing::TextAnimationDirection> const pXML_TextAnimationDirection_Enum[] = { { XML_LEFT, drawing::TextAnimationDirection_LEFT }, { XML_RIGHT, drawing::TextAnimationDirection_RIGHT }, // will be filtered @@ -620,7 +620,7 @@ static SvXMLEnumMapEntry<drawing::TextAnimationDirection> const pXML_TextAnimati { XML_TOKEN_INVALID, drawing::TextAnimationDirection(0) } }; -static SvXMLEnumMapEntry<drawing::TextHorizontalAdjust> const pXML_TextAlign_Enum[] = +SvXMLEnumMapEntry<drawing::TextHorizontalAdjust> const pXML_TextAlign_Enum[] = { { XML_LEFT, drawing::TextHorizontalAdjust_LEFT }, { XML_CENTER, drawing::TextHorizontalAdjust_CENTER }, @@ -629,7 +629,7 @@ static SvXMLEnumMapEntry<drawing::TextHorizontalAdjust> const pXML_TextAlign_Enu { XML_TOKEN_INVALID, drawing::TextHorizontalAdjust(0) } }; -static SvXMLEnumMapEntry<drawing::TextVerticalAdjust> const pXML_VerticalAlign_Enum[] = +SvXMLEnumMapEntry<drawing::TextVerticalAdjust> const pXML_VerticalAlign_Enum[] = { { XML_TOP, drawing::TextVerticalAdjust_TOP }, { XML_MIDDLE, drawing::TextVerticalAdjust_CENTER }, @@ -639,7 +639,7 @@ static SvXMLEnumMapEntry<drawing::TextVerticalAdjust> const pXML_VerticalAlign_E }; // note: PROPORTIONAL and ALLLINES are the same thing now! -static SvXMLEnumMapEntry<drawing::TextFitToSizeType> const pXML_FitToSize_Enum_Odf12[] = +SvXMLEnumMapEntry<drawing::TextFitToSizeType> const pXML_FitToSize_Enum_Odf12[] = { { XML_FALSE, drawing::TextFitToSizeType_NONE }, { XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL }, @@ -648,7 +648,7 @@ static SvXMLEnumMapEntry<drawing::TextFitToSizeType> const pXML_FitToSize_Enum_O { XML_TOKEN_INVALID, drawing::TextFitToSizeType(0) } }; -static SvXMLEnumMapEntry<drawing::TextFitToSizeType> const pXML_FitToSize_Enum[] = +SvXMLEnumMapEntry<drawing::TextFitToSizeType> const pXML_FitToSize_Enum[] = { { XML_FALSE, drawing::TextFitToSizeType_NONE }, { XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL }, @@ -657,7 +657,7 @@ static SvXMLEnumMapEntry<drawing::TextFitToSizeType> const pXML_FitToSize_Enum[] { XML_TOKEN_INVALID, drawing::TextFitToSizeType(0) } }; -static SvXMLEnumMapEntry<drawing::TextFitToSizeType> const pXML_ShrinkToFit_Enum[] = +SvXMLEnumMapEntry<drawing::TextFitToSizeType> const pXML_ShrinkToFit_Enum[] = { { XML_FALSE, drawing::TextFitToSizeType_NONE }, { XML_FALSE, drawing::TextFitToSizeType_PROPORTIONAL }, @@ -666,7 +666,7 @@ static SvXMLEnumMapEntry<drawing::TextFitToSizeType> const pXML_ShrinkToFit_Enum { XML_TOKEN_INVALID, drawing::TextFitToSizeType(0) } }; -static SvXMLEnumMapEntry<sal_Int32> const pXML_MeasureUnit_Enum[] = +SvXMLEnumMapEntry<sal_Int32> const pXML_MeasureUnit_Enum[] = { { XML_AUTOMATIC, 0 }, { XML_MM, 1 }, @@ -681,7 +681,7 @@ static SvXMLEnumMapEntry<sal_Int32> const pXML_MeasureUnit_Enum[] = { XML_TOKEN_INVALID,0 } }; -static SvXMLEnumMapEntry<drawing::MeasureTextHorzPos> const pXML_Measure_HAlign_Enum[] = +SvXMLEnumMapEntry<drawing::MeasureTextHorzPos> const pXML_Measure_HAlign_Enum[] = { { XML_AUTOMATIC, drawing::MeasureTextHorzPos_AUTO }, { XML_LEFT_OUTSIDE, drawing::MeasureTextHorzPos_LEFTOUTSIDE }, @@ -690,7 +690,7 @@ static SvXMLEnumMapEntry<drawing::MeasureTextHorzPos> const pXML_Measure_HAlign_ { XML_TOKEN_INVALID, drawing::MeasureTextHorzPos(0) } }; -static SvXMLEnumMapEntry<drawing::MeasureTextVertPos> const pXML_Measure_VAlign_Enum[] = +SvXMLEnumMapEntry<drawing::MeasureTextVertPos> const pXML_Measure_VAlign_Enum[] = { { XML_AUTOMATIC, drawing::MeasureTextVertPos_AUTO }, { XML_ABOVE, drawing::MeasureTextVertPos_EAST }, @@ -700,7 +700,7 @@ static SvXMLEnumMapEntry<drawing::MeasureTextVertPos> const pXML_Measure_VAlign_ }; // #FontWork# -static SvXMLEnumMapEntry<sal_Int32> const pXML_Fontwork_Style_Enum[] = +SvXMLEnumMapEntry<sal_Int32> const pXML_Fontwork_Style_Enum[] = { { XML_ROTATE, 0 }, //XFormTextStyle::Rotate, { XML_UPRIGHT, 1 }, //XFormTextStyle::Upright, @@ -710,7 +710,7 @@ static SvXMLEnumMapEntry<sal_Int32> const pXML_Fontwork_Style_Enum[] = { XML_TOKEN_INVALID,0 } }; -static SvXMLEnumMapEntry<sal_Int32> const pXML_Fontwork_Adjust_Enum[] = +SvXMLEnumMapEntry<sal_Int32> const pXML_Fontwork_Adjust_Enum[] = { { XML_LEFT, 0 }, //XFormTextAdjust::Left, { XML_RIGHT, 1 }, //XFormTextAdjust::Right, @@ -719,7 +719,7 @@ static SvXMLEnumMapEntry<sal_Int32> const pXML_Fontwork_Adjust_Enum[] = { XML_TOKEN_INVALID,0 } }; -static SvXMLEnumMapEntry<sal_Int32> const pXML_Fontwork_Shadow_Enum[] = +SvXMLEnumMapEntry<sal_Int32> const pXML_Fontwork_Shadow_Enum[] = { { XML_NORMAL, 0 }, //XFormTextShadow::Normal, { XML_SLANT, 1 }, //XFormTextShadow::Slant, @@ -727,7 +727,7 @@ static SvXMLEnumMapEntry<sal_Int32> const pXML_Fontwork_Shadow_Enum[] = { XML_TOKEN_INVALID,0 } }; -static SvXMLEnumMapEntry<sal_Int32> const pXML_Fontwork_Form_Enum[] = +SvXMLEnumMapEntry<sal_Int32> const pXML_Fontwork_Form_Enum[] = { { XML_NONE, 0 }, //XFTFORM_NONE, { XML_TOPCIRCLE, 1 }, //XFTFORM_TOPCIRC, @@ -745,7 +745,7 @@ static SvXMLEnumMapEntry<sal_Int32> const pXML_Fontwork_Form_Enum[] = { XML_TOKEN_INVALID,0 } }; -static SvXMLEnumMapEntry<sal_Int32> const pXML_Caption_Esc_Dir_Enum[] = +SvXMLEnumMapEntry<sal_Int32> const pXML_Caption_Esc_Dir_Enum[] = { { XML_HORIZONTAL, 0 }, //SdrCaptionEscDir::Horizontal, { XML_VERTICAL, 1 }, //SdrCaptionEscDir::Vertical, @@ -753,7 +753,7 @@ static SvXMLEnumMapEntry<sal_Int32> const pXML_Caption_Esc_Dir_Enum[] = { XML_TOKEN_INVALID,0 } }; -static SvXMLEnumMapEntry<sal_Int32> const pXML_Caption_Type_Enum[] = +SvXMLEnumMapEntry<sal_Int32> const pXML_Caption_Type_Enum[] = { { XML_STRAIGHT_LINE, 0 }, //SdrCaptionType::Type1, { XML_ANGLED_LINE, 1 }, //SdrCaptionType::Type2, diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 7d4db95dcdda..57c42fa23c33 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -369,7 +369,7 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI maPresRect.SetSize(aLayoutSize); } -static const OUStringLiteral gsPageLayoutNames( "PageLayoutNames" ); +const OUStringLiteral gsPageLayoutNames( "PageLayoutNames" ); SdXMLExport::SdXMLExport( const css::uno::Reference< css::uno::XComponentContext >& xContext, @@ -1355,9 +1355,9 @@ static OUString findOrAppendImpl( std::vector< DateTimeDeclImpl >& rVector, cons return OUString::createFromAscii( pPrefix ) + OUString::number( nIndex ); } -static const char gpStrHeaderTextPrefix[] = "hdr"; -static const char gpStrFooterTextPrefix[] = "ftr"; -static const char gpStrDateTimeTextPrefix[] = "dtd"; +const char gpStrHeaderTextPrefix[] = "hdr"; +const char gpStrFooterTextPrefix[] = "ftr"; +const char gpStrDateTimeTextPrefix[] = "dtd"; HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( const Reference<XDrawPage>& xDrawPage ) { diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 418bb7662513..c306f30a8aec 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -147,26 +147,26 @@ bool supportsText(XmlShapeType eShapeType) } -static const OUStringLiteral gsZIndex( "ZOrder" ); -static const OUStringLiteral gsPrintable( "Printable" ); -static const OUStringLiteral gsVisible( "Visible" ); -static const OUStringLiteral gsModel( "Model" ); -static const OUStringLiteral gsStartShape( "StartShape" ); -static const OUStringLiteral gsEndShape( "EndShape" ); -static const OUStringLiteral gsOnClick( "OnClick" ); -static const OUStringLiteral gsEventType( "EventType" ); -static const OUStringLiteral gsPresentation( "Presentation" ); -static const OUStringLiteral gsMacroName( "MacroName" ); -static const OUStringLiteral gsScript( "Script" ); -static const OUStringLiteral gsLibrary( "Library" ); -static const OUStringLiteral gsClickAction( "ClickAction" ); -static const OUStringLiteral gsBookmark( "Bookmark" ); -static const OUStringLiteral gsEffect( "Effect" ); -static const OUStringLiteral gsPlayFull( "PlayFull" ); -static const OUStringLiteral gsVerb( "Verb" ); -static const OUStringLiteral gsSoundURL( "SoundURL" ); -static const OUStringLiteral gsSpeed( "Speed" ); -static const OUStringLiteral gsStarBasic( "StarBasic" ); +const OUStringLiteral gsZIndex( "ZOrder" ); +const OUStringLiteral gsPrintable( "Printable" ); +const OUStringLiteral gsVisible( "Visible" ); +const OUStringLiteral gsModel( "Model" ); +const OUStringLiteral gsStartShape( "StartShape" ); +const OUStringLiteral gsEndShape( "EndShape" ); +const OUStringLiteral gsOnClick( "OnClick" ); +const OUStringLiteral gsEventType( "EventType" ); +const OUStringLiteral gsPresentation( "Presentation" ); +const OUStringLiteral gsMacroName( "MacroName" ); +const OUStringLiteral gsScript( "Script" ); +const OUStringLiteral gsLibrary( "Library" ); +const OUStringLiteral gsClickAction( "ClickAction" ); +const OUStringLiteral gsBookmark( "Bookmark" ); +const OUStringLiteral gsEffect( "Effect" ); +const OUStringLiteral gsPlayFull( "PlayFull" ); +const OUStringLiteral gsVerb( "Verb" ); +const OUStringLiteral gsSoundURL( "SoundURL" ); +const OUStringLiteral gsSpeed( "Speed" ); +const OUStringLiteral gsStarBasic( "StarBasic" ); XMLShapeExport::XMLShapeExport(SvXMLExport& rExp, SvXMLExportPropertyMapper *pExtMapper ) diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 9851331a1a6b..83cfa3880485 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -110,10 +110,10 @@ struct XMLShapeImportHelperImpl bool mbIsPresentationShapesSupported; }; -static const OUStringLiteral gsStartShape("StartShape"); -static const OUStringLiteral gsEndShape("EndShape"); -static const OUStringLiteral gsStartGluePointIndex("StartGluePointIndex"); -static const OUStringLiteral gsEndGluePointIndex("EndGluePointIndex"); +const OUStringLiteral gsStartShape("StartShape"); +const OUStringLiteral gsEndShape("EndShape"); +const OUStringLiteral gsStartGluePointIndex("StartGluePointIndex"); +const OUStringLiteral gsEndGluePointIndex("EndGluePointIndex"); XMLShapeImportHelper::XMLShapeImportHelper( SvXMLImport& rImporter, diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index e8d770e7637f..59046ccbc8da 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -150,8 +150,8 @@ public: virtual void Finish( bool bOverwrite ) override; }; -static const sal_uInt16 MAX_SPECIAL_DRAW_STYLES = 7; -static ContextID_Index_Pair const g_ContextIDs[MAX_SPECIAL_DRAW_STYLES+1] = +const sal_uInt16 MAX_SPECIAL_DRAW_STYLES = 7; +ContextID_Index_Pair const g_ContextIDs[MAX_SPECIAL_DRAW_STYLES+1] = { { CTF_DASHNAME , -1 }, { CTF_LINESTARTNAME , -1 }, @@ -162,7 +162,7 @@ static ContextID_Index_Pair const g_ContextIDs[MAX_SPECIAL_DRAW_STYLES+1] = { CTF_FILLBITMAPNAME , -1 }, { -1, -1 } }; -static XmlStyleFamily const g_Families[MAX_SPECIAL_DRAW_STYLES] = +XmlStyleFamily const g_Families[MAX_SPECIAL_DRAW_STYLES] = { XmlStyleFamily::SD_STROKE_DASH_ID, XmlStyleFamily::SD_MARKER_ID, diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx index 249f1815d6d6..c6cbef655e29 100644 --- a/xmloff/source/forms/controlpropertymap.cxx +++ b/xmloff/source/forms/controlpropertymap.cxx @@ -39,7 +39,7 @@ namespace xmloff #define MAP_CONST_P( name, prefix, token, type, context ){ name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFSVER_010, false } #define MAP_END() { nullptr, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFSVER_010, false } - static XMLPropertyMapEntry const aControlStyleProperties[] = + XMLPropertyMapEntry const aControlStyleProperties[] = { MAP_CONST_P( PROPERTY_ALIGN, XML_NAMESPACE_FO, XML_TEXT_ALIGN, XML_TYPE_TEXT_ALIGN, 0 ), MAP_CONST( PROPERTY_BACKGROUNDCOLOR, XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, XML_TYPE_COLOR, 0 ), diff --git a/xmloff/source/forms/formevents.cxx b/xmloff/source/forms/formevents.cxx index 37ce1c5dc717..fa7c4d002b1b 100644 --- a/xmloff/source/forms/formevents.cxx +++ b/xmloff/source/forms/formevents.cxx @@ -25,7 +25,7 @@ namespace xmloff { //= event translation table - static const XMLEventNameTranslation aEventTranslations[] = + const XMLEventNameTranslation aEventTranslations[] = { { "XApproveActionListener::approveAction", XML_NAMESPACE_FORM, "approveaction" }, // "on-approveaction" { "XActionListener::actionPerformed", XML_NAMESPACE_FORM, "performaction" }, // "on-performaction" diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx index 267f6e46c101..b79263310010 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.cxx +++ b/xmloff/source/forms/gridcolumnproptranslator.cxx @@ -57,7 +57,7 @@ namespace xmloff return -1; } - static struct AlignmentTranslationEntry + struct AlignmentTranslationEntry { ParagraphAdjust nParagraphValue; sal_Int16 nControlValue; diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index bb50930e1ec5..45c16b31dde5 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -294,10 +294,10 @@ void SvXMLMetaExport::MExport_() } } -static const char s_xmlns[] = "xmlns"; -static const char s_xmlns2[] = "xmlns:"; -static const char s_meta[] = "meta:"; -static const char s_href[] = "xlink:href"; +const char s_xmlns[] = "xmlns"; +const char s_xmlns2[] = "xmlns:"; +const char s_meta[] = "meta:"; +const char s_href[] = "xlink:href"; SvXMLMetaExport::SvXMLMetaExport( SvXMLExport& i_rExp, diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx index d9b2686e2b19..71c5bed2dc18 100644 --- a/xmloff/source/script/XMLEventExport.cxx +++ b/xmloff/source/script/XMLEventExport.cxx @@ -40,7 +40,7 @@ using ::com::sun::star::container::XNameReplace; using ::com::sun::star::container::XNameAccess; using ::xmloff::token::XML_EVENT_LISTENERS; -static const OUStringLiteral gsEventType("EventType"); +const OUStringLiteral gsEventType("EventType"); XMLEventExport::XMLEventExport(SvXMLExport& rExp) : rExport(rExp), diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx b/xmloff/source/script/XMLScriptContextFactory.cxx index da44c70d7d01..041dbdf6dab6 100644 --- a/xmloff/source/script/XMLScriptContextFactory.cxx +++ b/xmloff/source/script/XMLScriptContextFactory.cxx @@ -32,9 +32,9 @@ using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -static const OUStringLiteral gsEventType("EventType"); -static const OUStringLiteral gsScript("Script"); -static const OUStringLiteral gsURL("Script"); +const OUStringLiteral gsEventType("EventType"); +const OUStringLiteral gsScript("Script"); +const OUStringLiteral gsURL("Script"); XMLScriptContextFactory::XMLScriptContextFactory() { diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx index aaed4ded0e86..b704fe33239b 100644 --- a/xmloff/source/script/XMLScriptExportHandler.cxx +++ b/xmloff/source/script/XMLScriptExportHandler.cxx @@ -31,7 +31,7 @@ using namespace ::xmloff::token; using ::com::sun::star::beans::PropertyValue; -static const OUStringLiteral gsURL("Script"); +const OUStringLiteral gsURL("Script"); XMLScriptExportHandler::XMLScriptExportHandler() { diff --git a/xmloff/source/script/XMLStarBasicContextFactory.cxx b/xmloff/source/script/XMLStarBasicContextFactory.cxx index 7f76539789a0..450a232eeac8 100644 --- a/xmloff/source/script/XMLStarBasicContextFactory.cxx +++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx @@ -33,10 +33,10 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -static const OUStringLiteral gsEventType("EventType"); -static const OUStringLiteral gsLibrary("Library"); -static const OUStringLiteral gsMacroName("MacroName"); -static const OUStringLiteral gsStarBasic("StarBasic"); +const OUStringLiteral gsEventType("EventType"); +const OUStringLiteral gsLibrary("Library"); +const OUStringLiteral gsMacroName("MacroName"); +const OUStringLiteral gsStarBasic("StarBasic"); XMLStarBasicContextFactory::XMLStarBasicContextFactory() { diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx index ed6d3a136b04..cc5bbb835c96 100644 --- a/xmloff/source/script/XMLStarBasicExportHandler.cxx +++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx @@ -32,11 +32,11 @@ using namespace ::xmloff::token; using ::com::sun::star::beans::PropertyValue; -static const OUStringLiteral gsStarBasic("StarBasic"); -static const OUStringLiteral gsLibrary("Library"); -static const OUStringLiteral gsMacroName("MacroName"); -static const OUStringLiteral gsStarOffice("StarOffice"); -static const OUStringLiteral gsApplication("application"); +const OUStringLiteral gsStarBasic("StarBasic"); +const OUStringLiteral gsLibrary("Library"); +const OUStringLiteral gsMacroName("MacroName"); +const OUStringLiteral gsStarOffice("StarOffice"); +const OUStringLiteral gsApplication("application"); XMLStarBasicExportHandler::XMLStarBasicExportHandler() { diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index 932962c5f500..e963ece6a513 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -55,7 +55,7 @@ enum SvXMLTokenMapAttrs } -static const SvXMLTokenMapEntry aDashStyleAttrTokenMap[] = +const SvXMLTokenMapEntry aDashStyleAttrTokenMap[] = { { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_DASH_NAME }, { XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_DASH_DISPLAY_NAME }, diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx index 5be8cbff8667..00500194b68a 100644 --- a/xmloff/source/style/PageMasterPropHdlFactory.cxx +++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx @@ -40,7 +40,7 @@ using namespace ::xmloff::token; using namespace ::com::sun::star; using namespace ::com::sun::star::drawing; -static SvXMLEnumMapEntry<sal_uInt16> const aXML_TextGridMode_ConstantMap[] = +SvXMLEnumMapEntry<sal_uInt16> const aXML_TextGridMode_ConstantMap[] = { { XML_NONE, text::TextGridMode::NONE }, { XML_LINE, text::TextGridMode::LINES }, diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index 95772ae0e42f..a390a03fe03c 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -59,7 +59,7 @@ enum SvXMLTokenMapAttrs } -static const SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] = +const SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] = { { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF }, { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE }, @@ -73,14 +73,14 @@ static const SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] = }; -static const SvXMLEnumMapEntry<GraphicLocation> psXML_BrushHoriPos[] = +const SvXMLEnumMapEntry<GraphicLocation> psXML_BrushHoriPos[] = { { XML_LEFT, GraphicLocation_LEFT_MIDDLE }, { XML_RIGHT, GraphicLocation_RIGHT_MIDDLE }, { XML_TOKEN_INVALID, GraphicLocation(0) } }; -static const SvXMLEnumMapEntry<GraphicLocation> psXML_BrushVertPos[] = +const SvXMLEnumMapEntry<GraphicLocation> psXML_BrushVertPos[] = { { XML_TOP, GraphicLocation_MIDDLE_TOP }, { XML_BOTTOM, GraphicLocation_MIDDLE_BOTTOM }, diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index c0d416d5592b..6b3ddecb8b08 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -41,8 +41,8 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; using namespace ::xmloff::token; -static const OUStringLiteral gsIsPhysical( "IsPhysical" ); -static const OUStringLiteral gsFollowStyle( "FollowStyle" ); +const OUStringLiteral gsIsPhysical( "IsPhysical" ); +const OUStringLiteral gsFollowStyle( "FollowStyle" ); namespace { diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx index 0f9f18d6c070..df587d44ce7b 100644 --- a/xmloff/source/style/bordrhdl.cxx +++ b/xmloff/source/style/bordrhdl.cxx @@ -68,7 +68,7 @@ SvXMLEnumMapEntry<sal_uInt16> const pXML_NamedBorderWidths[] = }; // mapping tables to map external xml input to internal box line widths -static sal_uInt16 const aBorderWidths[] = +sal_uInt16 const aBorderWidths[] = { DEF_LINE_WIDTH_0, DEF_LINE_WIDTH_1, diff --git a/xmloff/source/style/csmaphdl.cxx b/xmloff/source/style/csmaphdl.cxx index f113e00a716f..97367734bfc7 100644 --- a/xmloff/source/style/csmaphdl.cxx +++ b/xmloff/source/style/csmaphdl.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -static const SvXMLEnumMapEntry<sal_uInt16> pXML_Casemap_Enum[] = +const SvXMLEnumMapEntry<sal_uInt16> pXML_Casemap_Enum[] = { { XML_NONE, style::CaseMap::NONE }, { XML_CASEMAP_LOWERCASE, style::CaseMap::LOWERCASE }, diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx index ca172f234758..e3a8adec7173 100644 --- a/xmloff/source/style/fonthdl.cxx +++ b/xmloff/source/style/fonthdl.cxx @@ -51,7 +51,7 @@ static const SvXMLEnumMapEntry<FontFamily>* lcl_getFontFamilyGenericMapping() return aFontFamilyGenericMapping; } -static SvXMLEnumMapEntry<FontPitch> const aFontPitchMapping[] = +SvXMLEnumMapEntry<FontPitch> const aFontPitchMapping[] = { { XML_FIXED, PITCH_FIXED }, { XML_VARIABLE, PITCH_VARIABLE }, diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index 91d346693a7d..7ba12bca5381 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -38,10 +38,10 @@ using namespace com::sun::star; using namespace xmloff::token; -static const OUStringLiteral gsStandardFormat("StandardFormat"); -static const OUStringLiteral gsType("Type"); -static const OUStringLiteral gsCurrencySymbol("CurrencySymbol"); -static const OUStringLiteral gsCurrencyAbbreviation("CurrencyAbbreviation"); +const OUStringLiteral gsStandardFormat("StandardFormat"); +const OUStringLiteral gsType("Type"); +const OUStringLiteral gsCurrencySymbol("CurrencySymbol"); +const OUStringLiteral gsCurrencyAbbreviation("CurrencyAbbreviation"); XMLNumberFormatAttributesExportHelper::XMLNumberFormatAttributesExportHelper( css::uno::Reference< css::util::XNumberFormatsSupplier > const & xTempNumberFormatsSupplier) diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx index 4343e534b690..d8a9cf32f904 100644 --- a/xmloff/source/style/prhdlfac.cxx +++ b/xmloff/source/style/prhdlfac.cxx @@ -62,7 +62,7 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -static SvXMLEnumMapEntry<drawing::ColorMode> const aXML_ColorMode_EnumMap[] = +SvXMLEnumMapEntry<drawing::ColorMode> const aXML_ColorMode_EnumMap[] = { { XML_GREYSCALE, drawing::ColorMode_GREYS }, { XML_MONO, drawing::ColorMode_MONO }, @@ -71,7 +71,7 @@ static SvXMLEnumMapEntry<drawing::ColorMode> const aXML_ColorMode_EnumMap[] = { XML_TOKEN_INVALID, drawing::ColorMode(0) } }; -static SvXMLEnumMapEntry<text::HorizontalAdjust> const aXML_HorizontalAdjust_Enum[] = +SvXMLEnumMapEntry<text::HorizontalAdjust> const aXML_HorizontalAdjust_Enum[] = { { XML_LEFT, text::HorizontalAdjust_LEFT }, { XML_CENTER, text::HorizontalAdjust_CENTER }, @@ -82,7 +82,7 @@ static SvXMLEnumMapEntry<text::HorizontalAdjust> const aXML_HorizontalAdjust_Enu // aXML_WritingDirection_Enum is used with and without 'page' // attribute, so you'll find uses of aXML_WritingDirection_Enum // directly, as well as &(aXML_WritingDirection_Enum[1]) -static SvXMLEnumMapEntry<sal_uInt16> const aXML_WritingDirection_Enum[] = +SvXMLEnumMapEntry<sal_uInt16> const aXML_WritingDirection_Enum[] = { // aXML_WritingDirection_Enum { XML_PAGE, text::WritingMode2::PAGE }, @@ -102,7 +102,7 @@ static SvXMLEnumMapEntry<sal_uInt16> const aXML_WritingDirection_Enum[] = { XML_TOKEN_INVALID, 0 } }; -static SvXMLEnumMapEntry<sal_uInt16> const pXML_VertPos_Enum[] = +SvXMLEnumMapEntry<sal_uInt16> const pXML_VertPos_Enum[] = { { XML_FROM_TOP, text::VertOrientation::NONE }, { XML_TOP, text::VertOrientation::TOP }, diff --git a/xmloff/source/style/prstylecond.cxx b/xmloff/source/style/prstylecond.cxx index f644f5029be2..4da002488c36 100644 --- a/xmloff/source/style/prstylecond.cxx +++ b/xmloff/source/style/prstylecond.cxx @@ -36,7 +36,7 @@ struct ConditionMap } -static const ConditionMap g_ConditionMap[] = +const ConditionMap g_ConditionMap[] = { { "TableHeader", XML_TABLE_HEADER, -1 }, { "Table", XML_TABLE, -1 }, diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index c005a38873f4..4712bf4e5bb7 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -143,8 +143,8 @@ namespace -static const OUStringLiteral gsIsPhysical( "IsPhysical" ); -static const OUStringLiteral gsFollowStyle( "FollowStyle" ); +const OUStringLiteral gsIsPhysical( "IsPhysical" ); +const OUStringLiteral gsFollowStyle( "FollowStyle" ); XMLPropStyleContext::XMLPropStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index dcfe8b9f7c63..05d89b199eff 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -52,11 +52,11 @@ using namespace ::xmloff::token; using ::com::sun::star::document::XEventsSupplier; -static const OUStringLiteral gsIsPhysical( "IsPhysical" ); -static const OUStringLiteral gsIsAutoUpdate( "IsAutoUpdate" ); -static const OUStringLiteral gsFollowStyle( "FollowStyle" ); -static const OUStringLiteral gsNumberingStyleName( "NumberingStyleName" ); -static const OUStringLiteral gsOutlineLevel( "OutlineLevel" ); +const OUStringLiteral gsIsPhysical( "IsPhysical" ); +const OUStringLiteral gsIsAutoUpdate( "IsAutoUpdate" ); +const OUStringLiteral gsFollowStyle( "FollowStyle" ); +const OUStringLiteral gsNumberingStyleName( "NumberingStyleName" ); +const OUStringLiteral gsOutlineLevel( "OutlineLevel" ); XMLStyleExport::XMLStyleExport( SvXMLExport& rExp, diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index d8b4e3c8a6b3..882b27971dd7 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -605,9 +605,9 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel, } -static const OUStringLiteral gsNumberingRules( "NumberingRules" ); -static const OUStringLiteral gsIsPhysical( "IsPhysical" ); -static const OUStringLiteral gsIsContinuousNumbering( "IsContinuousNumbering" ); +const OUStringLiteral gsNumberingRules( "NumberingRules" ); +const OUStringLiteral gsIsPhysical( "IsPhysical" ); +const OUStringLiteral gsIsContinuousNumbering( "IsContinuousNumbering" ); SvxXMLNumRuleExport::SvxXMLNumRuleExport( SvXMLExport& rExp ) : rExport( rExp ), diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 61b6bc1cfb08..be1e193d228e 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -272,7 +272,7 @@ enum SvXMLStyleElemAttrTokens #define XML_NUMF_COLORCOUNT 10 -static const Color aNumFmtStdColors[XML_NUMF_COLORCOUNT] = +const Color aNumFmtStdColors[XML_NUMF_COLORCOUNT] = { COL_BLACK, COL_LIGHTBLUE, @@ -292,14 +292,14 @@ static const Color aNumFmtStdColors[XML_NUMF_COLORCOUNT] = // maps for SvXMLUnitConverter::convertEnum -static const SvXMLEnumMapEntry<bool> aStyleValueMap[] = +const SvXMLEnumMapEntry<bool> aStyleValueMap[] = { { XML_SHORT, false }, { XML_LONG, true }, { XML_TOKEN_INVALID, false } }; -static const SvXMLEnumMapEntry<bool> aFormatSourceMap[] = +const SvXMLEnumMapEntry<bool> aFormatSourceMap[] = { { XML_FIXED, false }, { XML_LANGUAGE, true }, @@ -323,7 +323,7 @@ struct SvXMLDefaultDateFormat } -static const SvXMLDefaultDateFormat aDefaultDateFormats[] = +const SvXMLDefaultDateFormat aDefaultDateFormats[] = { // format day-of-week day month year hours minutes seconds format-source diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 0682de0e390b..d532ec2a6c0f 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -249,8 +249,8 @@ public: } }; -static const OUStringLiteral gsStarBats( "StarBats" ); -static const OUStringLiteral gsStarMath( "StarMath" ); +const OUStringLiteral gsStarBats( "StarBats" ); +const OUStringLiteral gsStarMath( "StarMath" ); SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -1013,9 +1013,9 @@ void SvxXMLListStyleContext::SetAttribute( sal_uInt16 nPrefixKey, } } -static const OUStringLiteral sIsPhysical( "IsPhysical" ); -static const OUStringLiteral sNumberingRules( "NumberingRules" ); -static const OUStringLiteral sIsContinuousNumbering( "IsContinuousNumbering" ); +const OUStringLiteral sIsPhysical( "IsPhysical" ); +const OUStringLiteral sNumberingRules( "NumberingRules" ); +const OUStringLiteral sIsContinuousNumbering( "IsContinuousNumbering" ); SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index d020280cb173..cc11a46dfe13 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -59,7 +59,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::style; using namespace ::xmloff::token; -static const SvXMLTokenMapEntry aStyleStylesElemTokenMap[] = +const SvXMLTokenMapEntry aStyleStylesElemTokenMap[] = { { XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_STYLE_STYLE }, { XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT, XML_TOK_STYLE_PAGE_MASTER }, @@ -79,8 +79,8 @@ static const SvXMLTokenMapEntry aStyleStylesElemTokenMap[] = XML_TOKEN_MAP_END }; -static const OUStringLiteral gsParaStyleServiceName( "com.sun.star.style.ParagraphStyle" ); -static const OUStringLiteral gsTextStyleServiceName( "com.sun.star.style.CharacterStyle" ); +const OUStringLiteral gsParaStyleServiceName( "com.sun.star.style.ParagraphStyle" ); +const OUStringLiteral gsTextStyleServiceName( "com.sun.star.style.CharacterStyle" ); const SvXMLTokenMap& SvXMLStylesContext::GetStyleStylesElemTokenMap() { diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index 27880a177e91..856cf08fd1a3 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -44,7 +44,7 @@ enum SvXMLTokenMapAttrs } -static const SvXMLTokenMapEntry aTabsAttributesAttrTokenMap[] = +const SvXMLTokenMapEntry aTabsAttributesAttrTokenMap[] = { { XML_NAMESPACE_STYLE, XML_POSITION, XML_TOK_TABSTOP_POSITION }, { XML_NAMESPACE_STYLE, XML_TYPE, XML_TOK_TABSTOP_TYPE }, diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index 21655d97bc30..05764ebd0fb9 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -111,18 +111,18 @@ void XMLFootnoteConfigHelper::Characters( const OUString& rChars ) // XMLFootnoteConfigurationImportContext -static const OUStringLiteral gsPropertyAnchorCharStyleName("AnchorCharStyleName"); -static const OUStringLiteral gsPropertyCharStyleName("CharStyleName"); -static const OUStringLiteral gsPropertyNumberingType("NumberingType"); -static const OUStringLiteral gsPropertyPageStyleName("PageStyleName"); -static const OUStringLiteral gsPropertyParagraphStyleName("ParaStyleName"); -static const OUStringLiteral gsPropertyPrefix("Prefix"); -static const OUStringLiteral gsPropertyStartAt("StartAt"); -static const OUStringLiteral gsPropertySuffix("Suffix"); -static const OUStringLiteral gsPropertyPositionEndOfDoc("PositionEndOfDoc"); -static const OUStringLiteral gsPropertyFootnoteCounting("FootnoteCounting"); -static const OUStringLiteral gsPropertyEndNotice("EndNotice"); -static const OUStringLiteral gsPropertyBeginNotice("BeginNotice"); +const OUStringLiteral gsPropertyAnchorCharStyleName("AnchorCharStyleName"); +const OUStringLiteral gsPropertyCharStyleName("CharStyleName"); +const OUStringLiteral gsPropertyNumberingType("NumberingType"); +const OUStringLiteral gsPropertyPageStyleName("PageStyleName"); +const OUStringLiteral gsPropertyParagraphStyleName("ParaStyleName"); +const OUStringLiteral gsPropertyPrefix("Prefix"); +const OUStringLiteral gsPropertyStartAt("StartAt"); +const OUStringLiteral gsPropertySuffix("Suffix"); +const OUStringLiteral gsPropertyPositionEndOfDoc("PositionEndOfDoc"); +const OUStringLiteral gsPropertyFootnoteCounting("FootnoteCounting"); +const OUStringLiteral gsPropertyEndNotice("EndNotice"); +const OUStringLiteral gsPropertyBeginNotice("BeginNotice"); XMLFootnoteConfigurationImportContext::XMLFootnoteConfigurationImportContext( SvXMLImport& rImport, @@ -181,7 +181,7 @@ enum XMLFtnConfigToken } -static const SvXMLTokenMapEntry aTextFieldAttrTokenMap[] = +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 }, @@ -213,7 +213,7 @@ const SvXMLTokenMap& return *pAttrTokenMap; } -static SvXMLEnumMapEntry<sal_Int16> const aFootnoteNumberingMap[] = +SvXMLEnumMapEntry<sal_Int16> const aFootnoteNumberingMap[] = { { XML_PAGE, FootnoteNumbering::PER_PAGE }, { XML_CHAPTER, FootnoteNumbering::PER_CHAPTER }, diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx index 95ed67de8268..8cc12041ca6c 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteImportContext.cxx @@ -52,7 +52,7 @@ enum XMLFootnoteChildToken { } -static const SvXMLTokenMapEntry aFootnoteChildTokenMap[] = +const SvXMLTokenMapEntry aFootnoteChildTokenMap[] = { { XML_NAMESPACE_TEXT, XML_NOTE_CITATION, XML_TOK_FTN_NOTE_CITATION }, diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx index 8f249e50e02f..80a1369a7152 100644 --- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx @@ -43,16 +43,16 @@ using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::lang::XMultiServiceFactory; -static const OUStringLiteral gsFieldMaster_Bibliography("com.sun.star.text.FieldMaster.Bibliography"); -static const OUStringLiteral gsBracketBefore("BracketBefore"); -static const OUStringLiteral gsBracketAfter("BracketAfter"); -static const OUStringLiteral gsIsNumberEntries("IsNumberEntries"); -static const OUStringLiteral gsIsSortByPosition("IsSortByPosition"); -static const OUStringLiteral gsSortKeys("SortKeys"); -static const OUStringLiteral gsSortKey("SortKey"); -static const OUStringLiteral gsIsSortAscending("IsSortAscending"); -static const OUStringLiteral gsSortAlgorithm("SortAlgorithm"); -static const OUStringLiteral gsLocale("Locale"); +const OUStringLiteral gsFieldMaster_Bibliography("com.sun.star.text.FieldMaster.Bibliography"); +const OUStringLiteral gsBracketBefore("BracketBefore"); +const OUStringLiteral gsBracketAfter("BracketAfter"); +const OUStringLiteral gsIsNumberEntries("IsNumberEntries"); +const OUStringLiteral gsIsSortByPosition("IsSortByPosition"); +const OUStringLiteral gsSortKeys("SortKeys"); +const OUStringLiteral gsSortKey("SortKey"); +const OUStringLiteral gsIsSortAscending("IsSortAscending"); +const OUStringLiteral gsSortAlgorithm("SortAlgorithm"); +const OUStringLiteral gsLocale("Locale"); XMLIndexBibliographyConfigurationContext::XMLIndexBibliographyConfigurationContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx index 45bead4222cf..ed84b1a346ec 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx @@ -64,7 +64,7 @@ XMLIndexChapterInfoEntryContext::~XMLIndexChapterInfoEntryContext() { } -static const SvXMLEnumMapEntry<sal_uInt16> aChapterDisplayMap[] = +const SvXMLEnumMapEntry<sal_uInt16> aChapterDisplayMap[] = { { XML_NAME, ChapterFormat::NAME }, { XML_NUMBER, ChapterFormat::NUMBER }, diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx index 1a194c399f9d..c29f59b50544 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx @@ -37,7 +37,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; using ::com::sun::star::xml::sax::XAttributeList; -static const SvXMLTokenMapEntry aIndexSourceTokenMap[] = +const SvXMLTokenMapEntry aIndexSourceTokenMap[] = { { XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL, diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index 727801fb828e..6024b1188fd6 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -69,7 +69,7 @@ static const char* aIndexServiceMap[] = "com.sun.star.text.IllustrationsIndex" }; -static const XMLTokenEnum aIndexSourceElementMap[] = +const XMLTokenEnum aIndexSourceElementMap[] = { XML_TABLE_OF_CONTENT_SOURCE, XML_ALPHABETICAL_INDEX_SOURCE, diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx index 655726a08f78..71792d98e5d8 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx @@ -59,7 +59,7 @@ XMLIndexTableSourceContext::~XMLIndexTableSourceContext() { } -static SvXMLEnumMapEntry<sal_uInt16> const lcl_aReferenceTypeTokenMap[] = +SvXMLEnumMapEntry<sal_uInt16> const lcl_aReferenceTypeTokenMap[] = { { XML_TEXT, ReferenceFieldPart::TEXT }, diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx index 69784ae6c37b..3e56ab088182 100644 --- a/xmloff/source/text/XMLLineNumberingImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx @@ -43,17 +43,17 @@ using ::com::sun::star::xml::sax::XAttributeList; using ::com::sun::star::text::XLineNumberingProperties; -static const OUStringLiteral gsCharStyleName("CharStyleName"); -static const OUStringLiteral gsCountEmptyLines("CountEmptyLines"); -static const OUStringLiteral gsCountLinesInFrames("CountLinesInFrames"); -static const OUStringLiteral gsDistance("Distance"); -static const OUStringLiteral gsInterval("Interval"); -static const OUStringLiteral gsSeparatorText("SeparatorText"); -static const OUStringLiteral gsNumberPosition("NumberPosition"); -static const OUStringLiteral gsNumberingType("NumberingType"); -static const OUStringLiteral gsIsOn("IsOn"); -static const OUStringLiteral gsRestartAtEachPage("RestartAtEachPage"); -static const OUStringLiteral gsSeparatorInterval("SeparatorInterval"); +const OUStringLiteral gsCharStyleName("CharStyleName"); +const OUStringLiteral gsCountEmptyLines("CountEmptyLines"); +const OUStringLiteral gsCountLinesInFrames("CountLinesInFrames"); +const OUStringLiteral gsDistance("Distance"); +const OUStringLiteral gsInterval("Interval"); +const OUStringLiteral gsSeparatorText("SeparatorText"); +const OUStringLiteral gsNumberPosition("NumberPosition"); +const OUStringLiteral gsNumberingType("NumberingType"); +const OUStringLiteral gsIsOn("IsOn"); +const OUStringLiteral gsRestartAtEachPage("RestartAtEachPage"); +const OUStringLiteral gsSeparatorInterval("SeparatorInterval"); XMLLineNumberingImportContext::XMLLineNumberingImportContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index 7ba32b3f40d8..3703c927105b 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -725,7 +725,7 @@ void XMLSectionExport::ExportBaseIndexStart( GetExport().StartElement( XML_NAMESPACE_TEXT, eElement, false ); } -static const XMLTokenEnum aTypeSourceElementNameMap[] = +const XMLTokenEnum aTypeSourceElementNameMap[] = { XML_TABLE_OF_CONTENT_SOURCE, // TOC XML_TABLE_INDEX_SOURCE, // table index @@ -882,14 +882,14 @@ void XMLSectionExport::ExportTableAndIllustrationIndexSourceAttributes( // map index of LevelFormats to attribute value; // level 0 is always the header -static const XMLTokenEnum aLevelNameTOCMap[] = +const XMLTokenEnum aLevelNameTOCMap[] = { XML_TOKEN_INVALID, XML_1, XML_2, XML_3, XML_4, XML_5, XML_6, XML_7, XML_8, XML_9, XML_10, XML_TOKEN_INVALID }; -static const XMLTokenEnum aLevelNameTableMap[] = +const XMLTokenEnum aLevelNameTableMap[] = { XML_TOKEN_INVALID, XML__EMPTY, XML_TOKEN_INVALID }; -static const XMLTokenEnum aLevelNameAlphaMap[] = +const XMLTokenEnum aLevelNameAlphaMap[] = { XML_TOKEN_INVALID, XML_SEPARATOR, XML_1, XML_2, XML_3, XML_TOKEN_INVALID }; -static const XMLTokenEnum aLevelNameBibliographyMap[] = +const XMLTokenEnum aLevelNameBibliographyMap[] = { XML_TOKEN_INVALID, XML_ARTICLE, XML_BOOK, XML_BOOKLET, XML_CONFERENCE, XML_CUSTOM1, XML_CUSTOM2, XML_CUSTOM3, XML_CUSTOM4, XML_CUSTOM5, XML_EMAIL, XML_INBOOK, XML_INCOLLECTION, @@ -942,7 +942,7 @@ static const char** aTypeLevelStylePropNameMap[] = aLevelStylePropNameBibliographyMap // bibliography }; -static const XMLTokenEnum aTypeLevelAttrMap[] = +const XMLTokenEnum aTypeLevelAttrMap[] = { XML_OUTLINE_LEVEL, // TOC XML_TOKEN_INVALID, // table index @@ -953,7 +953,7 @@ static const XMLTokenEnum aTypeLevelAttrMap[] = XML_BIBLIOGRAPHY_TYPE // bibliography }; -static const XMLTokenEnum aTypeElementNameMap[] = +const XMLTokenEnum aTypeElementNameMap[] = { XML_TABLE_OF_CONTENT_ENTRY_TEMPLATE, // TOC XML_TABLE_INDEX_ENTRY_TEMPLATE, // table index diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx index 7a77e3104131..a5c75a40e814 100644 --- a/xmloff/source/text/XMLSectionImportContext.cxx +++ b/xmloff/source/text/XMLSectionImportContext.cxx @@ -64,7 +64,7 @@ enum XMLSectionToken } -static const SvXMLTokenMapEntry aSectionTokenMap[] = +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/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx index 47241b1d9708..5073fe24b269 100644 --- a/xmloff/source/text/XMLSectionSourceImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx @@ -62,7 +62,7 @@ enum XMLSectionSourceToken } -static const SvXMLTokenMapEntry aSectionSourceTokenMap[] = +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 2bd4f6f33a8f..a0855956983d 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -63,7 +63,7 @@ enum SvXMLSepTokenMapAttrs } -static const SvXMLTokenMapEntry aColAttrTokenMap[] = +const SvXMLTokenMapEntry aColAttrTokenMap[] = { { XML_NAMESPACE_STYLE, XML_REL_WIDTH, XML_TOK_COLUMN_WIDTH }, { XML_NAMESPACE_FO, XML_START_INDENT, XML_TOK_COLUMN_MARGIN_LEFT }, @@ -71,7 +71,7 @@ static const SvXMLTokenMapEntry aColAttrTokenMap[] = XML_TOKEN_MAP_END }; -static const SvXMLTokenMapEntry aColSepAttrTokenMap[] = +const SvXMLTokenMapEntry aColSepAttrTokenMap[] = { { XML_NAMESPACE_STYLE, XML_WIDTH, XML_TOK_COLUMN_SEP_WIDTH }, { XML_NAMESPACE_STYLE, XML_COLOR, XML_TOK_COLUMN_SEP_COLOR }, @@ -81,7 +81,7 @@ static const SvXMLTokenMapEntry aColSepAttrTokenMap[] = XML_TOKEN_MAP_END }; -static SvXMLEnumMapEntry<sal_Int8> const pXML_Sep_Style_Enum[] = +SvXMLEnumMapEntry<sal_Int8> const pXML_Sep_Style_Enum[] = { { XML_NONE, 0 }, { XML_SOLID, 1 }, @@ -90,7 +90,7 @@ static SvXMLEnumMapEntry<sal_Int8> const pXML_Sep_Style_Enum[] = { XML_TOKEN_INVALID, 0 } }; -static SvXMLEnumMapEntry<VerticalAlignment> const pXML_Sep_Align_Enum[] = +SvXMLEnumMapEntry<VerticalAlignment> const pXML_Sep_Align_Enum[] = { { XML_TOP, VerticalAlignment_TOP }, { XML_MIDDLE, VerticalAlignment_MIDDLE }, @@ -244,13 +244,13 @@ XMLTextColumnSepContext_Impl::XMLTextColumnSepContext_Impl( } } -static const OUStringLiteral gsSeparatorLineIsOn("SeparatorLineIsOn"); -static const OUStringLiteral gsSeparatorLineWidth("SeparatorLineWidth"); -static const OUStringLiteral gsSeparatorLineColor("SeparatorLineColor"); -static const OUStringLiteral gsSeparatorLineRelativeHeight("SeparatorLineRelativeHeight"); -static const OUStringLiteral gsSeparatorLineVerticalAlignment("SeparatorLineVerticalAlignment"); -static const OUStringLiteral gsAutomaticDistance("AutomaticDistance"); -static const OUStringLiteral gsSeparatorLineStyle("SeparatorLineStyle"); +const OUStringLiteral gsSeparatorLineIsOn("SeparatorLineIsOn"); +const OUStringLiteral gsSeparatorLineWidth("SeparatorLineWidth"); +const OUStringLiteral gsSeparatorLineColor("SeparatorLineColor"); +const OUStringLiteral gsSeparatorLineRelativeHeight("SeparatorLineRelativeHeight"); +const OUStringLiteral gsSeparatorLineVerticalAlignment("SeparatorLineVerticalAlignment"); +const OUStringLiteral gsAutomaticDistance("AutomaticDistance"); +const OUStringLiteral gsSeparatorLineStyle("SeparatorLineStyle"); XMLTextColumnsContext::XMLTextColumnsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx index ec42039dde8c..07fc9cb5b99c 100644 --- a/xmloff/source/text/XMLTextColumnsExport.cxx +++ b/xmloff/source/text/XMLTextColumnsExport.cxx @@ -43,14 +43,14 @@ using namespace ::com::sun::star::beans; using namespace ::xmloff::token; -static const OUStringLiteral gsSeparatorLineIsOn("SeparatorLineIsOn"); -static const OUStringLiteral gsSeparatorLineWidth("SeparatorLineWidth"); -static const OUStringLiteral gsSeparatorLineColor("SeparatorLineColor"); -static const OUStringLiteral gsSeparatorLineRelativeHeight("SeparatorLineRelativeHeight"); -static const OUStringLiteral gsSeparatorLineVerticalAlignment("SeparatorLineVerticalAlignment"); -static const OUStringLiteral gsIsAutomatic("IsAutomatic"); -static const OUStringLiteral gsAutomaticDistance("AutomaticDistance"); -static const OUStringLiteral gsSeparatorLineStyle("SeparatorLineStyle"); +const OUStringLiteral gsSeparatorLineIsOn("SeparatorLineIsOn"); +const OUStringLiteral gsSeparatorLineWidth("SeparatorLineWidth"); +const OUStringLiteral gsSeparatorLineColor("SeparatorLineColor"); +const OUStringLiteral gsSeparatorLineRelativeHeight("SeparatorLineRelativeHeight"); +const OUStringLiteral gsSeparatorLineVerticalAlignment("SeparatorLineVerticalAlignment"); +const OUStringLiteral gsIsAutomatic("IsAutomatic"); +const OUStringLiteral gsAutomaticDistance("AutomaticDistance"); +const OUStringLiteral gsSeparatorLineStyle("SeparatorLineStyle"); XMLTextColumnsExport::XMLTextColumnsExport( SvXMLExport& rExp ) : rExport( rExp ) diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 838f258a8947..a947f81cc376 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -118,7 +118,7 @@ enum lcl_MarkType { TypeReference, TypeReferenceStart, TypeReferenceEnd, } -static SvXMLEnumMapEntry<lcl_MarkType> const lcl_aMarkTypeMap[] = +SvXMLEnumMapEntry<lcl_MarkType> const lcl_aMarkTypeMap[] = { { XML_REFERENCE_MARK, TypeReference }, { XML_REFERENCE_MARK_START, TypeReferenceStart }, diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index 13cb28ba98e6..890ca08b3e32 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -64,7 +64,7 @@ Reference < XStyle > XMLTextMasterPageContext::Create() return xNewStyle; } -static const OUStringLiteral gsFollowStyle( "FollowStyle" ); +const OUStringLiteral gsFollowStyle( "FollowStyle" ); XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx index 4e688bdcfbd4..70c7dccadf94 100644 --- a/xmloff/source/text/XMLTextMasterPageExport.cxx +++ b/xmloff/source/text/XMLTextMasterPageExport.cxx @@ -32,17 +32,17 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; using namespace ::xmloff::token; -static const OUStringLiteral gsHeaderText( "HeaderText" ); -static const OUStringLiteral gsHeaderOn( "HeaderIsOn" ); -static const OUStringLiteral gsHeaderShareContent( "HeaderIsShared" ); -static const OUStringLiteral gsHeaderTextFirst( "HeaderTextFirst" ); -static const OUStringLiteral gsHeaderTextLeft( "HeaderTextLeft" ); -static const OUStringLiteral gsFirstShareContent( "FirstIsShared" ); -static const OUStringLiteral gsFooterText( "FooterText" ); -static const OUStringLiteral gsFooterOn( "FooterIsOn" ); -static const OUStringLiteral gsFooterShareContent( "FooterIsShared" ); -static const OUStringLiteral gsFooterTextFirst( "FooterTextFirst" ); -static const OUStringLiteral gsFooterTextLeft( "FooterTextLeft" ); +const OUStringLiteral gsHeaderText( "HeaderText" ); +const OUStringLiteral gsHeaderOn( "HeaderIsOn" ); +const OUStringLiteral gsHeaderShareContent( "HeaderIsShared" ); +const OUStringLiteral gsHeaderTextFirst( "HeaderTextFirst" ); +const OUStringLiteral gsHeaderTextLeft( "HeaderTextLeft" ); +const OUStringLiteral gsFirstShareContent( "FirstIsShared" ); +const OUStringLiteral gsFooterText( "FooterText" ); +const OUStringLiteral gsFooterOn( "FooterIsOn" ); +const OUStringLiteral gsFooterShareContent( "FooterIsShared" ); +const OUStringLiteral gsFooterTextFirst( "FooterTextFirst" ); +const OUStringLiteral gsFooterTextLeft( "FooterTextLeft" ); XMLTextMasterPageExport::XMLTextMasterPageExport( SvXMLExport& rExp ) : XMLPageExport( rExp ) diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx index 57749b0b74d0..156118dfbe3d 100644 --- a/xmloff/source/text/XMLTextShapeImportHelper.cxx +++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx @@ -41,9 +41,9 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::container; using namespace ::com::sun::star::xml::sax; -static const OUStringLiteral gsAnchorType("AnchorType"); -static const OUStringLiteral gsAnchorPageNo("AnchorPageNo"); -static const OUStringLiteral gsVertOrientPosition("VertOrientPosition"); +const OUStringLiteral gsAnchorType("AnchorType"); +const OUStringLiteral gsAnchorPageNo("AnchorPageNo"); +const OUStringLiteral gsVertOrientPosition("VertOrientPosition"); XMLTextShapeImportHelper::XMLTextShapeImportHelper( SvXMLImport& rImp ) : diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx index 558bf80651d1..78c18282ec50 100644 --- a/xmloff/source/text/XMLTextShapeStyleContext.cxx +++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx @@ -140,7 +140,7 @@ void XMLTextShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey, } -static const OUStringLiteral gsIsAutoUpdate( "IsAutoUpdate" ); +const OUStringLiteral gsIsAutoUpdate( "IsAutoUpdate" ); XMLTextShapeStyleContext::XMLTextShapeStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx index cceb49caa51c..61fea910ca64 100644 --- a/xmloff/source/text/txtdropi.cxx +++ b/xmloff/source/text/txtdropi.cxx @@ -49,7 +49,7 @@ enum SvXMLTokenMapDropAttrs } -static const SvXMLTokenMapEntry aDropAttrTokenMap[] = +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/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 61396f58ce2a..9971a3504016 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -82,76 +82,76 @@ using namespace ::com::sun::star::container; using namespace ::xmloff::token; -static char const FIELD_SERVICE_SENDER[] = "ExtendedUser"; -static char const FIELD_SERVICE_AUTHOR[] = "Author"; -static char const FIELD_SERVICE_JUMPEDIT[] = "JumpEdit"; -static char const FIELD_SERVICE_GETEXP[] = "GetExpression"; -static char const FIELD_SERVICE_SETEXP[] = "SetExpression"; -static char const FIELD_SERVICE_USER[] = "User"; -static char const FIELD_SERVICE_INPUT[] = "Input"; -static char const FIELD_SERVICE_USERINPUT[] = "InputUser"; -static char const FIELD_SERVICE_DATETIME[] = "DateTime"; -static char const FIELD_SERVICE_PAGENUMBER[] = "PageNumber"; -static char const FIELD_SERVICE_DB_NEXT[] = "DatabaseNextSet"; -static char const FIELD_SERVICE_DB_SELECT[] = "DatabaseNumberOfSet"; -static char const FIELD_SERVICE_DB_NUMBER[] = "DatabaseSetNumber"; -static char const FIELD_SERVICE_DB_DISPLAY[] = "Database"; -static char const FIELD_SERVICE_DB_NAME[] = "DatabaseName"; -static char const FIELD_SERVICE_CONDITIONAL_TEXT[] = "ConditionalText"; -static char const FIELD_SERVICE_HIDDEN_TEXT[] = "HiddenText"; -static char const FIELD_SERVICE_HIDDEN_PARAGRAPH[] = "HiddenParagraph"; -static char const FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR[] = "DocInfo.ChangeAuthor"; -static char const FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR2[] = "docinfo.ChangeAuthor"; -static char const FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME[] = "DocInfo.ChangeDateTime"; -static char const FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME2[] = "docinfo.ChangeDateTime"; -static char const FIELD_SERVICE_DOC_INFO_EDIT_TIME[] = "DocInfo.EditTime"; -static char const FIELD_SERVICE_DOC_INFO_EDIT_TIME2[] = "docinfo.EditTime"; -static char const FIELD_SERVICE_DOC_INFO_DESCRIPTION[] = "DocInfo.Description"; -static char const FIELD_SERVICE_DOC_INFO_DESCRIPTION2[] = "docinfo.Description"; -static char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR[] = "DocInfo.CreateAuthor"; -static char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR2[] = "docinfo.CreateAuthor"; -static char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME[] = "DocInfo.CreateDateTime"; -static char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME2[] = "docinfo.CreateDateTime"; -static char const FIELD_SERVICE_DOC_INFO_CUSTOM[] = "DocInfo.Custom"; -static char const FIELD_SERVICE_DOC_INFO_CUSTOM2[] = "docinfo.Custom"; -static char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR[] = "DocInfo.PrintAuthor"; -static char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR2[] = "docinfo.PrintAuthor"; -static char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME[] = "DocInfo.PrintDateTime"; -static char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME2[] = "docinfo.PrintDateTime"; -static char const FIELD_SERVICE_DOC_INFO_KEY_WORDS[] = "DocInfo.KeyWords"; -static char const FIELD_SERVICE_DOC_INFO_KEY_WORDS2[] = "docinfo.KeyWords"; -static char const FIELD_SERVICE_DOC_INFO_SUBJECT[] = "DocInfo.Subject"; -static char const FIELD_SERVICE_DOC_INFO_SUBJECT2[] = "docinfo.Subject"; -static char const FIELD_SERVICE_DOC_INFO_TITLE[] = "DocInfo.Title"; -static char const FIELD_SERVICE_DOC_INFO_TITLE2[] = "docinfo.Title"; -static char const FIELD_SERVICE_DOC_INFO_REVISION[] = "DocInfo.Revision"; -static char const FIELD_SERVICE_DOC_INFO_REVISION2[] = "docinfo.Revision"; -static char const FIELD_SERVICE_FILE_NAME[] = "FileName"; -static char const FIELD_SERVICE_CHAPTER[] = "Chapter"; -static char const FIELD_SERVICE_TEMPLATE_NAME[] = "TemplateName"; -static char const FIELD_SERVICE_PAGE_COUNT[] = "PageCount"; -static char const FIELD_SERVICE_PARAGRAPH_COUNT[] = "ParagraphCount"; -static char const FIELD_SERVICE_WORD_COUNT[] = "WordCount"; -static char const FIELD_SERVICE_CHARACTER_COUNT[] = "CharacterCount"; -static char const FIELD_SERVICE_TABLE_COUNT[] = "TableCount"; -static char const FIELD_SERVICE_GRAPHIC_COUNT[] = "GraphicObjectCount"; -static char const FIELD_SERVICE_OBJECT_COUNT[] = "EmbeddedObjectCount"; -static char const FIELD_SERVICE_REFERENCE_PAGE_SET[] = "ReferencePageSet"; -static char const FIELD_SERVICE_REFERENCE_PAGE_GET[] = "ReferencePageGet"; -static char const FIELD_SERVICE_SHEET_NAME[] = "SheetName"; -static char const FIELD_SERVICE_PAGE_NAME[] = "PageName"; -static char const FIELD_SERVICE_MACRO[] = "Macro"; -static char const FIELD_SERVICE_GET_REFERENCE[] = "GetReference"; -static char const FIELD_SERVICE_DDE[] = "DDE"; -static char const FIELD_SERVICE_URL[] = "URL"; -static char const FIELD_SERVICE_BIBLIOGRAPHY[] = "Bibliography"; -static char const FIELD_SERVICE_SCRIPT[] = "Script"; -static char const FIELD_SERVICE_ANNOTATION[] = "Annotation"; -static char const FIELD_SERVICE_COMBINED_CHARACTERS[] = "CombinedCharacters"; -static char const FIELD_SERVICE_META[] = "MetadataField"; -static char const FIELD_SERVICE_MEASURE[] = "Measure"; -static char const FIELD_SERVICE_TABLE_FORMULA[] = "TableFormula"; -static char const FIELD_SERVICE_DROP_DOWN[] = "DropDown"; +char const FIELD_SERVICE_SENDER[] = "ExtendedUser"; +char const FIELD_SERVICE_AUTHOR[] = "Author"; +char const FIELD_SERVICE_JUMPEDIT[] = "JumpEdit"; +char const FIELD_SERVICE_GETEXP[] = "GetExpression"; +char const FIELD_SERVICE_SETEXP[] = "SetExpression"; +char const FIELD_SERVICE_USER[] = "User"; +char const FIELD_SERVICE_INPUT[] = "Input"; +char const FIELD_SERVICE_USERINPUT[] = "InputUser"; +char const FIELD_SERVICE_DATETIME[] = "DateTime"; +char const FIELD_SERVICE_PAGENUMBER[] = "PageNumber"; +char const FIELD_SERVICE_DB_NEXT[] = "DatabaseNextSet"; +char const FIELD_SERVICE_DB_SELECT[] = "DatabaseNumberOfSet"; +char const FIELD_SERVICE_DB_NUMBER[] = "DatabaseSetNumber"; +char const FIELD_SERVICE_DB_DISPLAY[] = "Database"; +char const FIELD_SERVICE_DB_NAME[] = "DatabaseName"; +char const FIELD_SERVICE_CONDITIONAL_TEXT[] = "ConditionalText"; +char const FIELD_SERVICE_HIDDEN_TEXT[] = "HiddenText"; +char const FIELD_SERVICE_HIDDEN_PARAGRAPH[] = "HiddenParagraph"; +char const FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR[] = "DocInfo.ChangeAuthor"; +char const FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR2[] = "docinfo.ChangeAuthor"; +char const FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME[] = "DocInfo.ChangeDateTime"; +char const FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME2[] = "docinfo.ChangeDateTime"; +char const FIELD_SERVICE_DOC_INFO_EDIT_TIME[] = "DocInfo.EditTime"; +char const FIELD_SERVICE_DOC_INFO_EDIT_TIME2[] = "docinfo.EditTime"; +char const FIELD_SERVICE_DOC_INFO_DESCRIPTION[] = "DocInfo.Description"; +char const FIELD_SERVICE_DOC_INFO_DESCRIPTION2[] = "docinfo.Description"; +char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR[] = "DocInfo.CreateAuthor"; +char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR2[] = "docinfo.CreateAuthor"; +char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME[] = "DocInfo.CreateDateTime"; +char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME2[] = "docinfo.CreateDateTime"; +char const FIELD_SERVICE_DOC_INFO_CUSTOM[] = "DocInfo.Custom"; +char const FIELD_SERVICE_DOC_INFO_CUSTOM2[] = "docinfo.Custom"; +char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR[] = "DocInfo.PrintAuthor"; +char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR2[] = "docinfo.PrintAuthor"; +char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME[] = "DocInfo.PrintDateTime"; +char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME2[] = "docinfo.PrintDateTime"; +char const FIELD_SERVICE_DOC_INFO_KEY_WORDS[] = "DocInfo.KeyWords"; +char const FIELD_SERVICE_DOC_INFO_KEY_WORDS2[] = "docinfo.KeyWords"; +char const FIELD_SERVICE_DOC_INFO_SUBJECT[] = "DocInfo.Subject"; +char const FIELD_SERVICE_DOC_INFO_SUBJECT2[] = "docinfo.Subject"; +char const FIELD_SERVICE_DOC_INFO_TITLE[] = "DocInfo.Title"; +char const FIELD_SERVICE_DOC_INFO_TITLE2[] = "docinfo.Title"; +char const FIELD_SERVICE_DOC_INFO_REVISION[] = "DocInfo.Revision"; +char const FIELD_SERVICE_DOC_INFO_REVISION2[] = "docinfo.Revision"; +char const FIELD_SERVICE_FILE_NAME[] = "FileName"; +char const FIELD_SERVICE_CHAPTER[] = "Chapter"; +char const FIELD_SERVICE_TEMPLATE_NAME[] = "TemplateName"; +char const FIELD_SERVICE_PAGE_COUNT[] = "PageCount"; +char const FIELD_SERVICE_PARAGRAPH_COUNT[] = "ParagraphCount"; +char const FIELD_SERVICE_WORD_COUNT[] = "WordCount"; +char const FIELD_SERVICE_CHARACTER_COUNT[] = "CharacterCount"; +char const FIELD_SERVICE_TABLE_COUNT[] = "TableCount"; +char const FIELD_SERVICE_GRAPHIC_COUNT[] = "GraphicObjectCount"; +char const FIELD_SERVICE_OBJECT_COUNT[] = "EmbeddedObjectCount"; +char const FIELD_SERVICE_REFERENCE_PAGE_SET[] = "ReferencePageSet"; +char const FIELD_SERVICE_REFERENCE_PAGE_GET[] = "ReferencePageGet"; +char const FIELD_SERVICE_SHEET_NAME[] = "SheetName"; +char const FIELD_SERVICE_PAGE_NAME[] = "PageName"; +char const FIELD_SERVICE_MACRO[] = "Macro"; +char const FIELD_SERVICE_GET_REFERENCE[] = "GetReference"; +char const FIELD_SERVICE_DDE[] = "DDE"; +char const FIELD_SERVICE_URL[] = "URL"; +char const FIELD_SERVICE_BIBLIOGRAPHY[] = "Bibliography"; +char const FIELD_SERVICE_SCRIPT[] = "Script"; +char const FIELD_SERVICE_ANNOTATION[] = "Annotation"; +char const FIELD_SERVICE_COMBINED_CHARACTERS[] = "CombinedCharacters"; +char const FIELD_SERVICE_META[] = "MetadataField"; +char const FIELD_SERVICE_MEASURE[] = "Measure"; +char const FIELD_SERVICE_TABLE_FORMULA[] = "TableFormula"; +char const FIELD_SERVICE_DROP_DOWN[] = "DropDown"; namespace { @@ -295,78 +295,78 @@ static Sequence<OUString> GetStringSequenceProperty( // service names -static const OUStringLiteral gsServicePrefix("com.sun.star.text.textfield."); -static const OUStringLiteral gsFieldMasterPrefix("com.sun.star.text.FieldMaster."); -static const OUStringLiteral gsPresentationServicePrefix("com.sun.star.presentation.TextField."); +const OUStringLiteral gsServicePrefix("com.sun.star.text.textfield."); +const OUStringLiteral gsFieldMasterPrefix("com.sun.star.text.FieldMaster."); +const OUStringLiteral gsPresentationServicePrefix("com.sun.star.presentation.TextField."); // property names -static const OUStringLiteral gsPropertyAdjust("Adjust"); -static const OUStringLiteral gsPropertyAuthor("Author"); -static const OUStringLiteral gsPropertyChapterFormat("ChapterFormat"); -static const OUStringLiteral gsPropertyChapterNumberingLevel("ChapterNumberingLevel"); -static const OUStringLiteral gsPropertyCharStyleNames("CharStyleNames"); -static const OUStringLiteral gsPropertyCondition("Condition"); -static const OUStringLiteral gsPropertyContent("Content"); -static const OUStringLiteral gsPropertyDataBaseName("DataBaseName"); -static const OUStringLiteral gsPropertyDataBaseURL("DataBaseURL"); -static const OUStringLiteral gsPropertyDataColumnName("DataColumnName"); -static const OUStringLiteral gsPropertyDataCommandType("DataCommandType"); -static const OUStringLiteral gsPropertyDataTableName("DataTableName"); -static const OUStringLiteral gsPropertyDateTime("DateTime"); -static const OUStringLiteral gsPropertyDateTimeValue("DateTimeValue"); -static const OUStringLiteral gsPropertyDDECommandElement("DDECommandElement"); -static const OUStringLiteral gsPropertyDDECommandFile("DDECommandFile"); -static const OUStringLiteral gsPropertyDDECommandType("DDECommandType"); -static const OUStringLiteral gsPropertyDependentTextFields("DependentTextFields"); -static const OUStringLiteral gsPropertyFalseContent("FalseContent"); -static const OUStringLiteral gsPropertyFields("Fields"); -static const OUStringLiteral gsPropertyFieldSubType("UserDataType"); -static const OUStringLiteral gsPropertyFileFormat("FileFormat"); -static const OUStringLiteral gsPropertyFullName("FullName"); -static const OUStringLiteral gsPropertyHint("Hint"); -static const OUStringLiteral gsPropertyInitials("Initials"); -static const OUStringLiteral gsPropertyInstanceName("InstanceName"); -static const OUStringLiteral gsPropertyIsAutomaticUpdate("IsAutomaticUpdate"); -static const OUStringLiteral gsPropertyIsConditionTrue("IsConditionTrue"); -static const OUStringLiteral gsPropertyIsDataBaseFormat("DataBaseFormat"); -static const OUStringLiteral gsPropertyIsDate("IsDate"); -static const OUStringLiteral gsPropertyIsExpression("IsExpression"); -static const OUStringLiteral gsPropertyIsFixed("IsFixed"); -static const OUStringLiteral gsPropertyIsFixedLanguage("IsFixedLanguage"); -static const OUStringLiteral gsPropertyIsHidden("IsHidden"); -static const OUStringLiteral gsPropertyIsInput("Input"); -static const OUStringLiteral gsPropertyIsShowFormula("IsShowFormula"); -static const OUStringLiteral gsPropertyIsVisible("IsVisible"); -static const OUStringLiteral gsPropertyItems("Items"); -static const OUStringLiteral gsPropertyLevel("Level"); -static const OUStringLiteral gsPropertyMeasureKind("Kind"); -static const OUStringLiteral gsPropertyName("Name"); -static const OUStringLiteral gsPropertyNumberFormat("NumberFormat"); -static const OUStringLiteral gsPropertyNumberingSeparator("NumberingSeparator"); -static const OUStringLiteral gsPropertyNumberingType("NumberingType"); -static const OUStringLiteral gsPropertyOffset("Offset"); -static const OUStringLiteral gsPropertyOn("On"); -static const OUStringLiteral gsPropertyPlaceholderType("PlaceHolderType"); -static const OUStringLiteral gsPropertyReferenceFieldPart("ReferenceFieldPart"); -static const OUStringLiteral gsPropertyReferenceFieldSource("ReferenceFieldSource"); -static const OUStringLiteral gsPropertyReferenceFieldLanguage("ReferenceFieldLanguage"); -static const OUStringLiteral gsPropertyScriptType("ScriptType"); -static const OUStringLiteral gsPropertySelectedItem("SelectedItem"); -static const OUStringLiteral gsPropertySequenceNumber("SequenceNumber"); -static const OUStringLiteral gsPropertySequenceValue("SequenceValue"); -static const OUStringLiteral gsPropertySetNumber("SetNumber"); -static const OUStringLiteral gsPropertySourceName("SourceName"); -static const OUStringLiteral gsPropertySubType("SubType"); -static const OUStringLiteral gsPropertyTargetFrame("TargetFrame"); -static const OUStringLiteral gsPropertyTrueContent("TrueContent"); -static const OUStringLiteral gsPropertyURL("URL"); -static const OUStringLiteral gsPropertyURLContent("URLContent"); -static const OUStringLiteral gsPropertyUserText("UserText"); -static const OUStringLiteral gsPropertyValue("Value"); -static const OUStringLiteral gsPropertyVariableName("VariableName"); -static const OUStringLiteral gsPropertyHelp("Help"); -static const OUStringLiteral gsPropertyTooltip("Tooltip"); -static const OUStringLiteral gsPropertyTextRange("TextRange"); +const OUStringLiteral gsPropertyAdjust("Adjust"); +const OUStringLiteral gsPropertyAuthor("Author"); +const OUStringLiteral gsPropertyChapterFormat("ChapterFormat"); +const OUStringLiteral gsPropertyChapterNumberingLevel("ChapterNumberingLevel"); +const OUStringLiteral gsPropertyCharStyleNames("CharStyleNames"); +const OUStringLiteral gsPropertyCondition("Condition"); +const OUStringLiteral gsPropertyContent("Content"); +const OUStringLiteral gsPropertyDataBaseName("DataBaseName"); +const OUStringLiteral gsPropertyDataBaseURL("DataBaseURL"); +const OUStringLiteral gsPropertyDataColumnName("DataColumnName"); +const OUStringLiteral gsPropertyDataCommandType("DataCommandType"); +const OUStringLiteral gsPropertyDataTableName("DataTableName"); +const OUStringLiteral gsPropertyDateTime("DateTime"); +const OUStringLiteral gsPropertyDateTimeValue("DateTimeValue"); +const OUStringLiteral gsPropertyDDECommandElement("DDECommandElement"); +const OUStringLiteral gsPropertyDDECommandFile("DDECommandFile"); +const OUStringLiteral gsPropertyDDECommandType("DDECommandType"); +const OUStringLiteral gsPropertyDependentTextFields("DependentTextFields"); +const OUStringLiteral gsPropertyFalseContent("FalseContent"); +const OUStringLiteral gsPropertyFields("Fields"); +const OUStringLiteral gsPropertyFieldSubType("UserDataType"); +const OUStringLiteral gsPropertyFileFormat("FileFormat"); +const OUStringLiteral gsPropertyFullName("FullName"); +const OUStringLiteral gsPropertyHint("Hint"); +const OUStringLiteral gsPropertyInitials("Initials"); +const OUStringLiteral gsPropertyInstanceName("InstanceName"); +const OUStringLiteral gsPropertyIsAutomaticUpdate("IsAutomaticUpdate"); +const OUStringLiteral gsPropertyIsConditionTrue("IsConditionTrue"); +const OUStringLiteral gsPropertyIsDataBaseFormat("DataBaseFormat"); +const OUStringLiteral gsPropertyIsDate("IsDate"); +const OUStringLiteral gsPropertyIsExpression("IsExpression"); +const OUStringLiteral gsPropertyIsFixed("IsFixed"); +const OUStringLiteral gsPropertyIsFixedLanguage("IsFixedLanguage"); +const OUStringLiteral gsPropertyIsHidden("IsHidden"); +const OUStringLiteral gsPropertyIsInput("Input"); +const OUStringLiteral gsPropertyIsShowFormula("IsShowFormula"); +const OUStringLiteral gsPropertyIsVisible("IsVisible"); +const OUStringLiteral gsPropertyItems("Items"); +const OUStringLiteral gsPropertyLevel("Level"); +const OUStringLiteral gsPropertyMeasureKind("Kind"); +const OUStringLiteral gsPropertyName("Name"); +const OUStringLiteral gsPropertyNumberFormat("NumberFormat"); +const OUStringLiteral gsPropertyNumberingSeparator("NumberingSeparator"); +const OUStringLiteral gsPropertyNumberingType("NumberingType"); +const OUStringLiteral gsPropertyOffset("Offset"); +const OUStringLiteral gsPropertyOn("On"); +const OUStringLiteral gsPropertyPlaceholderType("PlaceHolderType"); +const OUStringLiteral gsPropertyReferenceFieldPart("ReferenceFieldPart"); +const OUStringLiteral gsPropertyReferenceFieldSource("ReferenceFieldSource"); +const OUStringLiteral gsPropertyReferenceFieldLanguage("ReferenceFieldLanguage"); +const OUStringLiteral gsPropertyScriptType("ScriptType"); +const OUStringLiteral gsPropertySelectedItem("SelectedItem"); +const OUStringLiteral gsPropertySequenceNumber("SequenceNumber"); +const OUStringLiteral gsPropertySequenceValue("SequenceValue"); +const OUStringLiteral gsPropertySetNumber("SetNumber"); +const OUStringLiteral gsPropertySourceName("SourceName"); +const OUStringLiteral gsPropertySubType("SubType"); +const OUStringLiteral gsPropertyTargetFrame("TargetFrame"); +const OUStringLiteral gsPropertyTrueContent("TrueContent"); +const OUStringLiteral gsPropertyURL("URL"); +const OUStringLiteral gsPropertyURLContent("URLContent"); +const OUStringLiteral gsPropertyUserText("UserText"); +const OUStringLiteral gsPropertyValue("Value"); +const OUStringLiteral gsPropertyVariableName("VariableName"); +const OUStringLiteral gsPropertyHelp("Help"); +const OUStringLiteral gsPropertyTooltip("Tooltip"); +const OUStringLiteral gsPropertyTextRange("TextRange"); XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp, std::unique_ptr<XMLPropertyState> pCombinedCharState) diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 62dd48c768cb..02898ad629dc 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -535,7 +535,7 @@ void XMLTextFieldImportContext::ForceUpdate( // XMLSenderFieldImportContext -static const OUStringLiteral gsPropertyFieldSubType("UserDataType"); +const OUStringLiteral gsPropertyFieldSubType("UserDataType"); XMLSenderFieldImportContext::XMLSenderFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -654,7 +654,7 @@ void XMLSenderFieldImportContext::PrepareField( // XMLAuthorFieldImportContext -static const OUStringLiteral gsPropertyAuthorFullName("FullName"); +const OUStringLiteral gsPropertyAuthorFullName("FullName"); XMLAuthorFieldImportContext::XMLAuthorFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -719,7 +719,7 @@ void XMLAuthorFieldImportContext::PrepareField( // page continuation string -static SvXMLEnumMapEntry<PageNumberType> const lcl_aSelectPageAttrMap[] = +SvXMLEnumMapEntry<PageNumberType> const lcl_aSelectPageAttrMap[] = { { XML_PREVIOUS, PageNumberType_PREV }, { XML_CURRENT, PageNumberType_CURRENT }, @@ -727,7 +727,7 @@ static SvXMLEnumMapEntry<PageNumberType> const lcl_aSelectPageAttrMap[] = { XML_TOKEN_INVALID, PageNumberType(0) }, }; -static const OUStringLiteral gsPropertyUserText("UserText"); +const OUStringLiteral gsPropertyUserText("UserText"); XMLPageContinuationImportContext::XMLPageContinuationImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, @@ -878,8 +878,8 @@ void XMLPageNumberImportContext::PrepareField( // Placeholder -static const OUStringLiteral gsPropertyPlaceholderType("PlaceHolderType"); -static const OUStringLiteral gsPropertyPlaceholder("PlaceHolder"); +const OUStringLiteral gsPropertyPlaceholderType("PlaceHolderType"); +const OUStringLiteral gsPropertyPlaceholder("PlaceHolder"); XMLPlaceholderFieldImportContext::XMLPlaceholderFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -960,7 +960,7 @@ void XMLPlaceholderFieldImportContext::PrepareField( // time field -static const OUStringLiteral gsPropertyAdjust("Adjust"); +const OUStringLiteral gsPropertyAdjust("Adjust"); XMLTimeFieldImportContext::XMLTimeFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -1136,11 +1136,11 @@ void XMLDateFieldImportContext::ProcessAttribute( // database field superclass -static const OUStringLiteral gsPropertyDataBaseName("DataBaseName"); -static const OUStringLiteral gsPropertyDataBaseURL("DataBaseURL"); -static const OUStringLiteral gsPropertyTableName("DataTableName"); -static const OUStringLiteral gsPropertyDataCommandType("DataCommandType"); -static const OUStringLiteral gsPropertyIsVisible("IsVisible"); +const OUStringLiteral gsPropertyDataBaseName("DataBaseName"); +const OUStringLiteral gsPropertyDataBaseURL("DataBaseURL"); +const OUStringLiteral gsPropertyTableName("DataTableName"); +const OUStringLiteral gsPropertyDataCommandType("DataCommandType"); +const OUStringLiteral gsPropertyIsVisible("IsVisible"); XMLDatabaseFieldImportContext::XMLDatabaseFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -1604,7 +1604,7 @@ const char* XMLSimpleDocInfoImportContext::MapTokenToServiceName( // revision field -static const OUStringLiteral sPropertyRevision("Revision"); +const OUStringLiteral sPropertyRevision("Revision"); XMLRevisionDocInfoImportContext::XMLRevisionDocInfoImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, @@ -1874,9 +1874,9 @@ void XMLHiddenParagraphImportContext::PrepareField( // import conditional text (<text:conditional-text>) -static const OUStringLiteral gsPropertyTrueContent("TrueContent"); -static const OUStringLiteral gsPropertyFalseContent("FalseContent"); -static const OUStringLiteral gsPropertyIsConditionTrue("IsConditionTrue"); +const OUStringLiteral gsPropertyTrueContent("TrueContent"); +const OUStringLiteral gsPropertyFalseContent("FalseContent"); +const OUStringLiteral gsPropertyIsConditionTrue("IsConditionTrue"); XMLConditionalTextImportContext::XMLConditionalTextImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -2012,7 +2012,7 @@ void XMLHiddenTextImportContext::PrepareField( // file name fields -static const SvXMLEnumMapEntry<sal_uInt16> aFilenameDisplayMap[] = +const SvXMLEnumMapEntry<sal_uInt16> aFilenameDisplayMap[] = { { XML_PATH, FilenameDisplayFormat::PATH }, { XML_NAME, FilenameDisplayFormat::NAME }, @@ -2094,7 +2094,7 @@ void XMLFileNameImportContext::PrepareField( // template name field -static const SvXMLEnumMapEntry<sal_uInt16> aTemplateDisplayMap[] = +const SvXMLEnumMapEntry<sal_uInt16> aTemplateDisplayMap[] = { { XML_FULL, TemplateDisplayFormat::FULL }, { XML_PATH, TemplateDisplayFormat::PATH }, @@ -2149,7 +2149,7 @@ void XMLTemplateNameImportContext::PrepareField( // import chapter fields -static const SvXMLEnumMapEntry<sal_uInt16> aChapterDisplayMap[] = +const SvXMLEnumMapEntry<sal_uInt16> aChapterDisplayMap[] = { { XML_NAME, ChapterFormat::NAME }, { XML_NUMBER, ChapterFormat::NUMBER }, @@ -2159,8 +2159,8 @@ static const SvXMLEnumMapEntry<sal_uInt16> aChapterDisplayMap[] = { XML_TOKEN_INVALID, 0 } }; -static const OUStringLiteral gsPropertyChapterFormat("ChapterFormat"); -static const OUStringLiteral gsPropertyLevel("Level"); +const OUStringLiteral gsPropertyChapterFormat("ChapterFormat"); +const OUStringLiteral gsPropertyLevel("Level"); XMLChapterImportContext::XMLChapterImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -2547,7 +2547,7 @@ XMLReferenceFieldImportContext::XMLReferenceFieldImportContext( { } -static SvXMLEnumMapEntry<sal_uInt16> const lcl_aReferenceTypeTokenMap[] = +SvXMLEnumMapEntry<sal_uInt16> const lcl_aReferenceTypeTokenMap[] = { { XML_PAGE, ReferenceFieldPart::PAGE}, { XML_CHAPTER, ReferenceFieldPart::CHAPTER }, @@ -2677,7 +2677,7 @@ enum DdeFieldDeclAttrs } -static const SvXMLTokenMapEntry aDdeDeclAttrTokenMap[] = +const SvXMLTokenMapEntry aDdeDeclAttrTokenMap[] = { { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_DDEFIELD_NAME }, { XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION, XML_TOK_DDEFIELD_APPLICATION }, @@ -3024,7 +3024,7 @@ XMLBibliographyFieldImportContext::XMLBibliographyFieldImportContext( } // TODO: this is the same map as is used in the text field export -static SvXMLEnumMapEntry<sal_uInt16> const aBibliographyDataTypeMap[] = +SvXMLEnumMapEntry<sal_uInt16> 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 5349d4516a77..b1b6dedaf9d5 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -86,7 +86,7 @@ using namespace ::com::sun::star::lang; using namespace ::xmloff::token; using namespace ::com::sun::star::ucb; -static const SvXMLTokenMapEntry aTextElemTokenMap[] = +const SvXMLTokenMapEntry aTextElemTokenMap[] = { { XML_NAMESPACE_TEXT, XML_P, XML_TOK_TEXT_P }, { XML_NAMESPACE_LO_EXT, XML_P, XML_TOK_TEXT_P }, @@ -122,7 +122,7 @@ static const SvXMLTokenMapEntry aTextElemTokenMap[] = XML_TOKEN_MAP_END }; -static const SvXMLTokenMapEntry aTextPElemTokenMap[] = +const SvXMLTokenMapEntry aTextPElemTokenMap[] = { { XML_NAMESPACE_TEXT, XML_SPAN, XML_TOK_TEXT_SPAN }, { XML_NAMESPACE_TEXT, XML_TAB, XML_TOK_TEXT_TAB_STOP }, @@ -303,7 +303,7 @@ static const SvXMLTokenMapEntry aTextPElemTokenMap[] = XML_TOKEN_MAP_END }; -static const SvXMLTokenMapEntry aTextPAttrTokenMap[] = +const SvXMLTokenMapEntry aTextPAttrTokenMap[] = { { XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_P_XMLID }, { XML_NAMESPACE_XHTML, XML_ABOUT, XML_TOK_TEXT_P_ABOUT }, @@ -321,7 +321,7 @@ static const SvXMLTokenMapEntry aTextPAttrTokenMap[] = XML_TOKEN_MAP_END }; -static const SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] = +const SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] = { { XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_NUMBERED_PARAGRAPH_XMLID }, { XML_NAMESPACE_TEXT, XML_LIST_ID, @@ -336,7 +336,7 @@ static const SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] = XML_TOKEN_MAP_END }; -static const SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] = +const SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] = { { XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_LIST_BLOCK_XMLID }, { XML_NAMESPACE_TEXT, XML_STYLE_NAME, @@ -348,14 +348,14 @@ static const SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] = XML_TOKEN_MAP_END }; -static const SvXMLTokenMapEntry aTextListBlockElemTokenMap[] = +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 const SvXMLTokenMapEntry aTextFrameAttrTokenMap[] = +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 }, @@ -387,7 +387,7 @@ static const SvXMLTokenMapEntry aTextFrameAttrTokenMap[] = XML_TOKEN_MAP_END }; -static const SvXMLTokenMapEntry aTextContourAttrTokenMap[] = +const SvXMLTokenMapEntry aTextContourAttrTokenMap[] = { { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_TEXT_CONTOUR_WIDTH }, { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_TEXT_CONTOUR_HEIGHT }, @@ -398,7 +398,7 @@ static const SvXMLTokenMapEntry aTextContourAttrTokenMap[] = XML_TOKEN_MAP_END }; -static const SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] = +const SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] = { { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXT_HYPERLINK_HREF }, { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_TEXT_HYPERLINK_NAME }, @@ -410,7 +410,7 @@ static const SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] = XML_TOKEN_MAP_END }; -static const SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] = +const SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] = { { XML_NAMESPACE_STYLE, XML_HEADER, XML_TOK_TEXT_MP_HEADER }, { XML_NAMESPACE_STYLE, XML_FOOTER, XML_TOK_TEXT_MP_FOOTER }, @@ -424,7 +424,7 @@ static const SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] = XML_TOKEN_MAP_END }; -static const SvXMLTokenMapEntry aTextFieldAttrTokenMap[] = +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/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 26ff035a488b..75082493dfd8 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -126,80 +126,80 @@ using namespace ::xmloff; using namespace ::xmloff::token; // Implement Title/Description Elements UI (#i73249#) -static const OUStringLiteral gsTitle("Title"); -static const OUStringLiteral gsDescription("Description"); +const OUStringLiteral gsTitle("Title"); +const OUStringLiteral gsDescription("Description"); const OUStringLiteral XMLTextParagraphExport::gsAnchorCharStyleName("AnchorCharStyleName"); -static const OUStringLiteral gsAnchorPageNo("AnchorPageNo"); -static const OUStringLiteral gsAnchorType("AnchorType"); +const OUStringLiteral gsAnchorPageNo("AnchorPageNo"); +const OUStringLiteral gsAnchorType("AnchorType"); const OUStringLiteral XMLTextParagraphExport::gsBeginNotice("BeginNotice"); -static const OUStringLiteral gsBookmark("Bookmark"); +const OUStringLiteral gsBookmark("Bookmark"); const OUStringLiteral XMLTextParagraphExport::gsCategory("Category"); -static const OUStringLiteral gsChainNextName("ChainNextName"); +const OUStringLiteral gsChainNextName("ChainNextName"); const OUStringLiteral XMLTextParagraphExport::gsCharStyleName("CharStyleName"); const OUStringLiteral XMLTextParagraphExport::gsCharStyleNames("CharStyleNames"); -static const OUStringLiteral gsContourPolyPolygon("ContourPolyPolygon"); -static const OUStringLiteral gsDocumentIndexMark("DocumentIndexMark"); +const OUStringLiteral gsContourPolyPolygon("ContourPolyPolygon"); +const OUStringLiteral gsDocumentIndexMark("DocumentIndexMark"); const OUStringLiteral XMLTextParagraphExport::gsEndNotice("EndNotice"); const OUStringLiteral XMLTextParagraphExport::gsFootnote("Footnote"); const OUStringLiteral XMLTextParagraphExport::gsFootnoteCounting("FootnoteCounting"); -static const OUStringLiteral gsFrame("Frame"); -static const OUStringLiteral gsGraphicFilter("GraphicFilter"); -static const OUStringLiteral gsGraphicRotation("GraphicRotation"); -static const OUStringLiteral gsHeight("Height"); -static const OUStringLiteral gsHoriOrient("HoriOrient"); -static const OUStringLiteral gsHoriOrientPosition("HoriOrientPosition"); -static const OUStringLiteral gsHyperLinkName("HyperLinkName"); -static const OUStringLiteral gsHyperLinkTarget("HyperLinkTarget"); -static const OUStringLiteral gsHyperLinkURL("HyperLinkURL"); -static const OUStringLiteral gsIsAutomaticContour("IsAutomaticContour"); -static const OUStringLiteral gsIsCollapsed("IsCollapsed"); -static const OUStringLiteral gsIsPixelContour("IsPixelContour"); -static const OUStringLiteral gsIsStart("IsStart"); -static const OUStringLiteral gsIsSyncHeightToWidth("IsSyncHeightToWidth"); -static const OUStringLiteral gsIsSyncWidthToHeight("IsSyncWidthToHeight"); -static const OUStringLiteral gsNumberingRules("NumberingRules"); +const OUStringLiteral gsFrame("Frame"); +const OUStringLiteral gsGraphicFilter("GraphicFilter"); +const OUStringLiteral gsGraphicRotation("GraphicRotation"); +const OUStringLiteral gsHeight("Height"); +const OUStringLiteral gsHoriOrient("HoriOrient"); +const OUStringLiteral gsHoriOrientPosition("HoriOrientPosition"); +const OUStringLiteral gsHyperLinkName("HyperLinkName"); +const OUStringLiteral gsHyperLinkTarget("HyperLinkTarget"); +const OUStringLiteral gsHyperLinkURL("HyperLinkURL"); +const OUStringLiteral gsIsAutomaticContour("IsAutomaticContour"); +const OUStringLiteral gsIsCollapsed("IsCollapsed"); +const OUStringLiteral gsIsPixelContour("IsPixelContour"); +const OUStringLiteral gsIsStart("IsStart"); +const OUStringLiteral gsIsSyncHeightToWidth("IsSyncHeightToWidth"); +const OUStringLiteral gsIsSyncWidthToHeight("IsSyncWidthToHeight"); +const OUStringLiteral gsNumberingRules("NumberingRules"); const OUStringLiteral XMLTextParagraphExport::gsNumberingType("NumberingType"); const OUStringLiteral XMLTextParagraphExport::gsPageDescName("PageDescName"); const OUStringLiteral XMLTextParagraphExport::gsPageStyleName("PageStyleName"); -static const OUStringLiteral gsParaConditionalStyleName("ParaConditionalStyleName"); -static const OUStringLiteral gsParagraphService("com.sun.star.text.Paragraph"); +const OUStringLiteral gsParaConditionalStyleName("ParaConditionalStyleName"); +const OUStringLiteral gsParagraphService("com.sun.star.text.Paragraph"); const OUStringLiteral XMLTextParagraphExport::gsParaStyleName("ParaStyleName"); const OUStringLiteral XMLTextParagraphExport::gsPositionEndOfDoc("PositionEndOfDoc"); const OUStringLiteral XMLTextParagraphExport::gsPrefix("Prefix"); -static const OUStringLiteral gsRedline("Redline"); +const OUStringLiteral gsRedline("Redline"); const OUStringLiteral XMLTextParagraphExport::gsReferenceId("ReferenceId"); -static const OUStringLiteral gsReferenceMark("ReferenceMark"); -static const OUStringLiteral gsRelativeHeight("RelativeHeight"); -static const OUStringLiteral gsRelativeWidth("RelativeWidth"); -static const OUStringLiteral gsRuby("Ruby"); -static const OUStringLiteral gsRubyCharStyleName("RubyCharStyleName"); -static const OUStringLiteral gsRubyText("RubyText"); -static const OUStringLiteral gsServerMap("ServerMap"); -static const OUStringLiteral gsShapeService("com.sun.star.drawing.Shape"); -static const OUStringLiteral gsSizeType("SizeType"); -static const OUStringLiteral gsSoftPageBreak( "SoftPageBreak" ); +const OUStringLiteral gsReferenceMark("ReferenceMark"); +const OUStringLiteral gsRelativeHeight("RelativeHeight"); +const OUStringLiteral gsRelativeWidth("RelativeWidth"); +const OUStringLiteral gsRuby("Ruby"); +const OUStringLiteral gsRubyCharStyleName("RubyCharStyleName"); +const OUStringLiteral gsRubyText("RubyText"); +const OUStringLiteral gsServerMap("ServerMap"); +const OUStringLiteral gsShapeService("com.sun.star.drawing.Shape"); +const OUStringLiteral gsSizeType("SizeType"); +const OUStringLiteral gsSoftPageBreak( "SoftPageBreak" ); const OUStringLiteral XMLTextParagraphExport::gsStartAt("StartAt"); const OUStringLiteral XMLTextParagraphExport::gsSuffix("Suffix"); -static const OUStringLiteral gsTableService("com.sun.star.text.TextTable"); -static const OUStringLiteral gsText("Text"); -static const OUStringLiteral gsTextContentService("com.sun.star.text.TextContent"); -static const OUStringLiteral gsTextEmbeddedService("com.sun.star.text.TextEmbeddedObject"); +const OUStringLiteral gsTableService("com.sun.star.text.TextTable"); +const OUStringLiteral gsText("Text"); +const OUStringLiteral gsTextContentService("com.sun.star.text.TextContent"); +const OUStringLiteral gsTextEmbeddedService("com.sun.star.text.TextEmbeddedObject"); const OUStringLiteral XMLTextParagraphExport::gsTextEndnoteService("com.sun.star.text.Endnote"); -static const OUStringLiteral gsTextField("TextField"); -static const OUStringLiteral gsTextFieldService("com.sun.star.text.TextField"); -static const OUStringLiteral gsTextFrameService("com.sun.star.text.TextFrame"); -static const OUStringLiteral gsTextGraphicService("com.sun.star.text.TextGraphicObject"); -static const OUStringLiteral gsTextPortionType("TextPortionType"); +const OUStringLiteral gsTextField("TextField"); +const OUStringLiteral gsTextFieldService("com.sun.star.text.TextField"); +const OUStringLiteral gsTextFrameService("com.sun.star.text.TextFrame"); +const OUStringLiteral gsTextGraphicService("com.sun.star.text.TextGraphicObject"); +const OUStringLiteral gsTextPortionType("TextPortionType"); const OUStringLiteral XMLTextParagraphExport::gsTextSection("TextSection"); -static const OUStringLiteral gsUnvisitedCharStyleName("UnvisitedCharStyleName"); -static const OUStringLiteral gsVertOrient("VertOrient"); -static const OUStringLiteral gsVertOrientPosition("VertOrientPosition"); -static const OUStringLiteral gsVisitedCharStyleName("VisitedCharStyleName"); -static const OUStringLiteral gsWidth("Width"); -static const OUStringLiteral gsWidthType( "WidthType" ); -static const OUStringLiteral gsTextFieldStart( "TextFieldStart" ); -static const OUStringLiteral gsTextFieldEnd( "TextFieldEnd" ); -static const OUStringLiteral gsTextFieldStartEnd( "TextFieldStartEnd" ); +const OUStringLiteral gsUnvisitedCharStyleName("UnvisitedCharStyleName"); +const OUStringLiteral gsVertOrient("VertOrient"); +const OUStringLiteral gsVertOrientPosition("VertOrientPosition"); +const OUStringLiteral gsVisitedCharStyleName("VisitedCharStyleName"); +const OUStringLiteral gsWidth("Width"); +const OUStringLiteral gsWidthType( "WidthType" ); +const OUStringLiteral gsTextFieldStart( "TextFieldStart" ); +const OUStringLiteral gsTextFieldEnd( "TextFieldEnd" ); +const OUStringLiteral gsTextFieldStartEnd( "TextFieldStartEnd" ); const OUStringLiteral XMLTextParagraphExport::gsFrameStyleName("FrameStyleName"); @@ -1424,9 +1424,9 @@ void XMLTextParagraphExport::exportFrameFrames( // bookmarks, reference marks (and TOC marks) are the same except for the // element names. We use the same method for export and it an array with // the proper element names -static const enum XMLTokenEnum lcl_XmlReferenceElements[] = { +const enum XMLTokenEnum lcl_XmlReferenceElements[] = { XML_REFERENCE_MARK, XML_REFERENCE_MARK_START, XML_REFERENCE_MARK_END }; -static const enum XMLTokenEnum lcl_XmlBookmarkElements[] = { +const enum XMLTokenEnum lcl_XmlBookmarkElements[] = { XML_BOOKMARK, XML_BOOKMARK_START, XML_BOOKMARK_END }; // This function replaces the text portion iteration during auto style diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index a14f5dffbb9f..d430c09a8878 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -65,7 +65,7 @@ using namespace ::com::sun::star::text; using namespace ::xmloff::token; using namespace ::com::sun::star::drawing; -static SvXMLEnumMapEntry<sal_uInt16> const pXML_HoriPos_Enum[] = +SvXMLEnumMapEntry<sal_uInt16> const pXML_HoriPos_Enum[] = { { XML_FROM_LEFT, HoriOrientation::NONE }, { XML_FROM_INSIDE, HoriOrientation::NONE }, // import only @@ -77,7 +77,7 @@ static SvXMLEnumMapEntry<sal_uInt16> const pXML_HoriPos_Enum[] = { XML_TOKEN_INVALID, 0 } }; -static SvXMLEnumMapEntry<sal_uInt16> const pXML_HoriPosMirrored_Enum[] = +SvXMLEnumMapEntry<sal_uInt16> const pXML_HoriPosMirrored_Enum[] = { { XML_FROM_INSIDE, HoriOrientation::NONE }, { XML_INSIDE, HoriOrientation::LEFT }, @@ -86,7 +86,7 @@ static SvXMLEnumMapEntry<sal_uInt16> const pXML_HoriPosMirrored_Enum[] = { XML_TOKEN_INVALID, 0 } }; -static SvXMLEnumMapEntry<sal_uInt16> const pXML_HoriRel_Enum[] = +SvXMLEnumMapEntry<sal_uInt16> const pXML_HoriRel_Enum[] = { { XML_PARAGRAPH, RelOrientation::FRAME }, { XML_PARAGRAPH_CONTENT, RelOrientation::PRINT_AREA }, @@ -104,7 +104,7 @@ static SvXMLEnumMapEntry<sal_uInt16> const pXML_HoriRel_Enum[] = { XML_TOKEN_INVALID, 0 } }; -static SvXMLEnumMapEntry<sal_uInt16> const pXML_HoriRelFrame_Enum[] = +SvXMLEnumMapEntry<sal_uInt16> const pXML_HoriRelFrame_Enum[] = { { XML_FRAME, RelOrientation::FRAME }, { XML_FRAME_CONTENT, RelOrientation::PRINT_AREA }, @@ -118,7 +118,7 @@ static SvXMLEnumMapEntry<sal_uInt16> const pXML_HoriRelFrame_Enum[] = { XML_TOKEN_INVALID, 0 } }; -static SvXMLEnumMapEntry<bool> const pXML_HoriMirror_Enum[] = +SvXMLEnumMapEntry<bool> const pXML_HoriMirror_Enum[] = { { XML_FROM_LEFT, false }, { XML_FROM_INSIDE, true }, @@ -130,7 +130,7 @@ static SvXMLEnumMapEntry<bool> const pXML_HoriMirror_Enum[] = { XML_TOKEN_INVALID, false } }; -static SvXMLEnumMapEntry<sal_uInt16> const pXML_VertPosAtChar_Enum[] = +SvXMLEnumMapEntry<sal_uInt16> const pXML_VertPosAtChar_Enum[] = { { XML_FROM_TOP, VertOrientation::NONE }, { XML_TOP, VertOrientation::TOP }, @@ -145,7 +145,7 @@ static SvXMLEnumMapEntry<sal_uInt16> const pXML_VertPosAtChar_Enum[] = { XML_TOKEN_INVALID, 0 } }; -static SvXMLEnumMapEntry<sal_uInt16> const pXML_VertRel_Enum[] = +SvXMLEnumMapEntry<sal_uInt16> const pXML_VertRel_Enum[] = { { XML_PARAGRAPH, RelOrientation::FRAME }, { XML_PARAGRAPH_CONTENT, RelOrientation::PRINT_AREA }, @@ -161,7 +161,7 @@ static SvXMLEnumMapEntry<sal_uInt16> const pXML_VertRel_Enum[] = { XML_TOKEN_INVALID, 0 } }; -static SvXMLEnumMapEntry<sal_uInt16> const pXML_VertRelPage_Enum[] = +SvXMLEnumMapEntry<sal_uInt16> const pXML_VertRelPage_Enum[] = { { XML_PAGE, RelOrientation::FRAME }, { XML_PAGE_CONTENT, RelOrientation::PRINT_AREA }, @@ -171,14 +171,14 @@ static SvXMLEnumMapEntry<sal_uInt16> const pXML_VertRelPage_Enum[] = { XML_TOKEN_INVALID, 0 } }; -static SvXMLEnumMapEntry<sal_uInt16> const pXML_VertRelFrame_Enum[] = +SvXMLEnumMapEntry<sal_uInt16> const pXML_VertRelFrame_Enum[] = { { XML_FRAME, RelOrientation::FRAME }, { XML_FRAME_CONTENT, RelOrientation::PRINT_AREA }, { XML_TOKEN_INVALID, 0 } }; -static SvXMLEnumMapEntry<sal_uInt16> const pXML_VertRelAsChar_Enum[] = +SvXMLEnumMapEntry<sal_uInt16> const pXML_VertRelAsChar_Enum[] = { { XML_BASELINE, VertOrientation::TOP }, { XML_BASELINE, VertOrientation::CENTER }, // export only @@ -192,7 +192,7 @@ static SvXMLEnumMapEntry<sal_uInt16> const pXML_VertRelAsChar_Enum[] = { XML_TOKEN_INVALID, 0 } }; -static SvXMLEnumMapEntry<RubyAdjust> const pXML_RubyAdjust_Enum[] = +SvXMLEnumMapEntry<RubyAdjust> const pXML_RubyAdjust_Enum[] = { { XML_LEFT, RubyAdjust_LEFT }, { XML_CENTER, RubyAdjust_CENTER }, @@ -202,7 +202,7 @@ static SvXMLEnumMapEntry<RubyAdjust> const pXML_RubyAdjust_Enum[] = { XML_TOKEN_INVALID, RubyAdjust(0) } }; -static SvXMLEnumMapEntry<sal_Int16> const pXML_RubyPosition_Enum[] = +SvXMLEnumMapEntry<sal_Int16> const pXML_RubyPosition_Enum[] = { { XML_ABOVE, RubyPosition::ABOVE}, { XML_BELOW, RubyPosition::BELOW}, @@ -210,7 +210,7 @@ static SvXMLEnumMapEntry<sal_Int16> const pXML_RubyPosition_Enum[] = { XML_TOKEN_INVALID, 0 } }; -static SvXMLEnumMapEntry<sal_uInt16> const pXML_FontRelief_Enum[] = +SvXMLEnumMapEntry<sal_uInt16> const pXML_FontRelief_Enum[] = { { XML_NONE, FontRelief::NONE }, { XML_ENGRAVED, FontRelief::ENGRAVED }, @@ -218,7 +218,7 @@ static SvXMLEnumMapEntry<sal_uInt16> const pXML_FontRelief_Enum[] = { XML_TOKEN_INVALID, 0 } }; -static SvXMLEnumMapEntry<sal_uInt16> const pXML_ParaVerticalAlign_Enum[] = +SvXMLEnumMapEntry<sal_uInt16> const pXML_ParaVerticalAlign_Enum[] = { { XML_TOP, ParagraphVertAlign::TOP }, { XML_MIDDLE, ParagraphVertAlign::CENTER }, @@ -229,7 +229,7 @@ static SvXMLEnumMapEntry<sal_uInt16> const pXML_ParaVerticalAlign_Enum[] = }; // OD 2004-05-05 #i28701# -static SvXMLEnumMapEntry<sal_uInt16> const pXML_WrapInfluenceOnPosition_Enum[] = +SvXMLEnumMapEntry<sal_uInt16> const pXML_WrapInfluenceOnPosition_Enum[] = { // Tokens have been renamed and <XML_ITERATIVE> has been added (#i35017#) { XML_ONCE_SUCCESSIVE, WrapInfluenceOnPosition::ONCE_SUCCESSIVE }, @@ -238,7 +238,7 @@ static SvXMLEnumMapEntry<sal_uInt16> const pXML_WrapInfluenceOnPosition_Enum[] = { XML_TOKEN_INVALID, 0 } }; -static SvXMLEnumMapEntry<drawing::TextVerticalAdjust> const pXML_VerticalAlign_Enum[] = +SvXMLEnumMapEntry<drawing::TextVerticalAdjust> const pXML_VerticalAlign_Enum[] = { { XML_TOP, drawing::TextVerticalAdjust_TOP }, { XML_MIDDLE, drawing::TextVerticalAdjust_CENTER }, diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 4bf3ba743397..db30837502b4 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::xmloff::token; -static const SvXMLEnumMapEntry<sal_uInt16> aCategoryMap[] = +const SvXMLEnumMapEntry<sal_uInt16> aCategoryMap[] = { { XML_TEXT, ParagraphStyleCategory::TEXT }, { XML_CHAPTER, ParagraphStyleCategory::CHAPTER }, diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index a5cee8919af3..9a89d8fe4da8 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -51,18 +51,18 @@ // service names -static const char sAPI_fieldmaster_prefix[] = "com.sun.star.text.FieldMaster."; -static const char sAPI_get_expression[] = "GetExpression"; -static const char sAPI_set_expression[] = "SetExpression"; -static const char sAPI_user[] = "User"; -static const char sAPI_database[] = "com.sun.star.text.TextField.Database"; +const char sAPI_fieldmaster_prefix[] = "com.sun.star.text.FieldMaster."; +const char sAPI_get_expression[] = "GetExpression"; +const char sAPI_set_expression[] = "SetExpression"; +const char sAPI_user[] = "User"; +const char sAPI_database[] = "com.sun.star.text.TextField.Database"; // property names -static const char sAPI_content[] = "Content"; -static const char sAPI_sub_type[] = "SubType"; -static const char sAPI_number_format[] = "NumberFormat"; -static const char sAPI_is_visible[] = "IsVisible"; -static const char sAPI_current_presentation[] = "CurrentPresentation"; +const char sAPI_content[] = "Content"; +const char sAPI_sub_type[] = "SubType"; +const char sAPI_number_format[] = "NumberFormat"; +const char sAPI_is_visible[] = "IsVisible"; +const char sAPI_current_presentation[] = "CurrentPresentation"; using namespace ::com::sun::star; @@ -1063,7 +1063,7 @@ enum ValueType } -static SvXMLEnumMapEntry<ValueType> const aValueTypeMap[] = +SvXMLEnumMapEntry<ValueType> const aValueTypeMap[] = { { XML_FLOAT, XML_VALUE_TYPE_FLOAT }, { XML_CURRENCY, XML_VALUE_TYPE_CURRENCY }, diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 2badb088e673..6211b9982d7a 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -98,7 +98,7 @@ static constexpr sal_Int32 RENAME_ENTRY( XMLTokenEnum f, XMLTokenEnum s ) return static_cast< sal_Int32 >(f) | (static_cast< sal_Int32 >(s) << 16); } -static XMLTransformerActionInit const aActionTable[] = +XMLTransformerActionInit const aActionTable[] = { // remove office:class from <office:document> and <office:document-content> ENTRY0( OFFICE, DOCUMENT, XML_ETACTION_DOCUMENT ), @@ -575,7 +575,7 @@ static XMLTransformerActionInit const aActionTable[] = }; // XML_ETACTION_STYLE -static XMLTransformerActionInit const aStyleActionTable[] = +XMLTransformerActionInit const aStyleActionTable[] = { ENTRY0( STYLE, FAMILY, XML_ATACTION_STYLE_FAMILY ), ENTRY0( STYLE, NAME, XML_ATACTION_ENCODE_STYLE_NAME ), @@ -597,7 +597,7 @@ static XMLTransformerActionInit const aStyleActionTable[] = }; // OOO_FRAME_ELEM_ACTIONS -static XMLTransformerActionInit const aFrameElemActionTable[] = +XMLTransformerActionInit const aFrameElemActionTable[] = { ENTRY1Q( OFFICE, EVENTS, XML_ETACTION_RENAME_ELEM, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS ), @@ -610,7 +610,7 @@ static XMLTransformerActionInit const aFrameElemActionTable[] = }; // OOO_FRAME_ATTR_ACTIONS -static XMLTransformerActionInit const aFrameAttrActionTable[] = +XMLTransformerActionInit const aFrameAttrActionTable[] = { ENTRY0( DRAW, ZINDEX, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */ ENTRY0( DRAW, ID, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */ @@ -639,7 +639,7 @@ static XMLTransformerActionInit const aFrameAttrActionTable[] = }; // OOO_EVENT_ELEM_ACTIONS -static XMLTransformerActionInit const aEventActionTable[] = +XMLTransformerActionInit const aEventActionTable[] = { ENTRY0( XLINK, HREF, XML_ATACTION_HREF ), ENTRY1( SCRIPT, LANGUAGE, XML_ATACTION_ADD_NAMESPACE_PREFIX, @@ -652,7 +652,7 @@ static XMLTransformerActionInit const aEventActionTable[] = }; // action table for OOO_MASTER_PAGE_ACTIONS -static XMLTransformerActionInit const aMasterPageActionTable[] = +XMLTransformerActionInit const aMasterPageActionTable[] = { ENTRY0( STYLE, NAME, XML_ATACTION_ENCODE_STYLE_NAME ), ENTRY0( STYLE, NEXT_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), @@ -662,7 +662,7 @@ static XMLTransformerActionInit const aMasterPageActionTable[] = ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTransformerActionInit const aFontDeclActionTable[] = +XMLTransformerActionInit const aFontDeclActionTable[] = { ENTRY1Q( FO, FONT_FAMILY, XML_ATACTION_RENAME, XML_NAMESPACE_SVG, XML_FONT_FAMILY ), @@ -672,7 +672,7 @@ static XMLTransformerActionInit const aFontDeclActionTable[] = }; // action table for OOO_PARA_ACTIONS -static XMLTransformerActionInit const aParaActionTable[] = +XMLTransformerActionInit const aParaActionTable[] = { ENTRY0( TEXT, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), ENTRY0( TEXT, COND_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), @@ -683,7 +683,7 @@ static XMLTransformerActionInit const aParaActionTable[] = }; // action table for OOO_STYLE_REF_ACTIONS -static XMLTransformerActionInit const aStyleRefActionTable[] = +XMLTransformerActionInit const aStyleRefActionTable[] = { ENTRY0( TEXT, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), ENTRY0( TEXT, VISITED_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), @@ -713,7 +713,7 @@ static XMLTransformerActionInit const aStyleRefActionTable[] = // OOO_SHAPE_ACTIONS // !!ATTENTION!! If you change something here, please also change // aConnectorActionTable if appropriate -static XMLTransformerActionInit const aShapeActionTable[] = +XMLTransformerActionInit const aShapeActionTable[] = { ENTRY0( SVG, X, XML_ATACTION_INCH2IN ), ENTRY0( SVG, Y, XML_ATACTION_INCH2IN ), @@ -758,7 +758,7 @@ static XMLTransformerActionInit const aShapeActionTable[] = ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTransformerActionInit const aConnectorActionTable[] = +XMLTransformerActionInit const aConnectorActionTable[] = { ENTRY0( SVG, X1, XML_ATACTION_TWIPS2IN ), ENTRY0( SVG, Y1, XML_ATACTION_TWIPS2IN ), @@ -783,7 +783,7 @@ static XMLTransformerActionInit const aConnectorActionTable[] = }; // OOO_INDEX_ENTRY_TAB_STOP_ACTIONS -static XMLTransformerActionInit const aIndexEntryTabStopActionTable[] = +XMLTransformerActionInit const aIndexEntryTabStopActionTable[] = { ENTRY0( STYLE, POSITION, XML_ATACTION_INCH2IN ), ENTRY0( TEXT, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), @@ -791,7 +791,7 @@ static XMLTransformerActionInit const aIndexEntryTabStopActionTable[] = }; // OOO_TAB_STOP_ACTIONS -static XMLTransformerActionInit const aTabStopActionTable[] = +XMLTransformerActionInit const aTabStopActionTable[] = { ENTRY0( STYLE, POSITION, XML_ATACTION_INCH2IN ), ENTRY1Q( STYLE, LEADER_CHAR, XML_ATACTION_RENAME, @@ -800,7 +800,7 @@ static XMLTransformerActionInit const aTabStopActionTable[] = }; // OOO_LINENUMBERING_ACTIONS -static XMLTransformerActionInit const aLineNumberingActionTable[] = +XMLTransformerActionInit const aLineNumberingActionTable[] = { ENTRY0( TEXT, OFFSET, XML_ATACTION_INCH2IN ), ENTRY0( TEXT, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), @@ -809,7 +809,7 @@ static XMLTransformerActionInit const aLineNumberingActionTable[] = ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTransformerActionInit const aFootnoteSepActionTable[] = +XMLTransformerActionInit const aFootnoteSepActionTable[] = { ENTRY0( STYLE, WIDTH, XML_ATACTION_INCH2IN ), ENTRY0( STYLE, DISTANCE_BEFORE_SEP, XML_ATACTION_INCH2IN ), @@ -818,14 +818,14 @@ static XMLTransformerActionInit const aFootnoteSepActionTable[] = }; // OOO_DROP_CAP_ACTIONS -static XMLTransformerActionInit const aDropCapActionTable[] = +XMLTransformerActionInit const aDropCapActionTable[] = { ENTRY0( STYLE, DISTANCE, XML_ATACTION_INCH2IN ), ENTRY0( STYLE, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTransformerActionInit const aColumnsActionTable[] = +XMLTransformerActionInit const aColumnsActionTable[] = { ENTRY0( STYLE, COLUMN_GAP, XML_ATACTION_INCH2IN ), // ENTRY0( STYLE, SPACE_BEFORE, XML_ATACTION_INCH2IN ), @@ -839,7 +839,7 @@ static XMLTransformerActionInit const aColumnsActionTable[] = }; // OOO_TEXT_VALUE_TYPE_ACTIONS -static XMLTransformerActionInit const aTextValueTypeActionTable[] = +XMLTransformerActionInit const aTextValueTypeActionTable[] = { ENTRY1Q( TEXT, VALUE_TYPE, XML_ATACTION_RENAME, XML_NAMESPACE_OFFICE, XML_VALUE_TYPE ), @@ -862,7 +862,7 @@ static XMLTransformerActionInit const aTextValueTypeActionTable[] = }; // OOO_TABLE_VALUE_TYPE_ACTIONS -static XMLTransformerActionInit const aTableValueTypeActionTable[] = +XMLTransformerActionInit const aTableValueTypeActionTable[] = { ENTRY1Q( TABLE, VALUE_TYPE, XML_ATACTION_RENAME, XML_NAMESPACE_OFFICE, XML_VALUE_TYPE ), @@ -887,7 +887,7 @@ static XMLTransformerActionInit const aTableValueTypeActionTable[] = }; // action table for OOO_ANNOTATION_ACTIONS -static XMLTransformerActionInit const aAnnotationActionTable[] = +XMLTransformerActionInit const aAnnotationActionTable[] = { ENTRY1Q( OFFICE, AUTHOR, XML_ATACTION_MOVE_TO_ELEM, XML_NAMESPACE_DC, XML_CREATOR ), @@ -899,7 +899,7 @@ static XMLTransformerActionInit const aAnnotationActionTable[] = }; // action table for OOO_CHANGE_INFO_ACTIONS -static XMLTransformerActionInit const aChangeInfoActionTable[] = +XMLTransformerActionInit const aChangeInfoActionTable[] = { ENTRY1Q( OFFICE, CHG_AUTHOR, XML_ATACTION_MOVE_TO_ELEM, XML_NAMESPACE_DC, XML_CREATOR ), @@ -909,7 +909,7 @@ static XMLTransformerActionInit const aChangeInfoActionTable[] = }; // OOO_BACKGROUND_IMAGE_ACTIONS -static XMLTransformerActionInit const aBackgroundImageActionTable[] = +XMLTransformerActionInit const aBackgroundImageActionTable[] = { ENTRY1Q( DRAW, TRANSPARENCY, XML_ATACTION_RENAME_NEG_PERCENT, XML_NAMESPACE_DRAW, XML_OPACITY ), @@ -921,7 +921,7 @@ static XMLTransformerActionInit const aBackgroundImageActionTable[] = OpenOffice.org text documents, written by OpenOffice.org, contain wrong value for the transparency of the background graphic (#i50322#) */ -static XMLTransformerActionInit const aWriterBackgroundImageActionTable[] = +XMLTransformerActionInit const aWriterBackgroundImageActionTable[] = { ENTRY1Q( DRAW, TRANSPARENCY, XML_ATACTION_WRITER_BACK_GRAPHIC_TRANSPARENCY, XML_NAMESPACE_DRAW, XML_OPACITY ), ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ), @@ -929,7 +929,7 @@ static XMLTransformerActionInit const aWriterBackgroundImageActionTable[] = }; // OOO_DDE_CONNECTION_DECL -static XMLTransformerActionInit const aDDEConnectionDeclActionTable[] = +XMLTransformerActionInit const aDDEConnectionDeclActionTable[] = { ENTRY1Q( TEXT, NAME, XML_ATACTION_RENAME, XML_NAMESPACE_OFFICE, XML_NAME ), @@ -937,7 +937,7 @@ static XMLTransformerActionInit const aDDEConnectionDeclActionTable[] = }; // OOO_FORM_CONTROL_ACTIONS -static XMLTransformerActionInit const aFormControlActionTable[] = +XMLTransformerActionInit const aFormControlActionTable[] = { ENTRY2QN( FORM, SERVICE_NAME, XML_ATACTION_RENAME_ADD_NAMESPACE_PREFIX, @@ -948,7 +948,7 @@ static XMLTransformerActionInit const aFormControlActionTable[] = }; // OOO_FORM_COLUMN_ACTIONS -static XMLTransformerActionInit const aFormColumnActionTable[] = +XMLTransformerActionInit const aFormColumnActionTable[] = { ENTRY1Q( FORM, COLUMN_STYLE_NAME, XML_ATACTION_RENAME_ENCODE_STYLE_NAME_REF, XML_NAMESPACE_FORM, XML_TEXT_STYLE_NAME ), @@ -960,7 +960,7 @@ static XMLTransformerActionInit const aFormColumnActionTable[] = }; // OOO_FORM_PROP_ACTIONS -static XMLTransformerActionInit const aFormPropActionTable[] = +XMLTransformerActionInit const aFormPropActionTable[] = { ENTRY1Q( FORM, PROPERTY_TYPE, XML_ATACTION_RENAME, XML_NAMESPACE_OFFICE, XML_VALUE_TYPE ), @@ -969,14 +969,14 @@ static XMLTransformerActionInit const aFormPropActionTable[] = }; // OOO_XLINK_ACTIONS -static XMLTransformerActionInit const aXLinkActionTable[] = +XMLTransformerActionInit const aXLinkActionTable[] = { ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(false) ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; // OOO_CONFIG_ITEM_SET_ACTIONS -static XMLTransformerActionInit const aConfigItemSetActionTable[] = +XMLTransformerActionInit const aConfigItemSetActionTable[] = { ENTRY1( CONFIG, NAME, XML_ATACTION_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_OOO ), @@ -984,7 +984,7 @@ static XMLTransformerActionInit const aConfigItemSetActionTable[] = }; // OASIS_FORMULA_ACTIONS -static XMLTransformerActionInit const aFormulaActionTable[] = +XMLTransformerActionInit const aFormulaActionTable[] = { ENTRY1( TEXT, CONDITION, XML_ATACTION_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_OOOW ), @@ -998,14 +998,14 @@ static XMLTransformerActionInit const aFormulaActionTable[] = }; // OOO_ERROR_MACRO_ACTIONS -static XMLTransformerActionInit const aErrorMacroActionTable[] = +XMLTransformerActionInit const aErrorMacroActionTable[] = { ENTRY0( TABLE, NAME, XML_ATACTION_REMOVE ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; // OOO_DDE_CONV_MODE_ACTIONS -static XMLTransformerActionInit const aDDEConvModeActionTable[] = +XMLTransformerActionInit const aDDEConvModeActionTable[] = { ENTRY1Q( TABLE, LET_TEXT, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_KEEP_TEXT ), @@ -1013,7 +1013,7 @@ static XMLTransformerActionInit const aDDEConvModeActionTable[] = }; // OOO_DATAPILOT_MEMBER_ACTIONS -static XMLTransformerActionInit const aDataPilotMemberActionTable[] = +XMLTransformerActionInit const aDataPilotMemberActionTable[] = { ENTRY1Q( TABLE, DISPLAY_DETAILS, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_SHOW_DETAILS ), @@ -1021,7 +1021,7 @@ static XMLTransformerActionInit const aDataPilotMemberActionTable[] = }; // OOO_DATAPILOT_LEVEL_ACTIONS -static XMLTransformerActionInit const aDataPilotLevelActionTable[] = +XMLTransformerActionInit const aDataPilotLevelActionTable[] = { ENTRY1Q( TABLE, DISPLAY_EMPTY, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_SHOW_EMPTY ), @@ -1029,7 +1029,7 @@ static XMLTransformerActionInit const aDataPilotLevelActionTable[] = }; // OOO_SOURCE_SERVICE_ACTIONS -static XMLTransformerActionInit const aSourceServiceActionTable[] = +XMLTransformerActionInit const aSourceServiceActionTable[] = { ENTRY1Q( TABLE, USERNAME, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_USER_NAME ), @@ -1037,7 +1037,7 @@ static XMLTransformerActionInit const aSourceServiceActionTable[] = }; // OOO_ANIMATION_ACTIONS -static XMLTransformerActionInit const aAnimationsActionTable[] = +XMLTransformerActionInit const aAnimationsActionTable[] = { ENTRY0( DRAW, SHAPE_ID, XML_ATACTION_SHAPEID ), ENTRY0( PRESENTATION, PATH_ID, XML_ATACTION_SHAPEID ), @@ -1045,7 +1045,7 @@ static XMLTransformerActionInit const aAnimationsActionTable[] = }; // OOO_DRAW_AREA_POLYGON_ACTIONS (to be added to OOO_SHAPE_ACTIONS) -static XMLTransformerActionInit const aDrawAreaPolygonActionTable[] = +XMLTransformerActionInit const aDrawAreaPolygonActionTable[] = { ENTRY1Q( SVG, POINTS, XML_ATACTION_RENAME, XML_NAMESPACE_DRAW, XML_POINTS ), @@ -1053,7 +1053,7 @@ static XMLTransformerActionInit const aDrawAreaPolygonActionTable[] = }; // OOO_CHART_ACTIONS -static XMLTransformerActionInit const aChartActionTable[] = +XMLTransformerActionInit const aChartActionTable[] = { ENTRY1( CHART, CLASS, XML_ATACTION_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_CHART ), @@ -1065,7 +1065,7 @@ static XMLTransformerActionInit const aChartActionTable[] = }; // OOO_ALPHABETICAL_INDEX_MARK_ACTIONS -static XMLTransformerActionInit const aAlphabeticalIndexMarkActionTable[] = +XMLTransformerActionInit const aAlphabeticalIndexMarkActionTable[] = { ENTRY1Q( TEXT, MAIN_ETRY, XML_ATACTION_RENAME, XML_NAMESPACE_TEXT, XML_MAIN_ENTRY ), @@ -1073,7 +1073,7 @@ static XMLTransformerActionInit const aAlphabeticalIndexMarkActionTable[] = }; // OOO_SCRIPT_ACTIONS -static XMLTransformerActionInit const aScriptActionTable[] = +XMLTransformerActionInit const aScriptActionTable[] = { ENTRY1( SCRIPT, LANGUAGE, XML_ATACTION_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_OOO ), ENTRY1Q( SCRIPT, NAME, XML_ATACTION_RENAME, XML_NAMESPACE_OOO, XML_NAME ), @@ -1081,7 +1081,7 @@ static XMLTransformerActionInit const aScriptActionTable[] = ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTokenEnum const aTokenMap[] = +XMLTokenEnum const aTokenMap[] = { XML_NONE, XML_SINGLE, XML_DOUBLE, XML_BOLD, XML_BOLD_DOTTED, XML_BOLD_DASH, XML_BOLD_LONG_DASH, XML_BOLD_DOT_DASH, diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index 896b424f87e0..4b5233f3e9c2 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -105,7 +105,7 @@ static constexpr sal_Int32 RENAME_ENTRY( XMLTokenEnum f, XMLTokenEnum s ) return static_cast< sal_Int32 >(f) | (static_cast< sal_Int32 >(s) << 16); } -static XMLTransformerActionInit const aActionTable[] = +XMLTransformerActionInit const aActionTable[] = { // add office:class from <office:document> and <office:document-content> ENTRY0( OFFICE, DOCUMENT, XML_ETACTION_DOCUMENT ), @@ -565,7 +565,7 @@ static XMLTransformerActionInit const aActionTable[] = }; // XML_ETACTION_STYLE -static XMLTransformerActionInit const aStyleActionTable[] = +XMLTransformerActionInit const aStyleActionTable[] = { ENTRY0( STYLE, FAMILY, XML_ATACTION_STYLE_FAMILY ), ENTRY1( STYLE, NAME, XML_ATACTION_DECODE_STYLE_NAME, @@ -599,7 +599,7 @@ static XMLTransformerActionInit const aStyleActionTable[] = }; // OASIS_FRAME_ELEM_ACTIONS -static XMLTransformerActionInit const aFrameActionTable[] = +XMLTransformerActionInit const aFrameActionTable[] = { ENTRY0( DRAW, TEXT_BOX, XML_ETACTION_COPY ), ENTRY0( DRAW, IMAGE, XML_ETACTION_COPY ), @@ -612,7 +612,7 @@ static XMLTransformerActionInit const aFrameActionTable[] = }; // OASIS_EVENT_ELEM_ACTIONS -static XMLTransformerActionInit const aEventActionTable[] = +XMLTransformerActionInit const aEventActionTable[] = { ENTRY0( XLINK, HREF, XML_ATACTION_HREF ), ENTRY1( SCRIPT, LANGUAGE, XML_ATACTION_REMOVE_NAMESPACE_PREFIX, @@ -623,13 +623,13 @@ static XMLTransformerActionInit const aEventActionTable[] = }; // OASIS_EVENT_ELEM_ACTIONS -static XMLTransformerActionInit const aDlgActionTable[] = +XMLTransformerActionInit const aDlgActionTable[] = { ENTRY0( DLG, BORDER, XML_ATACTION_DLG_BORDER ) }; // action table for OASIS_MASTER_PAGE_ACTIONS -static XMLTransformerActionInit const aMasterPageActionTable[] = +XMLTransformerActionInit const aMasterPageActionTable[] = { ENTRY1( STYLE, NAME, XML_ATACTION_DECODE_STYLE_NAME, XML_FAMILY_TYPE_MASTER_PAGE ), @@ -643,7 +643,7 @@ static XMLTransformerActionInit const aMasterPageActionTable[] = }; // action table for OASIS_TEXT_STYLE_REF_ACTIONS -static XMLTransformerActionInit const aTextStyleRefActionTable[] = +XMLTransformerActionInit const aTextStyleRefActionTable[] = { ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_TEXT ), @@ -654,7 +654,7 @@ static XMLTransformerActionInit const aTextStyleRefActionTable[] = }; // action table for OASIS_PARA_STYLE_REF_ACTIONS -static XMLTransformerActionInit const aParaStyleRefActionTable[] = +XMLTransformerActionInit const aParaStyleRefActionTable[] = { ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_PARAGRAPH ), @@ -662,7 +662,7 @@ static XMLTransformerActionInit const aParaStyleRefActionTable[] = }; // action table for OASIS_LIST_STYLE_REF_ACTIONS -static XMLTransformerActionInit const aListStyleRefActionTable[] = +XMLTransformerActionInit const aListStyleRefActionTable[] = { ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_LIST ), @@ -670,7 +670,7 @@ static XMLTransformerActionInit const aListStyleRefActionTable[] = }; // action table for OASIS_MASTER_PAGE_REF_ACTIONS -static XMLTransformerActionInit const aMasterPageRefActionTable[] = +XMLTransformerActionInit const aMasterPageRefActionTable[] = { ENTRY1( DRAW, MASTER_PAGE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_MASTER_PAGE ), @@ -678,7 +678,7 @@ static XMLTransformerActionInit const aMasterPageRefActionTable[] = }; // action table for OASIS_MAP_STYLE_REF_ACTIONS -static XMLTransformerActionInit const aMapStyleRefActionTable[] = +XMLTransformerActionInit const aMapStyleRefActionTable[] = { ENTRY1( STYLE, APPLY_STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_END ), @@ -686,14 +686,14 @@ static XMLTransformerActionInit const aMapStyleRefActionTable[] = }; // action table for OASIS_TABLE_STYLE_REF_ACTIONS (#i40011#, #i40015#) -static XMLTransformerActionInit const aTableStyleRefActionTable[] = +XMLTransformerActionInit const aTableStyleRefActionTable[] = { ENTRY1( TABLE, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_END ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTransformerActionInit const aFontFaceActionTable[] = +XMLTransformerActionInit const aFontFaceActionTable[] = { ENTRY1Q( SVG, FONT_FAMILY, XML_ATACTION_RENAME, XML_NAMESPACE_FO, XML_FONT_FAMILY ), @@ -703,7 +703,7 @@ static XMLTransformerActionInit const aFontFaceActionTable[] = }; // action table for OASIS_PARA_ACTIONS -static XMLTransformerActionInit const aParaActionTable[] = +XMLTransformerActionInit const aParaActionTable[] = { ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_PARAGRAPH ), @@ -716,7 +716,7 @@ static XMLTransformerActionInit const aParaActionTable[] = // !!ATTENTION!! If you change something here, please also change // aConnectorActionTable if appropriate -static XMLTransformerActionInit const aShapeActionTable[] = +XMLTransformerActionInit const aShapeActionTable[] = { ENTRY1( DRAW, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_GRAPHIC ), @@ -765,7 +765,7 @@ static XMLTransformerActionInit const aShapeActionTable[] = }; // OASIS_ANIMATION_ACTIONS -static XMLTransformerActionInit const aAnimationActionTable[] = +XMLTransformerActionInit const aAnimationActionTable[] = { ENTRY0( DRAW, SHAPE_ID, XML_ATACTION_DECODE_ID ), ENTRY0( PRESENTATION, DELAY, XML_ATACTION_RNG2ISO_DATETIME ), @@ -775,7 +775,7 @@ static XMLTransformerActionInit const aAnimationActionTable[] = }; // OOO_CONNECTOR_ACTIONS -static XMLTransformerActionInit const aConnectorActionTable[] = +XMLTransformerActionInit const aConnectorActionTable[] = { ENTRY1( DRAW, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_GRAPHIC ), @@ -806,7 +806,7 @@ static XMLTransformerActionInit const aConnectorActionTable[] = }; // OASIS_INDEX_ENTRY_TAB_STOP_ACTIONS -static XMLTransformerActionInit const aIndexEntryTabStopActionTable[] = +XMLTransformerActionInit const aIndexEntryTabStopActionTable[] = { ENTRY0( STYLE, POSITION, XML_ATACTION_IN2INCH ), ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, @@ -815,7 +815,7 @@ static XMLTransformerActionInit const aIndexEntryTabStopActionTable[] = }; // OASIS_TAB_STOP_ACTIONS -static XMLTransformerActionInit const aTabStopActionTable[] = +XMLTransformerActionInit const aTabStopActionTable[] = { ENTRY0( STYLE, POSITION, XML_ATACTION_IN2INCH ), ENTRY1Q( STYLE, LEADER_TEXT, XML_ATACTION_RENAME, @@ -829,7 +829,7 @@ static XMLTransformerActionInit const aTabStopActionTable[] = }; // OASIS_LINENUMBERING_ACTIONS -static XMLTransformerActionInit const aLineNumberingActionTable[] = +XMLTransformerActionInit const aLineNumberingActionTable[] = { ENTRY0( TEXT, OFFSET, XML_ATACTION_IN2INCH ), ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, @@ -839,7 +839,7 @@ static XMLTransformerActionInit const aLineNumberingActionTable[] = ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTransformerActionInit const aFootnoteSepActionTable[] = +XMLTransformerActionInit const aFootnoteSepActionTable[] = { ENTRY0( STYLE, WIDTH, XML_ATACTION_IN2INCH ), ENTRY0( STYLE, DISTANCE_BEFORE_SEP, XML_ATACTION_IN2INCH ), @@ -848,7 +848,7 @@ static XMLTransformerActionInit const aFootnoteSepActionTable[] = }; // OASIS_NOTES_ACTIONS (processed by special context) -static XMLTransformerActionInit const aNotesActionTable[] = +XMLTransformerActionInit const aNotesActionTable[] = { ENTRY0( TEXT, NOTE_CLASS, XML_ATACTION_STYLE_FAMILY ), ENTRY1( TEXT, CITATION_STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, @@ -863,7 +863,7 @@ static XMLTransformerActionInit const aNotesActionTable[] = }; // OASIS_DROP_CAP_ACTIONS -static XMLTransformerActionInit const aDropCapActionTable[] = +XMLTransformerActionInit const aDropCapActionTable[] = { ENTRY0( STYLE, DISTANCE, XML_ATACTION_IN2INCH ), ENTRY1( STYLE, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, @@ -871,7 +871,7 @@ static XMLTransformerActionInit const aDropCapActionTable[] = ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTransformerActionInit const aColumnsActionTable[] = +XMLTransformerActionInit const aColumnsActionTable[] = { ENTRY0( STYLE, COLUMN_GAP, XML_ATACTION_IN2INCH ), ENTRY0( STYLE, SPACE_BEFORE, XML_ATACTION_REMOVE ), @@ -885,7 +885,7 @@ static XMLTransformerActionInit const aColumnsActionTable[] = }; // OASIS_TEXT_VALUE_TYPE_ACTIONS -static XMLTransformerActionInit const aTextValueTypeActionTable[] = +XMLTransformerActionInit const aTextValueTypeActionTable[] = { ENTRY1Q( OFFICE, VALUE_TYPE, XML_ATACTION_RENAME, XML_NAMESPACE_TEXT, XML_VALUE_TYPE ), @@ -906,7 +906,7 @@ static XMLTransformerActionInit const aTextValueTypeActionTable[] = }; // OASIS_TABLE_VALUE_TYPE_ACTIONS -static XMLTransformerActionInit const aTableValueTypeActionTable[] = +XMLTransformerActionInit const aTableValueTypeActionTable[] = { ENTRY1Q( OFFICE, VALUE_TYPE, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_VALUE_TYPE ), @@ -931,7 +931,7 @@ static XMLTransformerActionInit const aTableValueTypeActionTable[] = }; // action table for OASIS_ANNOTATION_ACTIONS -static XMLTransformerActionInit const aAnnotationActionTable[] = +XMLTransformerActionInit const aAnnotationActionTable[] = { ENTRY1Q( DC, CREATOR, XML_ETACTION_MOVE_TO_ATTR, XML_NAMESPACE_OFFICE, XML_AUTHOR ), @@ -944,7 +944,7 @@ static XMLTransformerActionInit const aAnnotationActionTable[] = }; // action table for OASIS_CHANGE_INFO_ACTIONS -static XMLTransformerActionInit const aChangeInfoActionTable[] = +XMLTransformerActionInit const aChangeInfoActionTable[] = { ENTRY1Q( DC, CREATOR, XML_ETACTION_MOVE_TO_ATTR, XML_NAMESPACE_OFFICE, XML_CHG_AUTHOR ), @@ -954,7 +954,7 @@ static XMLTransformerActionInit const aChangeInfoActionTable[] = }; // OASIS_BACKGROUND_IMAGE_ACTIONS -static XMLTransformerActionInit const aBackgroundImageActionTable[] = +XMLTransformerActionInit const aBackgroundImageActionTable[] = { ENTRY1Q( DRAW, OPACITY, XML_ATACTION_RENAME_NEG_PERCENT, XML_NAMESPACE_DRAW, XML_TRANSPARENCY ), @@ -963,7 +963,7 @@ static XMLTransformerActionInit const aBackgroundImageActionTable[] = }; // OASIS_DDE_CONNECTION_DECL -static XMLTransformerActionInit const aDDEConnectionDeclActionTable[] = +XMLTransformerActionInit const aDDEConnectionDeclActionTable[] = { ENTRY1Q( OFFICE, NAME, XML_ATACTION_RENAME, XML_NAMESPACE_TEXT, XML_NAME ), @@ -971,7 +971,7 @@ static XMLTransformerActionInit const aDDEConnectionDeclActionTable[] = }; // OASIS_FORM_CONTROL_ACTIONS -static XMLTransformerActionInit const aFormControlActionTable[] = +XMLTransformerActionInit const aFormControlActionTable[] = { ENTRY0( FORM, NAME, XML_ATACTION_MOVE_TO_ELEM ), ENTRY2QN( FORM, CONTROL_IMPLEMENTATION, @@ -984,7 +984,7 @@ static XMLTransformerActionInit const aFormControlActionTable[] = }; // OASIS_FORM_COLUMN_ACTIONS -static XMLTransformerActionInit const aFormColumnActionTable[] = +XMLTransformerActionInit const aFormColumnActionTable[] = { ENTRY1Q( FORM, TEXT_STYLE_NAME, XML_ATACTION_RENAME_DECODE_STYLE_NAME_REF, XML_NAMESPACE_FORM, XML_COLUMN_STYLE_NAME ), @@ -996,7 +996,7 @@ static XMLTransformerActionInit const aFormColumnActionTable[] = }; // OASIS_FORM_PROP_ACTIONS -static XMLTransformerActionInit const aFormPropActionTable[] = +XMLTransformerActionInit const aFormPropActionTable[] = { ENTRY1Q( OFFICE, VALUE_TYPE, XML_ATACTION_RENAME, XML_NAMESPACE_FORM, XML_PROPERTY_TYPE ), @@ -1010,7 +1010,7 @@ static XMLTransformerActionInit const aFormPropActionTable[] = }; // OASIS_XLINK_ACTIONS -static XMLTransformerActionInit const aXLinkActionTable[] = +XMLTransformerActionInit const aXLinkActionTable[] = { ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_uInt32(false) ), ENTRY0( TABLE, REFRESH_DELAY, XML_ATACTION_RNG2ISO_DATETIME ), @@ -1018,7 +1018,7 @@ static XMLTransformerActionInit const aXLinkActionTable[] = }; // OASIS_CONFIG_ITEM_SET_ACTIONS -static XMLTransformerActionInit const aConfigItemSetActionTable[] = +XMLTransformerActionInit const aConfigItemSetActionTable[] = { ENTRY1( CONFIG, NAME, XML_ATACTION_REMOVE_NAMESPACE_PREFIX, XML_NAMESPACE_OOO ), @@ -1026,7 +1026,7 @@ static XMLTransformerActionInit const aConfigItemSetActionTable[] = }; // OASIS_FORMULA_ACTIONS -static XMLTransformerActionInit const aFormulaActionTable[] = +XMLTransformerActionInit const aFormulaActionTable[] = { ENTRY0( TEXT, CONDITION, XML_ATACTION_REMOVE_ANY_NAMESPACE_PREFIX ), ENTRY0( TEXT, FORMULA, XML_ATACTION_REMOVE_ANY_NAMESPACE_PREFIX ), @@ -1036,7 +1036,7 @@ static XMLTransformerActionInit const aFormulaActionTable[] = }; // OASIS_CONTENT_VALIDATION_ACTIONS -static XMLTransformerActionInit const aContentValidationActionTable[] = +XMLTransformerActionInit const aContentValidationActionTable[] = { ENTRY0( TABLE, CONDITION, XML_ATACTION_REMOVE_ANY_NAMESPACE_PREFIX ), ENTRY0( TABLE, DISPLAY_LIST, XML_ATACTION_REMOVE ), @@ -1044,7 +1044,7 @@ static XMLTransformerActionInit const aContentValidationActionTable[] = }; // OASIS_DDE_CONV_MODE_ACTIONS -static XMLTransformerActionInit const aDDEConvModeActionTable[] = +XMLTransformerActionInit const aDDEConvModeActionTable[] = { ENTRY1Q( TABLE, KEEP_TEXT, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_LET_TEXT ), @@ -1052,7 +1052,7 @@ static XMLTransformerActionInit const aDDEConvModeActionTable[] = }; // OASIS_DATAPILOT_MEMBER_ACTIONS -static XMLTransformerActionInit const aDataPilotMemberActionTable[] = +XMLTransformerActionInit const aDataPilotMemberActionTable[] = { ENTRY1Q( TABLE, SHOW_DETAILS, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_DISPLAY_DETAILS ), @@ -1060,7 +1060,7 @@ static XMLTransformerActionInit const aDataPilotMemberActionTable[] = }; // OASIS_DATAPILOT_LEVEL_ACTIONS -static XMLTransformerActionInit const aDataPilotLevelActionTable[] = +XMLTransformerActionInit const aDataPilotLevelActionTable[] = { ENTRY1Q( TABLE, SHOW_EMPTY, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_DISPLAY_EMPTY ), @@ -1068,7 +1068,7 @@ static XMLTransformerActionInit const aDataPilotLevelActionTable[] = }; // OASIS_SOURCE_SERVICE_ACTIONS -static XMLTransformerActionInit const aSourceServiceActionTable[] = +XMLTransformerActionInit const aSourceServiceActionTable[] = { ENTRY1Q( TABLE, USER_NAME, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_USERNAME ), @@ -1076,7 +1076,7 @@ static XMLTransformerActionInit const aSourceServiceActionTable[] = }; // OASIS_CHART_ACTIONS -static XMLTransformerActionInit const aChartActionTable[] = +XMLTransformerActionInit const aChartActionTable[] = { ENTRY0( CHART, CLASS, XML_ATACTION_REMOVE_ANY_NAMESPACE_PREFIX ), ENTRY1( DRAW, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, @@ -1087,7 +1087,7 @@ static XMLTransformerActionInit const aChartActionTable[] = }; // OASIS_FORM_ACTIONS -static XMLTransformerActionInit const aFormActionTable[] = +XMLTransformerActionInit const aFormActionTable[] = { ENTRY2QN( FORM, CONTROL_IMPLEMENTATION, XML_ATACTION_RENAME_REMOVE_NAMESPACE_PREFIX, @@ -1098,7 +1098,7 @@ static XMLTransformerActionInit const aFormActionTable[] = }; // OASIS_ALPHABETICAL_INDEX_MARK_ACTIONS -static XMLTransformerActionInit const aAlphabeticalIndexMarkActionTable[] = +XMLTransformerActionInit const aAlphabeticalIndexMarkActionTable[] = { ENTRY1Q( TEXT, MAIN_ENTRY, XML_ATACTION_RENAME, XML_NAMESPACE_TEXT, XML_MAIN_ETRY ), @@ -1106,7 +1106,7 @@ static XMLTransformerActionInit const aAlphabeticalIndexMarkActionTable[] = }; // OASIS_DRAW_AREA_POLYGON_ACTIONS (to be added to OASIS_SHAPE_ACTIONS) -static XMLTransformerActionInit const aDrawAreaPolygonActionTable[] = +XMLTransformerActionInit const aDrawAreaPolygonActionTable[] = { ENTRY1Q( DRAW, POINTS, XML_ATACTION_RENAME, XML_NAMESPACE_SVG, XML_POINTS ), @@ -1114,7 +1114,7 @@ static XMLTransformerActionInit const aDrawAreaPolygonActionTable[] = }; // OASIS_SCRIPT_ACTIONS -static XMLTransformerActionInit const aScriptActionTable[] = +XMLTransformerActionInit const aScriptActionTable[] = { ENTRY1( SCRIPT, LANGUAGE, XML_ATACTION_REMOVE_NAMESPACE_PREFIX, XML_NAMESPACE_OOO ), ENTRY1Q( OOO, NAME, XML_ATACTION_RENAME, XML_NAMESPACE_SCRIPT, XML_NAME ), @@ -1123,7 +1123,7 @@ static XMLTransformerActionInit const aScriptActionTable[] = }; // OASIS_DATETIME_ACTIONS -static XMLTransformerActionInit const aDateTimeActionTable[] = +XMLTransformerActionInit const aDateTimeActionTable[] = { ENTRY0( TEXT, DATE_VALUE, XML_ATACTION_RNG2ISO_DATETIME ), ENTRY0( TEXT, TIME_VALUE, XML_ATACTION_RNG2ISO_DATETIME ), @@ -1142,7 +1142,7 @@ static XMLTransformerActionInit const aDateTimeActionTable[] = ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTokenEnum const aTokenMap[] = +XMLTokenEnum const aTokenMap[] = { XML_NONE, XML_SOLID, XML_DOTTED, XML_DASH, XML_LONG_DASH, XML_DOT_DASH, XML_DOT_DOT_DASH, XML_WAVE, XML_SMALL_WAVE, XML_TOKEN_END diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index d376f226ebd7..a8b7b91eb997 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -40,7 +40,7 @@ using namespace ::xmloff::token; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -static const sal_uInt16 aAttrActionMaps[XML_PROP_TYPE_END] = +const sal_uInt16 aAttrActionMaps[XML_PROP_TYPE_END] = { PROP_OASIS_GRAPHIC_ATTR_ACTIONS, PROP_OASIS_DRAWING_PAGE_ATTR_ACTIONS, // DRAWING_PAGE diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index 56a6504cc146..656d9050d156 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -61,7 +61,7 @@ const sal_uInt16 MAX_PROP_TYPES = 4; { XML_PROP_TYPE_##a, XML_PROP_TYPE_##END, \ XML_PROP_TYPE_END, XML_PROP_TYPE_END } -static const std::array<XMLPropType,MAX_PROP_TYPES> aPropTypes[XML_FAMILY_TYPE_END] = +const std::array<XMLPropType,MAX_PROP_TYPES> aPropTypes[XML_FAMILY_TYPE_END] = { ENTRY3( GRAPHIC, PARAGRAPH, TEXT ), // XML_FAMILY_TYPE_GRAPHIC, ENTRY3( GRAPHIC, PARAGRAPH, TEXT ), // XML_FAMILY_TYPE_PRESENTATION, @@ -87,7 +87,7 @@ static const std::array<XMLPropType,MAX_PROP_TYPES> aPropTypes[XML_FAMILY_TYPE_E ENTRY1( END ), // XML_FAMILY_TYPE_MARKER, }; -static const XMLTokenEnum aPropTokens[XML_PROP_TYPE_END] = +const XMLTokenEnum aPropTokens[XML_PROP_TYPE_END] = { XML_GRAPHIC_PROPERTIES, XML_DRAWING_PAGE_PROPERTIES, @@ -105,7 +105,7 @@ static const XMLTokenEnum aPropTokens[XML_PROP_TYPE_END] = XML_CHART_PROPERTIES }; -static const sal_uInt16 aAttrActionMaps[XML_PROP_TYPE_END] = +const sal_uInt16 aAttrActionMaps[XML_PROP_TYPE_END] = { PROP_OOO_GRAPHIC_ATTR_ACTIONS, PROP_OOO_DRAWING_PAGE_ATTR_ACTIONS, // DRAWING_PAGE @@ -123,7 +123,7 @@ static const sal_uInt16 aAttrActionMaps[XML_PROP_TYPE_END] = PROP_OOO_CHART_ATTR_ACTIONS }; -static const sal_uInt16 aElemActionMaps[XML_PROP_TYPE_END] = +const sal_uInt16 aElemActionMaps[XML_PROP_TYPE_END] = { PROP_OOO_GRAPHIC_ELEM_ACTIONS, MAX_OOO_PROP_ACTIONS, diff --git a/xmloff/source/xforms/SchemaContext.cxx b/xmloff/source/xforms/SchemaContext.cxx index 6c19cbfa019a..3ca81f850e93 100644 --- a/xmloff/source/xforms/SchemaContext.cxx +++ b/xmloff/source/xforms/SchemaContext.cxx @@ -34,12 +34,12 @@ using com::sun::star::xforms::XDataTypeRepository; using namespace xmloff::token; -static const SvXMLTokenMapEntry aAttributes[] = +const SvXMLTokenMapEntry aAttributes[] = { XML_TOKEN_MAP_END }; -static const SvXMLTokenMapEntry aChildren[] = +const SvXMLTokenMapEntry aChildren[] = { TOKEN_MAP_ENTRY( XSD, SIMPLETYPE ), XML_TOKEN_MAP_END diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx index cafaab50b16c..7ca0033a0276 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.cxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx @@ -53,13 +53,13 @@ using com::sun::star::xforms::XDataTypeRepository; using namespace xmloff::token; -static const SvXMLTokenMapEntry aAttributes[] = +const SvXMLTokenMapEntry aAttributes[] = { TOKEN_MAP_ENTRY( NONE, BASE ), XML_TOKEN_MAP_END }; -static const SvXMLTokenMapEntry aChildren[] = +const SvXMLTokenMapEntry aChildren[] = { TOKEN_MAP_ENTRY( XSD, LENGTH ), TOKEN_MAP_ENTRY( XSD, MINLENGTH ), diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx index 0c01874efbf5..217069258cab 100644 --- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx +++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx @@ -34,13 +34,13 @@ using com::sun::star::xforms::XDataTypeRepository; using namespace xmloff::token; -static const SvXMLTokenMapEntry aAttributes[] = +const SvXMLTokenMapEntry aAttributes[] = { TOKEN_MAP_ENTRY( NONE, NAME ), XML_TOKEN_MAP_END }; -static const SvXMLTokenMapEntry aChildren[] = +const SvXMLTokenMapEntry aChildren[] = { TOKEN_MAP_ENTRY( XSD, RESTRICTION ), XML_TOKEN_MAP_END diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx index c975e8b65b5c..d636beb42576 100644 --- a/xmloff/source/xforms/XFormsBindContext.cxx +++ b/xmloff/source/xforms/XFormsBindContext.cxx @@ -44,7 +44,7 @@ using com::sun::star::xforms::XModel2; using namespace xmloff::token; -static const struct SvXMLTokenMapEntry aAttributeMap[] = +const struct SvXMLTokenMapEntry aAttributeMap[] = { TOKEN_MAP_ENTRY( NONE, NODESET ), TOKEN_MAP_ENTRY( NONE, ID ), diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx index e1a81a3f6c37..cac6bb15b47e 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.cxx +++ b/xmloff/source/xforms/XFormsInstanceContext.cxx @@ -46,7 +46,7 @@ using com::sun::star::xml::sax::XAttributeList; using xmloff::token::XML_SRC; using xmloff::token::XML_ID; -static const SvXMLTokenMapEntry aAttributes[] = +const SvXMLTokenMapEntry aAttributes[] = { TOKEN_MAP_ENTRY( NONE, SRC ), TOKEN_MAP_ENTRY( NONE, ID ), diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx index e846e54b5866..b8e7f348214b 100644 --- a/xmloff/source/xforms/XFormsModelContext.cxx +++ b/xmloff/source/xforms/XFormsModelContext.cxx @@ -44,14 +44,14 @@ using namespace com::sun::star::uno; using namespace xmloff::token; -static const SvXMLTokenMapEntry aAttributes[] = +const SvXMLTokenMapEntry aAttributes[] = { TOKEN_MAP_ENTRY( NONE, ID ), TOKEN_MAP_ENTRY( NONE, SCHEMA ), XML_TOKEN_MAP_END }; -static const SvXMLTokenMapEntry aChildren[] = +const SvXMLTokenMapEntry aChildren[] = { TOKEN_MAP_ENTRY( XFORMS, INSTANCE ), TOKEN_MAP_ENTRY( XFORMS, BIND ), diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx index 254c7b97b11d..4e6cf7c71725 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.cxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx @@ -41,7 +41,7 @@ using namespace com::sun::star::uno; using namespace xmloff::token; -static const struct SvXMLTokenMapEntry aAttributeMap[] = +const struct SvXMLTokenMapEntry aAttributeMap[] = { TOKEN_MAP_ENTRY( NONE, ID ), TOKEN_MAP_ENTRY( NONE, BIND ), diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx index 80e80ebd7f2a..1ed999431b11 100644 --- a/xmloff/source/xforms/xformsapi.cxx +++ b/xmloff/source/xforms/xformsapi.cxx @@ -172,7 +172,7 @@ void xforms_setValue( Reference<XPropertySet> const & xPropertySet, } #define TOKEN_MAP_ENTRY(NAMESPACE,TOKEN) { XML_NAMESPACE_##NAMESPACE, xmloff::token::XML_##TOKEN, xmloff::token::XML_##TOKEN } -static const SvXMLTokenMapEntry aTypes[] = +const SvXMLTokenMapEntry aTypes[] = { TOKEN_MAP_ENTRY( XSD, STRING ), TOKEN_MAP_ENTRY( XSD, DECIMAL ), diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx index 97fba39e4488..151e043840bd 100644 --- a/xmloff/source/xforms/xformsexport.cxx +++ b/xmloff/source/xforms/xformsexport.cxx @@ -153,7 +153,7 @@ static OUString lcl_getXSDType( SvXMLExport const & rExport, // the model -static const ExportTable aXFormsModelTable[] = +const ExportTable aXFormsModelTable[] = { TABLE_ENTRY( "ID", NONE, ID, xforms_string ), TABLE_ENTRY( "SchemaRef", NONE, SCHEMA, xforms_string ), @@ -252,7 +252,7 @@ void exportXFormsInstance( SvXMLExport& rExport, // the binding -static const ExportTable aXFormsBindingTable[] = +const ExportTable aXFormsBindingTable[] = { TABLE_ENTRY( "BindingID", NONE, ID, xforms_string ), TABLE_ENTRY( "BindingExpression", NONE, NODESET, xforms_string ), @@ -366,7 +366,7 @@ void exportXFormsBinding( SvXMLExport& rExport, // the submission -static const ExportTable aXFormsSubmissionTable[] = +const ExportTable aXFormsSubmissionTable[] = { TABLE_ENTRY( "ID", NONE, ID, xforms_string ), TABLE_ENTRY( "Bind", NONE, BIND, xforms_string ), @@ -398,7 +398,7 @@ void exportXFormsSubmission( SvXMLExport& rExport, // export data types as XSD schema -static const ExportTable aDataTypeFacetTable[] = +const ExportTable aDataTypeFacetTable[] = { TABLE_ENTRY( "Length", XSD, LENGTH, xforms_int32 ), TABLE_ENTRY( "MinLength", XSD, MINLENGTH, xforms_int32 ), |