#100000# '#if SUPD' conditions removed.

3 files changed, 6 insertions, 42 deletions

diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index f77cec8b9b03..2168b199fe75 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: brwbox1.cxx,v $
  *
- *  $Revision: 1.28 $
+ *  $Revision: 1.29 $
  *
- *  last change: $Author: vg $ $Date: 2003-06-06 10:52:50 $
+ *  last change: $Author: rt $ $Date: 2003-08-07 11:48:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -188,11 +188,7 @@ void BrowseBox::Construct( BrowserMode nMode )
     bHit = FALSE;
     bRubber = FALSE;
     bHideSelect = FALSE;
-#if SUPD<655
     bHideCursor = NO_CURSOR_HIDE;
-#else
-    m_eHideCursorMode = hcNone;
-#endif
     nRowCount = 0;
     m_bFocusOnlyCursor = TRUE;
     m_aCursorColor = COL_TRANSPARENT;
@@ -2558,27 +2554,15 @@ void BrowseBox::SetMode( BrowserMode nMode )
 
     bHideSelect = ((nMode & BROWSER_HIDESELECT) == BROWSER_HIDESELECT);
     // default: do not hide the cursor at all (untaken scrolling and such)
-#if SUPD<655
     bHideCursor = NO_CURSOR_HIDE;
-#else
-    m_eHideCursorMode = hcNone;
-#endif
 
     if ( BROWSER_SMART_HIDECURSOR == ( nMode & BROWSER_SMART_HIDECURSOR ) )
     {   // smart cursor hide overrules hard cursor hide
-#if SUPD<655
         bHideCursor = SMART_CURSOR_HIDE;
-#else
-        m_eHideCursorMode = hcSmart;
-#endif
     }
     else if ( BROWSER_HIDECURSOR == ( nMode & BROWSER_HIDECURSOR ) )
     {
-#if SUPD<655
         bHideCursor = HARD_CURSOR_HIDE;
-#else
-        m_eHideCursorMode = hcAlways;
-#endif
     }
 
     m_bFocusOnlyCursor = ((nMode & BROWSER_CURSOR_WO_FOCUS) == 0);
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index eff869233c24..710248040fef 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: brwbox2.cxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: vg $ $Date: 2003-05-19 13:04:52 $
+ *  last change: $Author: rt $ $Date: 2003-08-07 11:48:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -399,20 +399,12 @@ void BrowseBox::DrawCursor()
 {
     short nCursorHideCount = GetCursorHideCount();
     BOOL bReallyHide = FALSE;
-#if SUPD<655
     if ( SMART_CURSOR_HIDE == bHideCursor )
-#else
-    if ( hcSmart == m_eHideCursorMode )
-#endif
     {
         if ( !GetSelectRowCount() && !GetSelectColumnCount() )
             bReallyHide = TRUE;
     }
-#if SUPD<655
     else if ( HARD_CURSOR_HIDE == bHideCursor )
-#else
-    else if ( hcAlways == m_eHideCursorMode )
-#endif
     {
         bReallyHide = TRUE;
     }
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index c022470d1c7c..1a4ef7d861cf 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: colorcfg.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2003-05-02 14:43:19 $
+ *  last change: $Author: rt $ $Date: 2003-08-07 11:48:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -204,9 +204,7 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString&
         RTL_CONSTASCII_USTRINGPARAM("/FontColor")       ,sal_False,
         RTL_CONSTASCII_USTRINGPARAM("/Links")           ,sal_True,
         RTL_CONSTASCII_USTRINGPARAM("/LinksVisited")    ,sal_True,
-#if SUPD<658
         RTL_CONSTASCII_USTRINGPARAM("/Anchor")          ,sal_False,
-#endif
         RTL_CONSTASCII_USTRINGPARAM("/Spell")     ,sal_False,
         RTL_CONSTASCII_USTRINGPARAM("/WriterTextGrid")  ,sal_False,
         RTL_CONSTASCII_USTRINGPARAM("/WriterFieldShadings"),sal_True,
@@ -229,10 +227,8 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString&
         RTL_CONSTASCII_USTRINGPARAM("/CalcReference")   ,sal_False,
         RTL_CONSTASCII_USTRINGPARAM("/CalcNotesBackground") ,sal_False,
         RTL_CONSTASCII_USTRINGPARAM("/DrawGrid")        ,sal_True,
-#if SUPD<664
         RTL_CONSTASCII_USTRINGPARAM("/DrawDrawing")     ,sal_False,
         RTL_CONSTASCII_USTRINGPARAM("/DrawFill")        ,sal_False,
-#endif
         RTL_CONSTASCII_USTRINGPARAM("/BASICIdentifier"),  sal_False,
         RTL_CONSTASCII_USTRINGPARAM("/BASICComment")   ,  sal_False,
         RTL_CONSTASCII_USTRINGPARAM("/BASICNumber")    ,  sal_False,
@@ -570,9 +566,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
         0, // FONTCOLOR
         0xcc, // LINKS
         0x80, // LINKSVISITED
-#if SUPD<658
         0, // ANCHOR
-#endif
         0xff0000, // SPELL
         0xc0c0c0, // WRITERTEXTGRID
         0xc0c0c0, // WRITERFIELDSHADIN
@@ -595,10 +589,8 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
         COL_LIGHTRED, // CALCREFERENCE
         0xffffc0, // CALCNOTESBACKGROUND
         0xc0c0c0, // DRAWGRID
-#if SUPD<664
         0, // DRAWDRAWING
         0xb8ff, // DRAWFILL
-#endif
         COL_GREEN, // BASICIDENTIFIER,
         COL_GRAY,// BASICCOMMENT   ,
         COL_LIGHTRED,// BASICNUMBER    ,
@@ -619,9 +611,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
             break;
 
         case SPELL :
-#if SUPD<664
         case DRAWDRAWING :
-#endif
         {
             const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
                 aRet = rStyleSettings.GetHighContrastMode() ?
@@ -629,12 +619,10 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
         }
         break;
 
-#if SUPD<664
         case DRAWFILL            :
                 aRet = /*rStyleSettings.GetHighContrastMode() ?
                     rStyleSettings.OutlineMode??? : */  aAutoColors[eEntry];
         break;
-#endif
 
         case FONTCOLOR :
             aRet = Application::GetSettings().GetStyleSettings().GetWindowTextColor();