[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Mar 12 04:45:07 PDT 2012
binfilter/bf_svtools/source/items/svt_rngitem.cxx | 6 ------
binfilter/bf_svtools/source/items1/svt_itemset.cxx | 8 --------
binfilter/bf_svtools/util/svt.flt | 3 ---
binfilter/inc/bf_svtools/nranges.hxx | 4 ----
binfilter/inc/bf_svtools/rngitem.hxx | 10 ----------
5 files changed, 31 deletions(-)
New commits:
commit f89f0d123f9155e0832d1186eb1bd64bbfddd3f1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 12 11:05:37 2012 +0000
ditch SfxULongRanges from binfilter
diff --git a/binfilter/bf_svtools/source/items/svt_rngitem.cxx b/binfilter/bf_svtools/source/items/svt_rngitem.cxx
index 401926b..1964e71 100644
--- a/binfilter/bf_svtools/source/items/svt_rngitem.cxx
+++ b/binfilter/bf_svtools/source/items/svt_rngitem.cxx
@@ -36,12 +36,6 @@
#include <bf_svtools/rngitem.hxx>
#include "svt_rngitem_inc.cxx"
-#define NUMTYPE sal_uInt32
-#define SfxXRangeItem SfxULongRangeItem
-#define SfxXRangesItem SfxULongRangesItem
-#include <bf_svtools/rngitem.hxx>
-#include "svt_rngitem_inc.cxx"
-
#else
// We leave this condition just in case NUMTYPE has been defined externally to this
diff --git a/binfilter/bf_svtools/source/items1/svt_itemset.cxx b/binfilter/bf_svtools/source/items1/svt_itemset.cxx
index c525349..cfb3ada 100644
--- a/binfilter/bf_svtools/source/items1/svt_itemset.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_itemset.cxx
@@ -66,14 +66,6 @@ DBG_NAME(SfxItemSet)
#undef SvNums
#undef SfxNumRanges
-#define NUMTYPE ULONG
-#define SvNums SvULongs
-#define SfxNumRanges SfxULongRanges
-#include "svt_nranges.cxx"
-#undef NUMTYPE
-#undef SvNums
-#undef SfxNumRanges
-
//========================================================================
#ifdef DBG_UTIL
diff --git a/binfilter/bf_svtools/util/svt.flt b/binfilter/bf_svtools/util/svt.flt
index 693a888..5032849 100644
--- a/binfilter/bf_svtools/util/svt.flt
+++ b/binfilter/bf_svtools/util/svt.flt
@@ -53,9 +53,6 @@ Sdbyy_scan
SfxListUndoAction
SfxPointerEntry
SfxUINT32s
-SfxULongRangeItem
-SfxULongRanges
-SfxULongRangesItem
SgfFontLst
SgfFontOne
SqlInternalNode
diff --git a/binfilter/inc/bf_svtools/nranges.hxx b/binfilter/inc/bf_svtools/nranges.hxx
index 194a158..9abd313 100644
--- a/binfilter/inc/bf_svtools/nranges.hxx
+++ b/binfilter/inc/bf_svtools/nranges.hxx
@@ -39,11 +39,7 @@
#define NUMTYPE USHORT
#define SfxNumRanges SfxUShortRanges
#include <bf_svtools/nranges.hxx>
-
#undef NUMTYPE
-#define NUMTYPE ULONG
-#define SfxNumRanges SfxULongRanges
-#include <bf_svtools/nranges.hxx>
#define _SFXNRANGES_HXX
diff --git a/binfilter/inc/bf_svtools/rngitem.hxx b/binfilter/inc/bf_svtools/rngitem.hxx
index 7768d23..39dfebb 100644
--- a/binfilter/inc/bf_svtools/rngitem.hxx
+++ b/binfilter/inc/bf_svtools/rngitem.hxx
@@ -38,16 +38,6 @@
#undef SfxXRangeItem
#undef SfxXRangesItem
-#ifndef _SFXITEMS_HXX
-#define NUMTYPE ULONG
-#define SfxXRangeItem SfxULongRangeItem
-#define SfxXRangesItem SfxULongRangesItem
-#include <bf_svtools/rngitem.hxx>
-#undef NUMTYPE
-#undef SfxXRangeItem
-#undef SfxXRangesItem
-#endif
-
#define _SFXRNGITEM_HXX
#else
More information about the Libreoffice-commits
mailing list