MWS_SRX644: migrate branch mws_srx644 -> HEAD

1 files changed, 10 insertions, 10 deletions

diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 2d1ae9c60..162bd204e 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: baside2.hxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: tbe $ $Date: 2002-09-09 15:16:03 $
+ *  last change: $Author: hr $ $Date: 2003-03-18 16:17:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,8 +100,8 @@ class SvxSearchItem;
 #include "svtools/lstner.hxx"
 #endif
 
-#ifndef _SVX_COLORCFG_HXX
-#include "svx/colorcfg.hxx"
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
 #endif
 
 #include <sfx2/progress.hxx>
@@ -127,10 +127,10 @@ public:
     inline void		StepProgress();
 };
 
-inline ProgressInfo::ProgressInfo( SfxObjectShell* pObjSh, const String& rText, ULONG nRange ) 
+inline ProgressInfo::ProgressInfo( SfxObjectShell* pObjSh, const String& rText, ULONG nRange )
     : SfxProgress( pObjSh, rText, nRange )
-{ 
-    nCurState = 0; 
+{
+    nCurState = 0;
 }
 
 // inline void ProgressInfo::StartProgress( const String& rName, ULONG nStates )
@@ -152,7 +152,7 @@ inline void ProgressInfo::StepProgress()
 }
 
 
-namespace svt { 
+namespace svt {
 class SourceViewConfig;
 }
 
@@ -412,7 +412,7 @@ public:
 
                     ModulWindow( ModulWindowLayout* pParent, StarBASIC* pBasic,
                             SfxObjectShell* pShell, String aLibName, String aName, ::rtl::OUString& aModule );
-                        
+
                     ~ModulWindow();
 
     virtual void	ExecuteCommand( SfxRequest& rReq );
@@ -498,7 +498,7 @@ private:
     ModulWindow * m_pModulWindow;
 
     Color m_aSyntaxColors[TT_KEYWORD + 1];
-    svx::ColorConfig m_aColorConfig;
+    svtools::ColorConfig m_aColorConfig;
 
     ImageList m_aImagesNormal;
     ImageList m_aImagesHighContrast;