[Libreoffice] [PATCH] Remove redundant #ifndef & #ifdef directives

A patch to remove some unused directives.

Graeme

From d82df8d1770a623b0d1943583e1cc070918ac54f Mon Sep 17 00:00:00 2001
From: J. Graeme Lingard <jgraeme+git@gmail.com>
Date: Fri, 8 Oct 2010 23:49:34 +0100
Subject: [PATCH] Remove redundant #ifndef & #ifdef directives

This change removes multiple unused #ifndef & #ifdef directives, plus
some unnecessary comments.
---
 .../source/processfactory/componentfactory.cxx     |    4 ----
 svl/source/items/aeitem.cxx                        |    2 --
 svl/source/items/itemiter.cxx                      |    3 ---
 svl/source/items/itempool.cxx                      |    2 --
 svl/source/items/itemset.cxx                       |    3 ---
 svl/source/items/macitem.cxx                       |    3 ---
 svl/source/items/poolcach.cxx                      |    3 ---
 svl/source/items/poolio.cxx                        |    3 ---
 svl/source/items/sitem.cxx                         |    4 ----
 svl/source/items/whiter.cxx                        |    3 ---
 svl/source/misc/PasswordHelper.cxx                 |    3 ---
 svl/source/notify/brdcst.cxx                       |    2 --
 svl/source/notify/broadcast.cxx                    |    2 --
 svl/source/notify/hint.cxx                         |    2 --
 svl/source/notify/isethint.cxx                     |    3 ---
 svl/source/notify/listener.cxx                     |    2 --
 svl/source/notify/listenerbase.cxx                 |    2 --
 svl/source/notify/listeneriter.cxx                 |    2 --
 svl/source/notify/lstner.cxx                       |    2 --
 svl/source/notify/smplhint.cxx                     |    2 --
 svl/source/numbers/numfmuno.cxx                    |    2 --
 svl/source/numbers/numhead.cxx                     |    2 --
 svl/source/numbers/numuno.cxx                      |    2 --
 svl/source/numbers/zforlist.cxx                    |    2 --
 svl/source/numbers/zforscan.cxx                    |    2 --
 svtools/source/brwbox/brwbox2.cxx                  |    2 --
 svtools/source/brwbox/brwhead.cxx                  |    3 ---
 svtools/source/brwbox/datwin.cxx                   |    3 ---
 svtools/source/config/menuoptions.cxx              |    6 ------
 svtools/source/contnr/ivctrl.cxx                   |    3 ---
 svtools/source/contnr/svicnvw.cxx                  |    3 ---
 svtools/source/contnr/svtreebx.cxx                 |    2 --
 svtools/source/contnr/treelist.cxx                 |    8 --------
 svtools/source/control/filectrl.cxx                |    3 ---
 svtools/source/dialogs/colrdlg.cxx                 |    2 --
 svtools/source/dialogs/prnsetup.cxx                |    3 ---
 svtools/source/dialogs/property.cxx                |    4 ----
 svtools/source/misc/ehdl.cxx                       |    3 ---
 svtools/source/urlobj/inetimg.cxx                  |    3 ---
 unotools/source/config/accelcfg.cxx                |    3 +--
 unotools/source/config/cacheoptions.cxx            |    6 ------
 unotools/source/config/dynamicmenuoptions.cxx      |    6 ------
 unotools/source/config/fontoptions.cxx             |    6 ------
 unotools/source/config/historyoptions.cxx          |    6 ------
 unotools/source/config/internaloptions.cxx         |    6 ------
 unotools/source/config/javaoptions.cxx             |    2 --
 unotools/source/config/localisationoptions.cxx     |    6 ------
 unotools/source/config/moduleoptions.cxx           |    6 ------
 unotools/source/config/pathoptions.cxx             |    2 --
 unotools/source/config/printwarningoptions.cxx     |    6 ------
 unotools/source/config/saveopt.cxx                 |    3 ---
 unotools/source/config/securityoptions.cxx         |    6 ------
 unotools/source/config/startoptions.cxx            |    6 ------
 unotools/source/config/workingsetoptions.cxx       |    6 ------
 unotools/source/misc/syslocale.cxx                 |    2 --
 55 files changed, 1 insertions(+), 187 deletions(-)

