diff options
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/inc/svl/zformat.hxx | 9 | ||||
| -rw-r--r-- | svl/source/numbers/zforfind.cxx | 2 | ||||
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx index b534f97be002..9ad2895aa2f7 100644 --- a/svl/inc/svl/zformat.hxx +++ b/svl/inc/svl/zformat.hxx @@ -101,14 +101,18 @@ class SvNumberNatNum public: static sal_uInt8 MapDBNumToNatNum( sal_uInt8 nDBNum, LanguageType eLang, bool bDate ); +#ifdef THE_FUTURE static sal_uInt8 MapNatNumToDBNum( sal_uInt8 nNatNum, LanguageType eLang, bool bDate ); +#endif SvNumberNatNum() : eLang( LANGUAGE_DONTKNOW ), nNum(0), bDBNum(0), bDate(0), bSet(0) {} bool IsComplete() const { return bSet && eLang != LANGUAGE_DONTKNOW; } sal_uInt8 GetRawNum() const { return nNum; } sal_uInt8 GetNatNum() const { return bDBNum ? MapDBNumToNatNum( nNum, eLang, bDate ) : nNum; } +#ifdef THE_FUTURE sal_uInt8 GetDBNum() const { return bDBNum ? nNum : MapNatNumToDBNum( nNum, eLang, bDate ); } +#endif LanguageType GetLang() const { return eLang; } void SetLang( LanguageType e ) { eLang = e; } void SetNum( sal_uInt8 nNumber, bool bDBNumber ) @@ -434,6 +438,7 @@ public: calling this method. */ void SwitchToGregorianCalendar( const String& rOrgCalendar, double fOrgDateTime ) const; +#ifdef THE_FUTURE /** Switches to the first specified calendar, if any, in subformat nNumFor (0..3). Original calendar name and date/time returned, but only if calendar switched and rOrgCalendar was empty. @@ -450,7 +455,7 @@ public: fOrgDateTime, NumFor[nNumFor] ); return false; } - +#endif private: ImpSvNumFor NumFor[4]; // Array for the 4 subformats String sFormatstring; // The format code string @@ -471,8 +476,10 @@ private: SVL_DLLPRIVATE bool ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const; +#ifdef THE_FUTURE SVL_DLLPRIVATE bool ImpSwitchToSpecifiedCalendar( String& rOrgCalendar, double& fOrgDateTime, const ImpSvNumFor& rNumFor ) const; +#endif #ifdef _ZFORMAT_CXX // ----- private implementation methods ----- diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index ad63f02d1469..f241f79bb24b 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -1028,7 +1028,6 @@ bool ImpSvNumberInputScan::GetDateRef( double& fDays, sal_uInt16& nCounter, } if ( bFormatTurn ) { -#if 0 /* TODO: We are currently not able to fully support a switch to another calendar during input for the following reasons: @@ -1055,6 +1054,7 @@ input for the following reasons: calendar would have to be implemented. No problem. */ +#ifdef THE_FUTURE if ( pFormat->IsOtherCalendar( nStringScanNumFor ) ) pFormat->SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime ); else diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 0a5e823b8a53..9784d4d9b9c1 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -246,7 +246,7 @@ sal_uInt8 SvNumberNatNum::MapDBNumToNatNum( sal_uInt8 nDBNum, LanguageType eLang return nNatNum; } - +#ifdef THE_FUTURE /* XXX NOTE: even though the MapNatNumToDBNum method is currently unused please * don't remove it in case we'd have to use it for some obscure exports to * Excel. */ @@ -329,6 +329,7 @@ sal_uInt8 SvNumberNatNum::MapNatNumToDBNum( sal_uInt8 nNatNum, LanguageType eLan } return nDBNum; } +#endif /***********************Funktionen SvNumFor******************************/ @@ -3032,6 +3033,7 @@ bool SvNumberformat::ImpFallBackToGregorianCalendar( String& rOrgCalendar, doubl } +#ifdef THE_FUTURE /* XXX NOTE: even if the ImpSwitchToSpecifiedCalendar method is currently * unused please don't remove it, it would be needed by * SwitchToSpecifiedCalendar(), see comment in @@ -3059,6 +3061,7 @@ bool SvNumberformat::ImpSwitchToSpecifiedCalendar( String& rOrgCalendar, } return false; } +#endif // static void SvNumberformat::ImpAppendEraG( String& OutString, |