[Libreoffice-commits] .: 4 commits - binfilter/bf_sc binfilter/bf_sw
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Jan 24 06:39:13 PST 2011
binfilter/bf_sc/source/core/data/sc_bcaslot.cxx | 5 --
binfilter/bf_sc/source/core/data/sc_documen7.cxx | 5 --
binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 24 ----------
binfilter/bf_sw/source/core/doc/sw_htmltbl.cxx | 28 ------------
binfilter/bf_sw/source/core/doc/sw_numpara.cxx | 44 -------------------
binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx | 53 -----------------------
binfilter/bf_sw/source/core/docnode/sw_node.cxx | 3 -
binfilter/bf_sw/source/core/docnode/sw_nodes.cxx | 3 -
8 files changed, 1 insertion(+), 164 deletions(-)
New commits:
commit 222b368672642392de99f5b678ea978a3563225e
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 12:11:17 2011 +0100
Remove erDEBUG directive.
diff --git a/binfilter/bf_sc/source/core/data/sc_bcaslot.cxx b/binfilter/bf_sc/source/core/data/sc_bcaslot.cxx
index 1a3e9ed..16d815f 100644
--- a/binfilter/bf_sc/source/core/data/sc_bcaslot.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_bcaslot.cxx
@@ -64,11 +64,6 @@ typedef ::std::vector< ScBroadcastArea* > ScBroadcastAreaList;
// STATIC DATA -----------------------------------------------------------
-#ifdef erDEBUG
-ULONG erCountBCAInserts = 0;
-ULONG erCountBCAFinds = 0;
-#endif
-
/*N*/ SV_IMPL_OP_PTRARR_SORT( ScBroadcastAreas, ScBroadcastAreaPtr );
/*N*/ TYPEINIT1( ScHint, SfxSimpleHint );
TYPEINIT1( ScAreaChangedHint, SfxHint );
diff --git a/binfilter/bf_sc/source/core/data/sc_documen7.cxx b/binfilter/bf_sc/source/core/data/sc_documen7.cxx
index 8f12f83..007ca4c 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen7.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen7.cxx
@@ -57,11 +57,6 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkArou
// STATIC DATA -----------------------------------------------------------
-#ifdef erDEBUG
-ULONG erCountBCAInserts = 0;
-ULONG erCountBCAFinds = 0;
-#endif
-
// -----------------------------------------------------------------------
/*N*/ void ScDocument::StartListeningArea( const ScRange& rRange,
commit fce0e35e4303c4f939fa577ff6f7aa51df95bf83
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 11:44:06 2011 +0100
Remove TEST_DELAYED_RESIZE directive.
diff --git a/binfilter/bf_sw/source/core/doc/sw_htmltbl.cxx b/binfilter/bf_sw/source/core/doc/sw_htmltbl.cxx
index ec48976..c70cfe3 100644
--- a/binfilter/bf_sw/source/core/doc/sw_htmltbl.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_htmltbl.cxx
@@ -31,16 +31,9 @@
#pragma hdrstop
#endif
-
-//#define TEST_DELAYED_RESIZE
-
-#ifdef TEST_DELAYED_RESIZE
-#endif
-
#include <horiornt.hxx>
#include <errhdl.hxx>
-
#include "htmltbl.hxx"
namespace binfilter {
@@ -61,32 +54,11 @@ namespace binfilter {
// eine Umrandung hat.
-
-
-
-
-
-
-
-
-
-
-
// nAbsAvail ist der verfuegbare Platz in TWIPS.
// nRelAvail ist der auf USHRT_MAX bezogene verfuegbare Platz oder 0
// nAbsSpace ist der Anteil von nAbsAvail, der durch der umgebende Zelle
// fur die Umrandung und den Abstand zum Inhalt reserviert ist.
-
-
-
-
-
-
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ef544a1fa36f299f5e3cd3c94a0d04073f2f7d6b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 11:43:13 2011 +0100
Remove OLD_INDEX directive.
diff --git a/binfilter/bf_sw/source/core/docnode/sw_node.cxx b/binfilter/bf_sw/source/core/docnode/sw_node.cxx
index cf62e91..ef82363 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_node.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_node.cxx
@@ -440,9 +440,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ pAttrSet( 0 ),
/*N*/ pCondColl( 0 ),
/*N*/ SwModify( pColl ) // CrsrsShell, FrameFmt
-/*N*/ #ifdef OLD_INDEX
-/*N*/ ,SwIndexReg(2)
-/*N*/ #endif
/*N*/ {
/*N*/ }
commit 4a7699c96c454ef06013d885969cc6d9ecbbf53b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 10:37:44 2011 +0100
Remove JP_DEBUG directive and some dead code.
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
index 4555b72..fe89723 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
@@ -1610,30 +1610,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*M*/ }
/*M*/ nFldLstGetMode = eGetMode;
/*M*/ nNodes = rDoc.GetNodes().Count();
-/*M*/
-/*M*/ #ifdef JP_DEBUG
-/*M*/ {
-/*M*/ SvFileStream sOut( "f:\\x.x", STREAM_STD_WRITE );
-/*M*/ sOut.Seek( STREAM_SEEK_TO_END );
-/*M*/ sOut << "------------------" << endl;
-/*M*/ const _SetGetExpFldPtr* pSortLst = pFldSortLst->GetData();
-/*M*/ for( USHORT n = pFldSortLst->Count(); n; --n, ++pSortLst )
-/*M*/ {
-/*M*/ String sStr( (*pSortLst)->GetNode() );
-/*M*/ sStr += "\t, ";
-/*M*/ sStr += (*pSortLst)->GetCntnt();
-/*M*/ sStr += "\tNode: ";
-/*M*/ sStr += (*pSortLst)->GetFld()->GetTxtNode().StartOfSectionIndex();
-/*M*/ sStr += "\tPos: ";
-/*M*/ sStr += *(*pSortLst)->GetFld()->GetStart();
-/*M*/ sStr += "\tType: ";
-/*M*/ sStr += (*pSortLst)->GetFld()->GetFld().GetFld()->GetTyp()->Which();
-/*M*/
-/*M*/ sOut << sStr.GetStr() << endl;
-/*M*/ }
-/*M*/ }
-/*M*/ #endif
-/*M*/ // JP_DEBUG
/*M*/ }
/*--------------------------------------------------------------------
diff --git a/binfilter/bf_sw/source/core/doc/sw_numpara.cxx b/binfilter/bf_sw/source/core/doc/sw_numpara.cxx
index 6968533..68c2471 100644
--- a/binfilter/bf_sw/source/core/doc/sw_numpara.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_numpara.cxx
@@ -42,50 +42,6 @@
#include "number.hxx"
-
-#ifdef JP_DEBUG
-
-#include <svwindow.hxx>
-namespace binfilter {
-
-class GrfWindow : public WorkWindow, public Timer
-{
- Graphic aGrf;
- Size aSz;
- virtual void Timeout();
- virtual void Paint( const Rectangle& );
-public:
- GrfWindow( const Graphic& rGrf );
- virtual ~GrfWindow();
-};
-
-GrfWindow::GrfWindow( const Graphic& rGrf )
- : WorkWindow( GetpApp()->GetAppWindow() ), aGrf( rGrf )
-{
- SetTimeout( 10000 );
-
- aSz = ::GetGraphicSizeTwip( &rGrf );
- SetMapMode( MapMode( MAP_TWIP ));
- SetPosSizePixel( Point( 100, 0 ), LogicToPixel( aSz ));
- Show();
- Invalidate();
- Update();
- Start();
-}
-SEXPORT GrfWindow::~GrfWindow()
-{
-}
-void SEXPORT GrfWindow::Timeout()
-{
- delete this;
-}
-void SEXPORT GrfWindow::Paint( const Rectangle& )
-{
- aGrf.Draw( this, Point(0,0), PixelToLogic( GetSizePixel() ) );
-}
-
-#endif
-
// waehrend des Nummerierens ist das Undo am Doc abgeschaltet !!!
diff --git a/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx b/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
index eaedab7..0cdfd72 100644
--- a/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
@@ -64,7 +64,7 @@ typedef SwTableLine* SwTableLinePtr;
-#if defined(DBG_UTIL) || defined( JP_DEBUG )
+#if defined(DBG_UTIL)
void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize )
{
@@ -85,9 +85,6 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize )
if( Abs( nAktSize - nSize ) > ( COLFUZZY * rBoxes.Count() ) )
{
DBG_ERROR( "Boxen der Line zu klein/gross" );
-#if defined( WNT ) && defined( JP_DEBUG )
- __asm int 3;
-#endif
}
}
@@ -655,8 +652,6 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
USHORT nLeft = pFndLn->GetTabBoxes().C40_GETPOS( SwTableBox, pLBx );
USHORT nRight = pFndLn->GetTabBoxes().C40_GETPOS( SwTableBox, pRBx );
-// if( ( nLeft && nRight+1 < pFndLn->GetTabBoxes().Count() ) ||
-// ( !nLeft && nRight+1 >= pFndLn->GetTabBoxes().Count() ) )
if( !nLeft || nRight == pFndLn->GetTabBoxes().Count() )
{
if( pULPara->bUL ) // Upper ?
@@ -1020,8 +1015,6 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
}
// suche ab dieser Line nach der naechsten Box mit Inhalt
-
-// suche ab dieser Line nach der naechsten Box mit Inhalt
BOOL lcl_BoxSetHeadCondColl( const SwTableBox*& rpBox, void* /*pPara*/ )
{
// in der HeadLine sind die Absaetze mit BedingtenVorlage anzupassen
@@ -1039,50 +1032,6 @@ BOOL lcl_LineSetHeadCondColl( const SwTableLine*& rpLine, void* /*pPara*/ )
return TRUE;
}
-/* */
-
-#ifdef _MSC_VER
-#pragma optimize( "", off )
-#endif
-
-
-//#pragma optimize( "", on )
-
-
-/* */
-
-//#pragma optimize( "", off )
-
-//#pragma optimize( "", on )
-
-
-// das Ergebnis des Positions Vergleiches
-// POS_BEFORE, // Box liegt davor
-// POS_BEHIND, // Box liegt dahinter
-// POS_INSIDE, // Box liegt vollstaendig in Start/End
-// POS_OUTSIDE, // Box ueberlappt Start/End vollstaendig
-// POS_EQUAL, // Box und Start/End sind gleich
-// POS_OVERLAP_BEFORE, // Box ueberlappt den Start
-// POS_OVERLAP_BEHIND // Box ueberlappt das Ende
-
-
-// Dummy Funktion fuer die Methode SetColWidth
-
-/* */
-
-
-#if defined(DBG_UTIL) || defined( JP_DEBUG )
-
-
-#endif
-
-#ifdef _MSC_VER
-#pragma optimize( "", on )
-#endif
-
-/* */
-
-
SwFrmFmt* SwShareBoxFmt::GetFormat( long nWidth ) const
{
SwFrmFmt *pRet = 0, *pTmp;
diff --git a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
index 74730f1..10efc84 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
@@ -55,9 +55,6 @@ namespace binfilter {
SV_DECL_PTRARR(SwSttNdPtrs,SwStartNode*,2,2)
} //namespace binfilter
-//#define JP_DEBUG
-#ifdef JP_DEBUG
-#endif
namespace binfilter {
More information about the Libreoffice-commits
mailing list