HC Cleanup - calc

13 files changed, 34 insertions, 193 deletions

diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index e503d3185401..faede3eb6482 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -658,8 +658,6 @@ void ScGlobal::Clear()
     DELETEZ(pEmbeddedBrushItem);
     DELETEZ(pProtectedBrushItem);
     DELETEZ(pOutlineBitmaps);
-//  DELETEZ(pAnchorBitmap);
-//  DELETEZ(pGrayAnchorBitmap);
     DELETEZ(pEnglishFormatter);
     DELETEZ(pCaseTransliteration);
     DELETEZ(pTransliteration);
@@ -705,7 +703,6 @@ CharSet ScGlobal::GetCharsetValue( const String& rCharSet )
     else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_861")) return RTL_TEXTENCODING_IBM_861;
     else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_863")) return RTL_TEXTENCODING_IBM_863;
     else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_865")) return RTL_TEXTENCODING_IBM_865;
-//  else if (rCharSet.EqualsIgnoreCaseAscii("SYSTEM")   ) return gsl_getSystemTextEncoding();
     else return gsl_getSystemTextEncoding();
 }
 
@@ -1358,7 +1355,6 @@ ScFunctionList::ScFunctionList() :
                 }
             }
         }
-//      pDesc->nHelpId    = 0;
 
         aFunctionList.Insert(pDesc, LIST_APPEND);
         nStrLen = (*(pDesc->pFuncName)).Len();
@@ -1856,7 +1852,7 @@ String ScFunctionMgr::GetCategoryName(sal_uInt32 _nCategoryNumber )
     {
         DBG_ERROR("Invalid category number!");
         return String();
-    } // if ( _nCategoryNumber >= SC_FUNCGROUP_COUNT )
+    }
 
     ::std::auto_ptr<ScResourcePublisher> pCategories( new ScResourcePublisher( ScResId( RID_FUNCTION_CATEGORIES ) ) );
     return String(ScResId((USHORT)_nCategoryNumber));
@@ -1875,7 +1871,7 @@ sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToke
             return ScCompiler::GetNativeSymbol(ocArrayOpen).GetChar(0);
         case eArrayClose:
             return ScCompiler::GetNativeSymbol(ocArrayClose).GetChar(0);
-    } // switch(_eToken)
+    }
     return 0;
 }
 // -----------------------------------------------------------------------------
@@ -1950,7 +1946,7 @@ CollatorWrapper*        ScGlobal::GetCollator()
     {
         pCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() );
         pCollator->loadDefaultCollator( *GetLocale(), SC_COLLATOR_IGNORES );
-    } // if ( !pCollator )
+    }
     return pCollator;
 }
 CollatorWrapper*        ScGlobal::GetCaseCollator()
@@ -1959,7 +1955,7 @@ CollatorWrapper*        ScGlobal::GetCaseCollator()
     {
         pCaseCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() );
         pCaseCollator->loadDefaultCollator( *GetLocale(), 0 );
-    } // if ( !pCaseCollator )
+    }
     return pCaseCollator;
 }
 ::utl::TransliterationWrapper* ScGlobal::GetCaseTransliteration()
@@ -1969,7 +1965,7 @@ CollatorWrapper*        ScGlobal::GetCaseCollator()
         const LanguageType eOfficeLanguage = Application::GetSettings().GetLanguage();
         pCaseTransliteration = new ::utl::TransliterationWrapper(::comphelper::getProcessServiceFactory(), SC_TRANSLITERATION_CASESENSE );
         pCaseTransliteration->loadModuleIfNeeded( eOfficeLanguage );
