diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-07 15:21:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-10 10:51:37 +0200 |
| commit | 51289601098449d985dbbddef316cf56acdafbc4 (patch) | |
| tree | 9d8a9dc16a736e095439b179bca01438a5750544 /include | |
| parent | bad606febb291022140cb4fb637005cfafff6f98 (diff) | |
loplugin:inlinefields in formula::FormulaCompiler
Change-Id: I6dc6dfd064bf944db278b4663812d71b6cc49b3a
Reviewed-on: https://gerrit.libreoffice.org/36344
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/formula/FormulaCompiler.hxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index 3c65b94973f3..22bd699e7811 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -80,8 +80,8 @@ public: { OpCodeHashMap * mpHashMap; /// Hash map of symbols, OUString -> OpCode OUString * mpTable; /// Array of symbols, OpCode -> OUString, offset==OpCode - ExternalHashMap * mpExternalHashMap; /// Hash map of ocExternal, Filter String -> AddIn String - ExternalHashMap * mpReverseExternalHashMap; /// Hash map of ocExternal, AddIn String -> Filter String + ExternalHashMap maExternalHashMap; /// Hash map of ocExternal, Filter String -> AddIn String + ExternalHashMap maReverseExternalHashMap; /// Hash map of ocExternal, AddIn String -> Filter String FormulaGrammar::Grammar meGrammar; /// Grammar, language and reference convention sal_uInt16 mnSymbols; /// Count of OpCode symbols bool mbCore : 1; /// If mapping was setup by core, not filters @@ -95,8 +95,6 @@ public: OpCodeMap(sal_uInt16 nSymbols, bool bCore, FormulaGrammar::Grammar eGrammar ) : mpHashMap( new OpCodeHashMap( nSymbols)), mpTable( new OUString[ nSymbols ]), - mpExternalHashMap( new ExternalHashMap), - mpReverseExternalHashMap( new ExternalHashMap), meGrammar( eGrammar), mnSymbols( nSymbols), mbCore( bCore) @@ -117,10 +115,10 @@ public: const OpCodeHashMap* getHashMap() const { return mpHashMap; } /// Get the symbol String -> AddIn String hash map for finds. - const ExternalHashMap* getExternalHashMap() const { return mpExternalHashMap; } + const ExternalHashMap* getExternalHashMap() const { return &maExternalHashMap; } /// Get the AddIn String -> symbol String hash map for finds. - const ExternalHashMap* getReverseExternalHashMap() const { return mpReverseExternalHashMap; } + const ExternalHashMap* getReverseExternalHashMap() const { return &maReverseExternalHashMap; } /// Get the symbol string matching an OpCode. const OUString& getSymbol( const OpCode eOp ) const @@ -157,7 +155,7 @@ public: bool isOOXML() const { return FormulaGrammar::isOOXML( meGrammar); } /// Does it have external symbol/name mappings? - bool hasExternals() const { return !mpExternalHashMap->empty(); } + bool hasExternals() const { return !maExternalHashMap.empty(); } /// Put entry of symbol String and OpCode pair. void putOpCode( const OUString & rStr, const OpCode eOp, const CharClass* pCharClass ); |