[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/core/text/inftxt.cxx |    6 +++---
 sw/source/core/text/inftxt.hxx |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 213571db0e69db5d8d16d16e8a5c428b824e80d1
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Apr 17 09:28:02 2014 +0200

    SwTxtSlot::SwTxtSlot now takes an empty reference by default, not a NULL
    
    Change-Id: I3fc7cef18dc1df228a648edb3020a976209f12ee

diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 001844d..8c303a0 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 112bed8..35c783e 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; }
 };