summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2014-03-30 11:47:33 +0200
committerMatteo Casalin <matteo.casalin@yahoo.com>2014-03-30 16:38:00 +0200
commit1e5826163af8473b52a00124b04b7b7dc8c3d52d (patch)
treec3e1727860b2d77d39d2575845b99486126d7a73
parent1f1aa85a1884d9ecbe897b36e651ded7222690fe (diff)
Some more conversion to consinstent integer types
Change-Id: Idca4a41c8c23e7761d8b10a7269f1e50fa74e379
-rw-r--r--sw/source/ui/fldui/fldref.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index e33e842674b6..9e5a1f87582f 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -957,11 +957,11 @@ sal_uInt16 SwFldRefPage::GetGroup()
void SwFldRefPage::FillUserData()
{
- sal_Int32 nTypeSel = m_pTypeLB->GetSelectEntryPos();
- if( LISTBOX_ENTRY_NOTFOUND == nTypeSel )
- nTypeSel = USHRT_MAX;
- else
- nTypeSel = sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(m_pTypeLB->GetEntryData( nTypeSel )));
+ const sal_Int32 nEntryPos = m_pTypeLB->GetSelectEntryPos();
+ const sal_uInt16 nTypeSel = ( LISTBOX_ENTRY_NOTFOUND == nEntryPos )
+ ? USHRT_MAX
+ : sal::static_int_cast< sal_uInt16 >
+ (reinterpret_cast< sal_uIntPtr >(m_pTypeLB->GetEntryData( nEntryPos )));
SetUserData( USER_DATA_VERSION ";" + OUString::number( nTypeSel ));
}