[Libreoffice-commits] .: 3 commits - sw/prj sw/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Tue Feb 22 08:23:52 PST 2011
sw/prj/build.lst | 3
sw/source/core/except/dbgloop.cxx | 170 --------------------------------------
sw/source/core/except/makefile.mk | 58 ------------
sw/source/core/inc/dbgloop.hxx | 80 -----------------
sw/source/core/makefile.mk | 11 --
sw/source/core/text/frmcrsr.cxx | 2
sw/source/core/text/frmform.cxx | 13 --
sw/source/core/text/frminf.cxx | 1
sw/source/core/text/frmpaint.cxx | 7 -
sw/source/core/text/guess.cxx | 1
sw/source/core/text/itradj.cxx | 1
sw/source/core/text/itrcrsr.cxx | 4
sw/source/core/text/itrform2.cxx | 5 -
sw/source/core/text/itrpaint.cxx | 3
sw/source/core/text/itrtxt.cxx | 7 -
sw/source/core/text/porfld.cxx | 1
sw/source/core/text/porglue.cxx | 4
sw/source/core/text/porlay.cxx | 6 -
sw/source/core/text/porlin.cxx | 4
sw/source/core/text/porref.cxx | 1
sw/source/core/text/porrst.cxx | 1
sw/source/core/text/portox.cxx | 1
sw/source/core/text/portxt.cxx | 1
sw/source/core/text/txtcfg.hxx | 57 ------------
sw/source/core/text/txtfld.cxx | 1
sw/source/core/text/txtfly.cxx | 1
sw/source/core/text/txtfrm.cxx | 1
sw/source/core/text/txtftn.cxx | 3
sw/source/core/text/txthyph.cxx | 2
sw/source/core/text/txtinit.cxx | 3
sw/source/core/text/txtio.cxx | 5 -
sw/source/core/text/txttab.cxx | 2
sw/source/core/text/widorp.cxx | 2
33 files changed, 8 insertions(+), 454 deletions(-)
New commits:
commit bb54576c75aa2661476aea0e0f5e265d4890a3c3
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 22 16:32:29 2011 +0100
Remove txtcfg.hxx
Their defined macros get only used once:
SLOPPY_TWIPS, CONST and CONSTCHAR. Moved this into the respective files.
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index b69eba4..b69a42d 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -49,7 +49,6 @@
#include <unicode/ubidi.h>
-#include "txtcfg.hxx"
#include "txtfrm.hxx" // SwTxtFrm
#include "inftxt.hxx" // SwTxtSizeInfo
#include "itrtxt.hxx" // SwTxtCursor
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 0b3b5b1..e6f3285 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -47,7 +47,6 @@
#include <pam.hxx>
#include <flyfrms.hxx>
#include <fmtanchr.hxx>
-#include <txtcfg.hxx>
#include <itrform2.hxx> // SwTxtFormatter
#include <widorp.hxx> // Widows and Orphans
#include <txtcache.hxx>
@@ -62,6 +61,9 @@
// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
+// Toleranzwert in der Formatierung und Textausgabe.
+#define SLOPPY_TWIPS 5
+
class FormatLevel
{
static MSHORT nLevel;
diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index 31f578b..85b7111 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -31,7 +31,6 @@
#include <pam.hxx> // GetSpaces
-#include <txtcfg.hxx>
#include <frminf.hxx> // SwTxtFrminfo
#include <itrtxt.hxx> // SwTxtMargin
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 847226c..c41dd97 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -47,7 +47,6 @@
#include <viewimp.hxx> // SwViewImp
#include <viewopt.hxx> // SwViewOption
#include <frmtool.hxx> // DrawGraphic
-#include <txtcfg.hxx>
#include <txtfrm.hxx> // SwTxtFrm
#include <itrpaint.hxx> // SwTxtPainter
#include <txtpaint.hxx> // SwSaveClip
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 057655b..522f707 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -36,7 +36,6 @@
#include <dlelstnr.hxx>
#include <swmodule.hxx>
#include <IDocumentSettingAccess.hxx>
-#include <txtcfg.hxx>
#include <guess.hxx>
#include <inftxt.hxx>
#include <pagefrm.hxx>
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index 47af51d..e746734 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -34,7 +34,6 @@
#include "frame.hxx" // CalcFlyAdjust()
#include "paratr.hxx"
-#include "txtcfg.hxx"
#include "itrtxt.hxx"
#include "porglue.hxx"
#include "porlay.hxx"
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index fb698ff..5aed623 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -47,7 +47,6 @@
#include <IDocumentSettingAccess.hxx>
#include <pagefrm.hxx>
-#include "txtcfg.hxx"
#include "itrtxt.hxx"
#include "txtfrm.hxx"
#include "flyfrms.hxx"
@@ -1287,7 +1286,7 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
// x ist der horizontale Offset innerhalb der Zeile.
SwTwips x = rPoint.X();
- CONST SwTwips nLeftMargin = GetLineStart();
+ const SwTwips nLeftMargin = GetLineStart();
SwTwips nRightMargin = GetLineEnd();
if( nRightMargin == nLeftMargin )
nRightMargin += 30;
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index e7c6774..9d3acb2 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -42,7 +42,6 @@
#include <viewsh.hxx>
#include <viewopt.hxx> // SwViewOptions
#include <paratr.hxx> // SwFmtDrop
-#include <txtcfg.hxx>
#include <itrform2.hxx>
#include <porrst.hxx>
#include <portab.hxx> // pLastTab->
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 47e9310..e827323 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -57,7 +57,6 @@
#include "flyfrms.hxx"
#include "viewsh.hxx"
-#include "txtcfg.hxx"
#include "itrpaint.hxx"
#include "txtfrm.hxx" // pFrm
#include "txtfly.hxx"
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index 687de11..2658b40 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -42,7 +42,6 @@
#include <tgrditem.hxx>
#include <porfld.hxx>
-#include "txtcfg.hxx"
#include "itrtxt.hxx"
#include "txtfrm.hxx"
#include "porfly.hxx"
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 08c20b2..0843bda 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -39,7 +39,6 @@
#include <vcl/metric.hxx>
#include <vcl/outdev.hxx>
#include <viewopt.hxx> // SwViewOptions
-#include <txtcfg.hxx>
#include <SwPortionHandler.hxx>
#include <porlay.hxx>
#include <porfld.hxx>
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index 2a81592..c9891e2 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -36,7 +36,6 @@
#include "viewopt.hxx" // SwViewOptions
#include <SwPortionHandler.hxx>
-#include "txtcfg.hxx"
#include "porglue.hxx"
#include "inftxt.hxx"
#include "porlay.hxx" // SwParaPortion, SetFull
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 0b65738..bca7dba 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -29,9 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-
-#include "txtcfg.hxx"
#include "porlay.hxx"
#include "itrform2.hxx"
#include "porglue.hxx"
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index 9de82b5..1351a02 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -33,8 +33,6 @@
#include <vcl/outdev.hxx>
#include <SwPortionHandler.hxx>
-
-#include "txtcfg.hxx"
#include "porlin.hxx"
#include "inftxt.hxx"
#include "portxt.hxx"
diff --git a/sw/source/core/text/porref.cxx b/sw/source/core/text/porref.cxx
index 4f8e50a..c6b8e2b 100644
--- a/sw/source/core/text/porref.cxx
+++ b/sw/source/core/text/porref.cxx
@@ -33,7 +33,6 @@
#include <SwPortionHandler.hxx>
#include "viewopt.hxx" // SwViewOptions
-#include "txtcfg.hxx"
#include "porref.hxx"
#include "inftxt.hxx" // GetTxtSize()
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 0687b97..2f51b69 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -43,7 +43,6 @@
#include <pagefrm.hxx> // SwPageFrm
#include <paratr.hxx>
#include <SwPortionHandler.hxx>
-#include <txtcfg.hxx>
#include <porrst.hxx>
#include <inftxt.hxx>
#include <txtpaint.hxx> // ClipVout
diff --git a/sw/source/core/text/portox.cxx b/sw/source/core/text/portox.cxx
index f8056bc..169a26d 100644
--- a/sw/source/core/text/portox.cxx
+++ b/sw/source/core/text/portox.cxx
@@ -33,7 +33,6 @@
#include <SwPortionHandler.hxx>
#include "viewopt.hxx" // SwViewOptions
-#include "txtcfg.hxx"
#include "portox.hxx"
#include "inftxt.hxx" // GetTxtSize()
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 329e9df..cfcaeb0 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -35,7 +35,6 @@
#include <com/sun/star/i18n/ScriptType.hdl>
#include <hintids.hxx> // CH_TXTATR
#include <SwPortionHandler.hxx>
-#include <txtcfg.hxx>
#include <porlay.hxx>
#include <inftxt.hxx>
#include <guess.hxx> // SwTxtGuess, Zeilenumbruch
diff --git a/sw/source/core/text/txtcfg.hxx b/sw/source/core/text/txtcfg.hxx
deleted file mode 100644
index eb28041..0000000
--- a/sw/source/core/text/txtcfg.hxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _TXTCFG_HXX
-#define _TXTCFG_HXX
-
-// Toleranzwert in der Formatierung und Textausgabe.
-#define SLOPPY_TWIPS 5
-
-#define CONSTCHAR( name, string ) static const sal_Char name[] = string
-
-// Allgemeines ...
-
-#ifndef CONST
-#define CONST const
-#endif
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index a4afbfa..d143b57 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -45,7 +45,6 @@
#include "flyfrm.hxx" //IsInBody()
#include "viewimp.hxx"
#include "txtatr.hxx" // SwTxtFld
-#include "txtcfg.hxx"
#include "swfont.hxx" // NewFldPortion, new SwFont
#include "fntcache.hxx" // NewFldPortion, SwFntAccess
#include "porfld.hxx"
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index e5b177e..d76a1be 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -50,7 +50,6 @@
#include "txtfly.hxx" // SwTxtFly
#include "txtpaint.hxx" // SwSaveClip
#include "txtatr.hxx" // SwTxtFlyCnt
-#include "txtcfg.hxx"
#include "notxtfrm.hxx"
#include "flyfrms.hxx"
#include "fmtcnct.hxx" // SwFmtChain
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 16c4c53..629454b 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -66,7 +66,6 @@
#include <fmtline.hxx>
#include <txtfrm.hxx> // SwTxtFrm
#include <sectfrm.hxx> // SwSectFrm
-#include <txtcfg.hxx> // DBG_LOOP
#include <itrform2.hxx> // Iteratoren
#include <widorp.hxx> // SwFrmBreak
#include <txtcache.hxx>
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index ff5dfad..856325e 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -49,7 +49,6 @@
// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
-#include "txtcfg.hxx"
#include "swfont.hxx" // new SwFont
#include "porftn.hxx"
#include "porfly.hxx"
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index a0fb174..e6b8940 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -36,7 +36,6 @@
#include <EnhancedPDFExportHelper.hxx>
#include <viewopt.hxx> // SwViewOptions
#include <viewsh.hxx>
-#include <txtcfg.hxx>
#include <SwPortionHandler.hxx>
#include <porhyph.hxx> //
#include <inftxt.hxx>
diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx
index ab6f18f..00e3033 100644
--- a/sw/source/core/text/txtinit.cxx
+++ b/sw/source/core/text/txtinit.cxx
@@ -29,9 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-
-#include "txtcfg.hxx"
#include "swcache.hxx"
#include "fntcache.hxx" // pFntCache ( SwFont/ScrFont-PrtFont Cache )
#include "swfntcch.hxx" // pSwFontCache ( SwAttrSet/SwFont Cache )
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index 8e93e58..0e62012 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -37,7 +37,6 @@
#include "viewsh.hxx" // IsDbg()
#include "viewopt.hxx" // IsDbg()
#include "txtatr.hxx"
-#include "txtcfg.hxx"
#include "txtfrm.hxx" // IsDbg()
#include "flyfrms.hxx"
#include "inftxt.hxx"
@@ -58,6 +57,8 @@
#include "pormulti.hxx"
#include "ndhints.hxx"
+#define CONSTCHAR( name, string ) static const sal_Char name[] = string
+
SvStream &operator<<( SvStream &rOs, const SwpHints & ) //$ ostream
{
rOs << " {HINTS:";
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 3cbc905..a466745 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -37,7 +37,6 @@
#include <SwPortionHandler.hxx>
#include "viewopt.hxx" // SwViewOptions
-#include "txtcfg.hxx"
#include "portab.hxx"
#include "inftxt.hxx"
#include "itrform2.hxx"
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index 89dc54c..1051f45 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -45,7 +45,6 @@
#include <fmtftn.hxx>
#include <rowfrm.hxx>
-#include "txtcfg.hxx"
#include "widorp.hxx"
#include "txtfrm.hxx"
#include "itrtxt.hxx"
commit cdd72241b124980453dc531a243ed7cee512ff5d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 22 16:18:34 2011 +0100
Remove DBG_LOOP usage
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 723fcf5..b69eba4 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -616,7 +616,6 @@ sal_Bool SwTxtFrm::_GetCrsrOfst(SwPosition* pPos, const Point& rPoint,
aLine.TwipsToLine( rPoint.Y() );
while( aLine.Y() + aLine.GetLineHeight() > nMaxY )
{
- DBG_LOOP;
if( !aLine.Prev() )
break;
}
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 70f6c77..0b3b5b1 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -583,7 +583,6 @@ void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine,
while( GetFollow() && GetFollow()->GetFollow() &&
nNewOfst >= GetFollow()->GetFollow()->GetOfst() )
{
- DBG_LOOP;
JoinFrm();
}
}
@@ -1463,7 +1462,6 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
*/
do
{
- DBG_LOOP;
if( bFirst )
bFirst = sal_False;
else
@@ -1746,7 +1744,6 @@ void SwTxtFrm::_Format( SwParaPortion *pPara )
void SwTxtFrm::Format( const SwBorderAttrs * )
{
- DBG_LOOP;
#if OSL_DEBUG_LEVEL > 1
const XubString aXXX = GetTxtNode()->GetTxt();
const SwTwips nDbgY = Frm().Top();
@@ -1976,7 +1973,6 @@ sal_Bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
"SwTxtFrm::FormatQuick with swapped frame" );
- DBG_LOOP;
#if OSL_DEBUG_LEVEL > 1
const XubString aXXX = GetTxtNode()->GetTxt();
const SwTwips nDbgY = Frm().Top();
@@ -2022,11 +2018,6 @@ sal_Bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
? GetFollow()->GetOfst() : aInf.GetTxt().Len();
do
{
- //DBG_LOOP; shadows declaration above.
- //resolved into:
-#if OSL_DEBUG_LEVEL > 1
- DbgLoop aDbgLoop2( (const void*) this );
-#endif
nStart = aLine.FormatLine( nStart );
if( aInf.IsNewLine() || (!aInf.IsStop() && nStart < nEnd) )
aLine.Insert( new SwLineLayout() );
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 56ef92e..847226c 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -611,7 +611,6 @@ void SwTxtFrm::Paint( const SwRect &rRect, const SwPrtOptions * /*pPrintData*/ )
SwTaggedPDFHelper aTaggedPDFHelperParagraph( 0, &aFrmInfo, 0, *pSh->GetOut() );
// <--
- DBG_LOOP_RESET;
if( !IsEmpty() || !PaintEmpty( rRect, sal_True ) )
{
#if OSL_DEBUG_LEVEL > 1
@@ -718,11 +717,6 @@ void SwTxtFrm::Paint( const SwRect &rRect, const SwPrtOptions * /*pPrintData*/ )
{
do
{
- //DBG_LOOP; shadows declaration above.
- //resolved into:
-#if OSL_DEBUG_LEVEL > 1
- DbgLoop aDbgLoop2( (const void*) this );
-#endif
aLine.DrawTextLine( rRect, aClip, IsUndersized() );
} while( aLine.Next() && aLine.Y() <= nBottom );
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 06297e4..fb698ff 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1041,7 +1041,6 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
// Ausgleich vor 's'.
while( pPor && !pPor->GetLen() )
{
- DBG_LOOP;
nX += pPor->Width();
if( !pPor->IsMarginPortion() )
{
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 2c2efa5..e7c6774 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -209,7 +209,6 @@ SwLinePortion *SwTxtFormatter::UnderFlow( SwTxtFormatInfo &rInf )
SwLinePortion *pTmpPrev = pPor;
while( pPor && pPor != pUnderFlow )
{
- DBG_LOOP;
if( !pPor->IsKernPortion() &&
( pPor->Width() || pPor->IsSoftHyphPortion() ) )
{
@@ -367,7 +366,6 @@ void SwTxtFormatter::InsertPortion( SwTxtFormatInfo &rInf,
rInf.SetLast( pPor );
while( pPor )
{
- DBG_LOOP;
pPor->Move( rInf );
rInf.SetLast( pPor );
pPor = pPor->GetPortion();
@@ -435,7 +433,6 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
OSL_ENSURE( rInf.GetLen() < STRING_LEN &&
rInf.GetIdx() <= rInf.GetTxt().Len(),
"SwTxtFormatter::BuildPortions: bad length in info" );
- DBG_LOOP;
// We have to check the script for fields in order to set the
// correct nActual value for the font.
@@ -1677,7 +1674,6 @@ void SwTxtFormatter::RecalcRealHeight()
sal_Bool bMore = sal_True;
while(bMore)
{
- DBG_LOOP;
CalcRealHeight();
bMore = Next() != 0;
}
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 804a2c0..47e9310 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -132,7 +132,6 @@ SwLinePortion *SwTxtPainter::CalcPaintOfst( const SwRect &rPaint )
while( pPor && GetInfo().X() + pPor->Width() + (pPor->Height()/2)
< nPaintOfst )
{
- DBG_LOOP;
if( pPor->InSpaceGrp() && GetInfo().GetSpaceAdd() )
{
long nTmp = GetInfo().X() +pPor->Width() +
@@ -310,7 +309,6 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
while( pPor )
{
- DBG_LOOP;
sal_Bool bSeeked = sal_True;
GetInfo().SetLen( pPor->GetLen() );
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index 79c8532..687de11 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -176,7 +176,6 @@ const SwLineLayout *SwTxtIter::NextLine()
const SwLineLayout *pNext = Next();
while( pNext && pNext->IsDummy() && pNext->GetNext() )
{
- DBG_LOOP;
pNext = Next();
}
return pNext;
@@ -191,7 +190,6 @@ const SwLineLayout *SwTxtIter::GetNextLine() const
const SwLineLayout *pNext = pCurr->GetNext();
while( pNext && pNext->IsDummy() && pNext->GetNext() )
{
- DBG_LOOP;
pNext = pNext->GetNext();
}
return (SwLineLayout*)pNext;
@@ -240,7 +238,6 @@ const SwLineLayout *SwTxtIter::PrevLine()
const SwLineLayout *pLast = pMyPrev;
while( pMyPrev && pMyPrev->IsDummy() )
{
- DBG_LOOP;
pLast = pMyPrev;
pMyPrev = Prev();
}
@@ -255,7 +252,7 @@ void SwTxtIter::Bottom()
{
while( Next() )
{
- DBG_LOOP;
+ // nothing
}
}
@@ -473,7 +470,6 @@ void SwTxtIter::CntHyphens( sal_uInt8 &nEndCnt, sal_uInt8 &nMidCnt) const
return;
while( pLay != pCurr )
{
- DBG_LOOP;
if ( pLay->IsEndHyph() )
nEndCnt++;
else
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index 5cfdb65..2a81592 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -224,7 +224,6 @@ void SwMarginPortion::AdjustRight( const SwLineLayout *pCurr )
SwGluePortion *pLeft = 0;
while( pPos )
{
- DBG_LOOP;
if( pPos->InFixMargGrp() )
pLeft = (SwGluePortion*)pPos;
pPos = pPos->GetPortion();
@@ -268,8 +267,6 @@ void SwMarginPortion::AdjustRight( const SwLineLayout *pCurr )
}
while( pPrev != pLeft )
{
- DBG_LOOP;
-
if( bNoMove || pPrev->PrtWidth() >= nRightGlue ||
pPrev->InHyphGrp() || pPrev->IsKernPortion() )
{
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 91620b7..0b65738 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -340,7 +340,6 @@ SwMarginPortion *SwLineLayout::CalcLeftMargin()
SwLinePortion *pPos = pLeft->GetPortion();
while( pPos )
{
- DBG_LOOP;
if( pPos->IsFlyPortion() )
{
// Die FlyPortion wird ausgesogen ...
@@ -451,7 +450,6 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
// Fix-Portion.
while( pPos )
{
- DBG_LOOP;
OSL_ENSURE( POR_LIN != pPos->GetWhichPor(),
"SwLineLayout::CalcLine: don't use SwLinePortions !" );
@@ -2261,7 +2259,6 @@ xub_StrLen SwParaPortion::GetParLen() const
const SwLineLayout *pLay = this;
while( pLay )
{
- DBG_LOOP;
nLen = nLen + pLay->GetLen();
pLay = pLay->GetNext();
}
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index a832b49..9de82b5 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -226,7 +226,6 @@ SwLinePortion *SwLinePortion::FindLastPortion()
// An das Ende wandern und pLinPortion an den letzten haengen ...
while( pPos->GetPortion() )
{
- DBG_LOOP;
pPos = pPos->GetPortion();
}
return pPos;
@@ -270,7 +269,6 @@ SwLinePortion *SwLinePortion::FindPrevPortion( const SwLinePortion *pRoot )
SwLinePortion *pPos = (SwLinePortion*)pRoot;
while( pPos->GetPortion() && pPos->GetPortion() != this )
{
- DBG_LOOP;
pPos = pPos->GetPortion();
}
OSL_ENSURE( pPos->GetPortion(),
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index a0070cf..ff5dfad 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -1650,7 +1650,6 @@ void SwParaPortion::SetErgoSumNum( const XubString& rErgo )
SwLineLayout *pLay = this;
while( pLay->GetNext() )
{
- DBG_LOOP;
pLay = pLay->GetNext();
}
SwLinePortion *pPor = pLay;
@@ -1676,7 +1675,6 @@ sal_Bool SwParaPortion::UpdateQuoVadis( const XubString &rQuo )
SwLineLayout *pLay = this;
while( pLay->GetNext() )
{
- DBG_LOOP;
pLay = pLay->GetNext();
}
SwLinePortion *pPor = pLay;
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index 6adb94c..a0fb174 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -122,7 +122,6 @@ sal_Bool SwTxtFrm::Hyphenate( SwInterHyphInfo &rHyphInf )
const xub_StrLen nEnd = rHyphInf.GetEnd();
while( !bRet && aLine.GetStart() < nEnd )
{
- DBG_LOOP;
bRet = aLine.Hyphenate( rHyphInf );
if( !aLine.Next() )
break;
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index 653cde4..8e93e58 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -276,7 +276,6 @@ void SwLineLayout::DebugPortions( SvStream &rOs, const XubString &/*rTxt*/, //$
while( pPortion2 )
{
- DBG_LOOP;
SwTxtPortion *pTxtPor = pPortion2->InTxtGrp() ?
(SwTxtPortion *)pPortion2 : NULL ;
(void)pTxtPor;
@@ -385,7 +384,6 @@ SvStream &SwLineLayout::operator<<( SvStream &rOs ) const //$ ostream
SwLinePortion *pPos = GetPortion();
while( pPos )
{
- DBG_LOOP;
rOs << "\t";
pPos->operator<<( rOs );
pPos = pPos->GetPortion();
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 635644f..3cbc905 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -493,7 +493,6 @@ sal_Bool SwTabPortion::PostFormat( SwTxtFormatInfo &rInf )
KSHORT nPorWidth = 0;
while( pPor )
{
- DBG_LOOP;
nPorWidth = nPorWidth + pPor->Width();
pPor = pPor->GetPortion();
}
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index e561356..89dc54c 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -525,7 +525,6 @@ sal_Bool WidowsAndOrphans::WouldFit( SwTxtMargin &rLine, SwTwips &rMaxHeight, sa
while( nMinLines > rLine.GetLineNr() )
{
- DBG_LOOP;
if( !rLine.NextLine() )
return sal_False;
nLineSum += rLine.GetLineHeight();
commit 8411348b1ce79a855129995d9160da76267dcff8
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 22 16:03:33 2011 +0100
Remove DBG_LOOP macro
diff --git a/sw/prj/build.lst b/sw/prj/build.lst
index 06ac86d..7736cfd 100755
--- a/sw/prj/build.lst
+++ b/sw/prj/build.lst
@@ -43,7 +43,6 @@ sw sw\source\core\doc nmake - all sw_doc sw_inc NULL
sw sw\source\core\docnode nmake - all sw_dcnd sw_inc NULL
sw sw\source\core\draw nmake - all sw_draw sw_inc NULL
sw sw\source\core\edit nmake - all sw_edit sw_inc NULL
-sw sw\source\core\except nmake - all sw_excpt sw_inc NULL
sw sw\source\core\fields nmake - all sw_fld sw_inc NULL
sw sw\source\core\frmedt nmake - all sw_frmed sw_inc NULL
sw sw\source\core\graphic nmake - all sw_grph sw_inc NULL
@@ -71,7 +70,7 @@ sw sw\source\filter\ww1 nmake - all sw_ww1 sw_in
sw sw\source\filter\ww8 nmake - all sw_ww8 sw_inc NULL
sw sw\source\filter\xml nmake - all sw_xml sw_inc NULL
sw sw\source\ui nmake - all sw_ui sw_app sw_cctrl sw_chrdl sw_conf sw_dbui sw_dchdl sw_dcvw sw_dlg sw_envlp sw_fldui sw_fmtui sw_frmdl sw_globd sw_index sw_ling sw_misc sw_rbbar sw_shell sw_table sw_uiuno sw_uivw sw_utlui sw_web sw_wrtsh sw_smartmenu sw_vba NULL
-sw sw\source\core nmake - all sw_core sw_attr sw_bast sw_crsr sw_dcnd sw_doc sw_draw sw_edit sw_excpt sw_fld sw_frmed sw_grph sw_layo sw_ole sw_para sw_sw3io sw_swg sw_text sw_tox sw_txtnd sw_uco sw_undo sw_view sw_acc sw_objpos sw_NumberTree sw_tablecore NULL
+sw sw\source\core nmake - all sw_core sw_attr sw_bast sw_crsr sw_dcnd sw_doc sw_draw sw_edit sw_fld sw_frmed sw_grph sw_layo sw_ole sw_para sw_sw3io sw_swg sw_text sw_tox sw_txtnd sw_uco sw_undo sw_view sw_acc sw_objpos sw_NumberTree sw_tablecore NULL
sw sw\source\filter nmake - all sw_flt sw_ascii sw_bsflt sw_html sw_rtf sw_wrtr sw_ww1 sw_ww8 sw_xml NULL
sw sw\util nmake - all sw_util sw_core sw_flt sw_sdi sw_ui NULL
sw sw\qa\unoapi nmake - all sw_qa_unoapi NULL
diff --git a/sw/source/core/except/dbgloop.cxx b/sw/source/core/except/dbgloop.cxx
deleted file mode 100644
index ddb3a7b..0000000
--- a/sw/source/core/except/dbgloop.cxx
+++ /dev/null
@@ -1,170 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sw.hxx"
-
-#if !defined(OSL_DEBUG_LEVEL) || OSL_DEBUG_LEVEL == 0
-#error Who broke the makefiles?
-#endif
-#include <tools/stream.hxx>
-#include "dbgloop.hxx"
-#include "errhdl.hxx"
-
-DbgLoopStack DbgLoop::aDbgLoopStack;
-
-/*************************************************************************
- * class DbgLoopStack
- *************************************************************************/
-
-DbgLoopStack::DbgLoopStack()
-{
- Reset();
-}
-
-void DbgLoopStack::Reset()
-{
- nPtr = 0;
- pDbg = 0;
- for( USHORT i = 0; i < DBG_MAX_STACK; ++i )
- aCount[i] = 0;
-}
-
-/*************************************************************************
- * DbgLoopStack::Push()
- *************************************************************************/
-
-void DbgLoopStack::Push( const void *pThis )
-{
- // Wir muessen irgendwie mitbekommen, wann die erste Stackposition
- // resettet werden soll, z.B. wenn wir einen Nullpointer uebergeben
- if( !nPtr && ( pDbg != pThis || !pThis ) )
- {
- aCount[1] = 0;
- pDbg = pThis;
- }
-
- ++nPtr;
- if( DBG_MAX_STACK > nPtr )
- {
- // Wenn eine loop entdeckt wird, wird der counter wieder zurueckgesetzt.
- OSL_ENSURE( DBG_MAX_LOOP > aCount[nPtr], "DbgLoopStack::Push: loop detected" );
- if( DBG_MAX_LOOP > aCount[nPtr] )
- ++(aCount[nPtr]);
- else
- aCount[nPtr] = 0;
- }
-}
-
-/*************************************************************************
- * DbgLoopStack::Pop()
- *************************************************************************/
-
-void DbgLoopStack::Pop()
-{
- if( DBG_MAX_STACK > nPtr )
- {
- OSL_ENSURE( nPtr, "DbgLoopStack::Pop: can't pop the stack" );
-
- OSL_ENSURE( aCount[nPtr], "DbgLoopStack::Pop: can't dec the count" );
- if( DBG_MAX_STACK > nPtr + 1 )
- aCount[nPtr + 1] = 0;
- }
- --nPtr;
-}
-
-/*************************************************************************
- * DbgLoopStack::Print()
- *************************************************************************/
-
-void DbgLoopStack::Print( SvStream &rOS ) const
-{
- rOS << "POS: " << nPtr << '\n';
- USHORT i;
- for( i = 0; i < DBG_MAX_STACK; ++i )
- rOS << i << " ";
- rOS << '\n';
- for( i = 0; i < DBG_MAX_STACK; ++i )
- rOS << aCount[i] << " ";
- rOS << '\n';
-}
-
-#ifdef STAND_ALONE
-// compile with: cl /AL /DSTAND_ALONE dbgloop.cxx
-
-/*************************************************************************
- * main()
- *************************************************************************/
-
-#include <stdlib.h>
-
-void AssertFail( const char *pErr, const char *pFile, USHORT nLine )
-{
- cout << pErr << '\n';
- PrintLoopStack( cout );
- exit(0);
-}
-
-class Test
-{
-public:
- void Run() const;
-};
-
-void Test::Run() const
-{
- cout << "---" << '\n';
- for( USHORT i = 0; i < 10; ++i )
- {
- cout << "i" << i;
- DBG_LOOP;
- PrintLoopStack( cout );
- for( USHORT j = 0; j < 10; ++j )
- {
- cout << " j" << j;
- DBG_LOOP;
- PrintLoopStack( cout );
- }
- cout << '\n';
- }
- PrintLoopStack( cout );
-}
-
-int main()
-{
- // unterschiedliche Instanzen waehlen wg. pDbg != pThis
- Test aTest1;
- aTest1.Run();
- Test aTest2;
- aTest2.Run();
- return 0;
-}
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/except/makefile.mk b/sw/source/core/except/makefile.mk
deleted file mode 100644
index f6ef7f3..0000000
--- a/sw/source/core/except/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=except
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/inc$/swpre.mk
-
-# hier kein PCH!
-prjpch=
-PRJPCH=
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES =
-
-.IF "$(DBG_LEVEL)">="2"
-CXXFILES += \
- dbgloop.cxx
-
-SLOFILES += \
- $(SLO)$/dbgloop.obj
-.ENDIF
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/sw/source/core/inc/dbgloop.hxx b/sw/source/core/inc/dbgloop.hxx
deleted file mode 100644
index c15eda6..0000000
--- a/sw/source/core/inc/dbgloop.hxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _DBGLOOP_HXX
-#define _DBGLOOP_HXX
-
-#if OSL_DEBUG_LEVEL > 1
-
-#include <tools/solar.h>
-
-class SvStream;
-
-#define DBG_MAX_STACK 20 // Verschachtelungstiefe
-#define DBG_MAX_LOOP 1000 // das Abbruchkriterium
-
-class DbgLoopStack
-{
- USHORT aCount[DBG_MAX_STACK];
- USHORT nPtr;
- const void *pDbg;
- void Reset();
-public:
- DbgLoopStack();
- void Push( const void *pThis );
- void Pop();
- void Print( SvStream &rOS ) const; //$ ostream
-};
-
-class DbgLoop
-{
- friend inline void PrintLoopStack( SvStream &rOS ); //$ ostream
- static DbgLoopStack aDbgLoopStack;
-public:
- inline DbgLoop( const void *pThis ) { aDbgLoopStack.Push( pThis ); }
- inline ~DbgLoop() { aDbgLoopStack.Pop(); }
-};
-
-inline void PrintLoopStack( SvStream &rOS ) //$ ostream
-{
- DbgLoop::aDbgLoopStack.Print( rOS );
-}
-
-#define DBG_LOOP DbgLoop aDbgLoop( (const void*)this );
-#define DBG_LOOP_RESET DbgLoop aDbgLoop( 0 );
-
-#else
-
-#define DBG_LOOP
-#define DBG_LOOP_RESET
-
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/makefile.mk b/sw/source/core/makefile.mk
index 04022c3..028d6dc 100644
--- a/sw/source/core/makefile.mk
+++ b/sw/source/core/makefile.mk
@@ -69,11 +69,6 @@ SUBLIBS3= \
$(SLB)$/SwNumberTree.lib \
$(SLB)$/tablecore.lib
-.IF "$(DBG_LEVEL)">="2"
-SUBLIBS3+= \
- $(SLB)$/except.lib
-.ENDIF
-
SUBLIBS4= \
$(SLB)$/frmedt.lib \
$(SLB)$/ole.lib \
@@ -83,8 +78,6 @@ SUBLIBS4= \
$(SLB)$/bastyp.lib
#-------------------------------------------------------------------------
-################################################################
-
LIB1TARGET=$(SLB)$/core1.lib
LIB1FILES= \
$(SUBLIBS1)
@@ -103,8 +96,4 @@ LIB4FILES= \
.INCLUDE : target.mk
-################################################################
-
#-------------------------------------------------------------------------
-
-
diff --git a/sw/source/core/text/txtcfg.hxx b/sw/source/core/text/txtcfg.hxx
index 68d42db..eb28041 100644
--- a/sw/source/core/text/txtcfg.hxx
+++ b/sw/source/core/text/txtcfg.hxx
@@ -29,17 +29,6 @@
#ifndef _TXTCFG_HXX
#define _TXTCFG_HXX
-#if OSL_DEBUG_LEVEL > 1
-#include "dbgloop.hxx" // DBG_LOOP
-#else
-#ifdef DBG_LOOP //kann per precompiled hereinkommen
-#undef DBG_LOOP
-#undef DBG_LOOP_RESET
-#endif
-#define DBG_LOOP
-#define DBG_LOOP_RESET
-#endif
-
// Toleranzwert in der Formatierung und Textausgabe.
#define SLOPPY_TWIPS 5
More information about the Libreoffice-commits
mailing list