Removed more commented out code.

I went through all files under clone/calc/* that had "//#include" and
tidied them up a bit.

15 files changed, 10 insertions, 63 deletions

diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx
index 55fcb503f51b..0a8c0dfbe005 100644
--- a/sc/inc/AccessibleFilterTopWindow.hxx
+++ b/sc/inc/AccessibleFilterTopWindow.hxx
@@ -28,7 +28,6 @@
 #ifndef SC_ACCESSIBLEFILTERTOPWINDOW_HXX
 #define SC_ACCESSIBLEFILTERTOPWINDOW_HXX
 
-//#include "AccessibleContextBase.hxx"
 #include "AccessibleFilterMenu.hxx"
 #include "cppuhelper/implbase1.hxx"
 
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index a1dee10fd75d..3a363ee0d1c5 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -42,7 +42,6 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-//#include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase7.hxx>
 
@@ -131,7 +130,7 @@ class ScStyleFamilyObj : public ::cppu::WeakImplHelper4<
 {
 private:
     ScDocShell*             pDocShell;
-    SfxStyleFamily          eFamily;        // Familie
+    SfxStyleFamily          eFamily;        // Family
 
     ScStyleObj*             GetObjectByIndex_Impl(UINT32 nIndex);
     ScStyleObj*             GetObjectByName_Impl(const rtl::OUString& Name);
@@ -223,7 +222,7 @@ class ScStyleObj : public ::cppu::WeakImplHelper7<
 private:
     const SfxItemPropertySet* pPropSet;
     ScDocShell*             pDocShell;
-    SfxStyleFamily          eFamily;        // Familie
+    SfxStyleFamily          eFamily;        // Family
     String                  aStyleName;
 
     SfxStyleSheetBase*      GetStyle_Impl();
@@ -239,7 +238,7 @@ public:
                             ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rName);
     virtual                 ~ScStyleObj();
 
-                            // per getImplementation gerufen:
+                            // created by getImplementation:
     sal_Bool                IsInserted() const      { return pDocShell != NULL; }
     SfxStyleFamily          GetFamily() const       { return eFamily; }
     void                    InitDoc( ScDocShell* pNewDocSh, const String& rNewName );
diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx
index 899169154d8d..5449cf5093ed 100644
--- a/sc/source/core/inc/core_pch.hxx
+++ b/sc/source/core/inc/core_pch.hxx
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//  ItemID-Defines etc. muessen immer ganz vorne stehen
+//  ItemID-Defines etc. must be included first
 
 #include "scitems.hxx"
 
@@ -34,8 +34,8 @@
 
 #define SC_PROGRESS_CXX
 
-//  ab hier automatisch per makepch generiert
-//  folgende duerfen nicht aufgenommen werden:
+//  Automatically generated by makepch
+// The following is not to be included:
 //      setjmp.h
 
 #include <tools/solar.h>
diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx
index 1b2cde3d4a6d..4c314ee37ff4 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -34,7 +34,6 @@
 #include "rangelst.hxx"
 #include "chartlis.hxx"
 
-//#include <vcl/svapp.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdpage.hxx>
@@ -208,7 +207,6 @@ void ScChartHelper::GetChartRanges( const uno::Reference< chart2::XChartDocument
     uno::Reference< chart2::data::XDataSource > xDataSource( xChartDoc, uno::UNO_QUERY );
     if( !xDataSource.is() )
         return;
-    //uno::Reference< chart2::data::XDataProvider > xProvider = xChartDoc->getDataProvider();
 
     uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aLabeledDataSequences( xDataSource->getDataSequences() );
     rRanges.realloc(2*aLabeledDataSequences.getLength());
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index bdfe84104c93..ad29869e2abb 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -57,7 +57,6 @@
 #include "op.h"
 #include "optab.h"
 #include "tool.h"
-//#include "math.h"
 #include "decl.h"
 #include "lotform.hxx"
 #include "lotrange.hxx"
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index 491941b36152..855fbcfefdf1 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -59,8 +59,6 @@
 #include <com/sun/star/sheet/DataPilotFieldLayoutMode.hpp>
 #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
 
-//#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
-
 using namespace com::sun::star;
 using namespace xmloff::token;
 using ::com::sun::star::uno::Reference;
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index 84979e3dbcdf..9510c91e3290 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -51,7 +51,6 @@
 #include "undodat.hxx"
 #include "undotab.hxx"
 #include "undoblk.hxx"
-//#include "pivot.hxx"
 #include "dpobject.hxx"
 #include "dpshttab.hxx"
 #include "dbdocfun.hxx"
@@ -74,7 +73,7 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String
 // ---------------------------------------------------------------------------
 
 //
-//  ehemalige viewfunc/dbfunc Methoden
+//  former viewfunc/dbfunc methods
 //
 
 void ScDocShell::ErrorMessage( USHORT nGlobStrId )
@@ -351,9 +350,6 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
         pData = pNoNameData;
     }
 
-//  if (bMark)
-//      MarkRange( ScRange( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab ), FALSE );
-
     return pData;
 }
 
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index fbb6dc8ead35..93ac54726781 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -42,8 +42,6 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-//#include <svxlink.hxx>
-
 #include "docsh.hxx"
 
 #include "stlsheet.hxx"
@@ -153,8 +151,6 @@ void ScDocShell::SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart
             if (pViewSh->GetViewData()->GetDocShell() == this)
                 pViewSh->UpdateOleZoom();
         }
-        //else
-        //  DataChanged( SvDataType() );            // fuer Zuppeln wenn nicht IP-aktiv
     }
 
     if (aDocument.IsEmbedded())
@@ -220,9 +216,6 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, BOOL bSnapSize )
         SetVisAreaOrSize( aNewArea, TRUE ); // hier muss auch der Start angepasst werden
         bChange = TRUE;
     }
-
-//  if (bChange)
-//      DataChanged( SvDataType() );        //! passiert auch bei SetModified
 }
 
 //
@@ -445,11 +438,9 @@ BOOL ScDocShell::ReloadTabLinks()
         if (pBase->ISA(ScTableLink))
         {
             ScTableLink* pTabLink = (ScTableLink*)pBase;
-//          pTabLink->SetAddUndo(FALSE);        //! Undo's zusammenfassen
             pTabLink->SetPaint(FALSE);          //  Paint nur einmal am Ende
             pTabLink->Update();
             pTabLink->SetPaint(TRUE);
-//          pTabLink->SetAddUndo(TRUE);
             bAny = TRUE;
         }
     }
diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx
index 7bc33b3af96b..948da8c9d735 100644
--- a/sc/source/ui/inc/msgpool.hxx
+++ b/sc/source/ui/inc/msgpool.hxx
@@ -36,7 +36,6 @@
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 
-//#include <dbitems.hxx>
 #include "uiitems.hxx"
 
 
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index aa4cdf58882d..e4a0768002a6 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -32,7 +32,6 @@
 
 #include <vcl/image.hxx>
 #include <vcl/virdev.hxx>
-//#include <toolkit/unoiface.hxx>
 #include <toolkit/unohlp.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/smplhint.hxx>
@@ -120,7 +119,6 @@ uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const rtl::OUString& aName)
     }
 
     throw container::NoSuchElementException();
-//    return uno::Any();
 }
 
 uno::Sequence<rtl::OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames(void) throw( uno::RuntimeException )
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 455af075306c..0724541278fa 100755
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -86,7 +86,6 @@
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/awt/XDevice.hpp>
 
-//#include <com/sun/star/sheet/CellDeleteMode.hpp>
 #include <com/sun/star/sheet/XCellRangeMovement.hpp>
 #include <com/sun/star/sheet/XSubTotalCalculatable.hpp>
 #include <com/sun/star/sheet/XSubTotalDescriptor.hpp>
@@ -1110,7 +1109,6 @@ getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDoc
         pDoc = pDocSh->GetDocument();
         String aString(sAddress);
         USHORT nMask = SCA_VALID;
-        //USHORT nParse = rCellRanges.Parse( sAddress, pDoc, nMask, formula::FormulaGrammar::CONV_XL_A1 );
         rResFlags = rCellRanges.Parse( sAddress, pDoc, nMask, eConv, 0 );
         if ( rResFlags & SCA_VALID )
         {
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index e7488e434f30..84a65e7e2af5 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -50,7 +50,6 @@
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
 #include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
 
-//#include <vbahelper/vbahelperinterface.hxx>
 #include "vbaformat.hxx"
 #include <formula/grammar.hxx>
 
@@ -62,7 +61,6 @@ class ScDocShell;
 class ScDocument;
 class ScRangeList;
 
-//typedef InheritedHelperInterfaceImpl1< ov::excel::XRange >  ScVbaRange_BASE;
 typedef ScVbaFormat< ov::excel::XRange > ScVbaRange_BASE;
 
 class ArrayVisitor
diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx
index 3ddc5f5b3b45..e21ca2c53090 100644
--- a/sc/source/ui/vba/vbawindows.cxx
+++ b/sc/source/ui/vba/vbawindows.cxx
@@ -35,7 +35,6 @@
 #include <tools/urlobj.hxx>
 #include "vbawindow.hxx"
 #include "vbaglobals.hxx"
-//#include "vbaworkbook.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::ooo::vba;
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index c8cd6325682d..c596e7e62c79 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -78,8 +78,6 @@
 // #i74769#
 #include <svx/sdrpaintwindow.hxx>
 
-//#include "tabvwsh.hxx"            //! Test !!!!
-
 //------------------------------------------------------------------------
 
 void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible )
@@ -642,10 +640,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
         aDrawingRectLogic = PixelToLogic(aDrawingRectPixel, aDrawMode);
     }
 
-// not necessary with overlay
-//  if (bCurVis)
-//      HideCursor();
-
     OutputDevice* pContentDev = this;       // device for document content, used by overlay manager
     SdrPaintWindow* pTargetPaintWindow = 0; // #i74769# work with SdrPaintWindow directly
 
@@ -820,16 +814,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
         {
             pContentDev->SetClipRegion();
         }
-
-        //BOOL bDraw = TRUE;
-        //if (eMode == SC_UPDATE_CHANGED)
-        //  bDraw = NeedDrawMarks() && aOutputData.SetChangedClip();
-        //if (bDraw)
-        //{
-        //  DrawMarks();
-        //  if (eMode == SC_UPDATE_CHANGED)
-        //      pContentDev->SetClipRegion();
-        //}
     }
 
     pContentDev->SetMapMode(MAP_PIXEL);
@@ -965,8 +949,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
     if ( pNoteMarker )
         pNoteMarker->Draw();        // ueber den Cursor, im Drawing-MapMode
 
-    //DrawStartTimer();             // fuer bunte Handles ohne System-Clipping
-
     //
     //  Wenn waehrend des Paint etwas invertiert wurde (Selektion geaendert aus Basic-Macro),
     //  ist das jetzt durcheinandergekommen und es muss neu gemalt werden
@@ -1650,9 +1632,6 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
 
 void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
 {
-    // transformed from ScGridWindow::InvertSimple
-
-//  ScMarkData& rMark = pViewData->GetMarkData();
     ScMarkData aMultiMark( pViewData->GetMarkData() );
     aMultiMark.SetMarking( FALSE );
     aMultiMark.MarkToMulti();
@@ -1704,8 +1683,6 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
     if (nX2 > nXRight) nX2 = nXRight;
     if (nY2 > nYBottom) nY2 = nYBottom;
 
-//  MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL);     // erst nach den return's !!!
-
     double nPPTX = pViewData->GetPPTX();
     double nPPTY = pViewData->GetPPTY();
 
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index 96b06ec7dfef..72ee0fdaadfa 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -41,7 +41,6 @@
 #include "tabvwsh.hxx"
 #include "scmod.hxx"
 #include "document.hxx"
-//#include "dataobj.hxx"
 #include "transobj.hxx"
 #include "docsh.hxx"
 #include "tabprotection.hxx"
@@ -106,15 +105,14 @@ void __EXPORT ScViewFunctionSet::BeginDrag()
     BOOL bRefMode = pScMod->IsFormulaMode();
     if (!bRefMode)
     {
-        pViewData->GetView()->FakeButtonUp( GetWhich() );   // ButtonUp wird verschluckt
+        pViewData->GetView()->FakeButtonUp( GetWhich() );   // ButtonUp is swallowed
 
         ScMarkData& rMark = pViewData->GetMarkData();
-//      rMark.SetMarking(FALSE);                        // es fehlt ein ButtonUp
         rMark.MarkToSimple();
         if ( rMark.IsMarked() && !rMark.IsMultiMarked() )
         {
             ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP );
-            // bApi = TRUE -> no error mesages
+            // bApi = TRUE -> no error messages
             BOOL bCopied = pViewData->GetView()->CopyToClip( pClipDoc, FALSE, TRUE );
             if ( bCopied )
             {
@@ -159,7 +157,7 @@ void __EXPORT ScViewFunctionSet::BeginDrag()
     Sound::Beep();          // can't drag
 }
 
-//      Selektion
+//      Selection
 
 void __EXPORT ScViewFunctionSet::CreateAnchor()
 {