[Libreoffice-commits] .: sw/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Dec 10 12:32:19 PST 2010
sw/source/core/layout/layouter.cxx | 2 -
sw/source/core/layout/sectfrm.cxx | 3 -
sw/source/core/text/itratr.hxx | 2 -
sw/source/core/text/itrtxt.cxx | 2 -
sw/source/core/text/txtfly.cxx | 10 +++---
sw/source/core/text/txtfly.hxx | 39 +----------------------
sw/source/core/unocore/unosect.cxx | 3 -
sw/source/filter/ww8/dump/dump8a.cxx | 2 -
sw/source/filter/ww8/ww8graf.cxx | 2 -
sw/source/ui/misc/num.cxx | 57 -----------------------------------
sw/source/ui/utlui/glbltree.cxx | 3 -
sw/source/ui/vba/vbalisthelper.hxx | 2 -
12 files changed, 15 insertions(+), 112 deletions(-)
New commits:
commit cd96e14fb8f56b074caa4d2610ed9df006f26cee
Author: Joachim Trémouroux <joachim.tremouroux at gmail.com>
Date: Fri Dec 10 20:32:10 2010 +0000
cppcheck: remove warnings
diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx
index 9ae1482..214e4df 100644
--- a/sw/source/core/layout/layouter.cxx
+++ b/sw/source/core/layout/layouter.cxx
@@ -73,7 +73,7 @@ public:
~SwEndnoter() { delete pEndArr; }
void CollectEndnotes( SwSectionFrm* pSct );
void CollectEndnote( SwFtnFrm* pFtn );
- const SwSectionFrm* GetSect() { return pSect; }
+ const SwSectionFrm* GetSect() const { return pSect; }
void InsertEndnotes();
BOOL HasEndnotes() const { return pEndArr && pEndArr->Count(); }
};
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index a3a5f25..d87738d 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -2183,7 +2183,6 @@ SwTwips SwSectionFrm::_Shrink( SwTwips nDist, BOOL bTst )
long nPrtHeight = (Prt().*fnRect->fnGetHeight)() - nDist;
(Prt().*fnRect->fnSetHeight)( nPrtHeight );
- SwTwips nReal = 0;
// We do not allow a section frame to shrink the its upper
// footer frame. This is because in the calculation of a
// footer frame, the content of the section frame is _not_
@@ -2199,7 +2198,7 @@ SwTwips SwSectionFrm::_Shrink( SwTwips nDist, BOOL bTst )
// would cause the top of the section frame to overlap with the
// fly frame again, this would result in a perfect loop.
if( GetUpper() && !GetUpper()->IsFooterFrm() )
- nReal = GetUpper()->Shrink( nDist, bTst );
+ GetUpper()->Shrink( nDist, bTst );
if( Lower() && Lower()->IsColumnFrm() && Lower()->GetNext() )
{
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index 0679840..d0149f7 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -80,7 +80,7 @@ protected:
void Rst( SwTxtAttr *pHt );
void CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, SwTxtFrm* pFrm = 0 );
inline SwAttrIter(SwTxtNode* pTxtNode)
- : pShell(0), pFnt(0), pLastOut(0), nChgCnt(0), pRedln(0), nPropFont(0), m_pTxtNode(pTxtNode) {}
+ : pShell(0), pFnt(0), pHints(0), pScriptInfo(0), pLastOut(0), nChgCnt(0), pRedln(0), nPropFont(0), m_pTxtNode(pTxtNode) {}
public:
// Konstruktor, Destruktor
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index 4b33e40..5a4b98d 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -75,9 +75,7 @@ void SwTxtIter::CtorInitTxtIter( SwTxtFrm *pNewFrm, SwTxtInfo *pNewInf )
pFrm = pNewFrm;
pInf = pNewInf;
- // --> OD 2008-01-17 #newlistlevelattrs#
aLineInf.CtorInitLineInfo( pNode->GetSwAttrSet(), *pNode );
- // <--
nFrameStart = pFrm->Frm().Pos().Y() + pFrm->Prt().Pos().Y();
SwTxtIter::Init();
if( pNode->GetSwAttrSet().GetRegister().GetValue() )
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index c151a61..ea392f8 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -755,12 +755,9 @@ SwFlyCntPortion *SwTxtFormatter::NewFlyCntPortion( SwTxtFormatInfo &rInf,
SwTxtFly::SwTxtFly( const SwTxtFly& rTxtFly )
{
pPage = rTxtFly.pPage;
- // --> OD 2006-08-15 #i68520#
mpCurrAnchoredObj = rTxtFly.mpCurrAnchoredObj;
- // <--
pCurrFrm = rTxtFly.pCurrFrm;
pMaster = rTxtFly.pMaster;
- // --> OD 2006-08-15 #i68520#
if( rTxtFly.mpAnchoredObjList )
{
mpAnchoredObjList = new SwAnchoredObjList( *(rTxtFly.mpAnchoredObjList) );
@@ -769,11 +766,16 @@ SwTxtFly::SwTxtFly( const SwTxtFly& rTxtFly )
{
mpAnchoredObjList = NULL;
}
- // <--
bOn = rTxtFly.bOn;
bLeftSide = rTxtFly.bLeftSide;
bTopRule = rTxtFly.bTopRule;
+ nMinBottom = rTxtFly.nMinBottom;
+ nNextTop = rTxtFly.nNextTop;
+ nIndex = rTxtFly.nIndex;
+ mbIgnoreCurrentFrame = rTxtFly.mbIgnoreCurrentFrame;
+ mbIgnoreContour = rTxtFly.mbIgnoreContour;
+ mbIgnoreObjsInHeaderFooter = rTxtFly.mbIgnoreObjsInHeaderFooter;
}
void SwTxtFly::CtorInitTxtFly( const SwTxtFrm *pFrm )
diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx
index d5b6c6e..d822c7d 100644
--- a/sw/source/core/text/txtfly.hxx
+++ b/sw/source/core/text/txtfly.hxx
@@ -41,20 +41,12 @@ class SwTxtPaintInfo;
class SwFmt;
class TextRanger;
class Color;
-// --> OD 2004-10-06 #i26945#
class SwAnchoredObject;
-// <--
-// --> OD 2006-08-15 #i68520# - refactoring
-//typedef MSHORT _FlyCntnt;
#include <fmtsrndenum.hxx>
-// <--
-// --> OD 2006-08-15 #i68520#
-//SV_DECL_PTRARR( SwFlyList, SdrObject*, 10, 10 )
#include <vector>
typedef std::vector< SwAnchoredObject* > SwAnchoredObjList;
-// <--
/*************************************************************************
* class SwFlyIter
@@ -93,13 +85,11 @@ public:
const SdrObject* GetObject( MSHORT nPos ){ return pSdrObj[ nPos ]; }
MSHORT GetCount() const { return nObjCnt; }
void ClrObject( MSHORT nPos );
- // --> OD 2006-08-15 #i68520#
static const SwRect CalcBoundRect( const SwAnchoredObject* pAnchoredObj,
const SwRect &rLine,
const SwTxtFrm* pFrm,
const long nXPos,
const sal_Bool bRight );
- // <--
#if OSL_DEBUG_LEVEL > 1
void ShowContour( OutputDevice* pOut, const SdrObject* pObj,
const Color& rClosedColor, const Color& rOpenColor );
@@ -113,17 +103,10 @@ public:
class SwTxtFly
{
const SwPageFrm *pPage;
- // --> OD 2006-08-15 #i68520#
const SwAnchoredObject* mpCurrAnchoredObj;
- // <--
-
const SwTxtFrm *pCurrFrm;
-
const SwCntntFrm *pMaster;
- // --> OD 2006-08-15 #i68520#
SwAnchoredObjList* mpAnchoredObjList;
- // <--
-
long nMinBottom;
long nNextTop; // Hier wird die Oberkante des "naechsten" Rahmens gespeichert
ULONG nIndex;
@@ -132,12 +115,10 @@ class SwTxtFly
sal_Bool bTopRule: 1;
sal_Bool mbIgnoreCurrentFrame: 1;
sal_Bool mbIgnoreContour: 1;
- // --> OD 2004-12-17 #118809# - boolean, indicating if objects in page
- // header|footer are considered for text frames not in page header|footer.
+ // boolean, indicating if objects in page header|footer are considered for
+ // text frames not in page header|footer.
sal_Bool mbIgnoreObjsInHeaderFooter: 1;
- // <--
SwRect _GetFrm( const SwRect &rPortion, sal_Bool bTop ) const;
- // --> OD 2006-08-15 #i68520#
SwAnchoredObjList* InitAnchoredObjList();
inline SwAnchoredObjList* GetAnchoredObjList() const
{
@@ -155,13 +136,9 @@ class SwTxtFly
SwAnchoredObjList::size_type nPos,
const SwRect &rLine ) const;
SwAnchoredObjList::size_type GetPos( const SwAnchoredObject* pAnchoredObj ) const;
- // <--
- // --> OD 2004-10-06 #i26945# - change first parameter:
- // Now it's the <SwAnchoredObject> instance of the floating screen object
sal_Bool GetTop( const SwAnchoredObject* _pAnchoredObj,
const sal_Bool bInFtn,
const sal_Bool bInFooterOrHeader );
- // <--
SwTwips CalcMinBottom() const;
const SwCntntFrm* _GetMaster();
@@ -170,22 +147,16 @@ public:
{
mbIgnoreCurrentFrame = sal_False;
mbIgnoreCurrentFrame = sal_False;
- // --> OD 2004-12-17 #118809#
mbIgnoreObjsInHeaderFooter = sal_False;
- // <--
- // --> OD 2006-08-15 #i68520#
mpCurrAnchoredObj = 0;
mpAnchoredObjList = 0;
- // <--
pMaster = 0;
}
inline SwTxtFly( const SwTxtFrm *pFrm )
{ CtorInitTxtFly( pFrm ); }
SwTxtFly( const SwTxtFly& rTxtFly );
- // --> OD 2006-08-15 #i68520#
inline ~SwTxtFly() { delete mpAnchoredObjList; }
- // <--
void CtorInitTxtFly( const SwTxtFrm *pFrm );
void SetTopRule(){ bTopRule = sal_False; }
@@ -194,9 +165,7 @@ public:
inline sal_Bool Relax( const SwRect &rRect );
inline sal_Bool Relax();
inline SwTwips GetMinBottom() const
- // --> OD 2006-08-15 #i68520#
{ return mpAnchoredObjList ? nMinBottom : CalcMinBottom(); }
- // <--
inline const SwCntntFrm* GetMaster() const
{ return pMaster ? pMaster : ((SwTxtFly*)this)->_GetMaster(); }
inline long GetNextTop() const { return nNextTop; }
@@ -204,12 +173,10 @@ public:
inline void SetNextTop( long nNew ) const
{ ((SwTxtFly*)this)->nNextTop = nNew; }
- // --> OD 2006-08-15 #i68520#
// determines the demanded rectangle for an anchored object,
// considering its surround for text wrapping.
SwRect AnchoredObjToRect( const SwAnchoredObject* pAnchoredObj,
const SwRect& rRect ) const;
- // <--
// Die Drawmethoden stellen sicher, dass ueberlappende Frames
// (ausser bei transparenten Frames) nicht uebergepinselt werden.
@@ -226,12 +193,10 @@ public:
void SetIgnoreCurrentFrame( sal_Bool bNew ) { mbIgnoreCurrentFrame = bNew; }
void SetIgnoreContour( sal_Bool bNew ) { mbIgnoreContour = bNew; }
- // --> OD 2004-12-17 #118809#
inline void SetIgnoreObjsInHeaderFooter( const sal_Bool _bNew )
{
mbIgnoreObjsInHeaderFooter = _bNew;
}
- // <--
#if OSL_DEBUG_LEVEL > 1
void ShowContour( OutputDevice* pOut );
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 2cf2cfb..b55fc58 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -437,9 +437,8 @@ SwXTextSection::getAnchor() throw (uno::RuntimeException)
SwSectionFmt *const pSectFmt = m_pImpl->GetSectionFmt();
if(pSectFmt)
{
- const SwSection* pSect;
const SwNodeIndex* pIdx;
- if( 0 != ( pSect = pSectFmt->GetSection() ) &&
+ if( 0 != ( pSectFmt->GetSection() ) &&
0 != ( pIdx = pSectFmt->GetCntnt().GetCntntIdx() ) &&
pIdx->GetNode().GetNodes().IsDocNodes() )
{
diff --git a/sw/source/filter/ww8/dump/dump8a.cxx b/sw/source/filter/ww8/dump/dump8a.cxx
index b35a64b..46b90e8 100644
--- a/sw/source/filter/ww8/dump/dump8a.cxx
+++ b/sw/source/filter/ww8/dump/dump8a.cxx
@@ -2328,7 +2328,6 @@ void DumpEscherRecs( ULONG nPos, UINT32 nLength )
{
begin( *pOut, *xTableStream ) << endl1;
- UINT16 nOldFbt = 0;
ULONG nReadLen = 0;
while( nReadLen < nLength )
{
@@ -2373,7 +2372,6 @@ void DumpEscherRecs( ULONG nPos, UINT32 nLength )
nReadLen += nRecLen;
xTableStream->Seek( nPos + nReadLen );
- nOldFbt = nFbt;
}
end( *pOut, *xTableStream ) << endl1;
}
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 65f0d4b..1ac9223 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -578,7 +578,7 @@ private:
long mnEndPos; //0x15
public:
explicit Chunk(long nStart, const String &rURL)
- : msURL(rURL), mnStartPos(nStart) {}
+ : msURL(rURL), mnStartPos(nStart), mnEndPos(0) {}
Chunk(const Chunk &rChunk)
: msURL(rChunk.msURL), mnStartPos(rChunk.mnStartPos),
mnEndPos(rChunk.mnEndPos) {}
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index ded9fbf..25cf448 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -94,7 +94,6 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
aDistNumMF( this, SW_RES(MF_NUMDIST )),
aAlignFT( this, SW_RES(FT_ALIGN )),
aAlignLB( this, SW_RES(LB_ALIGN )),
- // --> OD 2008-02-01 #newlistlevelattrs#
aLabelFollowedByFT( this, SW_RES(FT_LABEL_FOLLOWED_BY) ),
aLabelFollowedByLB( this, SW_RES(LB_LABEL_FOLLOWED_BY) ),
aListtabFT( this, SW_RES(FT_LISTTAB) ),
@@ -105,7 +104,6 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
aAlignedAtMF( this, SW_RES(MF_ALIGNED_AT) ),
aIndentAtFT( this, SW_RES(FT_INDENT_AT) ),
aIndentAtMF( this, SW_RES(MF_INDENT_AT) ),
- // <--
aStandardPB( this, SW_RES(PB_STANDARD )),
aPreviewWIN( this, SW_RES(WIN_PREVIEW )),
@@ -116,9 +114,7 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
pOutlineDlg(0),
bPreset( FALSE ),
bInInintControl(FALSE),
- // --> OD 2008-02-01 #newlistlevelattrs#
bLabelAlignmentPosAndSpaceModeActive( false )
- // <--
{
FreeResource();
SetExchangeSupport();
@@ -126,7 +122,6 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
aRelativeCB.Check();
aAlignLB.SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl));
- // --> OD 2008-02-01 #newlistlevelattrs#
aAlign2LB.SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl));
for ( USHORT i = 0; i < aAlignLB.GetEntryCount(); ++i )
{
@@ -134,7 +129,6 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
}
aAlign2LB.SetDropDownLineCount( aAlign2LB.GetEntryCount() );
aAlign2FT.SetText( aAlignFT.GetText() );
- // <--
Link aLk = LINK(this, SwNumPositionTabPage, DistanceHdl);
aDistBorderMF.SetUpHdl(aLk);
@@ -147,7 +141,6 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
aDistNumMF.SetLoseFocusHdl(aLk);
aIndentMF.SetLoseFocusHdl(aLk);
- // --> OD 2008-02-01 #newlistlevelattrs#
aLabelFollowedByLB.SetDropDownLineCount( aLabelFollowedByLB.GetEntryCount() );
aLabelFollowedByLB.SetSelectHdl( LINK(this, SwNumPositionTabPage, LabelFollowedByHdl_Impl) );
@@ -165,7 +158,6 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
aIndentAtMF.SetUpHdl(aLk);
aIndentAtMF.SetDownHdl(aLk);
aIndentAtMF.SetLoseFocusHdl(aLk);
- // <--
aLevelLB.SetSelectHdl(LINK(this, SwNumPositionTabPage, LevelHdl));
aRelativeCB.SetClickHdl(LINK(this, SwNumPositionTabPage, RelativeHdl));
@@ -191,7 +183,6 @@ SwNumPositionTabPage::~SwNumPositionTabPage()
void SwNumPositionTabPage::InitControls()
{
bInInintControl = TRUE;
- // --> OD 2008-02-01 #newlistlevelattrs#
const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive &&
aRelativeCB.IsEnabled() && aRelativeCB.IsChecked();
const bool bSingleSelection = aLevelLB.GetSelectEntryCount() == 1 &&
@@ -201,7 +192,6 @@ void SwNumPositionTabPage::InitControls()
( bSingleSelection || bRelative || pOutlineDlg != 0 ) );
aDistBorderFT.Enable( !bLabelAlignmentPosAndSpaceModeActive &&
( bSingleSelection || bRelative || pOutlineDlg != 0 ) );
- // <--
bool bSetDistEmpty = false;
bool bSameDistBorderNum = !bLabelAlignmentPosAndSpaceModeActive;
@@ -209,12 +199,10 @@ void SwNumPositionTabPage::InitControls()
bool bSameIndent = !bLabelAlignmentPosAndSpaceModeActive;
bool bSameAdjust = true;
- // --> OD 2008-02-01 #newlistlevelattrs#
bool bSameLabelFollowedBy = bLabelAlignmentPosAndSpaceModeActive;
bool bSameListtab = bLabelAlignmentPosAndSpaceModeActive;
bool bSameAlignAt = bLabelAlignmentPosAndSpaceModeActive;
bool bSameIndentAt = bLabelAlignmentPosAndSpaceModeActive;
- // <--
const SwNumFmt* aNumFmtArr[MAXLEVEL];
const SwFmtVertOrient* pFirstOrient = 0;
@@ -230,7 +218,6 @@ void SwNumPositionTabPage::InitControls()
if(USHRT_MAX == nLvl)
{
nLvl = i;
- // --> OD 2008-02-01 #newlistlevelattrs#
if ( !bLabelAlignmentPosAndSpaceModeActive )
{
pFirstOrient = aNumFmtArr[nLvl]->GetGraphicOrientation();
@@ -239,12 +226,10 @@ void SwNumPositionTabPage::InitControls()
aNumFmtArr[nLvl - 1]->GetAbsLSpace() + aNumFmtArr[nLvl - 1]->GetFirstLineOffset():
aNumFmtArr[nLvl]->GetAbsLSpace() + aNumFmtArr[nLvl]->GetFirstLineOffset();
}
- // <--
}
if( i > nLvl)
{
- // --> OD 2008-02-01 #newlistlevelattrs#
bSameAdjust &= aNumFmtArr[i]->GetNumAdjust() == aNumFmtArr[nLvl]->GetNumAdjust();
if ( !bLabelAlignmentPosAndSpaceModeActive )
{
@@ -282,8 +267,6 @@ void SwNumPositionTabPage::InitControls()
bSameIndentAt &=
aNumFmtArr[i]->GetIndentAt() == aNumFmtArr[nLvl]->GetIndentAt();
}
- // <--
-
}
}
nMask <<= 1;
@@ -324,19 +307,14 @@ void SwNumPositionTabPage::InitControls()
else if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT)
nPos = 2;
aAlignLB.SelectEntryPos(nPos);
- // --> OD 2008-02-01 #newlistlevelattrs#
aAlign2LB.SelectEntryPos( nPos );
- // <--
}
else
{
aAlignLB.SetNoSelection();
- // --> OD 2008-02-01 #newlistlevelattrs#
aAlign2LB.SetNoSelection();
- // <--
}
- // --> OD 2008-02-01 #newlistlevelattrs#
if ( bSameLabelFollowedBy )
{
USHORT nPos = 0; // LISTTAB
@@ -396,7 +374,6 @@ void SwNumPositionTabPage::InitControls()
{
aIndentAtMF.SetText(aEmptyStr);
}
- // <--
if(TRUE == bSetDistEmpty)
aDistBorderMF.SetText(aEmptyStr);
@@ -414,7 +391,6 @@ void SwNumPositionTabPage::ActivatePage(const SfxItemSet& )
{
bPreset = ((const SfxBoolItem*)pItem)->GetValue();
}
- //
bModified = (!pActNum->GetNumFmt( 0 ) || bPreset);
if(*pActNum != *pSaveNum ||
nActNumLvl != nTmpNumLvl )
@@ -434,10 +410,8 @@ void SwNumPositionTabPage::ActivatePage(const SfxItemSet& )
}
aLevelLB.SetUpdateMode(TRUE);
- // --> OD 2008-02-01 #newlistlevelattrs#
InitPosAndSpaceMode();
ShowControlsDependingOnPosAndSpaceMode();
- // <--
InitControls();
}
@@ -500,15 +474,12 @@ void SwNumPositionTabPage::Reset( const SfxItemSet& rSet )
else if(*pSaveNum != *pActNum)
*pActNum = *pSaveNum;
aPreviewWIN.SetNumRule(pActNum);
- // --> OD 2008-02-01 #newlistlevelattrs#
InitPosAndSpaceMode();
ShowControlsDependingOnPosAndSpaceMode();
- // <--
InitControls();
bModified = FALSE;
}
-// --> OD 2008-01-11 #newlistlevelattrs#
void SwNumPositionTabPage::InitPosAndSpaceMode()
{
if ( pActNum == 0 )
@@ -562,7 +533,6 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
aIndentAtFT.Show( bLabelAlignmentPosAndSpaceModeActive );
aIndentAtMF.Show( bLabelAlignmentPosAndSpaceModeActive );
}
-// <--
SfxTabPage* SwNumPositionTabPage::Create( Window* pParent,
const SfxItemSet& rAttrSet)
@@ -574,27 +544,21 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh)
{
pWrtSh = pSh;
- // --> OD 2008-02-01 #newlistlevelattrs#
const SwTwips nWidth = pWrtSh->GetAnyCurRect(RECT_FRM).Width();
aDistBorderMF.SetMax(aDistBorderMF.Normalize( nWidth ), FUNIT_TWIP );
aDistNumMF .SetMax(aDistNumMF .Normalize( nWidth ), FUNIT_TWIP );
aIndentMF .SetMax(aIndentMF .Normalize( nWidth ), FUNIT_TWIP );
- // --> OD 2008-02-18 #newlistlevelattrs#
aListtabMF.SetMax(aListtabMF.Normalize( nWidth ), FUNIT_TWIP );
aAlignedAtMF.SetMax(aAlignedAtMF.Normalize( nWidth ), FUNIT_TWIP );
aIndentAtMF.SetMax(aIndentAtMF.Normalize( nWidth ), FUNIT_TWIP );
- // <--
const SwTwips nLast2 = nWidth /2;
aDistBorderMF.SetLast( aDistBorderMF.Normalize( nLast2 ), FUNIT_TWIP );
aDistNumMF .SetLast( aDistNumMF .Normalize( nLast2 ), FUNIT_TWIP );
aIndentMF .SetLast( aIndentMF .Normalize( nLast2 ), FUNIT_TWIP );
- // --> OD 2008-02-18 #newlistlevelattrs#
aListtabMF.SetLast(aListtabMF.Normalize( nLast2 ), FUNIT_TWIP );
aAlignedAtMF.SetLast(aAlignedAtMF.Normalize( nLast2 ), FUNIT_TWIP );
aIndentAtMF.SetLast(aIndentAtMF.Normalize( nLast2 ), FUNIT_TWIP );
- // <--
- // <--
const SwRect& rPrtRect = pWrtSh->GetAnyCurRect(RECT_PAGE);
aPreviewWIN.SetPageWidth(rPrtRect.Width());
@@ -604,20 +568,16 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh)
aDistBorderMF .SetDecimalDigits(1);
aDistNumMF .SetDecimalDigits(1);
aIndentMF .SetDecimalDigits(1);
- // --> OD 2008-02-18 #newlistlevelattrs#
aListtabMF.SetDecimalDigits(1);
aAlignedAtMF.SetDecimalDigits(1);
aIndentAtMF.SetDecimalDigits(1);
- // <--
}
aDistBorderMF .SetUnit( eMetric );
aDistNumMF .SetUnit( eMetric );
aIndentMF .SetUnit( eMetric );
- // --> OD 2008-02-18 #newlistlevelattrs#
aListtabMF.SetUnit( eMetric );
aAlignedAtMF.SetUnit( eMetric );
aIndentAtMF.SetUnit( eMetric );
- // <--
}
IMPL_LINK( SwNumPositionTabPage, EditModifyHdl, Edit *, EMPTYARG )
@@ -629,11 +589,9 @@ IMPL_LINK( SwNumPositionTabPage, EditModifyHdl, Edit *, EMPTYARG )
{
SwNumFmt aNumFmt(pActNum->Get(i));
- // --> OD 2008-02-01 #newlistlevelattrs#
const USHORT nPos = aAlignLB.IsVisible()
? aAlignLB.GetSelectEntryPos()
: aAlign2LB.GetSelectEntryPos();
- // <--
SvxAdjust eAdjust = SVX_ADJUST_CENTER;
if(nPos == 0)
eAdjust = SVX_ADJUST_LEFT;
@@ -688,10 +646,8 @@ IMPL_LINK( SwNumPositionTabPage, LevelHdl, ListBox *, pBox )
}
aRelativeCB.Enable(1 != nActNumLvl);
SetModified();
- // --> OD 2008-02-01 #newlistlevelattrs#
InitPosAndSpaceMode();
ShowControlsDependingOnPosAndSpaceMode();
- // <--
InitControls();
return 0;
}
@@ -795,7 +751,6 @@ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox )
return 0;
}
-// --> OD 2008-02-01 #newlistlevelattrs#
IMPL_LINK( SwNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox*, EMPTYARG )
{
// determine value to be set at the chosen list levels
@@ -857,9 +812,7 @@ IMPL_LINK( SwNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox*, EMPTYARG )
return 0;
}
-// <--
-// --> OD 2008-02-01 #newlistlevelattrs#
IMPL_LINK( SwNumPositionTabPage, ListtabPosHdl_Impl, MetricField*, pFld )
{
// determine value to be set at the chosen list levels
@@ -882,9 +835,7 @@ IMPL_LINK( SwNumPositionTabPage, ListtabPosHdl_Impl, MetricField*, pFld )
return 0;
}
-// <--
-// --> OD 2008-02-01 #newlistlevelattrs#
IMPL_LINK( SwNumPositionTabPage, AlignAtHdl_Impl, MetricField*, pFld )
{
// determine value to be set at the chosen list levels
@@ -908,9 +859,7 @@ IMPL_LINK( SwNumPositionTabPage, AlignAtHdl_Impl, MetricField*, pFld )
return 0;
}
-// <--
-// --> OD 2008-02-01 #newlistlevelattrs#
IMPL_LINK( SwNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld )
{
// determine value to be set at the chosen list levels
@@ -937,7 +886,6 @@ IMPL_LINK( SwNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld )
return 0;
}
-// <--
IMPL_LINK( SwNumPositionTabPage, StandardHdl, PushButton *, EMPTYARG )
{
@@ -947,13 +895,10 @@ IMPL_LINK( SwNumPositionTabPage, StandardHdl, PushButton *, EMPTYARG )
if(nActNumLvl & nMask)
{
SwNumFmt aNumFmt( pActNum->Get( i ) );
- // --> OD 2008-02-11 #newlistlevelattrs#
SwNumRule aTmpNumRule( pWrtSh->GetUniqueNumRuleName(),
aNumFmt.GetPositionAndSpaceMode(),
pOutlineDlg ? OUTLINE_RULE : NUM_RULE );
- // <--
SwNumFmt aTempFmt(aTmpNumRule.Get( i ));
- // --> OD 2008-02-05 #newlistlevelattrs#
aNumFmt.SetPositionAndSpaceMode( aTempFmt.GetPositionAndSpaceMode() );
if ( aTempFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -969,8 +914,6 @@ IMPL_LINK( SwNumPositionTabPage, StandardHdl, PushButton *, EMPTYARG )
aNumFmt.SetFirstLineIndent( aTempFmt.GetFirstLineIndent() );
aNumFmt.SetIndentAt( aTempFmt.GetIndentAt() );
}
- // <--
-
pActNum->Set( i, aNumFmt );
}
nMask <<= 1;
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index 8e78d84..609dda1 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -1252,9 +1252,8 @@ void SwLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags,
SvLBoxEntry* pEntry )
{
SwGlblDocContent* pCont = (SwGlblDocContent*)pEntry->GetUserData();
- const SwSection* pSect;
if(pCont->GetType() == GLBLDOC_SECTION &&
- !(pSect = pCont->GetSection())->IsConnectFlag() )
+ !(pCont->GetSection())->IsConnectFlag() )
{
Font aOldFont( rDev.GetFont());
Font aFont(aOldFont);
diff --git a/sw/source/ui/vba/vbalisthelper.hxx b/sw/source/ui/vba/vbalisthelper.hxx
index 1fd590d..0e862fa 100644
--- a/sw/source/ui/vba/vbalisthelper.hxx
+++ b/sw/source/ui/vba/vbalisthelper.hxx
@@ -66,7 +66,7 @@ public:
SwVbaListHelper( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) throw( css::uno::RuntimeException );
sal_Int32 getGalleryType() const { return mnGalleryType; }
- css::uno::Reference< css::container::XIndexReplace > getNumberingRules() { return mxNumberingRules; }
+ css::uno::Reference< css::container::XIndexReplace > getNumberingRules() const { return mxNumberingRules; }
css::uno::Any getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const rtl::OUString& sName ) throw( css::uno::RuntimeException );
void setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const rtl::OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException );
More information about the Libreoffice-commits
mailing list