removed unused stuff from number formatter

3 files changed, 10 insertions, 35 deletions

diff --git a/svl/inc/svl/nfsymbol.hxx b/svl/inc/svl/nfsymbol.hxx
index 57b2ddde339e..de11c6d8830e 100644
--- a/svl/inc/svl/nfsymbol.hxx
+++ b/svl/inc/svl/nfsymbol.hxx
@@ -53,17 +53,16 @@ enum NfSymbolType
     NF_SYMBOLTYPE_FRAC          = -9,   // fraction /
     NF_SYMBOLTYPE_EMPTY         = -10,  // deleted symbols
     NF_SYMBOLTYPE_FRACBLANK     = -11,  // delimiter between integer and fraction
-    NF_SYMBOLTYPE_COMMENT       = -12,  // comment is following
-    NF_SYMBOLTYPE_CURRENCY      = -13,  // currency symbol
-    NF_SYMBOLTYPE_CURRDEL       = -14,  // currency symbol delimiter [$]
-    NF_SYMBOLTYPE_CURREXT       = -15,  // currency symbol extension -xxx
-    NF_SYMBOLTYPE_CALENDAR      = -16,  // calendar ID
-    NF_SYMBOLTYPE_CALDEL        = -17,  // calendar delimiter [~]
-    NF_SYMBOLTYPE_DATESEP       = -18,  // date separator
-    NF_SYMBOLTYPE_TIMESEP       = -19,  // time separator
-    NF_SYMBOLTYPE_TIME100SECSEP = -20,  // time 100th seconds separator
-    NF_SYMBOLTYPE_PERCENT       = -21,  // percent %
-    NF_SYMBOLTYPE_FRAC_FDIV     = -22   // forced divisors
+    NF_SYMBOLTYPE_CURRENCY      = -12,  // currency symbol
+    NF_SYMBOLTYPE_CURRDEL       = -13,  // currency symbol delimiter [$]
+    NF_SYMBOLTYPE_CURREXT       = -14,  // currency symbol extension -xxx
+    NF_SYMBOLTYPE_CALENDAR      = -15,  // calendar ID
+    NF_SYMBOLTYPE_CALDEL        = -16,  // calendar delimiter [~]
+    NF_SYMBOLTYPE_DATESEP       = -17,  // date separator
+    NF_SYMBOLTYPE_TIMESEP       = -18,  // time separator
+    NF_SYMBOLTYPE_TIME100SECSEP = -19,  // time 100th seconds separator
+    NF_SYMBOLTYPE_PERCENT       = -20,  // percent %
+    NF_SYMBOLTYPE_FRAC_FDIV     = -21   // forced divisors
 };
 
 }   // namespace svt
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 34deb795f197..c27f7795b745 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -354,9 +354,6 @@ public:
         LanguageType eLang
         );
 
-    /// Depricated ctor without service manager
-    SvNumberFormatter( LanguageType eLang );
-
     ~SvNumberFormatter();
 
     /// Set CallBack to ColorTable
@@ -544,18 +541,11 @@ public:
 
     /// Whether format index nFIndex is of type text or not
     bool IsTextFormat(sal_uInt32 nFIndex) const;
-    /// Whether the 4th string subcode of format index nFIndex is present
-    bool HasTextFormat(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;
-    /// Reset of "Used" flags
-    void PrepareSave();
-
-    /// Flag format index as used
-    void SetFormatUsed(sal_uInt32 nFIndex);
 
     /// Get additional info of a format index, e.g. for dialog box
     void GetFormatSpecialInfo(sal_uInt32 nFormat, bool& bThousand, bool& IsRed,
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index 68095ca7be0e..b534f97be002 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -40,9 +40,6 @@
 #include "zforscan.hxx"
 #endif
 
-// If comment field is also in format code string, was used for SUPD versions 371-372
-#define NF_COMMENT_IN_FORMATSTRING 0
-
 namespace utl {
     class DigitGroupingIterator;
 }
@@ -387,20 +384,9 @@ public:
                 sal_Unicode cEscIn = '\0', sal_Unicode cEscOut = '\\' );
 
     void SetComment( const String& rStr )
-#if NF_COMMENT_IN_FORMATSTRING
-        { SetComment( rStr, sFormatstring, sComment ); }
-#else
         { sComment = rStr; }
-#endif
     const String& GetComment() const { return sComment; }
 
-    // Erase "{ "..." }" from format subcode string to get the pure comment (old version)
-    static void EraseCommentBraces( String& rStr );
-    // Set comment rStr in format string rFormat and in rComment (old version)
-    static void SetComment( const String& rStr, String& rFormat, String& rComment );
-    // Erase comment at end of rStr to get pure format code string (old version)
-    static void EraseComment( String& rStr );
-
     /** Insert the number of blanks into the string that is needed to simulate
         the width of character c for underscore formats */
     static xub_StrLen InsertBlanks( String& r, xub_StrLen nPos, sal_Unicode c );