diff --git a/comphelper/source/processfactory/componentfactory.cxx 
b/comphelper/source/processfactory/componentfactory.cxx
index f0f5606..db32df8 100644
--- a/comphelper/source/processfactory/componentfactory.cxx
+++ b/comphelper/source/processfactory/componentfactory.cxx
@@ -35,10 +35,6 @@
 #include <cppuhelper/shlib.hxx>
 
 
-#ifndef GCC
-#endif
-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index 2095cf6..5288843 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -27,8 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
 
 #include <tools/string.hxx>
 
diff --git a/svl/source/items/itemiter.cxx b/svl/source/items/itemiter.cxx
index ae50822..c736f69 100644
--- a/svl/source/items/itemiter.cxx
+++ b/svl/source/items/itemiter.cxx
@@ -28,9 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-#ifndef GCC
-#endif
-
 #include <svl/itemiter.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 760f955..0467ceb 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -30,8 +30,6 @@
 
 #include <string.h>
 #include <stdio.h>
-#ifndef GCC
-#endif
 
 #include <svl/itempool.hxx>
 #include "whassert.hxx"
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index e864ab4..b260d6a 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -34,9 +34,6 @@
 #include <cstdarg>
 #endif
 
-#ifndef GCC
-#endif
-
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_ULONGS
 
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index fa17750..3031091 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -29,9 +29,6 @@
 #include "precompiled_svl.hxx"
 #include <tools/stream.hxx>
 
-#ifndef GCC
-#endif
-
 #include <svl/macitem.hxx>
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx
index 74172ea..0e8c03e 100644
--- a/svl/source/items/poolcach.cxx
+++ b/svl/source/items/poolcach.cxx
@@ -30,9 +30,6 @@
 
 #include <limits.h>
 
-#ifndef GCC
-#endif
-
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 #include "poolcach.hxx"
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index c306aaf..dc69cbb 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -31,9 +31,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#ifndef GCC
-#endif
-
 #include <tools/solar.h>
 #include <svl/itempool.hxx>
 #include "whassert.hxx"
diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx
index 1c4bb2e..f43c5f8 100644
--- a/svl/source/items/sitem.cxx
+++ b/svl/source/items/sitem.cxx
@@ -27,10 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-// INCLUDE ---------------------------------------------------------------
-
-#ifndef GCC
-#endif
 
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
diff --git a/svl/source/items/whiter.cxx b/svl/source/items/whiter.cxx
index fc4d3c8..b662b93 100644
--- a/svl/source/items/whiter.cxx
+++ b/svl/source/items/whiter.cxx
@@ -27,9 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-// INCLUDE ---------------------------------------------------------------
-#ifndef GCC
-#endif
 
 #include "whiter.hxx"
 #include <svl/itemset.hxx>
diff --git a/svl/source/misc/PasswordHelper.cxx b/svl/source/misc/PasswordHelper.cxx
index fb53b10..30fb76c 100644
--- a/svl/source/misc/PasswordHelper.cxx
+++ b/svl/source/misc/PasswordHelper.cxx
@@ -28,9 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-
-#ifndef GCC
-#endif
 #include "PasswordHelper.hxx"
 #include <rtl/digest.h>
 #include <tools/string.hxx>
diff --git a/svl/source/notify/brdcst.cxx b/svl/source/notify/brdcst.cxx
index da762d6..8472adf 100644
--- a/svl/source/notify/brdcst.cxx
+++ b/svl/source/notify/brdcst.cxx
@@ -28,8 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-#ifndef GCC
-#endif
 #include <tools/debug.hxx>
 
 #include <svl/hint.hxx>
diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx
index 5a4dc46..7b4d7c7 100644
--- a/svl/source/notify/broadcast.cxx
+++ b/svl/source/notify/broadcast.cxx
@@ -28,8 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-#ifndef GCC
-#endif
 #include <tools/debug.hxx>
 
 #include "listener.hxx"
diff --git a/svl/source/notify/hint.cxx b/svl/source/notify/hint.cxx
index e36f446..7e85c8c 100644
--- a/svl/source/notify/hint.cxx
+++ b/svl/source/notify/hint.cxx
@@ -27,8 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
 
 #include <svl/hint.hxx>
 
