diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-08-13 08:23:15 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-08-13 06:26:47 +0000 |
| commit | fa78b33a10ceb46b11caa726512a0862b9775b56 (patch) | |
| tree | 7eac72c8e51288c5fe105e80e62552395f649c93 /sw/inc | |
| parent | 7514df659bc12509880f7b74cd9a7820c96526fb (diff) | |
Use stardard prefixes for data members, and english names
Change-Id: Ie2c6a12787a1a3753c7b4f82a2b5d342e60fc8da
Reviewed-on: https://gerrit.libreoffice.org/5383
Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
Tested-by: Matteo Casalin <matteo.casalin@yahoo.com>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/cellfml.hxx | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx index 093837556dc2..35896a4cffd1 100644 --- a/sw/inc/cellfml.hxx +++ b/sw/inc/cellfml.hxx @@ -56,7 +56,7 @@ public: class SwTableFormula { -typedef void (SwTableFormula:: *FnScanFormel)( const SwTable&, String&, +typedef void (SwTableFormula:: *FnScanFormula)( const SwTable&, String&, String&, String*, void* ) const; void BoxNmsToPtr( const SwTable&, String&, String&, String* = 0, @@ -80,7 +80,7 @@ typedef void (SwTableFormula:: *FnScanFormel)( const SwTable&, String&, void GetBoxes( const SwTableBox& rStt, const SwTableBox& rEnd, SwSelBoxes& rBoxes ) const; - String ScanString( FnScanFormel fnFormel, const SwTable& rTbl, + String ScanString( FnScanFormula fnFormula, const SwTable& rTbl, void* = 0 ) const; const SwTable* FindTable( SwDoc& rDoc, const OUString& rNm ) const; @@ -88,9 +88,9 @@ typedef void (SwTableFormula:: *FnScanFormel)( const SwTable&, String&, protected: enum NameType { EXTRNL_NAME, INTRNL_NAME, REL_NAME }; - String sFormel; ///< current formula - NameType eNmType; ///< current display method - bool bValidValue; ///< true: recalculate formula + String m_sFormula; ///< current formula + NameType m_eNmType; ///< current display method + bool m_bValidValue; ///< true: recalculate formula // find the node in which the formula is located // TextFeld -> TextNode, @@ -98,7 +98,7 @@ protected: // !!! has to be overloaded by every derivation !!! virtual const SwNode* GetNodeOfFormula() const = 0; - SwTableFormula( const String& rFormel ); + SwTableFormula( const String& rFormula ); String MakeFormula( SwTblCalcPara& rCalcPara ) const { @@ -113,12 +113,12 @@ public: SwTableFormula( const SwTableFormula& rCpy ) { *this = rCpy; } virtual ~SwTableFormula(); SwTableFormula& operator=( const SwTableFormula& rCpy ) - { - sFormel = rCpy.sFormel; - eNmType = rCpy.eNmType; - bValidValue = rCpy.bValidValue; - return *this; - } + { + m_sFormula = rCpy.m_sFormula; + m_eNmType = rCpy.m_eNmType; + m_bValidValue = rCpy.m_bValidValue; + return *this; + } /// create from the internal formula (for CORE) the external formula (for UI) void PtrToBoxNm( const SwTable* pTbl ); @@ -129,19 +129,19 @@ public: /// gets called before/after merging/splitting of tables void ToSplitMergeBoxNm( SwTableFmlUpdate& rTblUpd ); - bool IsIntrnlName() const { return eNmType == INTRNL_NAME; } - NameType GetNameType() const { return eNmType; } + bool IsIntrnlName() const { return m_eNmType == INTRNL_NAME; } + NameType GetNameType() const { return m_eNmType; } - bool IsValid() const { return bValidValue; } - inline void ChgValid( bool bNew ) { bValidValue = bNew; } + bool IsValid() const { return m_bValidValue; } + void ChgValid( bool bNew ) { m_bValidValue = bNew; } - const String& GetFormula() const { return sFormel; } + const String& GetFormula() const { return m_sFormula; } void SetFormula( const String& rNew ) - { - sFormel = rNew; - bValidValue = false; - eNmType = EXTRNL_NAME; - } + { + m_sFormula = rNew; + m_eNmType = EXTRNL_NAME; + m_bValidValue = false; + } void GetBoxesOfFormula(const SwTable& rTbl, SwSelBoxes& rBoxes); // are all boxes valid which this formula relies on? |