diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-26 20:41:07 +0300 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-27 09:28:37 +0000 |
| commit | ec8617568ff091026b2f17cce3b547b1633fa6c4 (patch) | |
| tree | 70a54e6853121e2ff178ead66843a2deaa888fa4 /include/svl | |
| parent | 4667a55fd47db456d36ad151656b4041a6ded034 (diff) | |
Bin ugly (ab)use of preprocessor in headers
The time when it made sense to use "clever" #ifdefs to, for performance or
compiler reasons, conditionally bypass private parts of a class declaration
passed a decade or longer ago.
Still more of this in sw and sc. People working on those modules might want to
do it too, or not.
Change-Id: I1053139ca5e5e2631f7b22d99d3bada54fc337be
Reviewed-on: https://gerrit.libreoffice.org/3627
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'include/svl')
| -rw-r--r-- | include/svl/zforlist.hxx | 5 | ||||
| -rw-r--r-- | include/svl/zformat.hxx | 18 |
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 |