diff --git a/svl/source/notify/isethint.cxx b/svl/source/notify/isethint.cxx
index 1fa38a9..6cbff3a 100644
--- a/svl/source/notify/isethint.cxx
+++ b/svl/source/notify/isethint.cxx
@@ -28,9 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-#ifndef GCC
-#endif
-
 #include <svl/isethint.hxx>
 #include <svl/itemset.hxx>
 
diff --git a/svl/source/notify/listener.cxx b/svl/source/notify/listener.cxx
index 739a324..b86fbf9 100644
--- a/svl/source/notify/listener.cxx
+++ b/svl/source/notify/listener.cxx
@@ -27,8 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
 
 #include <tools/debug.hxx>
 
diff --git a/svl/source/notify/listenerbase.cxx b/svl/source/notify/listenerbase.cxx
index f51cb11..c5abb41 100644
--- a/svl/source/notify/listenerbase.cxx
+++ b/svl/source/notify/listenerbase.cxx
@@ -27,8 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
 
 #include <tools/debug.hxx>
 
diff --git a/svl/source/notify/listeneriter.cxx b/svl/source/notify/listeneriter.cxx
index a0c29f8..4673962 100644
--- a/svl/source/notify/listeneriter.cxx
+++ b/svl/source/notify/listeneriter.cxx
@@ -27,8 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
 #include <tools/debug.hxx>
 
 #include "listenerbase.hxx"
diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx
index b469d7f..eff3527 100644
--- a/svl/source/notify/lstner.cxx
+++ b/svl/source/notify/lstner.cxx
@@ -27,8 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
 
 #include <tools/debug.hxx>
 
diff --git a/svl/source/notify/smplhint.cxx b/svl/source/notify/smplhint.cxx
index 9eb0461..645fc6e 100644
--- a/svl/source/notify/smplhint.cxx
+++ b/svl/source/notify/smplhint.cxx
@@ -27,8 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
 
 #include <svl/smplhint.hxx>
 
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index ffc735a..94cbc99 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -27,8 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
 
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
diff --git a/svl/source/numbers/numhead.cxx b/svl/source/numbers/numhead.cxx
index e95a581..38cab29 100644
--- a/svl/source/numbers/numhead.cxx
+++ b/svl/source/numbers/numhead.cxx
@@ -27,8 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
 #include <tools/debug.hxx>
 
 #include "numhead.hxx"
diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index 4d53ecc..3a3f160 100644
--- a/svl/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.cxx
@@ -27,8 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
 
 #define _ZFORLIST_DECLARE_TABLE
 
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 7f47732..5268834 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -27,8 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
 
 #include <tools/debug.hxx>
 #include <unotools/charclass.hxx>
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index c88c6c2..8482140 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -27,8 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
 
 #include <stdlib.h>
 #include <tools/debug.hxx>
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 5f81ebe..00b9076 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -33,8 +33,6 @@
 #include <svtools/colorcfg.hxx>
 #include <vcl/salgtype.hxx>
 
-#ifndef GCC
-#endif
 #include <tools/multisel.hxx>
 #include <algorithm>
 
diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx
index 3e85664..698629a 100644
--- a/svtools/source/brwbox/brwhead.cxx
+++ b/svtools/source/brwbox/brwhead.cxx
@@ -31,9 +31,6 @@
 #include <svtools/brwhead.hxx>
 #include <svtools/brwbox.hxx>
 
-#ifndef GCC
-#endif
-
 //===================================================================
 
 BrowserHeader::BrowserHeader( BrowseBox* pParent, WinBits nWinBits )
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 8d7a6d5..1e2696b 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -30,9 +30,6 @@
 
 #include "datwin.hxx"
 
-#ifndef GCC
-#endif
-
 #include <vcl/svapp.hxx>
 
 #include <vcl/help.hxx>
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 7ab4216..f2425e0 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -27,12 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#ifndef GCC
-#endif
-
-//_________________________________________________________________________________________________________________
-//     includes
-//_________________________________________________________________________________________________________________
 
 #include <svtools/menuoptions.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 945b20a..fb69778 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -28,9 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifndef GCC
-#endif
-
 #include "ivctrl.hxx"
 #include "imivctl.hxx"
 #include <vcl/bitmapex.hxx>
diff --git a/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx
index f43f29d..bb5bb13 100644
--- a/svtools/source/contnr/svicnvw.cxx
+++ b/svtools/source/contnr/svicnvw.cxx
@@ -33,9 +33,6 @@
 #include <svimpicn.hxx>
 #include <svtools/svlbitm.hxx>
 
