summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-02-05 23:33:23 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-02-06 17:38:16 +0100
commitc7c6be20b026b6409a2bc79f027297d78bb395d9 (patch)
tree516fceaa0d837fe52f59b540f97ca881ba1701c0 /sw/source
parent599c7662a153b5202721118c2f802011fa1e18d8 (diff)
Remove some dead code
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/SwNumberTree/SwNodeNum.cxx101
-rw-r--r--sw/source/core/SwNumberTree/SwNumberTree.cxx44
-rw-r--r--sw/source/core/doc/htmltbl.cxx11
-rw-r--r--sw/source/core/layout/flowfrm.cxx5
-rw-r--r--sw/source/core/layout/paintfrm.cxx36
-rw-r--r--sw/source/core/layout/tabfrm.cxx30
-rw-r--r--sw/source/core/layout/wsfrm.cxx3
-rw-r--r--sw/source/core/tox/txmsrt.cxx61
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx2
-rw-r--r--sw/source/core/unocore/unochart.cxx15
-rw-r--r--sw/source/core/unocore/unodraw.cxx46
-rw-r--r--sw/source/core/view/viewsh.cxx1
-rw-r--r--sw/source/filter/html/parcss1.cxx12
13 files changed, 1 insertions, 366 deletions
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index 39e73f025d4d..e60000c24b22 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -199,13 +199,6 @@ bool SwNodeNum::IsCounted() const
{
// --> OD 2006-01-25 #i59559#
// <SwTxtNode::IsCounted()> determines, if a text node is counted for numbering
-// const SwNumFmt * pNumFmt = GetNumFmt();
-// if (pNumFmt)
-// {
-// sal_Int16 nType = pNumFmt->GetNumberingType();
-// if ( nType != SVX_NUM_NUMBER_NONE)
-// aResult = mpTxtNode->IsCounted();
-// }
aResult = GetTxtNode()->IsCountedInList();
// <--
}
@@ -273,9 +266,6 @@ bool SwNodeNum::LessThan(const SwNumberTreeNode & rNode) const
{
// --> OD 2007-10-31 #i83479# - refactoring
// simplify comparison by comparing the indexes of the text nodes
-// SwPosition aMyPos(*mpTxtNode);
-// SwPosition aHisPos(*rTmpNode.mpTxtNode);
-// bResult = (aMyPos < aHisPos) ? true : false;
bResult = ( mpTxtNode->GetIndex() < rTmpNode.mpTxtNode->GetIndex() ) ? true : false;
// <--
}
@@ -283,23 +273,6 @@ bool SwNodeNum::LessThan(const SwNumberTreeNode & rNode) const
return bResult;
}
-//void SwNodeNum::SetRestart(bool bRestart)
-//{
-// // --> OD 2005-10-19 #126009#
-// // - improvement: invalidation only, if <IsRestart()> state changes.
-// const bool bInvalidate( mbRestart != bRestart );
-// // <--
-// mbRestart = bRestart;
-
-// // --> OD 2005-10-19 #126009#
-// if ( bInvalidate )
-// {
-// InvalidateMe();
-// NotifyInvalidSiblings();
-// }
-// // <--
-//}
-
bool SwNodeNum::IsRestart() const
{
bool bIsRestart = false;
@@ -312,22 +285,6 @@ bool SwNodeNum::IsRestart() const
return bIsRestart;
}
-//void SwNodeNum::SetStart(SwNumberTree::tSwNumTreeNumber nStart)
-//{
-// // --> OD 2005-10-19 #126009#
-// // - improvement: invalidation only, if <IsRestart()> state changes.
-// const bool bInvalidate( mnStart != nStart );
-// // <--
-// mnStart = nStart;
-
-// // --> OD 2005-10-19 #126009#
-// if ( bInvalidate )
-// {
-// InvalidateMe();
-// NotifyInvalidSiblings();
-// }
-//}
-
bool SwNodeNum::IsCountPhantoms() const
{
bool bResult = true;
@@ -376,62 +333,6 @@ SwNumberTree::tSwNumTreeNumber SwNodeNum::GetStartValue() const
return aResult;
}
-//String SwNodeNum::ToString() const
-//{
-// String aResult("[ ", RTL_TEXTENCODING_ASCII_US);
-
-// if (GetTxtNode())
-// {
-// char aBuffer[256];
-
-// sprintf(aBuffer, "%p ", GetTxtNode());
-
-// aResult += String(aBuffer, RTL_TEXTENCODING_ASCII_US);
-// aResult += String::CreateFromInt32(GetPosition().nNode.GetIndex());
-// }
-// else
-// aResult += String("*", RTL_TEXTENCODING_ASCII_US);
-
-// aResult += String(" ", RTL_TEXTENCODING_ASCII_US);
-
-// unsigned int nLvl = GetLevel();
-// aResult += String::CreateFromInt32(nLvl);
-
-// aResult += String(": ", RTL_TEXTENCODING_ASCII_US);
-
-// tNumberVector aNumVector;
-
-// _GetNumberVector(aNumVector, false);
-
-// for (unsigned int n = 0; n < aNumVector.size(); n++)
-// {
-// if (n > 0)
-// aResult += String(", ", RTL_TEXTENCODING_ASCII_US);
-
-// aResult += String::CreateFromInt32(aNumVector[n]);
-// }
-
-// if (IsCounted())
-//// aResult += String(" counted", RTL_TEXTENCODING_ASCII_US);
-// aResult += String(" C", RTL_TEXTENCODING_ASCII_US);
-
-// if (IsRestart())
-// {
-//// aResult += String(" restart(", RTL_TEXTENCODING_ASCII_US);
-// aResult += String(" R(", RTL_TEXTENCODING_ASCII_US);
-// aResult += String::CreateFromInt32(GetStart());
-// aResult += String(")", RTL_TEXTENCODING_ASCII_US);
-// }
-
-// if (! IsValid())
-//// aResult += String(" invalid", RTL_TEXTENCODING_ASCII_US);
-// aResult += String(" I", RTL_TEXTENCODING_ASCII_US);
-
-// aResult += String(" ]", RTL_TEXTENCODING_ASCII_US);
-
-// return aResult;
-//}
-
// --> OD 2006-03-07 #131436#
void SwNodeNum::HandleNumberTreeRootNodeDelete( SwNodeNum& rNodeNum )
{
@@ -508,8 +409,6 @@ const SwNodeNum* SwNodeNum::GetPrecedingNodeNumOf( const SwTxtNode& rTxtNode ) c
const SwNodeNum* pPrecedingNodeNum( 0 );
// --> OD 2007-10-31 #i83479#
-// SwNodeNum aNodeNumForTxtNode;
-// aNodeNumForTxtNode.SetTxtNode( const_cast<SwTxtNode*>(&rTxtNode) );
SwNodeNum aNodeNumForTxtNode( const_cast<SwTxtNode*>(&rTxtNode) );
// <--
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index ec691a02c182..0014bfda530d 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -172,23 +172,6 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
// of the previous node determines the start value for the following
// children loop, if all children have to be validated and the first
// one doesn't restart the counting.
-// tSwNumTreeNumber nTmpNumber = 0;
-// if (aIt != mChildren.end())
-// nTmpNumber = (*aIt)->mnNumber;
-// while (aIt != aValidateIt)
-// {
-// if (aIt == mChildren.end())
-// aIt = mChildren.begin();
-// else
-// {
-// aIt++;
-// if ((*aIt)->IsCounted())
-// nTmpNumber++;
-// }
-// if ((*aIt)->IsRestart() || aIt == mChildren.begin())
-// nTmpNumber = (*aIt)->GetStart();
-// (*aIt)->mnNumber = nTmpNumber;
-// }
SwNumberTree::tSwNumTreeNumber nTmpNumber( 0 );
if (aIt != mChildren.end())
nTmpNumber = (*aIt)->mnNumber;
@@ -342,7 +325,6 @@ void SwNumberTreeNode::ValidateContinuous(const SwNumberTreeNode * pNode) const
// --> OD 2008-05-21 #i74748# - applied patch from garnier_romain
// number tree node has to be validated.
-// SetLastValid(aIt);
SetLastValid( aIt, true );
// <--
}
@@ -1052,32 +1034,6 @@ SwNumberTreeNode::GetIterator(const SwNumberTreeNode * pChild) const
return aItResult;
}
-//String SwNumberTreeNode::print(const String & rIndent,
-// const String & rMyIndent,
-// int nDepth) const
-//{
-// String aStr = rIndent;
-// aStr += ToString();
-// aStr += String("\n", RTL_TEXTENCODING_ASCII_US);
-
-// if (nDepth != 0)
-// {
-// if (nDepth < 0)
-// nDepth = -1;
-
-// tSwNumberTreeChildren::const_iterator aIt;
-// for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
-// {
-// String aTmpStr(rIndent);
-
-// aTmpStr += rMyIndent;
-// aStr += (*aIt)->print(aTmpStr, rMyIndent, nDepth - 1);
-// }
-// }
-
-// return aStr;
-//}
-
#if OSL_DEBUG_LEVEL > 1
unsigned long SwNumberTreeNode::GetInstances()
{
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index e5f26f46f261..291da2d56a63 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -57,8 +57,6 @@ using namespace ::com::sun::star;
#define MAX_TABWIDTH (USHRT_MAX - 2001)
-/* */
-
class SwHTMLTableLayoutConstraints
{
USHORT nRow; // Start-Zeile
@@ -87,7 +85,6 @@ public:
USHORT GetColumn() const { return nCol; }
};
-/* */
SwHTMLTableLayoutCnts::SwHTMLTableLayoutCnts( const SwStartNode *pSttNd,
SwHTMLTableLayout* pTab,
@@ -109,8 +106,6 @@ const SwStartNode *SwHTMLTableLayoutCnts::GetStartNode() const
}
-/* */
-
SwHTMLTableLayoutCell::SwHTMLTableLayoutCell( SwHTMLTableLayoutCnts *pCnts,
USHORT nRSpan, USHORT nCSpan,
USHORT nWidth, BOOL bPrcWidth,
@@ -129,7 +124,6 @@ SwHTMLTableLayoutCell::~SwHTMLTableLayoutCell()
}
}
-/* */
SwHTMLTableLayoutColumn::SwHTMLTableLayoutColumn( USHORT nWidth,
BOOL bRelWidth,
@@ -142,8 +136,6 @@ SwHTMLTableLayoutColumn::SwHTMLTableLayoutColumn( USHORT nWidth,
{}
-/* */
-
SwHTMLTableLayoutConstraints::SwHTMLTableLayoutConstraints(
ULONG nMin, ULONG nMax, USHORT nRw, USHORT nColumn, USHORT nColSp ):
nRow( nRw ), nCol( nColumn ), nColSpan( nColSp ),
@@ -185,7 +177,6 @@ SwHTMLTableLayoutConstraints *SwHTMLTableLayoutConstraints::InsertNext(
return pConstr;
}
-/* */
typedef SwHTMLTableLayoutColumn *SwHTMLTableLayoutColumnPtr;
typedef SwHTMLTableLayoutCell *SwHTMLTableLayoutCellPtr;
@@ -1548,7 +1539,6 @@ void SwHTMLTableLayout::AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
if( nRelLeftFill && !pLeftFillerBox &&
( nWidthSet>0 || nAbsLeftFill<MINLAY+nInhLeftBorderWidth ||
(HasColTags() && nAbsLeftFill < nAbsLeftSpace+nParentInhAbsLeftSpace+20) ) )
-// (nAbsLeftFill<MINLAY || nAbsLeftFill<=nAbsLeftSpace) )
{
SwHTMLTableLayoutColumn *pColumn = GetColumn( 0 );
pColumn->SetAbsColWidth( pColumn->GetAbsColWidth()+nAbsLeftFill );
@@ -1559,7 +1549,6 @@ void SwHTMLTableLayout::AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
if( nRelRightFill && !pRightFillerBox &&
( nWidthSet>0 || nAbsRightFill<MINLAY+nInhRightBorderWidth ||
(HasColTags() && nAbsRightFill < nAbsRightSpace+nParentInhAbsRightSpace+20) ) )
-// (nAbsRightFill<MINLAY || nAbsRightFill<=nAbsRightSpace) )
{
SwHTMLTableLayoutColumn *pColumn = GetColumn( nCols-1 );
pColumn->SetAbsColWidth( pColumn->GetAbsColWidth()+nAbsRightFill );
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 90d96d47eb9f..8dc16dbd6f3a 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1926,11 +1926,6 @@ BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways )
( rThis.GetUpper()->IsInTab() &&
rThis.GetUpper()->FindTabFrm()->IsFwdMoveAllowed() ) ) &&
0 != const_cast<SwFrm&>(rThis).GetNextCellLeaf( MAKEPAGE_NONE ) )
-/*
- &&
- // NEW TABLES
- // Have a look at our main competitor: We don't move inside row span cells:
- ( !rThis.GetUpper()->IsCellFrm() || !rThis.GetUpper()->IsLeaveUpperAllowed() ) )*/
{
bNoFwd = FALSE;
}
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index f4888e812df7..b65c455949bc 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1524,16 +1524,6 @@ void MA_FASTCALL lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage,
pRetoucheFly = 0;
}
-// --> OD 2008-05-16 #i84659# - no longer needed
-//inline BOOL IsShortCut( const SwRect &rRect, const SwRect &rFrmRect )
-//{
-// //Wenn der Frm vollstaendig rechts neben bzw. unter dem
-// //Rect sitzt ist's genug mit Painten.
-// return rFrmRect.Top() > rRect.Bottom();
-// // PAGES01 || (rFrmRect.Left() > rRect.Right()) );
-//}
-// <--
-
//---------------- Ausgabe fuer das BrushItem ----------------
/** lcl_DrawGraphicBackgrd - local help method to draw a background for a graphic
@@ -2807,8 +2797,6 @@ void SwRootFrm::Paint( const SwRect& rRect, const SwPrtOptions *pPrintData ) con
// --> OD 2008-10-07 #i92745#
// Extend check on certain states of the 'current' <ViewShell> instance to
// all existing <ViewShell> instances.
-// if ( !pSh->IsInEndAction() && !pSh->IsPaintInProgress() &&
-// (!pSh->Imp()->IsAction() || !pSh->Imp()->GetLayAction().IsActionInProgress() ) )
bool bPerformLayoutAction( true );
{
ViewShell* pTmpViewShell = pSh;
@@ -3571,7 +3559,6 @@ void SwFlyFrm::Paint( const SwRect& rRect, const SwPrtOptions* /* pPrintData */
// --> OD 2007-12-13 #i80822#
// suppress painting of background in printing area for
// non-transparent graphics.
-// if ( bPaintMarginOnly )
if ( bPaintMarginOnly ||
( pNoTxt && !bIsGraphicTransparent ) )
// <--
@@ -3589,7 +3576,6 @@ void SwFlyFrm::Paint( const SwRect& rRect, const SwPrtOptions* /* pPrintData */
// used in <SwNoTxtFrm::Paint(..)> to set the clip region
// for painting the graphic/OLE. Thus, the clip region is
// also applied for the PDF export.
-// if ( !pOut->GetConnectMetaFile() || pOut->GetOutDevType() == OUTDEV_PRINTER )
ViewShell *pSh = GetShell();
if ( !pOut->GetConnectMetaFile() || !pSh->GetWin() )
// <--
@@ -4707,9 +4693,6 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
{
const SwFrm* pDirRefFrm = IsCellFrm() ? FindTabFrm() : this;
SWRECTFN( pDirRefFrm )
- // OD 19.05.2003 #109667# - use new method <lcl_PaintLeftRightLine(..)>
- //::lcl_PaintLeftLine ( this, pPage, aRect, rRect, rAttrs, fnRect );
- //::lcl_PaintRightLine ( this, pPage, aRect, rRect, rAttrs, fnRect );
::lcl_PaintLeftRightLine ( sal_True, *(this), *(pPage), aRect, rRect, rAttrs, fnRect );
::lcl_PaintLeftRightLine ( sal_False, *(this), *(pPage), aRect, rRect, rAttrs, fnRect );
if ( !IsCntntFrm() || rAttrs.GetTopLine( *(this) ) )
@@ -4722,14 +4705,10 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
SwBorderAttrAccess aAccess( SwFrm::GetCache(),
pCellFrmForTopBorderAttrs );
const SwBorderAttrs &rTopAttrs = *aAccess.Get();
- // OD 19.05.2003 #109667# - use new method <lcl_PaintTopBottomLine(..)>
- //::lcl_PaintTopLine( this, pPage, aRect, rRect, rTopAttrs, fnRect );
::lcl_PaintTopBottomLine( sal_True, *(this), *(pPage), aRect, rRect, rTopAttrs, fnRect );
}
else
{
- // OD 19.05.2003 #109667# - use new method <lcl_PaintTopBottomLine(..)>
- //::lcl_PaintTopLine( this, pPage, aRect, rRect, rAttrs, fnRect );
::lcl_PaintTopBottomLine( sal_True, *(this), *(pPage), aRect, rRect, rAttrs, fnRect );
}
}
@@ -4743,14 +4722,10 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
SwBorderAttrAccess aAccess( SwFrm::GetCache(),
pCellFrmForBottomBorderAttrs );
const SwBorderAttrs &rBottomAttrs = *aAccess.Get();
- // OD 19.05.2003 #109667# - use new method <lcl_PaintTopBottomLine(..)>
- //::lcl_PaintBottomLine(this, pPage, aRect, rRect, rBottomAttrs, fnRect);
::lcl_PaintTopBottomLine(sal_False, *(this), *(pPage), aRect, rRect, rBottomAttrs, fnRect);
}
else
{
- // OD 19.05.2003 #109667# - use new method <lcl_PaintTopBottomLine(..)>
- //::lcl_PaintBottomLine(this, pPage, aRect, rRect, rAttrs, fnRect);
::lcl_PaintTopBottomLine(sal_False, *(this), *(pPage), aRect, rRect, rAttrs, fnRect);
}
}
@@ -5232,17 +5207,6 @@ void SwPageFrm::PaintMarginArea( const SwRect& _rOutputRect,
}
}
-// ----------------------------------------------------------------------
-//
-// const SwPageFrm::mnBorderPxWidth, const SwPageFrm::mnShadowPxWidth
-// SwPageFrm::GetBorderRect (..), SwPageFrm::GetRightShadowRect(..),
-// SwPageFrm::GetBottomShadowRect(..),
-// SwPageFrm::PaintBorderAndShadow(..),
-// SwPageFrm::GetBorderAndShadowBoundRect(..)
-//
-// OD 12.02.2003 for #i9719# and #105645#
-// ----------------------------------------------------------------------
-
const sal_Int8 SwPageFrm::mnBorderPxWidth = 1;
const sal_Int8 SwPageFrm::mnShadowPxWidth = 2;
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 58bbe938c9e2..115219ebfbad 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2065,7 +2065,6 @@ void SwTabFrm::MakeAll()
delete pAccess;
bCalcLowers |= pLayout->Resize(
pLayout->GetBrowseWidthByTabFrm( *this ), FALSE );
-// GetFmt()->GetDoc()->GetDocShell()->IsReadOnly() ? FALSE : TRUE );
pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this );
pAttrs = pAccess->Get();
}
@@ -2137,15 +2136,6 @@ void SwTabFrm::MakeAll()
// Thus, find next content, table or section
// and, if a section is found, get its first
// content.
-// SwFrm *pNxt = FindNextCnt();
-// if( pNxt && pNxt->IsInTab() )
-// pNxt = pNxt->FindTabFrm();
-// if ( pNxt )
-// {
-// pNxt->Calc();
-// if ( !GetNext() )
-// bValidPos = FALSE;
-// }
if ( 0 != lcl_FormatNextCntntForKeep( this ) && !GetNext() )
{
bValidPos = FALSE;
@@ -2756,19 +2746,6 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
// E.g., it could happen, that the fly frame is still registered
// at the page frame, the table is on, but it's anchor character
// text frame has already changed its page.
- //if ( WEIT_WECH != (pFly->Frm().*fnRect->fnGetTop)() &&
- // pFly->IsFlyAtCntFrm() && aFlyRect.IsOver( aRect ) &&
- // // OD 25.02.2003 #i9040# - use '<=' instead of '<'
- // (*fnRect->fnYDiff)(
- // (pFly->GetAnchorFrm()->Frm().*fnRect->fnGetBottom)(),
- // (Frm().*fnRect->fnGetTop)() ) <= 0 &&
- // !IsAnLower( pFly ) && !pFly->IsAnLower( this ) &&
- // ( !pMyFly || pMyFly->IsAnLower( pFly ) ) &&
- // pPage->GetPhyPageNum() >=
- // pFly->GetAnchorFrm()->FindPageFrm()->GetPhyPageNum() &&
- // // anchor should be in same page body/header/footer
- // ( pFly->GetAnchorFrm()->FindFooterOrHeader() ==
- // FindFooterOrHeader() ) )
const SwTxtFrm* pAnchorCharFrm = pFly->FindAnchorCharFrm();
bool bConsiderFly =
// --> OD 2005-04-06 #i46807# - do not consider invalid
@@ -3041,11 +3018,6 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
// OD 10.03.2003 #i9040# - consider right line attribute.
nRightSpacing = Max( nRightSpacing, ( nRightOffset + nRightLine ) );
}
- // OD 10.03.2003 #i9040# - do not hold wished table width.
- /*
- if ( !pAttrs->GetLRSpace().GetRight() )
- nRight = Max( nRight, nMax - (nWish + nLeft + nRight));
- */
}
break;
case text::HoriOrientation::LEFT_AND_WIDTH:
@@ -3249,8 +3221,6 @@ void SwTabFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew )
{
SwPageFrm *pPage = FindPageFrm();
InvalidatePage( pPage );
-// if ( nInvFlags & 0x01 )
-// SetCompletePaint();
if ( nInvFlags & 0x02 )
_InvalidatePrt();
if ( nInvFlags & 0x40 )
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 6ca710d39ea2..6a2baac78f25 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include <hintids.hxx>
#include <hints.hxx>
#include <tools/pstm.hxx>
@@ -1015,7 +1014,6 @@ void SwCntntFrm::Cut()
{
// --> OD 2006-09-25 #b6448963#
// prevent delete of <ColLocked> footnote frame
-// if( pUp->IsFtnFrm() )
if ( pUp->IsFtnFrm() && !pUp->IsColLocked())
// <--
{
@@ -1031,7 +1029,6 @@ void SwCntntFrm::Cut()
else
{
// --> OD 2006-09-25 #b6448963#
-// if ( pSct->IsColLocked() || !pSct->IsInFtn() )
if ( pSct->IsColLocked() || !pSct->IsInFtn() ||
( pUp->IsFtnFrm() && pUp->IsColLocked() ) )
// <--
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index ee06e8d46d4e..acc0700374de 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include <tools/resid.hxx>
#include <unotools/charclass.hxx>
#include <com/sun/star/i18n/CollatorOptions.hpp>
@@ -364,9 +363,6 @@ BOOL SwTOXIndex::operator==( const SwTOXSortTabBase& rCmpBase )
//
// kleiner haengt nur vom Text ab
-
-//
-
BOOL SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase )
{
SwTOXIndex& rCmp = (SwTOXIndex&)rCmpBase;
@@ -399,9 +395,6 @@ BOOL SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase )
//
// Das Stichwort selbst
-
-//
-
void SwTOXIndex::_GetText( String& rTxt, String& rTxtReading )
{
OSL_ENSURE(pTxtMark, "pTxtMark == 0, Kein Stichwort");
@@ -533,7 +526,6 @@ void SwTOXCustom::_GetText( String& rTxt, String &rTxtReading )
{
rTxt = aKey;
rTxtReading = sReading;
- /// !!!!!!!!!!!!!!
}
@@ -621,13 +613,6 @@ void SwTOXPara::_GetText( String& rTxt, String& )
case nsSwTOXElement::TOX_OUTLINELEVEL:
{
xub_StrLen nStt = nStartIndex;
-/* JP 22.01.98:
- Tabs ueberspringen - macht aber keinen Sinn, solange in der TOX-Form
- nicht die KapitelNummer eingestellt werden kann
- const String& rTmp = ((SwTxtNode*)pNd)->GetTxt();
- while( '\t' == rTmp.GetChar( nStt ) && nStt < rTmp.Len() )
- ++nStt;
-*/
rTxt = ((SwTxtNode*)pNd)->GetExpandTxt(
nStt,
STRING_NOTFOUND == nEndIndex ? STRING_LEN : nEndIndex - nStt);
@@ -664,13 +649,6 @@ void SwTOXPara::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT ) const
{
SwTxtNode* pSrc = (SwTxtNode*)aTOXSources[0].pNd;
xub_StrLen nStt = nStartIndex;
-/* JP 22.01.98:
- Tabs ueberspringen - macht aber keinen Sinn, solange in der TOX-Form
- nicht die KapitelNummer eingestellt werden kann
- const String& rTxt = pSrc->GetTxt();
- while( '\t' == rTxt.GetChar( nStt ) && nStt < rTxt.Len() )
- ++nStt;
-*/
pSrc->GetExpandTxt( rNd, &rInsPos, nStt,
nEndIndex == STRING_LEN ? STRING_LEN : nEndIndex - nStt,
FALSE, FALSE, TRUE );
@@ -692,9 +670,6 @@ USHORT SwTOXPara::GetLevel() const
if( nsSwTOXElement::TOX_OUTLINELEVEL == eType && pNd->GetTxtNode() )
{
- //USHORT nTmp = ((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel();//#outline level,zhaojianwei
- //if(nTmp < NO_NUMBERING)
- // nRet = nTmp + 1;
const int nTmp = ((SwTxtNode*)pNd)->GetAttrOutlineLevel();//#outline level,zhaojianwei????
if(nTmp != 0 )
nRet = static_cast<USHORT>(nTmp);
@@ -714,41 +689,6 @@ String SwTOXPara::GetURL() const
{
const SwTxtNode * pTxtNd = static_cast<const SwTxtNode *>(pNd);
- // --> OD 2009-08-05 #i103265#
-// //if( MAXLEVEL >= pTxtNd->GetTxtColl()->GetOutlineLevel()) //#outline level,zhaojianwei
-// if ( pTxtNd->GetAttrOutlineLevel() > 0) //<-end,zhaojianwei
-// {
-// aTxt = '#';
-// const SwNumRule * pRule = pTxtNd->GetNumRule();
-// if( pRule )
-// {
-// // dann noch die rel. Nummer davor setzen
-// const USHORT nCurrLevel = static_cast<USHORT>(pTxtNd->GetActualListLevel());
-// if(nCurrLevel <= MAXLEVEL)
-// {
-// // --> OD 2005-11-02 #i51089 - TUNING#
-// if ( pTxtNd->GetNum() )
-// {
-// SwNumberTree::tNumberVector aNumVector =
-// pTxtNd->GetNumberVector();
-
-// for( USHORT n = 0; n <= nCurrLevel; ++n )
-// {
-// int nNum = aNumVector[ n ];
-// nNum -= ( pRule->Get( n ).GetStart() - 1 );
-// ( aTxt += String::CreateFromInt32( nNum )) += '.';
-// }
-// }
-// else
-// {
-// OSL_ENSURE( false,
-// "<SwTOXPara::GetURL()> - text node with numbering rule, but without number. This is a serious defect -> inform OD" );
-// }
-// }
-// }
-// aTxt += pTxtNd->GetExpandTxt();
-// ( aTxt += cMarkSeperator ).AppendAscii( pMarkToOutline );
-// }
SwDoc* pDoc = const_cast<SwDoc*>( pTxtNd->GetDoc() );
::sw::mark::IMark const * const pMark = pDoc->getIDocumentMarkAccess()->getMarkForTxtNode(
*(pTxtNd),
@@ -756,7 +696,6 @@ String SwTOXPara::GetURL() const
aTxt = '#';
const String aMarkName( pMark->GetName() );
aTxt += aMarkName;
- // <--
}
break;
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 8384126f499d..7ea0ee98a786 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -226,7 +226,6 @@ SwTxtNode::SwTxtNode( const SwNodeIndex &rWhere,
if( pAutoAttr )
SetAttr( *pAutoAttr );
-// SyncNumberAndNumRule();
if ( !IsInList() && GetNumRule() && GetListId().Len() > 0 )
{
// #i101516#
@@ -2489,7 +2488,6 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, BOOL bNext,
// --> OD 2007-07-10 #i75353#
// No clear of hard set numbering rule at an outline paragraph at this point.
// Only if the paragraph style changes - see below.
-// aClearWhichIds.push_back( RES_PARATR_NUMRULE );
bClearHardSetNumRuleWhenFmtCollChanges = true;
// <--
}
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 81966daa64da..b6b6cfb9b679 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -1103,7 +1103,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
// be determined)
// -1: don't know yet, 0: not used, 1: always a single labe cell, ...
// -2: neither/failed
-// sal_Int32 nValuesSeqLen = -1; // used to see if all value sequences have the same size
for (sal_Int32 nDS1 = 0; nDS1 < nNumDS_LDS; ++nDS1)
{
uno::Reference< chart2::data::XLabeledDataSequence > xLabeledDataSequence( pDS_LDS[nDS1] );
@@ -1587,7 +1586,6 @@ void SwChartDataProvider::InvalidateTable( const SwTable *pTable )
Set_DataSequenceRef_t::iterator aIt( rSet.begin() );
while (aIt != rSet.end())
{
-// uno::Reference< util::XModifiable > xRef( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );
uno::Reference< chart2::data::XDataSequence > xTemp(*aIt); // temporary needed for g++ 3.3.5
uno::Reference< util::XModifiable > xRef( xTemp, uno::UNO_QUERY );
if (xRef.is())
@@ -1621,7 +1619,6 @@ sal_Bool SwChartDataProvider::DeleteBox( const SwTable *pTable, const SwTableBox
sal_Bool bNowEmpty = sal_False;
// check if weak reference is still valid...
-// uno::Reference< chart2::data::XDataSequence > xRef( uno::Reference< chart2::data::XDataSequence>(*aIt), uno::UNO_QUERY );
uno::Reference< chart2::data::XDataSequence > xTemp(*aIt); // temporary needed for g++ 3.3.5
uno::Reference< chart2::data::XDataSequence > xRef( xTemp, uno::UNO_QUERY );
if (xRef.is())
@@ -1669,7 +1666,6 @@ void SwChartDataProvider::DisposeAllDataSequences( const SwTable *pTable )
Set_DataSequenceRef_t::iterator aEndIt( aSet.end() );
while (aIt != aEndIt)
{
-// uno::Reference< lang::XComponent > xRef( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );
uno::Reference< chart2::data::XDataSequence > xTemp(*aIt); // temporary needed for g++ 3.3.5
uno::Reference< lang::XComponent > xRef( xTemp, uno::UNO_QUERY );
if (xRef.is())
@@ -1743,7 +1739,6 @@ void SwChartDataProvider::AddRowCols(
Set_DataSequenceRef_t::iterator aIt( rSet.begin() );
while (aIt != rSet.end())
{
-// uno::Reference< chart2::data::XTextualDataSequence > xRef( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );
uno::Reference< chart2::data::XDataSequence > xTemp(*aIt); // temporary needed for g++ 3.3.5
uno::Reference< chart2::data::XTextualDataSequence > xRef( xTemp, uno::UNO_QUERY );
if (xRef.is())
@@ -1807,14 +1802,9 @@ rtl::OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const rtl::OUStri
{
String aRange( aRangeRepresentation.GetToken(i, ';') );
SwFrmFmt *pTblFmt = 0; // pointer to table format
- // BM: For what should the check be necessary? for #i79009# it is required that NO check is done
-// SwUnoCrsr *pUnoCrsr = 0; // here required to check if the cells in the range do actually exist
-// std::auto_ptr< SwUnoCrsr > pAuto( pUnoCrsr ); // to end lifetime of object pointed to by pUnoCrsr
GetFormatAndCreateCursorFromRangeRep( pDoc, aRange, &pTblFmt, NULL );
if (!pTblFmt)
throw lang::IllegalArgumentException();
-// if (!pUnoCrsr)
-// throw uno::RuntimeException();
SwTable* pTable = SwTable::FindTable( pTblFmt );
if (pTable->IsTblComplex())
throw uno::RuntimeException();
@@ -1918,7 +1908,6 @@ SwChartDataSource::SwChartDataSource(
SwChartDataSource::~SwChartDataSource()
{
-// delete pTblCrsr;
}
uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL SwChartDataSource::getDataSequences( )
@@ -2364,7 +2353,6 @@ void SAL_CALL SwChartDataSequence::addPropertyChangeListener(
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- //SolarMutexGuard aGuard;
DBG_ERROR( "not implemented" );
}
@@ -2373,7 +2361,6 @@ void SAL_CALL SwChartDataSequence::removePropertyChangeListener(
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- //SolarMutexGuard aGuard;
DBG_ERROR( "not implemented" );
}
@@ -2382,7 +2369,6 @@ void SAL_CALL SwChartDataSequence::addVetoableChangeListener(
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- //SolarMutexGuard aGuard;
DBG_ERROR( "not implemented" );
}
@@ -2391,7 +2377,6 @@ void SAL_CALL SwChartDataSequence::removeVetoableChangeListener(
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- //SolarMutexGuard aGuard;
DBG_ERROR( "not implemented" );
}
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index ddfc6c56572b..408179b102ab 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1466,26 +1466,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
}
else
xPrSet->setPropertyValue(rPropertyName, aValue);
- // --> OD 2004-11-11 #i35007# - adjustment of the position
- // attributes, if the transformation is set, causes wrong alignments
- // and is no longer needed.
- // The position attributes are set, if the drawing object is added
- // to the draw page - see <SwXDrawPage::add(..)> - and on its first
- // positioning - see <SwAnchoredDrawObject::MakeObjPos().
-// // --> OD 2004-07-28 #i31698# - additionally adjust the position
-// // properties of the shape, if the transformation is set and
-// // the shape isn't a group member.
-// if ( rPropertyName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transformation"))) &&
-// !_GetTopGroupObj() )
-// {
-// drawing::HomogenMatrix3 aMatrix;
-// aValue >>= aMatrix;
-// awt::Point aNewPos( basegfx::fround( aMatrix.Line1.Column3 ),
-// basegfx::fround( aMatrix.Line2.Column3 ) );
-// _AdjustPositionProperties( aNewPos );
-// }
- // --> OD 2004-08-05 #i31698# - restore object position, if caption
- // point is set.
+ // #i31698# - restore object position, if caption point is set.
if ( rPropertyName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CaptionPoint"))) &&
getShapeType().equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CaptionShape"))) )
{
@@ -2251,36 +2232,11 @@ awt::Point SAL_CALL SwXShape::getPosition() throw ( uno::RuntimeException )
const Rectangle aGroupObjRect = pTopGroupObj->GetSnapRect();
// --> OD 2005-08-16 #i53320# - relative position of group member and
// top group object is always given in horizontal left-to-right layout.
-// const SwFrmFmt::tLayoutDir eLayoutDir = GetFrmFmt()
-// ? GetFrmFmt()->GetLayoutDir()
-// : SwFrmFmt::HORI_L2R;
awt::Point aOffset( 0, 0 );
-// switch ( eLayoutDir )
-// {
-// case SwFrmFmt::HORI_L2R:
{
aOffset.X = ( aMemberObjRect.Left() - aGroupObjRect.Left() );
aOffset.Y = ( aMemberObjRect.Top() - aGroupObjRect.Top() );
}
-// break;
-// case SwFrmFmt::HORI_R2L:
-// {
-// aOffset.X = ( aGroupObjRect.Right() - aMemberObjRect.Right() );
-// aOffset.Y = ( aMemberObjRect.Top() - aGroupObjRect.Top() );
-// }
-// break;
-// case SwFrmFmt::VERT_R2L:
-// {
-// aOffset.X = ( aMemberObjRect.Top() - aGroupObjRect.Top() );
-// aOffset.Y = ( aGroupObjRect.Right() - aMemberObjRect.Right() );
-// }
-// break;
-// default:
-// {
-// OSL_ENSURE( false,
-// "<SwXShape::getPosition()> - unsupported layout direction" );
-// }
-// }
// <--
aOffset.X = TWIP_TO_MM100(aOffset.X);
aOffset.Y = TWIP_TO_MM100(aOffset.Y);
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index d3e89444c868..b9eecd192b66 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#define _SVX_PARAITEM_HXX
#define _SVX_TEXTITEM_HXX
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index 008596015716..6f2b4bfd2cd6 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include <ctype.h>
#include <stdlib.h>
#include <stdio.h>
@@ -70,10 +69,8 @@
#endif
-
const sal_Int32 MAX_LEN = 1024;
-/* */
void CSS1Parser::InitRead( const String& rIn )
{
@@ -113,8 +110,6 @@ sal_Unicode CSS1Parser::GetNextChar()
return c;
}
-/* */
-
// Diese Funktion realisiert den in
//
// http://www.w3.orh/pub/WWW/TR/WD-css1.html
@@ -690,9 +685,6 @@ CSS1Token CSS1Parser::GetNextToken()
}
-/* */
-
-
// Dies folegenden Funktionen realisieren den in
//
// http://www.w3.orh/pub/WWW/TR/WD-css1.html
@@ -1152,7 +1144,6 @@ CSS1Expression *CSS1Parser::ParseDeclaration( String& rProperty )
return pRoot;
}
-/* */
CSS1Parser::CSS1Parser()
: nValue(0)
@@ -1165,7 +1156,6 @@ CSS1Parser::~CSS1Parser()
{
}
-/* */
BOOL CSS1Parser::ParseStyleSheet( const String& rIn )
{
@@ -1255,8 +1245,6 @@ BOOL CSS1Parser::DeclarationParsed( const String& /*rProperty*/,
}
-/* */
-
CSS1Selector::~CSS1Selector()
{
delete pNext;