Skip to content

C
core
Kaydet (Commit) d52a1320 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

SwpHintsArray::Check(): reindent that 

Change-Id: I9fede393b5a0fb6bd2fe0425f6a4b60b754aeb0b
üst 411ef872
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 18 deletions
sw/source/core/txtnode/ndhints.cxx
Dosyayı görüntüle @ d52a1320
...@@ -174,7 +174,7 @@ sal_uInt16 SwpHintsArray::GetPos( const SwTxtAttr *pHt ) const ...@@ -174,7 +174,7 @@ sal_uInt16 SwpHintsArray::GetPos( const SwTxtAttr *pHt ) const
#define CHECK_ERR(cond, text) \ #define CHECK_ERR(cond, text) \
if(!(cond)) \ if(!(cond)) \
{ \ { \
OSL_ENSURE(!this, text); \ SAL_WARN("sw.core", text); \
DumpHints(m_HintStarts, m_HintEnds); \ DumpHints(m_HintStarts, m_HintEnds); \
return !(const_cast<SwpHintsArray*>(this))->Resort(); \ return !(const_cast<SwpHintsArray*>(this))->Resort(); \
} }
...@@ -254,25 +254,27 @@ bool SwpHintsArray::Check() const ...@@ -254,25 +254,27 @@ bool SwpHintsArray::Check() const
// 8) style portion check // 8) style portion check
const SwTxtAttr* pHtThis = m_HintStarts[i]; const SwTxtAttr* pHtThis = m_HintStarts[i];
const SwTxtAttr* pHtLast = i > 0 ? m_HintStarts[i-1] : 0; const SwTxtAttr* pHtLast = i > 0 ? m_HintStarts[i-1] : 0;
CHECK_ERR( 0 == i || CHECK_ERR( (0 == i)
( RES_TXTATR_CHARFMT != pHtLast->Which() && RES_TXTATR_AUTOFMT != pHtLast->Which() ) || || ( (RES_TXTATR_CHARFMT != pHtLast->Which())
( RES_TXTATR_CHARFMT != pHtThis->Which() && RES_TXTATR_AUTOFMT != pHtThis->Which() ) || && (RES_TXTATR_AUTOFMT != pHtLast->Which()))
( *pHtThis->GetStart() >= *pHtLast->GetEnd() ) || || ( (RES_TXTATR_CHARFMT != pHtThis->Which())
( ( (*pHtThis->GetStart() == *pHtLast->GetStart()) && (RES_TXTATR_AUTOFMT != pHtThis->Which()))
&& (*pHtThis->GetEnd() == *pHtLast->GetEnd()) || (*pHtThis->GetStart() >= *pHtLast->GetEnd()) // no overlap
) // same range || ( ( (*pHtThis->GetStart() == *pHtLast->GetStart())
&& ( (pHtThis->Which() != RES_TXTATR_AUTOFMT) && (*pHtThis->GetEnd() == *pHtLast->GetEnd())
|| (pHtLast->Which() != RES_TXTATR_AUTOFMT) ) // same range
) // never two AUTOFMT on same range && ( (pHtThis->Which() != RES_TXTATR_AUTOFMT)
&& ( (pHtThis->Which() != RES_TXTATR_CHARFMT) || (pHtLast->Which() != RES_TXTATR_AUTOFMT)
|| (pHtLast->Which() != RES_TXTATR_CHARFMT) ) // never two AUTOFMT on same range
|| (static_cast<const SwTxtCharFmt *>(pHtThis) && ( (pHtThis->Which() != RES_TXTATR_CHARFMT)
|| (pHtLast->Which() != RES_TXTATR_CHARFMT)
|| (static_cast<const SwTxtCharFmt *>(pHtThis)
->GetSortNumber() != ->GetSortNumber() !=
static_cast<const SwTxtCharFmt *>(pHtLast) static_cast<const SwTxtCharFmt *>(pHtLast)
->GetSortNumber()) ->GetSortNumber())
) // multiple CHARFMT on same range need distinct sortnr ) // multiple CHARFMT on same range need distinct sortnr
) )
|| (*pHtThis->GetStart() == *pHtThis->GetEnd()), || (*pHtThis->GetStart() == *pHtThis->GetEnd()), // this empty
"HintsCheck: Portion inconsistency. " "HintsCheck: Portion inconsistency. "
"This can be temporarily ok during undo operations" ); "This can be temporarily ok during undo operations" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment