diff options
| author | Joseph Powers <jpowers27@cox.net> | 2011-05-15 19:39:55 -0700 |
|---|---|---|
| committer | Joseph Powers <jpowers27@cox.net> | 2011-05-16 18:33:52 -0700 |
| commit | 7820ce4d16d2e1c6a467855027e13f95ae5499ce (patch) | |
| tree | 1da61dc8bdf3191f8469f5247614b17a7a89499c /automation/source | |
| parent | e1fea21ac72bbafa1c2809bc42cdaaee8dbd866d (diff) | |
Change SvStorageInfoList from an OwnList to vector<>
Simple changes.
Diffstat (limited to 'automation/source')
| -rw-r--r-- | automation/source/server/statemnt.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 36ea24ce4..e30c16773 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1020,7 +1020,7 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo for ( i = 0; i < pMenu->GetItemCount() ; i++ ) { sal_uInt16 nID = pMenu->GetItemId( i ); - + aName = String(); if ( aName.Len() == 0 ) aName = pMenu->GetHelpText( nID ); @@ -2686,7 +2686,7 @@ sal_Bool StatementCommand::Execute() { if ( nErr == 1 ) ReportError( GEN_RES_STR0( S_NO_POPUP ) ); - else + else ReportError( GEN_RES_STR0( S_NO_SUBMENU ) ); break; } @@ -2984,7 +2984,7 @@ sal_Bool StatementCommand::Execute() { pRet->GenReturn ( RET_Value, nMethodId, aPath ); } - + } break; case RC_FileLen: @@ -3151,7 +3151,7 @@ sal_Bool StatementCommand::Execute() #if OSL_DEBUG_LEVEL > 1 sal_uInt16 nEntries = Dir( aDestPath, FSYS_KIND_FILE | FSYS_KIND_DIR ).Count(); - (void) nEntries; /* avoid warning about unused parameter */ + (void) nEntries; /* avoid warning about unused parameter */ #endif // The Count is only larger than 2 is the path is a directory which is not empty // the Count of 2 results from the "." and ".." directory @@ -3309,9 +3309,9 @@ sal_Bool StatementCommand::UnpackStorage( SotStorageRef xStorage, DirEntry &aBas SvStorageInfoList aList; xStorage->FillInfoList( &aList ); - for( sal_uInt16 i = 0; i < aList.Count(); i++ ) + for( size_t i = 0; i < aList.size(); i++ ) { - SvStorageInfo& rInfo = aList.GetObject( i ); + SvStorageInfo& rInfo = aList[ i ]; String aName = rInfo.GetName(); DirEntry aPath ( aBaseDir ); aPath += DirEntry( aName ); @@ -5502,7 +5502,7 @@ sal_Bool StatementControl::Execute() pThisEntry = (SvLBoxEntry*)pTree->GetEntryAtVisPos( nNr1-1 ); } } - + if ( pThisEntry ) { if ( ! (nParams & PARAM_USHORT_2) ) @@ -5605,7 +5605,7 @@ sal_Bool StatementControl::Execute() } } break; - + default: ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "EditBrowseBox" ) ); break; @@ -5798,7 +5798,7 @@ sal_Bool StatementControl::Execute() pRet->GenReturn ( RET_Value, aUId, aContent ); } break; - case TypeClass_STRING: + case TypeClass_STRING: { ::rtl::OUString aContent; aCell >>= aContent; |