diff options
| author | Joseph Powers <jpowers27@cox.net> | 2011-05-18 18:55:12 -0700 |
|---|---|---|
| committer | Joseph Powers <jpowers27@cox.net> | 2011-05-18 19:12:56 -0700 |
| commit | 7dd30968f0d89382198b70a58a3e8d1c1cc5fc98 (patch) | |
| tree | 2a7cc56145579c2fc87ea00c591de750bad45c51 /sfx2 | |
| parent | d3893f7f5a20deeb7aa7926dcdbb7bd07523ccc6 (diff) | |
Convert SvCommandList from an OwnList to a vector<>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/plugin.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx index 6991aab6c7..475aab6ce5 100644 --- a/sfx2/source/doc/plugin.cxx +++ b/sfx2/source/doc/plugin.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 @@ -99,9 +99,9 @@ void SAL_CALL PluginObject::initialize( const uno::Sequence< uno::Any >& aArgume aArguments[0] >>= mxObj; } -sal_Bool SAL_CALL PluginObject::load( +sal_Bool SAL_CALL PluginObject::load( const uno::Sequence < com::sun::star::beans::PropertyValue >& /*lDescriptor*/, - const uno::Reference < frame::XFrame >& xFrame ) + const uno::Reference < frame::XFrame >& xFrame ) throw( uno::RuntimeException ) { uno::Reference< plugin::XPluginManager > xPMgr( mxFact->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")) ), uno::UNO_QUERY ); @@ -116,14 +116,13 @@ throw( uno::RuntimeException ) pWin->SetBackground(); pWin->Show(); - sal_uIntPtr nCount = maCmdList.Count(); + size_t nCount = maCmdList.size(); uno::Sequence < ::rtl::OUString > aCmds( nCount ), aArgs( nCount ); ::rtl::OUString *pCmds = aCmds.getArray(), *pArgs = aArgs.getArray(); - for( sal_uIntPtr i = 0; i < nCount; i++ ) + for( size_t i = 0; i < nCount; i++ ) { - SvCommand & rCmd = maCmdList.GetObject( i ); - pCmds[i] = rCmd.GetCommand(); - pArgs[i] = rCmd.GetArgument(); + pCmds[i] = maCmdList[ i ].GetCommand(); + pArgs[i] = maCmdList[ i ].GetArgument(); } mxPlugin = xPMgr->createPluginFromURL( @@ -216,7 +215,7 @@ void SAL_CALL PluginObject::setPropertyValue(const ::rtl::OUString& aPropertyNam } else if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PluginCommands")) ) { - maCmdList.Clear(); + maCmdList.clear(); uno::Sequence < beans::PropertyValue > aCommandSequence; if( aAny >>= aCommandSequence ) maCmdList.FillFromSequence( aCommandSequence ); |