diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-07-02 08:20:48 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-07-02 09:30:19 +0200 |
commit | 2b0677d69e6e53a7e3a74c6e42a8d02f7cc36a41 (patch) | |
tree | 56d3cb8394f726025842adf25e902255b435bf85 /sw/source/ui | |
parent | 13c4a795aa42250a31977068a3fbb2dc5162e443 (diff) |
Upcoming improved loplugin:staticanonymous -> redundantstatic: sw
Change-Id: Id4e6e18b1fce848972e67ca519cbf23eab7cd109
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97701
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw/source/ui')
-rw-r--r-- | sw/source/ui/config/optpage.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/column.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 58 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/index/swuiidxmrk.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbaborders.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/vba/vbadialog.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbafield.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbafont.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbainformationhelper.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbalisthelper.cxx | 34 | ||||
-rw-r--r-- | sw/source/ui/vba/vbapalette.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbaparagraphformat.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/vba/vbastyles.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/vba/vbaview.cxx | 2 |
15 files changed, 65 insertions, 65 deletions
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 777b454d2828..70a2db75fcb7 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1352,7 +1352,7 @@ struct CharAttr } // Edit corresponds to Paste-attributes -static CharAttr const aRedlineAttr[] = +CharAttr const aRedlineAttr[] = { { SID_ATTR_CHAR_CASEMAP, sal_uInt16(SvxCaseMap::NotMapped) }, { SID_ATTR_CHAR_WEIGHT, WEIGHT_BOLD }, diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 50822c644e6b..64b64dec25b8 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -69,7 +69,7 @@ using namespace ::com::sun::star; #define FRAME_FORMAT_WIDTH 1000 // static data -static const sal_uInt16 nVisCols = 3; +const sal_uInt16 nVisCols = 3; static bool IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSect ) { diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 4257215e7c33..f18d33fa8385 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -148,7 +148,7 @@ struct FrameMap }; -static RelationMap const aRelationMap[] = +RelationMap const aRelationMap[] = { {SwFPos::FRAME, SwFPos::FRAME, LB::Frame, text::RelOrientation::FRAME}, {SwFPos::PRTAREA, SwFPos::PRTAREA, LB::PrintArea, text::RelOrientation::PRINT_AREA}, @@ -174,7 +174,7 @@ static RelationMap const aRelationMap[] = {SwFPos::REL_LINE, SwFPos::REL_LINE, LB::VertLine, text::RelOrientation::TEXT_LINE} }; -static RelationMap const aAsCharRelationMap[] = +RelationMap const aAsCharRelationMap[] = { {SwFPos::REL_BASE, SwFPos::REL_BASE, LB::RelBase, text::RelOrientation::FRAME}, {SwFPos::REL_CHAR, SwFPos::REL_CHAR, LB::RelChar, text::RelOrientation::FRAME}, @@ -182,10 +182,10 @@ static RelationMap const aAsCharRelationMap[] = }; // site anchored -static constexpr auto HORI_PAGE_REL = LB::RelPageFrame | LB::RelPagePrintArea | LB::RelPageLeft | +constexpr auto HORI_PAGE_REL = LB::RelPageFrame | LB::RelPagePrintArea | LB::RelPageLeft | LB::RelPageRight; -static FrameMap const aHPageMap[] = +FrameMap const aHPageMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, HORI_PAGE_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, HORI_PAGE_REL}, @@ -193,14 +193,14 @@ static FrameMap const aHPageMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, HORI_PAGE_REL} }; -static FrameMap const aHPageHtmlMap[] = +FrameMap const aHPageHtmlMap[] = { {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, LB::RelPageFrame} }; #define VERT_PAGE_REL (LB::RelPageFrame|LB::RelPagePrintArea) -static FrameMap const aVPageMap[] = +FrameMap const aVPageMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, VERT_PAGE_REL}, {SwFPos::BOTTOM, SwFPos::BOTTOM, text::VertOrientation::BOTTOM, VERT_PAGE_REL}, @@ -208,16 +208,16 @@ static FrameMap const aVPageMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, VERT_PAGE_REL} }; -static FrameMap const aVPageHtmlMap[] = +FrameMap const aVPageHtmlMap[] = { {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, LB::RelPageFrame} }; // frame anchored -static constexpr auto HORI_FRAME_REL = LB::FlyRelPageFrame | LB::FlyRelPagePrintArea | +constexpr auto HORI_FRAME_REL = LB::FlyRelPageFrame | LB::FlyRelPagePrintArea | LB::FlyRelPageLeft | LB::FlyRelPageRight; -static FrameMap const aHFrameMap[] = +FrameMap const aHFrameMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, HORI_FRAME_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, HORI_FRAME_REL}, @@ -225,7 +225,7 @@ static FrameMap const aHFrameMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, HORI_FRAME_REL} }; -static FrameMap const aHFlyHtmlMap[] = +FrameMap const aHFlyHtmlMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, LB::FlyRelPageFrame}, {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, LB::FlyRelPageFrame} @@ -234,7 +234,7 @@ static FrameMap const aHFlyHtmlMap[] = // own vertical alignment map for objects anchored to frame #define VERT_FRAME_REL (LB::FlyVertFrame|LB::FlyVertPrintArea) -static FrameMap const aVFrameMap[] = +FrameMap const aVFrameMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, VERT_FRAME_REL}, {SwFPos::BOTTOM, SwFPos::BOTTOM, text::VertOrientation::BOTTOM, VERT_FRAME_REL}, @@ -242,18 +242,18 @@ static FrameMap const aVFrameMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, VERT_FRAME_REL} }; -static FrameMap const aVFlyHtmlMap[] = +FrameMap const aVFlyHtmlMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB::FlyVertFrame}, {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, LB::FlyVertFrame} }; // paragraph anchored -static constexpr auto HORI_PARA_REL = LB::Frame | LB::PrintArea | LB::RelPageLeft | LB::RelPageRight | +constexpr auto HORI_PARA_REL = LB::Frame | LB::PrintArea | LB::RelPageLeft | LB::RelPageRight | LB::RelPageFrame | LB::RelPagePrintArea | LB::RelFrameLeft | LB::RelFrameRight; -static FrameMap const aHParaMap[] = +FrameMap const aHParaMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, HORI_PARA_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, HORI_PARA_REL}, @@ -263,23 +263,23 @@ static FrameMap const aHParaMap[] = #define HTML_HORI_PARA_REL (LB::Frame|LB::PrintArea) -static FrameMap const aHParaHtmlMap[] = +FrameMap const aHParaHtmlMap[] = { {SwFPos::LEFT, SwFPos::LEFT, text::HoriOrientation::LEFT, HTML_HORI_PARA_REL}, {SwFPos::RIGHT, SwFPos::RIGHT, text::HoriOrientation::RIGHT, HTML_HORI_PARA_REL} }; -static FrameMap const aHParaHtmlAbsMap[] = +FrameMap const aHParaHtmlAbsMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, HTML_HORI_PARA_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, HTML_HORI_PARA_REL} }; // allow vertical alignment at page areas -static constexpr auto VERT_PARA_REL = LB::VertFrame | LB::VertPrintArea | +constexpr auto VERT_PARA_REL = LB::VertFrame | LB::VertPrintArea | LB::RelPageFrame | LB::RelPagePrintArea; -static FrameMap const aVParaMap[] = +FrameMap const aVParaMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, VERT_PARA_REL}, {SwFPos::BOTTOM, SwFPos::BOTTOM, text::VertOrientation::BOTTOM, VERT_PARA_REL}, @@ -287,17 +287,17 @@ static FrameMap const aVParaMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, VERT_PARA_REL} }; -static FrameMap const aVParaHtmlMap[] = +FrameMap const aVParaHtmlMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB::VertPrintArea} }; // anchored relative to the character -static constexpr auto HORI_CHAR_REL = LB::Frame|LB::PrintArea | LB::RelPageLeft | LB::RelPageRight | +constexpr auto HORI_CHAR_REL = LB::Frame|LB::PrintArea | LB::RelPageLeft | LB::RelPageRight | LB::RelPageFrame | LB::RelPagePrintArea | LB::RelFrameLeft | LB::RelFrameRight | LB::RelChar; -static FrameMap const aHCharMap[] = +FrameMap const aHCharMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, HORI_CHAR_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, HORI_CHAR_REL}, @@ -307,13 +307,13 @@ static FrameMap const aHCharMap[] = #define HTML_HORI_CHAR_REL (LB::Frame|LB::PrintArea|LB::RelChar) -static FrameMap const aHCharHtmlMap[] = +FrameMap const aHCharHtmlMap[] = { {SwFPos::LEFT, SwFPos::LEFT, text::HoriOrientation::LEFT, HTML_HORI_CHAR_REL}, {SwFPos::RIGHT, SwFPos::RIGHT, text::HoriOrientation::RIGHT, HTML_HORI_CHAR_REL} }; -static FrameMap const aHCharHtmlAbsMap[] = +FrameMap const aHCharHtmlAbsMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, LB::PrintArea|LB::RelChar}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, LB::PrintArea}, @@ -321,10 +321,10 @@ static FrameMap const aHCharHtmlAbsMap[] = }; // allow vertical alignment at page areas -static constexpr auto VERT_CHAR_REL = LB::VertFrame | LB::VertPrintArea | +constexpr auto VERT_CHAR_REL = LB::VertFrame | LB::VertPrintArea | LB::RelPageFrame | LB::RelPagePrintArea; -static FrameMap const aVCharMap[] = +FrameMap const aVCharMap[] = { // introduce mappings for new vertical alignment at top of line <LB::VertLine> // and correct mapping for vertical alignment at character for position <FROM_BOTTOM> @@ -343,19 +343,19 @@ static FrameMap const aVCharMap[] = {SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, text::VertOrientation::LINE_CENTER, LB::VertLine} }; -static FrameMap const aVCharHtmlMap[] = +FrameMap const aVCharHtmlMap[] = { {SwFPos::BELOW, SwFPos::BELOW, text::VertOrientation::CHAR_BOTTOM, LB::RelChar} }; -static FrameMap const aVCharHtmlAbsMap[] = +FrameMap const aVCharHtmlAbsMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB::RelChar}, {SwFPos::BELOW, SwFPos::BELOW, text::VertOrientation::CHAR_BOTTOM, LB::RelChar} }; // anchored as character -static FrameMap const aVAsCharMap[] = +FrameMap const aVAsCharMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB::RelBase}, {SwFPos::BOTTOM, SwFPos::BOTTOM, text::VertOrientation::BOTTOM, LB::RelBase}, @@ -372,7 +372,7 @@ static FrameMap const aVAsCharMap[] = {SwFPos::FROMBOTTOM, SwFPos::FROMBOTTOM, text::VertOrientation::NONE, LB::RelBase} }; -static FrameMap const aVAsCharHtmlMap[] = +FrameMap const aVAsCharHtmlMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB::RelBase}, {SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, text::VertOrientation::CENTER, LB::RelBase}, diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 90f604612982..3abc2f4299b6 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -75,8 +75,8 @@ using namespace com::sun::star::ui::dialogs; using namespace ::sfx2; #include <svtools/editbrowsebox.hxx> -static const sal_Unicode aDeliStart = '['; // for the form -static const sal_Unicode aDeliEnd = ']'; // for the form +const sal_Unicode aDeliStart = '['; // for the form +const sal_Unicode aDeliEnd = ']'; // for the form static OUString lcl_CreateAutoMarkFileDlg(weld::Window* pParent, const OUString& rURL, const OUString& rFileString, bool bOpen) diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index ded8f725641a..d01c7a8a499c 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -1045,7 +1045,7 @@ struct TextInfo } -static const TextInfo aTextInfoArr[] = +const TextInfo aTextInfoArr[] = { {AUTH_FIELD_IDENTIFIER, HID_AUTH_FIELD_IDENTIFIER }, {AUTH_FIELD_AUTHORITY_TYPE, HID_AUTH_FIELD_AUTHORITY_TYPE }, diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index 5561bbfcbc76..7f641b829313 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -34,10 +34,10 @@ typedef InheritedHelperInterfaceWeakImpl<word::XBorder > SwVbaBorder_Base; // #TODO sort these indexes to match the order in which Word iterates over the // borders, the enumeration will match the order in this list -static const sal_Int16 supportedIndexTable[] = { word::WdBorderType::wdBorderBottom, word::WdBorderType::wdBorderDiagonalDown, word::WdBorderType::wdBorderDiagonalUp, word::WdBorderType::wdBorderHorizontal, word::WdBorderType::wdBorderLeft, word::WdBorderType::wdBorderRight, word::WdBorderType::wdBorderTop, word::WdBorderType::wdBorderVertical }; +const sal_Int16 supportedIndexTable[] = { word::WdBorderType::wdBorderBottom, word::WdBorderType::wdBorderDiagonalDown, word::WdBorderType::wdBorderDiagonalUp, word::WdBorderType::wdBorderHorizontal, word::WdBorderType::wdBorderLeft, word::WdBorderType::wdBorderRight, word::WdBorderType::wdBorderTop, word::WdBorderType::wdBorderVertical }; // Equiv widths in 1/100 mm -const static sal_Int32 OOLineHairline = 2; +const sal_Int32 OOLineHairline = 2; namespace { diff --git a/sw/source/ui/vba/vbadialog.cxx b/sw/source/ui/vba/vbadialog.cxx index c161b5d7c239..f6af8f113e87 100644 --- a/sw/source/ui/vba/vbadialog.cxx +++ b/sw/source/ui/vba/vbadialog.cxx @@ -32,7 +32,7 @@ struct WordDialogTable } -static const WordDialogTable aWordDialogTable[] = +const WordDialogTable aWordDialogTable[] = { { word::WdWordDialog::wdDialogFileNew, ".uno:NewDoc" }, { word::WdWordDialog::wdDialogFileOpen, ".uno:Open" }, diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 6e3aef2f32b7..09cb387871c1 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -387,7 +387,7 @@ struct DocPropertyTable } -static const DocPropertyTable aDocPropertyTables[] = +const DocPropertyTable aDocPropertyTables[] = { { "Author", "com.sun.star.text.textfield.docinfo.CreateAuthor" }, { "Bytes", nullptr }, diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index 01b15bd06b29..1b16c07bd2b3 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -41,7 +41,7 @@ struct MapPair } -static MapPair const UnderLineTable[] = { +MapPair const UnderLineTable[] = { { word::WdUnderline::wdUnderlineNone, css::awt::FontUnderline::NONE }, { word::WdUnderline::wdUnderlineSingle, css::awt::FontUnderline::SINGLE }, { word::WdUnderline::wdUnderlineWords, css::awt::FontUnderline::SINGLE }, diff --git a/sw/source/ui/vba/vbainformationhelper.cxx b/sw/source/ui/vba/vbainformationhelper.cxx index f6aeacee75ea..8dc2297469a3 100644 --- a/sw/source/ui/vba/vbainformationhelper.cxx +++ b/sw/source/ui/vba/vbainformationhelper.cxx @@ -29,7 +29,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static const sal_Int32 DEFAULT_PAGE_DISTANCE = 500; +const sal_Int32 DEFAULT_PAGE_DISTANCE = 500; sal_Int32 SwVbaInformationHelper::handleWdActiveEndPageNumber( const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) { diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx index ee92f31f9a02..3ae9a5e79c4c 100644 --- a/sw/source/ui/vba/vbalisthelper.cxx +++ b/sw/source/ui/vba/vbalisthelper.cxx @@ -29,23 +29,23 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static const sal_Int32 LIST_LEVEL_COUNT = 9; - -static const char UNO_NAME_PARENT_NUMBERING[] = "ParentNumbering"; -static const char UNO_NAME_PREFIX[] = "Prefix"; -static const char UNO_NAME_SUFFIX[] = "Suffix"; -static const char UNO_NAME_CHAR_STYLE_NAME[] = "CharStyleName"; -static const char UNO_NAME_NUMBERING_TYPE[] = "NumberingType"; -static const char UNO_NAME_BULLET_CHAR[] = "BulletChar"; - -static const sal_Unicode CHAR_CLOSED_DOT[] = u"\u2022"; -static const char CHAR_EMPTY_DOT[] = "o"; -static const sal_Unicode CHAR_SQUARE[] = u"\u2540"; -static const sal_Unicode CHAR_STAR_SYMBOL[] = u"\u272A"; -static const sal_Unicode CHAR_FOUR_DIAMONDS[] = u"\u2756"; -static const sal_Unicode CHAR_DIAMOND[] = u"\u2726"; -static const sal_Unicode CHAR_ARROW[] = u"\u27A2"; -static const sal_Unicode CHAR_CHECK_MARK[] = u"\u2713"; +const sal_Int32 LIST_LEVEL_COUNT = 9; + +const char UNO_NAME_PARENT_NUMBERING[] = "ParentNumbering"; +const char UNO_NAME_PREFIX[] = "Prefix"; +const char UNO_NAME_SUFFIX[] = "Suffix"; +const char UNO_NAME_CHAR_STYLE_NAME[] = "CharStyleName"; +const char UNO_NAME_NUMBERING_TYPE[] = "NumberingType"; +const char UNO_NAME_BULLET_CHAR[] = "BulletChar"; + +const sal_Unicode CHAR_CLOSED_DOT[] = u"\u2022"; +const char CHAR_EMPTY_DOT[] = "o"; +const sal_Unicode CHAR_SQUARE[] = u"\u2540"; +const sal_Unicode CHAR_STAR_SYMBOL[] = u"\u272A"; +const sal_Unicode CHAR_FOUR_DIAMONDS[] = u"\u2756"; +const sal_Unicode CHAR_DIAMOND[] = u"\u2726"; +const sal_Unicode CHAR_ARROW[] = u"\u27A2"; +const sal_Unicode CHAR_CHECK_MARK[] = u"\u2713"; SwVbaListHelper::SwVbaListHelper( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) : mxTextDocument( xTextDoc ), mnGalleryType( nGalleryType ), mnTemplateType( nTemplateType ) { diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx index f5ed233bb6bc..9bb41947c779 100644 --- a/sw/source/ui/vba/vbapalette.cxx +++ b/sw/source/ui/vba/vbapalette.cxx @@ -27,7 +27,7 @@ using namespace ::ooo::vba; using namespace ::ooo::vba::word; using namespace ::com::sun::star; -static const sal_Int32 ColorTable[] = +const sal_Int32 ColorTable[] = { WdColor::wdColorAutomatic, // 0 WdColor::wdColorBlack, // 1 diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx index 0a8c8566382f..9cf7ea43c4a1 100644 --- a/sw/source/ui/vba/vbaparagraphformat.cxx +++ b/sw/source/ui/vba/vbaparagraphformat.cxx @@ -31,10 +31,10 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static const sal_Int16 CHARACTER_INDENT_FACTOR = 12; -static const sal_Int16 PERCENT100 = 100; -static const sal_Int16 PERCENT150 = 150; -static const sal_Int16 PERCENT200 = 200; +const sal_Int16 CHARACTER_INDENT_FACTOR = 12; +const sal_Int16 PERCENT100 = 100; +const sal_Int16 PERCENT150 = 150; +const sal_Int16 PERCENT200 = 200; SwVbaParagraphFormat::SwVbaParagraphFormat( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< beans::XPropertySet >& rParaProps ) : SwVbaParagraphFormat_BASE( rParent, rContext ), mxParaProps( rParaProps ) { diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index bfebbb8b48dd..e320933f3c58 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -42,7 +42,7 @@ struct BuiltinStyleTable } -static const BuiltinStyleTable aBuiltinStyleTable[] = +const BuiltinStyleTable aBuiltinStyleTable[] = { { word::WdBuiltinStyle::wdStyleBlockQuotation, "", word::WdStyleType::wdStyleTypeParagraph }, { word::WdBuiltinStyle::wdStyleBodyText, "Text body", word::WdStyleType::wdStyleTypeParagraph }, @@ -160,7 +160,7 @@ struct MSOStyleNameTable } -static const MSOStyleNameTable aMSOStyleNameTable[] = +const MSOStyleNameTable aMSOStyleNameTable[] = { { "Normal", "Default" }, { nullptr, nullptr } diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx index e7012f4b13b6..9d965addbbdd 100644 --- a/sw/source/ui/vba/vbaview.cxx +++ b/sw/source/ui/vba/vbaview.cxx @@ -41,7 +41,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static const sal_Int32 DEFAULT_BODY_DISTANCE = 500; +const sal_Int32 DEFAULT_BODY_DISTANCE = 500; SwVbaView::SwVbaView( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& rModel ) : |