diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-12 16:57:26 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-13 08:42:26 +0100 |
commit | b70abeb9c3eea7ab24f3544ee95528278b53490d (patch) | |
tree | 31d0d8f90039fd3f4af85864343cc015fc98aed2 /starmath | |
parent | 888cff8bb0326153415b1d64d1ca6a45ac3ae84c (diff) |
Revert "loplugin:constfields in starmath"
This reverts commit e494cc2942899fd92a2273eaed2bf41eb74ea8a9.
Change-Id: Ie73ecb4b7299e70dea729c374763f9e2df2aa6f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90421
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'starmath')
-rw-r--r-- | starmath/inc/ElementsDockingWindow.hxx | 4 | ||||
-rw-r--r-- | starmath/inc/action.hxx | 4 | ||||
-rw-r--r-- | starmath/inc/node.hxx | 4 | ||||
-rw-r--r-- | starmath/inc/parse.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/token.hxx | 8 | ||||
-rw-r--r-- | starmath/inc/view.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/visitors.hxx | 4 | ||||
-rw-r--r-- | starmath/source/accessibility.hxx | 4 | ||||
-rw-r--r-- | starmath/source/dialog.cxx | 6 | ||||
-rw-r--r-- | starmath/source/document.cxx | 6 | ||||
-rw-r--r-- | starmath/source/mathmlimport.cxx | 2 | ||||
-rw-r--r-- | starmath/source/mathtype.hxx | 2 | ||||
-rw-r--r-- | starmath/source/ooxmlexport.hxx | 2 | ||||
-rw-r--r-- | starmath/source/uiobject.hxx | 2 |
14 files changed, 26 insertions, 26 deletions
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index 5a5a46836658..e10273b88aca 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -37,8 +37,8 @@ class SmParser; class SmElement { std::unique_ptr<SmNode> mpNode; - OUString const maText; - OUString const maHelpText; + OUString maText; + OUString maHelpText; public: Point mBoxLocation; diff --git a/starmath/inc/action.hxx b/starmath/inc/action.hxx index da8d94402b56..cb4a4eddf740 100644 --- a/starmath/inc/action.hxx +++ b/starmath/inc/action.hxx @@ -28,8 +28,8 @@ class SmDocShell; class SmFormatAction final : public SfxUndoAction { SmDocShell *pDoc; - SmFormat const aOldFormat; - SmFormat const aNewFormat; + SmFormat aOldFormat; + SmFormat aNewFormat; public: SmFormatAction(SmDocShell *pDocSh, const SmFormat& rOldFormat, const SmFormat& rNewFormat); diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index 7694007144d9..493f732529d2 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -97,7 +97,7 @@ class SmNode : public SmRect SmFace maFace; SmToken maNodeToken; - SmNodeType const meType; + SmNodeType meType; SmScaleMode meScaleMode; RectHorAlign meRectHorAlign; FontChangeMask mnFlags; @@ -434,7 +434,7 @@ public: */ class SmSpecialNode : public SmTextNode { - bool const mbIsFromGreekSymbolSet; + bool mbIsFromGreekSymbolSet; protected: SmSpecialNode(SmNodeType eNodeType, const SmToken &rNodeToken, sal_uInt16 _nFontDesc); diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx index 2d6036bb8df1..519a90041f65 100644 --- a/starmath/inc/parse.hxx +++ b/starmath/inc/parse.hxx @@ -75,7 +75,7 @@ class SmParser std::set< OUString > m_aUsedSymbols; // CharClass representing a locale for parsing numbers - CharClass const m_aNumCC; + CharClass m_aNumCC; // pointer to System locale's CharClass, which is alive inside SM_MOD() const CharClass* m_pSysCC; diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx index 786b4ff31d75..1bbe446fcca2 100644 --- a/starmath/inc/token.hxx +++ b/starmath/inc/token.hxx @@ -129,10 +129,10 @@ struct SmToken struct SmTokenTableEntry { const char* pIdent; - SmTokenType const eType; - sal_Unicode const cMathChar; - TG const nGroup; - sal_uInt16 const nLevel; + SmTokenType eType; + sal_Unicode cMathChar; + TG nGroup; + sal_uInt16 nLevel; }; #endif diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 687fd1850bf0..b3625b7dc76b 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -213,7 +213,7 @@ class SmViewShell: public SfxViewShell std::unique_ptr<SmViewShell_Impl> mpImpl; VclPtr<SmGraphicWindow> mpGraphic; - SmGraphicController const maGraphicController; + SmGraphicController maGraphicController; OUString maStatusText; bool mbPasteState; diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx index 7962180482ca..3f903aba8820 100644 --- a/starmath/inc/visitors.hxx +++ b/starmath/inc/visitors.hxx @@ -116,8 +116,8 @@ private: OutputDevice &mrDev; SmCaretPos maPos; /** Offset to draw from */ - Point const maOffset; - bool const mbCaretVisible; + Point maOffset; + bool mbCaretVisible; /** Default method for drawing pNodes */ void DefaultVisit( SmNode* pNode ) override; diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index 60e247973b67..5fce05b193da 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -58,7 +58,7 @@ SmGraphicAccessibleBaseClass; class SmGraphicAccessible final : public SmGraphicAccessibleBaseClass { - OUString const aAccName; + OUString aAccName; /// client id in the AccessibleEventNotifier queue sal_uInt32 nClientId; @@ -297,7 +297,7 @@ SmEditAccessibleBaseClass; class SmEditAccessible : public SmEditAccessibleBaseClass { - OUString const aAccName; + OUString aAccName; std::unique_ptr<::accessibility::AccessibleTextHelper> pTextHelper; VclPtr<SmEditWindow> pWin; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index de1fd7eb4bc8..77fc823ba17c 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -73,9 +73,9 @@ void lclGetSettingColors(Color& rBackgroundColor, Color& rTextColor) class SmFontStyles { - OUString const aNormal; - OUString const aBold; - OUString const aItalic; + OUString aNormal; + OUString aBold; + OUString aItalic; OUString aBoldItalic; public: diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index c3a56729284d..d64b30fbf09c 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -283,10 +283,10 @@ void SmDocShell::UpdateEditEngineDefaultFonts(const Color& aTextColor) // set fonts to be used struct FontDta { - LanguageType const nFallbackLang; + LanguageType nFallbackLang; LanguageType nLang; - DefaultFontType const nFontType; - sal_uInt16 const nFontInfoId; + DefaultFontType nFontType; + sal_uInt16 nFontInfoId; } aTable[3] = { // info to get western font to be used diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 55d9eeda2503..f33fd934c0d4 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -885,7 +885,7 @@ public: class SmXMLRowContext_Impl : public SmXMLDocContext_Impl { protected: - size_t const nElementCount; + size_t nElementCount; public: SmXMLRowContext_Impl(SmXMLImport &rImport) diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx index 0a9ca7d442bf..1e3a744d7789 100644 --- a/starmath/source/mathtype.hxx +++ b/starmath/source/mathtype.hxx @@ -151,7 +151,7 @@ private: void TypeFaceToString(OUString &rRet,sal_uInt8 nFace); OUStringBuffer &rRet; - SmNode * const pTree; + SmNode *pTree; sal_uInt8 nHAlign; diff --git a/starmath/source/ooxmlexport.hxx b/starmath/source/ooxmlexport.hxx index f7b36a0b2b0f..f7e05d7d165f 100644 --- a/starmath/source/ooxmlexport.hxx +++ b/starmath/source/ooxmlexport.hxx @@ -38,7 +38,7 @@ private: void HandleVerticalBrace( const SmVerticalBraceNode* pNode, int nLevel ) override; void HandleBlank() override; ::sax_fastparser::FSHelperPtr m_pSerializer; - oox::core::OoxmlVersion const version; + oox::core::OoxmlVersion version; /// needed to determine markup for nested run properties oox::drawingml::DocumentType const m_DocumentType; }; diff --git a/starmath/source/uiobject.hxx b/starmath/source/uiobject.hxx index e862ca4b8b0f..607c9194c85d 100644 --- a/starmath/source/uiobject.hxx +++ b/starmath/source/uiobject.hxx @@ -19,7 +19,7 @@ class ElementUIObject : public UIObject { private: SmElementsControl* mpElementsSelector; - OUString const maID; + OUString maID; public: |