diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-07 11:02:50 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-07 11:02:50 +0100 |
| commit | f6caeda452f9b6a83b00d28250c098be685f92af (patch) | |
| tree | 46a2835eda42e9439e4e87a7b190067a27cd3b4a | |
| parent | 1db9795d26c32101314882acd91467507104a984 (diff) | |
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.
| -rw-r--r-- | patches/dev300/fields-table-formula.diff | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/patches/dev300/fields-table-formula.diff b/patches/dev300/fields-table-formula.diff index c404fedaa..eda87c8ad 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; } |