summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Metz <mmetz@adrian-broher.net>2012-01-07 22:14:05 +0400
committerIvan Timofeev <timofeev.i.s@gmail.com>2012-01-07 22:14:05 +0400
commit5b031b4ea68df5ca210a5631c801414b476d8094 (patch)
tree20b09268cd8f8ba9cb72a26dabd6bd4b0f353422
parent948f57e74dda7e64b7c72208eaec00eac1bb96ba (diff)
Remove superfluous _ZFORLIST_DECLARE_TABLE definition.
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx3
-rw-r--r--chart2/source/controller/dialogs/dlg_ObjectProperties.cxx3
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.cxx3
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.cxx3
-rw-r--r--dbaccess/source/ui/browser/sbagrid.cxx1
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx1
-rw-r--r--dbaccess/source/ui/dlg/dlgattr.cxx1
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx2
-rw-r--r--extensions/source/propctrlr/usercontrol.hxx1
-rw-r--r--sc/source/core/data/documen2.cxx1
-rw-r--r--sc/source/core/data/documen8.cxx1
-rw-r--r--sc/source/core/data/document.cxx1
-rw-r--r--sc/source/core/inc/core_pch.hxx2
-rw-r--r--sc/source/filter/inc/filt_pch.hxx2
-rw-r--r--sc/source/ui/inc/ui_pch.hxx2
-rw-r--r--sc/source/ui/view/cellsh1.cxx1
-rw-r--r--sc/source/ui/view/formatsh.cxx1
-rw-r--r--sc/source/ui/view/tabvwsh5.cxx1
-rw-r--r--sc/source/ui/view/tabvwsha.cxx1
-rw-r--r--svl/inc/svl/zforlist.hxx6
-rw-r--r--svl/source/numbers/numuno.cxx2
-rw-r--r--svx/source/items/numfmtsh.cxx1
-rw-r--r--sw/source/core/doc/docfmt.cxx1
-rw-r--r--sw/source/core/doc/tblcpy.cxx1
-rw-r--r--sw/source/core/doc/tblrwcl.cxx1
-rw-r--r--sw/source/core/docnode/ndcopy.cxx1
-rw-r--r--sw/source/ui/shells/tabsh.cxx1
-rw-r--r--sw/source/ui/utlui/numfmtlb.cxx1
-rw-r--r--xmloff/source/style/xmlnumfe.cxx1
-rw-r--r--xmloff/source/style/xmlnumfi.cxx1
30 files changed, 0 insertions, 48 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 5de9287229ec..182a36f22ecc 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 ba1305150dd3..e3a6d22dcb7b 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 8632c4ad167b..b51b30319868 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 39ce58b86ec9..fd456ff2c490 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 7ba5def38d96..6fc175145f0b 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 ecdd3b823525..c100d9df5652 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 3c1c33bc7e4e..5a66b22789f2 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 54eae7916823..b3e654097527 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 d5965600ae34..abffd96eb71e 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 aa99070d9b77..8f2828b6a1b2 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 d62243090bad..cb1bd7d536eb 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 f3507ff2c09a..8f31478bbdc4 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 8bb1f0fc121d..5f98f67f531c 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 ac73821159e9..43a449f3c3af 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 318071d9fd86..c9ec843e66a0 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 9c51f0329139..f482caab08a4 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 3093b8d9ba14..1718741dab58 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 e416409da4e8..4961730d5630 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 36f84ce04e78..d64de030cef3 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 627284a77554..19d408768699 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 0433659daf4a..cc19af392d6f 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 72b41fee4505..a6b14024a71d 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 10cd5f7e4824..05227ea7c688 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 2ddd590a3106..a2e9b876ef26 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 5f17e31bd6a4..aa619aa5d40d 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 3ac2c182d0b3..e3e01083301d 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 d08b182a9bb8..32eb4e01c2a1 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 90bc56c8a5ad..6e6a405b3160 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 e15ad101c868..5b72306c73d9 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 8dc109ad3316..25f88162befd 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>