summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-12-23 22:48:59 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-01-05 09:18:14 +0000
commit30ec94d8d4af1ed72bc84ff6b5607d0733df9347 (patch)
treebe38485dbd98ada96c6f3f48b6491c12590e504e /sw
parentf84109c4577866227ac0d89368dfdceb5599954c (diff)
WaE and build fixes for OSL_DEBUG_LEVEL == 2
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/table/swtable.cxx4
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx3
-rw-r--r--sw/source/core/text/txtftn.cxx1
-rw-r--r--sw/source/core/txtnode/thints.cxx4
-rw-r--r--sw/source/core/undo/SwUndoPageDesc.cxx7
-rw-r--r--sw/source/filter/ww1/fltshell.cxx5
6 files changed, 9 insertions, 15 deletions
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index ae36c31f809d..c13630d748fc 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -1164,10 +1164,6 @@ static void lcl_CalcNewWidths( std::list<sal_uInt16> &rSpanPos, ChangeList& rCha
sal_uInt16 nPos = (sal_uInt16)nSum;
while( pCurr != rChanges.end() && pCurr->first < nPos )
{
-#if OSL_DEBUG_LEVEL > 1
- sal_uInt16 nTemp = pCurr->first;
- nTemp = pCurr->second;
-#endif
++nCurr;
++pCurr;
}
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 7ed062d70da9..c26d0c89873d 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -123,6 +123,7 @@ void lcl_DBGCheckStack()
{
nElement = *aIter;
}
+ (void)nElement;
}
#endif
@@ -303,6 +304,7 @@ SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info* pNumInfo,
#if OSL_DEBUG_LEVEL > 1
nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
lcl_DBGCheckStack();
+ (void)nCurrentStruct;
#endif
}
}
@@ -324,6 +326,7 @@ SwTaggedPDFHelper::~SwTaggedPDFHelper()
#if OSL_DEBUG_LEVEL > 1
nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
lcl_DBGCheckStack();
+ (void)nCurrentStruct;
#endif
}
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index f8f4b36fb82d..c9b512b8e509 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -832,6 +832,7 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
(void)bla;
}
nRstHeight = GetRstHeight();
+ (void)nRstHeight;
#endif
bInFtnConnect = sal_False;
return;
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 356348861aed..f6bf2e35f003 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1952,10 +1952,6 @@ sal_Bool SwTxtNode::GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd,
pPrev = pAttrArr->end();
}
-#if OSL_DEBUG_LEVEL > 1
- SwPoolItemEndPair aTmp = *pPrev;
-#endif
-
if( pPrev != pAttrArr->end() )
{
if( !pPrev->mpItem )
diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx
index aa7117c9da60..ef85c9c1fdd1 100644
--- a/sw/source/core/undo/SwUndoPageDesc.cxx
+++ b/sw/source/core/undo/SwUndoPageDesc.cxx
@@ -99,8 +99,11 @@ void DebugHeaderFooterContent( const SwPageDesc& rPageDesc )
nFooterLeft = 0;
}
}
- int i = 0;
- ++i; // To set a breakpoint
+
+ (void)nHeaderMaster;
+ (void)nHeaderLeft;
+ (void)nFooterMaster;
+ (void)nFooterLeft;
}
#endif
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 19c3abc5a277..8b3fb8283260 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -1685,11 +1685,6 @@ sal_Bool SwFltOutDoc::SeekCell(short nRow, short nCol, sal_Bool bPam)
{
pPaM->GetPoint()->nNode = pTableBox->GetSttIdx() + 1;
pPaM->GetPoint()->nContent.Assign(pPaM->GetCntntNode(), 0);
-//#pragma message(__FILE__ "(?) : Sw's const problem")
-#if OSL_DEBUG_LEVEL > 1
- const SwTxtFmtColl* p = GetDoc().GetDfltTxtFmtColl();
- p = GetDoc().GetTxtCollFromPool(RES_POOLCOLL_STANDARD, false );
-#endif
GetDoc().SetTxtFmtColl(*pPaM,
GetDoc().GetTxtCollFromPool(RES_POOLCOLL_STANDARD, false ));
}