summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2014-07-25 13:38:56 +0200
committerMatteo Casalin <matteo.casalin@yahoo.com>2014-07-26 14:25:31 +0200
commit9837f23c2069a20fefd06bb888c2ffb64f8082f5 (patch)
tree91a9b4b8d7e849c3e482fecd46981f5ece4ae90d /sw
parentd940c1226268a881c3fa4580cc41ac3082298218 (diff)
More proper integer types, constify
Change-Id: I52733936d2d38c5c22c054cf6e0bc323a74344ae
Diffstat (limited to 'sw')
-rw-r--r--sw/source/uibase/shells/txtnum.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx
index b88fd1adea68..89f0c04343b8 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -187,7 +187,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTabDialog( DLG_SVXTEST_NUM_BULLET,
GetView().GetWindow(), &aSet, GetShell()));
OSL_ENSURE(pDlg, "Dialogdiet fail!");
- sal_uInt16 nRet = pDlg->Execute();
+ const short nRet = pDlg->Execute();
const SfxPoolItem* pItem;
if ( RET_OK == nRet )
{
@@ -262,10 +262,10 @@ void SwTextShell::ExecSetNumber(SfxRequest &rReq)
if ( pNBOTypeMgr != NULL )
{
const SwNumRule* pNumRuleAtCurrentSelection = GetShell().GetNumRuleAtCurrentSelection();
- sal_uInt16 nActNumLvl = (sal_uInt16) 0xFFFF;
+ sal_uInt16 nActNumLvl = USHRT_MAX;
if ( pNumRuleAtCurrentSelection != NULL )
{
- sal_uInt16 nLevel = GetShell().GetNumLevel();
+ const sal_uInt16 nLevel = GetShell().GetNumLevel();
if ( nLevel < MAXLEVEL )
{
nActNumLvl = 1 << nLevel;