summaryrefslogtreecommitdiffstats
path: root/reportdesign/source/ui/dlg/Condition.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-03-13 13:27:46 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-03-13 13:48:23 +0100
commit6e4d3bad807a32371fe49f0a4a28ca0e5b0f6e70 (patch)
tree9e0f0f964884306b9675ce87e0c129cbcee5b963 /reportdesign/source/ui/dlg/Condition.cxx
parentrhbz#1431476 dnd has started copying instead of moving slides (diff)
downloadcore-6e4d3bad807a32371fe49f0a4a28ca0e5b0f6e70.tar.gz
core-6e4d3bad807a32371fe49f0a4a28ca0e5b0f6e70.zip
Clean up integer types representing positions in ToolBox's item vector
(vs. uses of sal_uInt16 representing such items' IDs). APPEND and ITEM_NOTFOUND are members of ToolBox now (and have been bumped to the corresponding type's max). The payload of VclEventIds ToolboxButtonStateChanged ToolboxClick ToolboxHighlightOff ToolboxItemAdded ToolboxItemDisabled ToolboxItemEnabled ToolboxItemRemoved ToolboxItemTextChanged ToolboxItemUpdated ToolboxItemWindowChanged ToolboxSelect has been changed too (note that reading/writing of those payloads isn't very consistent, though: for some of these, values are written that are never read, while for some others no values are ever written but the reading code would like to receive some value if the payload wasn't a nullptr). Change-Id: I4856ffb3637404b8d866621a3503d7922b1b8141
Diffstat (limited to 'reportdesign/source/ui/dlg/Condition.cxx')
-rw-r--r--reportdesign/source/ui/dlg/Condition.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 6136ef5a70b3..f93326f6eaec 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -392,8 +392,8 @@ void Condition::updateToolbar(const uno::Reference< report::XReportControlFormat
OSL_ENSURE(_xReportControlFormat.is(),"XReportControlFormat is NULL!");
if ( _xReportControlFormat.is() )
{
- sal_uInt16 nItemCount = m_pActions->GetItemCount();
- for (sal_uInt16 j = 0; j< nItemCount; ++j)
+ ToolBox::ImplToolItems::size_type nItemCount = m_pActions->GetItemCount();
+ for (ToolBox::ImplToolItems::size_type j = 0; j< nItemCount; ++j)
{
sal_uInt16 nItemId = m_pActions->GetItemId(j);
m_pActions->CheckItem( nItemId, OReportController::isFormatCommandEnabled(mapToolbarItemToSlotId(nItemId),