diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-25 00:05:58 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-25 11:58:26 +0100 |
| commit | 4efd419679e9a43b47bfe970fc5b1c2d7c680890 (patch) | |
| tree | df1484d33029d7e78618cffb894c7b151d04bea8 /svtools/inc | |
| parent | 7d8cc784403f857f652e4579f28a2c0d478610c2 (diff) | |
after nine years, time to give up on the REGEXP_SUPPORT dream
Diffstat (limited to 'svtools/inc')
| -rw-r--r-- | svtools/inc/svtools/fmtfield.hxx | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/svtools/inc/svtools/fmtfield.hxx b/svtools/inc/svtools/fmtfield.hxx index fdbf2518b69b..d4fd75a23797 100644 --- a/svtools/inc/svtools/fmtfield.hxx +++ b/svtools/inc/svtools/fmtfield.hxx @@ -33,17 +33,7 @@ #include <vcl/spinfld.hxx> #include <svl/zforlist.hxx> -//#define REGEXP_SUPPORT - -#ifdef REGEXP_SUPPORT - #ifndef _UNOTOOLS_TEXTSEARCH_HXX - #include <unotools/textsearch.hxx> - #endif -#else - // use a hand-made regular expression parsing for the small expression we're interested in - // as soon as OOo does have regular expression support, we can switch on the REGEXP_SUPPORT define - namespace validation { class NumberValidator; } -#endif +namespace validation { class NumberValidator; } typedef sal_uInt16 FORMAT_CHANGE_TYPE; #define FCT_KEYONLY 0x00 // only a new key was set @@ -282,31 +272,19 @@ protected: class SVT_DLLPUBLIC DoubleNumericField : public FormattedField { protected: -#ifdef REGEXP_SUPPORT - ::utl::TextSearch* m_pConformanceTester; -#else validation::NumberValidator* m_pNumberValidator; -#endif public: DoubleNumericField(Window* pParent, WinBits nStyle = 0) :FormattedField(pParent, nStyle) -#ifdef REGEXP_SUPPORT - ,m_pConformanceTester( NULL ) -#else ,m_pNumberValidator( NULL ) -#endif { ResetConformanceTester(); } DoubleNumericField(Window* pParent, const ResId& rResId) :FormattedField(pParent, rResId) -#ifdef REGEXP_SUPPORT - ,m_pConformanceTester( NULL ) -#else ,m_pNumberValidator( NULL ) -#endif { ResetConformanceTester(); } |