diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:35:18 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:35:18 +0100 |
| commit | 6a75a47be7b3aafbb655ffa70609fd2ed7ca4b3e (patch) | |
| tree | d00d2024213e09b8eba4704b8b6660eb42c3921c /extensions/source/dbpilots/gridwizard.cxx | |
| parent | 7fb1e1ea8c9f8d3ef13524d1327272824df7110d (diff) | |
| parent | eee3dbc7af039669d447d2e55abd896ea3383df1 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
automation/source/communi/communi.cxx
automation/source/server/recorder.cxx
automation/source/server/server.cxx
basctl/source/basicide/basobj2.cxx
Diffstat (limited to 'extensions/source/dbpilots/gridwizard.cxx')
| -rw-r--r-- | extensions/source/dbpilots/gridwizard.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index bd3efcdcbf45..9fddfd0635e0 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -373,12 +373,12 @@ namespace dbp return sal_False; OGridSettings& rSettings = getSettings(); - USHORT nSelected = m_aSelFields.GetEntryCount(); + sal_uInt16 nSelected = m_aSelFields.GetEntryCount(); rSettings.aSelectedFields.realloc(nSelected); ::rtl::OUString* pSelected = rSettings.aSelectedFields.getArray(); - for (USHORT i=0; i<nSelected; ++i, ++pSelected) + for (sal_uInt16 i=0; i<nSelected; ++i, ++pSelected) *pSelected = m_aSelFields.GetEntry(i); return sal_True; @@ -420,11 +420,11 @@ namespace dbp ListBox& rMoveTo = bMoveRight ? m_aSelFields : m_aExistFields; // the index of the selected entry - USHORT nSelected = bMoveRight ? m_aExistFields.GetSelectEntryPos() : m_aSelFields.GetSelectEntryPos(); + sal_uInt16 nSelected = bMoveRight ? m_aExistFields.GetSelectEntryPos() : m_aSelFields.GetSelectEntryPos(); // the (original) relative position of the entry sal_IntPtr nRelativeIndex = reinterpret_cast<sal_IntPtr>(bMoveRight ? m_aExistFields.GetEntryData(nSelected) : m_aSelFields.GetEntryData(nSelected)); - USHORT nInsertPos = LISTBOX_APPEND; + sal_uInt16 nInsertPos = LISTBOX_APPEND; if (!bMoveRight) { // need to determine an insert pos which reflects the original nInsertPos = 0; @@ -447,7 +447,7 @@ namespace dbp // remove the entry from it's old list if (bMoveRight) { - USHORT nSelectPos = m_aExistFields.GetSelectEntryPos(); + sal_uInt16 nSelectPos = m_aExistFields.GetSelectEntryPos(); m_aExistFields.RemoveEntry(nSelected); if ((LISTBOX_ENTRY_NOTFOUND != nSelectPos) && (nSelectPos < m_aExistFields.GetEntryCount())) m_aExistFields.SelectEntryPos(nSelectPos); @@ -456,7 +456,7 @@ namespace dbp } else { - USHORT nSelectPos = m_aSelFields.GetSelectEntryPos(); + sal_uInt16 nSelectPos = m_aSelFields.GetSelectEntryPos(); m_aSelFields.RemoveEntry(nSelected); if ((LISTBOX_ENTRY_NOTFOUND != nSelectPos) && (nSelectPos < m_aSelFields.GetEntryCount())) m_aSelFields.SelectEntryPos(nSelectPos); |