include/svx/svdtrans.hxx | 2 include/svx/svdtypes.hxx | 2 sc/inc/global.hxx | 26 ++--- sc/inc/scitems.hxx | 206 +++++++++++++++++++++++------------------------ 4 files changed, 118 insertions(+), 118 deletions(-)
New commits: commit de7e10f9dd823d3be8cb5a9f960c6b5a43e671f2 Author: Julien Nabet <[email protected]> AuthorDate: Fri Nov 22 10:42:00 2024 +0100 Commit: Julien Nabet <[email protected]> CommitDate: Fri Nov 22 14:26:09 2024 +0100 tdf#163486: PVS V1043 global object variable is declared in header (sc) Change-Id: Ie328b5120bc879702db351555c9db5d6b661be41 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176990 Reviewed-by: Julien Nabet <[email protected]> Tested-by: Jenkins diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 616930567210..fd51ff15808b 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -84,15 +84,15 @@ const sal_uInt16 MAXZOOM = 400; const SCSIZE MAXSUBTOTAL = 3; // ~105.88 twip, i.e. about 2 times narrower than o3tl::Length::ch, which is 210 twip -constexpr auto TWIPS_PER_CHAR = o3tl::toTwips(1 / 13.6, o3tl::Length::in); +inline constexpr auto TWIPS_PER_CHAR = o3tl::toTwips(1 / 13.6, o3tl::Length::in); -constexpr sal_Int32 STD_COL_WIDTH = o3tl::convert(64, o3tl::Length::pt, o3tl::Length::twip); -constexpr sal_Int32 STD_EXTRA_WIDTH = o3tl::convert(2, o3tl::Length::mm, o3tl::Length::twip); +inline constexpr sal_Int32 STD_COL_WIDTH = o3tl::convert(64, o3tl::Length::pt, o3tl::Length::twip); +inline constexpr sal_Int32 STD_EXTRA_WIDTH = o3tl::convert(2, o3tl::Length::mm, o3tl::Length::twip); -constexpr sal_Int32 MAX_EXTRA_WIDTH = o3tl::convert(42, o3tl::Length::cm, o3tl::Length::twip); -constexpr sal_Int32 MAX_EXTRA_HEIGHT = o3tl::convert(42, o3tl::Length::cm, o3tl::Length::twip); -constexpr sal_Int32 MAX_COL_WIDTH = o3tl::convert(1, o3tl::Length::m, o3tl::Length::twip); -constexpr sal_Int32 MAX_ROW_HEIGHT = o3tl::convert(1, o3tl::Length::m, o3tl::Length::twip); +inline constexpr sal_Int32 MAX_EXTRA_WIDTH = o3tl::convert(42, o3tl::Length::cm, o3tl::Length::twip); +inline constexpr sal_Int32 MAX_EXTRA_HEIGHT = o3tl::convert(42, o3tl::Length::cm, o3tl::Length::twip); +inline constexpr sal_Int32 MAX_COL_WIDTH = o3tl::convert(1, o3tl::Length::m, o3tl::Length::twip); +inline constexpr sal_Int32 MAX_ROW_HEIGHT = o3tl::convert(1, o3tl::Length::m, o3tl::Length::twip); /* standard row height: text + margin - STD_ROWHEIGHT_DIFF */ #define STD_ROWHEIGHT_DIFF 23 @@ -207,11 +207,11 @@ namespace o3tl { // Layer id's for drawing. // These are both id's and positions. -constexpr SdrLayerID SC_LAYER_FRONT (0); -constexpr SdrLayerID SC_LAYER_BACK (1); -constexpr SdrLayerID SC_LAYER_INTERN (2); -constexpr SdrLayerID SC_LAYER_CONTROLS(3); -constexpr SdrLayerID SC_LAYER_HIDDEN (4); +inline constexpr SdrLayerID SC_LAYER_FRONT (0); +inline constexpr SdrLayerID SC_LAYER_BACK (1); +inline constexpr SdrLayerID SC_LAYER_INTERN (2); +inline constexpr SdrLayerID SC_LAYER_CONTROLS(3); +inline constexpr SdrLayerID SC_LAYER_HIDDEN (4); // link tables enum class ScLinkMode { @@ -463,7 +463,7 @@ struct ScImportParam // Formula data replacement character for a pair of parentheses at end of // function name, to force sorting parentheses before all other characters. // Collation may treat parentheses differently. -constexpr sal_Unicode cParenthesesReplacement = 0x0001; +inline constexpr sal_Unicode cParenthesesReplacement = 0x0001; struct InputHandlerFunctionNames { ScTypedCaseStrSet maFunctionData; diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx index 1791ee9f7571..c2485993546e 100644 --- a/sc/inc/scitems.hxx +++ b/sc/inc/scitems.hxx @@ -99,110 +99,110 @@ class SvxSetItem; // Item-IDs for attributes: -constexpr sal_uInt16 ATTR_STARTINDEX(100); // begin of attributes - -constexpr sal_uInt16 ATTR_PATTERN_START(100); // begin of cell-attribute-pattern - -constexpr TypedWhichId<SvxFontItem> ATTR_FONT (100); // begin of cell-attributes -constexpr TypedWhichId<SvxFontHeightItem> ATTR_FONT_HEIGHT (101); -constexpr TypedWhichId<SvxWeightItem> ATTR_FONT_WEIGHT (102); -constexpr TypedWhichId<SvxPostureItem> ATTR_FONT_POSTURE (103); -constexpr TypedWhichId<SvxUnderlineItem> ATTR_FONT_UNDERLINE (104); -constexpr TypedWhichId<SvxOverlineItem> ATTR_FONT_OVERLINE (105); -constexpr TypedWhichId<SvxCrossedOutItem> ATTR_FONT_CROSSEDOUT (106); -constexpr TypedWhichId<SvxContourItem> ATTR_FONT_CONTOUR (107); -constexpr TypedWhichId<SvxShadowedItem> ATTR_FONT_SHADOWED (108); -constexpr TypedWhichId<SvxColorItem> ATTR_FONT_COLOR (109); -constexpr TypedWhichId<SvxLanguageItem> ATTR_FONT_LANGUAGE (110); -constexpr TypedWhichId<SvxFontItem> ATTR_CJK_FONT (111); -constexpr TypedWhichId<SvxFontHeightItem> ATTR_CJK_FONT_HEIGHT (112); -constexpr TypedWhichId<SvxWeightItem> ATTR_CJK_FONT_WEIGHT (113); -constexpr TypedWhichId<SvxPostureItem> ATTR_CJK_FONT_POSTURE (114); -constexpr TypedWhichId<SvxLanguageItem> ATTR_CJK_FONT_LANGUAGE (115); -constexpr TypedWhichId<SvxFontItem> ATTR_CTL_FONT (116); -constexpr TypedWhichId<SvxFontHeightItem> ATTR_CTL_FONT_HEIGHT (117); -constexpr TypedWhichId<SvxWeightItem> ATTR_CTL_FONT_WEIGHT (118); -constexpr TypedWhichId<SvxPostureItem> ATTR_CTL_FONT_POSTURE (119); -constexpr TypedWhichId<SvxLanguageItem> ATTR_CTL_FONT_LANGUAGE (120); -constexpr TypedWhichId<SvxEmphasisMarkItem> ATTR_FONT_EMPHASISMARK (121); -constexpr TypedWhichId<SvXMLAttrContainerItem> ATTR_USERDEF (122); // not saved in binary files -constexpr TypedWhichId<SvxWordLineModeItem> ATTR_FONT_WORDLINE (123); -constexpr TypedWhichId<SvxCharReliefItem> ATTR_FONT_RELIEF (124); -constexpr TypedWhichId<ScHyphenateCell> ATTR_HYPHENATE (125); -constexpr TypedWhichId<SvxScriptSpaceItem> ATTR_SCRIPTSPACE (126); -constexpr TypedWhichId<SvxHangingPunctuationItem> ATTR_HANGPUNCTUATION (127); -constexpr TypedWhichId<SvxForbiddenRuleItem> ATTR_FORBIDDEN_RULES (128); -constexpr TypedWhichId<SvxHorJustifyItem> ATTR_HOR_JUSTIFY (129); -constexpr TypedWhichId<SvxJustifyMethodItem> ATTR_HOR_JUSTIFY_METHOD (130); -constexpr TypedWhichId<ScIndentItem> ATTR_INDENT (131); -constexpr TypedWhichId<SvxVerJustifyItem> ATTR_VER_JUSTIFY (132); -constexpr TypedWhichId<SvxJustifyMethodItem> ATTR_VER_JUSTIFY_METHOD (133); -constexpr TypedWhichId<ScVerticalStackCell> ATTR_STACKED (134); -constexpr TypedWhichId<ScRotateValueItem> ATTR_ROTATE_VALUE (135); -constexpr TypedWhichId<SvxRotateModeItem> ATTR_ROTATE_MODE (136); -constexpr TypedWhichId<SfxBoolItem> ATTR_VERTICAL_ASIAN (137); -constexpr TypedWhichId<SvxFrameDirectionItem> ATTR_WRITINGDIR (138); -constexpr TypedWhichId<ScLineBreakCell> ATTR_LINEBREAK (139); -constexpr TypedWhichId<ScShrinkToFitCell> ATTR_SHRINKTOFIT (140); -constexpr TypedWhichId<SvxLineItem> ATTR_BORDER_TLBR (141); -constexpr TypedWhichId<SvxLineItem> ATTR_BORDER_BLTR (142); -constexpr TypedWhichId<SvxMarginItem> ATTR_MARGIN (143); -constexpr TypedWhichId<ScMergeAttr> ATTR_MERGE (144); -constexpr TypedWhichId<ScMergeFlagAttr> ATTR_MERGE_FLAG (145); -constexpr TypedWhichId<SfxUInt32Item> ATTR_VALUE_FORMAT (146); -constexpr TypedWhichId<SvxLanguageItem> ATTR_LANGUAGE_FORMAT (147); -constexpr TypedWhichId<SvxBrushItem> ATTR_BACKGROUND (148); -constexpr TypedWhichId<ScProtectionAttr> ATTR_PROTECTION (149); -constexpr TypedWhichId<SvxBoxItem> ATTR_BORDER (150); -constexpr TypedWhichId<SvxBoxInfoItem> ATTR_BORDER_INNER (151); // inside, because of template-EditDialog -constexpr TypedWhichId<SvxShadowItem> ATTR_SHADOW (152); -constexpr TypedWhichId<SfxUInt32Item> ATTR_VALIDDATA (153); -constexpr TypedWhichId<ScCondFormatItem> ATTR_CONDITIONAL (154); -constexpr TypedWhichId<SfxStringItem> ATTR_HYPERLINK (155); - -constexpr sal_uInt16 ATTR_PATTERN_END(155); // end cell-attribute-pattern +inline constexpr sal_uInt16 ATTR_STARTINDEX(100); // begin of attributes + +inline constexpr sal_uInt16 ATTR_PATTERN_START(100); // begin of cell-attribute-pattern + +inline constexpr TypedWhichId<SvxFontItem> ATTR_FONT (100); // begin of cell-attributes +inline constexpr TypedWhichId<SvxFontHeightItem> ATTR_FONT_HEIGHT (101); +inline constexpr TypedWhichId<SvxWeightItem> ATTR_FONT_WEIGHT (102); +inline constexpr TypedWhichId<SvxPostureItem> ATTR_FONT_POSTURE (103); +inline constexpr TypedWhichId<SvxUnderlineItem> ATTR_FONT_UNDERLINE (104); +inline constexpr TypedWhichId<SvxOverlineItem> ATTR_FONT_OVERLINE (105); +inline constexpr TypedWhichId<SvxCrossedOutItem> ATTR_FONT_CROSSEDOUT (106); +inline constexpr TypedWhichId<SvxContourItem> ATTR_FONT_CONTOUR (107); +inline constexpr TypedWhichId<SvxShadowedItem> ATTR_FONT_SHADOWED (108); +inline constexpr TypedWhichId<SvxColorItem> ATTR_FONT_COLOR (109); +inline constexpr TypedWhichId<SvxLanguageItem> ATTR_FONT_LANGUAGE (110); +inline constexpr TypedWhichId<SvxFontItem> ATTR_CJK_FONT (111); +inline constexpr TypedWhichId<SvxFontHeightItem> ATTR_CJK_FONT_HEIGHT (112); +inline constexpr TypedWhichId<SvxWeightItem> ATTR_CJK_FONT_WEIGHT (113); +inline constexpr TypedWhichId<SvxPostureItem> ATTR_CJK_FONT_POSTURE (114); +inline constexpr TypedWhichId<SvxLanguageItem> ATTR_CJK_FONT_LANGUAGE (115); +inline constexpr TypedWhichId<SvxFontItem> ATTR_CTL_FONT (116); +inline constexpr TypedWhichId<SvxFontHeightItem> ATTR_CTL_FONT_HEIGHT (117); +inline constexpr TypedWhichId<SvxWeightItem> ATTR_CTL_FONT_WEIGHT (118); +inline constexpr TypedWhichId<SvxPostureItem> ATTR_CTL_FONT_POSTURE (119); +inline constexpr TypedWhichId<SvxLanguageItem> ATTR_CTL_FONT_LANGUAGE (120); +inline constexpr TypedWhichId<SvxEmphasisMarkItem> ATTR_FONT_EMPHASISMARK (121); +inline constexpr TypedWhichId<SvXMLAttrContainerItem> ATTR_USERDEF (122); // not saved in binary files +inline constexpr TypedWhichId<SvxWordLineModeItem> ATTR_FONT_WORDLINE (123); +inline constexpr TypedWhichId<SvxCharReliefItem> ATTR_FONT_RELIEF (124); +inline constexpr TypedWhichId<ScHyphenateCell> ATTR_HYPHENATE (125); +inline constexpr TypedWhichId<SvxScriptSpaceItem> ATTR_SCRIPTSPACE (126); +inline constexpr TypedWhichId<SvxHangingPunctuationItem> ATTR_HANGPUNCTUATION (127); +inline constexpr TypedWhichId<SvxForbiddenRuleItem> ATTR_FORBIDDEN_RULES (128); +inline constexpr TypedWhichId<SvxHorJustifyItem> ATTR_HOR_JUSTIFY (129); +inline constexpr TypedWhichId<SvxJustifyMethodItem> ATTR_HOR_JUSTIFY_METHOD (130); +inline constexpr TypedWhichId<ScIndentItem> ATTR_INDENT (131); +inline constexpr TypedWhichId<SvxVerJustifyItem> ATTR_VER_JUSTIFY (132); +inline constexpr TypedWhichId<SvxJustifyMethodItem> ATTR_VER_JUSTIFY_METHOD (133); +inline constexpr TypedWhichId<ScVerticalStackCell> ATTR_STACKED (134); +inline constexpr TypedWhichId<ScRotateValueItem> ATTR_ROTATE_VALUE (135); +inline constexpr TypedWhichId<SvxRotateModeItem> ATTR_ROTATE_MODE (136); +inline constexpr TypedWhichId<SfxBoolItem> ATTR_VERTICAL_ASIAN (137); +inline constexpr TypedWhichId<SvxFrameDirectionItem> ATTR_WRITINGDIR (138); +inline constexpr TypedWhichId<ScLineBreakCell> ATTR_LINEBREAK (139); +inline constexpr TypedWhichId<ScShrinkToFitCell> ATTR_SHRINKTOFIT (140); +inline constexpr TypedWhichId<SvxLineItem> ATTR_BORDER_TLBR (141); +inline constexpr TypedWhichId<SvxLineItem> ATTR_BORDER_BLTR (142); +inline constexpr TypedWhichId<SvxMarginItem> ATTR_MARGIN (143); +inline constexpr TypedWhichId<ScMergeAttr> ATTR_MERGE (144); +inline constexpr TypedWhichId<ScMergeFlagAttr> ATTR_MERGE_FLAG (145); +inline constexpr TypedWhichId<SfxUInt32Item> ATTR_VALUE_FORMAT (146); +inline constexpr TypedWhichId<SvxLanguageItem> ATTR_LANGUAGE_FORMAT (147); +inline constexpr TypedWhichId<SvxBrushItem> ATTR_BACKGROUND (148); +inline constexpr TypedWhichId<ScProtectionAttr> ATTR_PROTECTION (149); +inline constexpr TypedWhichId<SvxBoxItem> ATTR_BORDER (150); +inline constexpr TypedWhichId<SvxBoxInfoItem> ATTR_BORDER_INNER (151); // inside, because of template-EditDialog +inline constexpr TypedWhichId<SvxShadowItem> ATTR_SHADOW (152); +inline constexpr TypedWhichId<SfxUInt32Item> ATTR_VALIDDATA (153); +inline constexpr TypedWhichId<ScCondFormatItem> ATTR_CONDITIONAL (154); +inline constexpr TypedWhichId<SfxStringItem> ATTR_HYPERLINK (155); + +inline constexpr sal_uInt16 ATTR_PATTERN_END(155); // end cell-attribute-pattern // page attributes -constexpr TypedWhichId<SvxLRSpaceItem> ATTR_LRSPACE (156); // editor: PageDesc-TabPage -constexpr TypedWhichId<SvxULSpaceItem> ATTR_ULSPACE (157); -constexpr TypedWhichId<SvxPageItem> ATTR_PAGE (158); -constexpr TypedWhichId<SvxPaperBinItem> ATTR_PAGE_PAPERBIN (159); -constexpr TypedWhichId<SvxSizeItem> ATTR_PAGE_SIZE (160); -constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_HORCENTER (161); -constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_VERCENTER (162); - -constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_ON (163); // editor: header/footer-page -constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_DYNAMIC (164); -constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_SHARED (165); -constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_SHARED_FIRST (166); - -constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_NOTES (167); // editor: table -constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_GRID (168); -constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_HEADERS (169); -constexpr TypedWhichId<ScViewObjectModeItem> ATTR_PAGE_CHARTS (170); -constexpr TypedWhichId<ScViewObjectModeItem> ATTR_PAGE_OBJECTS (171); -constexpr TypedWhichId<ScViewObjectModeItem> ATTR_PAGE_DRAWINGS (172); -constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_TOPDOWN (173); -constexpr TypedWhichId<SfxUInt16Item> ATTR_PAGE_SCALE (174); -constexpr TypedWhichId<SfxUInt16Item> ATTR_PAGE_SCALETOPAGES (175); -constexpr TypedWhichId<SfxUInt16Item> ATTR_PAGE_FIRSTPAGENO (176); - -constexpr TypedWhichId<ScPageHFItem> ATTR_PAGE_HEADERLEFT (177); // contents of header/ -constexpr TypedWhichId<ScPageHFItem> ATTR_PAGE_FOOTERLEFT (178); // footer (left) -constexpr TypedWhichId<ScPageHFItem> ATTR_PAGE_HEADERRIGHT (179); // contents of header/ -constexpr TypedWhichId<ScPageHFItem> ATTR_PAGE_FOOTERRIGHT (180); // footer (right) -constexpr TypedWhichId<ScPageHFItem> ATTR_PAGE_HEADERFIRST (181); // contents of header/ -constexpr TypedWhichId<ScPageHFItem> ATTR_PAGE_FOOTERFIRST (182); // footer (first page) -constexpr TypedWhichId<SvxSetItem> ATTR_PAGE_HEADERSET (183); // the corresponding sets -constexpr TypedWhichId<SvxSetItem> ATTR_PAGE_FOOTERSET (184); - -constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_FORMULAS (185); -constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_NULLVALS (186); - -constexpr TypedWhichId<ScPageScaleToItem> ATTR_PAGE_SCALETO (187); // #i8868# scale printout to width/height - -constexpr TypedWhichId<SfxBoolItem> ATTR_HIDDEN (188); - -constexpr sal_uInt16 ATTR_ENDINDEX(ATTR_HIDDEN); // end of pool-range +inline constexpr TypedWhichId<SvxLRSpaceItem> ATTR_LRSPACE (156); // editor: PageDesc-TabPage +inline constexpr TypedWhichId<SvxULSpaceItem> ATTR_ULSPACE (157); +inline constexpr TypedWhichId<SvxPageItem> ATTR_PAGE (158); +inline constexpr TypedWhichId<SvxPaperBinItem> ATTR_PAGE_PAPERBIN (159); +inline constexpr TypedWhichId<SvxSizeItem> ATTR_PAGE_SIZE (160); +inline constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_HORCENTER (161); +inline constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_VERCENTER (162); + +inline constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_ON (163); // editor: header/footer-page +inline constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_DYNAMIC (164); +inline constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_SHARED (165); +inline constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_SHARED_FIRST (166); + +inline constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_NOTES (167); // editor: table +inline constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_GRID (168); +inline constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_HEADERS (169); +inline constexpr TypedWhichId<ScViewObjectModeItem> ATTR_PAGE_CHARTS (170); +inline constexpr TypedWhichId<ScViewObjectModeItem> ATTR_PAGE_OBJECTS (171); +inline constexpr TypedWhichId<ScViewObjectModeItem> ATTR_PAGE_DRAWINGS (172); +inline constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_TOPDOWN (173); +inline constexpr TypedWhichId<SfxUInt16Item> ATTR_PAGE_SCALE (174); +inline constexpr TypedWhichId<SfxUInt16Item> ATTR_PAGE_SCALETOPAGES (175); +inline constexpr TypedWhichId<SfxUInt16Item> ATTR_PAGE_FIRSTPAGENO (176); + +inline constexpr TypedWhichId<ScPageHFItem> ATTR_PAGE_HEADERLEFT (177); // contents of header/ +inline constexpr TypedWhichId<ScPageHFItem> ATTR_PAGE_FOOTERLEFT (178); // footer (left) +inline constexpr TypedWhichId<ScPageHFItem> ATTR_PAGE_HEADERRIGHT (179); // contents of header/ +inline constexpr TypedWhichId<ScPageHFItem> ATTR_PAGE_FOOTERRIGHT (180); // footer (right) +inline constexpr TypedWhichId<ScPageHFItem> ATTR_PAGE_HEADERFIRST (181); // contents of header/ +inline constexpr TypedWhichId<ScPageHFItem> ATTR_PAGE_FOOTERFIRST (182); // footer (first page) +inline constexpr TypedWhichId<SvxSetItem> ATTR_PAGE_HEADERSET (183); // the corresponding sets +inline constexpr TypedWhichId<SvxSetItem> ATTR_PAGE_FOOTERSET (184); + +inline constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_FORMULAS (185); +inline constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_NULLVALS (186); + +inline constexpr TypedWhichId<ScPageScaleToItem> ATTR_PAGE_SCALETO (187); // #i8868# scale printout to width/height + +inline constexpr TypedWhichId<SfxBoolItem> ATTR_HIDDEN (188); + +inline constexpr sal_uInt16 ATTR_ENDINDEX(ATTR_HIDDEN); // end of pool-range // Dummy Slot-IDs for dialogs commit 2fa20173229c35de5432a7ad60a9c7e942aac37e Author: Julien Nabet <[email protected]> AuthorDate: Fri Nov 22 10:40:25 2024 +0100 Commit: Julien Nabet <[email protected]> CommitDate: Fri Nov 22 14:25:57 2024 +0100 tdf#163486: PVS V1043 global object variable is declared in header (include/) Change-Id: If6a656f47cb88dd218af660def31ece572a3b8ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176989 Reviewed-by: Julien Nabet <[email protected]> Tested-by: Jenkins diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index 2b32386e1004..1d490b1e1158 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -30,7 +30,7 @@ #include <tools/poly.hxx> // That maximum shear angle -constexpr Degree100 SDRMAXSHEAR(8900); +inline constexpr Degree100 SDRMAXSHEAR(8900); class XPolygon; class XPolyPolygon; diff --git a/include/svx/svdtypes.hxx b/include/svx/svdtypes.hxx index 1009b0314923..41a3272d7c41 100644 --- a/include/svx/svdtypes.hxx +++ b/include/svx/svdtypes.hxx @@ -57,7 +57,7 @@ typedef o3tl::strong_int<sal_Int16, struct SdrLayerIDTag> SdrLayerID; // If there is no layer when it should be identified, then // SdrLayerAdmin::GetLayerID(const String&) returns a value. -constexpr SdrLayerID SDRLAYER_NOTFOUND(-1); +inline constexpr SdrLayerID SDRLAYER_NOTFOUND(-1); /* * Repeat
