[Libreoffice-commits] .: 25 commits - starmath/inc starmath/qa starmath/source sw/qa sw/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sun Feb 13 13:47:20 PST 2011
starmath/inc/node.hxx | 25 ---
starmath/inc/rect.hxx | 4
starmath/inc/utility.hxx | 106 ----------------
starmath/qa/cppunit/test_nodetotextvisitors.cxx | 4
starmath/qa/cppunit/test_starmath.cxx | 6
starmath/source/node.cxx | 3
starmath/source/rect.cxx | 81 ------------
starmath/source/visitors.cxx | 40 ------
sw/qa/core/Test-BigPtrArray.cxx | 20 ---
sw/qa/core/swdoc-test.cxx | 4
sw/source/core/bastyp/index.cxx | 49 -------
sw/source/core/crsr/crsrsh.cxx | 15 --
sw/source/core/crsr/findattr.cxx | 6
sw/source/core/crsr/pam.cxx | 35 -----
sw/source/core/crsr/viscrs.cxx | 155 ------------------------
sw/source/core/docnode/ndtbl.cxx | 100 ---------------
sw/source/core/frmedt/feshview.cxx | 6
sw/source/core/inc/txtfrm.hxx | 41 ------
sw/source/core/text/itrtxt.cxx | 2
sw/source/core/text/txtio.cxx | 8 -
sw/source/core/unocore/unochart.cxx | 13 --
sw/source/filter/basflt/fltini.cxx | 6
sw/source/filter/html/css1atr.cxx | 28 ----
sw/source/filter/html/htmlatr.cxx | 16 --
sw/source/filter/html/htmlcss1.cxx | 8 -
sw/source/filter/html/htmltab.cxx | 25 ---
sw/source/filter/html/svxcss1.cxx | 14 --
sw/source/filter/html/wrthtml.hxx | 3
sw/source/filter/inc/msfilter.hxx | 10 -
sw/source/filter/ww8/needed_cast.hxx | 2
sw/source/filter/ww8/styles.cxx | 2
sw/source/filter/ww8/writerhelper.cxx | 100 +++------------
sw/source/filter/ww8/writerhelper.hxx | 40 ------
sw/source/filter/ww8/writerwordglue.hxx | 4
sw/source/filter/ww8/wrtw8nds.cxx | 3
sw/source/filter/ww8/wrtw8num.cxx | 14 --
sw/source/filter/ww8/wrtww8gr.cxx | 6
sw/source/filter/ww8/ww8par.cxx | 42 ------
sw/source/filter/ww8/ww8par2.cxx | 4
sw/source/filter/ww8/ww8par4.cxx | 7 -
40 files changed, 53 insertions(+), 1004 deletions(-)
New commits:
commit 4cfeb459a1879a1b2a4c3d323f6678d068143010
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 22:15:08 2011 +0100
Remove CHK (fix build)
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 5d1577b..c3d11b6 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -75,7 +75,6 @@ SwIndex::SwIndex( const SwIndex& rIdx, short nIdx )
#if OSL_DEBUG_LEVEL > 1
MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
#endif
-IDX_CHK_ARRAY
}
@@ -86,7 +85,6 @@ SwIndex::SwIndex( const SwIndex& rIdx )
#if OSL_DEBUG_LEVEL > 1
MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
#endif
-IDX_CHK_ARRAY
}
@@ -181,8 +179,6 @@ SwIndex& SwIndex::ChgValue( const SwIndex& rIdx, xub_StrLen nNewValue )
nIndex = nNewValue;
-IDX_CHK_ARRAY
-
return *this; }
@@ -197,8 +193,6 @@ void SwIndex::Remove()
pArray->pLast = pPrev;
else
pNext->pPrev = pPrev;
-
-IDX_CHK_ARRAY
}
/*************************************************************************
@@ -254,7 +248,6 @@ SwIndex& SwIndex::Assign( SwIndexReg* pArr, xub_StrLen nIdx )
}
else if( nIndex != nIdx )
ChgValue( *this, nIdx );
-IDX_CHK_ARRAY
return *this;
}
commit 3c5f914699ef4583f91ff5198b7dd240e5cc696c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 21:42:48 2011 +0100
Remove unused NEW_WW97_EXPORT
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index bc8a7c6..1e80097 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -142,12 +142,6 @@ void _InitFilter()
_SetFltPtr( READER_WRITER_HTML, (ReadHTML = new HTMLReader) );
_SetFltPtr( READER_WRITER_WW1, new WW1Reader );
_SetFltPtr( READER_WRITER_XML, (ReadXML = new XMLReader) );
-
-#ifdef NEW_WW97_EXPORT
- aReaderWriter[ READER_WRITER_WW1 ].fnGetWriter = &::GetWW8Writer;
- aReaderWriter[ READER_WRITER_WW5 ].fnGetWriter = &::GetWW8Writer;
-#endif
-
_SetFltPtr( READER_WRITER_TEXT_DLG, ReadAscii );
_SetFltPtr( READER_WRITER_TEXT, ReadAscii );
}
commit 04f1ede561bcab5a4d1bad3cea812c703e1ecc13
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 21:41:34 2011 +0100
Remove unused SHOW_IDLE_REGION
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index b2df47e..832f298 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -231,21 +231,6 @@ void SwCrsrShell::EndAction( const BOOL bIdleEnd )
if( bIdleEnd && Imp()->GetRegion() )
{
pCurCrsr->Hide();
-
-#ifdef SHOW_IDLE_REGION
-if( GetWin() )
-{
- GetWin()->Push();
- GetWin()->ChangePen( Pen( Color( COL_YELLOW )));
- for( USHORT n = 0; n < aPntReg.Count(); ++n )
- {
- SwRect aIRect( aPntReg[n] );
- GetWin()->DrawRect( aIRect.SVRect() );
- }
- GetWin()->Pop();
-}
-#endif
-
}
// vor der letzten Action alle invaliden Numerierungen updaten
commit 2949d0707df83a39f07dccd4338ae13a12c7c5fd
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 21:30:58 2011 +0100
Remove OLD
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 65b6c96..bb89f05 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -1186,10 +1186,6 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
{
// --- Ist die Selection noch da ??????
- // und noch die Attribute setzen
-#ifdef OLD
- pCrsr->GetDoc()->Insert( *pCrsr, *pReplSet, 0 );
-#else
//JP 13.07.95: alle gesuchten Attribute werden, wenn nicht im
// ReplaceSet angegeben, auf Default zurueck gesetzt
@@ -1218,7 +1214,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
aSet.Put( *pReplSet );
pCrsr->GetDoc()->InsertItemSet( *pCrsr, aSet, 0 );
}
-#endif
+
return FIND_NO_RING;
}
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 8dbca7f..2237dc9 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1106,11 +1106,6 @@ int SwFEShell::IsInsideSelectedObj( const Point &rPt )
bool SwFEShell::IsObjSelectable( const Point& rPt )
{
SET_CURR_SHELL(this);
-#ifdef OLD
- if( Imp()->HasDrawView() )
- return Imp()->GetDrawView()->PickSomething( rPt, MINMOVE );
- return 0;
-#else
SwDrawView *pDView = Imp()->GetDrawView();
bool bRet = false;
if( pDView )
@@ -1124,7 +1119,6 @@ bool SwFEShell::IsObjSelectable( const Point& rPt )
pDView->SetHitTolerancePixel( nOld );
}
return bRet;
-#endif
}
// Test if there is a object at that position and if it should be selected.
commit 504703737fcf9a969bf4eba6aeb37fc9f4c3167b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 21:28:50 2011 +0100
Remove unused DUMPSYMBOLS
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 113c5e7..aaccf6d 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -49,11 +49,6 @@
#include "wrtww8.hxx"
#include "ww8par.hxx"
-//#define DUMPSYMBOLS
-#ifdef DUMPSYMBOLS
-#include <fstream>
-#endif
-
using namespace ::com::sun::star;
using namespace sw::types;
using namespace sw::util;
@@ -711,15 +706,6 @@ void MSWordExportBase::SubstituteBullet( String& rNumStr,
if (!pConvert)
{
pConvert = CreateStarSymbolToMSMultiFont();
-#ifdef DUMPSYMBOLS
- ::std::ofstream output("fontdebug");
- for (sal_Unicode i=0xE000;i<0xF8FF;i++)
- {
- String sFont = pConvert->ConvertChar(i);
- if (sFont.Len())
- output << ::std::hex << i << std::endl;
- }
-#endif
}
sal_Unicode cChar = rNumStr.GetChar(0);
String sFont = pConvert->ConvertChar(cChar);
commit 0e43cc7fd293316195b0155bdeb6e11df983d28d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 21:28:07 2011 +0100
Remove unused NO_OLE_SIZE_OPTIMIZE
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 34cf2c4..74e3f65 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -108,9 +108,6 @@ bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet,
SvStorageRef xOleStg, SvStorageRef xObjStg, String &rStorageName,
SwOLENode *pOLENd)
{
-#ifdef NO_OLE_SIZE_OPTIMIZE
- return true;
-#else
bool bGraphicNeeded = false;
SfxItemIter aIter( rSet );
const SfxPoolItem* pItem = aIter.GetCurItem();
@@ -210,7 +207,6 @@ bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet,
else
bGraphicNeeded = true;
return bGraphicNeeded;
-#endif
}
void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
commit c4135e0b43e4bab57da79aba0018ef90b6823917
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 21:25:26 2011 +0100
Remove unused JAVA_BASIC_IDE
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 064e050..32f8170 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -371,9 +371,6 @@ public:
void OutFootEndNoteSym( const SwFmtFtn& rFmtFtn, const String& rNum,
sal_uInt16 nScript );
-#ifdef JAVA_BASIC_IDE
- void OutBasicModule( const String& rName, const String& rLanguage );
-#endif
void OutBasic();
void OutAndSetDefList( sal_uInt16 nNewLvl );
commit 5a187a9665dab614b2edf829e3be0be88f218e23
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 21:22:01 2011 +0100
Remove unused CHK
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 6b678e0..5d1577b 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -45,46 +45,6 @@ int SwIndex::nSerial = 0;
TYPEINIT0(SwIndexReg); // rtti
-#ifdef CHK
-
-#define IDX_CHK_ARRAY pArray->ChkArr();
-#define ARR_CHK_ARRAY ChkArr();
-
-
-void SwIndexReg::ChkArr()
-{
- OSL_ENSURE( (pFirst && pLast) || (!pFirst && !pLast),
- "Array falsch Indiziert" );
-
- if( !pFirst )
- return;
-
- xub_StrLen nVal = 0;
- const SwIndex* pIdx = pFirst, *pPrev = 0;
- OSL_ENSURE( !pIdx->pPrev, "Array-pFirst nicht am Anfang" );
-
- while( pIdx != pLast )
- {
- OSL_ENSURE( pIdx->pPrev != pIdx && pIdx->pNext != pIdx,
- "Index zeigt auf sich selbst" );
-
- OSL_ENSURE( pIdx->nIndex >= nVal, "Reihenfolge stimmt nicht" );
- OSL_ENSURE( pPrev == pIdx->pPrev, "Verkettung stimmt nicht" );
- pPrev = pIdx;
- pIdx = pIdx->pNext;
- nVal = pPrev->nIndex;
- }
-}
-
-#else // CHK
-
-#define IDX_CHK_ARRAY
-#define ARR_CHK_ARRAY
-
-#endif // CHK
-
-
-
SwIndex::SwIndex(SwIndexReg *const pArr, xub_StrLen const nIdx)
: nIndex( nIdx ), pArray( pArr ), pNext( 0 ), pPrev( 0 )
{
@@ -104,7 +64,6 @@ SwIndex::SwIndex(SwIndexReg *const pArr, xub_StrLen const nIdx)
#if OSL_DEBUG_LEVEL > 1
MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
#endif
-IDX_CHK_ARRAY
}
@@ -354,7 +313,6 @@ void SwIndexReg::Update( SwIndex const & rIdx, const xub_StrLen nDiff,
pStt = pStt->pNext;
}
}
-ARR_CHK_ARRAY
}
#if OSL_DEBUG_LEVEL > 1
commit cb45aaafe04e2ef026d839a96e71b1f5533ae441
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 21:16:23 2011 +0100
Remove unused DEL_TABLE_REDLINES
Old comment: #i17764# delete table redlines when modifying the table structure?
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index cfe9732..4af81c9 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -104,9 +104,6 @@
using namespace ::com::sun::star;
-// #i17764# delete table redlines when modifying the table structure?
-// #define DEL_TABLE_REDLINES 1
-
const sal_Unicode T2T_PARA = 0x0a;
extern void ClearFEShellTabCols();
@@ -114,25 +111,6 @@ extern void ClearFEShellTabCols();
// steht im gctable.cxx
extern BOOL lcl_GC_Line_Border( const SwTableLine*& , void* pPara );
-#ifdef DEL_TABLE_REDLINES
-class lcl_DelRedlines
-{
- SwDoc* pDoc;
-public:
- lcl_DelRedlines( const SwTableNode& rNd, BOOL bCheckForOwnRedline );
- lcl_DelRedlines( SwPaM& rPam );
-
- ~lcl_DelRedlines() { pDoc->EndUndo(UNDO_EMPTY, NULL); }
-};
-
-lcl_DelRedlines::lcl_DelRedlines( SwPaM & rPam) : pDoc( rPam.GetDoc() )
-{
- pDoc->StartUndo(UNDO_EMPTY, NULL);
- if( !pDoc->IsIgnoreRedline() && pDoc->GetRedlineTbl().Count() )
- pDoc->AcceptRedline( rPam, true );
-}
-#endif
-
void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, BYTE nId )
{
BOOL bTop = FALSE, bBottom = FALSE, bLeft = FALSE, bRight = FALSE;
@@ -672,10 +650,6 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
pStt = aOriginal.GetMark();
pEnd = aOriginal.GetPoint();
-#ifdef DEL_TABLE_REDLINES
- lcl_DelRedlines aDelRedl( aOriginal );
-#endif
-
SwUndoTxtToTbl* pUndo = 0;
if( DoesUndo() )
{
@@ -1119,10 +1093,6 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
const SwPosition *pStt = aOriginal.GetMark();
const SwPosition *pEnd = aOriginal.GetPoint();
-#ifdef DEL_TABLE_REDLINES
- lcl_DelRedlines aDelRedl( aOriginal );
-#endif
-
SwUndoTxtToTbl* pUndo = 0;
if( DoesUndo() )
{
@@ -1439,10 +1409,6 @@ BOOL SwDoc::TableToText( const SwTableNode* pTblNd, sal_Unicode cCh )
pESh->ClearMark();
// <--
-#ifdef DEL_TABLE_REDLINES
- lcl_DelRedlines aDelRedl( *pTblNd, FALSE );
-#endif
-
SwNodeRange aRg( *pTblNd, 0, *pTblNd->EndOfSectionNode() );
SwUndoTblToTxt* pUndo = 0;
SwNodeRange* pUndoRg = 0;
@@ -1712,10 +1678,6 @@ BOOL SwDoc::InsertCol( const SwSelBoxes& rBoxes, USHORT nCnt, BOOL bBehind )
if( rTbl.ISA( SwDDETable ))
return FALSE;
-#ifdef DEL_TABLE_REDLINES
- lcl_DelRedlines aDelRedl( *pTblNd, TRUE );
-#endif
-
SwTableSortBoxes aTmpLst( 0, 5 );
SwUndoTblNdsChg* pUndo = 0;
if( DoesUndo() )
@@ -1777,10 +1739,6 @@ BOOL SwDoc::InsertRow( const SwSelBoxes& rBoxes, USHORT nCnt, BOOL bBehind )
if( rTbl.ISA( SwDDETable ))
return FALSE;
-#ifdef DEL_TABLE_REDLINES
- lcl_DelRedlines aDelRedl( *pTblNd, TRUE );
-#endif
-
SwTableSortBoxes aTmpLst( 0, 5 );
SwUndoTblNdsChg* pUndo = 0;
if( DoesUndo() )
@@ -1981,10 +1939,6 @@ BOOL SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
rTable.FindSuperfluousRows( aSelBoxes );
}
-#ifdef DEL_TABLE_REDLINES
- lcl_DelRedlines aDelRedl( *pTblNd, TRUE );
-#endif
-
// soll die gesamte Tabelle geloescht werden ??
const ULONG nTmpIdx1 = pTblNd->GetIndex();
const ULONG nTmpIdx2 = aSelBoxes[ aSelBoxes.Count()-1 ]->GetSttNd()->
@@ -2178,10 +2132,6 @@ BOOL SwDoc::SplitTbl( const SwSelBoxes& rBoxes, sal_Bool bVert, USHORT nCnt,
if( rTbl.ISA( SwDDETable ))
return FALSE;
-#ifdef DEL_TABLE_REDLINES
- lcl_DelRedlines aDelRedl( *pTblNd, TRUE );
-#endif
-
SvULongs aNdsCnts;
SwTableSortBoxes aTmpLst( 0, 5 );
SwUndoTblNdsChg* pUndo = 0;
@@ -2262,10 +2212,6 @@ USHORT SwDoc::MergeTbl( SwPaM& rPam )
StartUndo( UNDO_TABLE_MERGE, NULL );
// <--
-#ifdef DEL_TABLE_REDLINES
- if( !IsIgnoreRedline() && GetRedlineTbl().Count() )
- DeleteRedline( *pTblNd, true, USHRT_MAX );
-#endif
RedlineMode_t eOld = GetRedlineMode();
SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE));
@@ -4589,50 +4535,4 @@ BOOL SwDoc::HasTblAnyProtection( const SwPosition* pPos,
return bHasProtection;
}
-#ifdef DEL_TABLE_REDLINES
-lcl_DelRedlines::lcl_DelRedlines( const SwTableNode& rNd,
- BOOL bCheckForOwnRedline )
- : pDoc( (SwDoc*)rNd.GetNodes().GetDoc() )
-{
- pDoc->StartUndo(UNDO_EMPTY, NULL);
- const SwRedlineTbl& rTbl = pDoc->GetRedlineTbl();
- if( !pDoc->IsIgnoreRedline() && rTbl.Count() )
- {
- BOOL bDelete = TRUE;
- if( bCheckForOwnRedline )
- {
- sal_uInt16 nRedlPos = pDoc->GetRedlinePos( rNd, USHRT_MAX );
- sal_uInt32 nSttNd = rNd.GetIndex(),
- nEndNd = rNd.EndOfSectionIndex();
-
- for ( ; nRedlPos < rTbl.Count(); ++nRedlPos )
- {
- const SwRedline* pRedline = rTbl[ nRedlPos ];
- const SwPosition* pStt = pRedline->Start(),
- * pEnd = pStt == pRedline->GetPoint()
- ? pRedline->GetMark()
- : pRedline->GetPoint();
- if( pStt->nNode <= nSttNd )
- {
- if( pEnd->nNode >= nEndNd &&
- pRedline->GetAuthor() == pDoc->GetRedlineAuthor() )
- {
- bDelete = FALSE;
- break;
- }
- }
- else
- break;
- }
- }
- if( bDelete )
- {
- SwPaM aPam(*rNd.EndOfSectionNode(), rNd);
- pDoc->AcceptRedline( aPam, true );
- }
- }
-}
-#endif
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a9154189f473a0e0cc265b2ad781a34499f64d86
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 21:14:24 2011 +0100
Remove unused SHOW_BOOKMARKS and SHOW_REDLINES
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 3c36339..b93a909 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -70,143 +70,6 @@ long SwSelPaintRects::nPixPtX = 0;
long SwSelPaintRects::nPixPtY = 0;
MapMode* SwSelPaintRects::pMapMode = 0;
-
-#ifndef SHOW_BOOKMARKS
-#define SHOWBOOKMARKS1( nAct )
-#define SHOWBOOKMARKS2( nAct, pRect )
-#endif
-
-#ifdef SHOW_REDLINES
-#include <redline.hxx>
-
-class SwRedlineRects : public SwSelPaintRects
-{
- USHORT nMode;
- USHORT nNm;
-
- virtual void Paint( const Rectangle& rRect );
- virtual void FillRects();
-
-public:
- SwRedlineRects( const SwCrsrShell& rSh, USHORT nName, USHORT n )
- : SwSelPaintRects( rSh ), nMode( n ), nNm( nName )
- {}
-};
-
-void SwRedlineRects::Paint( const Rectangle& rRect )
-{
- Window* pWin = GetShell()->GetWin();
-
- RasterOp eOld( pWin->GetRasterOp() );
- BOOL bLCol = pWin->IsLineColor();
- Color aLCol( pWin->GetLineColor() );
- BOOL bFCol = pWin->IsFillColor();
- Color aFCol( pWin->GetFillColor() );
-
- pWin->SetRasterOp( ROP_XOR );
- Color aCol;
-
- UINT8 nVal = 0xc8 - ( (nMode / 4) * 16 );
- switch( nMode % 4 )
- {
- case 0: aCol = RGB_COLORDATA( nVal, nVal, 0xFF ); break;
- case 1: aCol = RGB_COLORDATA( 0xFF, 0xc8, nVal ); break;
- case 2: aCol = RGB_COLORDATA( nVal, 0xFF, nVal ); break;
- case 3: aCol = RGB_COLORDATA( 0xFF, nVal, nVal ); break;
- }
- aCol = aCol.GetColor() ^ COL_WHITE;
-
- pWin->SetFillColor( aCol );
- pWin->SetLineColor( aCol );
-
- pWin->DrawRect( rRect );
-
- if( bLCol ) pWin->SetLineColor( aLCol ); else pWin->SetLineColor();
- if( bFCol ) pWin->SetFillColor( aFCol ); else pWin->SetFillColor();
- pWin->SetRasterOp( eOld );
-}
-
-void SwRedlineRects::FillRects()
-{
- SwRegionRects aReg( GetShell()->VisArea() );
-
- const SwRedlineTbl& rTbl = GetShell()->GetDoc()->GetRedlineTbl();
- SwShellCrsr* pCrsr = 0;
- for( USHORT n = 0; n < rTbl.Count(); ++n )
- {
- const SwRedline& rRed = *rTbl[ n ];
- if( rRed.HasMark() && (nMode % 4 ) == rRed.GetType() &&
- nNm == rRed.GetAuthor() )
- {
- if( !pCrsr )
- {
- pCrsr = new SwShellCrsr( *GetShell(), *rRed.GetPoint() );
- pCrsr->SetMark();
- }
- else
- *pCrsr->GetPoint() = *rRed.GetPoint();
- *pCrsr->GetMark() = *rRed.GetMark();
- pCrsr->FillRects();
- for( USHORT i = 0; i < pCrsr->Count(); ++i )
- aReg -= (*pCrsr)[ i ];
-
- pCrsr->Remove( 0, i );
- }
- }
- if( pCrsr ) delete pCrsr;
-
- aReg.Invert();
- SwRects::Insert( &aReg, 0 );
-}
-
-SwRedlineRects* aRedlines[ 10 * 4 ];
-static int bFirstCall = TRUE;
-
-void ShowRedlines( const SwCrsrShell* pSh, int nAction, const SwRect* pRect = 0 )
-{
- if( bFirstCall )
- {
- memset( aRedlines, 0, sizeof(aRedlines));
- bFirstCall = FALSE;
- }
-
- const SwRedlineTbl& rTbl = pSh->GetDoc()->GetRedlineTbl();
- const SwRedlineAuthorTbl& rAuthorTbl = pSh->GetDoc()->GetRedlineAuthorTbl();
-
- for( USHORT n = 0; n < rAuthorTbl.Count(); ++n )
- {
- for( int i = 0; i < 4; ++i )
- {
- SwRedlineRects** ppRedRect = &aRedlines[ n * 4 + i ];
- if( rTbl.Count() && !*ppRedRect )
- *ppRedRect = new SwRedlineRects( *pSh, n, n * 4 + i );
-
- if( *ppRedRect )
- {
- switch( nAction )
- {
- case 1: (*ppRedRect)->Show(); break;
- case 2: (*ppRedRect)->Hide(); break;
- case 3: (*ppRedRect)->Invalidate( *pRect ); break;
- }
-
- if( !(*ppRedRect)->Count() )
- delete *ppRedRect, *ppRedRect = 0;
- }
- }
- }
-}
-
-#define SHOWREDLINES1( nAct ) ShowRedlines( GetShell(),nAct );
-#define SHOWREDLINES2( nAct, pRect ) ShowRedlines( GetShell(),nAct, pRect );
-
-#else
-
-#define SHOWREDLINES1( nAct )
-#define SHOWREDLINES2( nAct, pRect )
-
-#endif
-
// ----- Starting from here: classes / methods for the non-text-cursor -----
SwVisCrsr::SwVisCrsr( const SwCrsrShell * pCShell )
@@ -648,9 +511,6 @@ void SwShellCrsr::Show()
do {
pTmp->SwSelPaintRects::Show();
} while( this != ( pTmp = dynamic_cast<SwShellCrsr*>(pTmp->GetNext()) ) );
-
- SHOWBOOKMARKS1( 1 )
- SHOWREDLINES1( 1 )
}
@@ -676,9 +536,6 @@ void SwShellCrsr::Invalidate( const SwRect& rRect )
while ( !pTmp );
}
while( this != pTmp );
-
- SHOWBOOKMARKS2( 3, &rRect )
- SHOWREDLINES2( 3, &rRect )
}
@@ -688,9 +545,6 @@ void SwShellCrsr::Hide()
do {
pTmp->SwSelPaintRects::Hide();
} while( this != ( pTmp = dynamic_cast<SwShellCrsr*>(pTmp->GetNext()) ) );
-
- SHOWBOOKMARKS1( 2 )
- SHOWREDLINES1( 2 )
}
SwCursor* SwShellCrsr::Create( SwPaM* pRing ) const
commit 937ae8632eea71f7f53d5e8c2219a8468af1f29d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 21:12:30 2011 +0100
Remove unused JP_REDLINE
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 4a2c7c8..3c36339 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -207,15 +207,6 @@ void ShowRedlines( const SwCrsrShell* pSh, int nAction, const SwRect* pRect = 0
#endif
-#ifdef JP_REDLINE
- if( GetDoc()->GetRedlineTbl().Count() )
- {
- SwRedlineTbl& rRedlineTbl = (SwRedlineTbl&)GetDoc()->GetRedlineTbl();
- for( USHORT i = 0; i < rRedlineTbl.Count(); ++i )
- rRedlineTbl[ i ]->HideRects( *GetShell() );
- }
-#endif
-
// ----- Starting from here: classes / methods for the non-text-cursor -----
SwVisCrsr::SwVisCrsr( const SwCrsrShell * pCShell )
commit afb5238e022bc0cccbc55a5a5bf0211bc95582de
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 21:10:59 2011 +0100
Remove unused CHECK_CELL_READONLY
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 8768b10..5fe6429 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -764,41 +764,6 @@ BOOL SwPaM::HasReadonlySel( bool bFormView ) const
}
}
}
-
-#ifdef CHECK_CELL_READONLY
-//JP 22.01.99: bisher wurden Tabelle, die in der Text-Selektion standen
-// nicht beachtet. Wollte man das haben, dann muss dieser
-// Code freigeschaltet werden
-
- if( !bRet )
- {
- // dann noch ueber alle Tabellen
- const SwFrmFmts& rFmts = *GetDoc()->GetTblFrmFmts();
- for( n = rFmts.Count(); n ; )
- {
- SwFrmFmt* pFmt = (SwFrmFmt*)rFmts[ --n ];
- const SwTable* pTbl = SwTable::FindTable( pFmt );
- ULONG nIdx = pTbl ? pTbl->GetTabSortBoxes()[0]->GetSttIdx()
- : 0;
- if( nSttIdx <= nIdx && nEndIdx >= nIdx )
- {
- // dann teste mal alle Boxen
- const SwTableSortBoxes& rBoxes = pTbl->GetTabSortBoxes();
-
- for( USHORT i = rBoxes.Count(); i; )
- if( rBoxes[ --i ]->GetFrmFmt()->GetProtect().
- IsCntntProtected() )
- {
- bRet = TRUE;
- break;
- }
-
- if( bRet )
- break;
- }
- }
- }
-#endif
}
}
}
commit 52528f8b9456ab1a789a001aa75ab944272b11e4
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 21:09:35 2011 +0100
Remove TL_NOT_USED
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index e3b40d4..305bc34 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -1372,19 +1372,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
if (!bNeedSequenceMapping)
aSequenceMapping.realloc(0);
-
-#ifdef TL_NOT_USED // in the end chart2 did not want to have the sequence minimized
- // try to shorten the 'SequenceMapping' as much as possible
- sal_Int32 k;
- for (k = nNumDS_LDS - 1; k >= 0; --k)
- {
- if (pSequenceMapping[k] != k)
- break;
- }
- aSequenceMapping.realloc( k + 1 );
-#endif
-
-
//
// build resulting properties
//
commit fe20d482890087d243962769cc9e08156e8a7e0f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 21:07:25 2011 +0100
Remove unused FULL_FIRST_LETTER
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index e8c7c85..18d94f6 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1015,12 +1015,8 @@ BOOL SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
{
if( !pNext ||
(CSS1_SELTYPE_PSEUDO==eNextType &&
-#ifdef FULL_FIRST_LETTER
- pNext->GetString().EqualsIgnoreCaseAscii(sCSS1_first_letter)) )
-#else
pNext->GetString().EqualsIgnoreCaseAscii(sCSS1_first_letter) &&
SVX_ADJUST_LEFT == rPropInfo.eFloat) )
-#endif
{
// Entweder kein zusammengesetzter Selektor oder
// ein X:first-line { float: left; ... }
@@ -1546,11 +1542,7 @@ void SwCSS1Parser::FillDropCap( SwFmtDrop& rDrop,
// Bei harter Attributierung (pName==0) koennen wir aufhoehren, wenn
// das Initial nur ueber eine Zeile geht.
-#ifdef FULL_FIRST_LETTER
- if( nLines<=1 && !pName )
-#else
if( nLines<=1 )
-#endif
return;
rDrop.GetLines() = nLines;
commit 2694492cdde19a692bfd1df4c000f1bcf0f6f4ba
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 21:06:41 2011 +0100
Remove unused EXACT_VALUES
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 35dd165..f619d7d 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -350,49 +350,28 @@ static void AddUnitPropertyValue( long nVal, FieldUnit eUnit, ByteString& rOut )
case FUNIT_KM:
OSL_ENSURE( FUNIT_CM == eUnit, "Masseinheit wird nicht unterstuetzt" );
case FUNIT_CM:
-#ifdef EXACT_VALUES
- // 0.001cm = 0.57twip
- nMul = 25400; // 2.54 * 10000
- nDiv = 1440; // 72 * 20;
- nFac = 1000;
-#else
// 0.01cm = 5.7twip (ist zwar ungenau, aber die UI ist auch ungenau)
nMul = 2540; // 2.54 * 1000
nDiv = 1440; // 72 * 20;
nFac = 100;
-#endif
pUnit = sCSS1_UNIT_cm;
break;
case FUNIT_TWIP:
OSL_ENSURE( FUNIT_POINT == eUnit, "Masseinheit wird nicht unterstuetzt" );
case FUNIT_POINT:
-#ifdef EXACT_VALUES
- // 0.01pt = 0.2twip
- nMul = 1000;
- nDiv = 20;
- nFac = 100;
-#else
// 0.1pt = 2.0twip (ist zwar ungenau, aber die UI ist auch ungenau)
nMul = 100;
nDiv = 20;
nFac = 10;
-#endif
pUnit = sCSS1_UNIT_pt;
break;
case FUNIT_PICA:
-#ifdef EXACT_VALUES
- // 0.001pc = 0.24twip
- nMul = 10000;
- nDiv = 12 * 20;
- nFac = 1000;
-#else
// 0.01pc = 2.40twip (ist zwar ungenau, aber die UI ist auch ungenau)
nMul = 1000;
nDiv = 240; // 12 * 20;
nFac = 100;
-#endif
pUnit = sCSS1_UNIT_pc;
break;
@@ -404,17 +383,10 @@ static void AddUnitPropertyValue( long nVal, FieldUnit eUnit, ByteString& rOut )
case FUNIT_INCH:
default:
OSL_ENSURE( FUNIT_INCH == eUnit, "Masseinheit wird nicht unterstuetzt" );
-#ifdef EXACT_VALUES
- // 0.0001in = 0.144twip
- nMul = 100000;
- nDiv = 1440; // 72 * 20;
- nFac = 10000;
-#else
// 0.01in = 14.4twip (ist zwar ungenau, aber die UI ist auch ungenau)
nMul = 1000;
nDiv = 1440; // 72 * 20;
nFac = 100;
-#endif
pUnit = sCSS1_UNIT_inch;
break;
}
commit 4a8834b35a30b4d744512d5ba60ce50007211b4f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 21:05:14 2011 +0100
Remove unused PERCENTAGE_POSSIBLE
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index c4f0f5b..235d8e4 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -1101,24 +1101,12 @@ static void ParseCSS1_font_size( const CSS1Expression *pExpr,
case CSS1_IDENT:
{
USHORT nSize;
-#ifdef PERCENTAGE_POSSIBLE
- const String& rValue = pExpr->GetString();
-#endif
+
if( SvxCSS1Parser::GetEnum( aFontSizeTable, pExpr->GetString(),
nSize ) )
{
nHeight = rParser.GetFontHeight( nSize );
}
-#ifdef PERCENTAGE_POSSIBLE
- else if( rValue.EqualsIgnoreCaseAscii( sCSS1_PV_larger ) )
- {
- nPropHeight = 150;
- }
- else if( rValue.EqualsIgnoreCaseAscii( sCSS1_PV_smaller ) )
- {
- nPropHeight = 67;
- }
-#endif
}
break;
commit fca603b3e5c6b64558e46576e4efaa9971f97343
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 21:02:04 2011 +0100
Remove unused SM_RECT_DEBUG
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index fe4afe7..85667b0 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -166,10 +166,6 @@ public:
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
virtual void CreateTextFromNode(String &rText);
-#ifdef SM_RECT_DEBUG
- using SmRect::Draw;
-#endif
-
virtual void GetAccessibleText( String &rText ) const;
sal_Int32 GetAccessibleIndex() const { return nAccIndex; }
const SmNode * FindNodeWithAccessibleIndex(xub_StrLen nAccIndex) const;
@@ -413,10 +409,6 @@ public:
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-#ifdef SM_RECT_DEBUG
- using SmRect::Draw;
-#endif
-
void CreateTextFromNode(String &rText);
void Accept(SmVisitor* pVisitor);
};
@@ -446,10 +438,6 @@ public:
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-#ifdef SM_RECT_DEBUG
- using SmRect::Draw;
-#endif
-
void Accept(SmVisitor* pVisitor);
};
@@ -509,11 +497,6 @@ public:
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
virtual void CreateTextFromNode(String &rText);
-#ifdef SM_RECT_DEBUG
- using SmRect::Draw;
-#endif
-
-
virtual void GetAccessibleText( String &rText ) const;
void Accept(SmVisitor* pVisitor);
};
@@ -541,10 +524,6 @@ public:
virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-#ifdef SM_RECT_DEBUG
- using SmRect::Draw;
-#endif
-
void Accept(SmVisitor* pVisitor);
};
@@ -623,10 +602,6 @@ public:
virtual void AdaptToX(const OutputDevice &rDev, ULONG nWidth);
virtual void AdaptToY(const OutputDevice &rDev, ULONG nHeight);
-#ifdef SM_RECT_DEBUG
- using SmRect::Draw;
-#endif
-
void Accept(SmVisitor* pVisitor);
};
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index 2185103..9aeee1f 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -211,10 +211,6 @@ public:
inline Rectangle AsRectangle() const;
SmRect AsGlyphRect() const;
-
-#ifdef SM_RECT_DEBUG
- void Draw(OutputDevice &rDev, const Point &rPosition, int nFlags) const;
-#endif
};
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index dec5ee7..217ea1b 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -50,9 +50,6 @@
#include <math.h>
#include <float.h>
-// define this to draw rectangles for debugging
-//#define SM_RECT_DEBUG
-
#define APPEND(str,ascii) str.AppendAscii(RTL_CONSTASCII_STRINGPARAM(ascii))
////////////////////////////////////////
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index 5660fe6..2556a96 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -615,87 +615,6 @@ SmRect SmRect::AsGlyphRect() const
return aRect;
}
-#ifdef SM_RECT_DEBUG
-
-// forward declaration
-void SmDrawFrame(OutputDevice &rDev, const Rectangle &rRec,
- const Color aCol = COL_BLACK);
-
-void SmRect::Draw(OutputDevice &rDev, const Point &rPosition, int nFlags) const
-{
- if (IsEmpty())
- return;
-
- rDev.Push(PUSH_LINECOLOR);
-
- if (nFlags & SM_RECT_LINES)
- { long nLeftSpace = 0,
- nRightSpace = 0;
-
- if (nFlags & SM_RECT_ITALIC)
- { nLeftSpace = GetItalicLeftSpace();
- nRightSpace = GetItalicRightSpace();
- }
-
- long nLeft = GetLeft() - nLeftSpace,
- nRight = GetRight() + nRightSpace;
-
- Point aOffset (rPosition - GetTopLeft());
-
- rDev.SetLineColor(COL_LIGHTBLUE);
- rDev.DrawLine(Point(nLeft, GetAlignB()) += aOffset,
- Point(nRight, GetAlignB()) += aOffset);
- rDev.DrawLine(Point(nLeft, GetAlignT()) += aOffset,
- Point(nRight, GetAlignT()) += aOffset);
- if (HasBaseline())
- rDev.DrawLine(Point(nLeft, GetBaseline()) += aOffset,
- Point(nRight, GetBaseline()) += aOffset);
-
- rDev.SetLineColor(COL_GRAY);
- rDev.DrawLine(Point(nLeft, GetHiAttrFence()) += aOffset,
- Point(nRight, GetHiAttrFence()) += aOffset);
- }
-
- if (nFlags & SM_RECT_MID)
- { Point aCenter = rPosition
- + (Point(GetItalicCenterX(), GetAlignM()) -= GetTopLeft()),
- aLenX (GetWidth() / 5, 0),
- aLenY (0, GetHeight() / 16);
-
- rDev.SetLineColor(COL_LIGHTGREEN);
- rDev.DrawLine(aCenter - aLenX, aCenter + aLenX);
- rDev.DrawLine(aCenter - aLenY, aCenter + aLenY);
- }
-
- if (nFlags & SM_RECT_ITALIC)
- SmDrawFrame(rDev, Rectangle(rPosition - Point(GetItalicLeftSpace(), 0),
- GetItalicSize()));
-
- if (nFlags & SM_RECT_CORE)
- SmDrawFrame(rDev, Rectangle(rPosition, GetSize()), COL_LIGHTRED);
-
- rDev.Pop();
-}
-
-
-void SmDrawFrame(OutputDevice &rDev, const Rectangle &rRec,
- const Color aCol)
-{
- rDev.Push(PUSH_LINECOLOR);
-
- rDev.SetLineColor(aCol);
-
- rDev.DrawLine(rRec.TopLeft(), rRec.BottomLeft());
- rDev.DrawLine(rRec.BottomLeft(), rRec.BottomRight());
- rDev.DrawLine(rRec.BottomRight(), rRec.TopRight());
- rDev.DrawLine(rRec.TopRight(), rRec.TopLeft());
-
- rDev.Pop();
-}
-
-#endif //SM_RECT_DEBUG
-
-
bool SmGetGlyphBoundRect(const OutputDevice &rDev,
const XubString &rText, Rectangle &rRect)
// basically the same as 'GetTextBoundRect' (in class 'OutputDevice')
diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx
index a6778eb..ffe304c 100644
--- a/starmath/source/visitors.cxx
+++ b/starmath/source/visitors.cxx
@@ -685,14 +685,6 @@ void SmDrawingVisitor::Visit( SmRootSymbolNode* pNode )
aBar.SetPos( aDrawPos );
rDev.DrawRect( aBar );
-
-#ifdef SM_RECT_DEBUG
- if ( !pNode->IsDebug( ) )
- return;
-
- int nRFlags = SM_RECT_CORE | SM_RECT_ITALIC | SM_RECT_LINES | SM_RECT_MID;
- pNode->SmRect::Draw( rDev, Position, nRFlags );
-#endif
}
void SmDrawingVisitor::Visit( SmPolyLineNode* pNode )
@@ -714,14 +706,6 @@ void SmDrawingVisitor::Visit( SmPolyLineNode* pNode )
aTmpDev.SetLineColor( pNode->GetFont( ).GetColor( ) );
rDev.DrawPolyLine( pNode->GetPolygon( ), aInfo );
-
-#ifdef SM_RECT_DEBUG
- if ( !pNode->IsDebug( ) )
- return;
-
- int nRFlags = SM_RECT_CORE | SM_RECT_ITALIC | SM_RECT_LINES | SM_RECT_MID;
- pNode->SmRect::Draw( rDev, Position, nRFlags );
-#endif
}
void SmDrawingVisitor::Visit( SmRectangleNode* pNode )
@@ -754,14 +738,6 @@ void SmDrawingVisitor::Visit( SmRectangleNode* pNode )
aTmp.SetPos( aPos );
rDev.DrawRect( aTmp );
-
-#ifdef SM_RECT_DEBUG
- if ( !pNode->IsDebug( ) )
- return;
-
- int nRFlags = SM_RECT_CORE | SM_RECT_ITALIC | SM_RECT_LINES | SM_RECT_MID;
- pNode->SmRect::Draw( rDev, rPosition, nRFlags );
-#endif
}
void SmDrawingVisitor::DrawTextNode( SmTextNode* pNode )
@@ -778,14 +754,6 @@ void SmDrawingVisitor::DrawTextNode( SmTextNode* pNode )
aPos = rDev.PixelToLogic( rDev.LogicToPixel( aPos ) );
rDev.DrawStretchText( aPos, pNode->GetWidth( ), pNode->GetText( ) );
-
-#ifdef SM_RECT_DEBUG
- if ( !pNode->IsDebug( ) )
- return;
-
- int nRFlags = SM_RECT_CORE | SM_RECT_ITALIC | SM_RECT_LINES | SM_RECT_MID;
- pNode->SmRect::Draw( rDev, Position, nRFlags );
-#endif
}
void SmDrawingVisitor::DrawSpecialNode( SmSpecialNode* pNode )
@@ -811,14 +779,6 @@ void SmDrawingVisitor::DrawChildren( SmNode* pNode )
Position = rPosition + aOffset;
it->Accept( this );
}
-
-#ifdef SM_RECT_DEBUG
- if ( !pNode->IsDebug( ) )
- return;
-
- int nRFlags = SM_RECT_CORE | SM_RECT_ITALIC | SM_RECT_LINES | SM_RECT_MID;
- pNode->SmRect::Draw( rDev, rPosition, nRFlags );
-#endif
}
/////////////////////////////// SmSetSelectionVisitor ////////////////////////////////
commit 0001b1ebd8b5bdfe8438991791b698ac265650f1
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 20:59:34 2011 +0100
Remove NEVER
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index 82e045d..dc040b6 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -133,29 +133,6 @@ public:
SmFace & operator *= (SmFace &rFace, const Fraction &rFrac);
-#ifdef NEVER
-////////////////////////////////////////////////////////////
-//
-// SmInfoText
-//
-
-class SmInfoText : public FixedText
-{
-protected:
- USHORT nMaxLen;
- String aText;
-
-public:
- SmInfoText(Window* pParent, WinBits nWinStyle = 0, USHORT nMax = 128);
- SmInfoText(Window* pParent, const ResId& rResId, USHORT nMax = 128);
-
- void SetText(const String& rStr);
-
- XubString GetText() const { return (aText); }
-};
-#endif
-
-
////////////////////////////////////////////////////////////
//
// SmPickList
@@ -204,63 +181,6 @@ public:
////////////////////////////////////////////////////////////
//
-// SmStringPickList
-//
-#ifdef NEVER
-class SmStringPickList : public SmPickList
-{
-protected:
- virtual void *CreateItem(const String& rString);
- virtual void *CreateItem(const void *pItem);
- virtual void DestroyItem(void *pItem);
-
- virtual bool CompareItem(const void *pFirstItem, const void *pSecondItem) const;
-
- virtual String GetStringItem(void *pItem);
-
-public:
- SmStringPickList()
- : SmPickList(0, 5) {}
- SmStringPickList(USHORT nInitSize, USHORT nMaxSize)
- : SmPickList(nInitSize, nMaxSize) {}
- SmStringPickList(const SmPickList& rOrig )
- : SmPickList(rOrig) {}
- virtual ~SmStringPickList() { Clear(); }
-
- virtual void Insert(const String &rString);
- virtual void Update(const String &rString, const String &rNewString);
- virtual void Remove(const String &rString);
-
- inline bool Contains(const String &rString) const;
- inline String Get(USHORT nPos = 0) const;
-
- inline SmStringPickList& operator = (const SmStringPickList& rList);
- inline String operator [] (USHORT nPos) const;
-};
-
-inline SmStringPickList& SmStringPickList::operator = (const SmStringPickList& rList)
-{
- *(SmPickList *)this = *(SmPickList *)&rList; return *this;
-}
-
-inline String SmStringPickList::operator [] (USHORT nPos) const
-{
- return *((String *)SmPickList::operator[](nPos));
-}
-
-inline String SmStringPickList::Get(USHORT nPos) const
-{
- return nPos < Count() ? *((String *)SmPickList::Get(nPos)) : String();
-}
-
-inline bool SmStringPickList::Contains(const String &rString) const
-{
- return SmPickList::Contains((void *)&rString);
-}
-#endif
-
-////////////////////////////////////////////////////////////
-//
// SmFontPickList
//
@@ -328,32 +248,6 @@ inline bool SmFontPickList::Contains(const Font &rFont) const
////////////////////////////////////////////////////////////
//
-// SmStringPickComboBox
-//
-#ifdef NEVER
-class SmStringPickComboBox : public SmStringPickList, public ComboBox
-{
-protected:
- virtual void LoseFocus();
-
- DECL_LINK(SelectHdl, ComboBox *);
-
-public:
- SmStringPickComboBox(Window* pParent, WinBits nWinStyle = 0, USHORT nMax = 4);
- SmStringPickComboBox(Window* pParent, const ResId& rResId, USHORT nMax = 4);
-
- SmStringPickComboBox& operator = (const SmStringPickList& rList);
-
- void SetText(const String& rStr);
-
- virtual void Insert(const String &rString);
- virtual void Update(const String &rString, const String &rNewString);
- virtual void Remove(const String &rString);
-};
-#endif
-
-////////////////////////////////////////////////////////////
-//
// SmFontPickListBox
//
commit ff0f99eb798213ddef9660f9a6b6dd885d8b6969
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 20:58:04 2011 +0100
Remove unused LINGU_STATISTIK
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 6190259..e8b894f 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -734,47 +734,6 @@ inline void SwTxtFrm::ResetBlinkPor() const
((SwTxtFrm*)this)->bBlinkPor = sal_False;
}
-#ifdef LINGU_STATISTIK
-
-class SwLinguStatistik
-{
-public:
- long nWords; // gepruefte Worte
- long nFlushCnt; // zaehlt die Messungen
-
- long nWrong; // als falsch erkannt
- long nAlter; // Alternativvorschlaege
- long nSpellTime; // Zeitmessung
- long nSynonym; // Thesaurus
- long nNoSynonym; // Thesaurus ratlos
- long nMeaning; // Thesaurus-Bedeutung
- long nNoMeaning; // Thesaurus meinungslos
- long nTheTime; // Zeitmessung
- long nHyphens; // Trennstellen
- long nNoHyph; // Worte ohne Trennstellen
- long nHyphErr; // Fehler beim Trennen
- long nHyphTime; // Zeitmessung
- SpellCheck *pSpell;
- LanguageType eLang;
-
- void Flush();
-
- inline SwLinguStatistik()
- { nWords = nWrong = nAlter = nSynonym = nNoSynonym =
- nHyphens = nNoHyph = nHyphErr = nSpellTime = nTheTime =
- nHyphTime = nFlushCnt = 0;
- pSpell = NULL;
- eLang = LANGUAGE_DONTKNOW; }
- inline ~SwLinguStatistik(){ Flush(); }
-};
-
-// globale Variable, implementiert in txtfrm.cxx
-extern SwLinguStatistik aSwLinguStat;
-
-#define SW_LING(nWhich,nInc) (aSwLinguStat.nWhich) += nInc;
-
-#endif
-
#define SWAP_IF_SWAPPED( pFrm )\
sal_Bool bUndoSwap = sal_False; \
if ( pFrm->IsVertical() && pFrm->IsSwapped() )\
commit 148b86a6f36f3ba26523dd61ab2894df47cc859c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 20:56:23 2011 +0100
Remove whitespaces from includes
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index 8931d3d..18180ed 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -30,8 +30,8 @@
#include "precompiled_starmath.hxx"
#ifdef WNT
-# include <prewin.h>
-# include <postwin.h>
+#include <prewin.h>
+#include <postwin.h>
#endif
#include <cppunit/TestSuite.h>
diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx
index 0ba5edd..0ad9652 100644
--- a/starmath/qa/cppunit/test_starmath.cxx
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -29,9 +29,9 @@
#include "precompiled_starmath.hxx"
#ifdef WNT
-# include <prewin.h>
-# include <windows.h>
-# include <postwin.h>
+#include <prewin.h>
+#include <windows.h>
+#include <postwin.h>
#endif
#include <cppunit/TestSuite.h>
diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx
index 9c9be3d..b97eb10 100644
--- a/sw/qa/core/Test-BigPtrArray.cxx
+++ b/sw/qa/core/Test-BigPtrArray.cxx
@@ -30,8 +30,8 @@
#include "precompiled_sw.hxx"
#ifdef WNT
-# include <prewin.h>
-# include <postwin.h>
+#include <prewin.h>
+#include <postwin.h>
#endif
#define TIMELOG
diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx
index a9a6690..ce6d5aa 100644
--- a/sw/qa/core/swdoc-test.cxx
+++ b/sw/qa/core/swdoc-test.cxx
@@ -28,8 +28,8 @@
#include "precompiled_sw.hxx"
#ifdef WNT
-# include <prewin.h>
-# include <postwin.h>
+#include <prewin.h>
+#include <postwin.h>
#endif
#include <cppunit/TestSuite.h>
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index 640182b..d35e4db 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -49,7 +49,7 @@
#include "porfly.hxx"
#if OSL_DEBUG_LEVEL > 1
-# include "txtfrm.hxx" // GetFrmID,
+#include "txtfrm.hxx" // GetFrmID,
#endif
/*************************************************************************
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index 010ee89..3bba3be 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -163,10 +163,10 @@ const char *GetLangName( const MSHORT )
}
#else
-# include <limits.h>
-# include <stdlib.h>
-# include "swtypes.hxx" // ZTCCONST
-# include "swfont.hxx" // SwDropPortion
+#include <limits.h>
+#include <stdlib.h>
+#include "swtypes.hxx" // ZTCCONST
+#include "swfont.hxx" // SwDropPortion
CONSTCHAR( pClose, "} " );
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 946b9d1..be3abdb 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -32,11 +32,11 @@
#include <set>
#include <map>
#include <vector>
-# include <swtypes.hxx> //SwTwips
-# include <tools/string.hxx> //String
-# include "wwstyles.hxx" //ww::sti
-# include <rtl/textenc.h> //rtl_TextEncoding
-# include <tools/gen.hxx> //Size
+#include <swtypes.hxx> //SwTwips
+#include <tools/string.hxx> //String
+#include "wwstyles.hxx" //ww::sti
+#include <rtl/textenc.h> //rtl_TextEncoding
+#include <tools/gen.hxx> //Size
#include <tools/datetime.hxx>
#include <fltshell.hxx> // fuer den Attribut Stack
#include <redline.hxx>
diff --git a/sw/source/filter/ww8/needed_cast.hxx b/sw/source/filter/ww8/needed_cast.hxx
index 8506fff..5dc4197 100644
--- a/sw/source/filter/ww8/needed_cast.hxx
+++ b/sw/source/filter/ww8/needed_cast.hxx
@@ -30,7 +30,7 @@
#define WW_NEEDED_CAST_HXX
#include <tools/debug.hxx>
-# include "staticassert.hxx"
+#include "staticassert.hxx"
namespace ww
{
diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx
index 928c140..30b2839 100644
--- a/sw/source/filter/ww8/styles.cxx
+++ b/sw/source/filter/ww8/styles.cxx
@@ -36,7 +36,7 @@
#include <tools/string.hxx> //do we have to...
#include <tools/debug.hxx>
-# include "staticassert.hxx" //StaticAssert
+#include "staticassert.hxx" //StaticAssert
namespace
{
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index fe3808f..caeeb5b 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -32,34 +32,34 @@
#include <com/sun/star/util/XCloseable.hpp>
#include <doc.hxx>
-# include "writerhelper.hxx"
-# include <msfilter.hxx>
+#include "writerhelper.hxx"
+#include <msfilter.hxx>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/embed/EmbedStates.hpp>
#include <algorithm> //std::swap
#include <functional> //std::binary_function
-# include <svl/itemiter.hxx> //SfxItemIter
-# include <svx/svdobj.hxx> //SdrObject
-# include <svx/svdoole2.hxx> //SdrOle2Obj
-# include <svx/fmglob.hxx> //FmFormInventor
-# include <editeng/brkitem.hxx> //SvxFmtBreakItem
-# include <editeng/tstpitem.hxx> //SvxTabStopItem
-# include <ndtxt.hxx> //SwTxtNode
-# include <ndnotxt.hxx> //SwNoTxtNode
-# include <fmtcntnt.hxx> //SwFmtCntnt
-# include <swtable.hxx> //SwTable
-# include <frmfmt.hxx> //SwFrmFmt
-# include <flypos.hxx> //SwPosFlyFrms
-# include <fmtanchr.hxx> //SwFmtAnchor
-# include <ndgrf.hxx> //SwGrfNode
-# include <fmtfsize.hxx> //SwFmtFrmSize
-# include <SwStyleNameMapper.hxx> //SwStyleNameMapper
-# include <docary.hxx> //SwCharFmts
-# include <charfmt.hxx> //SwCharFmt
-# include <fchrfmt.hxx> //SwFmtCharFmt
+#include <svl/itemiter.hxx> //SfxItemIter
+#include <svx/svdobj.hxx> //SdrObject
+#include <svx/svdoole2.hxx> //SdrOle2Obj
+#include <svx/fmglob.hxx> //FmFormInventor
+#include <editeng/brkitem.hxx> //SvxFmtBreakItem
+#include <editeng/tstpitem.hxx> //SvxTabStopItem
+#include <ndtxt.hxx> //SwTxtNode
+#include <ndnotxt.hxx> //SwNoTxtNode
+#include <fmtcntnt.hxx> //SwFmtCntnt
+#include <swtable.hxx> //SwTable
+#include <frmfmt.hxx> //SwFrmFmt
+#include <flypos.hxx> //SwPosFlyFrms
+#include <fmtanchr.hxx> //SwFmtAnchor
+#include <ndgrf.hxx> //SwGrfNode
+#include <fmtfsize.hxx> //SwFmtFrmSize
+#include <SwStyleNameMapper.hxx> //SwStyleNameMapper
+#include <docary.hxx> //SwCharFmts
+#include <charfmt.hxx> //SwCharFmt
+#include <fchrfmt.hxx> //SwFmtCharFmt
#ifndef _UNOTOOLS_STREAMWRAP_HXX
-# include <unotools/streamwrap.hxx>
+#include <unotools/streamwrap.hxx>
#endif
#include <numrule.hxx>
diff --git a/sw/source/filter/ww8/writerwordglue.hxx b/sw/source/filter/ww8/writerwordglue.hxx
index b267ba3..a5fd7cc 100644
--- a/sw/source/filter/ww8/writerwordglue.hxx
+++ b/sw/source/filter/ww8/writerwordglue.hxx
@@ -29,8 +29,8 @@
#ifndef SW_WRITERWORDGLUE
#define SW_WRITERWORDGLUE
-# include "needed_cast.hxx"
-# include "types.hxx"
+#include "needed_cast.hxx"
+#include "types.hxx"
class SwFrmFmt;
class SfxItemSet;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 1663d5c..11936dd 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -35,8 +35,9 @@
#include <algorithm>
#include <functional>
#include <iostream>
+
#if OSL_DEBUG_LEVEL > 1
-# include <cstdio>
+#include <cstdio>
#endif
#include <hintids.hxx>
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 91c075c..34cf2c4 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
#if OSL_DEBUG_LEVEL > 1
-# include <cstdio>
+#include <cstdio>
#endif
#include <com/sun/star/embed/XEmbedPersist.hpp>
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 725607f..fabef51 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -67,8 +67,8 @@
#include <fmtrowsplt.hxx>
#include <fmtfollowtextflow.hxx> // #i33818#
#include <numrule.hxx>
-# include "../inc/wwstyles.hxx"
-# include "writerhelper.hxx"
+#include "../inc/wwstyles.hxx"
+#include "writerhelper.hxx"
#include "ww8struc.hxx" // struct TC
#include "ww8par.hxx"
#include "ww8par2.hxx"
commit f02b7c422c671b8cd52465e0a9d911bbfe528913
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 20:51:45 2011 +0100
Remove unused DEBUGDUMP
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 58f9cfe..fe3808f 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -63,17 +63,6 @@
#endif
#include <numrule.hxx>
-#ifdef DEBUGDUMP
-# include <vcl/svapp.hxx>
-# ifndef _TOOLS_URLOBJ_HXX
-# include <tools/urlobj.hxx>
-# endif
-# ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX
-# include <unotools/ucbstreamhelper.hxx>
-# endif
-# include <unotools/localfilehelper.hxx>
-#endif
-
using namespace com::sun::star;
using namespace nsSwGetPoolIdFromName;
@@ -337,51 +326,6 @@ namespace sw
mxIPRef = 0;
}
}
-
-#ifdef DEBUGDUMP
- SvStream *CreateDebuggingStream(const String &rSuffix)
- {
- SvStream* pDbgOut = 0;
- static sal_Int32 nCount;
- String aFileName(String(RTL_CONSTASCII_STRINGPARAM("wwdbg")));
- aFileName.Append(String::CreateFromInt32(++nCount));
- aFileName.Append(rSuffix);
- String aURLStr;
- if (::utl::LocalFileHelper::ConvertPhysicalNameToURL(
- Application::GetAppFileName(), aURLStr))
- {
- INetURLObject aURL(aURLStr);
- aURL.removeSegment();
- aURL.removeFinalSlash();
- aURL.Append(aFileName);
-
- pDbgOut = ::utl::UcbStreamHelper::CreateStream(
- aURL.GetMainURL(INetURLObject::NO_DECODE),
- STREAM_TRUNC | STREAM_WRITE);
- }
- return pDbgOut;
- }
-
- void DumpStream(const SvStream &rSrc, SvStream &rDest, sal_uInt32 nLen)
- {
- SvStream &rSource = const_cast<SvStream&>(rSrc);
- ULONG nOrigPos = rSource.Tell();
- if (nLen == STREAM_SEEK_TO_END)
- {
- rSource.Seek(STREAM_SEEK_TO_END);
- nLen = rSource.Tell();
- }
- if (nLen - nOrigPos)
- {
- rSource.Seek(nOrigPos);
- sal_Char* pDat = new sal_Char[nLen];
- rSource.Read(pDat, nLen);
- rDest.Write(pDat, nLen);
- delete[] pDat;
- rSource.Seek(nOrigPos);
- }
- }
-#endif
}
namespace util
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index 6f82f69..71016f7 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -44,11 +44,6 @@
#include <tools/poly.hxx> //Polygon, PolyPolygon
#include <doc.hxx> //SwDoc
-//Uncomment to dump debugging streams of graphics
-#if OSL_DEBUG_LEVEL > 1
-//# define DEBUGDUMP
-#endif
-
class SwTxtFmtColl;
class SwCharFmt;
class SdrObject;
@@ -919,41 +914,6 @@ namespace sw
/// No copying allowed
DrawingOLEAdaptor(const DrawingOLEAdaptor &rDoc);
};
-
-#ifdef DEBUGDUMP
- /** Create a SvStream to dump data to during debugging
-
- This creates a file in the program dir of OOo, delete the SvStream
- after you are done with it
-
- @param rSuffix
- The suffix that will be appened to this debugging file
-
- @return a SvStream to dump data to
-
- @author
- <a href="mailto:cmc at openoffice.org">Caolán McNamara</a>
- */
- SvStream *CreateDebuggingStream(const String &rSuffix);
-
- /** Dump one SvStream to another
-
- @param rSrc
- The source stream
-
- @param rDest
- The destination stream
-
- @param nLen
- Optional Length of data to copy from rSrc to rDest, if unused copy
- all available data from rSrc
-
- @author
- <a href="mailto:cmc at openoffice.org">Caolán McNamara</a>
- */
- void DumpStream(const SvStream &rSrc, SvStream &rDest,
- sal_uInt32 nLen = STREAM_SEEK_TO_END);
-#endif
}
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 371d6c2..d0a46c0 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4118,48 +4118,6 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
::StartProgress(STR_STATSTR_W4WREAD, 0, 100, mpDocShell);
-#ifdef DEBUGDUMP
- //experimental embedded ttf dumper
- if (pWwFib->lcbSttbttmbd && (7 < pWwFib->nVersion))
- {
- pTableStream->Seek(pWwFib->fcSttbttmbd);
- sal_uInt16 nZeros;
- *pTableStream >> nZeros;
- sal_uInt16 nNoEntries;
- *pTableStream >> nNoEntries;
- sal_uInt32 nUnknown1;
- *pTableStream >> nUnknown1;
- sal_uInt16 nUnknown2;
- *pTableStream >> nUnknown2;
- std::vector<sal_uInt32> aOffsets;
- for (sal_uInt16 nI = 0; nI < nNoEntries; ++nI)
- {
- sal_uInt32 nOffset;
- *pTableStream >> nOffset;
- aOffsets.push_back(nOffset);
- sal_uInt32 nUnknown3;
- *pTableStream >> nUnknown3;
- sal_uInt32 nUnknown4;
- *pTableStream >> nUnknown4;
- }
- typedef std::vector<sal_uInt32>::iterator myIter;
- myIter aEnd = aOffsets.end();
- myIter aIter = aOffsets.begin();
- while (aIter != aEnd)
- {
- sal_uInt32 nOffset = *aIter;
- sal_uInt32 nLen = STREAM_SEEK_TO_END;
- ++aIter;
- pStrm->Seek(nOffset);
- if (aIter != aEnd)
- nLen = *aIter - nOffset;
- SvStream *pDbg = sw::hack::CreateDebuggingStream(CREATE_CONST_ASC(".ttf.dump"));
- sw::hack::DumpStream(*pStrm, *pDbg, nLen);
- delete pDbg;
- }
- }
-#endif
-
// read Font Table
pFonts = new WW8Fonts( *pTableStream, *pWwFib );
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 5617cc4..0d9dca8 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -203,13 +203,6 @@ static bool SwWw6ReadMacPICTStream(Graphic& rGraph, SvStorageRef& rSrc1)
pStp->Seek( STREAM_SEEK_TO_BEGIN );
-#ifdef DEBUGDUMP
- SvStream *pDbg = sw::hack::CreateDebuggingStream(CREATE_CONST_ASC(".pct"));
- pDbg->Seek(0x200); //Prepend extra 0x200 of zeros to make this a valid PICT
- sw::hack::DumpStream(*pStp, *pDbg);
- delete pDbg;
-#endif
-
// Mac-Pict steht im 03PICT-StorageStream allerdings ohne die ersten 512
// Bytes, die bei einem MAC-PICT egal sind ( werden nicht ausgewertet )
return SwWW8ImplReader::GetPictGrafFromStream(rGraph, *pStp);
commit 81931b8f089447dbd4aad9096934b3f487b4cb51
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 20:49:13 2011 +0100
Remove unused TEST_RESIZE
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 2a68d8e..8fc6b2b 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -28,8 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-//#define TEST_RESIZE
-
#include "hintids.hxx"
#include <vcl/svapp.hxx>
@@ -63,9 +61,6 @@
#include "poolfmt.hxx"
#include "swtable.hxx"
#include "cellatr.hxx"
-#ifdef TEST_RESIZE
-#include "viewsh.hxx"
-#endif
#include "htmltbl.hxx"
#include "swtblfmt.hxx"
#include "htmlnum.hxx"
@@ -5478,26 +5473,6 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
// SwTable aufbereiten
sal_uInt16 nBrowseWidth = (sal_uInt16)GetCurrentBrowseWidth();
pSaveStruct->MakeTable( nBrowseWidth, *pPam->GetPoint(), pDoc );
-
-#ifdef TEST_RESIZE
- const SwTable *pSwTable = pTable->GetSwTable();
- SwHTMLTableLayout *pLayoutInfo =
- pSwTable ? ((SwTable *)pSwTable)->GetHTMLTableLayout() : 0;
- if( pLayoutInfo )
- {
- ViewShell *pVSh = CheckActionViewShell();
- if( pVSh )
- {
- CallEndAction( sal_False, sal_False );
- CallStartAction( pVSh, sal_False );
-
- sal_uInt16 nNewBrwoseWidth =
- (sal_uInt16)GetCurrentBrowseWidth();
- if( nBrowseWidth != nNewBrowseWidth )
- pLayoutInfo->Resize( nNewBrowseWidth );
- }
- }
-#endif
}
GetNumInfo().Set( pTCntxt->GetNumInfo() );
commit b3509296ec7139527c32dc3f187285a7b28c4989
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 20:48:13 2011 +0100
Remove REL_HACK
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 2084c90..a28c981 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -3106,14 +3106,10 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, BOOL bOn )
rWrt.Strm() << sOut.GetBuffer();
-#define REL_HACK
-#ifdef REL_HACK
String sRel;
-#endif
if( aURL.Len() || bEvents )
{
-#ifdef REL_HACK
String sTmp( aURL );
sTmp.ToUpperAscii();
xub_StrLen nPos = sTmp.SearchAscii( "\" REL=" );
@@ -3122,7 +3118,6 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, BOOL bOn )
sRel = aURL.Copy( nPos+1 );
aURL.Erase( nPos );
}
-#endif
aURL.EraseLeadingChars().EraseTrailingChars();
((sOut = ' ') += OOO_STRING_SVTOOLS_HTML_O_href) += "=\"";
@@ -3151,10 +3146,9 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, BOOL bOn )
sOut = '\"';
}
-#ifdef REL_HACK
if( sRel.Len() )
sOut += ByteString( sRel, RTL_TEXTENCODING_ASCII_US );
-#endif
+
if( sOut.Len() )
rWrt.Strm() << sOut.GetBuffer();
commit 57c1b24ac142dc9e301453eed7eecc1982a3d47a
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 20:47:22 2011 +0100
Remove unused FORMAT_TABELLE
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 3ac51bd..2084c90 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -110,14 +110,6 @@ using namespace ::com::sun::star;
#error Attribut-Tabelle ist ungueltigt. Wurden neue Hint-IDs zugefuegt ??
#endif
-#ifdef FORMAT_TABELLE
-// da sie nicht benutzt wird!
-#define FORMATTAB_SIZE 7
-#if FORMATTAB_SIZE != RES_FMT_END - RES_FMT_BEGIN
-#error Format-Tabelle ist ungueltigt. Wurden neue Hint-IDs zugefuegt ??
-#endif
-#endif
-
#define NODETAB_SIZE 3
#if NODETAB_SIZE != RES_NODE_END - RES_NODE_BEGIN
#error Node-Tabelle ist ungueltigt. Wurden neue Hint-IDs zugefuegt ??
commit 87fb295f90cdf6caae3c4b8b80614dda2771c3fd
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 20:45:42 2011 +0100
Remove unused ENABLE_DEBUG_OUTPUT
diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx
index 11703dd..9c9be3d 100644
--- a/sw/qa/core/Test-BigPtrArray.cxx
+++ b/sw/qa/core/Test-BigPtrArray.cxx
@@ -47,8 +47,6 @@
#include <stdlib.h>
#include <rtl/logfile.hxx>
-#undef ENABLE_DEBUG_OUTPUT
-
using namespace std;
@@ -65,9 +63,6 @@ namespace /* private */
~BigPtrEntryMock()
{
- #ifdef ENABLE_DEBUG_OUTPUT
- printf("Destructor called (%i)\n", count_);
- #endif
}
ULONG getCount() const
@@ -98,14 +93,7 @@ namespace /* private */
void dumpBigPtrArray(const BigPtrArray& bparr)
{
- #ifdef ENABLE_DEBUG_OUTPUT
- for (int i = 0; i < bparr.Count(); i++)
- printf("bparr[%i,%i]: %i\n", i, static_cast<BigPtrEntryMock*>(bparr[i])->Position(), static_cast<BigPtrEntryMock*>(bparr[i])->getCount());
-
- printf("\n");
- #else
(void)bparr;
- #endif
}
void fillBigPtrArray(BigPtrArray& bparr, ULONG numEntries)
@@ -116,11 +104,7 @@ namespace /* private */
void printMethodName(const char* name)
{
- #ifdef ENABLE_DEBUG_OUTPUT
- printf(name);
- #else
(void)name;
- #endif
}
bool checkElementPositions(const BigPtrArray& bparr)
More information about the Libreoffice-commits
mailing list