applied_patches/0180-calc-general-type-auto-decimal-svtools.diff

   1 diff --git svtools/inc/svtools/zforlist.hxx svtools/inc/svtools/zforlist.hxx
   2 index bb4a589..069930e 100644
   3 --- svtools/inc/svtools/zforlist.hxx
   4 +++ svtools/inc/svtools/zforlist.hxx
   5 @@ -492,11 +492,16 @@ public:
   6      void GetOutputString( String& sString, sal_uInt32 nFIndex,
   7                            String& sOutString, Color** ppColor );
   8
   9 +    void GetStringColor( sal_uInt32 nFIndex, Color** ppColor );
  10 +
  11      /** Format a number according to the standard default format matching
  12          the given format index */
  13      void GetInputLineString( const double& fOutNumber,
  14                              sal_uInt32 nFIndex, String& sOutString );
  15
  16 +    void GetInputLineString( const double& fOutNumber,
  17 +                             sal_uInt32 nFIndex, String& sOutString, Color** ppColor );
  18 +
  19      /** Format a number according to a format code string to be scanned.
  20          @return
  21              <FALSE/> if format code contains an error
  22 diff --git svtools/inc/svtools/zformat.hxx svtools/inc/svtools/zformat.hxx
  23 index 4c52b10..d502bb6 100644
  24 --- svtools/inc/svtools/zformat.hxx
  25 +++ svtools/inc/svtools/zformat.hxx
  26 @@ -241,6 +241,7 @@ public:
  27
  28      BOOL GetOutputString( double fNumber, String& OutString, Color** ppColor );
  29      BOOL GetOutputString( String& sString, String& OutString, Color** ppColor );
  30 +    void GetStringColor( Color** ppColor );
  31
  32      // True if type text
  33      BOOL IsTextFormat() const { return (eType & NUMBERFORMAT_TEXT) != 0; }
  34 diff --git svtools/source/numbers/zforlist.cxx svtools/source/numbers/zforlist.cxx
  35 index 4b13774..ceedb05 100644
  36 --- svtools/source/numbers/zforlist.cxx
  37 +++ svtools/source/numbers/zforlist.cxx
  38 @@ -1488,9 +1488,16 @@ void SvNumberFormatter::GetInputLineString(const double& fOutNumber,
  39                                             sal_uInt32 nFIndex,
  40                                             String& sOutString)
  41  {
  42 +    Color* pColor;
  43 +    GetInputLineString(fOutNumber, nFIndex, sOutString, &pColor);
  44 +}
  45 +
  46 +void SvNumberFormatter::GetInputLineString(const double& fOutNumber,
  47 +                                           sal_uInt32 nFIndex,
  48 +                                           String& sOutString, Color** ppColor)
  49 +{
  50      SvNumberformat* pFormat;
  51      short nOldPrec;
  52 -    Color* pColor;
  53      pFormat = (SvNumberformat*) aFTable.Get(nFIndex);
  54      if (!pFormat)
  55          pFormat = aFTable.Get(ZF_STANDARD);
  56 @@ -1531,7 +1538,13 @@ void SvNumberFormatter::GetInputLineString(const double& fOutNumber,
  57              nOldPrec = pFormatScanner->GetStandardPrec();
  58              ChangeStandardPrec(300);                                           // Merkwert
  59          }
  60 -        pFormat->GetOutputString(fOutNumber, sOutString, &pColor);
  61 +        if (ppColor)
  62 +            pFormat->GetOutputString(fOutNumber, sOutString, ppColor);
  63 +        else
  64 +        {
  65 +            Color* pColor; // throw away the color info.
  66 +            pFormat->GetOutputString(fOutNumber, sOutString, &pColor);
  67 +        }
  68      }
  69      if (nOldPrec != -1)
  70          ChangeStandardPrec(nOldPrec);
  71 @@ -1574,6 +1587,21 @@ void SvNumberFormatter::GetOutputString(String& sString,
  72      }
  73  }
  74
  75 +void SvNumberFormatter::GetStringColor( sal_uInt32 nFIndex, Color** ppColor)
  76 +{
  77 +    if (!ppColor)
  78 +        return;
  79 +
  80 +    SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(nFIndex);
  81 +    if (!pFormat)
  82 +        pFormat = aFTable.Get(ZF_STANDARD_TEXT);
  83 +
  84 +    if (pFormat->IsTextFormat() || pFormat->HasTextFormat())
  85 +        pFormat->GetStringColor(ppColor);
  86 +    else
  87 +        *ppColor = NULL;
  88 +}
  89 +
  90  BOOL SvNumberFormatter::GetPreviewString(const String& sFormatString,
  91                                           double fPreviewNumber,
  92                                           String& sOutString,
  93 diff --git svtools/source/numbers/zformat.cxx svtools/source/numbers/zformat.cxx
  94 index 368fb16..65c0592 100644
  95 --- svtools/source/numbers/zformat.cxx
  96 +++ svtools/source/numbers/zformat.cxx
  97 @@ -1915,6 +1915,25 @@ BOOL SvNumberformat::GetOutputString(String& sString,
  98      }
  99      return FALSE;
 100  }
 101 +
 102 +void SvNumberformat::GetStringColor( Color** ppColor )
 103 +{
 104 +    if (!ppColor)
 105 +        return;
 106 +
 107 +    USHORT nIx;
 108 +    if (eType & NUMBERFORMAT_TEXT)
 109 +        nIx = 0;
 110 +    else if (NumFor[3].GetnAnz() > 0)
 111 +        nIx = 3;
 112 +    else
 113 +    {
 114 +        *ppColor = NULL;        // no change of color
 115 +        return;
 116 +    }
 117 +    *ppColor = NumFor[nIx].GetColor();
 118 +}
 119 +
 120  /*
 121  void SvNumberformat::GetNextFareyNumber(ULONG nPrec, ULONG x0, ULONG x1,
 122                                          ULONG y0, ULONG y1,