strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

svarray: merge with DEV300 m90

Browse source
This commit is contained in:
Bartosz Kosiorek 2010-10-20 22:48:22 +02:00
commit 8082b79563
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
basctl/source/basicide/baside2b.cxx
View file

@ -28,8 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
#include <svl/svarray.hxx>
#include <vector>
#define _BASIC_TEXTPORTIONS
#include <basic/sbdef.hxx>
#include <ide_pch.hxx>
@ -773,8 +772,8 @@ void EditorWindow::ImpDoHighlight( ULONG nLine )
pEditEngine->RemoveAttribs( nLine, TRUE );
HighlightPortions aPortions;
aHighlighter.getHighlightPortions( nLine, aLine, aPortions );
USHORT nCount = aPortions.Count();
for ( USHORT i = 0; i < nCount; i++ )
for ( size_t i = 0; i < aPortions.size(); i++ )
{
HighlightPortion& r = aPortions[i];
const Color& rColor = ((ModulWindowLayout*)pModulWindow->GetLayoutWindow())->getSyntaxColor(r.tokenType);

21
basctl/source/basicide/bastype3.cxx
View file

@ -42,14 +42,13 @@
#include <basdoc.hxx>
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <deque>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
SV_DECL_VARARR( EntryArray, SvLBoxEntry*, 4, 4 )
SV_IMPL_VARARR( EntryArray, SvLBoxEntry*);
typedef std::deque< SvLBoxEntry* > EntryArray;
void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
@ -196,7 +195,7 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBoxEntry* pEntry )
case 2:
case 1:
{
aEntries.C40_INSERT( SvLBoxEntry, pEntry, 0 );
aEntries.push_front( pEntry );
}
break;
case 0:
@ -210,14 +209,14 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBoxEntry* pEntry )
SbxVariable* pVar = 0;
bool bDocumentObjects = false;
if ( aEntries.Count() )
if ( !aEntries.empty() )
{
for ( USHORT n = 0; n < aEntries.Count(); n++ )
for ( size_t n = 0; n < aEntries.size(); n++ )
{
SvLBoxEntry* pLE = aEntries[n];
DBG_ASSERT( pLE, "Entrie im Array nicht gefunden" );
DBG_ASSERT( pLE, "Can not find entry in array" );
BasicEntry* pBE = (BasicEntry*)pLE->GetUserData();
DBG_ASSERT( pBE, "Keine Daten im Eintrag gefunden!" );
DBG_ASSERT( pBE, "The data in the entry not found!" );
String aName( GetEntryText( pLE ) );
switch ( pBE->GetType() )
@ -301,7 +300,7 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry )
case 2:
case 1:
{
aEntries.C40_INSERT( SvLBoxEntry, pEntry, 0 );
aEntries.push_front( pEntry );
}
break;
case 0:
@ -319,9 +318,9 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry )
pEntry = GetParent( pEntry );
}
if ( aEntries.Count() )
if ( !aEntries.empty() )
{
for ( USHORT n = 0; n < aEntries.Count(); n++ )
for ( size_t n = 0; n < aEntries.size(); n++ )
{
SvLBoxEntry* pLE = aEntries[n];
DBG_ASSERT( pLE, "Entrie im Array nicht gefunden" );