[Libreoffice-commits] core.git: include/svtools svtools/source

[Caolán McNamara (via logerrit)]

 include/svtools/editsyntaxhighlighter.hxx     |    4 ++--
 svtools/source/edit/editsyntaxhighlighter.cxx |    9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit a7b9cbbdd4b56b2f64b023f25de185353a6f01d9
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Feb 17 20:50:18 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Feb 18 10:02:38 2020 +0100

    VclMultiLineEdit is sufficient here
    
    Change-Id: Id3e20d4eebb02f0022b138dfcd835ea70f1417f7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88891
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/svtools/editsyntaxhighlighter.hxx b/include/svtools/editsyntaxhighlighter.hxx
index a3e94fe96d8b..a2ba1a22e3fd 100644
--- a/include/svtools/editsyntaxhighlighter.hxx
+++ b/include/svtools/editsyntaxhighlighter.hxx
@@ -21,11 +21,11 @@
 #define INCLUDED_SVTOOLS_EDITSYNTAXHIGHLIGHTER_HXX
 
 #include <comphelper/syntaxhighlight.hxx>
-#include <svtools/svmedit.hxx>
+#include <vcl/vclmedit.hxx>
 #include <svtools/svtdllapi.h>
 #include <svtools/colorcfg.hxx>
 
-class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit
+class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public VclMultiLineEdit
 {
     private:
         SyntaxHighlighter const   aHighlighter;
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
index 6dc523baa507..b32d80e1a430 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
@@ -17,24 +17,21 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include <svtools/svmedit.hxx>
 #include <vcl/event.hxx>
 #include <vcl/xtextedt.hxx>
 #include <vcl/textview.hxx>
 #include <svtools/editsyntaxhighlighter.hxx>
 #include <vcl/txtattr.hxx>
 
-
 MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( vcl::Window* pParent, WinBits nWinStyle,
-    HighlighterLanguage aLanguage): MultiLineEdit(pParent,nWinStyle), aHighlighter(aLanguage)
+    HighlighterLanguage aLanguage): VclMultiLineEdit(pParent,nWinStyle), aHighlighter(aLanguage)
 {
     EnableUpdateData(300);
 }
 
 void MultiLineEditSyntaxHighlight::SetText(const OUString& rNewText)
 {
-    MultiLineEdit::SetText(rNewText);
+    VclMultiLineEdit::SetText(rNewText);
     UpdateData();
 }
 
@@ -111,7 +108,7 @@ bool MultiLineEditSyntaxHighlight::PreNotify( NotifyEvent& rNEvt )
     if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
         DoBracketHilight(rNEvt.GetKeyEvent()->GetCharCode());
 
-    return MultiLineEdit::PreNotify(rNEvt);
+    return VclMultiLineEdit::PreNotify(rNEvt);
 }
 
 Color MultiLineEditSyntaxHighlight::GetSyntaxHighlightColor(const svtools::ColorConfig& rColorConfig, HighlighterLanguage eLanguage, TokenType aToken)