diff options
| author | Andras Timar <atimar@suse.com> | 2013-02-15 13:02:10 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-02-16 12:55:03 +0100 |
| commit | c16e9f4ed97f65357e9986f46ad88ee9f2237997 (patch) | |
| tree | 9da5c0056d4aad772a72d57f7bbf07d24ec2478a /basctl | |
| parent | Updated core (diff) | |
| download | core-c16e9f4ed97f65357e9986f46ad88ee9f2237997.tar.gz core-c16e9f4ed97f65357e9986f46ad88ee9f2237997.zip | |
Move SyntaxHighlighter class from svtools to comphelper
We use this class in helpcompiler, and it is not desirable to
compile svtools (thus half of LibreOffice) for a build tool
in cross-compiling environment.
Change-Id: I5e6bc3e576af41eb03c1420dd347c542306f69fa
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/baside2.hxx | 2 | ||||
| -rw-r--r-- | basctl/source/basicide/baside2b.cxx | 11 | ||||
| -rw-r--r-- | basctl/source/basicide/bastypes.cxx | 1 |
3 files changed, 5 insertions, 9 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 1619261e7d78..3d1b4a2b8a19 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -453,7 +453,7 @@ private: void NewConfig (bool bFirst); private: - // the color values (the indexes are TokenTypes, see svtools/syntaxhighlight.hxx) + // the color values (the indexes are TokenTypes, see comphelper/syntaxhighlight.hxx) Color aColors[TT_KEYWORDS + 1]; // the configuration svtools::ColorConfig aConfig; diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index b2a01828fa06..b812527e7801 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -41,7 +41,8 @@ #include <vcl/xtextedt.hxx> #include <vcl/txtattr.hxx> #include <svtools/textwindowpeer.hxx> -#include <svtools/syntaxhighlight.hxx> +#include <tools/stream.hxx> +#include <comphelper/syntaxhighlight.hxx> #include "svtools/treelistentry.hxx" #include <vcl/taskpanelist.hxx> #include <vcl/help.hxx> @@ -788,13 +789,7 @@ void EditorWindow::ImpDoHighlight( sal_uLong nLine ) if ( bDoSyntaxHighlight ) { OUString aLine( pEditEngine->GetText( nLine ) ); - Range aChanges = aHighlighter.notifyChange( nLine, 0, &aLine, 1 ); - if ( aChanges.Len() ) - { - for ( long n = aChanges.Min() + 1; n <= aChanges.Max(); n++ ) - aSyntaxLineTable.insert( n ); - aSyntaxIdleTimer.Start(); - } + aHighlighter.notifyChange( nLine, 0, &aLine, 1 ); bool const bWasModified = pEditEngine->IsModified(); pEditEngine->RemoveAttribs( nLine, true ); diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 340ea4052372..83cf3ba98c2c 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -36,6 +36,7 @@ #include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <vcl/msgbox.hxx> +#include <tools/stream.hxx> namespace basctl { |