diff options
| author | Daniel Di Marco <d.dimarco@gmx.de> | 2011-10-29 13:24:48 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-01 12:19:05 +0000 |
| commit | f7303fcac779f99931bfba48e8bfcf9c081af67f (patch) | |
| tree | 2ebd76bd8d6d8db36bc87020accf5b22e05afec9 /sfx2/source/control | |
| parent | cca7126c2908c5b9b6693326a3861bb96fae1be3 (diff) | |
eliminate SvUShorts type
Diffstat (limited to 'sfx2/source/control')
| -rw-r--r-- | sfx2/source/control/dispatch.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/control/macrconf.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 5aa16e163ff7..8df3b4a00a6a 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -164,7 +164,7 @@ struct SfxDispatcher_Impl sal_uInt16 nFilterCount; // Number of SIDs in pFilterSIDs const sal_uInt16* pFilterSIDs; // sorted Array of SIDs sal_uInt16 nStandardMode; // ExecuteMode from PlugInDispatcher - SvUShorts* pDisableList; + std::vector<sal_uInt16>* pDisableList; sal_uInt32 nDisableFlags; }; @@ -2498,8 +2498,8 @@ sal_Bool SfxDispatcher::IsAllowed } // BinSearch in the disable list - SvUShorts& rList = *pImp->pDisableList; - sal_uInt16 nCount = rList.Count(); + std::vector<sal_uInt16>& rList = *pImp->pDisableList; + sal_uInt16 nCount = rList.size(); sal_uInt16 nLow = 0, nMid = 0, nHigh; sal_Bool bFound = sal_False; nHigh = nCount - 1; diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx index 1464ffe0abed..c02dc8fd45a6 100644 --- a/sfx2/source/control/macrconf.cxx +++ b/sfx2/source/control/macrconf.cxx @@ -447,7 +447,7 @@ sal_uInt16 SfxMacroConfig::GetSlotId(SfxMacroInfoPtr pInfo) if (i == nCount) { // Macro still unknown - nCount = aIdArray.Count(); + nCount = aIdArray.size(); sal_uInt16 n; for (n=0; n<nCount; n++) // Seearch for free SlotId if (aIdArray[n] > SID_MACRO_START + n) @@ -456,7 +456,7 @@ sal_uInt16 SfxMacroConfig::GetSlotId(SfxMacroInfoPtr pInfo) sal_uInt16 nNewSlotId = SID_MACRO_START + n; if ( nNewSlotId > SID_MACRO_END ) return 0; - aIdArray.Insert( SID_MACRO_START + n, n ); + aIdArray.insert( aIdArray.begin() + n, SID_MACRO_START + n ); SfxSlot *pNewSlot = new SfxSlot; pNewSlot->nSlotId = SID_MACRO_START + n; @@ -531,12 +531,12 @@ void SfxMacroConfig::ReleaseSlotId(sal_uInt16 nId) pImp->aArr.Remove(i); // Release SlotId again - sal_uInt16 nIdCount = aIdArray.Count(); + sal_uInt16 nIdCount = aIdArray.size(); for (sal_uInt16 n=0; n<nIdCount; n++) { if (aIdArray[n] == nId) { - aIdArray.Remove(n); + aIdArray.erase( aIdArray.begin() + n ); break; } } |