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 | |
| 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')
68 files changed, 214 insertions, 214 deletions
diff --git a/sw/qa/core/doc/doc.cxx b/sw/qa/core/doc/doc.cxx index a8489e01a274..2229f603569c 100644 --- a/sw/qa/core/doc/doc.cxx +++ b/sw/qa/core/doc/doc.cxx @@ -19,7 +19,7 @@ #include <fmtanchr.hxx> #include <frameformats.hxx> -static char const DATA_DIRECTORY[] = "/sw/qa/core/doc/data/"; +char const DATA_DIRECTORY[] = "/sw/qa/core/doc/data/"; /// Covers sw/source/core/doc/ fixes. class SwCoreDocTest : public SwModelTestBase diff --git a/sw/qa/core/frmedt/frmedt.cxx b/sw/qa/core/frmedt/frmedt.cxx index c737187887c9..f661db647644 100644 --- a/sw/qa/core/frmedt/frmedt.cxx +++ b/sw/qa/core/frmedt/frmedt.cxx @@ -20,7 +20,7 @@ #include <dcontact.hxx> #include <frameformats.hxx> -static char const DATA_DIRECTORY[] = "/sw/qa/core/frmedt/data/"; +char const DATA_DIRECTORY[] = "/sw/qa/core/frmedt/data/"; /// Covers sw/source/core/frmedt/ fixes. class SwCoreFrmedtTest : public SwModelTestBase diff --git a/sw/qa/core/layout/layout.cxx b/sw/qa/core/layout/layout.cxx index ccf2b5cd513a..4cd04111de43 100644 --- a/sw/qa/core/layout/layout.cxx +++ b/sw/qa/core/layout/layout.cxx @@ -13,7 +13,7 @@ #include <wrtsh.hxx> -static char const DATA_DIRECTORY[] = "/sw/qa/core/layout/data/"; +char const DATA_DIRECTORY[] = "/sw/qa/core/layout/data/"; /// Covers sw/source/core/layout/ fixes. class SwCoreLayoutTest : public SwModelTestBase diff --git a/sw/qa/core/objectpositioning/objectpositioning.cxx b/sw/qa/core/objectpositioning/objectpositioning.cxx index d0431764b5ba..52a09642b86a 100644 --- a/sw/qa/core/objectpositioning/objectpositioning.cxx +++ b/sw/qa/core/objectpositioning/objectpositioning.cxx @@ -13,7 +13,7 @@ #include <wrtsh.hxx> -static char const DATA_DIRECTORY[] = "/sw/qa/core/objectpositioning/data/"; +char const DATA_DIRECTORY[] = "/sw/qa/core/objectpositioning/data/"; /// Covers sw/source/core/objectpositioning/ fixes. class SwCoreObjectpositioningTest : public SwModelTestBase diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx index 3f7cfb5272dd..6f3aff9faa32 100644 --- a/sw/qa/core/text/text.cxx +++ b/sw/qa/core/text/text.cxx @@ -13,7 +13,7 @@ #include <wrtsh.hxx> -static char const DATA_DIRECTORY[] = "/sw/qa/core/text/data/"; +char const DATA_DIRECTORY[] = "/sw/qa/core/text/data/"; /// Covers sw/source/core/text/ fixes. class SwCoreTextTest : public SwModelTestBase diff --git a/sw/qa/core/txtnode/txtnode.cxx b/sw/qa/core/txtnode/txtnode.cxx index 664a7ac26c7d..6bb288327584 100644 --- a/sw/qa/core/txtnode/txtnode.cxx +++ b/sw/qa/core/txtnode/txtnode.cxx @@ -15,7 +15,7 @@ #include <frameformats.hxx> #include <wrtsh.hxx> -static char const DATA_DIRECTORY[] = "/sw/qa/core/txtnode/data/"; +char const DATA_DIRECTORY[] = "/sw/qa/core/txtnode/data/"; /// Covers sw/source/core/txtnode/ fixes. class SwCoreTxtnodeTest : public SwModelTestBase diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 6840d6dda2e9..04016b53b265 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -36,7 +36,7 @@ #include <frmatr.hxx> #include <IDocumentSettingAccess.hxx> -static char const DATA_DIRECTORY[] = "/sw/qa/extras/layout/data/"; +char const DATA_DIRECTORY[] = "/sw/qa/extras/layout/data/"; /// Test to assert layout / rendering result of Writer. class SwLayoutWriter : public SwModelTestBase diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 69560ae2bd15..346efb75897b 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -51,7 +51,7 @@ #include <vcl/ITiledRenderable.hxx> #include <tools/json_writer.hxx> -static char const DATA_DIRECTORY[] = "/sw/qa/extras/tiledrendering/data/"; +char const DATA_DIRECTORY[] = "/sw/qa/extras/tiledrendering/data/"; static std::ostream& operator<<(std::ostream& os, ViewShellId id) { diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 05e78a46c332..779a785ec226 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -645,8 +645,8 @@ static void lcl_selectCharacters(SwPaM& rPaM, sal_Int32 first, sal_Int32 end) rPaM.GetPoint()->nContent.Assign(rPaM.GetContentNode(), end); } -static const OUString ORIGINAL_REPLACE_CONTENT("toto titi tutu"); -static const OUString EXPECTED_REPLACE_CONTENT("toto toto tutu"); +const OUString ORIGINAL_REPLACE_CONTENT("toto titi tutu"); +const OUString EXPECTED_REPLACE_CONTENT("toto toto tutu"); void SwUiWriterTest::testReplaceForward() { @@ -1464,9 +1464,9 @@ void SwUiWriterTest::testTextFieldGetAnchorGetTextInFooter() { // Chinese conversion tests -static const sal_Unicode CHINESE_TRADITIONAL_CONTENT(0x9F8D); -static const sal_Unicode CHINESE_SIMPLIFIED_CONTENT(0x9F99); -static const OUStringLiteral NON_CHINESE_CONTENT("Hippopotamus"); +const sal_Unicode CHINESE_TRADITIONAL_CONTENT(0x9F8D); +const sal_Unicode CHINESE_SIMPLIFIED_CONTENT(0x9F99); +const OUStringLiteral NON_CHINESE_CONTENT("Hippopotamus"); // Tests that a blank document is still blank after conversion void SwUiWriterTest::testChineseConversionBlank() diff --git a/sw/qa/uibase/shells/shells.cxx b/sw/qa/uibase/shells/shells.cxx index fbdf35758156..446fbacb2278 100644 --- a/sw/qa/uibase/shells/shells.cxx +++ b/sw/qa/uibase/shells/shells.cxx @@ -26,7 +26,7 @@ #include <IDocumentDrawModelAccess.hxx> #include <drawdoc.hxx> -static char const DATA_DIRECTORY[] = "/sw/qa/uibase/shells/data/"; +char const DATA_DIRECTORY[] = "/sw/qa/uibase/shells/data/"; /// Covers sw/source/uibase/shells/ fixes. class SwUibaseShellsTest : public SwModelTestBase diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx index 8158a485a56b..1e8ecaa83a3b 100644 --- a/sw/source/core/bastyp/bparr.cxx +++ b/sw/source/core/bastyp/bparr.cxx @@ -24,7 +24,7 @@ /** Resize block management by this constant. As a result there are approx. 20 * MAXENTRY == 20000 entries available */ -static const sal_uInt16 nBlockGrowSize = 20; +const sal_uInt16 nBlockGrowSize = 20; #if OSL_DEBUG_LEVEL > 2 #define CHECKIDX( p, n, i, c ) CheckIdx( p, n, i, c ); diff --git a/sw/source/core/crsr/paminit.cxx b/sw/source/core/crsr/paminit.cxx index bbc975acf565..367be6e02e37 100644 --- a/sw/source/core/crsr/paminit.cxx +++ b/sw/source/core/crsr/paminit.cxx @@ -21,7 +21,7 @@ #include <pamtyp.hxx> #include <cshtyp.hxx> -static const SwMoveFnCollection aFwrd = { +const SwMoveFnCollection aFwrd = { /* fnNd */ &GoNext, /* fnNds */ &GoNextNds, /* fnDoc */ &GoEndDoc, @@ -32,7 +32,7 @@ static const SwMoveFnCollection aFwrd = { /* fnSection */ &SwNodes::GoStartOfSection }; -static const SwMoveFnCollection aBwrd = { +const SwMoveFnCollection aBwrd = { /* fnNd */ &GoPrevious, /* fnNds */ &GoPreviousNds, /* fnDoc */ &GoStartDoc, diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 017885da5e25..1e126da0b2b4 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star::i18n; -static const sal_uInt16 coSrchRplcThreshold = 60000; +const sal_uInt16 coSrchRplcThreshold = 60000; namespace { diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx index 1fe119f2e877..614678fa7dca 100644 --- a/sw/source/core/doc/CntntIdxStore.cxx +++ b/sw/source/core/doc/CntntIdxStore.cxx @@ -45,11 +45,11 @@ namespace // #i59534: If a paragraph will be split we have to restore some redline positions // This help function checks a position compared with a node and a content index - static const int BEFORE_NODE = 0; // Position before the given node index - static const int BEFORE_SAME_NODE = 1; // Same node index but content index before given content index - static const int SAME_POSITION = 2; // Same node index and samecontent index - static const int BEHIND_SAME_NODE = 3; // Same node index but content index behind given content index - static const int BEHIND_NODE = 4; // Position behind the given node index + const int BEFORE_NODE = 0; // Position before the given node index + const int BEFORE_SAME_NODE = 1; // Same node index but content index before given content index + const int SAME_POSITION = 2; // Same node index and samecontent index + const int BEHIND_SAME_NODE = 3; // Same node index but content index behind given content index + const int BEHIND_NODE = 4; // Position behind the given node index int lcl_RelativePosition( const SwPosition& rPos, sal_uLong nNode, sal_Int32 nContent ) { diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index b3ccc8913ebb..ff92288c9faa 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -82,20 +82,20 @@ bool IsConditionalByPoolId(sal_uInt16 nId) namespace { - static const sal_uInt16 PT_3 = 3 * 20; // 3 pt - static const sal_uInt16 PT_6 = 6 * 20; // 6 pt - static const sal_uInt16 PT_7 = 7 * 20; // 7 pt - static const sal_uInt16 PT_10 = 10 * 20; // 10 pt - static const sal_uInt16 PT_12 = 12 * 20; // 12 pt - static const sal_uInt16 PT_14 = 14 * 20; // 14 pt - static const sal_uInt16 PT_16 = 16 * 20; // 16 pt - static const sal_uInt16 PT_18 = 18 * 20; // 18 pt - static const sal_uInt16 PT_24 = 24 * 20; // 24 pt - static const sal_uInt16 PT_28 = 28 * 20; // 28 pt + const sal_uInt16 PT_3 = 3 * 20; // 3 pt + const sal_uInt16 PT_6 = 6 * 20; // 6 pt + const sal_uInt16 PT_7 = 7 * 20; // 7 pt + const sal_uInt16 PT_10 = 10 * 20; // 10 pt + const sal_uInt16 PT_12 = 12 * 20; // 12 pt + const sal_uInt16 PT_14 = 14 * 20; // 14 pt + const sal_uInt16 PT_16 = 16 * 20; // 16 pt + const sal_uInt16 PT_18 = 18 * 20; // 18 pt + const sal_uInt16 PT_24 = 24 * 20; // 24 pt + const sal_uInt16 PT_28 = 28 * 20; // 28 pt #define HTML_PARSPACE GetMetricVal( CM_05 ) - static const sal_uInt16 aHeadlineSizes[ 2 * MAXLEVEL ] = { + const sal_uInt16 aHeadlineSizes[ 2 * MAXLEVEL ] = { // we do everything percentual now: 130, 115, 101, 95, 85, 85, 80, 80, 75, 75, // normal diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index ed67d98f01a0..716d0b771f63 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -97,20 +97,20 @@ namespace { -static const OUString MetaFilename("tscp/bails.rdf"); -static const OUString MetaNS("urn:bails"); -static const OUString ParagraphSignatureRDFNamespace = "urn:bails:loext:paragraph:signature:"; -static const OUString ParagraphSignatureIdRDFName = "urn:bails:loext:paragraph:signature:id"; -static const OUString ParagraphSignatureDigestRDFName = ":digest"; -static const OUString ParagraphSignatureDateRDFName = ":date"; -static const OUString ParagraphSignatureUsageRDFName = ":usage"; -static const OUString ParagraphSignatureLastIdRDFName = "urn:bails:loext:paragraph:signature:lastid"; -static const OUString ParagraphClassificationNameRDFName = "urn:bails:loext:paragraph:classification:name"; -static const OUString ParagraphClassificationValueRDFName = "urn:bails:loext:paragraph:classification:value"; -static const OUString ParagraphClassificationAbbrRDFName = "urn:bails:loext:paragraph:classification:abbreviation"; -static const OUString ParagraphClassificationFieldNamesRDFName = "urn:bails:loext:paragraph:classification:fields"; -static const OUString MetadataFieldServiceName = "com.sun.star.text.textfield.MetadataField"; -static const OUString DocInfoServiceName = "com.sun.star.text.TextField.DocInfo.Custom"; +const OUString MetaFilename("tscp/bails.rdf"); +const OUString MetaNS("urn:bails"); +const OUString ParagraphSignatureRDFNamespace = "urn:bails:loext:paragraph:signature:"; +const OUString ParagraphSignatureIdRDFName = "urn:bails:loext:paragraph:signature:id"; +const OUString ParagraphSignatureDigestRDFName = ":digest"; +const OUString ParagraphSignatureDateRDFName = ":date"; +const OUString ParagraphSignatureUsageRDFName = ":usage"; +const OUString ParagraphSignatureLastIdRDFName = "urn:bails:loext:paragraph:signature:lastid"; +const OUString ParagraphClassificationNameRDFName = "urn:bails:loext:paragraph:classification:name"; +const OUString ParagraphClassificationValueRDFName = "urn:bails:loext:paragraph:classification:value"; +const OUString ParagraphClassificationAbbrRDFName = "urn:bails:loext:paragraph:classification:abbreviation"; +const OUString ParagraphClassificationFieldNamesRDFName = "urn:bails:loext:paragraph:classification:fields"; +const OUString MetadataFieldServiceName = "com.sun.star.text.textfield.MetadataField"; +const OUString DocInfoServiceName = "com.sun.star.text.TextField.DocInfo.Custom"; /// Find all page styles which are currently used in the document. std::vector<OUString> lcl_getUsedPageStyles(SwViewShell const * pShell) diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 9a343e793a51..335bb0024aa2 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -238,7 +238,7 @@ public: } // Default zoom factor -const static double aEdgeScale = 0.5; +const double aEdgeScale = 0.5; //To optimize the expensive RetouchColor determination Color aGlobalRetoucheColor; diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx index b246006d885a..c3fab91e0614 100644 --- a/sw/source/core/text/xmldump.cxx +++ b/sw/source/core/text/xmldump.cxx @@ -440,7 +440,7 @@ void SwFrame::dumpInfosAsXml( xmlTextWriterPtr writer ) const // Hack: somehow conversion from "..." to va_list does // bomb on two string literals in the format. -static const char* const TMP_FORMAT = "%" SAL_PRIuUINTPTR; +const char* const TMP_FORMAT = "%" SAL_PRIuUINTPTR; void SwFrame::dumpAsXmlAttributes( xmlTextWriterPtr writer ) const { diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index decea02c4864..5d7188a0f4a1 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -65,7 +65,7 @@ SwFntCache *pFntCache = nullptr; // last Font set by ChgFntCache SwFntObj *pLastFont = nullptr; -static constexpr Color gWaveCol(COL_GRAY); +constexpr Color gWaveCol(COL_GRAY); long SwFntObj::nPixWidth; MapMode* SwFntObj::pPixMap = nullptr; diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx index 7ca58df40551..262fda8f54d7 100644 --- a/sw/source/core/unocore/unoevent.cxx +++ b/sw/source/core/unocore/unoevent.cxx @@ -212,7 +212,7 @@ void SwFrameStyleEventDescriptor::setMacroItem(const SvxMacroItem& rItem) m_rStyle.SetItem(RES_FRMMACRO, rItem); } -static const SvxMacroItem aEmptyMacroItem(RES_FRMMACRO); +const SvxMacroItem aEmptyMacroItem(RES_FRMMACRO); const SvxMacroItem& SwFrameStyleEventDescriptor::getMacroItem() { diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index d6c9e5a926fd..87c8e7b1a876 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -93,7 +93,7 @@ using namespace nsSwDocInfoSubType; #define COM_TEXT_FLDMASTER_CC "com.sun.star.text.fieldmaster." // note: this thing is indexed as an array, so do not insert/remove entries! -static const sal_uInt16 aDocInfoSubTypeFromService[] = +const sal_uInt16 aDocInfoSubTypeFromService[] = { DI_CHANGE | DI_SUB_AUTHOR, //PROPERTY_MAP_FLDTYP_DOCINFO_CHANGE_AUTHOR DI_CHANGE | DI_SUB_DATE, //PROPERTY_MAP_FLDTYP_DOCINFO_CHANGE_DATE_TIME @@ -124,7 +124,7 @@ struct ServiceIdResId } -static const ServiceIdResId aServiceToRes[] = +const ServiceIdResId aServiceToRes[] = { {SwFieldIds::DateTime, SwServiceType::FieldTypeDateTime }, {SwFieldIds::User, SwServiceType::FieldTypeUser }, diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index f9efe7742012..2cf0d0b507f9 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -189,7 +189,7 @@ SwXFootnote::getImplementationName() return "SwXFootnote"; } -static char const*const g_ServicesFootnote[] = +char const*const g_ServicesFootnote[] = { "com.sun.star.text.TextContent", "com.sun.star.text.Footnote", @@ -197,9 +197,9 @@ static char const*const g_ServicesFootnote[] = "com.sun.star.text.Endnote", // NB: only supported for endnotes! }; -static const size_t g_nServicesEndnote( SAL_N_ELEMENTS(g_ServicesFootnote) ); +const size_t g_nServicesEndnote( SAL_N_ELEMENTS(g_ServicesFootnote) ); -static const size_t g_nServicesFootnote( g_nServicesEndnote - 1 ); // NB: omit! +const size_t g_nServicesFootnote( g_nServicesEndnote - 1 ); // NB: omit! sal_Bool SAL_CALL SwXFootnote::supportsService(const OUString& rServiceName) { diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 82e42e167ce9..5121d1d9c104 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -119,8 +119,8 @@ lcl_ReAssignTOXType(SwDoc* pDoc, SwTOXBase& rTOXBase, const OUString& rNewName) rTOXBase.RegisterToTOXType( *const_cast<SwTOXType*>(pNewType) ); } -static const char cUserDefined[] = "User-Defined"; -static const char cUserSuffix[] = " (user)"; +const char cUserDefined[] = "User-Defined"; +const char cUserSuffix[] = " (user)"; #define USER_LEN 12 #define USER_AND_SUFFIXLEN 19 @@ -2650,7 +2650,7 @@ struct TokenType_ { } -static const struct TokenType_ g_TokenTypes[] = +const struct TokenType_ g_TokenTypes[] = { { "TokenEntryNumber", TOKEN_ENTRY_NO }, { "TokenEntryText", TOKEN_ENTRY_TEXT }, diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 81f1a6a2e33a..b392c42f1b88 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1003,7 +1003,7 @@ void SwXLineNumberingProperties::removeVetoableChangeListener(const OUString& /* OSL_FAIL("not implemented"); } -static const char aInvalidStyle[] = "__XXX___invalid"; +const char aInvalidStyle[] = "__XXX___invalid"; class SwXNumberingRules::Impl : public SvtListener diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index fedbf6ece9ac..f3feb9973d8a 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -154,7 +154,7 @@ class SwStyleProperties_Impl; , m_fTranslateIndex(fTranslateIndex) { } }; - static const std::vector<StyleFamilyEntry>* our_pStyleFamilyEntries; + const std::vector<StyleFamilyEntry>* our_pStyleFamilyEntries; // these should really be constexprs, but MSVC still is apparently too stupid for them #define nPoolChrNormalRange (RES_POOLCHR_NORMAL_END - RES_POOLCHR_NORMAL_BEGIN) #define nPoolChrHtmlRange (RES_POOLCHR_HTML_END - RES_POOLCHR_HTML_BEGIN) @@ -185,7 +185,7 @@ class SwStyleProperties_Impl; , m_nCollectionBits(nCollectionBits) { } }; - static const std::vector<ParagraphStyleCategoryEntry>* our_pParagraphStyleCategoryEntries; + const std::vector<ParagraphStyleCategoryEntry>* our_pParagraphStyleCategoryEntries; } static const std::vector<StyleFamilyEntry>* lcl_GetStyleFamilyEntries(); diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 5445115a6d0d..4b91ff051aba 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -3496,7 +3496,7 @@ static Writer& OutCSS1_SvxFrameDirection( Writer& rWrt, const SfxPoolItem& rHt ) * They are local structures, only needed within the HTML-DLL. */ -static SwAttrFnTab const aCSS1AttrFnTab = { +SwAttrFnTab const aCSS1AttrFnTab = { /* RES_CHRATR_CASEMAP */ OutCSS1_SvxCaseMap, /* RES_CHRATR_CHARSETCOLOR */ nullptr, /* RES_CHRATR_COLOR */ OutCSS1_SvxColor, diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 8071e419c80b..bd88e3ef843e 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; -static HTMLOutEvent const aBodyEventTable[] = +HTMLOutEvent const aBodyEventTable[] = { { OOO_STRING_SVTOOLS_HTML_O_SDonload, OOO_STRING_SVTOOLS_HTML_O_onload, SvMacroItemId::OpenDoc }, { OOO_STRING_SVTOOLS_HTML_O_SDonunload, OOO_STRING_SVTOOLS_HTML_O_onunload, SvMacroItemId::PrepareCloseDoc }, diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index ce608edc98f2..a709df33ec72 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -70,7 +70,7 @@ using namespace ::com::sun::star; static void lcl_swcss1_setEncoding( SwFormat& rFormat, rtl_TextEncoding eEnc ); // Implementation of SwCSS1Parsers (actually swcss1.cxx) -static const sal_uInt16 aItemIds[] = +const sal_uInt16 aItemIds[] = { RES_BREAK, RES_PAGEDESC, diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index c1ed88829383..a3c2f4989c6a 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -54,7 +54,7 @@ using namespace css; -static HTMLOptionEnum<SdrTextAniKind> const aHTMLMarqBehaviorTable[] = +HTMLOptionEnum<SdrTextAniKind> const aHTMLMarqBehaviorTable[] = { { OOO_STRING_SVTOOLS_HTML_BEHAV_scroll, SdrTextAniKind::Scroll }, { OOO_STRING_SVTOOLS_HTML_BEHAV_alternate, SdrTextAniKind::Alternate }, @@ -62,7 +62,7 @@ static HTMLOptionEnum<SdrTextAniKind> const aHTMLMarqBehaviorTable[] = { nullptr, SdrTextAniKind(0) } }; -static HTMLOptionEnum<SdrTextAniDirection> const aHTMLMarqDirectionTable[] = +HTMLOptionEnum<SdrTextAniDirection> const aHTMLMarqDirectionTable[] = { { OOO_STRING_SVTOOLS_HTML_AL_left, SdrTextAniDirection::Left }, { OOO_STRING_SVTOOLS_HTML_AL_right, SdrTextAniDirection::Right }, diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index 068968178d23..4b0133b726ea 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -48,7 +48,7 @@ struct HTMLNumFormatTableEntry } -static HTMLOptionEnum<SwFieldIds> const aHTMLFieldTypeTable[] = +HTMLOptionEnum<SwFieldIds> const aHTMLFieldTypeTable[] = { { OOO_STRING_SW_HTML_FT_author, SwFieldIds::Author }, { OOO_STRING_SW_HTML_FT_sender, SwFieldIds::ExtUser }, @@ -62,7 +62,7 @@ static HTMLOptionEnum<SwFieldIds> const aHTMLFieldTypeTable[] = { nullptr, SwFieldIds(0) } }; -static HTMLNumFormatTableEntry const aHTMLDateFieldFormatTable[] = +HTMLNumFormatTableEntry const aHTMLDateFieldFormatTable[] = { { "SSYS", NF_DATE_SYSTEM_SHORT }, { "LSYS", NF_DATE_SYSTEM_LONG }, @@ -84,7 +84,7 @@ static HTMLNumFormatTableEntry const aHTMLDateFieldFormatTable[] = { nullptr, NF_NUMERIC_START } }; -static HTMLNumFormatTableEntry const aHTMLTimeFieldFormatTable[] = +HTMLNumFormatTableEntry const aHTMLTimeFieldFormatTable[] = { { "SYS", NF_TIME_HHMMSS }, { "SSMM24", NF_TIME_HHMM }, @@ -92,7 +92,7 @@ static HTMLNumFormatTableEntry const aHTMLTimeFieldFormatTable[] = { nullptr, NF_NUMERIC_START } }; -static HTMLOptionEnum<SvxNumType> const aHTMLPageNumFieldFormatTable[] = +HTMLOptionEnum<SvxNumType> const aHTMLPageNumFieldFormatTable[] = { { OOO_STRING_SW_HTML_FF_uletter, SVX_NUM_CHARS_UPPER_LETTER }, { OOO_STRING_SW_HTML_FF_lletter, SVX_NUM_CHARS_LOWER_LETTER }, @@ -107,7 +107,7 @@ static HTMLOptionEnum<SvxNumType> const aHTMLPageNumFieldFormatTable[] = { nullptr, SvxNumType(0) } }; -static HTMLOptionEnum<SwExtUserSubType> const aHTMLExtUsrFieldSubTable[] = +HTMLOptionEnum<SwExtUserSubType> const aHTMLExtUsrFieldSubTable[] = { { OOO_STRING_SW_HTML_FS_company, EU_COMPANY }, { OOO_STRING_SW_HTML_FS_firstname, EU_FIRSTNAME }, @@ -127,14 +127,14 @@ static HTMLOptionEnum<SwExtUserSubType> const aHTMLExtUsrFieldSubTable[] = { nullptr, SwExtUserSubType(0) } }; -static HTMLOptionEnum<SwAuthorFormat> const aHTMLAuthorFieldFormatTable[] = +HTMLOptionEnum<SwAuthorFormat> const aHTMLAuthorFieldFormatTable[] = { { OOO_STRING_SW_HTML_FF_name, AF_NAME }, { OOO_STRING_SW_HTML_FF_shortcut, AF_SHORTCUT }, { nullptr, SwAuthorFormat(0) } }; -static HTMLOptionEnum<SwPageNumSubType> const aHTMLPageNumFieldSubTable[] = +HTMLOptionEnum<SwPageNumSubType> const aHTMLPageNumFieldSubTable[] = { { OOO_STRING_SW_HTML_FS_random, PG_RANDOM }, { OOO_STRING_SW_HTML_FS_next, PG_NEXT }, @@ -150,7 +150,7 @@ static HTMLOptionEnum<SwPageNumSubType> const aHTMLPageNumFieldSubTable[] = const SwDocInfoSubType DI_INFO3 = DI_SUBTYPE_END + 3; const SwDocInfoSubType DI_INFO4 = DI_SUBTYPE_END + 4; -static HTMLOptionEnum<sal_uInt16> const aHTMLDocInfoFieldSubTable[] = +HTMLOptionEnum<sal_uInt16> const aHTMLDocInfoFieldSubTable[] = { { OOO_STRING_SW_HTML_FS_title, DI_TITLE }, { OOO_STRING_SW_HTML_FS_theme, DI_SUBJECT }, @@ -166,7 +166,7 @@ static HTMLOptionEnum<sal_uInt16> const aHTMLDocInfoFieldSubTable[] = { nullptr, 0 } }; -static HTMLOptionEnum<sal_uInt16> const aHTMLDocInfoFieldFormatTable[] = +HTMLOptionEnum<sal_uInt16> const aHTMLDocInfoFieldFormatTable[] = { { OOO_STRING_SW_HTML_FF_author, DI_SUB_AUTHOR }, { OOO_STRING_SW_HTML_FF_time, DI_SUB_TIME }, @@ -174,7 +174,7 @@ static HTMLOptionEnum<sal_uInt16> const aHTMLDocInfoFieldFormatTable[] = { nullptr, 0 } }; -static HTMLOptionEnum<SwDocStatSubType> const aHTMLDocStatFieldSubTable[] = +HTMLOptionEnum<SwDocStatSubType> const aHTMLDocStatFieldSubTable[] = { { OOO_STRING_SW_HTML_FS_page, DS_PAGE }, { OOO_STRING_SW_HTML_FS_para, DS_PARA }, @@ -186,7 +186,7 @@ static HTMLOptionEnum<SwDocStatSubType> const aHTMLDocStatFieldSubTable[] = { nullptr, SwDocStatSubType(0) } }; -static HTMLOptionEnum<SwFileNameFormat> const aHTMLFileNameFieldFormatTable[] = +HTMLOptionEnum<SwFileNameFormat> const aHTMLFileNameFieldFormatTable[] = { { OOO_STRING_SW_HTML_FF_name, FF_NAME }, { OOO_STRING_SW_HTML_FF_pathname, FF_PATHNAME }, diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 2fb921c5ef2c..b41568377580 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -141,7 +141,7 @@ static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt, const SwFrameFormat& rF static Writer& OutHTML_FrameFormatAsMarquee( Writer& rWrt, const SwFrameFormat& rFrameFormat, const SdrObject& rSdrObj ); -static HTMLOutEvent const aImageEventTable[] = +HTMLOutEvent const aImageEventTable[] = { { OOO_STRING_SVTOOLS_HTML_O_SDonload, OOO_STRING_SVTOOLS_HTML_O_onload, SvMacroItemId::OnImageLoadDone }, { OOO_STRING_SVTOOLS_HTML_O_SDonabort, OOO_STRING_SVTOOLS_HTML_O_onabort, SvMacroItemId::OnImageLoadCancel }, @@ -149,7 +149,7 @@ static HTMLOutEvent const aImageEventTable[] = { nullptr, nullptr, SvMacroItemId::NONE } }; -static HTMLOutEvent const aIMapEventTable[] = +HTMLOutEvent const aIMapEventTable[] = { { OOO_STRING_SVTOOLS_HTML_O_SDonmouseover, OOO_STRING_SVTOOLS_HTML_O_onmouseover, SvMacroItemId::OnMouseOver }, { OOO_STRING_SVTOOLS_HTML_O_SDonmouseout, OOO_STRING_SVTOOLS_HTML_O_onmouseout, SvMacroItemId::OnMouseOut }, diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index dd0c0a81f83f..ee1b8f90881d 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -85,14 +85,14 @@ using namespace ::com::sun::star::form; const sal_uInt16 TABINDEX_MIN = 0; const sal_uInt16 TABINDEX_MAX = 32767; -static HTMLOptionEnum<FormSubmitMethod> const aHTMLFormMethodTable[] = +HTMLOptionEnum<FormSubmitMethod> const aHTMLFormMethodTable[] = { { OOO_STRING_SVTOOLS_HTML_METHOD_get, FormSubmitMethod_GET }, { OOO_STRING_SVTOOLS_HTML_METHOD_post, FormSubmitMethod_POST }, { nullptr, FormSubmitMethod(0) } }; -static HTMLOptionEnum<FormSubmitEncoding> const aHTMLFormEncTypeTable[] = +HTMLOptionEnum<FormSubmitEncoding> const aHTMLFormEncTypeTable[] = { { OOO_STRING_SVTOOLS_HTML_ET_url, FormSubmitEncoding_URL }, { OOO_STRING_SVTOOLS_HTML_ET_multipart, FormSubmitEncoding_MULTIPART }, @@ -106,7 +106,7 @@ enum HTMLWordWrapMode { HTML_WM_OFF, HTML_WM_HARD, HTML_WM_SOFT }; } -static HTMLOptionEnum<HTMLWordWrapMode> const aHTMLTextAreaWrapTable[] = +HTMLOptionEnum<HTMLWordWrapMode> const aHTMLTextAreaWrapTable[] = { { OOO_STRING_SVTOOLS_HTML_WW_off, HTML_WM_OFF }, { OOO_STRING_SVTOOLS_HTML_WW_hard, HTML_WM_HARD }, diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx index 95ce01d8b2db..196057ca765a 100644 --- a/sw/source/filter/html/htmlnumreader.cxx +++ b/sw/source/filter/html/htmlnumreader.cxx @@ -41,7 +41,7 @@ using namespace css; // <UL TYPE=...> -static HTMLOptionEnum<sal_Unicode> const aHTMLULTypeTable[] = +HTMLOptionEnum<sal_Unicode> const aHTMLULTypeTable[] = { { OOO_STRING_SVTOOLS_HTML_ULTYPE_disc, HTML_BULLETCHAR_DISC }, { OOO_STRING_SVTOOLS_HTML_ULTYPE_circle, HTML_BULLETCHAR_CIRCLE }, diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 219ca13aee71..40c00df425da 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -72,7 +72,7 @@ using ::editeng::SvxBorderLine; using namespace ::com::sun::star; -static HTMLOptionEnum<sal_Int16> const aHTMLTableVAlignTable[] = +HTMLOptionEnum<sal_Int16> const aHTMLTableVAlignTable[] = { { OOO_STRING_SVTOOLS_HTML_VA_top, text::VertOrientation::NONE }, { OOO_STRING_SVTOOLS_HTML_VA_middle, text::VertOrientation::CENTER }, diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index f64acdb4daab..c01a4e0b28ae 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -69,7 +69,7 @@ typedef void (*FnParseCSS1Prop)( const CSS1Expression *pExpr, SvxCSS1PropertyInfo& rPropInfo, const SvxCSS1Parser& rParser ); -static CSS1PropertyEnum const aFontSizeTable[] = +CSS1PropertyEnum const aFontSizeTable[] = { { "xx-small", 0 }, { "x-small", 1 }, @@ -81,7 +81,7 @@ static CSS1PropertyEnum const aFontSizeTable[] = { nullptr, 0 } }; -static CSS1PropertyEnum const aFontWeightTable[] = +CSS1PropertyEnum const aFontWeightTable[] = { { "extra-light", WEIGHT_NORMAL }, // WEIGHT_ULTRALIGHT (OBS) { "light", WEIGHT_NORMAL }, // WEIGHT_LIGHT (OBSOLETE) @@ -96,7 +96,7 @@ static CSS1PropertyEnum const aFontWeightTable[] = { nullptr, 0 } }; -static CSS1PropertyEnum const aFontStyleTable[] = +CSS1PropertyEnum const aFontStyleTable[] = { { "normal", ITALIC_NONE }, { "italic", ITALIC_NORMAL }, @@ -104,14 +104,14 @@ static CSS1PropertyEnum const aFontStyleTable[] = { nullptr, 0 } }; -static CSS1PropertyEnum const aFontVariantTable[] = +CSS1PropertyEnum const aFontVariantTable[] = { { "normal", sal_uInt16(SvxCaseMap::NotMapped) }, { "small-caps", sal_uInt16(SvxCaseMap::SmallCaps) }, { nullptr, 0 } }; -static CSS1PropertyEnum const aTextTransformTable[] = +CSS1PropertyEnum const aTextTransformTable[] = { { "uppercase", sal_uInt16(SvxCaseMap::Uppercase) }, { "lowercase", sal_uInt16(SvxCaseMap::Lowercase) }, @@ -119,7 +119,7 @@ static CSS1PropertyEnum const aTextTransformTable[] = { nullptr, 0 } }; -static CSS1PropertyEnum const aDirectionTable[] = +CSS1PropertyEnum const aDirectionTable[] = { { "ltr", sal_uInt16(SvxFrameDirection::Horizontal_LR_TB) }, { "rtl", sal_uInt16(SvxFrameDirection::Horizontal_RL_TB) }, @@ -127,7 +127,7 @@ static CSS1PropertyEnum const aDirectionTable[] = { nullptr, 0 } }; -static CSS1PropertyEnum const aBGRepeatTable[] = +CSS1PropertyEnum const aBGRepeatTable[] = { { "repeat", GPOS_TILED }, { "repeat-x", GPOS_TILED }, @@ -136,7 +136,7 @@ static CSS1PropertyEnum const aBGRepeatTable[] = { nullptr, 0 } }; -static CSS1PropertyEnum const aBGHoriPosTable[] = +CSS1PropertyEnum const aBGHoriPosTable[] = { { "left", GPOS_LT }, { "center", GPOS_MT }, @@ -144,7 +144,7 @@ static CSS1PropertyEnum const aBGHoriPosTable[] = { nullptr, 0 } }; -static CSS1PropertyEnum const aBGVertPosTable[] = +CSS1PropertyEnum const aBGVertPosTable[] = { { "top", GPOS_LT }, { "middle", GPOS_LM }, @@ -152,7 +152,7 @@ static CSS1PropertyEnum const aBGVertPosTable[] = { nullptr, 0 } }; -static CSS1PropertyEnum const aTextAlignTable[] = +CSS1PropertyEnum const aTextAlignTable[] = { { "left", sal_uInt16(SvxAdjust::Left) }, { "center", sal_uInt16(SvxAdjust::Center) }, @@ -161,7 +161,7 @@ static CSS1PropertyEnum const aTextAlignTable[] = { nullptr, 0 } }; -static CSS1PropertyEnum const aBorderWidthTable[] = +CSS1PropertyEnum const aBorderWidthTable[] = { { "thin", 0 }, // DEF_LINE_WIDTH_0 / DEF_DOUBLE_LINE0 { "medium", 1 }, // DEF_LINE_WIDTH_1 / DEF_DOUBLE_LINE1 @@ -175,7 +175,7 @@ enum CSS1BorderStyle { CSS1_BS_NONE, CSS1_BS_SINGLE, CSS1_BS_DOUBLE, CSS1_BS_DOT } -static CSS1PropertyEnum const aBorderStyleTable[] = +CSS1PropertyEnum const aBorderStyleTable[] = { { "none", CSS1_BS_NONE }, { "dotted", CSS1_BS_DOTTED }, @@ -189,7 +189,7 @@ static CSS1PropertyEnum const aBorderStyleTable[] = { nullptr, 0 } }; -static CSS1PropertyEnum const aFloatTable[] = +CSS1PropertyEnum const aFloatTable[] = { { "left", sal_uInt16(SvxAdjust::Left) }, { "right", sal_uInt16(SvxAdjust::Right) }, @@ -197,7 +197,7 @@ static CSS1PropertyEnum const aFloatTable[] = { nullptr, 0 } }; -static CSS1PropertyEnum const aPositionTable[] = +CSS1PropertyEnum const aPositionTable[] = { { "absolute", SVX_CSS1_POS_ABSOLUTE }, { "relative", SVX_CSS1_POS_RELATIVE }, @@ -206,7 +206,7 @@ static CSS1PropertyEnum const aPositionTable[] = }; // Feature: PrintExt -static CSS1PropertyEnum const aSizeTable[] = +CSS1PropertyEnum const aSizeTable[] = { { "auto", SVX_CSS1_STYPE_AUTO }, { "landscape", SVX_CSS1_STYPE_LANDSCAPE }, @@ -214,7 +214,7 @@ static CSS1PropertyEnum const aSizeTable[] = { nullptr, 0 } }; -static CSS1PropertyEnum const aPageBreakTable[] = +CSS1PropertyEnum const aPageBreakTable[] = { { "auto", SVX_CSS1_PBREAK_AUTO }, { "always", SVX_CSS1_PBREAK_ALWAYS }, @@ -224,7 +224,7 @@ static CSS1PropertyEnum const aPageBreakTable[] = { nullptr, 0 } }; -static CSS1PropertyEnum const aNumberStyleTable[] = +CSS1PropertyEnum const aNumberStyleTable[] = { { "decimal", SVX_NUM_ARABIC }, { "lower-alpha", SVX_NUM_CHARS_LOWER_LETTER }, @@ -236,7 +236,7 @@ static CSS1PropertyEnum const aNumberStyleTable[] = { nullptr, 0 } }; -static CSS1PropertyEnum const aBulletStyleTable[] = +CSS1PropertyEnum const aBulletStyleTable[] = { { "circle", HTML_BULLETCHAR_CIRCLE }, { "disc", HTML_BULLETCHAR_DISC }, @@ -245,7 +245,7 @@ static CSS1PropertyEnum const aBulletStyleTable[] = }; -static sal_uInt16 const aBorderWidths[] = +sal_uInt16 const aBorderWidths[] = { DEF_LINE_WIDTH_0, DEF_LINE_WIDTH_5, @@ -3089,7 +3089,7 @@ struct CSS1PropEntry { sCSS1_P_##p, ParseCSS1_##p } // the table with assignments -static CSS1PropEntry const aCSS1PropFnTab[] = +CSS1PropEntry const aCSS1PropFnTab[] = { CSS1_PROP_ENTRY(background), CSS1_PROP_ENTRY(background_color), diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index b5ef42e92bae..f8b13ae78b96 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -151,7 +151,7 @@ HTMLOptionEnum<SvxAdjust> const aHTMLPAlignTable[] = }; // <SPACER TYPE=...> -static HTMLOptionEnum<sal_uInt16> const aHTMLSpacerTypeTable[] = +HTMLOptionEnum<sal_uInt16> const aHTMLSpacerTypeTable[] = { { OOO_STRING_SVTOOLS_HTML_SPTYPE_block, HTML_SPTYPE_BLOCK }, { OOO_STRING_SVTOOLS_HTML_SPTYPE_horizontal, HTML_SPTYPE_HORI }, diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 3bd7ae8fbf43..920fd650895e 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -154,23 +154,23 @@ using namespace sw::util; using namespace ::com::sun::star; using namespace ::com::sun::star::drawing; -static const sal_Int32 Tag_StartParagraph_1 = 1; -static const sal_Int32 Tag_StartParagraph_2 = 2; -static const sal_Int32 Tag_WriteSdtBlock = 3; -static const sal_Int32 Tag_StartParagraphProperties = 4; -static const sal_Int32 Tag_InitCollectedParagraphProperties = 5; -static const sal_Int32 Tag_StartRun_1 = 6; -static const sal_Int32 Tag_StartRun_2 = 7; -static const sal_Int32 Tag_StartRun_3 = 8; -static const sal_Int32 Tag_EndRun_1 = 9; -static const sal_Int32 Tag_EndRun_2 = 10; -static const sal_Int32 Tag_StartRunProperties = 11; -static const sal_Int32 Tag_InitCollectedRunProperties = 12; +const sal_Int32 Tag_StartParagraph_1 = 1; +const sal_Int32 Tag_StartParagraph_2 = 2; +const sal_Int32 Tag_WriteSdtBlock = 3; +const sal_Int32 Tag_StartParagraphProperties = 4; +const sal_Int32 Tag_InitCollectedParagraphProperties = 5; +const sal_Int32 Tag_StartRun_1 = 6; +const sal_Int32 Tag_StartRun_2 = 7; +const sal_Int32 Tag_StartRun_3 = 8; +const sal_Int32 Tag_EndRun_1 = 9; +const sal_Int32 Tag_EndRun_2 = 10; +const sal_Int32 Tag_StartRunProperties = 11; +const sal_Int32 Tag_InitCollectedRunProperties = 12; //static const sal_Int32 Tag_Redline_1 = 13; -static const sal_Int32 Tag_Redline_2 = 14; -static const sal_Int32 Tag_TableDefinition = 15; -static const sal_Int32 Tag_OutputFlyFrame = 16; -static const sal_Int32 Tag_StartSection = 17; +const sal_Int32 Tag_Redline_2 = 14; +const sal_Int32 Tag_TableDefinition = 15; +const sal_Int32 Tag_OutputFlyFrame = 16; +const sal_Int32 Tag_StartSection = 17; namespace { diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index 7e448e1c30d6..8b040fc83693 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -991,7 +991,7 @@ struct WW8_WKB #endif // Maximum number of columns according the WW8 specification -static const sal_uInt8 MAX_NO_OF_SEP_COLUMNS = 44; +const sal_uInt8 MAX_NO_OF_SEP_COLUMNS = 44; struct SEPr { diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index 47e89d497abd..481b9760ffed 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -231,9 +231,9 @@ RedlineInfo::~RedlineInfo() delete pNextRedline; } -static const char g_sShowChanges[] = "ShowChanges"; -static const char g_sRecordChanges[] = "RecordChanges"; -static const char g_sRedlineProtectionKey[] = "RedlineProtectionKey"; +const char g_sShowChanges[] = "ShowChanges"; +const char g_sRecordChanges[] = "RecordChanges"; +const char g_sRedlineProtectionKey[] = "RedlineProtectionKey"; XMLRedlineImportHelper::XMLRedlineImportHelper( SvXMLImport & rImport, diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx index 8712409847d3..4f16010ee1a4 100644 --- a/sw/source/filter/xml/xmlbrsh.cxx +++ b/sw/source/filter/xml/xmlbrsh.cxx @@ -53,7 +53,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 }, diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 0ea3690eddac..5495d67e210c 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -107,7 +107,7 @@ enum SwXMLDocTokens } -static const SvXMLTokenMapEntry aDocTokenMap[] = +const SvXMLTokenMapEntry aDocTokenMap[] = { { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 476865ec5c30..78d1e9b14937 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -56,7 +56,7 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; using uno::Any; -static const sal_uInt16 nUnknownWhich = RES_UNKNOWNATR_CONTAINER; +const sal_uInt16 nUnknownWhich = RES_UNKNOWNATR_CONTAINER; SvXMLImportItemMapper::SvXMLImportItemMapper( SvXMLItemMapEntriesRef const & rMapEntries ) : diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx index 423bb25805a1..50c8f8b1c9c7 100644 --- a/sw/source/filter/xml/xmlmeta.cxx +++ b/sw/source/filter/xml/xmlmeta.cxx @@ -88,7 +88,7 @@ struct statistic { } -static const struct statistic s_stats [] = { +const struct statistic s_stats [] = { { XML_TOK_META_STAT_TABLE, "TableCount", &SwDocStat::nTable, nullptr }, { XML_TOK_META_STAT_IMAGE, "ImageCount", &SwDocStat::nGrf, nullptr }, { XML_TOK_META_STAT_OLE, "ObjectCount", &SwDocStat::nOLE, nullptr }, diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 5a95befacf47..543c0aa7d42b 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -110,7 +110,7 @@ enum SwXMLTableCellAttrTokens } -static const SvXMLTokenMapEntry aTableElemTokenMap[] = +const SvXMLTokenMapEntry aTableElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS }, @@ -135,7 +135,7 @@ static const SvXMLTokenMapEntry aTableElemTokenMap[] = XML_TOKEN_MAP_END }; -static const SvXMLTokenMapEntry aTableCellAttrTokenMap[] = +const SvXMLTokenMapEntry aTableCellAttrTokenMap[] = { { XML_NAMESPACE_XML, XML_ID, XML_TOK_TABLE_XMLID }, { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_STYLE_NAME }, diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 7645de3723ac..e7e5118e2f16 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -80,7 +80,7 @@ SwNoTextNode *SwXMLTextParagraphExport::GetNoTextNode( return pNdIdx->GetNodes()[pNdIdx->GetIndex() + 1]->GetNoTextNode(); } -static const OUStringLiteral gsEmbeddedObjectProtocol( "vnd.sun.star.EmbeddedObject:" ); +const OUStringLiteral gsEmbeddedObjectProtocol( "vnd.sun.star.EmbeddedObject:" ); SwXMLTextParagraphExport::SwXMLTextParagraphExport( SwXMLExport& rExp, 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 ) : diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 2669bac63e86..75dfb2e7cfa1 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1296,7 +1296,7 @@ static const char* s_EventNames[] = "OnFieldMergeFinished", "OnLayoutFinished" }; -static sal_Int32 const s_nEvents(SAL_N_ELEMENTS(s_EventNames)); +sal_Int32 const s_nEvents(SAL_N_ELEMENTS(s_EventNames)); Sequence< OUString > SwDocShell::GetEventNames() { diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index 77790b82c220..4a21273b2989 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -75,7 +75,7 @@ SwMasterUsrPref::~SwMasterUsrPref() { } -static const auto g_UpdateLinkIndex = 17; +const auto g_UpdateLinkIndex = 17; Sequence<OUString> SwContentViewConfig::GetPropertyNames() const { diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 4fe926573b45..e2cf3daaed45 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -120,9 +120,9 @@ enum GRP_WEB_VAR_END = GRP_WEB_VAR_BEGIN + 1 }; -static const sal_uInt16 VF_COUNT = 1; // { 0 } -static const sal_uInt16 VF_USR_COUNT = 2; // { 0, nsSwExtendedSubType::SUB_CMD } -static const sal_uInt16 VF_DB_COUNT = 1; // { nsSwExtendedSubType::SUB_OWN_FMT } +const sal_uInt16 VF_COUNT = 1; // { 0 } +const sal_uInt16 VF_USR_COUNT = 2; // { 0, nsSwExtendedSubType::SUB_CMD } +const sal_uInt16 VF_DB_COUNT = 1; // { nsSwExtendedSubType::SUB_OWN_FMT } static const char* FLD_EU_ARY[] = { @@ -292,7 +292,7 @@ struct SwFieldPack } // strings and formats -static const SwFieldPack aSwFields[] = +const SwFieldPack aSwFields[] = { // Document { SwFieldTypesEnum::ExtendedUser, FLD_EU_ARY, SAL_N_ELEMENTS(FLD_EU_ARY), nullptr, 0 }, diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 3e93d5320c1d..35f519050763 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -175,7 +175,7 @@ static sal_uInt16 aNavigationInsertIds[ NAVI_ENTRIES ] = NID_TABLE_FORMULA_ERROR }; -static OUStringLiteral const aNavigationImgIds[ NAVI_ENTRIES ] = +OUStringLiteral const aNavigationImgIds[ NAVI_ENTRIES ] = { RID_BMP_RIBBAR_TBL, RID_BMP_RIBBAR_FRM, diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 0348f461f0e0..6d4c784c40d5 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -93,7 +93,7 @@ void SwTableShell::InitInterface_Impl() } -static const sal_uInt16 aUITableAttrRange[] = +const sal_uInt16 aUITableAttrRange[] = { XATTR_FILL_FIRST, XATTR_FILL_LAST, FN_PARAM_TABLE_NAME, FN_PARAM_TABLE_NAME, diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx index 1c945e815d65..a702d7c8e808 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.hxx +++ b/sw/source/uibase/sidebar/PageMarginControl.hxx @@ -28,7 +28,7 @@ #define SWPAGE_WIDE_VALUE3 1800 // #i19922# - tdf#126051 see cui/source/tabpages/page.cxx and svx/source/dialog/hdft.cxx -static const long MINBODY = 56; // 1mm in twips rounded +const long MINBODY = 56; // 1mm in twips rounded class PageMarginPopup; diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx index 77ef3e4a073e..3c6412dfad6a 100644 --- a/sw/source/uibase/uno/unodispatch.cxx +++ b/sw/source/uibase/uno/unodispatch.cxx @@ -34,11 +34,11 @@ using namespace ::com::sun::star; -static const char cURLFormLetter[] = ".uno:DataSourceBrowser/FormLetter"; -static const char cURLInsertContent[] = ".uno:DataSourceBrowser/InsertContent";//data into fields -static const char cURLInsertColumns[] = ".uno:DataSourceBrowser/InsertColumns";//data into text -static const char cURLDocumentDataSource[] = ".uno:DataSourceBrowser/DocumentDataSource";//current data source of the document -static const char cInternalDBChangeNotification[] = ".uno::Writer/DataSourceChanged"; +const char cURLFormLetter[] = ".uno:DataSourceBrowser/FormLetter"; +const char cURLInsertContent[] = ".uno:DataSourceBrowser/InsertContent";//data into fields +const char cURLInsertColumns[] = ".uno:DataSourceBrowser/InsertColumns";//data into text +const char cURLDocumentDataSource[] = ".uno:DataSourceBrowser/DocumentDataSource";//current data source of the document +const char cInternalDBChangeNotification[] = ".uno::Writer/DataSourceChanged"; SwXDispatchProviderInterceptor::SwXDispatchProviderInterceptor(SwView& rVw) : m_pView(&rVw) diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index fbad314f1309..15e2bbba05a9 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -79,7 +79,7 @@ static void disableScrollBars(uno::Reference< beans::XPropertySet > const & xVie } } -static const sal_Int16 nZoomValues[] = +const sal_Int16 nZoomValues[] = { 20, 40, |