[Libreoffice] [PATCH] Remove superfluous _ZFORLIST_DECLARE_TABLE definition.

Marcel Metz <mmetz -AT- adrian-broher.net>
Sat, 07 Jan 2012 17:19:16 +0100

Hello lo-devs,

this patch removes the superfluous _ZFORLIST_DECLARE_TABLE define that
is explicit defined right in in front of the conditional code.

regards

Marcel Metz

---
 chart2/source/controller/dialogs/DataBrowser.cxx   |    3 ---
 .../controller/dialogs/dlg_ObjectProperties.cxx    |    3 ---
 .../source/controller/dialogs/tp_AxisPositions.cxx |    3 ---
 chart2/source/controller/dialogs/tp_Scale.cxx      |    3 ---
 dbaccess/source/ui/browser/sbagrid.cxx             |    1 -
 dbaccess/source/ui/control/FieldDescControl.cxx    |    1 -
 dbaccess/source/ui/dlg/dlgattr.cxx                 |    1 -
 dbaccess/source/ui/misc/UITools.cxx                |    2 --
 extensions/source/propctrlr/usercontrol.hxx        |    1 -
 sc/source/core/data/documen2.cxx                   |    1 -
 sc/source/core/data/documen8.cxx                   |    1 -
 sc/source/core/data/document.cxx                   |    1 -
 sc/source/core/inc/core_pch.hxx                    |    2 --
 sc/source/filter/inc/filt_pch.hxx                  |    2 --
 sc/source/ui/inc/ui_pch.hxx                        |    2 --
 sc/source/ui/view/cellsh1.cxx                      |    1 -
 sc/source/ui/view/formatsh.cxx                     |    1 -
 sc/source/ui/view/tabvwsh5.cxx                     |    1 -
 sc/source/ui/view/tabvwsha.cxx                     |    1 -
 svl/inc/svl/zforlist.hxx                           |    6 ------
 svl/source/numbers/numuno.cxx                      |    2 --
 svx/source/items/numfmtsh.cxx                      |    1 -
 sw/source/core/doc/docfmt.cxx                      |    1 -
 sw/source/core/doc/tblcpy.cxx                      |    1 -
 sw/source/core/doc/tblrwcl.cxx                     |    1 -
 sw/source/core/docnode/ndcopy.cxx                  |    1 -
 sw/source/ui/shells/tabsh.cxx                      |    1 -
 sw/source/ui/utlui/numfmtlb.cxx                    |    1 -
 xmloff/source/style/xmlnumfe.cxx                   |    1 -
 xmloff/source/style/xmlnumfi.cxx                   |    1 -
 30 files changed, 0 insertions(+), 48 deletions(-)

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx 
b/chart2/source/controller/dialogs/DataBrowser.cxx
index 5de9287..182a36f 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -29,9 +29,6 @@
 
 // header for class SvNumberformat
 #ifndef _ZFORMAT_HXX
-#ifndef _ZFORLIST_DECLARE_TABLE
-#define _ZFORLIST_DECLARE_TABLE
-#endif
 #include <svl/zformat.hxx>
 #endif
 // header for SvNumberFormatter
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx 
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index ba13051..e3a6d22 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -27,9 +27,6 @@
  ************************************************************************/
 
 #ifndef _ZFORLIST_HXX
-#ifndef _ZFORLIST_DECLARE_TABLE
-#define _ZFORLIST_DECLARE_TABLE
-#endif
 #include <svl/zforlist.hxx>
 #endif
 
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx 
b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 8632c4a..b51b303 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -49,9 +49,6 @@
 
 // header for class SvNumberformat
 #ifndef _ZFORMAT_HXX
-#ifndef _ZFORLIST_DECLARE_TABLE
-#define _ZFORLIST_DECLARE_TABLE
-#endif
 #include <svl/zformat.hxx>
 #endif
 
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx 
b/chart2/source/controller/dialogs/tp_Scale.cxx
index 39ce58b..fd456ff 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -49,9 +49,6 @@
 
 // header for class SvNumberformat
 #ifndef _ZFORMAT_HXX
-#ifndef _ZFORLIST_DECLARE_TABLE
-#define _ZFORLIST_DECLARE_TABLE
-#endif
 #include <svl/zformat.hxx>
 #endif
 
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 7ba5def..6fc1751 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -38,7 +38,6 @@
 #define ITEMID_NUMBERINFO       SID_ATTR_NUMBERFORMAT_INFO
 
 
