Bin CLOOK comments and un-split one large switch statement

CLOOK = "Compiler Limit: Out Of Keys", an error reported by Microsoft's
compiler a long time ago. No such problem in those versions we support. No
need to mention CLOOK in comments any more.

While at it, re-combine one large switch statement that was split to avoid
CLOOK.

Change-Id: Id93d973a5fb3c81b6c754eef0ba3b0bd55a649d2
Reviewed-on: https://gerrit.libreoffice.org/3640
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

6 files changed, 12 insertions, 11 deletions

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 71dfb2c7bdbf..c8431cfe87f5 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1940,7 +1940,7 @@ public:
 
     ScFormulaVectorState GetFormulaVectorState( const ScAddress& rPos ) const;
 
-private: // CLOOK-Impl-methods
+private:
 
     /**
      * Use this class as a locale variable to merge number formatter from
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 4831f74d4152..3220463f686a 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -46,9 +46,14 @@
 #include "sc.hrc"
 #include "cfgids.hxx"
 
-//! die Registrierung wird wegen CLOOKs in ein eigenes File wandern muessen...
+//! Here used to be an old German comment: "die Registrierung wird
+//! wegen CLOOKs in ein eigenes File wandern muessen..." which refers
+//! to the infamous CLOOK (Compiler Limit: Out of Keys) problem
+//! (http://msdn.microsoft.com/en-us/library/3d859kh1(v=vs.71).aspx ,
+//! which has not been relevant for many years. Presumably that is
+//! supposed to explain some odd arrangement of source code, or
+//! something. Or maybe that comment is completely irrelevant.
 
-// Interface-Registrierung
 #include "docsh.hxx"
 #include "tabvwsh.hxx"
 #include "prevwsh.hxx"
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 1bbc09f25f64..153ea1634c09 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -240,7 +240,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
     }
 }
 
-sal_uInt16 ScGetFontWorkId();       // wegen CLOOKs - in drtxtob2
+sal_uInt16 ScGetFontWorkId();
 
 //------------------------------------------------------------------
 
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index fbdc1f1782f3..57574350b5ec 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -377,7 +377,7 @@ void ScTabView::SetZoom( const Fraction& rNewX, const Fraction& rNewY, bool bAll
     aViewData.SetZoom( rNewX, rNewY, bAll );
     if (pDrawView)
         pDrawView->RecalcScale();
-    ZoomChanged();              // einzeln wegen CLOOKs
+    ZoomChanged();
 }
 
 void ScTabView::RefreshZoom()
@@ -393,7 +393,7 @@ void ScTabView::SetPagebreakMode( bool bSet )
     aViewData.SetPagebreakMode(bSet);
     if (pDrawView)
         pDrawView->RecalcScale();
-    ZoomChanged();              // einzeln wegen CLOOKs
+    ZoomChanged();
 }
 
 void ScTabView::ResetDrawDragMode()
diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx
index 24b61924041a..66a600006f79 100644
--- a/sc/source/ui/view/tabvwsh9.cxx
+++ b/sc/source/ui/view/tabvwsh9.cxx
@@ -35,7 +35,7 @@
 #include "userdat.hxx"
 #include "docsh.hxx"
 
-// forwards -> galwrap.cxx (wg. CLOOKs)
+// forwards (apparently because of ancient compiler limits not in headers!?)
 
 sal_uInt16  GallerySGA_FORMAT_GRAPHIC();
 Graphic GalleryGetGraphic       ();
@@ -43,8 +43,6 @@ sal_Bool    GalleryIsLinkage        ();
 String  GalleryGetFullPath      ();
 String  GalleryGetFilterName    ();
 
-// forwards -> imapwrap.cxx (wg. CLOOKs)
-
 class SvxIMapDlg;
 
 sal_uInt16          ScIMapChildWindowId();
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index 8a64214c1176..e64b22b7ae02 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -158,8 +158,6 @@ void ScTabViewShell::InsertURL( const String& rName, const String& rURL, const S
 
 //------------------------------------------------------------------------
 
-// wenn CLOOKs: -> mit <editview.hxx> <flditem.hxx>in neue tabvwsh
-
 static void lcl_SelectFieldAfterInsert( EditView& rView )
 {
     ESelection aSel = rView.GetSelection();