[ooo-build-commit] .: accessibility/source cui/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Mon Oct 4 07:59:44 PDT 2010
accessibility/source/extended/accessiblelistbox.cxx | 2
cui/source/inc/numpages.hxx | 6 --
cui/source/tabpages/border.cxx | 5 -
cui/source/tabpages/numpages.cxx | 58 --------------------
cui/source/tabpages/swpossizetabpage.cxx | 5 -
5 files changed, 5 insertions(+), 71 deletions(-)
New commits:
commit 2176141990ec94492309bf22d69b45917e471a3d
Author: David Hobley <davidh at sharpblue.org>
Date: Mon Oct 4 16:12:39 2010 +0200
Comments cleanup
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 087feda..3fe4ac6 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -130,7 +130,7 @@ namespace accessibility
}
break;
- // --> OD 2009-04-01 #i92103#
+ // #i92103#
case VCLEVENT_ITEM_EXPANDED :
case VCLEVENT_ITEM_COLLAPSED :
{
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index d7450b1..9c38f89 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -376,7 +376,6 @@ class SvxNumPositionTabPage : public SfxTabPage
FixedText aLevelFT;
MultiListBox aLevelLB;
- // --> OD 2008-01-11 #newlistlevelattrs#
// former set of controls shown for numbering rules containing list level
// attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION
FixedText aDistBorderFT;
@@ -390,7 +389,6 @@ class SvxNumPositionTabPage : public SfxTabPage
ListBox aAlignLB;
// <--
- // --> OD 2008-01-10 #newlistlevelattrs#
// new set of controls shown for numbering rules containing list level
// attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_ALIGNMENT
FixedText aLabelFollowedByFT;
@@ -422,9 +420,7 @@ class SvxNumPositionTabPage : public SfxTabPage
BOOL bModified : 1;
BOOL bPreset : 1;
BOOL bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein
- // --> OD 2008-01-11 #newlistlevelattrs#
bool bLabelAlignmentPosAndSpaceModeActive;
- // <--
void InitControls();
@@ -434,7 +430,6 @@ class SvxNumPositionTabPage : public SfxTabPage
DECL_LINK( RelativeHdl_Impl, CheckBox * );
DECL_LINK( StandardHdl_Impl, PushButton * );
- // --> OD 2008-01-11 #newlistlevelattrs#
void InitPosAndSpaceMode();
void ShowControlsDependingOnPosAndSpaceMode();
@@ -442,7 +437,6 @@ class SvxNumPositionTabPage : public SfxTabPage
DECL_LINK( ListtabPosHdl_Impl, MetricField* );
DECL_LINK( AlignAtHdl_Impl, MetricField* );
DECL_LINK( IndentAtHdl_Impl, MetricField* );
- // <--
public:
SvxNumPositionTabPage(Window* pParent,
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 48aac82..a6922e6 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -396,7 +396,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
AddItemConnection( svx::CreateFrameLineConnection( SID_ATTR_BORDER_DIAG_TLBR, aFrameSel, svx::FRAMEBORDER_TLBR ) );
if( aFrameSel.IsBorderEnabled( svx::FRAMEBORDER_BLTR ) )
AddItemConnection( svx::CreateFrameLineConnection( SID_ATTR_BORDER_DIAG_BLTR, aFrameSel, svx::FRAMEBORDER_BLTR ) );
- // --> OD 2005-03-01 #i43593# - item connection doesn't work for Writer,
+ // #i43593# - item connection doesn't work for Writer,
// because the Writer item sets contain these items
// checkbox "Merge with next paragraph" only visible for Writer dialog format.paragraph
AddItemConnection( new sfx::CheckBoxConnection( SID_ATTR_BORDER_CONNECT, aMergeWithNextCB, sfx::ITEMCONN_DEFAULT ) );
@@ -404,7 +404,6 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
// checkbox "Merge adjacent line styles" only visible for Writer dialog format.table
AddItemConnection( new sfx::CheckBoxConnection( SID_SW_COLLAPSING_BORDERS, aMergeAdjacentBordersCB, sfx::ITEMCONN_DEFAULT ) );
aMergeAdjacentBordersCB.Hide();
- // <--
}
// -----------------------------------------------------------------------
@@ -1243,7 +1242,7 @@ void SvxBorderTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
if (pSWModeItem)
{
nSWMode = pSWModeItem->GetValue();
- // --> OD 2005-03-01 #i43593#
+ // #i43593#
// show checkbox <aMergeWithNextCB> for format.paragraph
if ( nSWMode == SW_BORDER_MODE_PARA )
{
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index e18531f..f210035 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2751,7 +2751,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
const SvxNumberFormat &rFmt = pActNum->GetLevel(nLevel);
aNum.GetLevelVal()[ nLevel ] = rFmt.GetStart();
- // --> OD 2008-01-16 #newlistlevelattrs#
USHORT nXStart( 0 );
short nTextOffset( 0 );
USHORT nNumberXPos( 0 );
@@ -2784,7 +2783,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
nNumberXPos = static_cast<USHORT>( nTmpNumberXPos );
}
}
- // <--
USHORT nBulletWidth = 0;
if( SVX_NUM_BITMAP == (rFmt.GetNumberingType() &(~LINK_TOKEN)))
@@ -2819,7 +2817,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
nBulletWidth = (USHORT)pVDev->GetTextWidth(aText);
nPreNum++;
}
- // --> OD 2008-01-16 #newlistlevelattrs#
if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT &&
rFmt.GetLabelFollowedBy() == SvxNumberFormat::SPACE )
{
@@ -2829,7 +2826,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
nBulletWidth = nBulletWidth + (USHORT)pVDev->GetTextWidth(aText);
}
- // --> OD 2008-01-16 #newlistlevelattrs#
USHORT nTextXPos( 0 );
if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -2863,7 +2859,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
nXStart = static_cast<USHORT>( rFmt.GetIndentAt() / nWidthRelation );
}
- // <--
Rectangle aRect1(Point(nTextXPos, nYStart + nFontHeight / 2), Size(aSize.Width() / 2, 2));
pVDev->SetFillColor( aBackColor );
@@ -2891,7 +2886,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
{
const SvxNumberFormat &rFmt = pActNum->GetLevel(nLevel);
aNum.GetLevelVal()[ nLevel ] = rFmt.GetStart();
- // --> OD 2008-01-31 #newlistlevelattrs#
USHORT nXStart( 0 );
if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -2913,7 +2907,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
}
nXStart /= 2;
nXStart += 2;
- // <--
USHORT nTextOffset = 2 * nXStep;
if( SVX_NUM_BITMAP == (rFmt.GetNumberingType()&(~LINK_TOKEN)) )
{
@@ -3003,7 +2996,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
aDistNumMF( this, CUI_RES(MF_NUMDIST )),
aAlignFT( this, CUI_RES(FT_ALIGN )),
aAlignLB( this, CUI_RES(LB_ALIGN )),
- // --> OD 2008-01-10 #newlistlevelattrs#
aLabelFollowedByFT( this, CUI_RES(FT_LABEL_FOLLOWED_BY) ),
aLabelFollowedByLB( this, CUI_RES(LB_LABEL_FOLLOWED_BY) ),
aListtabFT( this, CUI_RES(FT_LISTTAB) ),
@@ -3014,7 +3006,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
aAlignedAtMF( this, CUI_RES(MF_ALIGNED_AT) ),
aIndentAtFT( this, CUI_RES(FT_INDENT_AT) ),
aIndentAtMF( this, CUI_RES(MF_INDENT_AT) ),
- // <--
aStandardPB( this, CUI_RES(PB_STANDARD )),
pPreviewWIN( new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW ))),
pActNum(0),
@@ -3024,9 +3015,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
bModified(false),
bPreset(false),
bInInintControl(FALSE),
- // --> OD 2008-01-11 #newlistlevelattrs#
bLabelAlignmentPosAndSpaceModeActive( false )
- // <--
{
FreeResource();
SetExchangeSupport();
@@ -3034,7 +3023,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
aRelativeCB.Check();
aAlignLB.SetSelectHdl(LINK(this, SvxNumPositionTabPage, EditModifyHdl_Impl));
- // --> OD 2008-01-10 #newlistlevelattrs#
aAlign2LB.SetSelectHdl(LINK(this, SvxNumPositionTabPage, EditModifyHdl_Impl));
for ( USHORT i = 0; i < aAlignLB.GetEntryCount(); ++i )
{
@@ -3042,7 +3030,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
}
aAlign2LB.SetDropDownLineCount( aAlign2LB.GetEntryCount() );
aAlign2FT.SetText( aAlignFT.GetText() );
- // <--
Link aLk = LINK(this, SvxNumPositionTabPage, DistanceHdl_Impl);
@@ -3058,7 +3045,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
aIndentMF.SetDownHdl(aLk);
aIndentMF.SetLoseFocusHdl(aLk);
- // --> OD 2008-01-10 #newlistlevelattrs#
aLabelFollowedByLB.SetDropDownLineCount( aLabelFollowedByLB.GetEntryCount() );
aLabelFollowedByLB.SetSelectHdl( LINK(this, SvxNumPositionTabPage, LabelFollowedByHdl_Impl) );
@@ -3076,7 +3062,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
aIndentAtMF.SetUpHdl(aLk);
aIndentAtMF.SetDownHdl(aLk);
aIndentAtMF.SetLoseFocusHdl(aLk);
- // <--
aLevelLB.SetSelectHdl(LINK(this, SvxNumPositionTabPage, LevelHdl_Impl));
aRelativeCB.SetClickHdl(LINK(this, SvxNumPositionTabPage, RelativeHdl_Impl));
@@ -3145,10 +3130,8 @@ void lcl_PrintDebugOutput(FixedText& rFixed, const SvxNumberFormat& rNumFmt)
void SvxNumPositionTabPage::InitControls()
{
bInInintControl = TRUE;
- // --> OD 2008-01-11 #newlistlevelattrs#
const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive &&
aRelativeCB.IsEnabled() && aRelativeCB.IsChecked();
- // <--
const bool bSingleSelection = aLevelLB.GetSelectEntryCount() == 1 &&
USHRT_MAX != nActNumLvl;
@@ -3163,12 +3146,10 @@ void SvxNumPositionTabPage::InitControls()
bool bSameIndent = !bLabelAlignmentPosAndSpaceModeActive;
bool bSameAdjust = true;
- // --> OD 2008-01-11 #newlistlevelattrs#
bool bSameLabelFollowedBy = bLabelAlignmentPosAndSpaceModeActive;
bool bSameListtab = bLabelAlignmentPosAndSpaceModeActive;
bool bSameAlignAt = bLabelAlignmentPosAndSpaceModeActive;
bool bSameIndentAt = bLabelAlignmentPosAndSpaceModeActive;
- // <--
const SvxNumberFormat* aNumFmtArr[SVX_MAX_NUM];
USHORT nMask = 1;
@@ -3194,7 +3175,6 @@ void SvxNumPositionTabPage::InitControls()
if( i > nLvl)
{
- // --> OD 2008-01-11 #newlistlevelattrs#
bSameAdjust &= aNumFmtArr[i]->GetNumAdjust() == aNumFmtArr[nLvl]->GetNumAdjust();
if ( !bLabelAlignmentPosAndSpaceModeActive )
{
@@ -3229,7 +3209,6 @@ void SvxNumPositionTabPage::InitControls()
bSameIndentAt &=
aNumFmtArr[i]->GetIndentAt() == aNumFmtArr[nLvl]->GetIndentAt();
}
- // <--
}
}
nMask <<= 1;
@@ -3275,19 +3254,14 @@ void SvxNumPositionTabPage::InitControls()
else if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT)
nPos = 2;
aAlignLB.SelectEntryPos(nPos);
- // --> OD 2008-01-11 #newlistlevelattrs#
aAlign2LB.SelectEntryPos( nPos );
- // <--
}
else
{
aAlignLB.SetNoSelection();
- // --> OD 2008-01-11 #newlistlevelattrs#
aAlign2LB.SetNoSelection();
- // <--
}
- // --> OD 2008-01-11 #newlistlevelattrs#
if ( bSameLabelFollowedBy )
{
USHORT nPos = 0; // LISTTAB
@@ -3345,7 +3319,6 @@ void SvxNumPositionTabPage::InitControls()
{
aIndentAtMF.SetText(aEmptyStr);
}
- // <--
if ( bSetDistEmpty )
aDistBorderMF.SetText(aEmptyStr);
@@ -3394,10 +3367,8 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet)
aRelativeCB.Enable(nActNumLvl != 1);
aLevelLB.SetUpdateMode(TRUE);
- // --> OD 2008-01-11 #newlistlevelattrs#
InitPosAndSpaceMode();
ShowControlsDependingOnPosAndSpaceMode();
- // <--
InitControls();
}
@@ -3494,19 +3465,13 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet )
*pActNum = *pSaveNum;
pPreviewWIN->SetNumRule(pActNum);
- // --> OD 2008-01-11 #newlistlevelattrs#
InitPosAndSpaceMode();
ShowControlsDependingOnPosAndSpaceMode();
-// const BOOL bDraw = pActNum->IsFeatureSupported(NUM_CONTINUOUS);
-// aDistNumFT.Show(bDraw);
-// aDistNumMF.Show(bDraw);
- // <--
InitControls();
bModified = FALSE;
}
-// --> OD 2008-01-11 #newlistlevelattrs#
void SvxNumPositionTabPage::InitPosAndSpaceMode()
{
if ( pActNum == 0 )
@@ -3562,7 +3527,6 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
aIndentAtFT.Show( bLabelAlignmentPosAndSpaceModeActive );
aIndentAtMF.Show( bLabelAlignmentPosAndSpaceModeActive );
}
-// <--
/*-----------------03.12.97 10:02-------------------
@@ -3583,20 +3547,16 @@ void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric)
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 );
- // <--
}
/*-----------------03.12.97 11:06-------------------
@@ -3611,11 +3571,9 @@ IMPL_LINK( SvxNumPositionTabPage, EditModifyHdl_Impl, Edit *, EMPTYARG )
{
SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
- // --> OD 2008-01-11 #newlistlevelattrs#
const USHORT nPos = aAlignLB.IsVisible()
? aAlignLB.GetSelectEntryPos()
: aAlign2LB.GetSelectEntryPos();
- // <--
SvxAdjust eAdjust = SVX_ADJUST_CENTER;
if(nPos == 0)
eAdjust = SVX_ADJUST_LEFT;
@@ -3672,10 +3630,8 @@ IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox *, pBox )
}
aRelativeCB.Enable(nActNumLvl != 1);
SetModified();
- // --> OD 2008-01-15 #newlistlevelattrs#
InitPosAndSpaceMode();
ShowControlsDependingOnPosAndSpaceMode();
- // <--
InitControls();
return 0;
}
@@ -3799,7 +3755,6 @@ IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox )
return 0;
}
-// --> OD 2008-01-14 #newlistlevelattrs#
IMPL_LINK( SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox*, EMPTYARG )
{
// determine value to be set at the chosen list levels
@@ -3859,9 +3814,7 @@ IMPL_LINK( SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox*, EMPTYARG )
return 0;
}
-// <--
-// --> OD 2008-01-14 #newlistlevelattrs#
IMPL_LINK( SvxNumPositionTabPage, ListtabPosHdl_Impl, MetricField*, pFld )
{
// determine value to be set at the chosen list levels
@@ -3887,9 +3840,7 @@ IMPL_LINK( SvxNumPositionTabPage, ListtabPosHdl_Impl, MetricField*, pFld )
return 0;
}
-// <--
-// --> OD 2008-01-14 #newlistlevelattrs#
IMPL_LINK( SvxNumPositionTabPage, AlignAtHdl_Impl, MetricField*, pFld )
{
// determine value to be set at the chosen list levels
@@ -3916,9 +3867,7 @@ IMPL_LINK( SvxNumPositionTabPage, AlignAtHdl_Impl, MetricField*, pFld )
return 0;
}
-// <--
-// --> OD 2008-01-14 #newlistlevelattrs#
IMPL_LINK( SvxNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld )
{
// determine value to be set at the chosen list levels
@@ -3948,27 +3897,21 @@ IMPL_LINK( SvxNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld )
return 0;
}
-// <--
-/*-----------------05.12.97 15:33-------------------
---------------------------------------------------*/
IMPL_LINK( SvxNumPositionTabPage, StandardHdl_Impl, PushButton *, EMPTYARG )
{
USHORT nMask = 1;
- // --> OD 2008-02-11 #newlistlevelattrs#
SvxNumRule aTmpNumRule( pActNum->GetFeatureFlags(),
pActNum->GetLevelCount(),
pActNum->IsContinuousNumbering(),
SVX_RULETYPE_NUMBERING,
pActNum->GetLevel( 0 ).GetPositionAndSpaceMode() );
- // <--
for(USHORT i = 0; i < pActNum->GetLevelCount(); i++)
{
if(nActNumLvl & nMask)
{
SvxNumberFormat aNumFmt( pActNum->GetLevel( i ) );
SvxNumberFormat aTempFmt(aTmpNumRule.GetLevel( i ));
- // --> OD 2008-02-05 #newlistlevelattrs#
aNumFmt.SetPositionAndSpaceMode( aTempFmt.GetPositionAndSpaceMode() );
if ( aTempFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -3984,7 +3927,6 @@ IMPL_LINK( SvxNumPositionTabPage, StandardHdl_Impl, PushButton *, EMPTYARG )
aNumFmt.SetFirstLineIndent( aTempFmt.GetFirstLineIndent() );
aNumFmt.SetIndentAt( aTempFmt.GetIndentAt() );
}
- // <--
pActNum->SetLevel( i, aNumFmt );
}
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index e30f9f7..78a6644 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -773,7 +773,7 @@ BOOL SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
USHORT nMapPos = GetMapPos(m_pVMap, m_aVertLB);
short nAlign = GetAlignment(m_pVMap, nMapPos, m_aVertLB, m_aVertToLB);
short nRel = GetRelation(m_pVMap, m_aVertToLB);
- // --> OD 2004-10-21 #i34055# - convert vertical position for
+ // #i34055# - convert vertical position for
// as-character anchored objects
long nVertByPos =
static_cast<long>(m_aVertByMF.Denormalize(m_aVertByMF.GetValue(FUNIT_TWIP)));
@@ -781,7 +781,6 @@ BOOL SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
{
nVertByPos *= -1;
}
- // <--
if ( nAlign != rVertOrient.GetValue() ||
nRel != rVertRelation.GetValue() ||
( m_aVertByMF.IsEnabled() &&
@@ -795,7 +794,7 @@ BOOL SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
}
}
- // OD 19.09.2003 #i18732#
+ // #i18732#
if(m_aFollowCB.IsChecked() != m_aFollowCB.GetSavedValue())
{
//Writer internal type - based on SfxBoolItem
More information about the ooo-build-commit
mailing list