-#define _ZFORLIST_DECLARE_TABLE
 #include <svx/numinf.hxx>
 #include <svx/dbaexchange.hxx>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx 
b/dbaccess/source/ui/control/FieldDescControl.cxx
index ecdd3b8..c100d9d 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -48,7 +48,6 @@
 #include <svx/svxids.hrc>
 #include <svx/algitem.hxx>
 #include <svl/itempool.hxx>
-#define _ZFORLIST_DECLARE_TABLE     // ohne das bekomme ich einen Compiler-Fehler in 
<svl/zforlist.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/rngitem.hxx>
 #include <svl/intitem.hxx>
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index 3c1c33b..5a66b22 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -39,7 +39,6 @@
 #include <svx/dialogs.hrc>
 #include "dbu_dlg.hrc"
 #include <svl/itemset.hxx>
-#define _ZFORLIST_DECLARE_TABLE
 #include <svl/zforlist.hxx>
 #include <svx/svxids.hrc>
 #include <svx/flagsdef.hxx>
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 54eae79..b3e6540 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -97,8 +97,6 @@
 #include <svl/intitem.hxx>
 #include <svx/algitem.hxx>
 #include <svx/numinf.hxx>
-#define _ZFORLIST_DECLARE_TABLE
-#include <svx/numinf.hxx>
 #include <svl/zforlist.hxx>
 #include "dlgattr.hxx"
 #include <vcl/msgbox.hxx>
diff --git a/extensions/source/propctrlr/usercontrol.hxx 
b/extensions/source/propctrlr/usercontrol.hxx
index d596560..abffd96 100644
--- a/extensions/source/propctrlr/usercontrol.hxx
+++ b/extensions/source/propctrlr/usercontrol.hxx
@@ -30,7 +30,6 @@
 #define _EXTENSIONS_PROPCTRLR_USERCONTROL_HXX_
 
 #include "commoncontrol.hxx"
-#define _ZFORLIST_DECLARE_TABLE
 #include <svtools/fmtfield.hxx>
 #include <svtools/fileurlbox.hxx>
 #include "standardcontrol.hxx"
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index aa99070..8f2828b6 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -29,7 +29,6 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#define _ZFORLIST_DECLARE_TABLE
 #include "scitems.hxx"
 #include <editeng/eeitem.hxx>
 
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index d622430..cb1bd7d 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -28,7 +28,6 @@
 
 
 
-#define _ZFORLIST_DECLARE_TABLE
 #include "scitems.hxx"
 #include <editeng/eeitem.hxx>
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 61fdbe5..11240b40 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -29,7 +29,6 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#define _ZFORLIST_DECLARE_TABLE
 #include "scitems.hxx"
 #include <editeng/eeitem.hxx>
 
diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx
index 8bb1f0f..5f98f67 100644
--- a/sc/source/core/inc/core_pch.hxx
+++ b/sc/source/core/inc/core_pch.hxx
@@ -31,8 +31,6 @@
 #include "scitems.hxx"
 
 
-#define _ZFORLIST_DECLARE_TABLE
-
 #define SC_PROGRESS_CXX
 
 #include <tools/solar.h>
diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx
index ac73821..43a449f 100644
--- a/sc/source/filter/inc/filt_pch.hxx
+++ b/sc/source/filter/inc/filt_pch.hxx
@@ -31,8 +31,6 @@
 #include "scitems.hxx"
 
 
-#define _ZFORLIST_DECLARE_TABLE
-
 #define SC_PROGRESS_CXX
 
 #include <tools/solar.h>
diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx
index 318071d..c9ec843 100644
--- a/sc/source/ui/inc/ui_pch.hxx
+++ b/sc/source/ui/inc/ui_pch.hxx
@@ -30,8 +30,6 @@
 
 #include "scitems.hxx"
 
-#define _ZFORLIST_DECLARE_TABLE
-
 #define _PRINTFUN_CXX
 #define _INPUTHDL_CXX
 
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 9c51f03..f482caa 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -50,7 +50,6 @@
 #include "scitems.hxx"
 #include <sfx2/viewfrm.hxx>
 
-#define _ZFORLIST_DECLARE_TABLE
 #include <svl/stritem.hxx>
 #include <svl/whiter.hxx>
 #include <svl/zforlist.hxx>
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index dd619fe..a9ba6b9 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -60,7 +60,6 @@
 #include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
 
