diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-28 12:56:23 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-28 13:48:14 +0100 |
| commit | a2f9c446b79d50d808bdc6e3487d230459f81260 (patch) | |
| tree | 2e307c998b2827e17feb6008a4ff703310199b30 | |
| parent | 176ac1e61610579ba8ac202c16d7aa0c0991af89 (diff) | |
Some clean-up
Change-Id: I8ef80b7ae952428a62cc1cea8b03219b77a83e99
| -rw-r--r-- | comphelper/source/misc/syntaxhighlight.cxx | 10 | ||||
| -rw-r--r-- | include/comphelper/syntaxhighlight.hxx | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx index bdf9d43e41fc..c9bac083beb6 100644 --- a/comphelper/source/misc/syntaxhighlight.cxx +++ b/comphelper/source/misc/syntaxhighlight.cxx @@ -257,7 +257,6 @@ namespace class SyntaxHighlighter::Tokenizer { - HighlighterLanguage aLanguage; // Character information tables sal_uInt16 aCharTypeTab[256]; @@ -272,7 +271,9 @@ class SyntaxHighlighter::Tokenizer sal_uInt16 nKeyWordCount; public: - Tokenizer( HighlighterLanguage aLang = HIGHLIGHT_BASIC ); + HighlighterLanguage const aLanguage; + + Tokenizer( HighlighterLanguage aLang ); ~Tokenizer( void ); void getHighlightPortions( const OUString& rLine, @@ -710,4 +711,9 @@ void SyntaxHighlighter::getHighlightPortions( const OUString& rLine, m_tokenizer->getHighlightPortions( rLine, portions ); } +HighlighterLanguage SyntaxHighlighter::GetLanguage() +{ + return m_tokenizer->aLanguage; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/syntaxhighlight.hxx b/include/comphelper/syntaxhighlight.hxx index ec0bf7c01e41..081be1d33f60 100644 --- a/include/comphelper/syntaxhighlight.hxx +++ b/include/comphelper/syntaxhighlight.hxx @@ -80,8 +80,9 @@ public: void getHighlightPortions( const OUString& rLine, std::vector<HighlightPortion>& pPortions ); - HighlighterLanguage GetLanguage() { return eLanguage;} + HighlighterLanguage GetLanguage(); }; + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |