diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-05 20:34:13 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-06 17:38:15 +0100 |
| commit | 144cfaf12d5e17b8212ec0f2e7dff54c7fe9f453 (patch) | |
| tree | 8d3d5baed24a1129be7f7c13492f2639298a8558 /sw | |
| parent | cd061ff8b45bf2399dfb0bb3fef184a637f024de (diff) | |
Fix build and remove one more nested macro
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/docedt.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/table/swtable.cxx | 1 | ||||
| -rw-r--r-- | sw/source/core/text/frmpaint.cxx | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 1e7b8ce306d2..d987bd585b76 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -1945,12 +1945,11 @@ uno::Any SwDoc::Spell( SwPaM& rPaM, uno::Reference< text::XFlatParagraph > xFlatPara = new SwXFlatParagraph( *((SwTxtNode*)pNd), aExpandText, pConversionMap ); // get error position of cursor in XFlatParagraph - sal_Int32 nGrammarErrorPosInText; linguistic2::ProofreadingResult aResult; sal_Int32 nGrammarErrors; do { - nGrammarErrorPosInText = ModelToViewHelper::ConvertToViewPosition( pConversionMap, nBeginGrammarCheck ); + ModelToViewHelper::ConvertToViewPosition( pConversionMap, nBeginGrammarCheck ); aResult = xGCIterator->checkSentenceAtPosition( xDoc, xFlatPara, aExpandText, lang::Locale(), nBeginGrammarCheck, -1, -1 ); diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 59cd681538ec..135f7b3f9f9f 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -2549,6 +2549,7 @@ ULONG SwTableBox::IsValidNumTxtNd( BOOL bCheckAttr ) const { const SwNode* pNode = pSttNd->GetNodes()[nIndex]; if( pNode->IsTableNode() ) + { pTextNode = 0; break; } diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 91fceb3a1107..b52d0297a24e 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -721,10 +721,8 @@ void SwTxtFrm::Paint( const SwRect &rRect, const SwPrtOptions * /*pPrintData*/ ) //DBG_LOOP; shadows declaration above. //resolved into: #if OSL_DEBUG_LEVEL > 1 -#if OSL_DEBUG_LEVEL > 1 DbgLoop aDbgLoop2( (const void*) this ); #endif -#endif aLine.DrawTextLine( rRect, aClip, IsUndersized() ); } while( aLine.Next() && aLine.Y() <= nBottom ); |