summaryrefslogtreecommitdiffstats
path: root/sw/source/core/view
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2011-11-24 00:52:07 +0100
committerMichael Stahl <mstahl@redhat.com>2011-11-24 00:52:07 +0100
commit9ace8bebd88ff41d65eeaa87a6d1f1dfd8875b6d (patch)
treeaa0104d77acfc11fdf73f4705fba205443cf5750 /sw/source/core/view
parentSwShell{,Table}Crsr: remove pointless overrides of IsSelOvr (diff)
downloadcore-9ace8bebd88ff41d65eeaa87a6d1f1dfd8875b6d.tar.gz
core-9ace8bebd88ff41d65eeaa87a6d1f1dfd8875b6d.zip
sw: enable more debug code:
Whole bunch of code is #if OSL_DEBUG_LEVEL > 1, reduce that to > 0 so more assertions are active when building --enable-debug or --enable-dbgutil.
Diffstat (limited to 'sw/source/core/view')
-rw-r--r--sw/source/core/view/viewpg.cxx4
-rw-r--r--sw/source/core/view/viewsh.cxx2
-rw-r--r--sw/source/core/view/vprint.cxx2
3 files changed, 1 insertions, 7 deletions
diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx
index d3f410557623..eca947b7bd28 100644
--- a/sw/source/core/view/viewpg.cxx
+++ b/sw/source/core/view/viewpg.cxx
@@ -94,9 +94,7 @@ void ViewShell::PrintProspect(
)
{
const sal_Int32 nMaxRenderer = rPrintData.GetRenderData().GetPagePairsForProspectPrinting().size() - 1;
-#if OSL_DEBUG_LEVEL > 1
OSL_ENSURE( 0 <= nRenderer && nRenderer <= nMaxRenderer, "nRenderer out of bounds");
-#endif
Printer *pPrinter = dynamic_cast< Printer * >(pOutDev);
if (!pPrinter || nMaxRenderer < 0 || nRenderer < 0 || nRenderer > nMaxRenderer)
return;
@@ -107,10 +105,8 @@ void ViewShell::PrintProspect(
std::pair< sal_Int32, sal_Int32 > rPagesToPrint =
rPrintData.GetRenderData().GetPagePairsForProspectPrinting()[ nRenderer ];
-#if OSL_DEBUG_LEVEL > 1
OSL_ENSURE( rPagesToPrint.first == -1 || rPrintData.GetRenderData().GetValidPagesSet().count( rPagesToPrint.first ) == 1, "first Page not valid" );
OSL_ENSURE( rPagesToPrint.second == -1 || rPrintData.GetRenderData().GetValidPagesSet().count( rPagesToPrint.second ) == 1, "second Page not valid" );
-#endif
// create a new shell for the Printer
ViewShell aShell( *this, 0, pPrinter );
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index f1b4b5f03aa3..b02b26f78ba0 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -536,7 +536,7 @@ void ViewShell::MakeVisible( const SwRect &rRect )
EndAction();
} while( nOldH != pRoot->Frm().Height() && nLoopCnt-- ); //swmod 071108//swmod 071225
}
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
else
{
OSL_ENSURE( !this, "MakeVisible fuer Drucker wird doch gebraucht?" );
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index f920ac21cd52..d5c096ee3222 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -463,9 +463,7 @@ sal_Bool ViewShell::PrintOrPDFExport(
{
const sal_Int32 nMaxRenderer = rPrintData.GetRenderData().GetPagesToPrint().size() - 1;
-#if OSL_DEBUG_LEVEL > 1
OSL_ENSURE( 0 <= nRenderer && nRenderer <= nMaxRenderer, "nRenderer out of bounds");
-#endif
if (!pOutDev || nMaxRenderer < 0 || nRenderer < 0 || nRenderer > nMaxRenderer)
return sal_False;