summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2014-07-18 22:53:10 +0200
committerMatteo Casalin <matteo.casalin@yahoo.com>2014-07-22 23:50:40 +0200
commit115919a9c2dc9b73db9ba5a92798210da144beb4 (patch)
treeb36df48b6cb359497d710d28920f26629d96c6af /sw/source
parentf11701d27fdc7553189bcd662437645cb4495b02 (diff)
Directly return the desired information
Change-Id: I099009585c0ad3de7e3e98e48c5a05fbded0b1bb
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/txtnode/txtedt.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 1fd7de3a1ac2..5c563c0b42c8 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -142,7 +142,7 @@ lcl_MaskRedlines( const SwTxtNode& rNode, OUStringBuffer& rText,
/**
* Used for spell checking. Deleted redlines and hidden characters are masked
*/
-static sal_uInt16
+static bool
lcl_MaskRedlinesAndHiddenText( const SwTxtNode& rNode, OUStringBuffer& rText,
sal_Int32 nStt, sal_Int32 nEnd,
const sal_Unicode cChar = CH_TXTATR_INWORD,
@@ -171,7 +171,7 @@ lcl_MaskRedlinesAndHiddenText( const SwTxtNode& rNode, OUStringBuffer& rText,
SwScriptInfo::MaskHiddenRanges( rNode, rText, nStt, nEnd, cChar );
}
- return nRedlinesMasked + nHiddenCharsMasked;
+ return (nRedlinesMasked + nHiddenCharsMasked) > 0;
}
/**
@@ -936,7 +936,7 @@ bool SwTxtNode::Spell(SwSpellArgs* pArgs)
const OUString aOldTxt( m_Text );
OUStringBuffer buf(m_Text);
const bool bRestoreString =
- lcl_MaskRedlinesAndHiddenText(*this, buf, 0, m_Text.getLength()) > 0;
+ lcl_MaskRedlinesAndHiddenText(*this, buf, 0, m_Text.getLength());
if (bRestoreString)
{ // ??? UGLY: is it really necessary to modify m_Text here?
m_Text = buf.makeStringAndClear();
@@ -1108,7 +1108,7 @@ bool SwTxtNode::Convert( SwConversionArgs &rArgs )
const OUString aOldTxt( m_Text );
OUStringBuffer buf(m_Text);
const bool bRestoreString =
- lcl_MaskRedlinesAndHiddenText(*this, buf, 0, m_Text.getLength()) > 0;
+ lcl_MaskRedlinesAndHiddenText(*this, buf, 0, m_Text.getLength());
if (bRestoreString)
{ // ??? UGLY: is it really necessary to modify m_Text here?
m_Text = buf.makeStringAndClear();
@@ -1245,8 +1245,8 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, const SwViewOption& rV
// modify string according to redline information and hidden text
const OUString aOldTxt( pNode->GetTxt() );
OUStringBuffer buf(pNode->m_Text);
- const bool bRestoreString = lcl_MaskRedlinesAndHiddenText( *pNode, buf,
- 0, pNode->GetTxt().getLength()) > 0;
+ const bool bRestoreString =
+ lcl_MaskRedlinesAndHiddenText(*pNode, buf, 0, pNode->GetTxt().getLength());
if (bRestoreString)
{ // ??? UGLY: is it really necessary to modify m_Text here?
pNode->m_Text = buf.makeStringAndClear();