diff options
| -rw-r--r-- | editeng/source/editeng/eertfpar.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/items/borderline.cxx | 20 | ||||
| -rw-r--r-- | editeng/source/misc/svxacorr.cxx | 24 | ||||
| -rw-r--r-- | editeng/source/uno/unotext.cxx | 2 | ||||
| -rw-r--r-- | include/editeng/itemtype.hxx | 2 |
5 files changed, 25 insertions, 25 deletions
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx index dd5043dd5af2..ea286d4a59ce 100644 --- a/editeng/source/editeng/eertfpar.cxx +++ b/editeng/source/editeng/eertfpar.cxx @@ -59,7 +59,7 @@ RtfImportInfo::~RtfImportInfo() { } -static constexpr MapUnit gRTFMapUnit = MapUnit::MapTwip; +constexpr MapUnit gRTFMapUnit = MapUnit::MapTwip; EditRTFParser::EditRTFParser( SvStream& rIn, EditSelection aSel, SfxItemPool& rAttrPool, EditEngine* pEditEngine) : diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index 3be1c2d46869..1239503fe560 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -171,16 +171,16 @@ ConvertBorderStyleFromWord(int const nWordLineStyle) } } -static const double THINTHICK_SMALLGAP_line2 = 15.0; -static const double THINTHICK_SMALLGAP_gap = 15.0; -static const double THINTHICK_LARGEGAP_line1 = 30.0; -static const double THINTHICK_LARGEGAP_line2 = 15.0; -static const double THICKTHIN_SMALLGAP_line1 = 15.0; -static const double THICKTHIN_SMALLGAP_gap = 15.0; -static const double THICKTHIN_LARGEGAP_line1 = 15.0; -static const double THICKTHIN_LARGEGAP_line2 = 30.0; -static const double OUTSET_line1 = 15.0; -static const double INSET_line2 = 15.0; +const double THINTHICK_SMALLGAP_line2 = 15.0; +const double THINTHICK_SMALLGAP_gap = 15.0; +const double THINTHICK_LARGEGAP_line1 = 30.0; +const double THINTHICK_LARGEGAP_line2 = 15.0; +const double THICKTHIN_SMALLGAP_line1 = 15.0; +const double THICKTHIN_SMALLGAP_gap = 15.0; +const double THICKTHIN_LARGEGAP_line1 = 15.0; +const double THICKTHIN_LARGEGAP_line2 = 30.0; +const double OUTSET_line1 = 15.0; +const double INSET_line2 = 15.0; double ConvertBorderWidthFromWord(SvxBorderLineStyle const eStyle, double const i_fWidth, diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index efab7967deb7..8b47ece89fae 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -93,13 +93,13 @@ enum class Flags { namespace o3tl { template<> struct typed_flags<Flags> : is_typed_flags<Flags, 0x07> {}; } -static const sal_Unicode cNonBreakingSpace = 0xA0; // UNICODE code for no break space +const sal_Unicode cNonBreakingSpace = 0xA0; // UNICODE code for no break space -static const char pXMLImplWrdStt_ExcptLstStr[] = "WordExceptList.xml"; -static const char pXMLImplCplStt_ExcptLstStr[] = "SentenceExceptList.xml"; -static const char pXMLImplAutocorr_ListStr[] = "DocumentList.xml"; +const char pXMLImplWrdStt_ExcptLstStr[] = "WordExceptList.xml"; +const char pXMLImplCplStt_ExcptLstStr[] = "SentenceExceptList.xml"; +const char pXMLImplAutocorr_ListStr[] = "DocumentList.xml"; -static const char +const char /* also at these beginnings - Brackets and all kinds of begin characters */ sImplSttSkipChars[] = "\"\'([{\x83\x84\x89\x91\x92\x93\x94", /* also at these ends - Brackets and all kinds of begin characters */ @@ -309,13 +309,13 @@ ACFlags SvxAutoCorrect::GetDefaultFlags() return nRet; } -static constexpr sal_Unicode cEmDash = 0x2014; -static constexpr sal_Unicode cEnDash = 0x2013; -static constexpr sal_Unicode cApostrophe = 0x2019; -static constexpr sal_Unicode cLeftDoubleAngleQuote = 0xAB; -static constexpr sal_Unicode cRightDoubleAngleQuote = 0xBB; -static constexpr sal_Unicode cLeftSingleAngleQuote = 0x2039; -static constexpr sal_Unicode cRightSingleAngleQuote = 0x203A; +constexpr sal_Unicode cEmDash = 0x2014; +constexpr sal_Unicode cEnDash = 0x2013; +constexpr sal_Unicode cApostrophe = 0x2019; +constexpr sal_Unicode cLeftDoubleAngleQuote = 0xAB; +constexpr sal_Unicode cRightDoubleAngleQuote = 0xBB; +constexpr sal_Unicode cLeftSingleAngleQuote = 0x2039; +constexpr sal_Unicode cRightSingleAngleQuote = 0x203A; // stop characters for searching preceding quotes // (the first character is also the opening quote we are looking for) const sal_Unicode aStopDoubleAngleQuoteStart[] = { 0x201E, 0x201D, 0 }; // preceding ,, diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 6cb3adb37a46..15a8a180793c 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -923,7 +923,7 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::getPropertyState( const OUStr return _getPropertyState( PropertyName ); } -static const sal_uInt16 aSvxUnoFontDescriptorWhichMap[] = { EE_CHAR_FONTINFO, EE_CHAR_FONTHEIGHT, EE_CHAR_ITALIC, +const sal_uInt16 aSvxUnoFontDescriptorWhichMap[] = { EE_CHAR_FONTINFO, EE_CHAR_FONTHEIGHT, EE_CHAR_ITALIC, EE_CHAR_UNDERLINE, EE_CHAR_WEIGHT, EE_CHAR_STRIKEOUT, EE_CHAR_CASEMAP, EE_CHAR_WLM, 0 }; diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx index 89666949d70c..179460b32b07 100644 --- a/include/editeng/itemtype.hxx +++ b/include/editeng/itemtype.hxx @@ -29,7 +29,7 @@ class Color; class IntlWrapper; // static and prototypes ------------------------------------------------- -static const sal_Unicode cpDelim[] = { ',' , ' ', '\0' }; +const sal_Unicode cpDelim[] = { ',' , ' ', '\0' }; EDITENG_DLLPUBLIC OUString GetMetricText( long nVal, MapUnit eSrcUnit, MapUnit eDestUnit, const IntlWrapper * pIntl ); OUString GetColorString( const Color& rCol ); |