-#define _ZFORLIST_DECLARE_TABLE
 #include <svl/stritem.hxx>
 #include <svl/zformat.hxx>
 #include <svl/languageoptions.hxx>
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index e416409..4961730 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -30,7 +30,6 @@
 
 
 // INCLUDE ---------------------------------------------------------------
-#define _ZFORLIST_DECLARE_TABLE
 #include "scitems.hxx"
 #include <svl/smplhint.hxx>
 #include <svl/zforlist.hxx>
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 36f84ce..d64de03 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -31,7 +31,6 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#define _ZFORLIST_DECLARE_TABLE
 #include "scitems.hxx"
 #include <svl/stritem.hxx>
 #include <svl/whiter.hxx>
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 627284a..19d4087 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -214,14 +214,8 @@ enum NfEvalDateFormat
 };
 
 
-#define _ZFORLIST_DECLARE_TABLE
-#ifdef _ZFORLIST_DECLARE_TABLE
 DECLARE_TABLE (SvNumberFormatTable, SvNumberformat*)
 DECLARE_TABLE (SvNumberFormatterIndexTable, sal_uInt32*)
-#else
-typedef Table SvNumberFormatTable;
-typedef Table SvNumberFormatterIndexTable;
-#endif
 
 typedef ::std::map< sal_uInt32, sal_uInt32 > SvNumberFormatterMergeMap;
 
diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index 0433659..cc19af3 100644
--- a/svl/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.cxx
@@ -27,8 +27,6 @@
  ************************************************************************/
 
 
-#define _ZFORLIST_DECLARE_TABLE
-
 #include <comphelper/servicehelper.hxx>
 
 #include <svl/numuno.hxx>
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 72b41fe..a6b1402 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -35,7 +35,6 @@
 #include <tools/debug.hxx>
 #include <i18npool/mslangid.hxx>
 
-#define _ZFORLIST_DECLARE_TABLE
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
 
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 10cd5f7..05227ea 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -28,7 +28,6 @@
 
 
 
-#define _ZFORLIST_DECLARE_TABLE
 #include <hintids.hxx>
 #include <rtl/logfile.hxx>
 #include <svl/itemiter.hxx>
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 2ddd590..a2e9b87 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -30,7 +30,6 @@
 
 #include <hintids.hxx>
 
-#define _ZFORLIST_DECLARE_TABLE
 #include <svl/zforlist.hxx>
 #include <frmfmt.hxx>
 #include <doc.hxx>
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 5f17e31..aa619aa 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <hintids.hxx>
 
-#define _ZFORLIST_DECLARE_TABLE
 #include <editeng/brshitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/protitem.hxx>
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 3ac2c18..e3e0108 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -29,7 +29,6 @@
 
 #include <editeng/brkitem.hxx>
 
-#define _ZFORLIST_DECLARE_TABLE
 #include <hintids.hxx>
 #include <fmtpdsc.hxx>
 #include <fmtanchr.hxx>
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index d08b182..32eb4e0 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -29,7 +29,6 @@
 #include <hintids.hxx>
 
 #ifndef _ZFORLIST_HXX
-#define _ZFORLIST_DECLARE_TABLE
 #include <svl/zforlist.hxx>
 #endif
 #include <svl/stritem.hxx>
diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx
index 90bc56c..6e6a405 100644
--- a/sw/source/ui/utlui/numfmtlb.cxx
+++ b/sw/source/ui/utlui/numfmtlb.cxx
@@ -35,7 +35,6 @@
 #include <unotools/localedatawrapper.hxx>
 #include <i18npool/lang.h>
 #ifndef _ZFORMAT_HXX //autogen
-#define _ZFORLIST_DECLARE_TABLE
 #include <svl/zformat.hxx>
 #endif
 #include <svl/eitem.hxx>
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index e15ad10..5b72306 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -28,7 +28,6 @@
 
 
 #define _SVSTDARR_ULONGS
-#define _ZFORLIST_DECLARE_TABLE
 
 #include <svl/svstdarr.hxx>
 #include <svl/zforlist.hxx>
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 8dc109a..25f8816 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -29,7 +29,6 @@
 
 #include <unotools/syslocale.hxx>
 
-#define _ZFORLIST_DECLARE_TABLE
 #include <svl/zforlist.hxx>
 
 #include <svl/zformat.hxx>

Context

[Libreoffice] [PATCH] Remove superfluous _ZFORLIST_DECLARE_TABLE definition. · Marcel Metz
- Re: [Libreoffice] [PUSHED][PATCH] Remove superfluous _ZFORLIST_DECLARE_TABLE definition. · Ivan Timofeev

Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.