dba33f: remove BROWSER_HIGHLIGHT_AUTO/MANU - they're not used at all

4 files changed, 5 insertions, 18 deletions

diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx
index 8296c9f994f6..252087b02876 100644
--- a/svtools/inc/svtools/brwbox.hxx
+++ b/svtools/inc/svtools/brwbox.hxx
@@ -99,8 +99,6 @@ typedef ULONG BrowserMode;
 
 #define BROWSER_HIGHLIGHT_NONE       0x0100 // == BROWSER_HIDESELECT
 #define BROWSER_HIGHLIGHT_TOGGLE 0x00000000 // old default => NULL, dont use!
-#define BROWSER_HIGHLIGHT_AUTO   0x00010000
-#define BROWSER_HIGHLIGHT_MANU   0x00020000
 
 #define BROWSER_HEADERBAR_NEW    0x00040000
 #define BROWSER_AUTOSIZE_LASTCOL 0x00080000
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 4ebed0d70f3f..1b2bb5ffe9d1 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -2449,8 +2449,6 @@ void BrowseBox::SetMode( BrowserMode nMode )
             BROWSER_AUTO_HSCROLL |
             BROWSER_TRACKING_TIPS |
 //          BROWSER_HIGHLIGHT_NONE |
-            BROWSER_HIGHLIGHT_AUTO |
-//          BROWSER_HIGHLIGHT_MANU |
             BROWSER_HEADERBAR_NEW |
 //          BROWSER_AUTOSIZE_LASTCOL |
             0;
@@ -2520,9 +2518,6 @@ void BrowseBox::SetMode( BrowserMode nMode )
     pVScroll->SetScrollHdl( LINK( this, BrowseBox, ScrollHdl ) );
     pVScroll->SetEndScrollHdl( LINK( this, BrowseBox, EndScrollHdl ) );
 
-    getDataWindow()->bHighlightAuto =
-            BROWSER_HIGHLIGHT_AUTO == ( nMode & BROWSER_HIGHLIGHT_AUTO ) ||
-            BROWSER_HIGHLIGHT_MANU != ( nMode & BROWSER_HIGHLIGHT_MANU );
     getDataWindow()->bAutoSizeLastCol =
             BROWSER_AUTOSIZE_LASTCOL == ( nMode & BROWSER_AUTOSIZE_LASTCOL );
     getDataWindow()->bOwnDataChangedHdl =
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index daf8d080dac2..aee7483451cd 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -343,10 +343,6 @@ void BrowseBox::ToggleSelection( BOOL bForce )
     if ( !bForce &&
          ( bNotToggleSel || !IsUpdateMode() || !bSelectionIsVisible ) )
         return;
-//MI, 28.01.98
-//  if ( !getDataWindow()->bHighlightToggle &&
-//       !getDataWindow()->bHighlightAuto )
-//      return;
 
     // only highlight painted areas!
     bNotToggleSel = TRUE;
@@ -987,11 +983,10 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL
                 Size( _rRect.GetSize().Width(), nDataRowHeigt ) );
         PaintRow( _rOut, aRowRect );
 
-        BOOL bRowAutoHighlight  =   _bDrawSelections
-                                &&  !bHideSelect
-                                &&  ((BrowserDataWin&)GetDataWindow()).bHighlightAuto
-                                &&  IsRowSelected( nRow );
-        if ( bRowAutoHighlight )
+        BOOL bRowSelected   =   _bDrawSelections
+                            &&  !bHideSelect
+                            &&  IsRowSelected( nRow );
+        if ( bRowSelected )
         {
             _rOut.SetTextColor( rHighlightTextColor );
             _rOut.SetFillColor( rHighlightFillColor );
@@ -1085,7 +1080,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL
             bRetouching = TRUE;
 
         // reset auto-highlight
-        if ( bRowAutoHighlight )
+        if ( bRowSelected )
         {
             _rOut.SetTextColor( aOldTextColor );
             _rOut.SetFillColor( aOldFillColor );
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index b01c39832a32..0c2c48d73a0d 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -145,7 +145,6 @@ public:
     FASTBOOL        bAutoVScroll;   // autohide horizontaler Scrollbar
     FASTBOOL        bUpdateMode;    // nicht SV-UpdateMode wegen Invalidate()
     FASTBOOL        bAutoSizeLastCol;// last column always fills up window
-    FASTBOOL        bHighlightAuto; // new auto-highlight by SetFont() etc.
     FASTBOOL        bResizeOnPaint; // outstanding resize-event
     FASTBOOL        bUpdateOnUnlock;    // Update() while locked
     FASTBOOL        bInUpdateScrollbars;    // Rekursionsschutz