summaryrefslogtreecommitdiff
path: root/sw/source/ui/misc/num.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/misc/num.cxx')
-rw-r--r--sw/source/ui/misc/num.cxx169
1 files changed, 86 insertions, 83 deletions
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index ef57606f405a..b15ebfbbc007 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -76,14 +76,14 @@
#include <svl/aeitem.hxx>
#include <svl/slstitm.hxx>
-static BOOL bLastRelative = FALSE;
+static sal_Bool bLastRelative = sal_False;
SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
const SfxItemSet& rSet) :
SfxTabPage( pParent, SW_RES( TP_NUM_POSITION ), rSet ),
- aPositionFL( this, SW_RES(FL_POSITION )),
aLevelFL( this, SW_RES(FL_LEVEL )),
aLevelLB( this, SW_RES(LB_LEVEL )),
+ aPositionFL( this, SW_RES(FL_POSITION )),
aDistBorderFT( this, SW_RES(FT_BORDERDIST )),
aDistBorderMF( this, SW_RES(MF_BORDERDIST )),
@@ -112,18 +112,21 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
pSaveNum(0),
pWrtSh(0),
pOutlineDlg(0),
- bPreset( FALSE ),
- bInInintControl(FALSE),
+ bPreset( sal_False ),
+ bInInintControl(sal_False),
bLabelAlignmentPosAndSpaceModeActive( false )
{
FreeResource();
SetExchangeSupport();
aPreviewWIN.SetBackground(Wallpaper(Color(COL_TRANSPARENT)));
+ aStandardPB.SetAccessibleRelationMemberOf(&aPositionFL);
+
+
aRelativeCB.Check();
aAlignLB.SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl));
aAlign2LB.SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl));
- for ( USHORT i = 0; i < aAlignLB.GetEntryCount(); ++i )
+ for ( sal_uInt16 i = 0; i < aAlignLB.GetEntryCount(); ++i )
{
aAlign2LB.InsertEntry( aAlignLB.GetEntry( i ) );
}
@@ -164,7 +167,7 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
aStandardPB.SetClickHdl(LINK(this, SwNumPositionTabPage, StandardHdl));
// Ebenen einfuegen
- for(USHORT i = 1; i <= MAXLEVEL; i++)
+ for(sal_uInt16 i = 1; i <= MAXLEVEL; i++)
aLevelLB.InsertEntry(String::CreateFromInt32(i));
String sEntry(String::CreateFromAscii("1 - "));
sEntry += String::CreateFromInt32(MAXLEVEL);
@@ -182,7 +185,7 @@ SwNumPositionTabPage::~SwNumPositionTabPage()
void SwNumPositionTabPage::InitControls()
{
- bInInintControl = TRUE;
+ bInInintControl = sal_True;
const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive &&
aRelativeCB.IsEnabled() && aRelativeCB.IsChecked();
const bool bSingleSelection = aLevelLB.GetSelectEntryCount() == 1 &&
@@ -205,10 +208,10 @@ void SwNumPositionTabPage::InitControls()
bool bSameIndentAt = bLabelAlignmentPosAndSpaceModeActive;
const SwNumFmt* aNumFmtArr[MAXLEVEL];
- USHORT nMask = 1;
- USHORT nLvl = USHRT_MAX;
+ sal_uInt16 nMask = 1;
+ sal_uInt16 nLvl = USHRT_MAX;
long nFirstBorderTextRelative = -1;
- for(USHORT i = 0; i < MAXLEVEL; i++)
+ for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
{
aNumFmtArr[i] = &pActNum->Get(i);
if(nActNumLvl & nMask)
@@ -278,7 +281,7 @@ void SwNumPositionTabPage::InitControls()
aDistBorderMF.SetValue(aDistBorderMF.Normalize(nDistBorderNum),FUNIT_TWIP);
}
else
- bSetDistEmpty = TRUE;
+ bSetDistEmpty = sal_True;
if(bSameDist)
aDistNumMF .SetValue(aDistNumMF.Normalize(aNumFmtArr[nLvl]->GetCharTextDistance()), FUNIT_TWIP);
@@ -291,7 +294,7 @@ void SwNumPositionTabPage::InitControls()
if(bSameAdjust)
{
- USHORT nPos = 1; // zentriert
+ sal_uInt16 nPos = 1; // zentriert
if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_LEFT)
nPos = 0;
else if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT)
@@ -307,7 +310,7 @@ void SwNumPositionTabPage::InitControls()
if ( bSameLabelFollowedBy )
{
- USHORT nPos = 0; // LISTTAB
+ sal_uInt16 nPos = 0; // LISTTAB
if ( aNumFmtArr[nLvl]->GetLabelFollowedBy() == SvxNumberFormat::SPACE )
{
nPos = 1;
@@ -365,19 +368,19 @@ void SwNumPositionTabPage::InitControls()
aIndentAtMF.SetText(aEmptyStr);
}
- if(TRUE == bSetDistEmpty)
+ if(sal_True == bSetDistEmpty)
aDistBorderMF.SetText(aEmptyStr);
- bInInintControl = FALSE;
+ bInInintControl = sal_False;
}
void SwNumPositionTabPage::ActivatePage(const SfxItemSet& )
{
const SfxPoolItem* pItem;
- UINT16 nTmpNumLvl =
+ sal_uInt16 nTmpNumLvl =
pOutlineDlg ? pOutlineDlg->GetActNumLevel() : 0;
const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet();
- if(pExampleSet && pExampleSet->GetItemState(FN_PARAM_NUM_PRESET, FALSE, &pItem))
+ if(pExampleSet && pExampleSet->GetItemState(FN_PARAM_NUM_PRESET, sal_False, &pItem))
{
bPreset = ((const SfxBoolItem*)pItem)->GetValue();
}
@@ -387,18 +390,18 @@ void SwNumPositionTabPage::ActivatePage(const SfxItemSet& )
{
*pActNum = *pSaveNum;
nActNumLvl = nTmpNumLvl;
- USHORT nMask = 1;
- aLevelLB.SetUpdateMode(FALSE);
+ sal_uInt16 nMask = 1;
+ aLevelLB.SetUpdateMode(sal_False);
aLevelLB.SetNoSelection();
aLevelLB.SelectEntryPos( MAXLEVEL, nActNumLvl == USHRT_MAX);
if(nActNumLvl != USHRT_MAX)
- for(USHORT i = 0; i < MAXLEVEL; i++)
+ for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
{
if(nActNumLvl & nMask)
- aLevelLB.SelectEntryPos( i, TRUE);
+ aLevelLB.SelectEntryPos( i, sal_True);
nMask <<= 1 ;
}
- aLevelLB.SetUpdateMode(TRUE);
+ aLevelLB.SetUpdateMode(sal_True);
InitPosAndSpaceMode();
ShowControlsDependingOnPosAndSpaceMode();
@@ -414,11 +417,11 @@ int SwNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet)
SwOutlineTabDialog::SetActNumLevel(nActNumLvl);
if(_pSet)
FillItemSet(*_pSet);
- return TRUE;
+ return sal_True;
}
-BOOL SwNumPositionTabPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SwNumPositionTabPage::FillItemSet( SfxItemSet& rSet )
{
if(pOutlineDlg)
*pOutlineDlg->GetNumRule() = *pActNum;
@@ -426,7 +429,7 @@ BOOL SwNumPositionTabPage::FillItemSet( SfxItemSet& rSet )
{
*pSaveNum = *pActNum;
rSet.Put(SwUINumRuleItem( *pSaveNum ));
- rSet.Put(SfxBoolItem(FN_PARAM_NUM_PRESET, FALSE));
+ rSet.Put(SfxBoolItem(FN_PARAM_NUM_PRESET, sal_False));
}
return bModified;
}
@@ -437,27 +440,27 @@ void SwNumPositionTabPage::Reset( const SfxItemSet& rSet )
if(pOutlineDlg)
{
pSaveNum = pOutlineDlg->GetNumRule();
- aLevelLB.EnableMultiSelection(FALSE);
+ aLevelLB.EnableMultiSelection(sal_False);
}
- else if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_ACT_NUMBER, FALSE, &pItem))
+ else if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_ACT_NUMBER, sal_False, &pItem))
pSaveNum = ((SwUINumRuleItem*)pItem)->GetNumRule();
nActNumLvl = SwOutlineTabDialog::GetActNumLevel();
- USHORT nMask = 1;
- aLevelLB.SetUpdateMode(FALSE);
+ sal_uInt16 nMask = 1;
+ aLevelLB.SetUpdateMode(sal_False);
aLevelLB.SetNoSelection();
if(nActNumLvl == USHRT_MAX)
{
- aLevelLB.SelectEntryPos( MAXLEVEL, TRUE);
+ aLevelLB.SelectEntryPos( MAXLEVEL, sal_True);
}
else
- for(USHORT i = 0; i < MAXLEVEL; i++)
+ for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
{
if(nActNumLvl & nMask)
- aLevelLB.SelectEntryPos( i, TRUE);
+ aLevelLB.SelectEntryPos( i, sal_True);
nMask <<= 1;
}
- aLevelLB.SetUpdateMode(TRUE);
+ aLevelLB.SetUpdateMode(sal_True);
if(!pActNum)
pActNum = new SwNumRule(*pSaveNum);
@@ -467,7 +470,7 @@ void SwNumPositionTabPage::Reset( const SfxItemSet& rSet )
InitPosAndSpaceMode();
ShowControlsDependingOnPosAndSpaceMode();
InitControls();
- bModified = FALSE;
+ bModified = sal_False;
}
void SwNumPositionTabPage::InitPosAndSpaceMode()
@@ -481,8 +484,8 @@ void SwNumPositionTabPage::InitPosAndSpaceMode()
SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode =
SvxNumberFormat::LABEL_ALIGNMENT;
- USHORT nMask = 1;
- for( USHORT i = 0; i < MAXLEVEL; ++i )
+ sal_uInt16 nMask = 1;
+ for( sal_uInt16 i = 0; i < MAXLEVEL; ++i )
{
if(nActNumLvl & nMask)
{
@@ -572,14 +575,14 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh)
IMPL_LINK( SwNumPositionTabPage, EditModifyHdl, Edit *, EMPTYARG )
{
- USHORT nMask = 1;
- for(USHORT i = 0; i < MAXLEVEL; i++)
+ sal_uInt16 nMask = 1;
+ for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
{
if(nActNumLvl & nMask)
{
SwNumFmt aNumFmt(pActNum->Get(i));
- const USHORT nPos = aAlignLB.IsVisible()
+ const sal_uInt16 nPos = aAlignLB.IsVisible()
? aAlignLB.GetSelectEntryPos()
: aAlign2LB.GetSelectEntryPos();
SvxAdjust eAdjust = SVX_ADJUST_CENTER;
@@ -598,33 +601,33 @@ IMPL_LINK( SwNumPositionTabPage, EditModifyHdl, Edit *, EMPTYARG )
IMPL_LINK( SwNumPositionTabPage, LevelHdl, ListBox *, pBox )
{
- USHORT nSaveNumLvl = nActNumLvl;
+ sal_uInt16 nSaveNumLvl = nActNumLvl;
nActNumLvl = 0;
if(pBox->IsEntryPosSelected( MAXLEVEL ) &&
(pBox->GetSelectEntryCount() == 1 || nSaveNumLvl != 0xffff))
{
nActNumLvl = 0xFFFF;
- pBox->SetUpdateMode(FALSE);
- for( USHORT i = 0; i < MAXLEVEL; i++ )
- pBox->SelectEntryPos( i, FALSE );
- pBox->SetUpdateMode(TRUE);
+ pBox->SetUpdateMode(sal_False);
+ for( sal_uInt16 i = 0; i < MAXLEVEL; i++ )
+ pBox->SelectEntryPos( i, sal_False );
+ pBox->SetUpdateMode(sal_True);
}
else if(pBox->GetSelectEntryCount())
{
- USHORT nMask = 1;
- for( USHORT i = 0; i < MAXLEVEL; i++ )
+ sal_uInt16 nMask = 1;
+ for( sal_uInt16 i = 0; i < MAXLEVEL; i++ )
{
if(pBox->IsEntryPosSelected( i ))
nActNumLvl |= nMask;
nMask <<= 1;
}
- pBox->SelectEntryPos( MAXLEVEL, FALSE );
+ pBox->SelectEntryPos( MAXLEVEL, sal_False );
}
else
{
nActNumLvl = nSaveNumLvl;
- USHORT nMask = 1;
- for( USHORT i = 0; i < MAXLEVEL; i++ )
+ sal_uInt16 nMask = 1;
+ for( sal_uInt16 i = 0; i < MAXLEVEL; i++ )
{
if(nActNumLvl & nMask)
{
@@ -647,8 +650,8 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld )
if(bInInintControl)
return 0;
long nValue = static_cast< long >(pFld->Denormalize(pFld->GetValue(FUNIT_TWIP)));
- USHORT nMask = 1;
- for(USHORT i = 0; i < MAXLEVEL; i++)
+ sal_uInt16 nMask = 1;
+ for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
{
if(nActNumLvl & nMask)
{
@@ -661,7 +664,7 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld )
if(0 == i)
{
long nTmp = aNumFmt.GetFirstLineOffset();
- aNumFmt.SetAbsLSpace( USHORT(nValue - nTmp));
+ aNumFmt.SetAbsLSpace( sal_uInt16(nValue - nTmp));
}
else
{
@@ -669,7 +672,7 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld )
pActNum->Get( i - 1 ).GetFirstLineOffset() -
pActNum->Get( i ).GetFirstLineOffset();
- aNumFmt.SetAbsLSpace( USHORT(nValue + nTmp));
+ aNumFmt.SetAbsLSpace( sal_uInt16(nValue + nTmp));
}
}
else
@@ -686,7 +689,7 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld )
//jetzt muss mit dem FirstLineOffset auch der AbsLSpace veraendert werden
long nDiff = nValue + aNumFmt.GetFirstLineOffset();
long nAbsLSpace = aNumFmt.GetAbsLSpace();
- aNumFmt.SetAbsLSpace(USHORT(nAbsLSpace + nDiff));
+ aNumFmt.SetAbsLSpace(sal_uInt16(nAbsLSpace + nDiff));
aNumFmt.SetFirstLineOffset( -(short)nValue );
}
@@ -704,16 +707,16 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld )
IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox )
{
- BOOL bOn = pBox->IsChecked();
- BOOL bSingleSelection = aLevelLB.GetSelectEntryCount() == 1 && USHRT_MAX != nActNumLvl;
- BOOL bSetValue = FALSE;
+ sal_Bool bOn = pBox->IsChecked();
+ sal_Bool bSingleSelection = aLevelLB.GetSelectEntryCount() == 1 && USHRT_MAX != nActNumLvl;
+ sal_Bool bSetValue = sal_False;
long nValue = 0;
if(bOn || bSingleSelection)
{
- USHORT nMask = 1;
- BOOL bFirst = TRUE;
- bSetValue = TRUE;
- for(USHORT i = 0; i < MAXLEVEL; i++)
+ sal_uInt16 nMask = 1;
+ sal_Bool bFirst = sal_True;
+ bSetValue = sal_True;
+ for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
{
if(nActNumLvl & nMask)
{
@@ -726,7 +729,7 @@ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox )
}
else
bSetValue = nValue == rNumFmt.GetAbsLSpace() - pActNum->Get(i - 1).GetAbsLSpace();
- bFirst = FALSE;
+ bFirst = sal_False;
}
nMask <<= 1;
}
@@ -747,7 +750,7 @@ IMPL_LINK( SwNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox*, EMPTYARG )
SvxNumberFormat::SvxNumLabelFollowedBy eLabelFollowedBy =
SvxNumberFormat::LISTTAB;
{
- const USHORT nPos = aLabelFollowedByLB.GetSelectEntryPos();
+ const sal_uInt16 nPos = aLabelFollowedByLB.GetSelectEntryPos();
if ( nPos == 1 )
{
eLabelFollowedBy = SvxNumberFormat::SPACE;
@@ -760,9 +763,9 @@ IMPL_LINK( SwNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox*, EMPTYARG )
// set value at the chosen list levels
bool bSameListtabPos = true;
- USHORT nFirstLvl = USHRT_MAX;
- USHORT nMask = 1;
- for( USHORT i = 0; i < MAXLEVEL; ++i )
+ sal_uInt16 nFirstLvl = USHRT_MAX;
+ sal_uInt16 nMask = 1;
+ for( sal_uInt16 i = 0; i < MAXLEVEL; ++i )
{
if ( nActNumLvl & nMask )
{
@@ -809,8 +812,8 @@ IMPL_LINK( SwNumPositionTabPage, ListtabPosHdl_Impl, MetricField*, pFld )
const long nValue = static_cast< long >(pFld->Denormalize(pFld->GetValue(FUNIT_TWIP)));
// set value at the chosen list levels
- USHORT nMask = 1;
- for( USHORT i = 0; i < MAXLEVEL; ++i )
+ sal_uInt16 nMask = 1;
+ for( sal_uInt16 i = 0; i < MAXLEVEL; ++i )
{
if ( nActNumLvl & nMask )
{
@@ -832,8 +835,8 @@ IMPL_LINK( SwNumPositionTabPage, AlignAtHdl_Impl, MetricField*, pFld )
const long nValue = static_cast< long >(pFld->Denormalize(pFld->GetValue(FUNIT_TWIP)));
// set value at the chosen list levels
- USHORT nMask = 1;
- for( USHORT i = 0; i < MAXLEVEL; ++i )
+ sal_uInt16 nMask = 1;
+ for( sal_uInt16 i = 0; i < MAXLEVEL; ++i )
{
if ( nActNumLvl & nMask )
{
@@ -856,8 +859,8 @@ IMPL_LINK( SwNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld )
const long nValue = static_cast< long >(pFld->Denormalize(pFld->GetValue(FUNIT_TWIP)));
// set value at the chosen list levels
- USHORT nMask = 1;
- for( USHORT i = 0; i < MAXLEVEL; ++i )
+ sal_uInt16 nMask = 1;
+ for( sal_uInt16 i = 0; i < MAXLEVEL; ++i )
{
if ( nActNumLvl & nMask )
{
@@ -879,8 +882,8 @@ IMPL_LINK( SwNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld )
IMPL_LINK( SwNumPositionTabPage, StandardHdl, PushButton *, EMPTYARG )
{
- USHORT nMask = 1;
- for(USHORT i = 0; i < MAXLEVEL; i++)
+ sal_uInt16 nMask = 1;
+ for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
{
if(nActNumLvl & nMask)
{
@@ -915,9 +918,9 @@ IMPL_LINK( SwNumPositionTabPage, StandardHdl, PushButton *, EMPTYARG )
}
#if OSL_DEBUG_LEVEL > 1
-void SwNumPositionTabPage::SetModified(BOOL bRepaint)
+void SwNumPositionTabPage::SetModified(sal_Bool bRepaint)
{
- bModified = TRUE;
+ bModified = sal_True;
if(bRepaint)
{
aPreviewWIN.SetLevel(nActNumLvl);
@@ -929,7 +932,7 @@ void SwNumPositionTabPage::SetModified(BOOL bRepaint)
SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(Window* pParent,
const SfxItemSet* pSwItemSet, SwWrtShell & rSh) :
- SfxTabDialog(pParent, SW_RES(DLG_SVXTEST_NUM_BULLET), pSwItemSet, FALSE, &aEmptyStr),
+ SfxTabDialog(pParent, SW_RES(DLG_SVXTEST_NUM_BULLET), pSwItemSet, sal_False, &aEmptyStr),
rWrtSh(rSh),
sRemoveText(SW_RES(ST_RESET)),
nRetOptionsDialog(USHRT_MAX)
@@ -939,7 +942,7 @@ SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(Window* pParent,
GetUserButton()->SetHelpId(HID_NUM_RESET);
GetUserButton()->SetClickHdl(LINK(this, SwSvxNumBulletTabDialog, RemoveNumberingHdl));
if(!rWrtSh.GetCurNumRule())
- GetUserButton()->Enable(FALSE);
+ GetUserButton()->Enable(sal_False);
AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM );
AddTabPage( RID_SVXPAGE_PICK_BULLET );
AddTabPage( RID_SVXPAGE_PICK_NUM );
@@ -953,7 +956,7 @@ SwSvxNumBulletTabDialog::~SwSvxNumBulletTabDialog()
{
}
-void SwSvxNumBulletTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage)
+void SwSvxNumBulletTabDialog::PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage)
{
//Namen der Vorlagen und Metric setzen
String sNumCharFmt, sBulletCharFmt;
@@ -990,7 +993,7 @@ void SwSvxNumBulletTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage)
SwDocShell* pDocShell = rWrtSh.GetView().GetDocShell();
::FillCharStyleListBox(rCharFmtLB, pDocShell);
List aList;
- for(USHORT j = 0; j < rCharFmtLB.GetEntryCount(); j++)
+ for(sal_uInt16 j = 0; j < rCharFmtLB.GetEntryCount(); j++)
{
aList.Insert( new XubString(rCharFmtLB.GetEntry(j)), LIST_APPEND );
@@ -998,9 +1001,9 @@ void SwSvxNumBulletTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage)
aSet.Put( SfxStringListItem( SID_CHAR_FMT_LIST_BOX,&aList ) ) ;
FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, pDocShell));
- aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< USHORT >(eMetric) ) );
+ aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< sal_uInt16 >(eMetric) ) );
rPage.PageCreated(aSet);
- for( USHORT i = (USHORT)aList.Count(); i; --i )
+ for( sal_uInt16 i = (sal_uInt16)aList.Count(); i; --i )
delete (XubString*)aList.Remove(i);
aList.Clear();
}
@@ -1010,7 +1013,7 @@ void SwSvxNumBulletTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage)
SwDocShell* pDocShell = rWrtSh.GetView().GetDocShell();
FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, pDocShell));
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
- aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< USHORT >(eMetric)) );
+ aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< sal_uInt16 >(eMetric)) );
rPage.PageCreated(aSet);
}
break;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 04:26:17 +0000