-#ifndef GCC
-#endif
-
 #define ICNVW_BLOCK_ENTRYINS   0x0001
 
 SvIcnVwDataEntry::SvIcnVwDataEntry()
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index 3b797ee..8997263 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -30,8 +30,6 @@
 
 #define _SVTREEBX_CXX
 #include <vcl/svapp.hxx>
-#ifndef GCC
-#endif
 
 class TabBar;
 
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index b246145..d234c48 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -30,16 +30,8 @@
 
 #define _TREELIST_CXX
 
-#ifndef GCC
-#endif
-
 #include <svtools/treelist.hxx>
 
-#ifdef DBG_UTIL
-// Prueft Integritaet der Liste nach jeder Operation
-//#define CHECK_INTEGRITY
-#endif
-
 
 DBG_NAME(SvListEntry);
 
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index d6a554e..bcf4916 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -34,9 +34,6 @@
 #include <filectrl.hxx>
 #include <filectrl.hrc>
 
-#ifndef GCC
-#endif
-
 // =======================================================================
 
 FileControl::FileControl( Window* pParent, WinBits nStyle, FileControlMode nFlags ) :
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index 7503436..a2d9472 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -27,8 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#ifndef GCC
-#endif
 
 #include <svtools/svtdata.hxx>
 #include "colrdlg.hrc"
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 463440d..858d739 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -30,9 +30,6 @@
 #include <tools/debug.hxx>
 #include <vcl/print.hxx>
 
-#ifndef GCC
-#endif
-
 #include <svtools/svtdata.hxx>
 #include "prnsetup.hrc"
 #include <svtools/prnsetup.hxx>
diff --git a/svtools/source/dialogs/property.cxx b/svtools/source/dialogs/property.cxx
index 087db18..6efd58f 100644
--- a/svtools/source/dialogs/property.cxx
+++ b/svtools/source/dialogs/property.cxx
@@ -28,10 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-
-#ifndef GCC
-#endif
-
 #include "property.hxx"
 
 #define FRAME_OFFSET 4
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 0ff2a33..7705d95 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -37,9 +37,6 @@
 #include <vcl/sound.hxx>
 #endif
 
-#ifndef GCC
-#endif
-
 #include <svtools/ehdl.hxx>
 #include <svtools/svtdata.hxx>
 #include <svtools/svtools.hrc>
diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx
index 3ae55eb..83b5605 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.cxx
@@ -31,9 +31,6 @@
 #include <sot/formats.hxx>
 #include <tools/stream.hxx>
 
-#ifndef GCC
-#endif
-
 #include "inetimg.hxx"
 
 #define TOKEN_SEPARATOR '\001'
diff --git a/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx
index 9e2602b..fd1ec77 100644
--- a/unotools/source/config/accelcfg.cxx
+++ b/unotools/source/config/accelcfg.cxx
@@ -27,8 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
-#ifndef GCC
-#endif
+
 #include "rtl/instance.hxx"
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/unotools/source/config/cacheoptions.cxx b/unotools/source/config/cacheoptions.cxx
index af2565f..766bc92 100644
--- a/unotools/source/config/cacheoptions.cxx
+++ b/unotools/source/config/cacheoptions.cxx
@@ -27,12 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
-#ifndef GCC
-#endif
-
-//_________________________________________________________________________________________________________________
-//     includes
-//_________________________________________________________________________________________________________________
 
 #include <unotools/cacheoptions.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/unotools/source/config/dynamicmenuoptions.cxx 
b/unotools/source/config/dynamicmenuoptions.cxx
index 44a4d05..e461bab 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -27,12 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
-#ifndef GCC
-#endif
-
-//_________________________________________________________________________________________________________________
-//     includes
-//_________________________________________________________________________________________________________________
 
 #include <unotools/dynamicmenuoptions.hxx>
 #include <unotools/moduleoptions.hxx>
diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx
index 151c57a..08b407f 100644
--- a/unotools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.cxx
@@ -27,12 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
-#ifndef GCC
-#endif
-
-//_________________________________________________________________________________________________________________
-//     includes
-//_________________________________________________________________________________________________________________
 
 #include <unotools/fontoptions.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 784ae4e..16d725b 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -27,12 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
