[Libreoffice-commits] .: 8 commits - starmath/source sw/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Jan 24 06:38:22 PST 2011
starmath/source/accessibility.cxx | 8 ------
starmath/source/accessibility.hxx | 5 ----
sw/source/core/doc/docfld.cxx | 24 -------------------
sw/source/core/doc/docglbl.cxx | 17 --------------
sw/source/core/doc/docredln.cxx | 3 --
sw/source/core/doc/htmltbl.cxx | 46 --------------------------------------
sw/source/core/doc/tblrwcl.cxx | 3 --
sw/source/core/docnode/node.cxx | 3 --
sw/source/core/docnode/nodes.cxx | 37 ------------------------------
sw/source/core/edit/edlingu.cxx | 4 ---
sw/source/filter/html/swhtml.cxx | 13 ----------
sw/source/ui/vba/vbastyles.cxx | 12 ---------
12 files changed, 175 deletions(-)
New commits:
commit 949c578bdfe6bea9fa1f784d337d6ad39164ef20
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 15:36:33 2011 +0100
Remove TEST_DELAYED_RESIZE and FIX41370.
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 7afb7a1..08c053a 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -30,11 +30,6 @@
#include "precompiled_sw.hxx"
#include "hintids.hxx"
-//#define TEST_DELAYED_RESIZE
-
-#ifdef TEST_DELAYED_RESIZE
-#include <vcl/sound.hxx>
-#endif
#include <vcl/wrkwin.hxx>
#include <vcl/svapp.hxx>
#include <sot/storage.hxx>
@@ -457,9 +452,6 @@ SwFrmFmt *SwHTMLTableLayout::FindFlyFrmFmt() const
static void lcl_GetMinMaxSize( ULONG& rMinNoAlignCnts, ULONG& rMaxNoAlignCnts,
ULONG& rAbsMinNoAlignCnts,
-#ifdef FIX41370
- BOOL& rHR,
-#endif
SwTxtNode *pTxtNd, ULONG nIdx, BOOL bNoBreak )
{
pTxtNd->GetMinMaxSize( nIdx, rMinNoAlignCnts, rMaxNoAlignCnts,
@@ -485,14 +477,6 @@ static void lcl_GetMinMaxSize( ULONG& rMinNoAlignCnts, ULONG& rMaxNoAlignCnts,
rMinNoAlignCnts = rMaxNoAlignCnts;
rAbsMinNoAlignCnts = rMaxNoAlignCnts;
}
-#ifdef FIX41370
- else if( pColl && RES_POOLCOLL_HTML_HR==pColl->GetPoolFmtId() )
- {
- rHR |= !pTxtNd->HasSwAttrSet() ||
- SFX_ITEM_SET != pTxtNd->GetpSwAttrSet()
- ->GetItemState( RES_LR_SPACE, FALSE );
- }
-#endif
}
void SwHTMLTableLayout::AutoLayoutPass1()
@@ -538,9 +522,6 @@ void SwHTMLTableLayout::AutoLayoutPass1()
ULONG nAbsMinNoAlignCell = 0;
ULONG nMaxTableCell = 0;
ULONG nAbsMinTableCell = 0;
-#ifdef FIX41370
- BOOL bHR = FALSE;
-#endif
while( pCnts )
{
@@ -561,9 +542,6 @@ void SwHTMLTableLayout::AutoLayoutPass1()
lcl_GetMinMaxSize( nMinNoAlignCnts,
nMaxNoAlignCnts,
nAbsMinNoAlignCnts,
-#ifdef FIX41370
- bHR,
-#endif
pTxtNd, nIdx,
pCnts->HasNoBreakTag() );
@@ -684,24 +662,6 @@ void SwHTMLTableLayout::AutoLayoutPass1()
nAbsMinNoAlignCell = nWidth;
}
}
-#ifdef FIX41370
- else if( bHR && nWidth>0 && !bRelWidth )
- {
- // Ein kleiner Hack, um einen Bug in Netscape 4.0
- // nachzubilden (siehe #41370#). Wenn eine Zelle eine
- // fixe Breite besitzt und gleichzeitig ein HR, wird
- // sie nie schmaler als die angegebene Breite.
- // (Genaugenomen scheint die Zelle nie schmaler zu werden
- // als die HR-Linie, denn wenn man fuer die Linie eine
- // Breite angibt, die breiter ist als die der Zelle, dann
- // wird die Zelle so breit wie die Linie. Das bekommen wir
- // natuerlich nicht hin.)
- if( nWidth>nMinNoAlignCell )
- nMinNoAlignCell = nWidth;
- if( nWidth>nAbsMinNoAlignCell )
- nAbsMinNoAlignCell = nWidth;
- }
-#endif
// Mindestbreite fuer Inhalt einhalten
if( nMinNoAlignCell < MINLAY )
@@ -1802,9 +1762,6 @@ void SwHTMLTableLayout::_Resize( USHORT nAbsAvail, BOOL bRecalc )
IMPL_STATIC_LINK( SwHTMLTableLayout, DelayedResize_Impl, void*, EMPTYARG )
{
-#ifdef TEST_DELAYED_RESIZE
- Sound::Beep( SOUND_WARNING );
-#endif
pThis->aResizeTimer.Stop();
pThis->_Resize( pThis->nDelayedResizeAbsAvail,
pThis->bDelayedResizeRecalc );
@@ -1878,9 +1835,6 @@ BOOL SwHTMLTableLayout::Resize( USHORT nAbsAvail, BOOL bRecalc,
bDelayedResizeRecalc = bRecalc;
aResizeTimer.SetTimeout( nDelay );
aResizeTimer.Start();
-#ifdef TEST_DELAYED_RESIZE
- Sound::Beep( SOUND_DEFAULT );
-#endif
}
else
{
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 265020d..62e54bb 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -5273,10 +5273,6 @@ void SwHTMLParser::InsertHorzRule()
// Sinn. Um zu Vermeiden, dass die Linie bei der Breitenberechnung
// beruecksichtigt wird, bekommt sie aber trotzdem entsprechendes
// LRSpace-Item verpasst.
-#ifdef FIX41370
- const SwFmtColl *pColl = GetCurrFmtColl();
- SvxLRSpaceItem aLRItem( pColl->GetLRSpace() );
-#endif
if( !pTable )
{
// Laenge und Ausrichtung der Linie ueber Absatz-Einzuege "tuerken"
@@ -5288,10 +5284,8 @@ void SwHTMLParser::InsertHorzRule()
if( (long)nWidth < nBrowseWidth )
{
-#ifndef FIX41370
const SwFmtColl *pColl = GetCurrFmtColl();
SvxLRSpaceItem aLRItem( pColl->GetLRSpace() );
-#endif
long nDist = nBrowseWidth - nWidth;
switch( eAdjust )
@@ -5310,17 +5304,10 @@ void SwHTMLParser::InsertHorzRule()
break;
}
-#ifndef FIX41370
_HTMLAttr* pTmp = new _HTMLAttr( *pPam->GetPoint(), aLRItem );
aSetAttrTab.Insert( pTmp, aSetAttrTab.Count() );
-#endif
}
}
-
-#ifdef FIX41370
- _HTMLAttr* pTmp = new _HTMLAttr( *pPam->GetPoint(), aLRItem );
- aSetAttrTab.Insert( pTmp, aSetAttrTab.Count() );
-#endif
}
// Bookmarks koennen nicht in Hyperlinks eingefueht werden
commit 7d225cf0826751d94c848cfd659aceafe380b0a8
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 15:36:09 2011 +0100
Remove FUTURE directive.
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index e5d00da..725569e 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -166,18 +166,6 @@ static const MSOStyleNameTable aMSOStyleNameTable[] =
{ 0, 0, 0 }
};
-#ifdef FUTURE // seems this isn't used
-static uno::Sequence< rtl::OUString > getStyleTypes()
-{
- uno::Sequence< rtl::OUString > aRet(3);
- rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles") );
- pArray[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharacterStyles") );
- pArray[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingStyles") );
- return aRet;
-}
-#endif
-
typedef ::cppu::WeakImplHelper1< container::XEnumeration > StyleEnumeration_BASE;
typedef ::cppu::WeakImplHelper3< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > StyleCollectionHelper_BASE;
commit ed0eaa20ffcb271fbfd078bcb26cbcb823feda38
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 15:35:33 2011 +0100
Remove OLD_INDEX directive.
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 1fc2544..586ac07 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1012,9 +1012,6 @@ SwCntntNode::SwCntntNode( const SwNodeIndex &rWhere, const BYTE nNdType,
SwNode( rWhere, nNdType ),
pCondColl( 0 ),
mbSetModifyAtAttr( false )
-#ifdef OLD_INDEX
- ,SwIndexReg(2)
-#endif
{
}
commit 5864fa253ad22a9b920e1eaccecc4af324c6ec8b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 15:34:57 2011 +0100
Remove LINGU_STATISTIK (forgot this one).
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 8fd809a..7e186f9 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -310,10 +310,6 @@ void SwLinguIter::_End(bool bRestoreSelection)
DELETEZ(pCurrX);
pSh = 0;
-
-#ifdef LINGU_STATISTIK
- aSwLinguStat.Flush();
-#endif
}
/*************************************************************************
commit d250909b981d9b6e28bbd9c21030b888aa80ce88
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 10:43:02 2011 +0100
Remove DVO_TEST directive.
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index fe203fe..6567351 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -379,9 +379,6 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
for( ; pNewRedl && n < pRedlineTbl->Count(); bDec ? n : ++n )
{
bDec = false;
-#ifdef DVO_TEST
- _CHECK_REDLINE( this )
-#endif
SwRedline* pRedl = (*pRedlineTbl)[ n ];
SwPosition* pRStt = pRedl->Start(),
commit 41b46e9f4ca241fe6e2a5857dc9a0b6b8b7bb5ec
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 10:40:14 2011 +0100
Remove JP_TEST directive.
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index bb973ec..f934f15 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -87,23 +87,6 @@ BOOL SwDoc::GenerateHTMLDoc( const String& rPath, int nOutlineLevel )
BOOL SwDoc::GenerateHTMLDoc( const String& rPath,
const SwTxtFmtColl* pSplitColl )
{
-#ifdef JP_TEST
- if( !pSplitColl )
- {
- BYTE nLvl = 1;
- const SwTxtFmtColls& rFmtColls =*GetTxtFmtColls();
- for( USHORT n = rFmtColls.Count(); n; )
- if( nLvl == rFmtColls[ --n ]->GetAttrOutlineLevel() -1 )//<-end,zhaojianwei 0814
- {
- pSplitColl = rFmtColls[ n ];
- break;
- }
-
- if( !pSplitColl )
- pSplitColl = GetTxtCollFromPool( RES_POOLCOLL_HEADLINE2 );
- }
-#endif
-
return SplitDoc( SPLITDOC_TO_HTML, rPath, pSplitColl );
}
commit 35538451c767ad6a43969665864ca8bbcef801c0
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 10:37:11 2011 +0100
Remove JP_DEBUG directive.
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 3a4d354..51d1b3a 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -2404,30 +2404,6 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
}
nFldLstGetMode = static_cast<BYTE>( eGetMode );
nNodes = rDoc.GetNodes().Count();
-
-#ifdef JP_DEBUG
- {
- SvFileStream sOut( "f:\\x.x", STREAM_STD_WRITE );
- sOut.Seek( STREAM_SEEK_TO_END );
- sOut << "------------------" << endl;
- const _SetGetExpFldPtr* pSortLst = pFldSortLst->GetData();
- for( USHORT n = pFldSortLst->Count(); n; --n, ++pSortLst )
- {
- String sStr( (*pSortLst)->GetNode() );
- sStr += "\t, ";
- sStr += (*pSortLst)->GetCntnt();
- sStr += "\tNode: ";
- sStr += (*pSortLst)->GetFld()->GetTxtNode().StartOfSectionIndex();
- sStr += "\tPos: ";
- sStr += *(*pSortLst)->GetFld()->GetStart();
- sStr += "\tType: ";
- sStr += (*pSortLst)->GetFld()->GetFld().GetFld()->GetTyp()->Which();
-
- sOut << sStr.GetStr() << endl;
- }
- }
-#endif
- // JP_DEBUG
}
void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, USHORT nFldWhich )
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index f40ec60..a6c7f5e 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -3483,9 +3483,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
}
}
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index aef3178..1600d87 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -57,12 +57,6 @@ extern BOOL CheckNodesRange( const SwNodeIndex& rStt,
SV_DECL_PTRARR(SwSttNdPtrs,SwStartNode*,2,2)
-//#define JP_DEBUG
-#ifdef JP_DEBUG
-#include "shellio.hxx"
-#endif
-
-
// Funktion zum bestimmen des hoechsten Levels innerhalb des Bereiches
USHORT HighestLevel( SwNodes & rNodes, const SwNodeRange & rRange );
@@ -915,21 +909,6 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
rNodes.UpdtOutlineIdx( aOrigInsPos.aStart.GetNode() );
}
-#ifdef JP_DEBUG
- {
-extern Writer* GetDebugWriter(const String&);
-
- Writer* pWriter = GetDebugWriter(aEmptyStr);
- if( pWriter )
- {
- int nError;
- SvFileStream aStrm( "c:\\$$move.db", STREAM_WRITE );
- SwWriter aWriter( aStrm, *pMyDoc );
- aWriter.Write( &nError, pWriter );
- }
- }
-#endif
-
return TRUE;
}
@@ -2148,22 +2127,6 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
}
aRg.aStart++;
}
-
-
-#ifdef JP_DEBUG
- {
-extern Writer* GetDebugWriter(const String&);
-
- Writer* pWriter = GetDebugWriter(aEmptyStr);
- if( pWriter )
- {
- int nError;
- SvFileStream aStrm( "c:\\$$copy.db", STREAM_WRITE );
- SwWriter aWriter( aStrm, *pMyDoc );
- aWriter.Write( &nError, pWriter );
- }
- }
-#endif
}
void SwNodes::_DelDummyNodes( const SwNodeRange& rRg )
commit cfee4e39ced77dc3b634d8428497264dc14f330c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 10:23:58 2011 +0100
Remove TL_NOT_YET_USED directive.
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index f5d9e77..93f7d5d 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1682,14 +1682,6 @@ void SmEditAccessible::Init()
}
}
-#ifdef TL_NOT_YET_USED
-SmDocShell * SmEditAccessible::GetDoc_Impl()
-{
- SmViewShell *pView = pWin ? pWin->GetView() : 0;
- return pView ? pView->GetDoc() : 0;
-}
-#endif // TL_NOT_YET_USED
-
void SmEditAccessible::ClearWin()
{
// #112565# remove handler before current object gets destroyed
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 3b5f4b3..3195759 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -344,11 +344,6 @@ class SmEditAccessible :
SmEditAccessible( const SmEditAccessible & );
SmEditAccessible & operator = ( const SmEditAccessible & );
-protected:
-#ifdef TL_NOT_YET_USED
- SmDocShell * GetDoc_Impl();
-#endif //TL_NOT_YET_USED
-
public:
SmEditAccessible( SmEditWindow *pEditWin );
virtual ~SmEditAccessible();
More information about the Libreoffice-commits
mailing list