[Libreoffice-commits] .: sw/source

[Joseph Powers]

 sw/source/filter/html/SwAppletImpl.cxx |    6 +++---
 sw/source/filter/html/htmlplug.cxx     |    8 ++++----
 sw/source/ui/shells/textsh.cxx         |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit bbf0a6f25ef32f112badaa21ba238b470b7804d9
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Wed May 18 18:58:39 2011 -0700

    Convert SvCommandList from an OwnList to a vector<>

diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx
index 6eb6531..3718056 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.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
@@ -164,8 +164,8 @@ sal_Bool SwApplet_Impl::CreateApplet( const String& rBaseURL )
     String aCode, aName, aCodeBase;
     sal_Bool bMayScript = sal_False;
 
-    sal_uInt32 nArgCount = aCommandList.Count();
-    for( sal_uInt32 i=0; i<nArgCount; i++ )
+    size_t nArgCount = aCommandList.size();
+    for( size_t i = 0; i < nArgCount; i++ )
     {
         const SvCommand& rArg = aCommandList[i];
         const String& rName = rArg.GetCommand();
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index c5a3080..ed80ded 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.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
@@ -1172,7 +1172,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
         SvCommandList aCommands;
         aCommands.FillFromSequence( aProps );
         SvULongs aParams;
-        sal_uLong i = aCommands.Count();
+        size_t i = aCommands.size();
         while( i > 0 )
         {
             const SvCommand& rCommand = aCommands[ --i ];
@@ -1213,7 +1213,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
         }
 
         rHTMLWrt.DecIndentLevel(); // Inhalt von Applet einruecken
-        if( aCommands.Count() )
+        if( aCommands.size() )
             rHTMLWrt.OutNewLine();
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_applet, sal_False );
     }
@@ -1228,7 +1228,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
 
         SvCommandList aCommands;
         aCommands.FillFromSequence( aProps );
-        for( sal_uLong i=0; i<aCommands.Count(); i++ )
+        for( size_t i = 0; i < aCommands.size(); i++ )
         {
             const SvCommand& rCommand = aCommands[ i ];
             const String& rName = rCommand.GetCommand();
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 2bddf80..5c43f8a 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.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
@@ -310,7 +310,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
                                             INetURLObject(), sClassLocation,
                                             URIHelper::GetMaybeFileHdl()) ) ) );
                         uno::Sequence< beans::PropertyValue > aSeq;
-                        if ( aCommandList.Count() )
+                        if ( aCommandList.size() )
                         {
                             aCommandList.FillSequence( aSeq );
                             xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginCommands")), uno::makeAny( aSeq ) );