-#ifndef GCC
-#endif
-
-//_________________________________________________________________________________________________________________
-// includes
-//_________________________________________________________________________________________________________________
 
 #include <unotools/historyoptions.hxx>
 #include <unotools/historyoptions_const.hxx>
diff --git a/unotools/source/config/internaloptions.cxx b/unotools/source/config/internaloptions.cxx
index 281a8ea..4375a6e 100644
--- a/unotools/source/config/internaloptions.cxx
+++ b/unotools/source/config/internaloptions.cxx
@@ -27,12 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
-#ifndef GCC
-#endif
-
-//_________________________________________________________________________________________________________________
-//     includes
-//_________________________________________________________________________________________________________________
 
 #include <deque>
 
diff --git a/unotools/source/config/javaoptions.cxx b/unotools/source/config/javaoptions.cxx
index 51fbacc..8b3c7ae 100644
--- a/unotools/source/config/javaoptions.cxx
+++ b/unotools/source/config/javaoptions.cxx
@@ -27,8 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
-#ifndef GCC
-#endif
 
 #include <unotools/javaoptions.hxx>
 #include <com/sun/star/uno/Any.h>
diff --git a/unotools/source/config/localisationoptions.cxx 
b/unotools/source/config/localisationoptions.cxx
index 523c8b9..fcdea6a 100644
--- a/unotools/source/config/localisationoptions.cxx
+++ b/unotools/source/config/localisationoptions.cxx
@@ -27,12 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
-#ifndef GCC
-#endif
-
-//_________________________________________________________________________________________________________________
-//     includes
-//_________________________________________________________________________________________________________________
 
 #include <unotools/localisationoptions.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 7414a83..57a4b99 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -27,12 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
-#ifndef GCC
-#endif
-
-//_________________________________________________________________________________________________________________
-//     includes
-//_________________________________________________________________________________________________________________
 
 #include <unotools/moduleoptions.hxx>
 #include <comphelper/sequenceashashmap.hxx>
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index b02f912..6580e4e 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -27,8 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
-#ifndef GCC
-#endif
 
 #include <unotools/pathoptions.hxx>
 #include <unotools/configitem.hxx>
diff --git a/unotools/source/config/printwarningoptions.cxx 
b/unotools/source/config/printwarningoptions.cxx
index 482b267..561899f 100644
--- a/unotools/source/config/printwarningoptions.cxx
+++ b/unotools/source/config/printwarningoptions.cxx
@@ -27,12 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
-#ifndef GCC
-#endif
-
-//_________________________________________________________________________________________________________________
-//     includes
-//_________________________________________________________________________________________________________________
 
 #include <unotools/printwarningoptions.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 6f9aefe..6c92a7e 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -28,9 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
 
-#ifndef GCC
-#endif
-
 #include <unotools/saveopt.hxx>
 #include "rtl/instance.hxx"
 #include <unotools/configmgr.hxx>
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index b8b6bb6..5417e4f 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -27,12 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
-#ifndef GCC
-#endif
-
-//_________________________________________________________________________________________________________________
-//     includes
-//_________________________________________________________________________________________________________________
 
 #include <unotools/securityoptions.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/unotools/source/config/startoptions.cxx b/unotools/source/config/startoptions.cxx
index a4a0572..ad6e7db 100644
--- a/unotools/source/config/startoptions.cxx
+++ b/unotools/source/config/startoptions.cxx
@@ -27,12 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
-#ifndef GCC
-#endif
-
-//_________________________________________________________________________________________________________________
-//     includes
-//_________________________________________________________________________________________________________________
 
 #include <unotools/startoptions.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/unotools/source/config/workingsetoptions.cxx 
b/unotools/source/config/workingsetoptions.cxx
index f581cc4..40df723 100644
--- a/unotools/source/config/workingsetoptions.cxx
+++ b/unotools/source/config/workingsetoptions.cxx
@@ -27,12 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
-#ifndef GCC
-#endif
-
-//_________________________________________________________________________________________________________________
-//     includes
-//_________________________________________________________________________________________________________________
 
 #include <unotools/workingsetoptions.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx
index e6da175..700b9de 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.cxx
@@ -27,8 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
-#ifndef GCC
-#endif
 
 #include <unotools/syslocale.hxx>
 #include <tools/string.hxx>
-- 
1.7.1