diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-11-06 09:42:15 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-06 15:56:13 +0000 |
commit | 48a4d615c85c58a06a50209bfbcc6e93145142fc (patch) | |
tree | 454e3743daa81261287a1c0acf9a721fdae5e108 /include/svl | |
parent | 9e05e45452bfc98c39f589b3f3b90c6596a638c9 (diff) |
If XPersistObject support is dropped, all this unsupported old data can go
Change-Id: I7000df307920b1b04b81cc4c436009cf6b6548e0
Reviewed-on: https://gerrit.libreoffice.org/12282
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/svl')
-rw-r--r-- | include/svl/nfversi.hxx | 7 | ||||
-rw-r--r-- | include/svl/zforlist.hxx | 6 | ||||
-rw-r--r-- | include/svl/zformat.hxx | 18 |
3 files changed, 0 insertions, 31 deletions
diff --git a/include/svl/nfversi.hxx b/include/svl/nfversi.hxx index c18dda2dcadb..3145bfd69882 100644 --- a/include/svl/nfversi.hxx +++ b/include/svl/nfversi.hxx @@ -21,17 +21,10 @@ #define INCLUDED_SVL_NFVERSI_HXX // file IDs - -#define SV_NUMBERFORMATTER_VERSION_SYSTORE 0x0004 -#define SV_NUMBERFORMATTER_VERSION_KEYWORDS 0x0005 #define SV_NUMBERFORMATTER_VERSION_NEWSTANDARD 0x0006 #define SV_NUMBERFORMATTER_VERSION_NF_TIME_HH_MMSS00 0x0007 #define SV_NUMBERFORMATTER_VERSION_NF_DATE_WW 0x0008 -#define SV_NUMBERFORMATTER_VERSION_NEW_CURR 0x0009 -#define SV_NUMBERFORMATTER_VERSION_YEAR2000 0x000a -#define SV_NUMBERFORMATTER_VERSION_TWODIGITYEAR 0x000b #define SV_NUMBERFORMATTER_VERSION_NF_DATETIME_SYS_DDMMYYYY_HHMMSS 0x000c -#define SV_NUMBERFORMATTER_VERSION_CALENDAR 0x000d #define SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS 0x000e #define SV_NUMBERFORMATTER_VERSION_FIXED_FRACTION 0x000f diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index 8d567184f4b6..dc7c7da759fe 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -37,7 +37,6 @@ #include <boost/ptr_container/ptr_vector.hpp> class Date; -class SvStream; class Color; class CharClass; class CalendarWrapper; @@ -518,11 +517,6 @@ public: /// Whether format index nFIndex is of type text or not bool IsTextFormat(sal_uInt32 nFIndex) const; - /// Load all formats from a stream - bool Load( SvStream& rStream ); - /// Save all formats to a stream - bool Save( SvStream& rStream ) const; - /// Get additional info of a format index, e.g. for dialog box void GetFormatSpecialInfo(sal_uInt32 nFormat, bool& bThousand, bool& IsRed, sal_uInt16& nPrecision, sal_uInt16& nAnzLeading); diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx index 5920243fb950..2d5b110d1574 100644 --- a/include/svl/zformat.hxx +++ b/include/svl/zformat.hxx @@ -29,13 +29,10 @@ namespace utl { class DigitGroupingIterator; } -class SvStream; class Color; class ImpSvNumberformatScan; // format code string scanner class ImpSvNumberInputScan; // input string scanner -class ImpSvNumMultipleWriteHeader; // compatible file format -class ImpSvNumMultipleReadHeader; // compatible file format class SvNumberFormatter; enum SvNumberformatLimitOps @@ -69,8 +66,6 @@ struct ImpSvNumberformatInfo // Struct for FormatInfo bool bThousand; // Has group (AKA thousand) separator void Copy( const ImpSvNumberformatInfo& rNumFor, sal_uInt16 nAnz ); - void Load(SvStream& rStream, sal_uInt16 nAnz); - void Save(SvStream& rStream, sal_uInt16 nAnz) const; }; // NativeNumber, represent numbers using CJK or other digits if nNum>0, @@ -119,9 +114,6 @@ public: ~ImpSvNumFor(); void Enlarge(sal_uInt16 nAnz); // Init of arrays to the right size - void Load( SvStream& rStream, ImpSvNumberformatScan& rSc, - OUString& rLoadedColorName); - void Save( SvStream& rStream ) const; // if pSc is set, it is used to get the Color pointer void Copy( const ImpSvNumFor& rNumFor, ImpSvNumberformatScan* pSc ); @@ -141,8 +133,6 @@ public: // new SYMBOLTYPE_CURRENCY in subformat? bool HasNewCurrency() const; bool GetNewCurrencySymbol( OUString& rSymbol, OUString& rExtension ) const; - void SaveNewCurrencyMap( SvStream& rStream ) const; - void LoadNewCurrencyMap( SvStream& rStream ); // [NatNum1], [NatNum2], ... void SetNatNumNum( sal_uInt8 nNum, bool bDBNum ) { aNatNum.SetNum( nNum, bDBNum ); } @@ -227,14 +217,6 @@ public: bool IsStarFormatSupported() const { return bStarFlag; } void SetStarFormatSupport( bool b ) { bStarFlag = b; } - NfHackConversion Load( SvStream& rStream, ImpSvNumMultipleReadHeader& rHdr, - SvNumberFormatter* pConverter, ImpSvNumberInputScan& rISc ); - void Save( SvStream& rStream, ImpSvNumMultipleWriteHeader& rHdr ) const; - - // Load a string which might contain an Euro symbol, - // in fact that could be any string used in number formats. - static OUString LoadString( SvStream& rStream ); - /** * Get output string from a numeric value that fits the number of * characters specified. |