diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-27 21:12:52 +0300 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-28 14:28:29 +0000 |
| commit | c72bb2da7bc8a7616539d57890139ee8b5360443 (patch) | |
| tree | 773c68072b56e4b51bd301cdd8a0e781ee9d257d /sw | |
| parent | 1fd3167695aaebb050df53acd91f2e1625e8305a (diff) | |
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>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/doc.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/doc/docnew.cxx | 1 | ||||
| -rw-r--r-- | sw/source/core/inc/rolbck.hxx | 10 |
3 files changed, 1 insertions, 12 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 1e77cacd2e72..d1956b84b921 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -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. diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index ea7c899df91c..94ebfeade346 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -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> diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index 138c177840d2..62b01844f43c 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -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: */ |