diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-17 09:28:02 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-17 09:49:57 +0200 |
| commit | 213571db0e69db5d8d16d16e8a5c428b824e80d1 (patch) | |
| tree | 83ac8697ef333be09ca0d00c6085357a8107ac34 | |
| parent | fede08ac7d8b9d6c0abd2ba1b09fd3beb1c1b7e7 (diff) | |
SwTxtSlot::SwTxtSlot now takes an empty reference by default, not a NULL
Change-Id: I3fc7cef18dc1df228a648edb3020a976209f12ee
| -rw-r--r-- | sw/source/core/text/inftxt.cxx | 6 | ||||
| -rw-r--r-- | sw/source/core/text/inftxt.hxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 001844d2601d..8c303a02343a 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1659,7 +1659,7 @@ SwTxtSlot::SwTxtSlot( const SwLinePortion *pPor, bool bTxtLen, bool bExgLists, - OUString const & pCh ) + OUString const & rCh ) : pOldTxt(0) , pOldSmartTagList(0) , pOldGrammarCheckList(0) @@ -1668,13 +1668,13 @@ SwTxtSlot::SwTxtSlot( , nLen(0) , pInf(NULL) { - if( pCh.isEmpty() ) + if( rCh.isEmpty() ) { bOn = pPor->GetExpTxt( *pNew, aTxt ); } else { - aTxt = pCh; + aTxt = rCh; bOn = true; } diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 112bed8f2303..35c783e6cc91 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -775,9 +775,9 @@ protected: SwTxtSizeInfo *pInf; public: // The replacement string originates either from the portion via GetExpText() - // or from the char * pCh, if it is not NULL + // or from the rCh, if it is not empty. SwTxtSlot( const SwTxtSizeInfo *pNew, const SwLinePortion *pPor, bool bTxtLen, - bool bExgLists, OUString const & pCh = OUString() ); + bool bExgLists, OUString const & rCh = OUString() ); ~SwTxtSlot(); bool IsOn() const { return bOn; } }; |