diff options
| author | Philipp Riemer <ruderphilipp@gmail.com> | 2012-06-30 23:49:55 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-07-04 15:46:44 +0200 |
| commit | b779da6fb73d7b235f4f7d032c7e463d97545e83 (patch) | |
| tree | b510608aeab0172620b1d27d8afec736b56491bf /sw | |
| parent | 2d06094c701262ef54604be206c25dd87a77d224 (diff) | |
renamed "MakeFormel" into "MakeFormula" (in sw/)
Change-Id: I1da8e5e7b8d12895c099a6c0cc259009e76aa341
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/cellfml.hxx | 6 | ||||
| -rw-r--r-- | sw/source/core/attr/cellatr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/fields/cellfml.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/fields/tblcalc.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx index 3a8566f14ecc..837316271eff 100644 --- a/sw/inc/cellfml.hxx +++ b/sw/inc/cellfml.hxx @@ -78,7 +78,7 @@ typedef void (SwTableFormula:: *FnScanFormel)( const SwTable&, String&, void* pPara = 0 ) const; void BoxNmsToRelNm( const SwTable&, String&, String&, String* = 0, void* pPara = 0 ) const; - void _MakeFormel( const SwTable&, String&, String&, String* = 0, + void _MakeFormula( const SwTable&, String&, String&, String* = 0, void* pPara = 0 ) const; void _GetFmlBoxes( const SwTable&, String&, String&, String* = 0, void* pPara = 0 ) const; @@ -109,9 +109,9 @@ protected: SwTableFormula( const String& rFormel ); - String MakeFormel( SwTblCalcPara& rCalcPara ) const + String MakeFormula( SwTblCalcPara& rCalcPara ) const { - return ScanString( &SwTableFormula::_MakeFormel, + return ScanString( &SwTableFormula::_MakeFormula, *rCalcPara.pTbl, &rCalcPara ); } diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx index 71641d3a804c..dcc9c8785c6f 100644 --- a/sw/source/core/attr/cellatr.cxx +++ b/sw/source/core/attr/cellatr.cxx @@ -195,7 +195,7 @@ void SwTblBoxFormula::Calc( SwTblCalcPara& rCalcPara, double& rValue ) { // create pointers from box names BoxNmToPtr( rCalcPara.pTbl ); - String sFml( MakeFormel( rCalcPara )); + String sFml( MakeFormula( rCalcPara )); if( !rCalcPara.rCalc.IsCalcError() ) rValue = rCalcPara.rCalc.Calculate( sFml ).GetDouble(); else diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx index 9ca66e19747c..6d45a44df2cf 100644 --- a/sw/source/core/fields/cellfml.cxx +++ b/sw/source/core/fields/cellfml.cxx @@ -311,7 +311,7 @@ SwTableFormula::~SwTableFormula() { } -void SwTableFormula::_MakeFormel( const SwTable& rTbl, String& rNewStr, +void SwTableFormula::_MakeFormula( const SwTable& rTbl, String& rNewStr, String& rFirstBox, String* pLastBox, void* pPara ) const { SwTblCalcPara* pCalcPara = (SwTblCalcPara*)pPara; @@ -651,7 +651,7 @@ String SwTableFormula::ScanString( FnScanFormel fnFormel, const SwTable& rTbl, // beim Bauen der Formel ist der TabellenName unerwuenscht //JP 22.02.99: der CAST muss fuer den Linux-Compiler sein - if( fnFormel != (FnScanFormel)&SwTableFormula::_MakeFormel ) + if( fnFormel != (FnScanFormel)&SwTableFormula::_MakeFormula ) aStr += sTblNm; nStt = nTrenner; diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx index e7975c098b8d..4657e0f8836b 100644 --- a/sw/source/core/fields/tblcalc.cxx +++ b/sw/source/core/fields/tblcalc.cxx @@ -61,7 +61,7 @@ void SwTblField::CalcField( SwTblCalcPara& rCalcPara ) // erzeuge aus den BoxNamen die Pointer BoxNmToPtr( rCalcPara.pTbl ); - String sFml( MakeFormel( rCalcPara )); + String sFml( MakeFormula( rCalcPara )); SetValue( rCalcPara.rCalc.Calculate( sFml ).GetDouble() ); ChgValid( !rCalcPara.IsStackOverFlow() ); // ist der Wert wieder gueltig? } |