CWS-TOOLING: integrate CWS sqlsyntaxhighlighting

2008-11-20 17:23:29 +0100 mod  r264074 : new colors by UX
2008-11-17 17:37:19 +0100 mod  r263732 : revert manual fix for icu
2008-11-17 15:03:39 +0100 mod  r263725 : manual fix for icu
2008-11-17 11:26:39 +0100 mod  r263709 : manual fix for icu
2008-11-16 18:19:16 +0100 mod  r263702 : `fix
2008-11-12 22:11:50 +0100 mod  r263619 : CWS-TOOLING: rebase CWS sqlsyntaxhighlighting to trunk@263288 (milestone: DEV300:m35)
2008-11-12 11:04:33 +0100 mod  r263578 : minor cleanup
2008-11-12 11:03:02 +0100 mod  r263577 : seperate MulitLineEditSyntaxHighlighter into new file
2008-11-06 15:13:27 +0100 fs  r263391 : merged from trunk
2008-11-06 15:09:20 +0100 fs  r263390 : merged from trunk
2008-11-06 15:07:06 +0100 fs  r263388 : reverted the change c262599. This seems to be a merge from trunk, but without properly setting svn:mergeinfo, thus it results in conflicts when doing a real 'svn merge'.
2008-11-06 15:03:19 +0100 fs  r263387 : merged rev. 262769
2008-11-03 17:58:19 +0100 mod  r263297 : little fixes
2008-11-03 17:56:49 +0100 mod  r263296 : little fixes
2008-11-03 17:12:41 +0100 mod  r263295 : new entry SQL comment for Tools-Appearance
2008-11-03 17:12:13 +0100 mod  r263294 : different tokenizer based on language
2008-11-03 17:11:40 +0100 mod  r263293 : new entry for Tools-Appearance: SQL Comment
2008-11-03 17:11:14 +0100 mod  r263292 : get notification about color changes for sql view
2008-10-29 00:01:40 +0100 mod  r262768 : string listbox
2008-10-28 23:57:45 +0100 mod  r262767 : string listbox
2008-10-22 18:38:07 +0200 mod  r262614 : source alignment fix
2008-10-22 18:37:23 +0200 mod  r262613 : '' as string as well
2008-10-22 18:36:45 +0200 mod  r262612 : get syntax highlighting in tools-sql...
2008-10-22 14:11:12 +0200 mod  r262605 : formatting fix
2008-10-22 13:30:42 +0200 mod  r262599 : additional entries for Tools-Options-Appearance
2008-10-19 22:53:50 +0200 mod  r262302 : migration from cvs to svn
2008-10-19 22:37:45 +0200 mod  r262301 : migration from cvs to svn
2008-10-19 22:36:04 +0200 mod  r262300 : migration from cvs to svn

2 files changed, 7 insertions, 9 deletions

diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 80ed80b91d32..e92e4251be54 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: baside2.cxx,v $
- * $Revision: 1.46 $
+ * $Revision: 1.46.2.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1429,7 +1429,7 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) :
         = Color(m_aColorConfig.GetColorValue(svtools::BASICERROR).nColor);
     m_aSyntaxColors[TT_OPERATOR]
         = Color(m_aColorConfig.GetColorValue(svtools::BASICOPERATOR).nColor);
-    m_aSyntaxColors[TT_KEYWORD]
+    m_aSyntaxColors[TT_KEYWORDS]
         = Color(m_aColorConfig.GetColorValue(svtools::BASICKEYWORD).nColor);
 
     Font aFont( GetFont() );
@@ -1674,9 +1674,9 @@ void ModulWindowLayout::Notify(SfxBroadcaster & rBc, SfxHint const & rHint)
         m_aSyntaxColors[TT_OPERATOR] = aColor;
         aColor = Color(m_aColorConfig.GetColorValue(svtools::BASICKEYWORD).
                        nColor);
-        if (bChanged || aColor != m_aSyntaxColors[TT_KEYWORD])
+        if (bChanged || aColor != m_aSyntaxColors[TT_KEYWORDS])
             bChanged = true;
-        m_aSyntaxColors[TT_KEYWORD] = aColor;
+        m_aSyntaxColors[TT_KEYWORDS] = aColor;
         if (bChanged)
             updateSyntaxHighlighting();
     }
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 56f0b4b36294..640c0582ca9e 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: baside2.hxx,v $
- * $Revision: 1.26 $
+ * $Revision: 1.26.22.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -37,8 +37,6 @@
 #include <bastype3.hxx>
 #include <basidesh.hxx>
 
-#include <basic/hilight.hxx>
-
 class ExtTextEngine;
 class ExtTextView;
 class SvxSearchItem;
@@ -54,7 +52,7 @@ class SvxSearchItem;
 #include <svtools/colorcfg.hxx>
 
 #include <sfx2/progress.hxx>
-
+#include <svtools/syntaxhighlight.hxx>
 
 DBG_NAMEEX( ModulWindow )
 
@@ -458,7 +456,7 @@ private:
 
     ModulWindow * m_pModulWindow;
 
-    Color m_aSyntaxColors[TT_KEYWORD + 1];
+    Color m_aSyntaxColors[TT_KEYWORDS + 1];
     svtools::ColorConfig m_aColorConfig;
 
     ImageList m_aImagesNormal;