[ooo-build-commit] .: patches/dev300

[Kohei Yoshida]

 patches/dev300/fields-table-formula.diff |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit ae7c887586d9e31c885e1351cdf77e70fc85973c
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Sep 30 18:06:45 2010 -0400

    Adjusted the patch to apply again after the BOOL -> bool conversion.

diff --git a/patches/dev300/fields-table-formula.diff b/patches/dev300/fields-table-formula.diff
index 5bb2e0e..8d92494 100644
--- a/patches/dev300/fields-table-formula.diff
+++ b/patches/dev300/fields-table-formula.diff
@@ -221,7 +221,7 @@ index 7579256..7ff70f2 100644
  {
  typedef void (SwTableFormula:: *FnScanFormel)( const SwTable&, String&,
                                              String&, String*, void* ) const;
-@@ -92,11 +93,14 @@ typedef void (SwTableFormula:: *FnScanFormel)( const SwTable&, String&,
+@@ -92,13 +92,16 @@ typedef void (SwTableFormula:: *FnScanFormel)( const SwTable&, String&,
                          void* = 0 ) const;
  
      const SwTable* FindTable( SwDoc& rDoc, const String& rNm ) const;
@@ -235,8 +235,11 @@ index 7579256..7ff70f2 100644
  
 -    String 		sFormel;			// akt. Formel
      NameType 	eNmType;			// akt. Darstellungs Art
-     BOOL 		bValidValue;		// TRUE: Formel neu berechnen
+-    bool               bValidValue;            // TRUE: Formel neu berechnen
++    BOOL 		bValidValue;		// TRUE: Formel neu berechnen
  
+     // suche den Node, in dem die Formel steht:
+     //	TextFeld	-> TextNode,
 @@ -106,7 +110,7 @@ protected:
      // !!! MUSS VON JEDER ABLEITUNG UEBERLADEN WERDEN !!!
      virtual const SwNode* GetNodeOfFormula() const = 0;
@@ -258,12 +261,12 @@ index 7579256..7ff70f2 100644
                                      return *this;
          }
  
-@@ -143,16 +148,13 @@ public:
+@@ -143,16 +143,13 @@ public:
      NameType GetNameType() const		{ return eNmType; }
  
      // erfrage/setze das Flag, ob der akt. Wert gueltig ist
--    BOOL 		IsValid() const				{ return bValidValue; }
--    inline void	ChgValid( BOOL bNew )		{ bValidValue = bNew; }
+-    bool               IsValid() const                         { return bValidValue; }
+-    inline void        ChgValid( bool bNew )           { bValidValue = bNew; }
 +    BOOL 		IsValid() const			{ return bValidValue; }
 +    inline void	ChgValid( BOOL bNew )   { bValidValue = bNew; }
  
@@ -271,7 +274,7 @@ index 7579256..7ff70f2 100644
 -    void SetFormula( const String& rNew )
 -        {
 -            sFormel = rNew;
--            bValidValue = FALSE;
+-            bValidValue = false;
 -            eNmType = EXTRNL_NAME;
 -        }
 +    const String& GetFormula() const { return sInputFormula; }
@@ -378,7 +381,7 @@ index fb98a31..4227bb3 100644
 +    : bWwFormula( bWwFml )
  {
 -    eNmType = EXTRNL_NAME;
--    bValidValue = FALSE;
+-    bValidValue = false;
 +    SetFormula( rFormel );
  }