Kaydet (Commit) c72bb2da authored tarafından Tor Lillqvist's avatar Tor Lillqvist Kaydeden (comit) David Tardon

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/3640Tested-by: 's avatarLibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst 1fd31676
......@@ -887,7 +887,6 @@ public:
sal_uInt16 GetLineLen( sal_uLong nParagraph, sal_uInt16 nLine ) const;
sal_uLong GetLineHeight( sal_uLong nParagraph, sal_uLong nLine = 0 );
// nFormat must be a value from the enum EETextFormat (due to CLOOKS)
sal_uLong Read( SvStream& rInput, const String& rBaseURL, sal_uInt16, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
::svl::IUndoManager&
......
......@@ -22,6 +22,7 @@
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <vcl/graph.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/field.hxx>
#include <sfx2/bindings.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
......
......@@ -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"
......
......@@ -240,7 +240,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
}
}
sal_uInt16 ScGetFontWorkId(); // wegen CLOOKs - in drtxtob2
sal_uInt16 ScGetFontWorkId();
//------------------------------------------------------------------
......
......@@ -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()
......
......@@ -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();
......
......@@ -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();
......
......@@ -251,10 +251,6 @@ public:
void SetZoomOnPage( sal_Bool bZoom = sal_True ) { mbZoomOnPage = bZoom; }
sal_Bool IsZoomOnPage() { return mbZoomOnPage; }
void CheckLineTo (SfxRequest& rReq);
void FuTemp01(SfxRequest& rReq);
void FuTemp02(SfxRequest& rReq);
void FuTemp03(SfxRequest& rReq);
void FuTemp04(SfxRequest& rReq);
void SetChildWindowState( SfxItemSet& rSet );
void UpdateIMapDlg( SdrObject* pObj );
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -605,7 +605,7 @@ private:
DECL_LINK( AddDrawUndo, SdrUndoAction * );
// DrawModel
void DrawNotifyUndoHdl(); // Because of CLOOKs
void DrawNotifyUndoHdl();
/** Only for internal use and therefore private.
Copy a range within the same or to another document.
......
......@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#define ROLBCK_HISTORY_ONLY // The fight against the CLOOK's
#include <doc.hxx>
#include <dcontact.hxx>
#include <com/sun/star/document/PrinterIndependentLayout.hpp>
......
......@@ -25,8 +25,6 @@
#include <vector>
#include <set>
//Nur die History anziehen, um das docnew.cxx gegen die CLOOK's zu behaupten.
namespace sfx2 {
class MetadatableUndo;
}
......@@ -51,8 +49,6 @@ class SwFmtChain;
class SwNode;
class SwCharFmt;
#ifndef ROLBCK_HISTORY_ONLY
#include <tox.hxx>
#include <SwNumberTreeTypes.hxx>
......@@ -339,8 +335,6 @@ public:
};
#endif
class SwpHstry : public std::vector<SwHistoryHint*> {
public:
// the destructor will free all objects still in the vector
......@@ -401,8 +395,6 @@ public:
void CopyFmtAttr( const SfxItemSet& rSet, sal_uLong nNodeIdx );
};
#ifndef ROLBCK_HISTORY_ONLY
class SwRegHistory : public SwClient
{
private:
......@@ -431,8 +423,6 @@ public:
void ChangeNodeIndex( sal_uLong nNew ) { m_nNodeIndex = nNew; }
};
#endif
#endif // _ROLBCK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment