diff options
Diffstat (limited to 'unotools/source/config')
-rw-r--r-- | unotools/source/config/bootstrap.cxx | 6 | ||||
-rw-r--r-- | unotools/source/config/defaultoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/fontcfg.cxx | 18 | ||||
-rw-r--r-- | unotools/source/config/historyoptions.cxx | 10 | ||||
-rw-r--r-- | unotools/source/config/lingucfg.cxx | 4 | ||||
-rw-r--r-- | unotools/source/config/pathoptions.cxx | 4 |
6 files changed, 22 insertions, 22 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 5228fb466682..2aaecdd2fb86 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -405,9 +405,9 @@ static Bootstrap::PathStatus implGetVersionFile(rtl::Bootstrap const & _rData, B // Error reporting -static char const IS_MISSING[] = "is missing"; -static char const IS_INVALID[] = "is corrupt"; -static char const PERIOD[] = ". "; +char const IS_MISSING[] = "is missing"; +char const IS_INVALID[] = "is corrupt"; +char const PERIOD[] = ". "; static void addFileError(OUStringBuffer& _rBuf, OUString const& _aPath, AsciiString _sWhat) { diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx index 80a597abcdbf..de7c5a4b4dfd 100644 --- a/unotools/source/config/defaultoptions.cxx +++ b/unotools/source/config/defaultoptions.cxx @@ -120,7 +120,7 @@ struct PathToDefaultMapping_Impl } -static PathToDefaultMapping_Impl const PathMap_Impl[] = +PathToDefaultMapping_Impl const PathMap_Impl[] = { { SvtPathOptions::PATH_ADDIN, &SvtDefaultOptions_Impl::m_aAddinPath }, { SvtPathOptions::PATH_AUTOCORRECT, &SvtDefaultOptions_Impl::m_aAutoCorrectPath }, diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index 8cc694bbb59c..9025562f89c0 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -368,7 +368,7 @@ FontSubstConfiguration::~FontSubstConfiguration() * FontSubstConfigItem::getMapName */ -static const char* const aImplKillLeadingList[] = +const char* const aImplKillLeadingList[] = { "microsoft", "monotype", @@ -391,7 +391,7 @@ static const char* const aImplKillLeadingList[] = nullptr }; -static const char* const aImplKillTrailingList[] = +const char* const aImplKillTrailingList[] = { "microsoft", "monotype", @@ -441,7 +441,7 @@ static const char* const aImplKillTrailingList[] = nullptr }; -static const char* const aImplKillTrailingWithExceptionsList[] = +const char* const aImplKillTrailingWithExceptionsList[] = { "ce", "monospace", "oldface", nullptr, "ps", "caps", nullptr, @@ -458,7 +458,7 @@ struct ImplFontAttrWeightSearchData } -static ImplFontAttrWeightSearchData const aImplWeightAttrSearchList[] = +ImplFontAttrWeightSearchData const aImplWeightAttrSearchList[] = { // the attribute names are ordered by "first match wins" // e.g. "semilight" should wins over "semi" @@ -488,7 +488,7 @@ struct ImplFontAttrWidthSearchData } -static ImplFontAttrWidthSearchData const aImplWidthAttrSearchList[] = +ImplFontAttrWidthSearchData const aImplWidthAttrSearchList[] = { { "narrow", WIDTH_CONDENSED }, { "semicondensed", WIDTH_SEMI_CONDENSED }, @@ -513,7 +513,7 @@ struct ImplFontAttrTypeSearchData } -static ImplFontAttrTypeSearchData const aImplTypeAttrSearchList[] = +ImplFontAttrTypeSearchData const aImplTypeAttrSearchList[] = { { "monotype", ImplFontAttrs::None }, { "linotype", ImplFontAttrs::None }, @@ -758,7 +758,7 @@ struct StrictStringSort // The entries in this table must match the bits in the ImplFontAttrs enum. -static const char* const pAttribNames[] = +const char* const pAttribNames[] = { "default", "standard", @@ -804,7 +804,7 @@ struct enum_convert } -static const enum_convert pWeightNames[] = +const enum_convert pWeightNames[] = { { "normal", WEIGHT_NORMAL }, { "medium", WEIGHT_MEDIUM }, @@ -822,7 +822,7 @@ static const enum_convert pWeightNames[] = { "ultralight", WEIGHT_ULTRALIGHT } }; -static const enum_convert pWidthNames[] = +const enum_convert pWidthNames[] = { { "normal", WIDTH_NORMAL }, { "condensed", WIDTH_CONDENSED }, diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index 986e39898d6c..d200aa833982 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.cxx @@ -44,11 +44,11 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; namespace { - static const ::sal_Int32 s_nOffsetURL = 0; - static const ::sal_Int32 s_nOffsetFilter = 1; - static const ::sal_Int32 s_nOffsetTitle = 2; - static const ::sal_Int32 s_nOffsetPassword = 3; - static const ::sal_Int32 s_nOffsetThumbnail = 4; + const ::sal_Int32 s_nOffsetURL = 0; + const ::sal_Int32 s_nOffsetFilter = 1; + const ::sal_Int32 s_nOffsetTitle = 2; + const ::sal_Int32 s_nOffsetPassword = 3; + const ::sal_Int32 s_nOffsetThumbnail = 4; const char s_sItemList[] = "ItemList"; const char s_sOrderList[] = "OrderList"; diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 3bd5953889e7..94da331f88ba 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -219,7 +219,7 @@ struct NamesToHdl } -static NamesToHdl const aNamesToHdl[] = +NamesToHdl const aNamesToHdl[] = { {/* 0 */ "General/DefaultLocale", UPN_DEFAULT_LOCALE, UPH_DEFAULT_LOCALE}, {/* 1 */ "General/DictionaryList/ActiveDictionaries", UPN_ACTIVE_DICTIONARIES, UPH_ACTIVE_DICTIONARIES}, @@ -803,7 +803,7 @@ bool SvtLinguConfigItem::IsReadOnly( sal_Int32 nPropertyHandle ) const static SvtLinguConfigItem *pCfgItem = nullptr; static sal_Int32 nCfgItemRefCount = 0; -static const char aG_Dictionaries[] = "Dictionaries"; +const char aG_Dictionaries[] = "Dictionaries"; SvtLinguConfig::SvtLinguConfig() { diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 9d1927042bef..1896f456a3a8 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -167,7 +167,7 @@ struct VarNameAttribute } -static const PropertyStruct aPropNames[] = +const PropertyStruct aPropNames[] = { { "Addin", SvtPathOptions::PATH_ADDIN }, { "AutoCorrect", SvtPathOptions::PATH_AUTOCORRECT }, @@ -198,7 +198,7 @@ static const PropertyStruct aPropNames[] = { "Classification", SvtPathOptions::PATH_CLASSIFICATION } }; -static const VarNameAttribute aVarNameAttribute[] = +const VarNameAttribute aVarNameAttribute[] = { { SUBSTITUTE_INSTPATH }, // $(instpath) { SUBSTITUTE_PROGPATH }, // $(progpath) |