[Libreoffice-commits] .: patches/dev300

[Cédric Bosdonnat]

 patches/dev300/fields-table-formula.diff |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit f6caeda452f9b6a83b00d28250c098be685f92af
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Mon Mar 7 11:02:50 2011 +0100

    n#675961: Fixed regression of copy-paste of Writer table formulas
    
    This fix is only fixing the regression for the old-style formulas. The
    newly added ODF Formulas / ww8 formulas still suffers from some trouble:
    the pasted formula isn't made relative. This would need much more
    important changes that couldn't go into a 3.3.x release.

diff --git a/patches/dev300/fields-table-formula.diff b/patches/dev300/fields-table-formula.diff
index c404fed..eda87c8 100644
--- a/patches/dev300/fields-table-formula.diff
+++ b/patches/dev300/fields-table-formula.diff
@@ -258,12 +258,13 @@ index 7579256..7ff70f2 100644
  
      String MakeFormel( SwTblCalcPara& rCalcPara ) const
      {
-@@ -122,9 +126,10 @@ public:
+@@ -122,9 +126,11 @@ public:
      virtual ~SwTableFormula();
      SwTableFormula& operator=( const SwTableFormula& rCpy )
          {
 -                                    sFormel = rCpy.sFormel;
-+                                    SetFormula( rCpy.GetFormula() );
++                                    sInputFormula = rCpy.sInputFormula;
++                                    sSwFormula = rCpy.sSwFormula;
                                      eNmType = rCpy.eNmType;
                                      bValidValue = rCpy.bValidValue;
 +                                    bWwFormula = rCpy.bWwFormula;
@@ -395,12 +396,13 @@ index fb98a31..4227bb3 100644
  }
  
  SwTableFormula::~SwTableFormula()
-@@ -555,7 +562,7 @@ void SwTableFormula::PtrToBoxNm( const SwTable* pTbl )
+@@ -555,7 +562,8 @@ void SwTableFormula::PtrToBoxNm( const SwTable* pTbl )
      case EXTRNL_NAME:
          return;
      }
 -    sFormel = ScanString( fnFormel, *pTbl, (void*)pNd );
 +    sSwFormula = ScanString( fnFormel, *pTbl, (void*)pNd );
++    if ( !bWwFormula ) sInputFormula = sSwFormula; // TODO This would need to be improved later
      eNmType = EXTRNL_NAME;
  }