-    } // if ( !pCaseTransliteration )
+    }
     return pCaseTransliteration;
 }
 IntlWrapper*         ScGlobal::GetScIntlWrapper()
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index f686ed36bf9b..d3830fce5bd8 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -1176,7 +1176,7 @@ bool XmlScPropHdl_JustifyMethod::equals(
     const ::com::sun::star::uno::Any& r1,
     const ::com::sun::star::uno::Any& r2 ) const
 {
-    sal_Int32 nVal1, nVal2;
+    sal_Int32 nVal1(0), nVal2(0);
 
     if((r1 >>= nVal1) && (r2 >>= nVal2))
         return (nVal1 == nVal2);
@@ -1214,7 +1214,7 @@ sal_Bool XmlScPropHdl_JustifyMethod::exportXML(
     const ::com::sun::star::uno::Any& rValue,
     const SvXMLUnitConverter& /* rUnitConverter */ ) const
 {
-    sal_Int32 nVal;
+    sal_Int32 nVal(0);
     bool bRetval = false;
 
     if (rValue >>= nVal)
@@ -1597,7 +1597,7 @@ bool XmlScPropHdl_RotateReference::equals(
     const ::com::sun::star::uno::Any& r1,
     const ::com::sun::star::uno::Any& r2 ) const
 {
-    sal_Int32 aReference1, aReference2;
+    sal_Int32 aReference1(0), aReference2(0);
 
     if((r1 >>= aReference1) && (r2 >>= aReference2))
         return (aReference1 == aReference2);
@@ -1645,7 +1645,7 @@ sal_Bool XmlScPropHdl_RotateReference::exportXML(
     const ::com::sun::star::uno::Any& rValue,
     const SvXMLUnitConverter& /* rUnitConverter */ ) const
 {
-    sal_Int32 nVal;
+    sal_Int32 nVal(0);
     sal_Bool bRetval(sal_False);
 
     if(rValue >>= nVal)
@@ -1694,7 +1694,7 @@ bool XmlScPropHdl_VertJustify::equals(
     const ::com::sun::star::uno::Any& r1,
     const ::com::sun::star::uno::Any& r2 ) const
 {
-    sal_Int32 aReference1, aReference2;
+    sal_Int32 aReference1(0), aReference2(0);
 
     if((r1 >>= aReference1) && (r2 >>= aReference2))
         return (aReference1 == aReference2);
@@ -1748,7 +1748,7 @@ sal_Bool XmlScPropHdl_VertJustify::exportXML(
     const ::com::sun::star::uno::Any& rValue,
     const SvXMLUnitConverter& /* rUnitConverter */ ) const
 {
-    sal_Int32 nVal;
+    sal_Int32 nVal(0);
     sal_Bool bRetval(sal_False);
 
     if(rValue >>= nVal)
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index a0d65c6e8727..a66d58b32553 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -91,7 +91,8 @@ void __EXPORT ScTbxInsertCtrl::StateChanged( USHORT /* nSID */, SfxItemState eSt
             aSlotURL += rtl::OUString::valueOf( sal_Int32( nImageId ));
             Image aImage = GetImage( m_xFrame,
                                      aSlotURL,
-                                     hasBigImages() );
+                                     hasBigImages()
+                                     );
             GetToolBox().SetItemImage(GetId(), aImage);
         }
     }
@@ -99,38 +100,22 @@ void __EXPORT ScTbxInsertCtrl::StateChanged( USHORT /* nSID */, SfxItemState eSt
 
 SfxPopupWindow* __EXPORT ScTbxInsertCtrl::CreatePopupWindow()
 {
-//    USHORT nWinResId, nTbxResId;
     USHORT nSlotId = GetSlotId();
     if (nSlotId == SID_TBXCTL_INSERT)
     {
         rtl::OUString aInsertBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertbar" ));
         createAndPositionSubToolBar( aInsertBarResStr );
-//      nWinResId = RID_TBXCTL_INSERT;
-//      nTbxResId = RID_TOOLBOX_INSERT;
     }
     else if (nSlotId == SID_TBXCTL_INSCELLS)
     {
         rtl::OUString aInsertCellsBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertcellsbar" ));
         createAndPositionSubToolBar( aInsertCellsBarResStr );
-//      nWinResId = RID_TBXCTL_INSCELLS;
-//      nTbxResId = RID_TOOLBOX_INSCELLS;
     }
-    else /* SID_TBXCTL_INSOBJ */
+    else
     {
         rtl::OUString aInsertObjectBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertobjectbar" ));
         createAndPositionSubToolBar( aInsertObjectBarResStr );
-//      nWinResId = RID_TBXCTL_INSOBJ;
-//      nTbxResId = RID_TOOLBOX_INSOBJ;
     }
-/*
-    WindowAlign eNewAlign = ( GetToolBox().IsHorizontal() ) ? WINDOWALIGN_LEFT : WINDOWALIGN_TOP;
-    ScTbxInsertPopup *pWin = new ScTbxInsertPopup( nSlotId, eNewAlign,
-                                    ScResId(nWinResId), ScResId(nTbxResId), GetBindings() );
-    pWin->StartPopupMode(&GetToolBox(), TRUE);
-    pWin->StartSelection();
-    pWin->Show();
-    return pWin;
-*/
     return NULL;
 }
 
@@ -154,80 +139,6 @@ void __EXPORT ScTbxInsertCtrl::Select( BOOL /* bMod1 */ )
     if ( pDispatch )
         pDispatch->Execute(nLastSlotId);
 }
-/*
-//------------------------------------------------------------------
-//
-//  Popup - Window
-//
-//------------------------------------------------------------------
-
-ScTbxInsertPopup::ScTbxInsertPopup( USHORT nId, WindowAlign eNewAlign,
-                        const ResId& rRIdWin, const ResId& rRIdTbx,
-                        SfxBindings& rBindings ) :
-                SfxPopupWindow  ( nId, rRIdWin, rBindings),
-                aTbx            ( this, GetBindings(), rRIdTbx ),
-                aRIdWinTemp(rRIdWin),
-                aRIdTbxTemp(rRIdTbx)
-{
-    aTbx.UseDefault();
-    FreeResource();
-
-    aTbx.GetToolBox().SetAlign( eNewAlign );
-    if (eNewAlign == WINDOWALIGN_LEFT || eNewAlign == WINDOWALIGN_RIGHT)
-        SetText( EMPTY_STRING );
-
-    Size aSize = aTbx.CalcWindowSizePixel();
-    aTbx.SetPosSizePixel( Point(), aSize );
-    SetOutputSizePixel( aSize );
-    aTbx.GetToolBox().SetSelectHdl( LINK(this, ScTbxInsertPopup, TbxSelectHdl));
-    aTbxClickHdl = aTbx.GetToolBox().GetClickHdl();
-    aTbx.GetToolBox().SetClickHdl(  LINK(this, ScTbxInsertPopup, TbxClickHdl));
-}
-
-ScTbxInsertPopup::~ScTbxInsertPopup()
-{
-}
-
-SfxPopupWindow* __EXPORT ScTbxInsertPopup::Clone() const
-{
-    return new ScTbxInsertPopup( GetId(), aTbx.GetToolBox().GetAlign(),
-                                    aRIdWinTemp, aRIdTbxTemp,
-                                    (SfxBindings&) GetBindings() );
-}
-
-void ScTbxInsertPopup::StartSelection()
-{
-    aTbx.GetToolBox().StartSelection();
-}
-
-IMPL_LINK(ScTbxInsertPopup, TbxSelectHdl, ToolBox*, pBox)
-{
-    EndPopupMode();
-
-    USHORT nLastSlotId = pBox->GetCurItemId();
-    SfxUInt16Item aItem( GetId(), nLastSlotId );
-    SfxDispatcher* pDisp = GetBindings().GetDispatcher();
-    pDisp->Execute( GetId(), SFX_CALLMODE_SYNCHRON, &aItem, 0L );
-    pDisp->Execute( nLastSlotId, SFX_CALLMODE_ASYNCHRON );
-    return 0;
-}
-
-IMPL_LINK(ScTbxInsertPopup, TbxClickHdl, ToolBox*, pBox)
-{
-    USHORT nLastSlotId = pBox->GetCurItemId();
-    SfxUInt16Item aItem( GetId(), nLastSlotId );
-    GetBindings().GetDispatcher()->Execute( GetId(), SFX_CALLMODE_SYNCHRON, &aItem, 0L );
-    if(aTbxClickHdl.IsSet())
-        aTbxClickHdl.Call(pBox);
-    return 0;
-}
-
-void __EXPORT ScTbxInsertPopup::PopupModeEnd()
-{
-    aTbx.GetToolBox().EndSelection();
-    SfxPopupWindow::PopupModeEnd();
-}
-*/
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/outline.src b/sc/source/ui/dbgui/outline.src
index d2ac591fd455..f1a895ddea23 100644
--- a/sc/source/ui/dbgui/outline.src
+++ b/sc/source/ui/dbgui/outline.src
@@ -27,7 +27,6 @@
 
 #include "sc.hrc"
 
-
 // Imageliste hier, damit sie nicht in ui.src beim Zusammenbauen der
 // "echten" Imagelisten stoert
 
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index 18013a089306..b3eff6dde692 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -529,9 +529,6 @@ void ScAutoFmtPreview::NotifyChange( ScAutoFormatData* pNewData )
 void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ )
 {
     sal_uInt32 nOldDrawMode = aVD.GetDrawMode();
-    //  #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
-    if( GetSettings().GetStyleSettings().GetHighContrastMode() )
-        aVD.SetDrawMode( DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
 
     Size aWndSize( GetSizePixel() );
     Font aFont( aVD.GetFont() );
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index ae10df13c469..e959211d10bb 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -397,8 +397,6 @@ CommandToolBox::CommandToolBox( ScNavigatorDlg* pParent, const ResId& rResId )
     SetSizePixel( CalcWindowSizePixel() );
     SetDropdownClickHdl( LINK(this, CommandToolBox, ToolBoxDropdownClickHdl) );
     SetItemBits( IID_DROPMODE, GetItemBits( IID_DROPMODE ) | TIB_DROPDOWNONLY );
-//  EnableItem( IID_UP, FALSE );
-//  EnableItem( IID_DOWN, FALSE );
 }
 
 //------------------------------------------------------------------------
@@ -447,7 +445,6 @@ void CommandToolBox::Select( USHORT nSelId )
             case IID_DOWN:
                 rDlg.EndOfDataArea();
                 break;
-            // IID_DROPMODE ist in Click
             case IID_CHANGEROOT:
                 rDlg.aLbEntries.ToggleRoot();
                 UpdateButtons();
diff --git a/sc/source/ui/navipi/navipi.hrc b/sc/source/ui/navipi/navipi.hrc
index 3ca5bb07c130..97486c940a5f 100644
--- a/sc/source/ui/navipi/navipi.hrc
+++ b/sc/source/ui/navipi/navipi.hrc
@@ -41,7 +41,6 @@
 #define STR_NOTACTIVE           11
 #define STR_HIDDEN              12
 #define STR_ACTIVEWIN           13
-//#define IMG_ENTRIES               14
 #define STR_QHLP_SCEN_LISTBOX   15
 #define STR_QHLP_SCEN_COMMENT   16
 #define IL_CMD                  17
@@ -56,5 +55,3 @@
 #define IID_DROPMODE    9
 #define IID_CHANGEROOT  10
 #define IID_ZOOMOUT     11
-
-
diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src
index 917d2f8175d9..d461196ea14e 100644
--- a/sc/source/ui/navipi/navipi.src
+++ b/sc/source/ui/navipi/navipi.src
@@ -238,7 +238,6 @@ Window RID_SCDLG_NAVIGATOR
 
 };
 
-
 ImageList RID_IMAGELIST_NAVCONT
 {
     Prefix = "nc";
@@ -250,11 +249,13 @@ Image RID_IMG_DROP_URL
     ImageBitmap = Bitmap { File = "dropurl.bmp" ; };
     MaskColor = STD_MASKCOLOR ;
 };
+
 Image RID_IMG_DROP_LINK
 {
     ImageBitmap = Bitmap { File = "droplink.bmp" ; };
     MaskColor = STD_MASKCOLOR ;
 };
+
 Image RID_IMG_DROP_COPY
 {
     ImageBitmap = Bitmap { File = "dropcopy.bmp" ; };
@@ -267,38 +268,47 @@ String SCSTR_CONTENT_ROOT
 {
     Text [ en-US ] = "Contents" ;
 };
+
 String SCSTR_CONTENT_TABLE
 {
     Text [ en-US ] = "Sheets" ;
 };
+
 String SCSTR_CONTENT_RANGENAME
 {
     Text [ en-US ] = "Range names" ;
 };
+
 String SCSTR_CONTENT_DBAREA
 {
     Text [ en-US ] = "Database Ranges" ;
 };
+
 String SCSTR_CONTENT_GRAPHIC
 {
     Text [ en-US ] = "Graphics" ;
 };
+
 String SCSTR_CONTENT_OLEOBJECT
 {
     Text [ en-US ] = "OLE objects" ;
 };
+
 String SCSTR_CONTENT_NOTE
 {
     Text [ en-US ] = "Comments" ;
 };
+
 String SCSTR_CONTENT_AREALINK
 {
     Text [ en-US ] = "Linked areas" ;
 };
+
 String SCSTR_CONTENT_DRAWING
 {
     Text [ en-US ] = "Drawing objects";
 };
+
  // PopupMenu -------------------------------------------------------------
 Menu RID_POPUP_DROPMODE
 {
@@ -324,6 +334,7 @@ Menu RID_POPUP_DROPMODE
         };
     };
 };
+
 Menu RID_POPUP_NAVIPI_SCENARIO
 {
     ItemList =
@@ -342,45 +353,3 @@ Menu RID_POPUP_NAVIPI_SCENARIO
         };
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index 4e00378b4cec..56a37f438717 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -126,8 +126,8 @@ ScTablePage::ScTablePage( Window* pParent, const SfxItemSet& rCoreAttrs ) :
         aBtnTopDown         ( this, ScResId( BTN_TOPDOWN ) ),
         aBtnLeftRight       ( this, ScResId( BTN_LEFTRIGHT ) ),
         aBmpPageDir         ( this, ScResId( BMP_PAGEDIR ) ),
-        aImgLeftRight       ( ScResId( IMG_LEFTRIGHT ) ),
-        aImgTopDown         ( ScResId( IMG_TOPDOWN ) ),
+        aImgLeftRight       (       ScResId( IMG_LEFTRIGHT ) ),
+        aImgTopDown         (       ScResId( IMG_TOPDOWN ) ),
         aBtnPageNo          ( this, ScResId( BTN_PAGENO ) ),
         aEdPageNo           ( this, ScResId( ED_PAGENO ) ),
         aFlPrint            ( this, ScResId( FL_PRINT ) ),
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 84949a3a6f6a..a47069b26c93 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -5271,8 +5271,7 @@ throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::Run
     sal_Int32  nCol;
     sal_Int32 nMaxRows = 0;
     sal_Int32 nMaxColumns = 0;
-    sal_Bool bEof;
-//  sal_Bool bColName = sal_True;
+    sal_Bool bEof = sal_False;
     long lColCnt = 0;
     if (MaxColumns.hasValue())
     {
@@ -5410,11 +5409,6 @@ ScVbaRange::AutoFill(  const uno::Reference< excel::XRange >& Destination, const
     ScUnoConversion::FillScRange( destRange, destAddress );
     ScUnoConversion::FillScRange( sourceRange, thisAddress );
 
-
-    // source is valid
-//  if (  !sourceRange.In( destRange ) )
-//      throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "source not in destination" ) ), uno::Reference< uno::XInterface >() );
-
     FillDir eDir = FILL_TO_BOTTOM;
     double fStep = 1.0;
 
@@ -5667,8 +5661,8 @@ ScVbaRange::Merge( const uno::Any& Across ) throw (script::BasicErrorException,
         // #TODO #FIXME this seems incredibly lame, this can't be right
         for (sal_Int32 i=1; i <= oRangeRowsImpl->getCount();i++)
         {
-                       oRangeRowsImpl->Cells( uno::makeAny( i ), uno::Any() )->Merge( uno::makeAny( sal_False ) );
-               }
+            oRangeRowsImpl->Cells( uno::makeAny( i ), uno::Any() )->Merge( uno::makeAny( sal_False ) );
+        }
     }
 }
 
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 8180c1b8ea1e..1fa995813d1b 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -1331,8 +1331,7 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH,
         return;                                         // leer
 
     //  #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
-    BOOL bCellContrast = bUseStyleColor &&
-            Application::GetSettings().GetStyleSettings().GetHighContrastMode();
+    BOOL bCellContrast = bUseStyleColor;
 
     if ( pBackground && !bCellContrast )
     {
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 01877252b078..9fe099ebf327 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -45,7 +45,6 @@
 
 ////////////////////// Umsetzen der Standard-Defines //////////////////////
 
-//#define _SVDDRAG_HXX      // SdrDragStat
 #define _SVDPAGE_HXX        // SdrPage
 
 #ifdef _SDR_NOSURROGATEOBJ
@@ -116,13 +115,8 @@
     #undef _SVDORECT_HXX
 #endif
 
-//#ifdef _SDR_NOVIEWS
-//  #define _SVDDRAG_HXX
-//#endif
-
 ////////////////////// Ende der SVDRAW-Modifikationen /////////////////////
 
-
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
@@ -200,7 +194,7 @@ void __EXPORT ScCornerButton::Paint( const Rectangle& rRect )
     BOOL bLayoutRTL = pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() );
     long nDarkX = bLayoutRTL ? 0 : nPosX;
 
-    if ( !bAdd && !rStyleSettings.GetHighContrastMode() )
+    if ( !bAdd )
     {
         // match the shaded look of column/row headers
 
@@ -472,7 +466,6 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
             if ( WhichH( aViewData.GetActivePart() ) == SC_SPLIT_RIGHT )
                 ActivatePart( SC_SPLIT_BOTTOMLEFT );
             InvalidateSplit();
-//          UpdateShow();
         }
     if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE )
         if ( aViewData.GetVSplitPos() > nSizeY - SPLIT_MARGIN )
@@ -481,7 +474,6 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
             if ( WhichV( aViewData.GetActivePart() ) == SC_SPLIT_TOP )
                 ActivatePart( SC_SPLIT_BOTTOMLEFT );
             InvalidateSplit();
-//          UpdateShow();
         }
 
     UpdateShow();
