2 files changed, 5 insertions, 18 deletions
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index d5c84235a4f9..e4810e6492c6 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/i18n/NumberFormatCode.hpp>
 #include <unotools/localedatawrapper.hxx>
+#include <unotools/numberformatcodewrapper.hxx>
 #include <tools/link.hxx>
 #include <svl/ondemand.hxx>
 #include <svl/nfkeytab.hxx>
@@ -815,8 +816,6 @@ private:
     OUString aThousandSep;
     OUString aDateSep;
 
-#ifdef _ZFORLIST_CXX                // ----- private Methoden -----
-
     SVL_DLLPRIVATE static bool          bCurrencyTableInitialized;
     SVL_DLLPRIVATE static sal_uInt16            nSystemCurrencyPosition;
     SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl* pFormatterRegistry;
@@ -916,8 +915,6 @@ private:
     // link to be set at <method>SvtSysLocaleOptions::SetCurrencyChangeLink()</method>
     DECL_DLLPRIVATE_STATIC_LINK( SvNumberFormatter, CurrencyChangeLink, void* );
 
-#endif // _ZFORLIST_CXX
-
 public:
 
     // own static mutex, may also be used by internal class SvNumberFormatterRegistry_Impl
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 20cc4d110c24..fce623d58569 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -25,11 +25,6 @@
 #include <svl/nfversi.hxx>
 #include <svl/nfkeytab.hxx>
 
-// We need ImpSvNumberformatScan for the private SvNumberformat definitions.
-#ifdef _ZFORMAT_CXX
-#include "zforscan.hxx"
-#endif
-
 namespace utl {
     class DigitGroupingIterator;
 }
@@ -531,12 +526,10 @@ private:
     /// Whether it's a (YY)YY-M(M)-D(D) format.
     SVL_DLLPRIVATE bool ImpIsIso8601( const ImpSvNumFor& rNumFor );
 
-#ifdef _ZFORMAT_CXX     // ----- private implementation methods -----
-
-    const CharClass& rChrCls() const        { return rScan.GetChrCls(); }
-    const LocaleDataWrapper& rLoc() const   { return rScan.GetLoc(); }
-    CalendarWrapper& GetCal() const         { return rScan.GetCal(); }
-    const SvNumberFormatter& GetFormatter() const   { return *rScan.GetNumberformatter(); }
+    const CharClass& rChrCls() const;
+    const LocaleDataWrapper& rLoc() const;
+    CalendarWrapper& GetCal() const;
+    const SvNumberFormatter& GetFormatter() const;
 
     // divide in substrings and color conditions
     SVL_DLLPRIVATE short ImpNextSymbol( OUStringBuffer& rString,
@@ -702,9 +695,6 @@ private:
             impTransliterateImpl(rStr, rNum);
         }
     }
-
-#endif // _ZFORMAT_CXX
-
 };
 
 #endif  // _ZFORMAT_HXX