[Libreoffice-commits] .: sw/inc sw/source

[Bjoern Michaelsen]

 sw/inc/cellfml.hxx                |    6 +++---
 sw/source/core/attr/cellatr.cxx   |    2 +-
 sw/source/core/fields/cellfml.cxx |    4 ++--
 sw/source/core/fields/tblcalc.cxx |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit b779da6fb73d7b235f4f7d032c7e463d97545e83
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date:   Sat Jun 30 23:49:55 2012 +0200

    renamed "MakeFormel" into "MakeFormula" (in sw/)
    
    Change-Id: I1da8e5e7b8d12895c099a6c0cc259009e76aa341

diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 3a8566f..8373162 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 71641d3..dcc9c87 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 9ca66e1..6d45a44 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 e7975c0..4657e0f 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?
 }