@@ -491,13 +483,11 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
         long nScrollBarSize = pFrameWin->GetSettings().GetStyleSettings().GetScrollBarSize();
         if (bVScroll)
         {
-//          nBarX = aVScrollBottom.GetSizePixel().Width();
             nBarX = nScrollBarSize;
             nSizeX -= nBarX - nOverlap;
         }
         if (bHScroll)
         {
-//          nBarY = aHScrollLeft.GetSizePixel().Height();
             nBarY = nScrollBarSize;
             nSizeY -= nBarY - nOverlap;
         }
@@ -1015,11 +1005,6 @@ void ScTabView::SetActivePointer( const Pointer& rPointer )
     for (USHORT i=0; i<4; i++)
         if (pGridWin[i])
             pGridWin[i]->SetPointer( rPointer );
-
-/*  ScSplitPos ePos = aViewData.GetActivePart();
-    if (pGridWin[ePos])
-        pGridWin[ePos]->SetPointer( rPointer );
-*/
 }
 
 
@@ -1750,7 +1735,6 @@ void ScTabView::DoHSplit(long nSplitPos)
         else
         {
             nOldDelta = aViewData.GetPosX( SC_SPLIT_LEFT );
-//          aViewData.SetPosX( SC_SPLIT_LEFT, nOldDelta );
             long nLeftWidth = nSplitPos - pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width();
             if ( nLeftWidth < 0 ) nLeftWidth = 0;
             nNewDelta = nOldDelta + aViewData.CellsAtX( nOldDelta, 1, SC_SPLIT_LEFT,
@@ -2442,5 +2426,4 @@ void ScTabView::EnableRefInput(BOOL bFlag)
 }
 
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 4ffb4d6db889..ac96f2eb2329 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1086,8 +1086,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
     Color aBackCol = ((const SvxBrushItem&)pPattern->GetItem(ATTR_BACKGROUND)).GetColor();
 
     ScModule* pScMod = SC_MOD();
-    if ( aBackCol.GetTransparency() > 0 ||
-            Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
+    if ( aBackCol.GetTransparency() > 0 )
     {
         aBackCol.SetColor( pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor );
     }