summaryrefslogtreecommitdiff
path: root/sc/source/ui/cctrl/dpcontrol.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/cctrl/dpcontrol.cxx')
-rw-r--r--sc/source/ui/cctrl/dpcontrol.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index b90a51ed6bee..0066af5938e2 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -306,7 +306,7 @@ IMPL_LINK( ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl, void*, EMPTYARG )
size_t ScMenuFloatingWindow::MENU_NOT_SELECTED = 999;
-ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, USHORT nMenuStackLevel) :
+ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel) :
PopupMenuFloatingWindow(pParent),
maOpenTimer(this),
maCloseTimer(this),
@@ -1160,7 +1160,7 @@ void ScDPFieldPopupWindow::setAllMemberState(bool bSet)
{
size_t n = maMembers.size();
for (size_t i = 0; i < n; ++i)
- maChecks.CheckEntryPos(static_cast< USHORT >( i ), bSet);
+ maChecks.CheckEntryPos(static_cast< sal_uInt16 >( i ), bSet);
}
void ScDPFieldPopupWindow::selectCurrentMemberOnly(bool bSet)
@@ -1356,7 +1356,7 @@ void ScDPFieldPopupWindow::initMembers()
for (size_t i = 0; i < n; ++i)
{
maChecks.InsertEntry(maMembers[i].maName);
- maChecks.CheckEntryPos(static_cast< USHORT >( i ), maMembers[i].mbVisible);
+ maChecks.CheckEntryPos(static_cast< sal_uInt16 >( i ), maMembers[i].mbVisible);
if (maMembers[i].mbVisible)
++nVisMemCount;
}
@@ -1391,7 +1391,7 @@ void ScDPFieldPopupWindow::getResult(hash_map<OUString, bool, OUStringHash>& rRe
size_t n = maMembers.size();
for (size_t i = 0; i < n; ++i)
{
- bool bState = maChecks.IsChecked(static_cast< USHORT >( i ));
+ bool bState = maChecks.IsChecked(static_cast< sal_uInt16 >( i ));
aResult.insert(ResultMap::value_type(maMembers[i].maName, bState));
}
rResult.swap(aResult);